From 2f7204276709c32902a25079a5c40d49fb8809cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volker=20Fr=C3=B6hlich?= Date: Sun, 26 Jul 2015 21:35:51 +0200 Subject: [PATCH] Version 2.0.0 --- .gitignore | 2 ++ gdal-2.0.0-swig-perl.patch | 42 ++++++++++++++++++++++++++++++++++++++ gdal-cleaner.sh | 2 +- gdal.spec | 29 +++++++++++++++----------- sources | 4 ++-- 5 files changed, 64 insertions(+), 15 deletions(-) create mode 100644 gdal-2.0.0-swig-perl.patch diff --git a/.gitignore b/.gitignore index 7846640..37caa88 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,5 @@ gdalautotest-1.7.0.tar.gz /gdalautotest-1.11.1.tar.gz /gdalautotest-1.11.2.tar.gz /gdal-1.11.2-fedora.tar.xz +/gdal-2.0.0-fedora.tar.xz +/gdalautotest-2.0.0.tar.gz diff --git a/gdal-2.0.0-swig-perl.patch b/gdal-2.0.0-swig-perl.patch new file mode 100644 index 0000000..d7aabdf --- /dev/null +++ b/gdal-2.0.0-swig-perl.patch @@ -0,0 +1,42 @@ +--- gdal-2.0.0/swig/include/perl/ogr_perl.i 2015-06-14 21:06:33.000000000 +0200 ++++ gdal-2.0.0-fedora/swig/include/perl/ogr_perl.i 2015-06-24 00:04:22.935551746 +0200 +@@ -109,11 +109,11 @@ + + } + +-# wrapped data source methods: ++/* wrapped data source methods: */ + %rename (_GetDriver) GetDriver; + %rename (_TestCapability) TestCapability; + +-# wrapped layer methods: ++/* wrapped layer methods: */ + %rename (_ReleaseResultSet) ReleaseResultSet; + %rename (_CreateLayer) CreateLayer; + %rename (_DeleteLayer) DeleteLayer; +@@ -121,11 +121,11 @@ + %rename (_DeleteField) DeleteField; + %rename (_Validate) Validate; + +-# wrapped feature methods: ++/* wrapped feature methods: */ + %rename (_AlterFieldDefn) AlterFieldDefn; + %rename (_SetGeometry) SetGeometry; + +-# wrapped geometry methods: ++/* wrapped geometry methods: */ + %rename (_ExportToWkb) ExportToWkb; + + %perlcode %{ +diff -up gdal-2.0.0-fedora/swig/include/perl/typemaps_perl.i.format gdal-2.0.0-fedora/swig/include/perl/typemaps_perl.i +--- gdal-2.0.0-fedora/swig/include/perl/typemaps_perl.i.format 2015-06-14 13:06:33.000000000 -0600 ++++ gdal-2.0.0-fedora/swig/include/perl/typemaps_perl.i 2015-06-23 09:23:56.605781882 -0600 +@@ -146,7 +146,7 @@ + { + /* %typemap(ret) VSI_RETVAL */ + if ($1 == -1 ) { +- croak(strerror(errno)); ++ croak("%s",strerror(errno)); + } + } + diff --git a/gdal-cleaner.sh b/gdal-cleaner.sh index 41cbba5..67ae15c 100755 --- a/gdal-cleaner.sh +++ b/gdal-cleaner.sh @@ -1,6 +1,6 @@ #!/bin/bash # Volker Fröhlich -VERSION="1.11.2" +VERSION="2.0.0" tar xvf gdal-"${VERSION}".tar.xz diff --git a/gdal.spec b/gdal.spec index 7287b09..1dc3b08 100644 --- a/gdal.spec +++ b/gdal.spec @@ -25,7 +25,7 @@ %global proj_somaj 9 # Tests can be of a different version -%global testversion 1.11.2 +%global testversion 2.0.0 %global run_tests 1 %global with_spatialite 1 @@ -42,13 +42,13 @@ Name: gdal -Version: 1.11.2 -Release: 12%{?dist} +Version: 2.0.0 +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 +# Source0: http://download.osgeo.org/gdal/%%{version}/gdal-%%{version}.tar.xz # See PROVENANCE.TXT-fedora and the cleaner script for details! Source0: %{name}-%{version}-fedora.tar.xz @@ -68,9 +68,10 @@ Patch2: %{name}-jni.patch # Fedora uses Alternatives for Java Patch8: %{name}-1.9.0-java.patch -# update for poppler >= 31 -# http://trac.osgeo.org/gdal/changeset/28438/ -Patch9: %{name}-svn28438-poppler31.diff +# Perl SWIG comments and string formatting +# https://trac.osgeo.org/gdal/ticket/6039 +# https://trac.osgeo.org/gdal/ticket/6050 +Patch9: %{name}-2.0.0-swig-perl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -79,7 +80,7 @@ BuildRequires: ant BuildRequires: armadillo-devel BuildRequires: cfitsio-devel # No CharLS in EL5 -BuildRequires: CharLS-devel +#BuildRequires: CharLS-devel BuildRequires: chrpath BuildRequires: curl-devel BuildRequires: doxygen @@ -279,7 +280,7 @@ rm -r frmts/grib/degrib18/g2clib-1.0.4 %patch1 -p1 -b .g2clib~ %patch2 -p1 -b .jni~ %patch8 -p1 -b .java~ -%patch9 -p1 -b .poppler31~ +%patch9 -p1 -b .swig~ # Copy in PROVENANCE.TXT-fedora cp -p %SOURCE4 . @@ -356,9 +357,9 @@ sed -i 's|test \"$ARCH\" = \"x86_64\"|test \"$libdir\" = \"/usr/lib64\"|g' confi 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 -sed -i 's|#CHARLS_LIB = -L/path/to/charls_lib -lCharLS|CHARLS_LIB = -lCharLS|' GDALmake.opt.in +#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 +#sed -i 's|#CHARLS_LIB = -L/path/to/charls_lib -lCharLS|CHARLS_LIB = -lCharLS|' GDALmake.opt.in # Replace default plug-in dir # Solved in 2.0 @@ -778,6 +779,10 @@ popd #Or as before, using ldconfig %changelog +* Sun Jul 26 2015 Volker Froehlich - 2.0.0-1 +- Disable charls support due to build issues +- Solve a string formatting and comment errors in the Perl swig template + * Wed Jul 22 2015 Marek Kasik - 1.11.2-12 - Rebuild (poppler-0.34.0) diff --git a/sources b/sources index e0be54a..d154491 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -f639373d0709858d41997c708ca80c52 gdal-1.11.2-fedora.tar.xz -3d4cb6361005312dc86016b0b7eb57a4 gdalautotest-1.11.2.tar.gz +676fe1e87c3d3846f7eabbe10b590bb4 gdalautotest-2.0.0.tar.gz +5bf821cd8bbd1e7d21bcee3ba412fb25 gdal-2.0.0-fedora.tar.xz