From abfe1e29d0b68bc17773ae2b03988ae015d38c18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volker=20Fr=C3=B6hlich?= Date: Fri, 25 Sep 2015 08:59:57 +0200 Subject: [PATCH] Update for 2.0.1 Also add manpage for Perl module --- .gitignore | 2 ++ gdal-2.0.0-swig-perl.patch | 42 ----------------------------------- gdal-2.0.0-xopen-source.patch | 11 --------- gdal-cleaner.sh | 2 +- gdal.spec | 21 ++++++------------ sources | 4 ++-- 6 files changed, 12 insertions(+), 70 deletions(-) delete mode 100644 gdal-2.0.0-swig-perl.patch delete mode 100644 gdal-2.0.0-xopen-source.patch diff --git a/.gitignore b/.gitignore index 37caa88..b497907 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,5 @@ gdalautotest-1.7.0.tar.gz /gdal-1.11.2-fedora.tar.xz /gdal-2.0.0-fedora.tar.xz /gdalautotest-2.0.0.tar.gz +/gdalautotest-2.0.1.tar.gz +/gdal-2.0.1-fedora.tar.xz diff --git a/gdal-2.0.0-swig-perl.patch b/gdal-2.0.0-swig-perl.patch deleted file mode 100644 index d7aabdf..0000000 --- a/gdal-2.0.0-swig-perl.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- 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-2.0.0-xopen-source.patch b/gdal-2.0.0-xopen-source.patch deleted file mode 100644 index 7064931..0000000 --- a/gdal-2.0.0-xopen-source.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gdal-2.0.0-fedora/apps/gdalserver.c~ 2015-08-09 09:08:49.645792201 +0100 -+++ gdal-2.0.0-fedora/apps/gdalserver.c 2015-08-09 09:08:55.906683962 +0100 -@@ -28,7 +28,7 @@ - ****************************************************************************/ - - #if defined(__STDC_VERSION__) --#define _XOPEN_SOURCE -+#define _XOPEN_SOURCE 600 - #endif - - #include "cpl_port.h" diff --git a/gdal-cleaner.sh b/gdal-cleaner.sh index 67ae15c..bc1d04b 100755 --- a/gdal-cleaner.sh +++ b/gdal-cleaner.sh @@ -1,6 +1,6 @@ #!/bin/bash # Volker Fröhlich -VERSION="2.0.0" +VERSION="2.0.1" tar xvf gdal-"${VERSION}".tar.xz diff --git a/gdal.spec b/gdal.spec index 2e74792..74d4da4 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.0 +%global testversion 2.0.1 %global run_tests 1 %global with_spatialite 1 @@ -41,8 +41,8 @@ Name: gdal -Version: 2.0.0 -Release: 5%{?dist} +Version: 2.0.1 +Release: 1%{?dist} Summary: GIS file format library Group: System Environment/Libraries License: MIT @@ -67,15 +67,6 @@ Patch2: %{name}-jni.patch # Fedora uses Alternatives for Java Patch8: %{name}-1.9.0-java.patch -# 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 - -# https://bugzilla.redhat.com/show_bug.cgi?id=1249703 -# Solved in https://trac.osgeo.org/gdal/ticket/6072 -Patch10: %{name}-2.0.0-xopen-source.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ant @@ -285,8 +276,6 @@ rm -r frmts/grib/degrib18/g2clib-1.0.4 %patch1 -p1 -b .g2clib~ %patch2 -p1 -b .jni~ %patch8 -p1 -b .java~ -%patch9 -p1 -b .swig~ -%patch10 -p1 -b .xopen~ # Copy in PROVENANCE.TXT-fedora cp -p %SOURCE4 . @@ -753,6 +742,7 @@ popd %files perl %doc swig/perl/README %{perl_vendorarch}/* +%{_mandir}/man3/*.3pm* %files python %doc swig/python/README.txt @@ -784,6 +774,9 @@ popd #Or as before, using ldconfig %changelog +* Thu Sep 24 2015 Volker Froehlich - 2.0.1-1 +- Updated for 2.0.1; Add Perl module manpage + * Wed Sep 23 2015 Orion Poplawski - 2.0.0-5 - Rebuild for libdap 3.15.1 diff --git a/sources b/sources index d154491..bae32cc 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -676fe1e87c3d3846f7eabbe10b590bb4 gdalautotest-2.0.0.tar.gz -5bf821cd8bbd1e7d21bcee3ba412fb25 gdal-2.0.0-fedora.tar.xz +d322e6a93d7a2817adb77d6997c30fc8 gdalautotest-2.0.1.tar.gz +c102814db78ec8b0609f4a6be121edeb gdal-2.0.1-fedora.tar.xz