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

Update to 3.3.2

Browse Source
This commit is contained in:
Sandro Mani 2021-09-07 13:26:19 +02:00
parent 2add6bb7cb
commit 3e685b82b4
12 changed files with 52 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -63,3 +63,5 @@ gdalautotest-1.7.0.tar.gz
/gdal-3.3.0-fedora.tar.xz
/gdal-3.3.1-fedora.tar.xz
/gdalautotest-3.3.1.tar.gz
/gdal-3.3.2-fedora.tar.xz
/gdalautotest-3.3.2.tar.gz

18
gdal-gcc11.patch
View File

@ -1,6 +1,6 @@
diff -rupN --no-dereference gdal-3.3.1-fedora/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp gdal-3.3.1-fedora-new/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp
--- gdal-3.3.1-fedora/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp 2021-06-28 12:59:02.000000000 +0200
+++ gdal-3.3.1-fedora-new/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp 2021-07-05 16:04:48.497897722 +0200
diff -rupN --no-dereference gdal-3.3.2-fedora/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp gdal-3.3.2-fedora-new/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp
--- gdal-3.3.2-fedora/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp 2021-09-01 11:49:35.000000000 +0200
+++ gdal-3.3.2-fedora-new/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp 2021-09-07 12:51:18.767929853 +0200
@@ -34,6 +34,7 @@
#include <limits>
#include <math.h>
@ -9,9 +9,9 @@ diff -rupN --no-dereference gdal-3.3.1-fedora/ogr/ogrsf_frmts/cad/libopencad/cad
//------------------------------------------------------------------------------
// CADVector
diff -rupN --no-dereference gdal-3.3.1-fedora/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp gdal-3.3.1-fedora-new/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
--- gdal-3.3.1-fedora/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp 2021-06-28 12:59:01.000000000 +0200
+++ gdal-3.3.1-fedora-new/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp 2021-07-05 16:04:48.497897722 +0200
diff -rupN --no-dereference gdal-3.3.2-fedora/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp gdal-3.3.2-fedora-new/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
--- gdal-3.3.2-fedora/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp 2021-09-01 11:49:34.000000000 +0200
+++ gdal-3.3.2-fedora-new/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp 2021-09-07 12:51:18.768929851 +0200
@@ -39,6 +39,7 @@
#include <limits>
#include <memory>
@ -20,9 +20,9 @@ diff -rupN --no-dereference gdal-3.3.1-fedora/ogr/ogrsf_frmts/cad/libopencad/dwg
#if ((defined(__sun__) || defined(__FreeBSD__)) && __GNUC__ == 4 && __GNUC_MINOR__ == 8) || defined(__ANDROID__)
// gcc 4.8 on Solaris 11.3 or FreeBSD 11 doesn't have std::string
diff -rupN --no-dereference gdal-3.3.1-fedora/third_party/LercLib/Lerc2.h gdal-3.3.1-fedora-new/third_party/LercLib/Lerc2.h
--- gdal-3.3.1-fedora/third_party/LercLib/Lerc2.h 2021-06-28 12:58:18.000000000 +0200
+++ gdal-3.3.1-fedora-new/third_party/LercLib/Lerc2.h 2021-07-05 16:04:48.498897716 +0200
diff -rupN --no-dereference gdal-3.3.2-fedora/third_party/LercLib/Lerc2.h gdal-3.3.2-fedora-new/third_party/LercLib/Lerc2.h
--- gdal-3.3.2-fedora/third_party/LercLib/Lerc2.h 2021-09-01 11:48:49.000000000 +0200
+++ gdal-3.3.2-fedora-new/third_party/LercLib/Lerc2.h 2021-09-07 12:51:18.768929851 +0200
@@ -30,6 +30,7 @@ Contributors: Thomas Maurer
#include <limits>
#include <string>

9
gdal.spec
View File

@ -8,7 +8,7 @@
#TODO: Consider doxy patch from Suse, setting EXTRACT_LOCAL_CLASSES = NO
# Tests can be of a different version
%global testversion 3.3.1
%global testversion 3.3.2
%global run_tests 1
%global bashcompletiondir %(pkg-config --variable=compatdir bash-completion)
@ -43,8 +43,8 @@
%endif
Name: gdal
Version: 3.3.1
Release: 5%{?dist}%{?bootstrap:.%{bootstrap}.bootstrap}
Version: 3.3.2
Release: 1%{?dist}%{?bootstrap:.%{bootstrap}.bootstrap}
Summary: GIS file format library
License: MIT
URL: http://www.gdal.org
@ -641,6 +641,9 @@ popd
#Or as before, using ldconfig
%changelog
* Tue Sep 07 2021 Sandro Mani <manisandro@gmail.com> - 3.3.2-1
- Update to 3.3.2
* Tue Aug 10 2021 Orion Poplawski <orion@nwra.com> - 3.3.1-5
- Rebuild for hdf5 1.10.7/netcdf 4.8.0

