diff --git a/.gitignore b/.gitignore index 626ab88..ae377ac 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ gdalautotest-1.7.0.tar.gz /gdal-3.0.1-fedora.tar.xz /gdal-3.1.0-fedora.tar.xz /gdalautotest-3.1.0.tar.gz +/gdal-3.1.1-fedora.tar.xz diff --git a/gdal-1.9.0-java.patch b/gdal-1.9.0-java.patch index 589b05d..93ab613 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.0-fedora/swig/java/java.opt gdal-3.1.0-fedora-new/swig/java/java.opt ---- gdal-3.1.0-fedora/swig/java/java.opt 2020-05-04 11:18:28.000000000 +0200 -+++ gdal-3.1.0-fedora-new/swig/java/java.opt 2020-05-18 11:28:48.479899529 +0200 +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 @@ -7,6 +7,6 @@ JAVADOC=$(JAVA_HOME)/bin/javadoc JAVAC=$(JAVA_HOME)/bin/javac JAVA=$(JAVA_HOME)/bin/java diff --git a/gdal-cleaner.sh b/gdal-cleaner.sh index e8609ea..393ee2e 100755 --- a/gdal-cleaner.sh +++ b/gdal-cleaner.sh @@ -1,5 +1,13 @@ #!/bin/bash -VERSION="3.1.0" + +if [ $# -lt 1 ]; then + echo "Usage: $0 version" + exit 1 +fi + +VERSION="$1" + +wget https://github.com/OSGeo/gdal/releases/download/v$VERSION/gdal-$VERSION.tar.gz tar xvf gdal-"${VERSION}".tar.gz diff --git a/gdal.spec b/gdal.spec index 5dca093..0e4c0f4 100644 --- a/gdal.spec +++ b/gdal.spec @@ -45,8 +45,8 @@ %endif Name: gdal -Version: 3.1.0 -Release: 5%{?dist}%{?bootstrap:.%{bootstrap}.bootstrap} +Version: 3.1.1 +Release: 1%{?dist}%{?bootstrap:.%{bootstrap}.bootstrap} Summary: GIS file format library License: MIT URL: http://www.gdal.org @@ -688,6 +688,9 @@ popd #Or as before, using ldconfig %changelog +* Tue Jun 30 2020 Sandro Mani - 3.1.1-1 +- Update to 3.1.1 + * Sat Jun 27 2020 Jitka Plesnikova - 3.1.0-5 - Perl 5.32 re-rebuild updated packages diff --git a/gdal_installapps.patch b/gdal_installapps.patch index 1331f5c..069c46c 100644 --- a/gdal_installapps.patch +++ b/gdal_installapps.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gdal-3.1.0-fedora/apps/GNUmakefile gdal-3.1.0-fedora-new/apps/GNUmakefile ---- gdal-3.1.0-fedora/apps/GNUmakefile 2020-05-04 11:18:27.000000000 +0200 -+++ gdal-3.1.0-fedora-new/apps/GNUmakefile 2020-05-18 11:28:49.293888148 +0200 +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 @@ -233,6 +233,7 @@ gdal-config-inst: gdal-config.in ../GDAL install: default diff --git a/gdal_iso8211.patch b/gdal_iso8211.patch index b194f94..a116f33 100644 --- a/gdal_iso8211.patch +++ b/gdal_iso8211.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gdal-3.1.0-fedora/frmts/iso8211/GNUmakefile gdal-3.1.0-fedora-new/frmts/iso8211/GNUmakefile ---- gdal-3.1.0-fedora/frmts/iso8211/GNUmakefile 2020-05-04 11:18:27.000000000 +0200 -+++ gdal-3.1.0-fedora-new/frmts/iso8211/GNUmakefile 2020-05-18 11:28:48.892893749 +0200 +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 @@ -23,8 +23,7 @@ dist-clean: clean rm -rf $(DISTDIR) diff --git a/gdal_nopdf.patch b/gdal_nopdf.patch index 2692e6d..f914ff4 100644 --- a/gdal_nopdf.patch +++ b/gdal_nopdf.patch @@ -1,6 +1,6 @@ -diff -rupN gdal-3.1.0-fedora/doc/source/index.rst gdal-3.1.0-fedora-new/doc/source/index.rst ---- gdal-3.1.0-fedora/doc/source/index.rst 2020-05-04 11:18:27.000000000 +0200 -+++ gdal-3.1.0-fedora-new/doc/source/index.rst 2020-05-20 18:56:54.508740758 +0200 +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 @@ -9,8 +9,6 @@ GDAL .. include:: ./about_no_title.rst diff --git a/gdal_sphinx-warnings.patch b/gdal_sphinx-warnings.patch index f66ca46..d17649c 100644 --- a/gdal_sphinx-warnings.patch +++ b/gdal_sphinx-warnings.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gdal-3.1.0-fedora/doc/Makefile gdal-3.1.0-fedora-new/doc/Makefile ---- gdal-3.1.0-fedora/doc/Makefile 2020-05-04 11:18:27.000000000 +0200 -+++ gdal-3.1.0-fedora-new/doc/Makefile 2020-05-18 11:28:49.090890982 +0200 +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 @@ # diff --git a/gdal_tirpcinc.patch b/gdal_tirpcinc.patch index 8b70170..481d8d2 100644 --- a/gdal_tirpcinc.patch +++ b/gdal_tirpcinc.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gdal-3.1.0-fedora/frmts/dods/GNUmakefile gdal-3.1.0-fedora-new/frmts/dods/GNUmakefile ---- gdal-3.1.0-fedora/frmts/dods/GNUmakefile 2020-05-04 11:18:27.000000000 +0200 -+++ gdal-3.1.0-fedora-new/frmts/dods/GNUmakefile 2020-05-18 11:28:48.686896632 +0200 +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 @@ -4,7 +4,7 @@ include ../../GDALmake.opt OBJ = dodsdataset2.o @@ -10,9 +10,9 @@ diff -rupN --no-dereference gdal-3.1.0-fedora/frmts/dods/GNUmakefile gdal-3.1.0- default: $(OBJ:.o=.$(OBJ_EXT)) -diff -rupN --no-dereference gdal-3.1.0-fedora/ogr/ogrsf_frmts/dods/GNUmakefile gdal-3.1.0-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile ---- gdal-3.1.0-fedora/ogr/ogrsf_frmts/dods/GNUmakefile 2020-05-04 11:18:27.000000000 +0200 -+++ gdal-3.1.0-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile 2020-05-18 11:28:48.687896618 +0200 +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 @@ -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 0488d6e..fb4a1be 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (gdal-3.1.0-fedora.tar.xz) = 8a0c20c39d213c3d8fdf807769c1d376fbdc5a73a215173dd5695e77a356d0788fe61a7722ba7228b74211d7c5466d82b69254b1c279a39037bafb2cde2c8c7f -SHA512 (gdalautotest-3.1.0.tar.gz) = 0b5c4ee4dba19c1c6f12689d72f91f24bf6b435adccfaaa10e56b9953148aee301c698e62b460335db1406b52fe0fa0e51960f100f3032e600e7531d334b730d +SHA512 (gdal-3.1.1-fedora.tar.xz) = 1b48d73f2581d4a9649f4acba2185db543e20609fd902c14d66f372445762436c5b5c38c4eb7a44ca2b943edc37665c7f8d7e8ab7698050324e52bdba25de0f0