rpms
/
gdal
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to 3.1.3

This commit is contained in:
Sandro Mani 2020-09-07 16:08:23 +02:00
parent e7ebba872a
commit a4d8e114bf
10 changed files with 46 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -49,3 +49,4 @@ gdalautotest-1.7.0.tar.gz
/gdalautotest-3.1.1.tar.gz
/gdal-3.1.2-fedora.tar.xz
/gdalautotest-3.1.2.tar.gz
/gdal-3.1.3-fedora.tar.xz

6
gdal-1.9.0-java.patch
View File

@ -1,6 +1,6 @@
diff -rupN --no-dereference gdal-3.1.2-fedora/swig/java/java.opt gdal-3.1.2-fedora-new/swig/java/java.opt
--- gdal-3.1.2-fedora/swig/java/java.opt 2020-07-07 13:43:38.000000000 +0200
+++ gdal-3.1.2-fedora-new/swig/java/java.opt 2020-07-07 15:17:32.573888187 +0200
diff -rupN --no-dereference gdal-3.1.3-fedora/swig/java/java.opt gdal-3.1.3-fedora-new/swig/java/java.opt
--- gdal-3.1.3-fedora/swig/java/java.opt 2020-09-01 10:36:31.000000000 +0200
+++ gdal-3.1.3-fedora-new/swig/java/java.opt 2020-09-07 14:41:31.736573017 +0200
@@ -7,6 +7,6 @@ JAVADOC=$(JAVA_HOME)/bin/javadoc
JAVAC=$(JAVA_HOME)/bin/javac
JAVA=$(JAVA_HOME)/bin/java

10
gdal.spec
View File

@ -9,7 +9,7 @@
#TODO: Consider doxy patch from Suse, setting EXTRACT_LOCAL_CLASSES = NO
# Tests can be of a different version
%global testversion 3.1.2
%global testversion 3.1.3
%global run_tests 1
%global bashcompletiondir %(pkg-config --variable=compatdir bash-completion)
@ -45,8 +45,8 @@
%endif
Name: gdal
Version: 3.1.2
Release: 6%{?dist}%{?bootstrap:.%{bootstrap}.bootstrap}
Version: 3.1.3
Release: 1%{?dist}%{?bootstrap:.%{bootstrap}.bootstrap}
Summary: GIS file format library
License: MIT
URL: http://www.gdal.org
@ -77,6 +77,7 @@ Patch7: gdal_nopdf.patch
# Adapt to jasper 2.0.17
Patch8: gdal_jasper.patch
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: libtool
@ -690,6 +691,9 @@ popd
#Or as before, using ldconfig
%changelog
* Mon Sep 07 2020 Sandro Mani <manisandro@gmail.com> - 3.1.3-1
- Update to 3.1.3
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.2-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

6
gdal_installapps.patch
View File

@ -1,6 +1,6 @@
diff -rupN --no-dereference gdal-3.1.2-fedora/apps/GNUmakefile gdal-3.1.2-fedora-new/apps/GNUmakefile
--- gdal-3.1.2-fedora/apps/GNUmakefile 2020-07-07 13:43:39.000000000 +0200
+++ gdal-3.1.2-fedora-new/apps/GNUmakefile 2020-07-07 15:17:33.741889402 +0200
diff -rupN --no-dereference gdal-3.1.3-fedora/apps/GNUmakefile gdal-3.1.3-fedora-new/apps/GNUmakefile
--- gdal-3.1.3-fedora/apps/GNUmakefile 2020-09-01 10:36:31.000000000 +0200
+++ gdal-3.1.3-fedora-new/apps/GNUmakefile 2020-09-07 14:41:33.244545332 +0200
@@ -233,6 +233,7 @@ gdal-config-inst: gdal-config.in ../GDAL
install: default

6
gdal_iso8211.patch
View File

