diff --git a/GDALmake.opt.in.patch b/GDALmake.opt.in.patch index b8c81c2..e1400da 100644 --- a/GDALmake.opt.in.patch +++ b/GDALmake.opt.in.patch @@ -1,6 +1,6 @@ diff -rup a/GDALmake.opt.in b/GDALmake.opt.in ---- a/GDALmake.opt.in 2018-05-04 18:05:45.000000000 +0200 -+++ b/GDALmake.opt.in 2018-05-14 09:47:11.178524546 +0200 +--- a/GDALmake.opt.in 2018-09-21 11:01:50.000000000 +0200 ++++ b/GDALmake.opt.in 2018-09-29 15:21:42.993179662 +0200 @@ -67,7 +67,7 @@ INST_DOCS = @exec_prefix@/doc INST_MAN = @mandir@ INST_HTML = $(HOME)/www/gdal diff --git a/gdal-2.3.1.tar.xz b/gdal-2.3.1.tar.xz deleted file mode 100644 index f53d62b..0000000 --- a/gdal-2.3.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9c4625c45a3ee7e49a604ef221778983dd9fd8104922a87f20b99d9bedb7725a -size 8768888 diff --git a/gdal-2.3.2.tar.xz b/gdal-2.3.2.tar.xz new file mode 100644 index 0000000..61dac8a --- /dev/null +++ b/gdal-2.3.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3f6d78fe8807d1d6afb7bed27394f19467840a82bc36d65e66316fa0aa9d32a4 +size 8775760 diff --git a/gdal-fix_ecw5_detection.patch b/gdal-fix_ecw5_detection.patch deleted file mode 100644 index 49884d4..0000000 --- a/gdal-fix_ecw5_detection.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -purN gdal-2.3.1.orig/configure.ac gdal-2.3.1/configure.ac ---- gdal-2.3.1.orig/configure.ac 2018-07-17 14:10:15.236559853 +0200 -+++ gdal-2.3.1/configure.ac 2018-07-17 14:21:49.213424507 +0200 -@@ -2879,7 +2879,7 @@ else - echo "#include " > testnewabi.cpp - echo "namespace NCS { class CString { public: static std::wstring Utf8Decode (const std::string &sUtf8); }; }" >> testnewabi.cpp - echo "int main() { return static_cast(NCS::CString::Utf8Decode(std::string()).size()); }" >> testnewabi.cpp -- if test -z "`$${CXX} ${CXXFLAGS} ${CPPFLAGS} testnewabi.cpp -L$with_ecw/$ecw_license_type/lib/newabi/$ECW_ARCH/$ECW_CONF -lNCSEcw -o testnewabi 2>&1`" ; then -+ if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testnewabi.cpp -L$with_ecw/$ecw_license_type/lib/newabi/$ECW_ARCH/$ECW_CONF -lNCSEcw -o testnewabi 2>&1`" ; then - ECW_LIBDIR=$with_ecw/$ecw_license_type/lib/newabi/$ECW_ARCH/$ECW_CONF - ECW_LIBS="-L$ECW_LIBDIR -lNCSEcw $ECW_FRAMEWORK_COCOA" - with_ecw=$with_ecw/$ecw_license_type diff --git a/gdal.changes b/gdal.changes index 86743a2..872992c 100644 --- a/gdal.changes +++ b/gdal.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Sat Sep 29 13:11:22 UTC 2018 - Bruno Friedmann + +- Update to new bugfix 2.3.2 version + See details https://trac.osgeo.org/gdal/wiki/Release/2.3.2-News + This adds 65 bug fixes on top of 2.3.1. + The C and C++ API and ABI are unchanged. +- Packaging: + + spec-cleaner -m -i URL and Requires order changes + + Remove patch gdal-fix_ecw5_detection.patch (merged upstream) + + Redone patch GDALmake.opt.in.patch with version 2.3.2 + ------------------------------------------------------------------- Tue Jul 31 06:29:53 UTC 2018 - bruno@ioda-net.ch diff --git a/gdal.spec b/gdal.spec index e4e7134..5e68522 100644 --- a/gdal.spec +++ b/gdal.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -24,28 +24,23 @@ %bcond_with ecw5_support %bcond_with fgdb_support Name: gdal -Version: 2.3.1 +Version: 2.3.2 Release: 0 Summary: GDAL/OGR - a translator library for raster and vector geospatial data formats License: MIT AND BSD-3-Clause AND SUSE-Public-Domain Group: Development/Libraries/C and C++ -Url: http://www.gdal.org/ +URL: http://www.gdal.org/ Source0: http://download.osgeo.org/%{name}/%{version}/%{sourcename}-%{version}.tar.xz Patch0: gdal-perl.patch # Fix occasional parallel build failure Patch1: GDALmake.opt.in.patch -# PATCH-FIX-UPSTREAM - gdal-fix_ecw5_detection.patch: fix ECW5 detection in configure -Patch3: gdal-fix_ecw5_detection.patch +BuildRequires: KEALib-devel BuildRequires: blas-devel BuildRequires: chrpath BuildRequires: curl-devel BuildRequires: dos2unix BuildRequires: doxygen >= 1.4.2 BuildRequires: fdupes -%if %{with fgdb_support} -BuildRequires: filegdb_api-devel -%endif -BuildRequires: KEALib-devel BuildRequires: gcc-c++ BuildRequires: geos-devel >= 3 BuildRequires: giflib-devel @@ -80,6 +75,9 @@ BuildRequires: pkgconfig(spatialite) BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(xerces-c) BuildRequires: pkgconfig(zlib) >= 1.1.4 +%if %{with fgdb_support} +BuildRequires: filegdb_api-devel +%endif %if %{with ecw5_support} BuildRequires: ERDAS-ECW_JPEG_2000_SDK-devel %else @@ -120,9 +118,9 @@ vector data. Summary: GDAL library header files Group: Development/Languages/C and C++ Requires: lib%{name}%{soversion} = %{version} +Requires: pkgconfig(libopenjp2) Provides: lib%{name}%{soversion}-devel Provides: lib%{name}-devel -Requires: pkgconfig(libopenjp2) %description devel Development Libraries for the GDAL file format library @@ -170,7 +168,6 @@ The GDAL python modules provide support to handle multiple GIS file formats. %setup -q -n %{sourcename}-%{version} %patch0 -p1 %patch1 -p1 -%patch3 -p1 # Set the right (build) libproj.so version PROJSOVER=$(ls -1 %_libdir/libproj.so.?? | awk -F '.' '{print $3}') @@ -189,7 +186,7 @@ done find . -iname "*.py" -exec sed -i 's,^#!%{_bindir}/env python$,#!%{_bindir}/python3,' {} \; %if %{with ecw5_support} # gdal configure script looks for a given layout, so reproduce what is expected. -%if 0%{suse_version} >= 1500 +%if 0%{?suse_version} >= 1500 %define ecw_abi_conf newabi %else %define ecw_abi_conf ""