rebuild for armadillo 10

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -43,3 +43,13 @@ gdalautotest-1.7.0.tar.gz
 /gdal-2.3.2-fedora.tar.xz
 /gdalautotest-3.0.1.zip
 /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
+/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
+/gdalautotest-3.1.3.tar.gz
+/gdal-3.1.4-fedora.tar.xz
+/gdalautotest-3.1.4.tar.gz

gdal-1.9.0-java.patch

@@ -1,6 +1,6 @@
-diff -rupN --no-dereference gdal-3.0.4-fedora/swig/java/java.opt gdal-3.0.4-fedora-new/swig/java/java.opt
---- gdal-3.0.4-fedora/swig/java/java.opt	2020-01-28 11:13:12.000000000 +0100
-+++ gdal-3.0.4-fedora-new/swig/java/java.opt	2020-02-06 00:23:36.321286290 +0100
+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
 @@ -7,6 +7,6 @@ JAVADOC=$(JAVA_HOME)/bin/javadoc
  JAVAC=$(JAVA_HOME)/bin/javac
  JAVA=$(JAVA_HOME)/bin/java

gdal-cleaner.sh

@@ -1,7 +1,15 @@
 #!/bin/bash
-VERSION="3.0.4"
 
-tar xvf gdal-"${VERSION}".tar.xz
+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
 
 mv gdal-"${VERSION}"{,-fedora} && pushd gdal-"${VERSION}"-fedora
 

gdal-completion.patch

@@ -1,12 +0,0 @@
-diff -rupN --no-dereference gdal-3.0.4-fedora/scripts/GNUmakefile gdal-3.0.4-fedora-new/scripts/GNUmakefile
---- gdal-3.0.4-fedora/scripts/GNUmakefile	2020-01-28 11:13:13.000000000 +0100
-+++ gdal-3.0.4-fedora-new/scripts/GNUmakefile	2020-02-06 00:23:36.089287463 +0100
-@@ -5,6 +5,6 @@ completion:
- 
- install:
- 	if test "x`pkg-config --version 2>/dev/null`" != "x" -a "x`pkg-config --variable=compatdir bash-completion`" != "x"; then \
--		$(INSTALL_DIR) $(DESTDIR)${prefix}`pkg-config --variable=compatdir bash-completion` ; \
--		cp gdal-bash-completion.sh $(DESTDIR)${prefix}`pkg-config --variable=compatdir bash-completion`; \
-+		$(INSTALL_DIR) $(DESTDIR)`pkg-config --variable=compatdir bash-completion` ; \
-+		$(INSTALL_DATA) gdal-bash-completion.sh $(DESTDIR)`pkg-config --variable=compatdir bash-completion`/gdal; \
- 	fi

gdal-gcc11.patch

@@ -0,0 +1,11 @@
+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
+@@ -38,6 +38,7 @@
+ #include <iostream>
+ #include <memory>
+ #include <string>
++#include <limits>
+ 
+ #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

gdal.spec

@@ -9,8 +9,8 @@
 #TODO: Consider doxy patch from Suse, setting EXTRACT_LOCAL_CLASSES  = NO
 
 # Tests can be of a different version
-%global testversion 3.0.4
-%global run_tests 0
+%global testversion 3.1.4
+%global run_tests 1
 
 %global bashcompletiondir %(pkg-config --variable=compatdir bash-completion)
 
@@ -45,8 +45,8 @@
 %endif
 
 Name:          gdal
-Version:       3.0.4
-Release:       4%{?dist}%{?bootstrap:.%{bootstrap}.bootstrap}
+Version:       3.1.4
+Release:       2%{?dist}%{?bootstrap:.%{bootstrap}.bootstrap}
 Summary:       GIS file format library
 License:       MIT
 URL:           http://www.gdal.org
@@ -61,16 +61,22 @@ Source3:       %{name}-cleaner.sh
 
 Source4:       PROVENANCE.TXT-fedora
 
-# Fix bash-completion install dir
-Patch1:        %{name}-completion.patch
 # Fedora uses Alternatives for Java
 Patch2:        %{name}-1.9.0-java.patch
 # Ensure rpc/types.h is found by dods driver (indirectly required by libdap/XDRUtils.h)
 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
+# 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
-Patch5:        gdal_installapps.patch
+Patch6:        gdal_installapps.patch
+# Don't refer to PDF manual which is not built
+Patch7:        gdal_nopdf.patch
+# Fix issues caught by gcc-11
+Patch8:        %{name}-gcc11.patch
+
 
 BuildRequires: gcc
 BuildRequires: gcc-c++