6
gdal_autoconf270.patch
View File

@ -1,6 +1,6 @@
diff -rupN gdal-3.3.1-fedora/m4/lib-link.m4 gdal-3.3.1-fedora-new/m4/lib-link.m4
--- gdal-3.3.1-fedora/m4/lib-link.m4 2021-06-28 12:59:14.000000000 +0200
+++ gdal-3.3.1-fedora-new/m4/lib-link.m4 2021-07-24 23:56:17.364927895 +0200
diff -rupN --no-dereference gdal-3.3.2-fedora/m4/lib-link.m4 gdal-3.3.2-fedora-new/m4/lib-link.m4
--- gdal-3.3.2-fedora/m4/lib-link.m4 2021-09-01 11:49:49.000000000 +0200
+++ gdal-3.3.2-fedora-new/m4/lib-link.m4 2021-09-07 12:51:19.228928933 +0200
@@ -108,8 +108,6 @@ dnl acl_hardcode_direct,
dnl acl_hardcode_minus_L.
AC_DEFUN([AC_LIB_RPATH],

6
gdal_installapps.patch
View File

@ -1,6 +1,6 @@
diff -rupN --no-dereference gdal-3.3.1-fedora/apps/GNUmakefile gdal-3.3.1-fedora-new/apps/GNUmakefile
--- gdal-3.3.1-fedora/apps/GNUmakefile 2021-06-28 12:57:58.000000000 +0200
+++ gdal-3.3.1-fedora-new/apps/GNUmakefile 2021-07-05 16:04:48.081900302 +0200
diff -rupN --no-dereference gdal-3.3.2-fedora/apps/GNUmakefile gdal-3.3.2-fedora-new/apps/GNUmakefile
--- gdal-3.3.2-fedora/apps/GNUmakefile 2021-09-01 11:48:27.000000000 +0200
+++ gdal-3.3.2-fedora-new/apps/GNUmakefile 2021-09-07 12:51:18.318930754 +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.3.1-fedora/frmts/iso8211/GNUmakefile gdal-3.3.1-fedora-new/frmts/iso8211/GNUmakefile
--- gdal-3.3.1-fedora/frmts/iso8211/GNUmakefile 2021-06-28 12:57:58.000000000 +0200
+++ gdal-3.3.1-fedora-new/frmts/iso8211/GNUmakefile 2021-07-05 16:04:47.659902921 +0200
diff -rupN --no-dereference gdal-3.3.2-fedora/frmts/iso8211/GNUmakefile gdal-3.3.2-fedora-new/frmts/iso8211/GNUmakefile
--- gdal-3.3.2-fedora/frmts/iso8211/GNUmakefile 2021-09-01 11:48:27.000000000 +0200
+++ gdal-3.3.2-fedora-new/frmts/iso8211/GNUmakefile 2021-09-07 12:51:17.869931658 +0200
@@ -23,8 +23,7 @@ dist-clean: clean
rm -rf $(DISTDIR)

18
gdal_java.patch
View File

@ -1,6 +1,6 @@
diff -rupN --no-dereference gdal-3.3.1-fedora/swig/java/add_javadoc.c gdal-3.3.1-fedora-new/swig/java/add_javadoc.c
--- gdal-3.3.1-fedora/swig/java/add_javadoc.c 2021-06-28 12:58:00.000000000 +0200
+++ gdal-3.3.1-fedora-new/swig/java/add_javadoc.c 2021-07-05 16:04:47.215905676 +0200
diff -rupN --no-dereference gdal-3.3.2-fedora/swig/java/add_javadoc.c gdal-3.3.2-fedora-new/swig/java/add_javadoc.c
--- gdal-3.3.2-fedora/swig/java/add_javadoc.c 2021-09-01 11:48:29.000000000 +0200
+++ gdal-3.3.2-fedora-new/swig/java/add_javadoc.c 2021-09-07 12:51:17.389932633 +0200
@@ -133,22 +133,22 @@ int main(int argc, char* argv[])
FILE* fDst;
JavaDocInstance* instances = (JavaDocInstance*)calloc(sizeof(JavaDocInstance), 3000);
@ -81,9 +81,9 @@ diff -rupN --no-dereference gdal-3.3.1-fedora/swig/java/add_javadoc.c gdal-3.3.1
} while(bFoundOpen == FALSE || nBrackets > 0);
}
else
diff -rupN --no-dereference gdal-3.3.1-fedora/swig/java/javadoc.java gdal-3.3.1-fedora-new/swig/java/javadoc.java
--- gdal-3.3.1-fedora/swig/java/javadoc.java 2021-06-28 12:58:00.000000000 +0200
+++ gdal-3.3.1-fedora-new/swig/java/javadoc.java 2021-07-05 16:04:47.217905663 +0200
diff -rupN --no-dereference gdal-3.3.2-fedora/swig/java/javadoc.java gdal-3.3.2-fedora-new/swig/java/javadoc.java
--- gdal-3.3.2-fedora/swig/java/javadoc.java 2021-09-01 11:48:29.000000000 +0200
+++ gdal-3.3.2-fedora-new/swig/java/javadoc.java 2021-09-07 12:51:17.391932629 +0200
@@ -11982,12 +11982,12 @@ public interface osrConstants:public fin
public interface osrConstants:public final static int PROJ_ERR_COORD_TRANSFM
@ -99,9 +99,9 @@ diff -rupN --no-dereference gdal-3.3.1-fedora/swig/java/javadoc.java gdal-3.3.1-
* or iterative convergence method failed.
*/
public interface osrConstants:public final static int PROJ_ERR_COORD_TRANSFM_OUTSIDE_PROJECTION_DOMAIN
diff -rupN --no-dereference gdal-3.3.1-fedora/swig/java/java.opt gdal-3.3.1-fedora-new/swig/java/java.opt
--- gdal-3.3.1-fedora/swig/java/java.opt 2021-06-28 12:57:58.000000000 +0200
+++ gdal-3.3.1-fedora-new/swig/java/java.opt 2021-07-05 16:04:47.215905676 +0200
diff -rupN --no-dereference gdal-3.3.2-fedora/swig/java/java.opt gdal-3.3.2-fedora-new/swig/java/java.opt
--- gdal-3.3.2-fedora/swig/java/java.opt 2021-09-01 11:48:26.000000000 +0200
+++ gdal-3.3.2-fedora-new/swig/java/java.opt 2021-09-07 12:51:17.392932626 +0200
@@ -7,6 +7,6 @@ JAVADOC=$(JAVA_HOME)/bin/javadoc
JAVAC=$(JAVA_HOME)/bin/javac
JAVA=$(JAVA_HOME)/bin/java

