From 552efb7294e952a01c7377fdb2fca19394c453d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volker=20Fr=C3=B6hlich?= Date: Mon, 4 Dec 2017 20:58:15 +0100 Subject: [PATCH] New version 2.2.3 --- .gitignore | 2 ++ gdal-2.2.3-swig-python-version.patch | 13 +++++++++++++ gdal-cleaner.sh | 2 +- gdal.spec | 14 +++++++++++--- sources | 4 ++-- 5 files changed, 29 insertions(+), 6 deletions(-) create mode 100644 gdal-2.2.3-swig-python-version.patch diff --git a/.gitignore b/.gitignore index 4a4de6f..6a4f5a1 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,5 @@ gdalautotest-1.7.0.tar.gz /gdalautotest-2.1.4.tar.gz /gdal-2.2.2-fedora.tar.xz /gdalautotest-2.2.2.tar.gz +/gdalautotest-2.2.3.tar.gz +/gdal-2.2.3-fedora.tar.xz diff --git a/gdal-2.2.3-swig-python-version.patch b/gdal-2.2.3-swig-python-version.patch new file mode 100644 index 0000000..7792bd7 --- /dev/null +++ b/gdal-2.2.3-swig-python-version.patch @@ -0,0 +1,13 @@ +diff --git a/swig/python/setup.py b/swig/python/setup.py +index 6fac6f9..b6aa52e 100644 +--- a/swig/python/setup.py ++++ b/swig/python/setup.py +@@ -7,7 +7,7 @@ + # Howard Butler hobu.inc@gmail.com + + +-gdal_version = '2.2.2' ++gdal_version = '2.2.3' + + import sys + import os diff --git a/gdal-cleaner.sh b/gdal-cleaner.sh index 82a9f76..89b0299 100755 --- a/gdal-cleaner.sh +++ b/gdal-cleaner.sh @@ -1,6 +1,6 @@ #!/bin/bash # Volker Fröhlich -VERSION="2.2.2" +VERSION="2.2.3" tar xvf gdal-"${VERSION}".tar.xz diff --git a/gdal.spec b/gdal.spec index 3889321..46c9a3e 100644 --- a/gdal.spec +++ b/gdal.spec @@ -24,7 +24,7 @@ %global proj_somaj 12 # Tests can be of a different version -%global testversion 2.2.2 +%global testversion 2.2.3 %global run_tests 0 %global compdir %(dirname $(pkg-config --variable=compatdir bash-completion)) @@ -67,8 +67,8 @@ %endif Name: gdal -Version: 2.2.2 -Release: 2%{?dist}%{?bootstrap:.%{bootstrap}.bootstrap} +Version: 2.2.3 +Release: 1%{?dist}%{?bootstrap:.%{bootstrap}.bootstrap} Summary: GIS file format library Group: System Environment/Libraries License: MIT @@ -92,6 +92,10 @@ Patch2: %{name}-jni.patch # Fix bash-completion install dir Patch3: %{name}-completion.patch +# https://trac.osgeo.org/gdal/changeset/40801/ +# Python bindings version was 2.2.2 instead of 2.2.3 +Patch5: %{name}-2.2.3-swig-python-version.patch + # Fedora uses Alternatives for Java Patch8: %{name}-1.9.0-java.patch @@ -331,6 +335,7 @@ rm -r frmts/grib/degrib18/g2clib-1.0.4 %patch1 -p1 -b .g2clib~ %patch2 -p1 -b .jni~ %patch3 -p1 -b .completion~ +%patch5 -p1 -b .python~ %patch8 -p1 -b .java~ %patch9 -p1 -b .zlib~ @@ -880,6 +885,9 @@ popd #Or as before, using ldconfig %changelog +* Mon Dec 04 2017 Volker Froehlich - 2.2.3-1 +- New upstream release + * Wed Nov 29 2017 Volker Froehlich - 2.2.2-2 - Re-enable bsb format (BZ#1432330) diff --git a/sources b/sources index 4b60d2c..0c87173 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (gdalautotest-2.2.2.tar.gz) = 7379244673d73ce2ea7b284c1447b1a5eb5fb53a6acd3ca33a45c605b804d952a63bb31831b67db8c2df900a73493f86366413f720e776234591ea9a7495da94 -SHA512 (gdal-2.2.2-fedora.tar.xz) = 9c916ba63a2ab8705e5d59301701d228d9f50b6449f3fa02f0d326084917fcf21aa3205a6baacd76da511988c8b0c775dd1604250495dd3c512b07408fdd2a01 +SHA512 (gdalautotest-2.2.3.tar.gz) = f38511cbeff87ff1a6a441703d675db5c8b278d508749897d393530e0e7bc9455e6ed01c065c6b011e20a335dca866b24e6d9638ce31a2488290c938a32b76ba +SHA512 (gdal-2.2.3-fedora.tar.xz) = 896e70367c06254b3785bab2c9fc57450a98ffa9aee66b44f75a8755f2afa7b5d2d2dbfd4dc9ce244f2b1d88835017a86f8c7a800fffa4d56a4be9293b7f7d0d