diff --git a/proj-8.2.1.tar.gz b/proj-8.2.1.tar.gz deleted file mode 100644 index 0408b8b..0000000 Binary files a/proj-8.2.1.tar.gz and /dev/null differ diff --git a/proj-9.3.0.tar.gz b/proj-9.3.0.tar.gz new file mode 100644 index 0000000..1b1dd63 Binary files /dev/null and b/proj-9.3.0.tar.gz differ diff --git a/proj.spec b/proj.spec index 2cfe178..1154cab 100644 --- a/proj.spec +++ b/proj.spec @@ -1,6 +1,6 @@ Name: proj -Version: 8.2.1 -Release: 2 +Version: 9.3.0 +Release: 1 Summary: A generic coordinate transformation software License: MIT URL: https://proj4.org @@ -8,6 +8,7 @@ Source0: http://download.osgeo.org/proj/proj-%{version}.tar.gz Source1: http://download.osgeo.org/proj/proj-datumgrid-1.7.tar.gz BuildRequires: libtool make BuildRequires: gcc-c++ sqlite-devel libtiff-devel curl-devel +BuildRequires: cmake gtest-devel >= 1.8.0 gmock-devel %description PROJ is a generic coordinate transformation software that transforms @@ -43,19 +44,17 @@ This package contains additional US and Canadian datum shift grids. %autosetup -n proj-%{version} -p1 %build -sed -i -e 's|5\:4\:5|6\:4\:6|' src/Makefile* -%configure -%make_build OPTIMIZE="$RPM_OPT_FLAGS" +%cmake -DUSE_EXTERNAL_GTEST=ON +%make_build %install -%makeinstall -tar -C %{buildroot}%{_datadir}/%{name} -xf %{SOURCE1} -find %{buildroot} -type f -name "*.la" -delete -print -# It would be good to find out where these extra files# come from: -rm -rf %{buildroot}%{_datadir}/doc/${name} +%make_install + +mkdir -p %{buildroot}%{_datadir}/%{name} +tar -xf %{SOURCE1} --directory %{buildroot}%{_datadir}/%{name} %check -./test$i %{buildroot}%{_bindir}/proj ||: +ctest %post /sbin/ldconfig @@ -63,9 +62,17 @@ rm -rf %{buildroot}%{_datadir}/doc/${name} /sbin/ldconfig %files -%doc AUTHORS COPYING -%{_bindir}/* -%{_libdir}/libproj.so.22* +%doc AUTHORS COPYING NEWS +%{_bindir}/cct +%{_bindir}/cs2cs +%{_bindir}/geod +%{_bindir}/gie +%{_bindir}/invgeod +%{_bindir}/invproj +%{_bindir}/proj +%{_bindir}/projinfo +%{_bindir}/projsync +%{_libdir}/libproj.so.25* %files help %doc NEWS README ChangeLog @@ -75,6 +82,8 @@ rm -rf %{buildroot}%{_datadir}/doc/${name} %{_includedir}/*.h %{_includedir}/proj %{_libdir}/{libproj.so,libproj.a,libproj.la} +%{_libdir}/cmake/proj/*.cmake +%{_libdir}/cmake/proj4/*.cmake %attr(0755,root,root) %{_libdir}/pkgconfig/proj.pc %files nad @@ -82,6 +91,9 @@ rm -rf %{buildroot}%{_datadir}/doc/${name} %{_datadir}/proj %changelog +* Thu Oct 19 2023 yaoxin - 9.3.0-1 +- Upgrade to 9.3.0 + * Wed Dec 14 2022 caodongxia - 8.2.1-2 - Add the compilation dependency make