6
gdal_no-diag-disable.patch
View File

@ -1,6 +1,6 @@
diff -rupN --no-dereference gdal-3.3.1-fedora/configure.ac gdal-3.3.1-fedora-new/configure.ac
--- gdal-3.3.1-fedora/configure.ac 2021-06-28 12:57:58.000000000 +0200
+++ gdal-3.3.1-fedora-new/configure.ac 2021-07-05 16:04:48.710896401 +0200
diff -rupN --no-dereference gdal-3.3.2-fedora/configure.ac gdal-3.3.2-fedora-new/configure.ac
--- gdal-3.3.2-fedora/configure.ac 2021-09-01 11:48:27.000000000 +0200
+++ gdal-3.3.2-fedora-new/configure.ac 2021-09-07 12:51:19.001929383 +0200
@@ -64,7 +64,7 @@ dnl warning #2304: non-explicit construc
dnl warning #3280: declaration hides member
dnl remark #11074: Inlining inhibited by limit max-size

6
gdal_nopdf.patch
View File

@ -1,6 +1,6 @@
diff -rupN --no-dereference gdal-3.3.1-fedora/doc/source/index.rst gdal-3.3.1-fedora-new/doc/source/index.rst
--- gdal-3.3.1-fedora/doc/source/index.rst 2021-06-28 12:57:58.000000000 +0200
+++ gdal-3.3.1-fedora-new/doc/source/index.rst 2021-07-05 16:04:48.288899019 +0200
diff -rupN --no-dereference gdal-3.3.2-fedora/doc/source/index.rst gdal-3.3.2-fedora-new/doc/source/index.rst
--- gdal-3.3.2-fedora/doc/source/index.rst 2021-09-01 11:48:26.000000000 +0200
+++ gdal-3.3.2-fedora-new/doc/source/index.rst 2021-09-07 12:51:18.542930304 +0200
@@ -4,8 +4,6 @@ GDAL
.. include:: ./about_no_title.rst

