diff --git a/.gitignore b/.gitignore index ffe77e9..e8d40f7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,17 +1,2 @@ -/proj-5.2.0.tar.gz -/proj-datumgrid-1.8.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 -/proj-data-1.3.tar.gz -/proj-7.2.1.tar.gz -/proj-data-1.4.tar.gz -/proj-8.0.0.tar.gz -/proj-data-1.5.tar.gz -/proj-8.0.1.tar.gz -/proj-8.1.0.tar.gz -/proj-data-1.7.tar.gz -/proj-8.1.1.tar.gz -/proj-8.2.0.tar.gz -/proj-data-1.8.tar.gz +SOURCES/proj-data-1.19.tar.gz +SOURCES/proj-9.5.0.tar.gz diff --git a/.proj.metadata b/.proj.metadata new file mode 100644 index 0000000..987e68d --- /dev/null +++ b/.proj.metadata @@ -0,0 +1,2 @@ +c7aed63acbb26176b5b67288d91ac1f22c841cc5 SOURCES/proj-data-1.19.tar.gz +77782c889ca727eaf4696055604634b4d253f9a0 SOURCES/proj-9.5.0.tar.gz diff --git a/proj.spec b/SPECS/proj.spec similarity index 71% rename from proj.spec rename to SPECS/proj.spec index f861bd2..4e818d1 100644 --- a/proj.spec +++ b/SPECS/proj.spec @@ -1,19 +1,15 @@ -%global proj_version 8.2.0 -%global data_version 1.8 +%if 0%{?fedora} +%bcond_without mingw +%else +%bcond_with mingw +%endif -# The name is special so that rpmdev-bumpspec will bump this rather than adding .1 to the end -%global baserelease 1 - -# In order to avoid needing to keep incrementing the release version for the -# main package forever, we will just construct one for proj that is guaranteed -# to increment safely. Changing this can only be done during an update when the -# base proj version number is increasing. -%global data_release %{proj_version}.%{baserelease}%{?dist} +%global data_version 1.19 Name: proj # Also check whether there is a new proj-data release when upgrading! -Version: %{proj_version} -Release: %{baserelease}%{?dist} +Version: 9.5.0 +Release: 1%{?dist} Summary: Cartographic projection software (PROJ) License: MIT @@ -30,8 +26,24 @@ BuildRequires: make BuildRequires: libtiff-devel BuildRequires: sqlite-devel +%if %{with mingw} +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 +%endif + Obsoletes: proj-datumgrid < 1.8-6.3.2.6 +Requires: proj-data = %{version}-%{release} + %description Proj and invproj perform respective forward and inverse transformation of cartographic data to or from cartesian data with a wide range of selectable @@ -47,6 +59,14 @@ Obsoletes: %{name}-static < 7.2.0 This package contains libproj and the appropriate header files and man pages. +%package data +Summary: Proj data files +BuildArch: noarch + +%description data +Proj arch independent data files. + + %package data-europe Summary: Compat package for old proj-datumgrid-europe BuildArch: noarch @@ -55,6 +75,7 @@ Provides: deprecated() Requires: proj-data-at Requires: proj-data-be Requires: proj-data-ch +Requires: proj-data-cz Requires: proj-data-de Requires: proj-data-dk Requires: proj-data-es @@ -64,8 +85,10 @@ Requires: proj-data-fo Requires: proj-data-fr Requires: proj-data-is Requires: proj-data-nl +Requires: proj-data-pl Requires: proj-data-pt Requires: proj-data-se +Requires: proj-data-si Requires: proj-data-sk Requires: proj-data-uk @@ -122,7 +145,7 @@ Please do not depend on this package, it will get removed! %files data-world - +# TODO: why the \ cruft in this section? %define data_subpkg(c:n:e:s:) \ %define countrycode %{-c:%{-c*}}%{!-c:%{error:Country code not defined}} \ %define countryname %{-n:%{-n*}}%{!-n:%{error:Country name not defined}} \ @@ -133,7 +156,8 @@ Please do not depend on this package, it will get removed! Summary: %{countryname} datum grids for Proj\ BuildArch: noarch\ # See README.DATA \ -License: CC-BY and MIT and BSD and Public Domain \ +License: CC-BY-4.0 OR CC-BY-SA-4.0 OR MIT OR BSD-2-Clause OR CC0-1.0\ +Requires: proj-data = %{version}-%{release} \ Supplements: proj\ \ %description data-%{countrycode}\ @@ -144,12 +168,14 @@ Supplements: proj\ %{extrafile} +%data_subpkg -c ar -n Argentina %data_subpkg -c at -n Austria %data_subpkg -c au -n Australia %data_subpkg -c be -n Belgium %data_subpkg -c br -n Brasil %data_subpkg -c ca -n Canada -%data_subpkg -c ch -n Switzerland +%data_subpkg -c ch -n Switzerland -e CH +%data_subpkg -c cz -n Czech %data_subpkg -c de -n Germany %data_subpkg -c dk -n Denmark -e DK %data_subpkg -c es -n Spain @@ -164,30 +190,79 @@ Supplements: proj\ %data_subpkg -c nc -n %{quote:New Caledonia} %data_subpkg -c nl -n Netherlands %data_subpkg -c nz -n %{quote:New Zealand} +%data_subpkg -c pl -n Poland %data_subpkg -c pt -n Portugal %data_subpkg -c se -n Sweden %data_subpkg -c sk -n Slovakia +%data_subpkg -c si -n Slovenia %data_subpkg -c uk -n %{quote:United Kingdom} %data_subpkg -c us -n %{quote:United States} %data_subpkg -c za -n %{quote:South Africa} +%if %{with mingw} +%package -n mingw32-%{name} +Summary: Cartographic projection software (PROJ.4) +Obsoletes: mingw32-%{name}-static < 6.3.2-3 +BuildArch: noarch + +%description -n mingw32-%{name} +Proj and invproj perform respective forward and inverse transformation of +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-%{name} +Summary: Cartographic projection software (PROJ.4) +Obsoletes: mingw64-%{name}-static < 6.3.2-3 +BuildArch: noarch + + +%description -n mingw64-%{name} +Proj and invproj perform respective forward and inverse transformation of +cartographic data to or from cartesian data with a wide range of selectable +projection functions. Proj docs: http://www.remotesensing.org/dl/new_docs/ + + +%{?mingw_debug_package} +%endif + + %prep %autosetup -p1 %build +# Native build %cmake -DUSE_EXTERNAL_GTEST=ON %cmake_build +%if %{with mingw} +# MinGW build +%mingw_cmake -DBUILD_TESTING=OFF +%mingw_make_build +%endif + %install %cmake_install +%if %{with mingw} +%mingw_make_install +%endif # Install data mkdir -p %{buildroot}%{_datadir}/%{name} tar -xf %{SOURCE1} --directory %{buildroot}%{_datadir}/%{name} +%if %{with mingw} +rm -rf %{buildroot}%{mingw32_docdir} +rm -rf %{buildroot}%{mingw32_mandir} +rm -rf %{buildroot}%{mingw64_docdir} +rm -rf %{buildroot}%{mingw64_mandir} + + +%mingw_debug_install_post +%endif %check @@ -196,10 +271,6 @@ tar -xf %{SOURCE1} --directory %{buildroot}%{_datadir}/%{name} %files -%doc README.md -%doc %{_docdir}/%{name}/AUTHORS -%doc %{_docdir}/%{name}/NEWS -%license %{_docdir}/%{name}/COPYING %{_bindir}/cct %{_bindir}/cs2cs %{_bindir}/geod @@ -209,14 +280,29 @@ tar -xf %{SOURCE1} --directory %{buildroot}%{_datadir}/%{name} %{_bindir}/proj %{_bindir}/projinfo %{_bindir}/projsync -%{_libdir}/libproj.so.22* -%{_mandir}/man1/*.1* +%{_libdir}/libproj.so.25* + +%files devel +%{_includedir}/*.h +%{_includedir}/proj/ +%{_libdir}/libproj.so +%{_libdir}/cmake/proj/ +%{_libdir}/cmake/proj4/ +%{_libdir}/pkgconfig/%{name}.pc + +%files data +%doc README.md +%dir %{_docdir}/%{name}/ +%doc %{_docdir}/%{name}/AUTHORS.md +%doc %{_docdir}/%{name}/NEWS.md +%license %{_docdir}/%{name}/COPYING %dir %{_datadir}/%{name} %{_datadir}/%{name}/CH %{_datadir}/%{name}/GL27 %{_datadir}/%{name}/ITRF2000 %{_datadir}/%{name}/ITRF2008 %{_datadir}/%{name}/ITRF2014 +%{_datadir}/%{name}/ITRF2020 %{_datadir}/%{name}/nad.lst %{_datadir}/%{name}/nad27 %{_datadir}/%{name}/nad83 @@ -229,17 +315,117 @@ tar -xf %{SOURCE1} --directory %{buildroot}%{_datadir}/%{name} %{_datadir}/%{name}/deformation_model.schema.json %{_datadir}/%{name}/projjson.schema.json %{_datadir}/%{name}/triangulation.schema.json +%{_mandir}/man1/*.1* -%files devel -%{_includedir}/*.h -%{_includedir}/proj/ -%{_libdir}/libproj.so -%{_libdir}/cmake/proj/ -%{_libdir}/cmake/proj4/ -%{_libdir}/pkgconfig/%{name}.pc +%if %{with mingw} +%files -n mingw32-%{name} +%license COPYING +%{mingw32_bindir}/libproj_9.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/ +%{mingw32_datadir}/%{name}/ + +%files -n mingw64-%{name} +%license COPYING +%{mingw64_bindir}/libproj_9.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/ +%{mingw64_datadir}/%{name}/ +%endif %changelog +* Sat Dec 28 2024 Arkady L. Shane - 9.5.0-1 +- Rebuilt for MSVSphere 10 + +* Mon Sep 16 2024 Sandro Mani - 9.5.0-1 +- Update to 9.5.0 + +* Sun Sep 01 2024 Markus Neteler - 9.4.1-3 +- SPDX migration of proj-data + +* Fri Jul 19 2024 Fedora Release Engineering - 9.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Mon Jun 03 2024 Sandro Mani - 9.4.1-1 +- Update to 9.4.1 + +* Mon May 27 2024 Sandro Mani - 9.4.0-2 +- Fix doc dir ownership + +* Tue Mar 05 2024 Sandro Mani - 9.4.0-1 +- Update to 9.4.0 + +* Fri Jan 26 2024 Fedora Release Engineering - 9.3.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 9.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Dec 03 2023 Sandro Mani - 9.3.1-1 +- Update to 9.3.1 + +* Sat Sep 02 2023 Sandro Mani - 9.3.0-1 +- Update to 9.3.0 + +* Fri Jul 21 2023 Fedora Release Engineering - 9.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jun 02 2023 Sandro Mani - 9.2.1-1 +- Update to 9.2.1 + +* Tue May 09 2023 Markus Neteler - 9.2.0-2 +- SPDX migration + +* Sat Mar 04 2023 Sandro Mani - 9.2.0-1 +- Update to 9.2.0 + +* Fri Jan 20 2023 Fedora Release Engineering - 9.1.1-1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Dec 02 2022 Sandro Mani - 9.1.1-1 +- Update to 9.1.1 + +* Sun Sep 04 2022 Sandro Mani - 9.1.0-1 +- Update to 9.1.0 + +* Fri Jul 22 2022 Fedora Release Engineering - 9.0.1-1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jun 16 2022 Sandro Mani - 9.0.1-1 +- Update to 9.0.1 + +* Fri Mar 25 2022 Sandro Mani - 9.0.0-2 +- Rebuild with mingw-gcc-12 + +* Thu Mar 03 2022 Sandro Mani - 9.0.0-1 +- Update to 9.0.0 + +* Thu Feb 24 2022 Sandro Mani - 8.2.1-6 +- Make mingw subpackages noarch + +* Thu Feb 24 2022 Sandro Mani - 8.2.1-5 +- Add mingw subpackages + +* Fri Jan 21 2022 Fedora Release Engineering - 8.2.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Sun Jan 02 2022 Sandro Mani - 8.2.1-1 +- Update to 8.2.1 + +* Fri Dec 10 2021 Sandro Mani - 8.2.0-2 +- Split off -data subpackage (#2030978) + * Mon Nov 01 2021 Sandro Mani - 8.2.0-1 - Update to 8.2.0 diff --git a/sources b/sources deleted file mode 100644 index 1ae207a..0000000 --- a/sources +++ /dev/null @@ -1,2 +0,0 @@ -SHA512 (proj-8.2.0.tar.gz) = e7bcd959deeeb9130325a7bf63a8a0b8de2c55ba573065ca5ea32cf83c2c2643648760cfbe1c3bd1d2a2e74f65ceae4d9d525a537678386260fc2862b3927f5e -SHA512 (proj-data-1.8.tar.gz) = 884425c3bc09a39cb1b611264ccaa17940f4779f4e0d6023306f6b82622cdd0a2e5970a79018d499d323640acb72560789ef127ff4e0c712fa3679e5cfeb34bc