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

Update to 3.1.2

This commit is contained in:
Sandro Mani 2020-07-09 10:21:28 +02:00
parent db9f8bec75
commit 7bccf86956
9 changed files with 27 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

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

6
gdal-1.9.0-java.patch
View File

@ -1,6 +1,6 @@
diff -rupN --no-dereference gdal-3.1.1-fedora/swig/java/java.opt gdal-3.1.1-fedora-new/swig/java/java.opt
--- gdal-3.1.1-fedora/swig/java/java.opt 2020-06-22 10:25:55.000000000 +0200
+++ gdal-3.1.1-fedora-new/swig/java/java.opt 2020-06-30 11:51:59.565549149 +0200
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
@@ -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.1
%global testversion 3.1.2
%global run_tests 1
%global bashcompletiondir %(pkg-config --variable=compatdir bash-completion)
@ -45,7 +45,7 @@
%endif
Name: gdal
Version: 3.1.1
Version: 3.1.2
Release: 1%{?dist}%{?bootstrap:.%{bootstrap}.bootstrap}
Summary: GIS file format library
License: MIT
@ -68,7 +68,8 @@ Patch3: gdal_tirpcinc.patch
# Use libtool to create libiso8211.a, otherwise broken static lib is created since object files are compiled through libtool
Patch4: gdal_iso8211.patch
# Don't pass -W to sphinx, it causes it to error out on warnings
Patch5: gdal_sphinx-warnings.patch
# Don't do parallel build, currently fails with "Sphinx parallel build error: NotImplementedError"
Patch5: gdal_sphinx.patch
# Fix makefiles installing libtool wrappers instead of actual executables
Patch6: gdal_installapps.patch
# Don't refer to PDF manual which is not built
@ -688,6 +689,9 @@ popd
#Or as before, using ldconfig
%changelog
* Tue Jul 07 2020 Sandro Mani <manisandro@gmail.com> - 3.1.2-1
- Update to 3.1.2
* Tue Jun 30 2020 Sandro Mani <manisandro@gmail.com> - 3.1.1-1
- Update to 3.1.1

6
gdal_installapps.patch
View File

@ -1,6 +1,6 @@
diff -rupN --no-dereference gdal-3.1.1-fedora/apps/GNUmakefile gdal-3.1.1-fedora-new/apps/GNUmakefile
--- gdal-3.1.1-fedora/apps/GNUmakefile 2020-06-22 10:25:56.000000000 +0200
+++ gdal-3.1.1-fedora-new/apps/GNUmakefile 2020-06-30 11:52:01.349547978 +0200
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
@@ -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.1-fedora/frmts/iso8211/GNUmakefile gdal-3.1.1-fedora-new/frmts/iso8211/GNUmakefile
--- gdal-3.1.1-fedora/frmts/iso8211/GNUmakefile 2020-06-22 10:25:55.000000000 +0200
+++ gdal-3.1.1-fedora-new/frmts/iso8211/GNUmakefile 2020-06-30 11:52:00.482548548 +0200
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
@@ -23,8 +23,7 @@ dist-clean: clean
rm -rf $(DISTDIR)

6
gdal_nopdf.patch
View File

@ -1,6 +1,6 @@
diff -rupN --no-dereference gdal-3.1.1-fedora/doc/source/index.rst gdal-3.1.1-fedora-new/doc/source/index.rst
--- gdal-3.1.1-fedora/doc/source/index.rst 2020-06-22 10:25:56.000000000 +0200
+++ gdal-3.1.1-fedora-new/doc/source/index.rst 2020-06-30 11:52:01.715547738 +0200
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
@@ -9,8 +9,6 @@ GDAL
.. include:: ./about_no_title.rst

12
gdal_sphinx-warnings.patch
View File

@ -1,12 +0,0 @@
diff -rupN --no-dereference gdal-3.1.1-fedora/doc/Makefile gdal-3.1.1-fedora-new/doc/Makefile
--- gdal-3.1.1-fedora/doc/Makefile 2020-06-22 10:25:55.000000000 +0200
+++ gdal-3.1.1-fedora-new/doc/Makefile 2020-06-30 11:52:00.968548229 +0200
@@ -2,7 +2,7 @@
#
# You can set these variables from the command line.
-SPHINXOPTS = --keep-going -j auto -W
+SPHINXOPTS = --keep-going -j auto
SPHINXBUILD = sphinx-build
SOURCEDIR = source
BUILDDIR = build

12
gdal_tirpcinc.patch
View File

@ -1,6 +1,6 @@
diff -rupN --no-dereference gdal-3.1.1-fedora/frmts/dods/GNUmakefile gdal-3.1.1-fedora-new/frmts/dods/GNUmakefile
--- gdal-3.1.1-fedora/frmts/dods/GNUmakefile 2020-06-22 10:25:55.000000000 +0200
+++ gdal-3.1.1-fedora-new/frmts/dods/GNUmakefile 2020-06-30 11:51:59.970548884 +0200
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
@@ -4,7 +4,7 @@ include ../../GDALmake.opt
OBJ = dodsdataset2.o
@ -10,9 +10,9 @@ diff -rupN --no-dereference gdal-3.1.1-fedora/frmts/dods/GNUmakefile gdal-3.1.1-
default: $(OBJ:.o=.$(OBJ_EXT))
diff -rupN --no-dereference gdal-3.1.1-fedora/ogr/ogrsf_frmts/dods/GNUmakefile gdal-3.1.1-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile
--- gdal-3.1.1-fedora/ogr/ogrsf_frmts/dods/GNUmakefile 2020-06-22 10:25:55.000000000 +0200
+++ gdal-3.1.1-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile 2020-06-30 11:51:59.993548869 +0200
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
@@ -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 (gdal-3.1.1-fedora.tar.xz) = 1b48d73f2581d4a9649f4acba2185db543e20609fd902c14d66f372445762436c5b5c38c4eb7a44ca2b943edc37665c7f8d7e8ab7698050324e52bdba25de0f0
SHA512 (gdalautotest-3.1.1.tar.gz) = aa93bc7b954999377a5c0f549e9349b2167ebdf26c0ef292ac9f6f3d7b1e9e916b69765f4c795ddc460661fc5e4aa38a1f5d357426dd8f406c4edfd4fd68535f
SHA512 (gdal-3.1.2-fedora.tar.xz) = 61e7f543696d3919119ee9e1678a4ad89e46c30bf2d4ed51f6ed5eea50128080cab63ce6ba8f35dd7d1a6d9db9c0144243b363d2da8aae1d370e902dde49fb15