@ -1,6 +1,6 @@
diff -rupN --no-dereference gdal-3.1.2-fedora/frmts/iso8211/GNUmakefile gdal-3.1.2-fedora-new/frmts/iso8211/GNUmakefile
--- gdal-3.1.2-fedora/frmts/iso8211/GNUmakefile 2020-07-07 13:43:38.000000000 +0200
+++ gdal-3.1.2-fedora-new/frmts/iso8211/GNUmakefile 2020-07-07 15:17:33.178888816 +0200
diff -rupN --no-dereference gdal-3.1.3-fedora/frmts/iso8211/GNUmakefile gdal-3.1.3-fedora-new/frmts/iso8211/GNUmakefile
--- gdal-3.1.3-fedora/frmts/iso8211/GNUmakefile 2020-09-01 10:36:30.000000000 +0200
+++ gdal-3.1.3-fedora-new/frmts/iso8211/GNUmakefile 2020-09-07 14:41:32.513558759 +0200
@@ -23,8 +23,7 @@ dist-clean: clean
rm -rf $(DISTDIR)

42
gdal_jasper.patch
View File

@ -1,31 +1,21 @@
diff -rupN gdal-3.1.2-fedora/frmts/jpeg2000/jpeg2000dataset.cpp gdal-3.1.2-fedora-new/frmts/jpeg2000/jpeg2000dataset.cpp
--- gdal-3.1.2-fedora/frmts/jpeg2000/jpeg2000dataset.cpp 2020-07-07 13:46:27.000000000 +0200
+++ gdal-3.1.2-fedora-new/frmts/jpeg2000/jpeg2000dataset.cpp 2020-07-22 12:26:50.419482813 +0200
@@ -595,7 +595,7 @@ GDALDataset *JPEG2000Dataset::Open( GDAL
diff -rupN --no-dereference gdal-3.1.3-fedora/frmts/jpeg2000/jpeg2000_vsil_io.cpp gdal-3.1.3-fedora-new/frmts/jpeg2000/jpeg2000_vsil_io.cpp
--- gdal-3.1.3-fedora/frmts/jpeg2000/jpeg2000_vsil_io.cpp 2020-09-01 10:39:25.000000000 +0200
+++ gdal-3.1.3-fedora-new/frmts/jpeg2000/jpeg2000_vsil_io.cpp 2020-09-07 14:41:33.957532225 +0200
@@ -96,7 +96,7 @@ typedef struct {
{
int iFormat;
- char *pszFormatName = nullptr;
+ const char *pszFormatName = nullptr;
// PRIjas_seqent macro is defined since Jasper 2.0.17
if (!Identify(poOpenInfo))
return nullptr;
diff -rupN gdal-3.1.2-fedora/frmts/jpeg2000/jpeg2000_vsil_io.cpp gdal-3.1.2-fedora-new/frmts/jpeg2000/jpeg2000_vsil_io.cpp
--- gdal-3.1.2-fedora/frmts/jpeg2000/jpeg2000_vsil_io.cpp 2020-07-07 13:46:27.000000000 +0200
+++ gdal-3.1.2-fedora-new/frmts/jpeg2000/jpeg2000_vsil_io.cpp 2020-07-22 13:29:02.017426423 +0200
@@ -94,13 +94,13 @@ typedef struct {
* File stream object.
\******************************************************************************/
-static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, int cnt)
+static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, unsigned int cnt)
{
jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj);
-#ifndef PRIjas_seqent
+#if 0
static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, int cnt)
#else
static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, unsigned cnt)
@@ -106,7 +106,7 @@ static int JPEG2000_VSIL_read(jas_stream
return static_cast<int>(VSIFReadL(buf, 1, cnt, fileobj->fp));
}
-static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, int cnt)
+static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, unsigned int cnt)
{
jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj);
return static_cast<int>(VSIFWriteL(buf, 1, cnt, fileobj->fp));
-#ifndef PRIjas_seqent
+#if 0
static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, int cnt)
#else
static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, unsigned int cnt)

6
gdal_nopdf.patch
View File

@ -1,6 +1,6 @@
diff -rupN --no-dereference gdal-3.1.2-fedora/doc/source/index.rst gdal-3.1.2-fedora-new/doc/source/index.rst
--- gdal-3.1.2-fedora/doc/source/index.rst 2020-07-07 13:43:39.000000000 +0200
+++ gdal-3.1.2-fedora-new/doc/source/index.rst 2020-07-07 15:17:34.025889697 +0200
diff -rupN --no-dereference gdal-3.1.3-fedora/doc/source/index.rst gdal-3.1.3-fedora-new/doc/source/index.rst
--- gdal-3.1.3-fedora/doc/source/index.rst 2020-09-01 10:36:31.000000000 +0200
+++ gdal-3.1.3-fedora-new/doc/source/index.rst 2020-09-07 14:41:33.605538696 +0200
@@ -9,8 +9,6 @@ GDAL
.. include:: ./about_no_title.rst