@@ -91,17 +97,22 @@ BuildRequires: expat-devel
 BuildRequires: fontconfig-devel
 # No freexl in EL5
 BuildRequires: freexl-devel
-BuildRequires: g2clib-static
 BuildRequires: geos-devel >= 3.7.1
 BuildRequires: ghostscript
 BuildRequires: hdf-devel
 BuildRequires: hdf-static
 BuildRequires: hdf5-devel
+# No complete java yet in EL8
+%if 0%{?rhel} < 8
 BuildRequires: java-devel >= 1:1.6.0
+%endif
 BuildRequires: jasper-devel
 BuildRequires: jpackage-utils
+# No complete java yet in EL8
+%if 0%{?rhel} < 8
 # For 'mvn_artifact' and 'mvn_install'
 BuildRequires: javapackages-local
+%endif
 BuildRequires: json-c-devel
 BuildRequires: libgeotiff-devel
 # No libgta in EL5
@@ -146,6 +157,7 @@ BuildRequires: python2-numpy
 %if %{with python3}
 BuildRequires: python3-devel
 BuildRequires: python3-numpy
+BuildRequires: python3-setuptools
 %endif
 BuildRequires: sqlite-devel
 BuildRequires: swig
@@ -155,11 +167,9 @@ BuildRequires: xz-devel
 BuildRequires: zlib-devel
 BuildRequires: libtirpc-devel
 
-BuildRequires: /usr/bin/epstopdf
-BuildRequires: /usr/bin/latex
-BuildRequires: /usr/bin/dvips
-BuildRequires: tex(newunicodechar.sty)
-
+BuildRequires: python3-sphinx
+BuildRequires: python3-sphinx_rtd_theme
+BuildRequires: python3-breathe
 
 # Run time dependency for gpsbabel driver
 Requires:      gpsbabel
@@ -203,6 +213,8 @@ Provides:      bundled(degrib) = 2.14
 This package contains the GDAL file format library.
 
 
+# No complete java yet in EL8
+%if 0%{?rhel} < 8
 %package java
 Summary:        Java modules for the GDAL file format library
 Requires:       jpackage-utils
@@ -219,6 +231,7 @@ BuildArch:      noarch
 
 %description javadoc
 This package contains the API documentation for %{name}.
+%endif
 
 
 %package perl
@@ -316,6 +329,9 @@ chmod 644 apps/gnmanalyse.cpp apps/gnmmanage.cpp
 # Fix mandir
 sed -i "s|^mandir=.*|mandir='\${prefix}/share/man'|" configure.ac
 
+# Delete .doxygen_up_to_date, otherwise doxygen isn't run
+rm -f doc/.doxygen_up_to_date
+
 
 %build
 # For future reference:
@@ -325,9 +341,9 @@ autoreconf -ifv
 
 %configure \
 	--with-autoload=%{_libdir}/%{name}plugins \
-	--datadir=%{_datadir}/%{name}/ \
 	--includedir=%{_includedir}/%{name}/ \
 	--prefix=%{_prefix}         \
+	--with-bash-completion      \
 	--with-armadillo            \
 	--with-curl                 \
 	--with-cfitsio              \
@@ -341,7 +357,9 @@ autoreconf -ifv
 	--with-hdf4                 \
 	--with-hdf5                 \
 	--with-jasper               \
+%if 0%{?rhel} < 8
 	--with-java                 \
+%endif
 	--with-jpeg                 \
 	--with-libjson-c            \
 	--without-jpeg12            \
@@ -369,19 +387,25 @@ autoreconf -ifv
 	--with-libkml
 
 %make_build
-make man
-make docs
 
 # Build some utilities, as requested in BZ #1271906
 make -C ogr/ogrsf_frmts/s57 all
 make -C frmts/iso8211 all
 
+# Documentation
+make man
+make docs
+
+# No complete java yet in EL8
+%if 0%{?rhel} < 8
+
 # Make Java module and documentation
 pushd swig/java
   make
   ant maven
 popd
 %mvn_artifact swig/java/build/maven/gdal-%version.pom swig/java/build/maven/gdal-%version.jar
+%endif
 
 # Make Python modules
 pushd swig/python
@@ -395,25 +419,6 @@ pushd swig/perl
   %make_build
 popd
 
