diff --git a/.gitignore b/.gitignore index d42d274..1c175cd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -proj-4.7.0.tar.gz proj-datumgrid-1.5.zip +proj-4.8.0.tar.gz diff --git a/proj-4.8.0-removeinclude.patch b/proj-4.8.0-removeinclude.patch new file mode 100644 index 0000000..dd08985 --- /dev/null +++ b/proj-4.8.0-removeinclude.patch @@ -0,0 +1,10 @@ +--- src/jniproj.c.old 2012-04-21 00:01:12.286146452 +0300 ++++ src/jniproj.c 2012-04-21 00:01:18.128146582 +0300 +@@ -49,7 +49,6 @@ + #include + #include + #include "projects.h" +-#include "org_proj4_PJ.h" + #include + + #define PJ_FIELD_NAME "ptr" diff --git a/proj.spec b/proj.spec index b38bd27..5480ebe 100644 --- a/proj.spec +++ b/proj.spec @@ -1,6 +1,6 @@ Name: proj -Version: 4.7.0 -Release: 5%{?dist} +Version: 4.8.0 +Release: 1%{?dist} Summary: Cartographic projection software (PROJ.4) Group: Applications/Engineering @@ -8,6 +8,7 @@ License: MIT URL: http://proj.osgeo.org Source0: http://download.osgeo.org/proj/proj-%{version}.tar.gz Source1: http://download.osgeo.org/proj/proj-datumgrid-1.5.zip +Patch0: proj-4.8.0-removeinclude.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool @@ -55,6 +56,7 @@ This package contains additional EPSG dataset. %prep %setup -q +%patch0 -p0 # disable internal libtool to avoid hardcoded r-path for makefile in `find . -type f -name 'Makefile.in'`; do @@ -131,6 +133,7 @@ rm -rf $RPM_BUILD_ROOT %attr(0755,root,root) %{_datadir}/%{name}/test27 %attr(0755,root,root) %{_datadir}/%{name}/test83 %attr(0755,root,root) %{_datadir}/%{name}/testvarious +%attr(0755,root,root) %{_libdir}/pkgconfig/%{name}.pc %exclude %{_datadir}/%{name}/epsg %{_datadir}/%{name} @@ -140,6 +143,9 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %{_datadir}/%{name}/epsg %changelog +* Fri Apr 20 2012 Devrim GÜNDÜZ 4.8.0-1 +- Update to 4.8.0, per bz #814851 + * Sat Jan 14 2012 Fedora Release Engineering - 4.7.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index 15bd0df..f05636c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -927d34623b52e0209ba2bfcca18fe8cd proj-4.7.0.tar.gz f5bf28a2a9c6afe9a3f670f0c0adb783 proj-datumgrid-1.5.zip +d815838c92a29179298c126effbb1537 proj-4.8.0.tar.gz