6
gdal_sphinx.patch
View File

@ -1,6 +1,6 @@
diff -rupN --no-dereference gdal-3.3.1-fedora/doc/Makefile gdal-3.3.1-fedora-new/doc/Makefile
--- gdal-3.3.1-fedora/doc/Makefile 2021-06-28 12:57:57.000000000 +0200
+++ gdal-3.3.1-fedora-new/doc/Makefile 2021-07-05 16:04:47.871901605 +0200
diff -rupN --no-dereference gdal-3.3.2-fedora/doc/Makefile gdal-3.3.2-fedora-new/doc/Makefile
--- gdal-3.3.2-fedora/doc/Makefile 2021-09-01 11:48:26.000000000 +0200
+++ gdal-3.3.2-fedora-new/doc/Makefile 2021-09-07 12:51:18.095931201 +0200
@@ -2,7 +2,7 @@
#

12
gdal_tirpcinc.patch
View File

@ -1,6 +1,6 @@
diff -rupN --no-dereference gdal-3.3.1-fedora/frmts/dods/GNUmakefile gdal-3.3.1-fedora-new/frmts/dods/GNUmakefile
--- gdal-3.3.1-fedora/frmts/dods/GNUmakefile 2021-06-28 12:57:58.000000000 +0200
+++ gdal-3.3.1-fedora-new/frmts/dods/GNUmakefile 2021-07-05 16:04:47.443904261 +0200
diff -rupN --no-dereference gdal-3.3.2-fedora/frmts/dods/GNUmakefile gdal-3.3.2-fedora-new/frmts/dods/GNUmakefile
--- gdal-3.3.2-fedora/frmts/dods/GNUmakefile 2021-09-01 11:48:26.000000000 +0200
+++ gdal-3.3.2-fedora-new/frmts/dods/GNUmakefile 2021-09-07 12:51:17.636932131 +0200
@@ -4,7 +4,7 @@ include ../../GDALmake.opt
OBJ = dodsdataset2.o
@ -10,9 +10,9 @@ diff -rupN --no-dereference gdal-3.3.1-fedora/frmts/dods/GNUmakefile gdal-3.3.1-
default: $(OBJ:.o=.$(OBJ_EXT))
diff -rupN --no-dereference gdal-3.3.1-fedora/ogr/ogrsf_frmts/dods/GNUmakefile gdal-3.3.1-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile
--- gdal-3.3.1-fedora/ogr/ogrsf_frmts/dods/GNUmakefile 2021-06-28 12:57:58.000000000 +0200
+++ gdal-3.3.1-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile 2021-07-05 16:04:47.443904261 +0200
diff -rupN --no-dereference gdal-3.3.2-fedora/ogr/ogrsf_frmts/dods/GNUmakefile gdal-3.3.2-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile
--- gdal-3.3.2-fedora/ogr/ogrsf_frmts/dods/GNUmakefile 2021-09-01 11:48:27.000000000 +0200
+++ gdal-3.3.2-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile 2021-09-07 12:51:17.636932131 +0200
@@ -5,7 +5,7 @@ include ../../../GDALmake.opt
OBJ = ogrdodsdriver.o ogrdodsdatasource.o ogrdodslayer.o \
ogrdodssequencelayer.o ogrdodsfielddefn.o ogrdodsgrid.o

4
sources
View File

@ -1,2 +1,2 @@
SHA512 (gdal-3.3.1-fedora.tar.xz) = ac757fc0dda75e1acfbfa9c939cc0ff86debcc856f98972994c7953613d1c4a6b4d7190f48a9fb33d76a5a8fde52983a2d50970e806e7f6029f961e874e346da
SHA512 (gdalautotest-3.3.1.tar.gz) = 2fd6cc6b4923265ad839ce121f1e79151e3dc801bd90365ea699a49a975118dcd4c96e7cca493650f5226122e6d2deeccf8d1ab2467226586c36f087a9866b37
SHA512 (gdal-3.3.2-fedora.tar.xz) = 7fd49081d2ee03603083d51357a615386b53ddc2c15592001c560b060d3b7162f0594b6c2a5b82654617877a4e960b9462d4fcb9fbda9d3e7d4b7c63361d34ca
SHA512 (gdalautotest-3.3.2.tar.gz) = e82f95ba3214bfcdb4d38f87d7ec57931bc44da96b0cf58e81dd90ef60adf0ef700d8f3bcef17a706afdbd87feb01c201cc7d43ea8832daecdc98d9f2880ddda