SHA256
1
0
forked from pool/gdal

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
This commit is contained in:
Martin Pluskal 2015-03-10 11:28:50 +00:00 committed by Git OBS Bridge
parent bbdf099cb6
commit 7d818e716c
3 changed files with 19 additions and 0 deletions

11
gdal-libproj.patch Normal file
View File

@ -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
/************************************************************************/

View File

@ -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

View File

@ -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}