6
gdal_sphinx.patch
View File

@ -1,6 +1,6 @@
diff -rupN --no-dereference gdal-3.1.2-fedora/doc/Makefile gdal-3.1.2-fedora-new/doc/Makefile
--- gdal-3.1.2-fedora/doc/Makefile 2020-07-07 13:43:38.000000000 +0200
+++ gdal-3.1.2-fedora-new/doc/Makefile 2020-07-07 15:17:33.445889094 +0200
diff -rupN --no-dereference gdal-3.1.3-fedora/doc/Makefile gdal-3.1.3-fedora-new/doc/Makefile
--- gdal-3.1.3-fedora/doc/Makefile 2020-09-01 10:36:30.000000000 +0200
+++ gdal-3.1.3-fedora-new/doc/Makefile 2020-09-07 14:41:32.887551892 +0200
@@ -2,7 +2,7 @@
#

12
gdal_tirpcinc.patch
View File

@ -1,6 +1,6 @@
diff -rupN --no-dereference gdal-3.1.2-fedora/frmts/dods/GNUmakefile gdal-3.1.2-fedora-new/frmts/dods/GNUmakefile
--- gdal-3.1.2-fedora/frmts/dods/GNUmakefile 2020-07-07 13:43:38.000000000 +0200
+++ gdal-3.1.2-fedora-new/frmts/dods/GNUmakefile 2020-07-07 15:17:32.871888497 +0200
diff -rupN --no-dereference gdal-3.1.3-fedora/frmts/dods/GNUmakefile gdal-3.1.3-fedora-new/frmts/dods/GNUmakefile
--- gdal-3.1.3-fedora/frmts/dods/GNUmakefile 2020-09-01 10:36:30.000000000 +0200
+++ gdal-3.1.3-fedora-new/frmts/dods/GNUmakefile 2020-09-07 14:41:32.127565845 +0200
@@ -4,7 +4,7 @@ include ../../GDALmake.opt
OBJ = dodsdataset2.o
@ -10,9 +10,9 @@ diff -rupN --no-dereference gdal-3.1.2-fedora/frmts/dods/GNUmakefile gdal-3.1.2-
default: $(OBJ:.o=.$(OBJ_EXT))
diff -rupN --no-dereference gdal-3.1.2-fedora/ogr/ogrsf_frmts/dods/GNUmakefile gdal-3.1.2-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile
--- gdal-3.1.2-fedora/ogr/ogrsf_frmts/dods/GNUmakefile 2020-07-07 13:43:38.000000000 +0200
+++ gdal-3.1.2-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile 2020-07-07 15:17:32.871888497 +0200
diff -rupN --no-dereference gdal-3.1.3-fedora/ogr/ogrsf_frmts/dods/GNUmakefile gdal-3.1.3-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile
--- gdal-3.1.3-fedora/ogr/ogrsf_frmts/dods/GNUmakefile 2020-09-01 10:36:31.000000000 +0200
+++ gdal-3.1.3-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile 2020-09-07 14:41:32.127565845 +0200
@@ -5,7 +5,7 @@ include ../../../GDALmake.opt
OBJ = ogrdodsdriver.o ogrdodsdatasource.o ogrdodslayer.o \
ogrdodssequencelayer.o ogrdodsfielddefn.o ogrdodsgrid.o

3
sources
View File

@ -1,2 +1 @@
SHA512 (gdalautotest-3.1.2.tar.gz) = 014b3986ed67d93f6bfffb6522b9797f2c097d1fe8fca9211293eaacab2344cfa3d1a7507b2786347c3921c18f29964b5d5856f8c9ef4ec6934c39a00f7610a8
SHA512 (gdal-3.1.2-fedora.tar.xz) = 61e7f543696d3919119ee9e1678a4ad89e46c30bf2d4ed51f6ed5eea50128080cab63ce6ba8f35dd7d1a6d9db9c0144243b363d2da8aae1d370e902dde49fb15
SHA512 (gdal-3.1.3-fedora.tar.xz) = dcf576439bd07f0cb51bed4f8a61650cc91d03ec47cdbe091ac9a2713cc6fac3e45a66b4ed6b5e636fc0988de49eb87e466a3654c34d498552c8923377dc7f39