From 5e1c933b74b08ea9ec7466d5f39ea30e9a798cb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Volker=20Fr=C3=B6hlich?= <volker27@gmx.at>
Date: Thu, 24 May 2012 08:32:48 +0200
Subject: [PATCH] GDAL 1.9.1 plus cleaner script

- New upstream release
- Update and slightly improve cleaner script
- Update poppler 0.20 patch
---
 clean-gdal.sh                                 | 19 --------------
 ...er020.patch => gdal-1.9.1-poppler020.patch |  7 ++----
 gdal-cleaner.sh                               | 25 +++++++++++++++++++
 gdal.spec                                     | 16 +++++++++---
 4 files changed, 39 insertions(+), 28 deletions(-)
 delete mode 100755 clean-gdal.sh
 rename gdal-1.9.0-poppler020.patch => gdal-1.9.1-poppler020.patch (95%)
 create mode 100755 gdal-cleaner.sh

diff --git a/clean-gdal.sh b/clean-gdal.sh
deleted file mode 100755
index eb2cbf7..0000000
--- a/clean-gdal.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-# Volker Fröhlich
-tar xvfz gdal-1.9.1RC2.tar.gz
-
-mv gdal-1.9.1{,-fedora} && pushd gdal-1.9.1-fedora
-
-rm data/cubewerx_extra.wkt
-rm data/esri_extra.wkt
-rm data/ecw_cs.wkt
-
-#Muss man swig wirklich löschen?
-rm -r swig/php
-rm -r frmts/bsb
-
-popd
-
-
-#TODO: Provenance reinkopieren
-
-tar cvfz gdal-1.9.1-fedora.tar.gz gdal-1.9.1-fedora
diff --git a/gdal-1.9.0-poppler020.patch b/gdal-1.9.1-poppler020.patch
similarity index 95%
rename from gdal-1.9.0-poppler020.patch
rename to gdal-1.9.1-poppler020.patch
index af43bc4..e2ad912 100644
--- a/gdal-1.9.0-poppler020.patch
+++ b/gdal-1.9.1-poppler020.patch
@@ -131,8 +131,7 @@ Index: /branches/1.9/gdal/frmts/pdf/pdfdataset.cpp
 +#endif
  #endif
  
-@@ -570,7 +590,11 @@
-     GooString* poUserPwd = NULL;
+@@ -567,5 +587,9 @@
  
      /* Set custom error handler for poppler errors */
 +#ifdef POPPLER_0_20_OR_LATER
@@ -141,9 +140,7 @@ Index: /branches/1.9/gdal/frmts/pdf/pdfdataset.cpp
      setErrorFunction(PDFDatasetErrorFunction);
 +#endif
  
-     PDFDoc* poDoc = NULL;
-     ObjectAutoFree oObj;
-
+     /* poppler global variable */
 Index: /branches/1.9/gdal/frmts/pdf/makefile.vc
 ===================================================================
 --- /branches/1.9/gdal/frmts/pdf/makefile.vc	(revision 22493)
diff --git a/gdal-cleaner.sh b/gdal-cleaner.sh
new file mode 100755
index 0000000..3681315
--- /dev/null
+++ b/gdal-cleaner.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+# Volker Fröhlich
+VERSION="1.9.1"
+
+tar xvfz gdal-"${VERSION}".tar.gz
+
+mv gdal-"${VERSION}"{,-fedora} && pushd gdal-"${VERSION}"-fedora
+
+rm data/cubewerx_extra.wkt
+rm data/esri_extra.wkt
+rm data/esri_Wisconsin_extra.wkt
+rm data/esri_StatePlane_extra.wkt
+rm data/ecw_cs.wkt
+
+rm -r frmts/bsb
+
+#Really necessary?
+rm -r swig/php
+
+popd
+
+
+#TODO: Insert Provenance file
+
+tar cvfz gdal-"${VERSION}"-fedora.tar.gz gdal-"${VERSION}"-fedora
diff --git a/gdal.spec b/gdal.spec
index fd2df85..fa4759d 100644
--- a/gdal.spec
+++ b/gdal.spec
@@ -29,25 +29,28 @@
 
 
 Name:      gdal
-Version:   1.9.0
-Release:   5%{?dist}
+Version:   1.9.1
+Release:   1%{?dist}
 Summary:   GIS file format library
 Group:     System Environment/Libraries
 License:   MIT
 URL:       http://www.gdal.org
 # Source0:   http://download.osgeo.org/gdal/gdal-%%{version}.tar.gz
-# See PROVENANCE.TXT-fedora for details!
+# See PROVENANCE.TXT-fedora and the cleaner script for details!
 
 Source0:   %{name}-%{version}-fedora.tar.gz
 Source1:   http://download.osgeo.org/%{name}/%{name}autotest-%{testversion}.tar.gz
 Source2:   %{name}.pom
 
+# Cleaner script for the tarball
+Source3:   %{name}-cleaner.sh
+
 # Patch to use system g2clib
 Patch1:    %{name}-g2clib.patch
 
 # Support poppler 0.20
 # http://trac.osgeo.org/gdal/ticket/4668
-Patch2:    %{name}-1.9.0-poppler020.patch
+Patch2:    %{name}-1.9.1-poppler020.patch
 
 # http://trac.osgeo.org/gdal/changeset/24440#file0
 Patch3:    %{name}-1.9.1-java-swig.patch
@@ -785,6 +788,11 @@ rm -rf %{buildroot}
 #Or as before, using ldconfig
 
 %changelog
+* Wed May 23 2012 Volker Fröhlich <volker27@gmx.at> - 1.9.1-1
+- New upstream release
+- Update poppler patch
+- Add cleaner script
+
 * Sun May 20 2012 Volker Fröhlich <volker27@gmx.at> - 1.9.0-5
 - Patches for libpoppler 0.20, libdap 3.11.3 and swig 2.0.6