diff --git a/.gitignore b/.gitignore index d22e858..abb2fc1 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ proj-4.6.1.tar.gz /proj-6.2.0.tar.gz /proj-6.3.1.tar.gz /proj-6.3.2.tar.gz +/proj-7.2.0.tar.gz diff --git a/mingw-proj.spec b/mingw-proj.spec index c3f695f..8f8643b 100644 --- a/mingw-proj.spec +++ b/mingw-proj.spec @@ -3,24 +3,29 @@ %global pkgname proj Name: mingw-%{pkgname} -Version: 6.3.2 -Release: 2%{?dist} +Version: 7.2.0 +Release: 1%{?dist} Summary: Cartographic projection software (PROJ.4) BuildArch: noarch License: MIT URL: https://github.com/OSGeo/proj.4 Source0: https://github.com/OSGeo/proj.4/archive/%{version}/%{pkgname}-%{version}.tar.gz +# Ship a pkgconfig file +Patch0: proj_pkgconfig.patch -BuildRequires: autoconf automake libtool -BuildRequires: sqlite +BuildRequires: cmake +BuildRequires: mingw32-curl BuildRequires: mingw32-filesystem >= 95 BuildRequires: mingw32-gcc-c++ +BuildRequires: mingw32-libtiff BuildRequires: mingw32-sqlite +BuildRequires: mingw64-curl BuildRequires: mingw64-filesystem >= 95 BuildRequires: mingw64-gcc-c++ +BuildRequires: mingw64-libtiff BuildRequires: mingw64-sqlite @@ -32,6 +37,7 @@ projection functions. Proj docs: http://www.remotesensing.org/dl/new_docs/ %package -n mingw32-%{pkgname} Summary: Cartographic projection software (PROJ.4) +Obsoletes: mingw32-%{pkgname}-static < 6.3.2-3 %description -n mingw32-%{pkgname} Proj and invproj perform respective forward and inverse transformation of @@ -39,16 +45,10 @@ cartographic data to or from cartesian data with a wide range of selectable projection functions. Proj docs: http://www.remotesensing.org/dl/new_docs/ -%package -n mingw32-%{pkgname}-static -Summary: Static libraries for mingw32-%{pkgname} -Requires: mingw32-%{pkgname} = %{version}-%{release} - -%description -n mingw32-%{pkgname}-static -Static libraries for mingw32-%{pkgname}. - - %package -n mingw64-%{pkgname} Summary: Cartographic projection software (PROJ.4) +Obsoletes: mingw64-%{pkgname}-static < 6.3.2-3 + %description -n mingw64-%{pkgname} Proj and invproj perform respective forward and inverse transformation of @@ -56,14 +56,6 @@ cartographic data to or from cartesian data with a wide range of selectable projection functions. Proj docs: http://www.remotesensing.org/dl/new_docs/ -%package -n mingw64-%{pkgname}-static -Summary: Static libraries for mingw64-%{pkgname} -Requires: mingw64-%{pkgname} = %{version}-%{release} - -%description -n mingw64-%{pkgname}-static -Static libraries for mingw64-%{pkgname}. - - %{?mingw_debug_package} @@ -72,17 +64,12 @@ Static libraries for mingw64-%{pkgname}. %build -./autogen.sh - -%mingw_configure -%mingw_make %{?_smp_mflags} +%mingw_cmake -DBUILD_TESTING=OFF +%mingw_make_build %install -%mingw_make install DESTDIR=%{buildroot} - -# Remove libtool archives -find %{buildroot} -type f -name '*.la' -delete +%mingw_make_install # Remove unneeded files rm -r %{buildroot}%{mingw32_datadir} @@ -91,30 +78,31 @@ rm -r %{buildroot}%{mingw64_datadir} %files -n mingw32-%{pkgname} %license COPYING -%{mingw32_bindir}/libproj-15.dll +%{mingw32_bindir}/libproj_7_2.dll %{mingw32_bindir}/*.exe %{mingw32_libdir}/libproj.dll.a +%{mingw32_libdir}/cmake/proj/ +%{mingw32_libdir}/cmake/proj4/ %{mingw32_libdir}/pkgconfig/proj.pc %{mingw32_includedir}/*.h %{mingw32_includedir}/proj/ -%files -n mingw32-%{pkgname}-static -%{mingw32_libdir}/libproj.a - %files -n mingw64-%{pkgname} %license COPYING -%{mingw64_bindir}/libproj-15.dll +%{mingw64_bindir}/libproj_7_2.dll %{mingw64_bindir}/*.exe %{mingw64_libdir}/libproj.dll.a +%{mingw64_libdir}/cmake/proj/ +%{mingw64_libdir}/cmake/proj4/ %{mingw64_libdir}/pkgconfig/proj.pc %{mingw64_includedir}/*.h %{mingw64_includedir}/proj/ -%files -n mingw64-%{pkgname}-static -%{mingw64_libdir}/libproj.a - %changelog +* Thu Nov 12 2020 Sandro Mani - 7.2.0-1 +- Update to 7.2.0 + * Tue Jul 28 2020 Fedora Release Engineering - 6.3.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/proj_pkgconfig.patch b/proj_pkgconfig.patch new file mode 100644 index 0000000..6164d5f --- /dev/null +++ b/proj_pkgconfig.patch @@ -0,0 +1,22 @@ +diff -rupN proj-7.2.0/CMakeLists.txt proj-7.2.0-new/CMakeLists.txt +--- proj-7.2.0/CMakeLists.txt 2020-10-28 12:22:26.000000000 +0100 ++++ proj-7.2.0-new/CMakeLists.txt 2020-11-05 07:27:39.486134481 +0100 +@@ -277,3 +277,18 @@ add_subdirectory(cmake) + if(BUILD_TESTING) + add_subdirectory(test) + endif() ++ ++################################################################################ ++# pkgconfig file ++################################################################################ ++SET(prefix ${CMAKE_INSTALL_PREFIX}) ++SET(exec_prefix ${CMAKE_INSTALL_PREFIX}) ++SET(libdir ${CMAKE_INSTALL_PREFIX}/${LIBDIR}) ++SET(includedir ${CMAKE_INSTALL_PREFIX}/${INCLUDEDIR}) ++SET(datarootdir ${CMAKE_INSTALL_PREFIX}/${DATADIR}) ++SET(VERSION ${PROJ_VERSION}) ++SET(SQLITE3_LIBS ${SQLITE3_LIBRARY}) ++SET(TIFF_LIBS ${TIFF_LIBRARY}) ++SET(CURL_LIBS ${CURL_LIBRARY}) ++CONFIGURE_FILE(proj.pc.in proj.pc @ONLY) ++INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/proj.pc DESTINATION ${LIBDIR}/pkgconfig) diff --git a/sources b/sources index 568879a..5f2f544 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (proj-6.3.2.tar.gz) = 05443c3b25d51ae6dedaf5343b8bda4024f3b6f8bed34a8d684d5948c5a7a388afc0c73abc248a270e6ed141d6826f4c9e9e84675c8d6f25c635b8aca558286a +SHA512 (proj-7.2.0.tar.gz) = 65dfca92b7890a9ffa78f48da443045069a250e2974dcf564fa23ffc297f87235b669983b39906352bd8eb702714b98fd89a4c7beaad4ad70834993a6de85128