[gdal] Update to 1.10.0

[Orion Poplawski]

commit cec008e961697f4b66b15795de5082df35db445a
Author: Orion Poplawski <orion at nwra.com>
Date:   Fri Aug 23 12:29:48 2013 -0600

    Update to 1.10.0
    
    - Enable PCRE support
    - Drop man patch applied upstream
    - Drop dods patch fixed upstream
    - Add more tex BRs to handle changes in texlive packaging
    - Fix man page install location

 .gitignore                   |    1 +
 gdal-1.9.0-man.patch         |   11 -----------
 gdal-1.9.1-dods-3.11.3.patch |   14 --------------
 gdal-cleaner.sh              |    2 +-
 gdal.spec                    |   41 ++++++++++++++++++++++++++++-------------
 sources                      |    2 +-
 6 files changed, 31 insertions(+), 40 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a219059..ebdc254 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ gdalautotest-1.7.0.tar.gz
 /gdalautotest-1.9.0.tar.gz
 /gdal-1.9.1-fedora.tar.gz
 /gdal-1.9.2-fedora.tar.gz
+/gdal-1.10.0-fedora.tar.gz
diff --git a/gdal-cleaner.sh b/gdal-cleaner.sh
index 8a0d644..0cbd22d 100755
--- a/gdal-cleaner.sh
+++ b/gdal-cleaner.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Volker Fröhlich
-VERSION="1.9.2"
+VERSION="1.10.0"
 
 tar xvfz gdal-"${VERSION}".tar.gz
 
diff --git a/gdal.spec b/gdal.spec
index a93ef67..59d7b6a 100644
--- a/gdal.spec
+++ b/gdal.spec
@@ -32,8 +32,8 @@
 
 
 Name:      gdal
-Version:   1.9.2
-Release:   12%{?dist}
+Version:   1.10.0
+Release:   1%{?dist}
 Summary:   GIS file format library
 Group:     System Environment/Libraries
 License:   MIT
@@ -55,15 +55,9 @@ Patch1:    %{name}-g2clib.patch
 # Patch for Fedora JNI library location
 Patch2:    %{name}-jni.patch
 
-Patch4:    %{name}-1.9.1-dods-3.11.3.patch
-
 # Fedora uses Alternatives for Java
 Patch8:    %{name}-1.9.0-java.patch
 
-# Make man a phony buildtarget; the directory otherwise blocks it
-# Should be solved in 2.0
-Patch9:    %{name}-1.9.0-man.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: ant
@@ -109,6 +103,7 @@ BuildRequires: libdap-devel
 BuildRequires: librx-devel
 BuildRequires: mysql-devel
 BuildRequires: numpy
+BuildRequires: pcre-devel
 #BuildRequires: ogdi-devel
 BuildRequires: perl(ExtUtils::MakeMaker)
 BuildRequires: pkgconfig
@@ -120,7 +115,18 @@ BuildRequires: ruby
 BuildRequires: ruby-devel
 BuildRequires: sqlite-devel
 BuildRequires: swig
-BuildRequires: tetex-latex
+BuildRequires: texlive-latex
+%if 0%{?fedora} >= 20
+BuildRequires: texlive-collection-fontsrecommended
+BuildRequires: texlive-collection-langcyrillic
+BuildRequires: texlive-collection-langportuguese
+BuildRequires: texlive-collection-latex
+BuildRequires: texlive-epstopdf
+BuildRequires: tex(multirow.sty)
+BuildRequires: tex(sectsty.sty)
+BuildRequires: tex(tocloft.sty)
+BuildRequires: tex(xtab.sty)
+%endif
 BuildRequires: unixODBC-devel
 BuildRequires: xerces-c-devel
 BuildRequires: xz-devel
@@ -277,9 +283,7 @@ rm -r frmts/grib/degrib18/g2clib-1.0.4
 
 %patch1 -p1 -b .g2clib~
 %patch2 -p1 -b .jni~
-%patch4 -p1 -b .dods~
 %patch8 -p1 -b .java~
-%patch9 -p1 -b .man~
 
 # Copy in PROVENANCE.TXT-fedora
 cp %SOURCE4 .
@@ -363,6 +367,9 @@ sed -i 's|test \"$ARCH\" = \"x86_64\"|test \"$libdir\" = \"/usr/lib64\"|g' confi
   sed -i 's|with_dods_root/lib|with_dods_root/lib64|' configure
 %endif
 
+# Fix mandir
+sed -i "s|^mandir=.*|mandir='\${prefix}/share/man'|" 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
@@ -642,8 +649,7 @@ touch -r NEWS %{buildroot}%{_bindir}/%{name}-config
 chmod 755 %{buildroot}%{_bindir}/%{name}-config
 
 # Clean up junk
-rm -f %{buildroot}%{_bindir}/gdal_sieve.dox
-rm -f %{buildroot}%{_bindir}/gdal_fillnodata.dox
+rm -f %{buildroot}%{_bindir}/*.dox
 
 #jni-libs and libgdal are also built static (*.a)
 #.exists and .packlist stem from Perl
@@ -709,6 +715,7 @@ popd
 %{_bindir}/gdal_grid
 %{_bindir}/gdalenhance
 %{_bindir}/gdalmanage
+%{_bindir}/gdalserver
 %{_bindir}/gdalsrsinfo
 %{_bindir}/gdaltransform
 %{_bindir}/nearblack
@@ -789,6 +796,14 @@ popd
 #Or as before, using ldconfig
 
 %changelog
+* Fri Aug 23 2013 Orion Poplawski <orion at cora.nwra.com> - 1.10.0-1
+- Update to 1.10.0
+- Enable PCRE support
+- Drop man patch applied upstream
+- Drop dods patch fixed upstream
+- Add more tex BRs to handle changes in texlive packaging
+- Fix man page install location
+
 * Mon Aug 19 2013 Marek Kasik <mkasik at redhat.com> - 1.9.2-12
 - Rebuild (poppler-0.24.0)
 
diff --git a/sources b/sources
index 8cbf7d4..c717e1e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-1cc5e615ee5bcf32f4f2999e9021042e  gdal-1.9.2-fedora.tar.gz
+85d68854e69903e94510030411183732  gdal-1.10.0-fedora.tar.gz
 0d1e425b45465f64f6d1f32790d8bea0  gdalautotest-1.9.0.tar.gz