From 1f3d6400063826b2053db7227183cf32c8cd8fb0 Mon Sep 17 00:00:00 2001
From: Volker Froehlich <volker27@gmx.at>
Date: Thu, 4 Feb 2016 19:16:48 +0100
Subject: [PATCH] New version 2.0.2; Fix geos support (#BZ1284714)

---
 .gitignore      |  3 +++
 gdal-cleaner.sh |  2 +-
 gdal.spec       | 19 ++++++++++++-------
 sources         |  4 ++--
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index b497907..0a9b7d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,6 @@ gdalautotest-1.7.0.tar.gz
 /gdalautotest-2.0.0.tar.gz
 /gdalautotest-2.0.1.tar.gz
 /gdal-2.0.1-fedora.tar.xz
+/gdalautotest-2.0.2.tar.gz
+/gdalautotest-1.11.3.tar.gz
+/gdal-2.0.2-fedora.tar.xz
diff --git a/gdal-cleaner.sh b/gdal-cleaner.sh
index bc1d04b..bc1b00f 100755
--- a/gdal-cleaner.sh
+++ b/gdal-cleaner.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Volker Fröhlich
-VERSION="2.0.1"
+VERSION="2.0.2"
 
 tar xvf gdal-"${VERSION}".tar.xz
 
diff --git a/gdal.spec b/gdal.spec
index 8e9c490..0e74e95 100644
--- a/gdal.spec
+++ b/gdal.spec
@@ -24,7 +24,7 @@
 %global proj_somaj 9
 
 # Tests can be of a different version
-%global testversion 2.0.1
+%global testversion 2.0.2
 %global run_tests 1
 
 %global with_spatialite 1
@@ -41,8 +41,8 @@
 
 
 Name:      gdal
-Version:   2.0.1
-Release:   6%{?dist}
+Version:   2.0.2
+Release:   1%{?dist}
 Summary:   GIS file format library
 Group:     System Environment/Libraries
 License:   MIT
@@ -355,6 +355,10 @@ sed -i 's|test \"$ARCH\" = \"x86_64\"|test \"$libdir\" = \"/usr/lib64\"|g' confi
 # Fix mandir
 sed -i "s|^mandir=.*|mandir='\${prefix}/share/man'|" configure
 
+# Add our custom cflags when trying to find geos
+# https://bugzilla.redhat.com/show_bug.cgi?id=1284714
+sed -i 's|CFLAGS=\"${GEOS_CFLAGS}\"|CFLAGS=\"${CFLAGS} ${GEOS_CFLAGS}\"|g' configure
+
 # Activate support for JPEGLS
 #sed -i 's|^#HAVE_CHARLS|HAVE_CHARLS|' GDALmake.opt.in
 #sed -i 's|#CHARLS_INC = -I/path/to/charls_include|CHARLS_INC = -I%{_includedir}/CharLS|' GDALmake.opt.in
@@ -369,10 +373,6 @@ sed -i "s|^mandir=.*|mandir='\${prefix}/share/man'|" configure
     ogr/ogrsf_frmts/generic/ogrsfdriverregistrar.cpp
 %endif
 
-# Remove man dir, as it blocks a build target.
-# It obviously slipped into the tarball and is not in Trunk (April 17th, 2011)
-#rm -rf man
-
 
 %build
 #TODO: Couldn't I have modified that in the prep section?
@@ -665,6 +665,7 @@ for f in 'GDAL*' BandProperty ColorAssociation CutlineTransformer DatasetPropert
 done
 #TODO: What's that?
 rm -f %{buildroot}%{_mandir}/man1/*_%{name}-%{version}-fedora_apps_*
+rm -f %{buildroot}%{_mandir}/man1/_home_rouault_dist_wrk_gdal_apps_.1*
 
 %check
 %if %{run_tests}
@@ -794,6 +795,10 @@ popd
 #Or as before, using ldconfig
 
 %changelog
+* Thu Feb 04 2016 Volker Froehlich <volker27@gmx.at> - 2.0.2-1
+- New upstream release
+- Fix geos support (BZ #1284714)
+
 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
diff --git a/sources b/sources
index bae32cc..822b759 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-d322e6a93d7a2817adb77d6997c30fc8  gdalautotest-2.0.1.tar.gz
-c102814db78ec8b0609f4a6be121edeb  gdal-2.0.1-fedora.tar.xz
+bd112b6415544d4d67bdb12703f2cf1d  gdalautotest-2.0.2.tar.gz
+2b7ab131f610b7ffc6328d1144e0014f  gdal-2.0.2-fedora.tar.xz