-# --------- Documentation ----------
-
-# No useful documentation in swig
-%global docdirs apps doc doc/br doc/ru ogr ogr/ogrsf_frmts frmts/gxf frmts/iso8211 frmts/pcidsk frmts/sdts frmts/vrt ogr/ogrsf_frmts/dgn/
-for docdir in %{docdirs}; do
-  pushd $docdir
-    if [ ! -f Doxyfile ]; then
-      doxygen -g
-    else
-      doxygen -u
-    fi
-    if [ $docdir == "doc/ru" ]; then
-      sed -i -e 's|^OUTPUT_LANGUAGE|OUTPUT_LANGUAGE = Russian\n#OUTPUT_LANGUAGE |' Doxyfile
-    fi
-    rm -rf html
-    doxygen
-  popd
-done
-
 
 %install
 pushd swig/python
@@ -425,16 +430,20 @@ popd
 
 %make_install install-man
 
+# Drop gdal.pdf symlink, as we don't build the pdf documentation
+rm doc/build/html/gdal.pdf
+
 install -pm 755 ogr/ogrsf_frmts/s57/s57dump %{buildroot}%{_bindir}
 install -pm 755 frmts/iso8211/8211createfromxml %{buildroot}%{_bindir}
 install -pm 755 frmts/iso8211/8211dump %{buildroot}%{_bindir}
 install -pm 755 frmts/iso8211/8211view %{buildroot}%{_bindir}
+# Rename for %%files doc below
+mv frmts/iso8211/html frmts/iso8211/iso8211_html
 
 # Directory for auto-loading plugins
 mkdir -p %{buildroot}%{_libdir}/%{name}plugins
 
 #TODO: Don't do that?
-find %{buildroot}%{perl_vendorarch} -name "*.dox" -exec rm -rf '{}' \;
 rm %{buildroot}%{perl_archlib}/perllocal.pod
 
 %if %{without python} && %{without python3}
@@ -446,6 +455,8 @@ rm %buildroot%_mandir/man1/{pct2rgb,rgb2pct}.1
 find %{buildroot}%{perl_vendorarch} -name "*.so" -exec chmod 755 '{}' \;
 find %{buildroot}%{perl_vendorarch} -name "*.pm" -exec chmod 644 '{}' \;
 
+# No complete java yet in EL8
+%if 0%{?rhel} < 8
 # install Java plugin
 %mvn_install -J swig/java/java
 
