From 58a4d06d29e345d9d0232aa33356e6f835e467db Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 12 Nov 2020 00:14:03 +0100 Subject: [PATCH] Update to 3.2.0 --- .gitignore | 2 ++ gdal-1.9.0-java.patch | 6 +++--- gdal-gcc11.patch | 6 +++--- gdal.spec | 28 +++++++++++----------------- gdal_installapps.patch | 6 +++--- gdal_iso8211.patch | 6 +++--- gdal_nopdf.patch | 8 ++++---- gdal_sphinx.patch | 6 +++--- gdal_tirpcinc.patch | 12 ++++++------ sources | 4 ++-- 10 files changed, 40 insertions(+), 44 deletions(-) diff --git a/.gitignore b/.gitignore index 632990e..33bd557 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,5 @@ gdalautotest-1.7.0.tar.gz /gdalautotest-3.1.3.tar.gz /gdal-3.1.4-fedora.tar.xz /gdalautotest-3.1.4.tar.gz +/gdalautotest-3.2.0.tar.gz +/gdal-3.2.0-fedora.tar.xz diff --git a/gdal-1.9.0-java.patch b/gdal-1.9.0-java.patch index b79d0fc..db697fd 100644 --- a/gdal-1.9.0-java.patch +++ b/gdal-1.9.0-java.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gdal-3.1.4-fedora/swig/java/java.opt gdal-3.1.4-fedora-new/swig/java/java.opt ---- gdal-3.1.4-fedora/swig/java/java.opt 2020-10-20 11:47:08.000000000 +0200 -+++ gdal-3.1.4-fedora-new/swig/java/java.opt 2020-11-02 11:56:48.341314610 +0100 +diff -rupN --no-dereference gdal-3.2.0-fedora/swig/java/java.opt gdal-3.2.0-fedora-new/swig/java/java.opt +--- gdal-3.2.0-fedora/swig/java/java.opt 2020-10-26 14:05:40.000000000 +0100 ++++ gdal-3.2.0-fedora-new/swig/java/java.opt 2020-11-12 00:13:52.048881098 +0100 @@ -7,6 +7,6 @@ JAVADOC=$(JAVA_HOME)/bin/javadoc JAVAC=$(JAVA_HOME)/bin/javac JAVA=$(JAVA_HOME)/bin/java diff --git a/gdal-gcc11.patch b/gdal-gcc11.patch index 595a7c1..5b0b8df 100644 --- a/gdal-gcc11.patch +++ b/gdal-gcc11.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gdal-3.1.4-fedora/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp gdal-3.1.4-fedora-new/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp ---- gdal-3.1.4-fedora/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp 2020-10-20 11:50:59.000000000 +0200 -+++ gdal-3.1.4-fedora-new/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp 2020-11-02 11:56:49.997342382 +0100 +diff -rupN --no-dereference gdal-3.2.0-fedora/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp gdal-3.2.0-fedora-new/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp +--- gdal-3.2.0-fedora/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp 2020-10-26 14:09:09.000000000 +0100 ++++ gdal-3.2.0-fedora-new/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp 2020-11-12 00:13:53.604880951 +0100 @@ -38,6 +38,7 @@ #include #include diff --git a/gdal.spec b/gdal.spec index 0af7480..1732796 100644 --- a/gdal.spec +++ b/gdal.spec @@ -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.4 +%global testversion 3.2.0 %global run_tests 1 %global bashcompletiondir %(pkg-config --variable=compatdir bash-completion) @@ -45,7 +45,7 @@ %endif Name: gdal -Version: 3.1.4 +Version: 3.2.0 Release: 1%{?dist}%{?bootstrap:.%{bootstrap}.bootstrap} Summary: GIS file format library License: MIT @@ -573,6 +573,7 @@ popd %files %{_bindir}/gdallocationinfo %{_bindir}/gdal_contour +%{_bindir}/gdal_create %{_bindir}/gdal_rasterize %{_bindir}/gdal_translate %{_bindir}/gdaladdo @@ -584,7 +585,6 @@ popd %{_bindir}/gdal_grid %{_bindir}/gdalenhance %{_bindir}/gdalmanage -%{_bindir}/gdalserver %{_bindir}/gdalsrsinfo %{_bindir}/gdaltransform %{_bindir}/nearblack @@ -612,8 +612,8 @@ popd %files libs %doc LICENSE.TXT NEWS PROVENANCE.TXT COMMITTERS PROVENANCE.TXT-fedora -%{_libdir}/libgdal.so.27 -%{_libdir}/libgdal.so.27.* +%{_libdir}/libgdal.so.28 +%{_libdir}/libgdal.so.28.* %{_datadir}/%{name} #TODO: Possibly remove files like .dxf, .dgn, ... %dir %{_libdir}/%{name}plugins @@ -646,11 +646,8 @@ popd %files -n python2-gdal %doc swig/python/README.rst %doc swig/python/samples -%{python2_sitearch}/osgeo -%{python2_sitearch}/GDAL-%{version}-py*.egg-info -%{python2_sitearch}/osr.py* -%{python2_sitearch}/ogr.py* -%{python2_sitearch}/gdal*.py* +%{python2_sitearch}/osgeo/ +%{python2_sitearch}/GDAL-%{version}-py*.egg-info/ %endif %if %{with python3} @@ -658,13 +655,7 @@ popd %doc swig/python/README.rst %doc swig/python/samples %{python3_sitearch}/osgeo -%{python3_sitearch}/GDAL-%{version}-py*.egg-info -%{python3_sitearch}/osr.py -%{python3_sitearch}/__pycache__/osr.*.py* -%{python3_sitearch}/ogr.py -%{python3_sitearch}/__pycache__/ogr.*.py* -%{python3_sitearch}/gdal*.py -%{python3_sitearch}/__pycache__/gdal*.*.py* +%{python3_sitearch}/GDAL-%{version}-py*.egg-info/ %endif %if %{with python2} || %{with python3} @@ -691,6 +682,9 @@ popd #Or as before, using ldconfig %changelog +* Thu Nov 05 2020 Sandro Mani - 3.2.0-1 +- Update to 3.2.0 + * Mon Nov 02 2020 Sandro Mani - 3.1.4-1 - Update to 3.1.4 diff --git a/gdal_installapps.patch b/gdal_installapps.patch index 83e5330..55b9f4f 100644 --- a/gdal_installapps.patch +++ b/gdal_installapps.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gdal-3.1.4-fedora/apps/GNUmakefile gdal-3.1.4-fedora-new/apps/GNUmakefile ---- gdal-3.1.4-fedora/apps/GNUmakefile 2020-10-20 11:47:09.000000000 +0200 -+++ gdal-3.1.4-fedora-new/apps/GNUmakefile 2020-11-02 11:56:49.446333140 +0100 +diff -rupN --no-dereference gdal-3.2.0-fedora/apps/GNUmakefile gdal-3.2.0-fedora-new/apps/GNUmakefile +--- gdal-3.2.0-fedora/apps/GNUmakefile 2020-10-26 14:05:39.000000000 +0100 ++++ gdal-3.2.0-fedora-new/apps/GNUmakefile 2020-11-12 00:13:53.083881000 +0100 @@ -233,6 +233,7 @@ gdal-config-inst: gdal-config.in ../GDAL install: default diff --git a/gdal_iso8211.patch b/gdal_iso8211.patch index 6a1bbe4..968b872 100644 --- a/gdal_iso8211.patch +++ b/gdal_iso8211.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gdal-3.1.4-fedora/frmts/iso8211/GNUmakefile gdal-3.1.4-fedora-new/frmts/iso8211/GNUmakefile ---- gdal-3.1.4-fedora/frmts/iso8211/GNUmakefile 2020-10-20 11:47:08.000000000 +0200 -+++ gdal-3.1.4-fedora-new/frmts/iso8211/GNUmakefile 2020-11-02 11:56:48.896323916 +0100 +diff -rupN --no-dereference gdal-3.2.0-fedora/frmts/iso8211/GNUmakefile gdal-3.2.0-fedora-new/frmts/iso8211/GNUmakefile +--- gdal-3.2.0-fedora/frmts/iso8211/GNUmakefile 2020-10-26 14:05:39.000000000 +0100 ++++ gdal-3.2.0-fedora-new/frmts/iso8211/GNUmakefile 2020-11-12 00:13:52.575881048 +0100 @@ -23,8 +23,7 @@ dist-clean: clean rm -rf $(DISTDIR) diff --git a/gdal_nopdf.patch b/gdal_nopdf.patch index 7dc1578..57505da 100644 --- a/gdal_nopdf.patch +++ b/gdal_nopdf.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference gdal-3.1.4-fedora/doc/source/index.rst gdal-3.1.4-fedora-new/doc/source/index.rst ---- gdal-3.1.4-fedora/doc/source/index.rst 2020-10-20 11:47:09.000000000 +0200 -+++ gdal-3.1.4-fedora-new/doc/source/index.rst 2020-11-02 11:56:49.720337736 +0100 -@@ -9,8 +9,6 @@ GDAL +diff -rupN --no-dereference gdal-3.2.0-fedora/doc/source/index.rst gdal-3.2.0-fedora-new/doc/source/index.rst +--- gdal-3.2.0-fedora/doc/source/index.rst 2020-10-26 14:05:39.000000000 +0100 ++++ gdal-3.2.0-fedora-new/doc/source/index.rst 2020-11-12 00:13:53.348880975 +0100 +@@ -4,8 +4,6 @@ GDAL .. include:: ./about_no_title.rst diff --git a/gdal_sphinx.patch b/gdal_sphinx.patch index 9ae60f6..b2a6ff8 100644 --- a/gdal_sphinx.patch +++ b/gdal_sphinx.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gdal-3.1.4-fedora/doc/Makefile gdal-3.1.4-fedora-new/doc/Makefile ---- gdal-3.1.4-fedora/doc/Makefile 2020-10-20 11:47:08.000000000 +0200 -+++ gdal-3.1.4-fedora-new/doc/Makefile 2020-11-02 11:56:49.173328561 +0100 +diff -rupN --no-dereference gdal-3.2.0-fedora/doc/Makefile gdal-3.2.0-fedora-new/doc/Makefile +--- gdal-3.2.0-fedora/doc/Makefile 2020-10-26 14:05:39.000000000 +0100 ++++ gdal-3.2.0-fedora-new/doc/Makefile 2020-11-12 00:13:52.828881024 +0100 @@ -2,7 +2,7 @@ # diff --git a/gdal_tirpcinc.patch b/gdal_tirpcinc.patch index e93038a..de5985f 100644 --- a/gdal_tirpcinc.patch +++ b/gdal_tirpcinc.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gdal-3.1.4-fedora/frmts/dods/GNUmakefile gdal-3.1.4-fedora-new/frmts/dods/GNUmakefile ---- gdal-3.1.4-fedora/frmts/dods/GNUmakefile 2020-10-20 11:47:08.000000000 +0200 -+++ gdal-3.1.4-fedora-new/frmts/dods/GNUmakefile 2020-11-02 11:56:48.643319674 +0100 +diff -rupN --no-dereference gdal-3.2.0-fedora/frmts/dods/GNUmakefile gdal-3.2.0-fedora-new/frmts/dods/GNUmakefile +--- gdal-3.2.0-fedora/frmts/dods/GNUmakefile 2020-10-26 14:05:39.000000000 +0100 ++++ gdal-3.2.0-fedora-new/frmts/dods/GNUmakefile 2020-11-12 00:13:52.314881073 +0100 @@ -4,7 +4,7 @@ include ../../GDALmake.opt OBJ = dodsdataset2.o @@ -10,9 +10,9 @@ diff -rupN --no-dereference gdal-3.1.4-fedora/frmts/dods/GNUmakefile gdal-3.1.4- default: $(OBJ:.o=.$(OBJ_EXT)) -diff -rupN --no-dereference gdal-3.1.4-fedora/ogr/ogrsf_frmts/dods/GNUmakefile gdal-3.1.4-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile ---- gdal-3.1.4-fedora/ogr/ogrsf_frmts/dods/GNUmakefile 2020-10-20 11:47:08.000000000 +0200 -+++ gdal-3.1.4-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile 2020-11-02 11:56:48.643319674 +0100 +diff -rupN --no-dereference gdal-3.2.0-fedora/ogr/ogrsf_frmts/dods/GNUmakefile gdal-3.2.0-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile +--- gdal-3.2.0-fedora/ogr/ogrsf_frmts/dods/GNUmakefile 2020-10-26 14:05:39.000000000 +0100 ++++ gdal-3.2.0-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile 2020-11-12 00:13:52.314881073 +0100 @@ -5,7 +5,7 @@ include ../../../GDALmake.opt OBJ = ogrdodsdriver.o ogrdodsdatasource.o ogrdodslayer.o \ ogrdodssequencelayer.o ogrdodsfielddefn.o ogrdodsgrid.o diff --git a/sources b/sources index 375f667..c7fabcc 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (gdal-3.1.4-fedora.tar.xz) = 191e52c9d01a349a2036fb82f10aad8f2945b1bc0c10e04d568d10644e0b64e503efc38c38f73ab9a80d0ece39ae625b64531eededb91af7b7ea95ad3dcc4105 -SHA512 (gdalautotest-3.1.4.tar.gz) = 656215632d37fd9dba377ef28d44dce47bcda6cd3ce8eeddf48c22d810f906e805664b2980d04f07ae4653fc3b385a7ee321e0fe7d69f9c2d83d2b271367161c +SHA512 (gdalautotest-3.2.0.tar.gz) = 8ac8283c10ff397fc7cadceb02871c5c9e25d86d63c1eac8bb0e6e3c45f742c70143b759d20c7fb2e350b09528dad4d9449e863456d6283170637c1fdb7cc65a +SHA512 (gdal-3.2.0-fedora.tar.xz) = 0fa73c1d188646b08b139c85f7b339e638d593e3d58fda8a93183f66dcbf62feba10423cd4a1669bef59aa2bcf423686dec63e2a9e95e173666793eb3492dcd0