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 e379263..2880e9b 100644 --- a/gdal.changes +++ b/gdal.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue Mar 10 10:35:47 UTC 2015 - schubert.seb@gmail.com + +- Fix hard coded proj4 library name + * gdal-libproj.patch + +------------------------------------------------------------------- +Sun Mar 8 20:39:00 UTC 2015 - mpluskal@suse.com + +- Update perl package dependencies + ------------------------------------------------------------------- Mon Feb 9 16:46:37 UTC 2015 - mpluskal@suse.com diff --git a/gdal.spec b/gdal.spec index 3133e61..1cde685 100644 --- a/gdal.spec +++ b/gdal.spec @@ -1,7 +1,7 @@ # # spec file for package gdal # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -29,8 +29,11 @@ Patch0: gdal-python_install.patch Patch1: gdal-configure.patch Patch2: gdal-perl.patch # Fix occasional paralle build failure -Patch3: GDALmake.opt.in.patch +Patch3: GDALmake.opt.in.patch +# Fix hard coded name of libproj library +Patch4: gdal-libproj.patch BuildRequires: blas-devel +BuildRequires: chrpath BuildRequires: curl-devel BuildRequires: doxygen >= 1.4.2 BuildRequires: fdupes @@ -47,6 +50,7 @@ BuildRequires: libproj-devel BuildRequires: libspatialite-devel BuildRequires: libtiff-devel >= 3.6.0 BuildRequires: libtool +BuildRequires: libxerces-c-devel BuildRequires: netcdf-devel BuildRequires: openjpeg2-devel BuildRequires: poppler-devel @@ -57,20 +61,18 @@ BuildRequires: sqlite-devel >= 3 BuildRequires: swig BuildRequires: unixODBC-devel BuildRequires: zlib-devel >= 1.1.4 -BuildRequires: chrpath -BuildRequires: libxerces-c-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{with ecw_support} BuildRequires: libecwj2-devel %endif %if 0%{?suse_version} >= 1310 -BuildRequires: hdf5-devel BuildRequires: autoconf BuildRequires: automake +BuildRequires: hdf5-devel %endif %if 0%{?suse_version} > 1310 && 0%{?suse_version} != 1315 -BuildRequires: perl-ExtUtils-MakeMaker BuildRequires: libwebp-devel +BuildRequires: perl-ExtUtils-MakeMaker %else BuildRequires: hdf-devel >= 4.0 %endif @@ -105,8 +107,11 @@ application for all supported formats. Summary: Perl bindings for GDAL Group: Development/Languages/Perl Requires: %{name} = %{version}-%{release} +%if 0%{?suse_version} < 1140 Requires: perl = %{perl_version} -Requires: perl-base +%else +%{perl_requires} +%endif %description -n perl-gdal Perl bindings for GDAL - Geo::GDAL, Geo::OGR and Geo::OSR modules. @@ -126,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}