From 3e22a6c4a11f36faaff9d981b7fc0a53cd53aa2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Devrim=20G=C3=BCnd=C3=BCz?= Date: Thu, 21 May 2015 12:54:35 +0300 Subject: [PATCH] Apply patch in 1212215 for a better fix to the problem. --- gdal.spec | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/gdal.spec b/gdal.spec index c494829..81f6469 100644 --- a/gdal.spec +++ b/gdal.spec @@ -21,6 +21,8 @@ #TODO: EvenR suggested to drop Ruby bindings, as they are unmaintained # He also suggest to use --with-static-proj4 to actually link to proj, instead of dlopen()ing it. +# Major digit of the proj so version +%global proj_somaj 9 # Tests can be of a different version %global testversion 1.11.2 @@ -141,6 +143,13 @@ BuildRequires: zlib-devel # Run time dependency for gpsbabel driver Requires: gpsbabel +# proj DL-opened in ogrct.cpp, see also fix in %%prep +%if 0%{?__isa_bits} == 64 +Requires: libproj.so.%{proj_somaj}()(64bit) +%else +Requires: libproj.so.%{proj_somaj} +%endif + Requires: %{name}-libs%{?_isa} = %{version}-%{release} # Enable/disable generating refmans @@ -322,8 +331,8 @@ sed -i 's|-L\$with_geotiff\/lib -lgeotiff $LIBS|-lgeotiff $LIBS|g' configure # libproj is dlopened; upstream sources point to .so, which is usually not present # http://trac.osgeo.org/gdal/ticket/3602 -sed -i 's|libproj.so|libproj.so.9|g' ogr/ogrct.cpp - +sed -i 's|libproj.so|libproj.so.%{proj_somaj}|g' ogr/ogrct.cpp + # Fix Python installation path sed -i 's|setup.py install|setup.py install --root=%{buildroot}|' swig/python/GNUmakefile @@ -765,8 +774,8 @@ popd %changelog * Thu May 21 2015 Devrim Gündüz - 1.11.2-6 -- Fix proj soname in ogr/ogrct.cpp. Per report from Sandro Mani. - Fixes #1212215. +- Fix proj soname in ogr/ogrct.cpp. Patch from Sandro Mani + Fixes #1212215. * Sun May 17 2015 Orion Poplawski - 1.11.2-5 - Rebuild for hdf5 1.8.15