@@ -460,21 +471,7 @@ chrpath --delete %{buildroot}%{_jnidir}/%{name}/*jni.so*
 # Install Java API documentation in the designated place
 mkdir -p %{buildroot}%{_javadocdir}/%{name}
 cp -pr swig/java/java/org %{buildroot}%{_javadocdir}/%{name}
-
-# Install refmans
-for docdir in %{docdirs}; do
-  pushd $docdir
-    path=%{_builddir}/%{name}-%{version}-fedora/refman
-    mkdir -p $path/html/$docdir
-    cp -r html $path/html/$docdir
-  popd
-done
-
-# Install formats documentation
-for dir in gdal_frmts ogrsf_frmts; do
-  mkdir -p $dir
-  find frmts -name "*.html" -exec install -p -m 644 '{}' $dir \;
-done
+%endif
 
 #TODO: Header date lost during installation
 # Install multilib cpl_config.h bz#430894
@@ -528,23 +525,25 @@ chmod 755 %{buildroot}%{_bindir}/%{name}-config
 #jni-libs and libgdal are also built static (*.a)
 #.exists and .packlist stem from Perl
 for junk in {*.a,*.la,*.bs,.exists,.packlist} ; do
-  find %{buildroot} -name "$junk" -exec rm -rf '{}' \;
+  find %{buildroot} -name "$junk" -delete
 done
 
 # Don't duplicate license files
 rm %{buildroot}%{_datadir}/%{name}/LICENSE.TXT
 
 
+# No complete java yet in EL8
+%if 0%{?rhel} < 8
 %check
 %if %{run_tests}
 for i in -I/usr/lib/jvm/java/include{,/linux}; do
     java_inc="$java_inc $i"
 done
-
+%endif
 
 pushd %{name}autotest-%{testversion}
 	# Export test enviroment
-	export PYTHONPATH=$PYTHONPATH:%{buildroot}%{python_sitearch}
+	export PYTHONPATH=$PYTHONPATH:%{buildroot}%{python2_sitearch}
 	#TODO: Nötig?
 	export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%{buildroot}%{_libdir}
 	# export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%%{buildroot}%%{_libdir}:$java_inc
@@ -572,7 +571,6 @@ popd
 
 
 %files
-%{bashcompletiondir}/*
 %{_bindir}/gdallocationinfo
 %{_bindir}/gdal_contour
 %{_bindir}/gdal_rasterize
@@ -590,12 +588,16 @@ popd
 %{_bindir}/gdalsrsinfo
 %{_bindir}/gdaltransform
 %{_bindir}/nearblack
+%{_bindir}/gdal_viewshed
+%{_bindir}/gdalmdiminfo
+%{_bindir}/gdalmdimtranslate
 %{_bindir}/ogr*
 %{_bindir}/8211*
 %{_bindir}/s57*
 %{_bindir}/testepsg
 %{_bindir}/gnmanalyse
 %{_bindir}/gnmmanage
+%{_datadir}/bash-completion/completions/*
 %{_mandir}/man1/gdal*.1*
 %exclude %{_mandir}/man1/gdal-config.1*
 %exclude %{_mandir}/man1/gdal2tiles.1*
@@ -610,8 +612,8 @@ popd
 
 %files libs
 %doc LICENSE.TXT NEWS PROVENANCE.TXT COMMITTERS PROVENANCE.TXT-fedora
-%{_libdir}/libgdal.so.26
-%{_libdir}/libgdal.so.26.*
+%{_libdir}/libgdal.so.27
+%{_libdir}/libgdal.so.27.*
 %{_datadir}/%{name}
 #TODO: Possibly remove files like .dxf, .dgn, ...
 %dir %{_libdir}/%{name}plugins
@@ -625,12 +627,15 @@ popd
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/%{name}.pc
 
+# No complete java yet in EL8
+%if 0%{?rhel} < 8
 # Can I even have a separate Java package anymore?
 %files java -f .mfiles
 %doc swig/java/apps
 %{_jnidir}/%{name}/libgdalalljni.so*
 
 %files javadoc -f .mfiles-javadoc
+%endif
 
 %files perl
 %doc swig/perl/README
@@ -675,7 +680,7 @@ popd
 %endif
 
 %files doc
-%doc gdal_frmts ogrsf_frmts refman
+%doc doc/build/html frmts/iso8211/iso8211_html
 
 #TODO: jvm
 #Should be managed by the Alternatives system and not via ldconfig
@@ -686,6 +691,60 @@ popd
 #Or as before, using ldconfig
 
 %changelog
+* Tue Jan  5 23:46:53 WET 2021 José Matos <jamatos@fedoraproject.org> - 3.1.4-2
+- rebuild for armadillo 10
+
+* Mon Nov 02 2020 Sandro Mani <manisandro@gmail.com> - 3.1.4-1
+- Update to 3.1.4
+
+* Wed Oct 28 2020 Jeff Law <law@redhat.com> - 3.1.3-3
+- Fix missing #include for gcc-11
+
+* Fri Oct 16 21:25:24 CEST 2020 Sandro Mani <manisandro@gmail.com> - 3.1.3-2
+- Rebuild (jasper)
+
+* 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
+
+* Wed Jul 22 09:48:50 GMT 2020 Sandro Mani <manisandro@gmail.com> - 3.1.2-5
+- Rebuild (poppler)
+
+* Thu Jul 16 2020 Jiri Vanek <jvanek@redhat.com> - 3.1.2-4
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Wed Jul 15 15:55:55 GMT 2020 Sandro Mani <manisandro@gmail.com> - 3.1.2-3
+- Rebuild (poppler)
+
+* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 3.1.2-2
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* 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
+
+* Sat Jun 27 2020 Jitka Plesnikova <jplesnik@redhat.com> - 3.1.0-5
+- Perl 5.32 re-rebuild updated packages
+
+* Fri Jun 26 2020 Orion Poplawski <orion@nwra.com> - 3.1.0-4
+- Rebuild for hdf5 1.10.6
+
+* Thu Jun 25 2020 Jitka Plesnikova <jplesnik@redhat.com> - 3.1.0-3
+- Perl 5.32 rebuild
+
+* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 3.1.0-2
+- Rebuilt for Python 3.9
+
+* Tue May 12 2020 Sandro Mani <manisandro@gmail.com> - 3.1.0-1
+- Update to 3.1.0
+
+* Sat May 09 2020 Markus Neteler <neteler@mundialis.de> - 3.0.4-5
+* disabled JAVA and LaTeX support for EPEL8, due to (yet) missing dependencies
+
 * Wed Apr 22 2020 Björn Esser <besser82@fedoraproject.org> - 3.0.4-4
 - Re-enable annobin
 

gdal_installapps.patch

@@ -1,7 +1,7 @@
-diff -rupN --no-dereference gdal-3.0.4-fedora/apps/GNUmakefile gdal-3.0.4-fedora-new/apps/GNUmakefile
---- gdal-3.0.4-fedora/apps/GNUmakefile	2020-01-28 11:13:12.000000000 +0100
-+++ gdal-3.0.4-fedora-new/apps/GNUmakefile	2020-03-03 23:17:41.032487778 +0100
-@@ -216,6 +216,7 @@ gdal-config-inst:	gdal-config.in ../GDAL
+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
+@@ -233,6 +233,7 @@ gdal-config-inst:	gdal-config.in ../GDAL
  
  install: default
  	for f in $(BIN_LIST) ; do $(INSTALL) $$f $(DESTDIR)$(INST_BIN) ; done

gdal_iso8211.patch

@@ -1,6 +1,6 @@
-diff -rupN gdal-3.0.4-fedora/frmts/iso8211/GNUmakefile gdal-3.0.4-fedora-new/frmts/iso8211/GNUmakefile
---- gdal-3.0.4-fedora/frmts/iso8211/GNUmakefile	2020-01-28 11:13:11.000000000 +0100
-+++ gdal-3.0.4-fedora-new/frmts/iso8211/GNUmakefile	2020-02-06 00:24:10.382117696 +0100
+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
 @@ -23,8 +23,7 @@ dist-clean:	clean
  	rm -rf $(DISTDIR)
  

gdal_nopdf.patch

@@ -0,0 +1,12 @@
+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
+ 
+ .. include:: ./about_no_title.rst
+ 
+-This documentation is also available as a `PDF file <gdal.pdf>`_.
+-
+ .. toctree::
+     :maxdepth: 2
+ 

gdal_sphinx.patch

@@ -0,0 +1,12 @@
+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
+@@ -2,7 +2,7 @@
+ #
+ 
+ # You can set these variables from the command line.
+-SPHINXOPTS    = --keep-going -j auto -W
++SPHINXOPTS    = --keep-going
+ SPHINXBUILD   = sphinx-build
+ SOURCEDIR     = source
+ BUILDDIR      = build

gdal_tirpcinc.patch

@@ -1,6 +1,6 @@
-diff -rupN --no-dereference gdal-3.0.4-fedora/frmts/dods/GNUmakefile gdal-3.0.4-fedora-new/frmts/dods/GNUmakefile
---- gdal-3.0.4-fedora/frmts/dods/GNUmakefile	2020-01-28 11:13:11.000000000 +0100
-+++ gdal-3.0.4-fedora-new/frmts/dods/GNUmakefile	2020-02-06 00:23:36.543285168 +0100
+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
 @@ -4,7 +4,7 @@ include ../../GDALmake.opt
  
  OBJ	=	dodsdataset2.o
@@ -10,9 +10,9 @@ diff -rupN --no-dereference gdal-3.0.4-fedora/frmts/dods/GNUmakefile gdal-3.0.4-
  
  default:	$(OBJ:.o=.$(OBJ_EXT))
  
-diff -rupN --no-dereference gdal-3.0.4-fedora/ogr/ogrsf_frmts/dods/GNUmakefile gdal-3.0.4-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile
---- gdal-3.0.4-fedora/ogr/ogrsf_frmts/dods/GNUmakefile	2020-01-28 11:13:11.000000000 +0100
-+++ gdal-3.0.4-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile	2020-02-06 00:23:36.543285168 +0100
+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
 @@ -5,7 +5,7 @@ include ../../../GDALmake.opt
  OBJ	=	ogrdodsdriver.o ogrdodsdatasource.o ogrdodslayer.o \
  		ogrdodssequencelayer.o ogrdodsfielddefn.o ogrdodsgrid.o

sources

@@ -1,2 +1,2 @@
-SHA512 (gdal-3.0.4-fedora.tar.xz) = f880a763cbf3e846789df4c45a68be11121fdc66252dab126d95b79141589435ef7712ed0efcb7d633643f2c82cde88f9663bb15b624e69f362ed2e10a79a110
-SHA512 (gdalautotest-3.0.4.tar.gz) = d205c6eba1c68ade3cd55b9ae77c9a885f1ff87f6964ea4e71799bc98393ddcf92081a5319afd3d0d9d0cf8862d140eb59ad2ccf7e70a955cad2732f55c28e72
+SHA512 (gdal-3.1.4-fedora.tar.xz) = 191e52c9d01a349a2036fb82f10aad8f2945b1bc0c10e04d568d10644e0b64e503efc38c38f73ab9a80d0ece39ae625b64531eededb91af7b7ea95ad3dcc4105
+SHA512 (gdalautotest-3.1.4.tar.gz) = 656215632d37fd9dba377ef28d44dce47bcda6cd3ce8eeddf48c22d810f906e805664b2980d04f07ae4653fc3b385a7ee321e0fe7d69f9c2d83d2b271367161c