From 4e672cbba4274f16b9688ccf3c0e7b7f4111cae53ad7caec9a4f6e5f2d31f200 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Thu, 12 Jul 2018 09:00:00 +0000 Subject: [PATCH] - Update to version 5.1.0 and datumgrid 1.7 * See provided NEWS for list of all changes OBS-URL: https://build.opensuse.org/package/show/Application:Geo/proj?expand=0&rev=27 --- proj-4.9.3.tar.gz | 3 -- proj-5.1.0.tar.gz | 3 ++ proj-datumgrid-1.6.zip | 3 -- proj-datumgrid-1.7.zip | 3 ++ proj.changes | 6 ++++ proj.spec | 71 ++++++++++++++++++++++-------------------- 6 files changed, 50 insertions(+), 39 deletions(-) delete mode 100644 proj-4.9.3.tar.gz create mode 100644 proj-5.1.0.tar.gz delete mode 100644 proj-datumgrid-1.6.zip create mode 100644 proj-datumgrid-1.7.zip diff --git a/proj-4.9.3.tar.gz b/proj-4.9.3.tar.gz deleted file mode 100644 index a031367..0000000 --- a/proj-4.9.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6984542fea333488de5c82eea58d699e4aff4b359200a9971537cd7e047185f7 -size 921448 diff --git a/proj-5.1.0.tar.gz b/proj-5.1.0.tar.gz new file mode 100644 index 0000000..c29e1a7 --- /dev/null +++ b/proj-5.1.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6b1379a53317d9b5b8c723c1dc7bf2e3a8eb22ceb46b8807a1ce48ef65685bb3 +size 1006324 diff --git a/proj-datumgrid-1.6.zip b/proj-datumgrid-1.6.zip deleted file mode 100644 index 1e7f0cb..0000000 --- a/proj-datumgrid-1.6.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:054e7b63b474926c79f25fbe5cd8760351e8d93e5a167b5473e993c01bb08866 -size 2766762 diff --git a/proj-datumgrid-1.7.zip b/proj-datumgrid-1.7.zip new file mode 100644 index 0000000..76c439c --- /dev/null +++ b/proj-datumgrid-1.7.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ffcad4453fac3b4a13ca678ef343e688496e18019f35709ef03c5f200e9fb85a +size 6601627 diff --git a/proj.changes b/proj.changes index e6dcfb8..243a006 100644 --- a/proj.changes +++ b/proj.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jul 12 08:45:57 UTC 2018 - mpluskal@suse.com + +- Update to version 5.1.0 and datumgrid 1.7 + * See provided NEWS for list of all changes + ------------------------------------------------------------------- Sun Oct 2 09:00:00 UTC 2016 - tzotsos@opensuse.org diff --git a/proj.spec b/proj.spec index c673925..b3c9109 100644 --- a/proj.spec +++ b/proj.spec @@ -1,7 +1,7 @@ # # spec file for package proj # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,45 +16,48 @@ # -%define libname lib%{name}12 +%define gridver 1.7 +%define sover 13 +%define libname lib%{name}%{sover} Name: proj -Version: 4.9.3 +Version: 5.1.0 Release: 0 Summary: Cartographic projection software License: MIT Group: Productivity/Scientific/Other -Url: https://trac.osgeo.org/proj/ +URL: https://trac.osgeo.org/proj/ Source0: http://download.osgeo.org/proj/%{name}-%{version}.tar.gz -Source1: http://download.osgeo.org/proj/%{name}-datumgrid-1.6.zip +Source1: http://download.osgeo.org/proj/%{name}-datumgrid-%{gridver}.zip BuildRequires: pkgconfig BuildRequires: unzip Provides: libproj = %{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build - -%package -n %{libname} -Summary: Cartographic projection software -Group: Development/Libraries/C and C++ - -%package -n libproj-devel -Summary: Development files for PROJ -Group: Development/Libraries/C and C++ -Requires: %{libname} = %{version} - -%description -n %{libname} -This package the library for performing respective -forward and inverse transformation of cartographic data to or from cartesian -data with a wide range of selectable projection functions. %description This package offers the commandline tools for performing respective forward and inverse transformation of cartographic data to or from cartesian data with a wide range of selectable projection functions. -%description -n libproj-devel +%package -n %{libname} +Summary: Cartographic projection software +Group: Development/Libraries/C and C++ + +%description -n %{libname} +This package the library for performing respective +forward and inverse transformation of cartographic data to or from cartesian +data with a wide range of selectable projection functions. + +%package devel +Summary: Development files for PROJ +Group: Development/Libraries/C and C++ +Requires: %{libname} = %{version} +Provides: libproj-devel = %{version} +Obsoletes: libproj-devel < %{version} + +%description devel This package contains libproj and the appropriate header files and man pages. %prep -%setup -q -n %{name}-%{version} +%setup -q cd nad unzip -o %{SOURCE1} @@ -72,31 +75,33 @@ install -D -p -m 0644 src/projects.h %{buildroot}/%{_includedir}/projects.h %postun -n %{libname} -p /sbin/ldconfig %files -%defattr(-,root,root) -%doc NEWS AUTHORS COPYING README ChangeLog +%doc NEWS AUTHORS README ChangeLog %defattr(0755,root,root) %{_bindir}/cs2cs +%{_bindir}/cct +%{_bindir}/gie %{_bindir}/geod %{_bindir}/invgeod %{_bindir}/invproj %{_bindir}/nad2bin %{_bindir}/proj %defattr(0644,root,root) -%{_mandir}/man1/cs2cs.1%{ext_man} -%{_mandir}/man1/geod.1%{ext_man} -%{_mandir}/man1/proj.1%{ext_man} +%{_mandir}/man1/cs2cs.1%{?ext_man} +%{_mandir}/man1/geod.1%{?ext_man} +%{_mandir}/man1/proj.1%{?ext_man} +%{_mandir}/man1/cct.1%{?ext_man} +%{_mandir}/man1/gie.1%{?ext_man} %{_datadir}/proj/ %files -n %{libname} -%defattr(0644,root,root) -%{_libdir}/libproj.so.12* +%license COPYING +%{_libdir}/libproj.so.%{sover}* -%files -n libproj-devel -%defattr(0644,root,root) +%files devel %{_includedir}/*.h %{_libdir}/libproj.so %{_libdir}/pkgconfig/proj.pc -%{_mandir}/man3/geodesic.3%{ext_man} -%{_mandir}/man3/pj_init.3%{ext_man} +%{_mandir}/man3/geodesic.3%{?ext_man} +%{_mandir}/man3/pj_init.3%{?ext_man} %changelog