Accepting request 510338 from Application:Geo

1

OBS-URL: https://build.opensuse.org/request/show/510338
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gdal?expand=0&rev=18

gdal-2.2.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0d4c326862e0f118e17418c042c2bcd037b25abd3fb198e1fc5d40b11a9fc8ea
-size 8229284

gdal-2.2.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:927098d54083ac919a497f787b835b099e9a194f2e5444dbff901f7426b86066
+size 8231532

gdal-upstream-issue#6898-changeset#38636.patch

@@ -1,68 +0,0 @@
-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;
-   }
- %}

gdal.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Fri Jul 14 15:15:38 UTC 2017 - toddrme2178@gmail.com
+
+- Add python2-gdal provides for the python-gdal subpackage for
+  compatibility with single-spec python macros.
+
+-------------------------------------------------------------------
+Wed Jul 12 10:22:32 UTC 2017 - bruno@ioda-net.ch
+
+- New upstream bugfix release 2.2.1
+  See details https://trac.osgeo.org/gdal/wiki/Release/2.2.1-News 
+- Packaging
+  + Remove gdal-upstream-issue#6898-changeset#38636.patch merged
+
 -------------------------------------------------------------------
 Wed May 24 09:00:11 UTC 2017 - bruno@ioda-net.ch
 

gdal.spec

@@ -23,7 +23,7 @@
 %define sourcename gdal
 
 Name:           gdal
-Version:        2.2.0
+Version:        2.2.1
 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,8 +36,6 @@ Patch1:         GDALmake.opt.in.patch
 # 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
@@ -142,6 +140,7 @@ Perl bindings for GDAL - Geo::GDAL, Geo::OGR and Geo::OSR modules.
 Summary:        GDAL Python module
 Group:          Development/Languages/Python
 Requires:       %{name} = %{version}-%{release}
+Provides:       python2-%{name} = %{version}
 %py_requires
 
 %description -n python-%{name}
@@ -160,7 +159,6 @@ The GDAL python modules provide support to handle multiple GIS file formats.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 # Fix mandir
 sed -i "s|^mandir=.*|mandir='\${prefix}/share/man'|" configure