From 7d818e716cf39e24ab9ebd24faefdabe9ce191e0988ff1976f8e40928ff82c36 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 10 Mar 2015 11:28:50 +0000 Subject: [PATCH] Accepting request 290134 from home:sebschub:branches:Application:Geo The library name of proj4 is hard coded in one file and does not correspond to openSUSE's proj4 package. This is fixed here. OBS-URL: https://build.opensuse.org/request/show/290134 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/gdal?expand=0&rev=6 --- gdal-libproj.patch | 11 +++++++++++ gdal.changes | 5 +++++ gdal.spec | 3 +++ 3 files changed, 19 insertions(+) create mode 100644 gdal-libproj.patch diff --git a/gdal-libproj.patch b/gdal-libproj.patch new file mode 100644 index 0000000..7b21d14 --- /dev/null +++ b/gdal-libproj.patch @@ -0,0 +1,11 @@ +--- ogr/ogrct.cpp 2014-09-24 15:47:42.000000000 +0200 ++++ ogr/ogrct.cpp_new 2015-03-10 11:09:34.135358433 +0100 +@@ -92,7 +92,7 @@ + #elif defined(__APPLE__) + # define LIBNAME "libproj.dylib" + #else +-# define LIBNAME "libproj.so" ++# define LIBNAME "libproj.so.0" + #endif + + /************************************************************************/ diff --git a/gdal.changes b/gdal.changes index 2d6c9a0..7152fd3 100644 --- a/gdal.changes +++ b/gdal.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 10 10:35:47 UTC 2015 - schubert.seb@gmail.com + +- Fix hard coded proj4 library name + ------------------------------------------------------------------- Sun Mar 8 20:39:00 UTC 2015 - mpluskal@suse.com diff --git a/gdal.spec b/gdal.spec index 96aecd3..1cde685 100644 --- a/gdal.spec +++ b/gdal.spec @@ -30,6 +30,8 @@ Patch1: gdal-configure.patch Patch2: gdal-perl.patch # Fix occasional paralle build failure Patch3: GDALmake.opt.in.patch +# Fix hard coded name of libproj library +Patch4: gdal-libproj.patch BuildRequires: blas-devel BuildRequires: chrpath BuildRequires: curl-devel @@ -129,6 +131,7 @@ The GDAL python modules provide support to handle multiple GIS file formats. %patch1 %patch2 -p1 %patch3 -p0 +%patch4 -p0 # need to regenerate (old ones don't support perl 5.10) rm swig/perl/{gdal_wrap.cpp,gdalconst_wrap.c,ogr_wrap.cpp,osr_wrap.cpp}