From dc820e44b29bad7161c8245435c552ab70a2c177 Mon Sep 17 00:00:00 2001 From: Jozef Mlich Date: Tue, 3 May 2016 08:44:14 +0200 Subject: [PATCH] Resolves: #1332175 new upstream version --- .gitignore | 2 + gdal-2.0.1-iso8211-include.patch | 11 ----- gdal-2.0.2-sqlite-crash.patch | 79 -------------------------------- gdal-2.1.0-zlib.patch | 12 +++++ gdal-cleaner.sh | 2 +- gdal-jni.patch | 36 +++++++-------- gdal.spec | 21 ++++----- sources | 4 +- 8 files changed, 45 insertions(+), 122 deletions(-) delete mode 100644 gdal-2.0.1-iso8211-include.patch delete mode 100644 gdal-2.0.2-sqlite-crash.patch create mode 100644 gdal-2.1.0-zlib.patch diff --git a/.gitignore b/.gitignore index 0a9b7d0..f3be978 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,5 @@ gdalautotest-1.7.0.tar.gz /gdalautotest-2.0.2.tar.gz /gdalautotest-1.11.3.tar.gz /gdal-2.0.2-fedora.tar.xz +/gdalautotest-2.1.0.tar.gz +/gdal-2.1.0-fedora.tar.xz diff --git a/gdal-2.0.1-iso8211-include.patch b/gdal-2.0.1-iso8211-include.patch deleted file mode 100644 index 6cd5e81..0000000 --- a/gdal-2.0.1-iso8211-include.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nur gdal-2.0.1-fedora/frmts/iso8211/8211createfromxml.cpp gdal-2.0.1-fedora-iso8211/frmts/iso8211/8211createfromxml.cpp ---- gdal-2.0.1-fedora/frmts/iso8211/8211createfromxml.cpp 2015-09-15 16:06:51.000000000 +0200 -+++ gdal-2.0.1-fedora-iso8211/frmts/iso8211/8211createfromxml.cpp 2015-10-18 03:04:21.812446373 +0200 -@@ -28,6 +28,7 @@ - ****************************************************************************/ - - #include "cpl_minixml.h" -+#include "cpl_conv.h" - #include "iso8211.h" - #include - #include diff --git a/gdal-2.0.2-sqlite-crash.patch b/gdal-2.0.2-sqlite-crash.patch deleted file mode 100644 index 2f2f49e..0000000 --- a/gdal-2.0.2-sqlite-crash.patch +++ /dev/null @@ -1,79 +0,0 @@ -Index: /branches/2.0/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitevfs.cpp -=================================================================== ---- /branches/2.0/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitevfs.cpp (revision 33410) -+++ /branches/2.0/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitevfs.cpp (revision 33411) -@@ -381,9 +381,49 @@ - } - --static int OGRSQLiteVFSCurrentTime (sqlite3_vfs* pVFS, double* p1) --{ -- sqlite3_vfs* pUnderlyingVFS = GET_UNDERLYING_VFS(pVFS); -- //CPLDebug("SQLITE", "OGRSQLiteVFSCurrentTime()"); -- return pUnderlyingVFS->xCurrentTime(pUnderlyingVFS, p1); -+// Derived for sqlite3.c implementation of unixCurrentTime64 and winCurrentTime64 -+#ifdef WIN32 -+#include -+static int OGRSQLiteVFSCurrentTimeInt64 (sqlite3_vfs* /*pVFS*/, sqlite3_int64 *piNow) -+{ -+ FILETIME ft; -+ static const sqlite3_int64 winFiletimeEpoch = 23058135*(sqlite3_int64)8640000; -+ static const sqlite3_int64 max32BitValue = -+ (sqlite3_int64)2000000000 + (sqlite3_int64)2000000000 + -+ (sqlite3_int64)294967296; -+ -+#if defined(_WIN32_WCE) -+ SYSTEMTIME time; -+ GetSystemTime(&time); -+ /* if SystemTimeToFileTime() fails, it returns zero. */ -+ if (!SystemTimeToFileTime(&time,&ft)){ -+ return SQLITE_ERROR; -+ } -+#else -+ GetSystemTimeAsFileTime( &ft ); -+#endif -+ *piNow = winFiletimeEpoch + -+ ((((sqlite3_int64)ft.dwHighDateTime)*max32BitValue) + -+ (sqlite3_int64)ft.dwLowDateTime)/(sqlite3_int64)10000; -+ return SQLITE_OK; -+} -+#else -+#include -+static int OGRSQLiteVFSCurrentTimeInt64 (sqlite3_vfs* /*pVFS*/, sqlite3_int64 *piNow) -+{ -+ struct timeval sNow; -+ static const sqlite3_int64 unixEpoch = 24405875*(sqlite3_int64)8640000; -+ (void)gettimeofday(&sNow, NULL); /* Cannot fail given valid arguments */ -+ *piNow = unixEpoch + 1000*(sqlite3_int64)sNow.tv_sec + sNow.tv_usec/1000; -+ -+ return SQLITE_OK; -+} -+#endif -+ -+static int OGRSQLiteVFSCurrentTime (sqlite3_vfs* /*pVFS*/, double* p1) -+{ -+ sqlite3_int64 i = 0; -+ int rc = OGRSQLiteVFSCurrentTimeInt64(NULL, &i); -+ *p1 = i/86400000.0; -+ return rc; - } - -@@ -408,5 +448,9 @@ - pVFSAppData->nCounter = 0; - -+#if SQLITE_VERSION_NUMBER >= 3008000L /* perhaps not the minimal version that defines xCurrentTimeInt64, but who cares */ -+ pMyVFS->iVersion = 2; -+#else - pMyVFS->iVersion = 1; -+#endif - pMyVFS->szOsFile = sizeof(OGRSQLiteFileStruct); - pMyVFS->mxPathname = pDefaultVFS->mxPathname; -@@ -425,4 +469,9 @@ - pMyVFS->xCurrentTime = OGRSQLiteVFSCurrentTime; - pMyVFS->xGetLastError = OGRSQLiteVFSGetLastError; -+#if SQLITE_VERSION_NUMBER >= 3008000L /* perhaps not the minimal version that defines xCurrentTimeInt64, but who cares */ -+ if( pMyVFS->iVersion >= 2 ) -+ pMyVFS->xCurrentTimeInt64 = OGRSQLiteVFSCurrentTimeInt64; -+#endif -+ - return pMyVFS; - } diff --git a/gdal-2.1.0-zlib.patch b/gdal-2.1.0-zlib.patch new file mode 100644 index 0000000..dc30f48 --- /dev/null +++ b/gdal-2.1.0-zlib.patch @@ -0,0 +1,12 @@ +diff -up ./frmts/mrf/mrf_band.cpp.zlib ./frmts/mrf/mrf_band.cpp +--- ./frmts/mrf/mrf_band.cpp.zlib 2016-04-25 19:35:55.000000000 +0200 ++++ ./frmts/mrf/mrf_band.cpp 2016-05-02 16:24:16.802790904 +0200 +@@ -57,7 +57,7 @@ + + #include + #include +-#include "../zlib/zlib.h" ++#include + + using std::vector; + using std::string; diff --git a/gdal-cleaner.sh b/gdal-cleaner.sh index bc1b00f..49bf00c 100755 --- a/gdal-cleaner.sh +++ b/gdal-cleaner.sh @@ -1,6 +1,6 @@ #!/bin/bash # Volker Fröhlich -VERSION="2.0.2" +VERSION="2.1.0" tar xvf gdal-"${VERSION}".tar.xz diff --git a/gdal-jni.patch b/gdal-jni.patch index edb266e..48b6b00 100644 --- a/gdal-jni.patch +++ b/gdal-jni.patch @@ -1,7 +1,7 @@ -diff -up gdal-1.9.2-fedora/swig/include/java/gdalconst_java.i.jni gdal-1.9.2-fedora/swig/include/java/gdalconst_java.i ---- gdal-1.9.2-fedora/swig/include/java/gdalconst_java.i.jni 2012-10-08 18:58:28.000000000 -0600 -+++ gdal-1.9.2-fedora/swig/include/java/gdalconst_java.i 2013-06-12 14:40:22.858828066 -0600 -@@ -22,7 +22,7 @@ +diff -up ./swig/include/java/gdalconst_java.i.jni~ ./swig/include/java/gdalconst_java.i +--- ./swig/include/java/gdalconst_java.i.jni~ 2016-04-25 19:35:57.000000000 +0200 ++++ ./swig/include/java/gdalconst_java.i 2016-05-02 15:50:37.171990235 +0200 +@@ -13,7 +13,7 @@ static { try { @@ -10,34 +10,34 @@ diff -up gdal-1.9.2-fedora/swig/include/java/gdalconst_java.i.jni gdal-1.9.2-fed available = true; } catch (UnsatisfiedLinkError e) { available = false; -diff -up gdal-1.9.2-fedora/swig/include/java/gdal_java.i.jni gdal-1.9.2-fedora/swig/include/java/gdal_java.i ---- gdal-1.9.2-fedora/swig/include/java/gdal_java.i.jni 2012-10-08 18:58:28.000000000 -0600 -+++ gdal-1.9.2-fedora/swig/include/java/gdal_java.i 2013-06-12 14:40:39.142749339 -0600 -@@ -22,7 +22,7 @@ +diff -up ./swig/include/java/gdal_java.i.jni~ ./swig/include/java/gdal_java.i +--- ./swig/include/java/gdal_java.i.jni~ 2016-04-25 19:35:57.000000000 +0200 ++++ ./swig/include/java/gdal_java.i 2016-05-02 15:50:37.172990231 +0200 +@@ -15,7 +15,7 @@ static { try { - System.loadLibrary("gdaljni"); + System.load("/usr/lib/java/gdal/libgdaljni.so"); available = true; - + if (gdal.HasThreadSupport() == 0) -diff -up gdal-1.9.2-fedora/swig/include/java/ogr_java.i.jni gdal-1.9.2-fedora/swig/include/java/ogr_java.i ---- gdal-1.9.2-fedora/swig/include/java/ogr_java.i.jni 2012-10-08 18:58:28.000000000 -0600 -+++ gdal-1.9.2-fedora/swig/include/java/ogr_java.i 2013-06-12 14:39:47.946997388 -0600 -@@ -24,7 +24,7 @@ +diff -up ./swig/include/java/ogr_java.i.jni~ ./swig/include/java/ogr_java.i +--- ./swig/include/java/ogr_java.i.jni~ 2016-04-25 19:35:57.000000000 +0200 ++++ ./swig/include/java/ogr_java.i 2016-05-02 15:50:37.172990231 +0200 +@@ -17,7 +17,7 @@ static { try { - System.loadLibrary("ogrjni"); + System.load("/usr/lib/java/gdal/libogrjni.so"); available = true; - + if (org.gdal.gdal.gdal.HasThreadSupport() == 0) -diff -up gdal-1.9.2-fedora/swig/include/java/osr_java.i.jni gdal-1.9.2-fedora/swig/include/java/osr_java.i ---- gdal-1.9.2-fedora/swig/include/java/osr_java.i.jni 2012-10-08 18:58:28.000000000 -0600 -+++ gdal-1.9.2-fedora/swig/include/java/osr_java.i 2013-06-12 14:41:10.097554983 -0600 -@@ -26,7 +26,7 @@ +diff -up ./swig/include/java/osr_java.i.jni~ ./swig/include/java/osr_java.i +--- ./swig/include/java/osr_java.i.jni~ 2016-04-25 19:35:57.000000000 +0200 ++++ ./swig/include/java/osr_java.i 2016-05-02 15:50:37.172990231 +0200 +@@ -20,7 +20,7 @@ static { try { diff --git a/gdal.spec b/gdal.spec index 3016184..591486b 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.2 +%global testversion 2.1.0 %global run_tests 1 %global with_spatialite 1 @@ -41,8 +41,8 @@ Name: gdal -Version: 2.0.2 -Release: 5%{?dist} +Version: 2.1.0 +Release: 1%{?dist} Summary: GIS file format library Group: System Environment/Libraries License: MIT @@ -64,14 +64,9 @@ Patch1: %{name}-g2clib.patch # Patch for Fedora JNI library location Patch2: %{name}-jni.patch -# https://trac.osgeo.org/gdal/ticket/6159#ticket -Patch3: %{name}-2.0.1-iso8211-include.patch - -# https://trac.osgeo.org/gdal/ticket/6360 -Patch4: %{name}-2.0.2-sqlite-crash.patch - # Fedora uses Alternatives for Java Patch8: %{name}-1.9.0-java.patch +Patch9: %{name}-2.1.0-zlib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -294,9 +289,8 @@ rm -r frmts/grib/degrib18/g2clib-1.0.4 %patch1 -p1 -b .g2clib~ %patch2 -p1 -b .jni~ -%patch3 -p1 -b .iso8211~ -%patch4 -p4 -b .sqlite~ %patch8 -p1 -b .java~ +%patch9 -p1 -b .zlib~ # Copy in PROVENANCE.TXT-fedora cp -p %SOURCE4 . @@ -773,6 +767,8 @@ popd %exclude %{_mandir}/man1/gdal_sieve.1* %{_mandir}/man1/nearblack.1* %{_mandir}/man1/ogr*.1* +%{_mandir}/man1/gnm*.1.* + %files libs %doc LICENSE.TXT NEWS PROVENANCE.TXT COMMITERS PROVENANCE.TXT-fedora @@ -845,6 +841,9 @@ popd #Or as before, using ldconfig %changelog +* Mon May 02 2016 Jozef Mlich - 2.1.0-1 +- New upstream release + * Mon Apr 18 2016 Tom Hughes - 2.0.2-5 - Rebuild for libdap change Resoloves: #1328104 diff --git a/sources b/sources index 822b759..a1f2c69 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -bd112b6415544d4d67bdb12703f2cf1d gdalautotest-2.0.2.tar.gz -2b7ab131f610b7ffc6328d1144e0014f gdal-2.0.2-fedora.tar.xz +660f99dfcf43343daa97dbdc8bc4157f gdalautotest-2.1.0.tar.gz +87514e2251b2010f1a428561986b042b gdal-2.1.0-fedora.tar.xz