From e5c130527d45ffcbdce2cb61544fe0fe53bf3be3 Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Thu, 27 Nov 2014 15:47:17 +0100 Subject: [PATCH 1/3] Rebuild (poppler-0.28.1) --- gdal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gdal.spec b/gdal.spec index d5c67e8..a6c1aa0 100644 --- a/gdal.spec +++ b/gdal.spec @@ -41,7 +41,7 @@ Name: gdal Version: 1.11.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GIS file format library Group: System Environment/Libraries License: MIT @@ -763,6 +763,9 @@ popd #Or as before, using ldconfig %changelog +* Thu Nov 27 2014 Marek Kasik - 1.11.1-3 +- Rebuild (poppler-0.28.1) + * Fri Nov 14 2014 Dan Horák - 1.11.1-2 - update gdal-config for ppc64le From f618c625efb144521860df29a253798f45ffa86a Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 2 Dec 2014 11:15:00 -0700 Subject: [PATCH 2/3] Don't try to install perllocal.pod (bz 1161231). --- gdal.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gdal.spec b/gdal.spec index a6c1aa0..f7f09b8 100644 --- a/gdal.spec +++ b/gdal.spec @@ -493,6 +493,7 @@ mkdir -p %{buildroot}%{_libdir}/%{name}plugins #TODO: Don't do that? find %{buildroot}%{perl_vendorarch} -name "*.dox" -exec rm -rf '{}' \; +rm -f %{buildroot}%{perl_archlib}/perllocal.pod # Correct permissions #TODO and potential ticket: Why are the permissions not correct? @@ -763,6 +764,9 @@ popd #Or as before, using ldconfig %changelog +* Tue Dec 2 2014 Jerry James - 1.11.1-3 +- Don't try to install perllocal.pod (bz 1161231) + * Thu Nov 27 2014 Marek Kasik - 1.11.1-3 - Rebuild (poppler-0.28.1) From b41a7b1641251809f9cdbbf6794bf992bece1a55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volker=20Fr=C3=B6hlich?= Date: Sat, 6 Dec 2014 03:28:35 +0100 Subject: [PATCH 3/3] Apply upstream changeset 27949 to prevent a crash when using sqlite 3.8.7 --- gdal-1.11.1-sqlite-crash.patch | 65 ++++++++++++++++++++++++++++++++++ gdal.spec | 9 ++++- 2 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 gdal-1.11.1-sqlite-crash.patch diff --git a/gdal-1.11.1-sqlite-crash.patch b/gdal-1.11.1-sqlite-crash.patch new file mode 100644 index 0000000..3e2b13f --- /dev/null +++ b/gdal-1.11.1-sqlite-crash.patch @@ -0,0 +1,65 @@ +Index: /trunk/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.cpp +=================================================================== +--- /trunk/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.cpp (revision 27942) ++++ /trunk/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.cpp (revision 27949) +@@ -36,4 +36,23 @@ + #ifdef HAVE_SQLITE_VFS + ++/************************************************************************/ ++/* OGR2SQLITE_Register() */ ++/************************************************************************/ ++ ++CPL_C_START ++int CPL_DLL OGR2SQLITE_static_register (sqlite3* hDB, char **pzErrMsg, void* pApi); ++CPL_C_END ++ ++/* We call this function so that each time a db is created, */ ++/* OGR2SQLITE_static_register is called, to initialize the sqlite3_api */ ++/* structure with the right pointers. */ ++/* We need to declare this function before including sqlite3ext.h, since */ ++/* sqlite 3.8.7, sqlite3_auto_extension can be a macro (#5725) */ ++ ++void OGR2SQLITE_Register() ++{ ++ sqlite3_auto_extension ((void (*)(void)) OGR2SQLITE_static_register); ++} ++ + #define VIRTUAL_OGR_DYNAMIC_EXTENSION_ENABLED + //#define DEBUG_OGR2SQLITE +@@ -2403,16 +2422,11 @@ + /************************************************************************/ + +-CPL_C_START +-int CPL_DLL OGR2SQLITE_static_register (sqlite3 * hDB, char **pzErrMsg, +- const sqlite3_api_routines * pApi); +-CPL_C_END +- + #ifndef WIN32 + extern const struct sqlite3_api_routines OGRSQLITE_static_routines; + #endif + +-int OGR2SQLITE_static_register (sqlite3 * hDB, char **pzErrMsg, +- const sqlite3_api_routines * pApi) +-{ ++int OGR2SQLITE_static_register (sqlite3 * hDB, char **pzErrMsg, void * _pApi) ++{ ++ const sqlite3_api_routines * pApi = (const sqlite3_api_routines * )_pApi; + #ifndef WIN32 + if( pApi->create_module == NULL ) +@@ -2450,16 +2464,3 @@ + } + +-/************************************************************************/ +-/* OGR2SQLITE_Register() */ +-/************************************************************************/ +- +-/* We call this function so that each time a db is created, */ +-/* OGR2SQLITE_static_register is called, to initialize the sqlite3_api */ +-/* structure with the right pointers. */ +- +-void OGR2SQLITE_Register() +-{ +- sqlite3_auto_extension ((void (*)(void)) OGR2SQLITE_static_register); +-} +- + #endif // HAVE_SQLITE_VFS diff --git a/gdal.spec b/gdal.spec index f7f09b8..c1e7d11 100644 --- a/gdal.spec +++ b/gdal.spec @@ -41,7 +41,7 @@ Name: gdal Version: 1.11.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GIS file format library Group: System Environment/Libraries License: MIT @@ -66,6 +66,9 @@ Patch2: %{name}-jni.patch # Fedora uses Alternatives for Java Patch8: %{name}-1.9.0-java.patch +# http://trac.osgeo.org/gdal/changeset/27949 +Patch9: %{name}-1.11.1-sqlite-crash.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ant @@ -266,6 +269,7 @@ rm -r frmts/grib/degrib18/g2clib-1.0.4 %patch1 -p1 -b .g2clib~ %patch2 -p1 -b .jni~ %patch8 -p1 -b .java~ +%patch9 -p3 -b .sqlite~ # Copy in PROVENANCE.TXT-fedora cp -p %SOURCE4 . @@ -764,6 +768,9 @@ popd #Or as before, using ldconfig %changelog +* Sat Dec 6 2014 Volker Fröhlich - 1.11.1-4 +- Apply upstream changeset 27949 to prevent a crash when using sqlite 3.8.7 + * Tue Dec 2 2014 Jerry James - 1.11.1-3 - Don't try to install perllocal.pod (bz 1161231)