Hello community, here is the log from the commit of package gdal for openSUSE:Factory checked in at 2017-07-05 23:57:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gdal (Old) and /work/SRC/openSUSE:Factory/.gdal.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gdal" Wed Jul 5 23:57:26 2017 rev:17 rq:498835 version:2.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/gdal/gdal.changes 2017-02-04 16:55:50.840912459 +0100 +++ /work/SRC/openSUSE:Factory/.gdal.new/gdal.changes 2017-07-05 23:57:28.476378554 +0200 @@ -1,0 +2,13 @@ +Wed May 24 09:00:11 UTC 2017 - [email protected] + +- New upstream release 2.2.0 + - https://trac.osgeo.org/gdal/wiki/Release/2.2.0-News +- Packaging + + add patch gdal-upstream-issue#6898-changeset#38636.patch + fixing non void return garbage in swig/perl. + + redone patches against 2.2.0 + gdal-libproj.patch + GDALmake.opt.in.patch + gdal-perl.patch + +------------------------------------------------------------------- Old: ---- gdal-2.1.3.tar.xz New: ---- gdal-2.2.0.tar.xz gdal-upstream-issue#6898-changeset#38636.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gdal.spec ++++++ --- /var/tmp/diff_new_pack.U2Tcy2/_old 2017-07-05 23:57:29.448241649 +0200 +++ /var/tmp/diff_new_pack.U2Tcy2/_new 2017-07-05 23:57:29.452241086 +0200 @@ -23,7 +23,7 @@ %define sourcename gdal Name: gdal -Version: 2.1.3 +Version: 2.2.0 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 @@ -36,6 +36,8 @@ # Fix hard coded name of libproj library # But libproj.so is valid if libproj-devel is installed ? Patch2: gdal-libproj.patch +# Upstream issue #6898 changeset #38636 +Patch3: gdal-upstream-issue#6898-changeset#38636.patch BuildRequires: blas-devel BuildRequires: chrpath BuildRequires: curl-devel @@ -44,10 +46,10 @@ BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: geos-devel >= 3 +BuildRequires: geotiff-devel >= 1.2.1 BuildRequires: giflib-devel BuildRequires: lapack-devel BuildRequires: libexpat-devel >= 1.95.0 -BuildRequires: libgeotiff-devel >= 1.2.1 # No more please we have openjpeg2 # BuildRequires: libjasper-devel # Using jasper create build error on arm, powerpc, s390 @@ -158,6 +160,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 # Fix mandir sed -i "s|^mandir=.*|mandir='\${prefix}/share/man'|" configure @@ -168,11 +171,8 @@ done %build -# need to regenerate (old one does not accpet CFLAGS) -%if 0%{?suse_version} >= 1310 -mv configure.in configure.ac +# need to regenerate (old one does not accept CFLAGS) autoreconf -fi -%endif %configure \ --prefix=%{_prefix} \ @@ -263,11 +263,13 @@ # chrpath must be removed here chmod 644 %{buildroot}%{perl_vendorarch}/auto/Geo/GDAL/Const/Const.so chmod 644 %{buildroot}%{perl_vendorarch}/auto/Geo/GDAL/GDAL.so +chmod 644 %{buildroot}%{perl_vendorarch}/auto/Geo/GNM/GNM.so chmod 644 %{buildroot}%{perl_vendorarch}/auto/Geo/OGR/OGR.so chmod 644 %{buildroot}%{perl_vendorarch}/auto/Geo/OSR/OSR.so chrpath --delete %{buildroot}%{perl_vendorarch}/auto/Geo/GDAL/Const/Const.so chrpath --delete %{buildroot}%{perl_vendorarch}/auto/Geo/GDAL/GDAL.so +chrpath --delete %{buildroot}%{perl_vendorarch}/auto/Geo/GNM/GNM.so chrpath --delete %{buildroot}%{perl_vendorarch}/auto/Geo/OGR/OGR.so chrpath --delete %{buildroot}%{perl_vendorarch}/auto/Geo/OSR/OSR.so @@ -342,11 +344,14 @@ %{_bindir}/gdaltindex %{_bindir}/gdaltransform %{_bindir}/gdalwarp +%{_bindir}/gnmanalyse +%{_bindir}/gnmmanage %{_bindir}/mkgraticule.py %{_bindir}/nearblack %{_bindir}/ogr2ogr %{_bindir}/ogrinfo %{_bindir}/ogrlineref +%{_bindir}/ogrmerge.py %{_bindir}/ogrtindex %{_bindir}/pct2rgb.py %{_bindir}/rgb2pct.py @@ -388,6 +393,7 @@ %{_mandir}/man1/ogr_utilities.1* %{_mandir}/man1/ogrinfo.1* %{_mandir}/man1/ogrlineref.1* +%{_mandir}/man1/ogrmerge.1* %{_mandir}/man1/ogrtindex.1* %{_mandir}/man1/pct2rgb.1* %{_mandir}/man1/rgb2pct.1* @@ -410,6 +416,7 @@ %{perl_vendorarch}/Geo/GDAL.pm %dir %{perl_vendorarch}/Geo/GDAL %{perl_vendorarch}/Geo/GDAL/Const.pm +%{perl_vendorarch}/Geo/GNM.pm %{perl_vendorarch}/Geo/OGR.pm %{perl_vendorarch}/Geo/OSR.pm %dir %{perl_vendorarch}/Geo @@ -418,6 +425,8 @@ %attr(755,root,root) %{perl_vendorarch}/auto/Geo/GDAL/GDAL.so %dir %{perl_vendorarch}/auto/Geo/GDAL/Const %attr(755,root,root) %{perl_vendorarch}/auto/Geo/GDAL/Const/Const.so +%dir %{perl_vendorarch}/auto/Geo/GNM +%attr(755,root,root) %{perl_vendorarch}/auto/Geo/GNM/GNM.so %dir %{perl_vendorarch}/auto/Geo/OGR %attr(755,root,root) %{perl_vendorarch}/auto/Geo/OGR/OGR.so %dir %{perl_vendorarch}/auto/Geo/OSR ++++++ GDALmake.opt.in.patch ++++++ --- /var/tmp/diff_new_pack.U2Tcy2/_old 2017-07-05 23:57:29.472238269 +0200 +++ /var/tmp/diff_new_pack.U2Tcy2/_new 2017-07-05 23:57:29.476237705 +0200 @@ -1,7 +1,7 @@ -diff -rup gdal-2.1.0-orig/GDALmake.opt.in gdal-2.1.0/GDALmake.opt.in ---- gdal-2.1.0-orig/GDALmake.opt.in 2016-04-25 20:35:57.000000000 +0300 -+++ gdal-2.1.0/GDALmake.opt.in 2016-05-10 05:25:25.988438174 +0300 -@@ -68,7 +68,7 @@ INST_DOCS = @exec_prefix@/doc +diff -rup a/GDALmake.opt.in b/GDALmake.opt.in +--- a/GDALmake.opt.in 2017-04-28 18:07:38.000000000 +0200 ++++ b/GDALmake.opt.in 2017-05-19 21:11:58.318459759 +0200 +@@ -67,7 +67,7 @@ INST_DOCS = @exec_prefix@/doc INST_MAN = @mandir@ INST_HTML = $(HOME)/www/gdal ++++++ gdal-2.1.3.tar.xz -> gdal-2.2.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/gdal/gdal-2.1.3.tar.xz /work/SRC/openSUSE:Factory/.gdal.new/gdal-2.2.0.tar.xz differ: char 26, line 1 ++++++ gdal-libproj.patch ++++++ --- /var/tmp/diff_new_pack.U2Tcy2/_old 2017-07-05 23:57:29.528230382 +0200 +++ /var/tmp/diff_new_pack.U2Tcy2/_new 2017-07-05 23:57:29.528230382 +0200 @@ -1,12 +1,12 @@ diff -rup a/ogr/ogrct.cpp b/ogr/ogrct.cpp ---- a/ogr/ogrct.cpp 2016-01-26 16:21:46.000000000 +0100 -+++ b/ogr/ogrct.cpp 2016-02-23 12:41:38.368276062 +0100 -@@ -92,7 +92,7 @@ static void (*pfn_pj_ctx_free)( projC +--- a/ogr/ogrct.cpp 2017-04-28 18:07:33.000000000 +0200 ++++ b/ogr/ogrct.cpp 2017-05-19 21:06:54.145528449 +0200 +@@ -102,7 +102,7 @@ static bool bProjLocaleSafe = false #elif defined(__APPLE__) - # define LIBNAME "libproj.dylib" + # define LIBNAME "libproj.dylib" #else --# define LIBNAME "libproj.so" -+# define LIBNAME "libproj.so.12" +-# define LIBNAME "libproj.so" ++# define LIBNAME "libproj.so.12" #endif /************************************************************************/ ++++++ gdal-perl.patch ++++++ --- /var/tmp/diff_new_pack.U2Tcy2/_old 2017-07-05 23:57:29.548227564 +0200 +++ /var/tmp/diff_new_pack.U2Tcy2/_new 2017-07-05 23:57:29.552227001 +0200 @@ -1,7 +1,7 @@ diff -rup a/swig/perl/GNUmakefile b/swig/perl/GNUmakefile ---- a/swig/perl/GNUmakefile 2015-06-14 21:06:33.000000000 +0200 -+++ b/swig/perl/GNUmakefile 2015-07-26 19:09:56.184743728 +0200 -@@ -26,7 +26,7 @@ build: gdal_wrap.cc Makefile_Geo__GDAL +--- a/swig/perl/GNUmakefile 2017-04-28 18:07:38.000000000 +0200 ++++ b/swig/perl/GNUmakefile 2017-05-19 21:09:04.906101672 +0200 +@@ -30,7 +30,7 @@ build: gdal_wrap.cc Makefile_Geo__GDAL gdal_wrap.cc: generate Makefile_Geo__GDAL: @@ -11,8 +11,8 @@ test: build $(MAKE) -f Makefile_Geo__GDAL test diff -rup a/swig/perl/Makefile b/swig/perl/Makefile ---- a/swig/perl/Makefile 2015-06-14 21:06:33.000000000 +0200 -+++ b/swig/perl/Makefile 2015-07-26 19:09:30.598745454 +0200 +--- a/swig/perl/Makefile 2017-04-28 18:07:38.000000000 +0200 ++++ b/swig/perl/Makefile 2017-05-19 21:09:20.618146109 +0200 @@ -7,7 +7,7 @@ build: Makefile_Geo__GDAL $(MAKE) -f Makefile_Geo__OSR ++++++ gdal-upstream-issue#6898-changeset#38636.patch ++++++ Index: swig/include/perl/band.i =================================================================== --- a/swig/include/perl/band.i (revision 38635) +++ b/swig/include/perl/band.i (revision 38636) @@ -4,5 +4,5 @@ double NVClassify(int comparison, double nv, AV* classifier, const char **error) { /* recursive, return nv < classifier[0] ? classifier[1] : classifier[2] - returns error if there are not three values in the classifier, + sets error if there are not three values in the classifier, first is not a number, or second or third are not a number of arrayref */ @@ -33,16 +33,13 @@ else if (t && SvROK(*t) && (SvTYPE(SvRV(*t)) == SVt_PVAV)) return NVClassify(comparison, nv, (AV*)(SvRV(*t)), error); - else { + else *error = "The decision in a classifier must be a number or a reference to a classifier."; - return 0; - } - } else { + } else *error = "The first value in a classifier must be a number."; - return 0; - } + return 0; } void NVClass(int comparison, double nv, AV* classifier, int *klass, const char **error) { - /* recursive, return nv < classifier[0] ? classifier[1] : classifier[2] - returns NULL if there are not three values in the classifier, + /* recursive, return in klass nv < classifier[0] ? classifier[1] : classifier[2] + sets error if there are not three values in the classifier, first is not a number, or second or third are not a number of arrayref */ @@ -78,12 +75,8 @@ else if (t && SvROK(*t) && (SvTYPE(SvRV(*t)) == SVt_PVAV)) NVClass(comparison, nv, (AV*)(SvRV(*t)), klass, error); - else { + else *error = "The decision in a classifier must be a number or a reference to a classifier."; - return; - } - } else { + } else *error = "The first value in a classifier must be a number."; - return; - } } AV* to_array_classifier(SV* classifier, int* comparison, const char **error) { @@ -101,6 +94,8 @@ else if (strcmp(c, ">=") == 0) *comparison = 3; - else + else { *error = "The first element in classifier object must be a comparison."; + return NULL; + } } if (s && SvROK(*s) && (SvTYPE(SvRV(*s)) == SVt_PVAV)) @@ -108,7 +103,7 @@ else *error = "The second element in classifier object must be an array reference."; - } else { + } else *error = NEED_ARRAY_REF; - } + return NULL; } %}
