Upload correct gdalautotest source

https://fedoraproject.org/wiki/Changes/Java17

.gitignore

@@ -43,3 +43,35 @@ 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
+/gdalautotest-3.2.0.tar.gz
+/gdal-3.2.0-fedora.tar.xz
+/gdal-3.2.1-fedora.tar.xz
+/gdalautotest-3.2.1.tar.gz
+/gdalautotest-3.2.2.tar.gz
+/gdal-3.2.2-fedora.tar.xz
+/gdalautotest-3.3.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
+/gdal-3.3.3-fedora.tar.xz
+/gdalautotest-3.3.3.tar.gz
+/gdal-3.4.0-fedora.tar.xz
+/gdalautotest-3.4.0.tar.gz
+/gdal-3.4.1-fedora.tar.xz
+/gdalautotest-3.4.1.tar.gz
+/gdal-3.4.2-fedora.tar.xz
+/gdalautotest-3.4.2.tar.gz
+/gdal-3.4.3-fedora.tar.xz
+/gdalautotest-3.4.3.tar.gz

gdal-1.9.0-java.patch

@@ -1,11 +0,0 @@
-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
-@@ -7,6 +7,6 @@ JAVADOC=$(JAVA_HOME)/bin/javadoc
- JAVAC=$(JAVA_HOME)/bin/javac
- JAVA=$(JAVA_HOME)/bin/java
- JAR=$(JAVA_HOME)/bin/jar
--JAVA_INCLUDE=-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
-+JAVA_INCLUDE=-I/usr/lib/jvm/java/include/ -I/usr/lib/jvm/java/include/linux
- 
- 

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,33 @@
+diff -rupN --no-dereference gdal-3.4.3-fedora/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp gdal-3.4.3-fedora-new/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp
+--- gdal-3.4.3-fedora/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp	2022-04-22 11:03:21.000000000 +0200
++++ gdal-3.4.3-fedora-new/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp	2022-05-04 16:04:12.433118621 +0200
+@@ -34,6 +34,7 @@
+ #include <limits>
+ #include <math.h>
+ #include <algorithm>
++#include <limits>
+ 
+ //------------------------------------------------------------------------------
+ // CADVector
+diff -rupN --no-dereference gdal-3.4.3-fedora/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp gdal-3.4.3-fedora-new/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
+--- gdal-3.4.3-fedora/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp	2022-04-22 11:03:20.000000000 +0200
++++ gdal-3.4.3-fedora-new/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp	2022-05-04 16:04:12.434118533 +0200
+@@ -39,6 +39,7 @@
+ #include <limits>
+ #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
+diff -rupN --no-dereference gdal-3.4.3-fedora/third_party/LercLib/Lerc2.h gdal-3.4.3-fedora-new/third_party/LercLib/Lerc2.h
+--- gdal-3.4.3-fedora/third_party/LercLib/Lerc2.h	2022-04-22 11:02:29.000000000 +0200
++++ gdal-3.4.3-fedora-new/third_party/LercLib/Lerc2.h	2022-05-04 16:04:12.434118533 +0200
+@@ -30,6 +30,7 @@ Contributors:  Thomas Maurer
+ #include <limits>
+ #include <string>
+ #include <typeinfo>
++#include <limits>
+ #include "Defines.h"
+ #include "BitMask.h"
+ #include "BitStuffer2.h"

gdal.spec

@@ -1,4 +1,3 @@
-#TODO: Create script to make clean tarball
 #TODO: msg needs to have PublicDecompWT.zip from EUMETSAT, which is not free;
 #      Building without msg therefore
 #TODO: e00compr bundled?
@@ -9,8 +8,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.4.3
+%global run_tests 1
 
 %global bashcompletiondir %(pkg-config --variable=compatdir bash-completion)
 
@@ -32,7 +31,6 @@
 %global spatialite "--with-spatialite"
 %endif
 
-%bcond_with python2
 %bcond_without python3
 
 # No ppc64 build for spatialite in EL6
@@ -45,8 +43,8 @@
 %endif
 
 Name:          gdal
-Version:       3.0.4
-Release:       4%{?dist}%{?bootstrap:.%{bootstrap}.bootstrap}
+Version:       3.4.3
+Release:       1%{?dist}
 Summary:       GIS file format library
 License:       MIT
 URL:           http://www.gdal.org
@@ -61,16 +59,26 @@ 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
+# Java build fixes
+Patch2:        gdal_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
+# Drop -diag-disable compile flag
+Patch9:        gdal_no-diag-disable.patch
+# Fix build with autoconf 2.70
+Patch10:       gdal_autoconf270.patch
+
 
 BuildRequires: gcc
 BuildRequires: gcc-c++
@@ -78,38 +86,38 @@ BuildRequires: libtool
 BuildRequires: automake
 BuildRequires: autoconf
 BuildRequires: ant
-# No armadillo in EL5
 BuildRequires: armadillo-devel
 BuildRequires: bash-completion
 BuildRequires: cfitsio-devel
-# No CharLS in EL5
 #BuildRequires: CharLS-devel
 BuildRequires: chrpath
 BuildRequires: curl-devel
 BuildRequires: doxygen
 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
 BuildRequires: libgta-devel
 
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
-# No libkml in EL
 BuildRequires: libkml-devel
 
 %if %{with_spatialite}
@@ -117,7 +125,6 @@ BuildRequires: libspatialite-devel
 %endif
 
 BuildRequires: libtiff-devel
-# No libwebp in EL 5 and 6
 BuildRequires: libwebp-devel
 BuildRequires: libtool
 BuildRequires: giflib-devel
@@ -139,13 +146,12 @@ BuildRequires: poppler-devel
 %endif
 BuildRequires: libpq-devel
 BuildRequires: proj-devel >= 5.2.0
-%if %{with python2}
-BuildRequires: python2-devel
-BuildRequires: python2-numpy
-%endif
 %if %{with python3}
 BuildRequires: python3-devel
 BuildRequires: python3-numpy
+BuildRequires: python3-setuptools
+BuildRequires: python3dist(pytest) >= 3.6
+BuildRequires: python3dist(lxml) >= 4.5.1
 %endif
 BuildRequires: sqlite-devel
 BuildRequires: swig
@@ -155,11 +161,10 @@ 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
+BuildRequires: make
 
 # Run time dependency for gpsbabel driver
 Requires:      gpsbabel
@@ -173,7 +178,6 @@ Requires:      %{name}-libs%{?_isa} = %{version}-%{release}
   %global cpuarch 64
 %endif
 
-#TODO: Description on the lib?
 %description
 Geospatial Data Abstraction Library (GDAL/OGR) is a cross platform
 C++ translator library for raster and vector geospatial data formats.
@@ -203,6 +207,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 +225,7 @@ BuildArch:      noarch
 
 %description javadoc
 This package contains the API documentation for %{name}.
+%endif
 
 
 %package perl
@@ -229,22 +236,6 @@ Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $versi
 %description perl
 The GDAL Perl modules provide support to handle multiple GIS file formats.
 
-%if %{with python2}
-%package -n python2-gdal
-%{?python_provide:%python_provide python2-gdal}
-# Remove before F30
-Provides: %{name}-python = %{version}-%{release}
-Provides: %{name}-python%{?_isa} = %{version}-%{release}
-Obsoletes: %{name}-python < %{version}-%{release}
-Summary:        Python modules for the GDAL file format library
-Requires:       numpy
-Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
-
-%description -n python2-gdal
-The GDAL Python modules provide support to handle multiple GIS file formats.
-The package also includes a couple of useful utilities in Python.
-%endif
-
 
 %if %{with python3}
 %package -n python3-gdal
@@ -260,10 +251,10 @@ The GDAL Python 3 modules provide support to handle multiple GIS file formats.
 %endif
 
 
-%if %{with python2} || %{with python3}
+%if %{with python3}
 %package python-tools
 Summary:        Python tools for the GDAL file format library
-Requires:       %{?with_python3:python3-gdal}%{?!with_python3:python2-gdal}
+Requires:       python3-gdal
 
 %description python-tools
 The GDAL Python package provides number of tools for programming and
@@ -278,17 +269,13 @@ BuildArch:      noarch
 %description doc
 This package contains documentation for GDAL.
 
+
 # We don't want to provide private Python extension libs
-%if %{with python2} && %{with python3}
-%global __provides_exclude_from ^(%{python2_sitearch}|%{python3_sitearch})/.*\.so$
-%elif %{with python2}
-%global __provides_exclude_from ^%{python2_sitearch}/.*\.so$
-%elif %{with_python3}
+%if %{with_python3}
 %global __provides_exclude_from ^%{python3_sitearch}/.*\.so$
 %endif
 
 
-
 %prep
 %autosetup -p1 -n %{name}-%{version}-fedora -a 1
 
@@ -304,18 +291,12 @@ rm -rf frmts/gtiff/libtiff
 # Copy in PROVENANCE.TXT-fedora
 cp -p %SOURCE4 .
 
-# Sanitize permissions
-chmod 644 apps/gnmanalyse.cpp apps/gnmmanage.cpp
-
 # Adjust check for LibDAP version
 # http://trac.osgeo.org/gdal/ticket/4545
 %if %cpuarch == 64
   sed -i 's|with_dods_root/lib|with_dods_root/lib64|' configure.ac
 %endif
 
-# Fix mandir
-sed -i "s|^mandir=.*|mandir='\${prefix}/share/man'|" configure.ac
-
 
 %build
 # For future reference:
@@ -325,9 +306,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 +322,9 @@ autoreconf -ifv
 	--with-hdf4                 \
 	--with-hdf5                 \
 	--with-jasper               \
+%if 0%{?rhel} < 8
 	--with-java                 \
+%endif
 	--with-jpeg                 \
 	--with-libjson-c            \
 	--without-jpeg12            \
@@ -369,23 +352,28 @@ 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
+  ANT_OPTS="-Dfile.encoding=utf-8" 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
-  %{?with_python2:%py2_build}
   %{?with_python3:%py3_build}
 popd
 
@@ -395,29 +383,9 @@ 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
-  %{?with_python2:%py2_install}
   %{?with_python3:%py3_install}
 popd
 
@@ -425,19 +393,23 @@ 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}
+%if %{without python3}
 rm %buildroot%_mandir/man1/{pct2rgb,rgb2pct}.1
 %endif
 
@@ -446,6 +418,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 +434,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
@@ -498,7 +458,7 @@ cat > %{buildroot}%{_includedir}/%{name}/cpl_config.h <<EOF
 #endif
 EOF
 #<<<<<<<<<<<<<
-touch -r NEWS port/cpl_config.h
+touch -r NEWS.md port/cpl_config.h
 
 
 # Multilib gdal-config
@@ -522,59 +482,62 @@ x86_64 | ppc64 | ppc64le | ia64 | s390x | sparc64 | alpha | alphaev6 | aarch64 )
 esac
 EOF
 #<<<<<<<<<<<<<
-touch -r NEWS %{buildroot}%{_bindir}/%{name}-config
+touch -r NEWS.md %{buildroot}%{_bindir}/%{name}-config
 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}
-	#TODO: Nötig?
 	export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%{buildroot}%{_libdir}
-	# export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%%{buildroot}%%{_libdir}:$java_inc
-
 	export GDAL_DATA=%{buildroot}%{_datadir}/%{name}/
 
 	# Enable these tests on demand
 	#export GDAL_RUN_SLOW_TESTS=1
 	#export GDAL_DOWNLOAD_TEST_DATA=1
 
-	# Remove some test cases that would require special preparation
-	rm -rf ogr/ogr_pg.py # No database available
-	rm -rf ogr/ogr_mysql.py # No database available
-	rm -rf osr/osr_esri.py # ESRI datum absent
-	rm -rf osr/osr_erm.py # File from ECW absent
-
-	# Run tests but force normal exit in the end
-	./run_all.py || true
+	# Some tests are currently skipped:
+	# - `test_fits_vector` because it's crashing.
+	# - `test_http*`, `test_jp2openjpeg_45`, `*multithreaded_download*`,
+	#   `*multithreaded_upload*`, and `test_vsis3_no_sign_request`, which
+	#   try to connect externally.
+	# - `test_eedai_GOOGLE_APPLICATION_CREDENTIALS` which seems to use the
+	#   internet.
+	# - `test_osr_erm_1`, `test_ers_4`, `test_ers_8`, and `test_ers_10` as
+	#   they use `ecw_cs.wkt` which was removed due to unclear license.
+        # - `test_jpeg2000_8` and `test_jpeg2000_11` as files don't load,
+        #   perhaps due to buggy Jasper library?
+        # - `test_osr_ct_options_area_of_interest` returns the wrong value, but
+        #   it's skipped on macOS by upstream for mysteriously failing as well,
+        #   so do the same here.
+# FIXME: Some Tests hang on i686 and armv7hl
+%ifnarch i686 armv7hl
+%{pytest} -v -k 'not test_fits_vector and not test_http and not test_jp2openjpeg_45 and not multithreaded_download and not multithreaded_upload and not test_vsis3_no_sign_request and not test_eedai_GOOGLE_APPLICATION_CREDENTIALS and not test_osr_erm_1 and not test_ers_4 and not test_ers_8 and not test_ers_10 and not test_jpeg2000_8 and not test_jpeg2000_11 and not test_osr_ct_options_area_of_interest' || :
+%endif
 popd
 %endif
-#%%{run_tests}
-
-
-%ldconfig_scriptlets libs
 
 
 %files
-%{bashcompletiondir}/*
 %{_bindir}/gdallocationinfo
 %{_bindir}/gdal_contour
+%{_bindir}/gdal_create
 %{_bindir}/gdal_rasterize
 %{_bindir}/gdal_translate
 %{_bindir}/gdaladdo
@@ -586,16 +549,18 @@ popd
 %{_bindir}/gdal_grid
 %{_bindir}/gdalenhance
 %{_bindir}/gdalmanage
-%{_bindir}/gdalserver
 %{_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*
@@ -609,11 +574,11 @@ popd
 
 
 %files libs
-%doc LICENSE.TXT NEWS PROVENANCE.TXT COMMITTERS PROVENANCE.TXT-fedora
-%{_libdir}/libgdal.so.26
-%{_libdir}/libgdal.so.26.*
+%license LICENSE.TXT
+%doc NEWS.md PROVENANCE.TXT COMMITTERS PROVENANCE.TXT-fedora
+%{_libdir}/libgdal.so.30
+%{_libdir}/libgdal.so.30.*
 %{_datadir}/%{name}
-#TODO: Possibly remove files like .dxf, .dgn, ...
 %dir %{_libdir}/%{name}plugins
 
 %files devel
@@ -625,44 +590,28 @@ 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
 %{perl_vendorarch}/*
 %{_mandir}/man3/*.3pm*
 
-%if %{with python2}
-%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*
-%endif
-
 %if %{with python3}
 %files -n python3-gdal
 %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*
-%endif
+%{python3_sitearch}/GDAL-%{version}-py*.egg-info/
+%{python3_sitearch}/osgeo/
+%{python3_sitearch}/osgeo_utils/
 
-%if %{with python2} || %{with python3}
 %files python-tools
 %_bindir/*.py
 %{_mandir}/man1/pct2rgb.1*
@@ -675,7 +624,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 +635,171 @@ popd
 #Or as before, using ldconfig
 
 %changelog
+* Wed May 04 2022 Sandro Mani <manisandro@gmail.com> - 3.4.3-1
+- Update to 3.4.3
+
+* Mon Mar 14 2022 Sandro Mani <manisandro@gmail.com> - 3.4.2-1
+- Update to 3.4.2
+
+* Thu Mar 10 2022 Sandro Mani <manisandro@gmail.com> - 3.4.1-6
+- Rebuild for proj-9.0.0
+
+* Sun Feb 13 2022 Josef Ridky <jridky@redhat.com> - 3.4.1-5
+- Rebuilt for libjasper.so.6
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 3.4.1-4
+- Rebuilt for java-17-openjdk as system jdk
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Jan 13 2022 Sandro Mani <manisandro@gmail.com> - 3.4.1-2
+- Rebuild (poppler)
+
+* Tue Jan 04 2022 Sandro Mani <manisandro@gmail.com> - 3.4.1-1
+- Update to 3.4.1
+
+* Sun Nov 21 2021 Orion Poplawski <orion@nwra.com> - 3.4.0-2
+- Rebuild for hdf5 1.12.1
+
+* Mon Nov 08 2021 Sandro Mani <manisandro@gmail.com> - 3.4.0-1
+- Update to 3.4.0
+
+* Fri Oct 29 2021 Sandro Mani <manisandro@gmail.com> - 3.3.3-1
+- Update to 3.3.3
+
+* Thu Oct 21 2021 Sandro Mani <manisandro@gmail.com> - 3.3.2-3
+- Rebuild (geos)
+
+* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 3.3.2-2
+- Rebuilt with OpenSSL 3.0.0
+
+* 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
+
+* Mon Aug 02 2021 Sandro Mani <manisandro@gmail.com> - 3.3.1-4
+- Rebuild (poppler)
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Sat Jul 10 2021 Björn Esser <besser82@fedoraproject.org> - 3.3.1-2
+- Rebuild for versioned symbols in json-c
+
+* Mon Jul 05 2021 Sandro Mani <manisandro@gmail.com> - 3.3.1-1
+- Update to 3.3.1
+
+* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 3.3.0-7
+- Rebuilt for Python 3.10
+
+* Mon May 24 2021 Jitka Plesnikova <jplesnik@redhat.com> - 3.3.0-6
+- Perl 5.34 re-rebuild updated packages
+
+* Fri May 21 2021 Sandro Mani <manisandro@gmail.com> - 3.3.0-5
+- Rebuild (libgta)
+
+* Fri May 21 2021 Jitka Plesnikova <jplesnik@redhat.com> - 3.3.0-4
+- Perl 5.34 rebuild
+
+* Thu May 20 2021 Richard Shaw <hobbes1069@gmail.com> - 3.3.0-3
+- Rebuilding for libgta 1.2.1.
+
+* Fri May 07 2021 Sandro Mani <manisandro@gmail.com> - 3.3.0-2
+- Rebuild (gdal)
+
+* Mon May 03 2021 Sandro Mani <manisandro@gmail.com> - 3.3.0-1
+- Update to 3.3.0
+
+* Wed Mar 24 2021 Sandro Mani <manisandro@gmail.com> - 3.2.2-1
+- Update to 3.2.2
+
+* Sun Mar 07 2021 Sandro Mani <manisandro@gmail.com> - 3.2.1-10
+- Rebuild (proj)
+
+* Tue Feb 23 2021 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.2.1-9
+- Fix compile against GEOS on s390x
+
+* Sat Feb 13 2021 Sandro Mani <manisandro@gmail.com> - 3.2.1-8
+- Rebuild (geos)
+
+* Sat Feb 13 2021 Sandro Mani <manisandro@gmail.com> - 3.2.1-7
+- Rebuild (geos)
+
+* Mon Feb 08 2021 Pavel Raiskup <praiskup@redhat.com> - 3.2.1-6
+- rebuild for libpq ABI fix rhbz#1908268
+
+* Mon Feb 01 2021 Orion Poplawski <orion@nwra.com> - 3.2.1-5
+- Rebuild for cfitsio 3.490
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Fri Jan 15 11:51:40 CET 2021 Sandro Mani <manisandro@gmail.com> - 3.2.1-3
+- Rebuild (poppler)
+
+* Tue Jan  5 18:08:07 WET 2021 José Matos <jamatos@fedoraproject.org> - 3.2.1-2
+- rebuild for armadillo 10
+
+* Mon Jan 04 2021 Sandro Mani <manisandro@gmail.coM> - 3.2.1-1
+- Update to 3.2.1
+
+* Thu Nov 05 2020 Sandro Mani <manisandro@gmail.com> - 3.2.0-1
+- Update to 3.2.0
+
+* 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_autoconf270.patch

@@ -0,0 +1,12 @@
+diff -rupN --no-dereference gdal-3.4.3-fedora/m4/lib-link.m4 gdal-3.4.3-fedora-new/m4/lib-link.m4
+--- gdal-3.4.3-fedora/m4/lib-link.m4	2022-04-22 11:03:37.000000000 +0200
++++ gdal-3.4.3-fedora-new/m4/lib-link.m4	2022-05-04 16:04:12.870079834 +0200
+@@ -108,8 +108,6 @@ dnl   acl_hardcode_direct,
+ dnl   acl_hardcode_minus_L.
+ AC_DEFUN([AC_LIB_RPATH],
+ [
+-  dnl Tell automake >= 1.10 to complain if config.rpath is missing.
+-  m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
+   AC_REQUIRE([AC_PROG_CC])                dnl we use $CC, $GCC, $LDFLAGS
+   AC_REQUIRE([AC_LIB_PROG_LD])            dnl we use $LD, $with_gnu_ld
+   AC_REQUIRE([AC_CANONICAL_HOST])         dnl we use $host

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.4.3-fedora/apps/GNUmakefile gdal-3.4.3-fedora-new/apps/GNUmakefile
+--- gdal-3.4.3-fedora/apps/GNUmakefile	2022-04-22 11:02:04.000000000 +0200
++++ gdal-3.4.3-fedora-new/apps/GNUmakefile	2022-05-04 16:04:11.984158476 +0200
+@@ -232,6 +232,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.4.3-fedora/frmts/iso8211/GNUmakefile gdal-3.4.3-fedora-new/frmts/iso8211/GNUmakefile
+--- gdal-3.4.3-fedora/frmts/iso8211/GNUmakefile	2022-04-22 11:02:04.000000000 +0200
++++ gdal-3.4.3-fedora-new/frmts/iso8211/GNUmakefile	2022-05-04 16:04:11.552196892 +0200
 @@ -23,8 +23,7 @@ dist-clean:	clean
  	rm -rf $(DISTDIR)
  

gdal_java.patch

@@ -0,0 +1,98 @@
+diff -rupN --no-dereference gdal-3.4.3-fedora/swig/java/add_javadoc.c gdal-3.4.3-fedora-new/swig/java/add_javadoc.c
+--- gdal-3.4.3-fedora/swig/java/add_javadoc.c	2022-04-22 11:02:06.000000000 +0200
++++ gdal-3.4.3-fedora-new/swig/java/add_javadoc.c	2022-05-04 16:04:11.092237798 +0200
+@@ -142,21 +142,21 @@ int main(int argc, char* argv[])
+     JavaDocInstance* instances = (JavaDocInstance*)calloc(sizeof(JavaDocInstance), 3000);
+     int nInstances = 0;
+     char szLine[512];
+-    char szClass[256];
++    char szClass[512];
+     char javadoc[16384];
+     szClass[0] = 0;
+-    while(fgets(szLine, 255, fSrc))
++    while(fgets(szLine, 511, fSrc))
+     {
+         if (strstr(szLine, "/**") == NULL) continue;
+ begin:
+         strcpy(javadoc, szLine);
+-        while(fgets(szLine, 255, fSrc))
++        while(fgets(szLine, 511, fSrc))
+         {
+             strcat(javadoc, szLine);
+             if (strstr(szLine, "*/"))
+                 break;
+         }
+-        while(fgets(szLine, 255, fSrc))
++        while(fgets(szLine, 511, fSrc))
+         {
+             if (szLine[0] == 10)
+                 continue;
+@@ -209,10 +209,10 @@ begin:
+             continue;
+         }
+         szClass[0] = 0;
+-        char szPackage[256];
++        char szPackage[512];
+         szPackage[0] = 0;
+ 
+-        while(fgets(szLine, 255, fSrc))
++        while(fgets(szLine, 511, fSrc))
+         {
+             char szMethodName[1024];
+             char* szOriLine = strdup(szLine);
+@@ -255,7 +255,7 @@ begin:
+                     strcpy(szMethodName, szLine);
+                     do
+                     {
+-                        ignore_ret(fgets(szLine, 255, fSrc));
++                        ignore_ret(fgets(szLine, 511, fSrc));
+                         strcpy(szMethodName + strlen(szMethodName) - 1, szLine);
+                     } while (!strchr(szMethodName,')'));
+                     strcpy(szLine, szMethodName);
+@@ -282,7 +282,7 @@ begin:
+                             {
+                                 do
+                                 {
+-                                    ignore_ret(fgets(szLine, 255, fSrc));
++                                    ignore_ret(fgets(szLine, 511, fSrc));
+                                 } while (!strchr(szLine,'}'));
+                             }
+                             break;
+@@ -310,7 +310,7 @@ begin:
+                                         nBrackets --;
+                                     }
+                                 }
+-                                ignore_ret(fgets(szLine, 255, fSrc));
++                                ignore_ret(fgets(szLine, 511, fSrc));
+                             } while(bFoundOpen == FALSE || nBrackets > 0);
+                         }
+                         else
+diff -rupN --no-dereference gdal-3.4.3-fedora/swig/java/javadoc.java gdal-3.4.3-fedora-new/swig/java/javadoc.java
+--- gdal-3.4.3-fedora/swig/java/javadoc.java	2022-04-22 11:02:07.000000000 +0200
++++ gdal-3.4.3-fedora-new/swig/java/javadoc.java	2022-05-04 16:04:11.094237621 +0200
+@@ -11982,12 +11982,12 @@ public interface osrConstants:public fin
+ public interface osrConstants:public final static int PROJ_ERR_COORD_TRANSFM
+ 
+ /**
+- * Invalid input coordinate. e.g a latitude > 90°.
++ * Invalid input coordinate. e.g a latitude > 90 deg.
+  */
+ public interface osrConstants:public final static int PROJ_ERR_COORD_TRANSFM_INVALID_COORD
+ 
+ /**
+- * Coordinate is outside of the projection domain. e.g approximate mercator with \|longitude - lon_0\| > 90°,
++ * Coordinate is outside of the projection domain. e.g approximate mercator with \|longitude - lon_0\| > 90 deg,
+  * 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.4.3-fedora/swig/java/java.opt gdal-3.4.3-fedora-new/swig/java/java.opt
+--- gdal-3.4.3-fedora/swig/java/java.opt	2022-04-22 11:02:04.000000000 +0200
++++ gdal-3.4.3-fedora-new/swig/java/java.opt	2022-05-04 16:04:11.094237621 +0200
+@@ -7,6 +7,6 @@ JAVADOC=$(JAVA_HOME)/bin/javadoc
+ JAVAC=$(JAVA_HOME)/bin/javac
+ JAVA=$(JAVA_HOME)/bin/java
+ JAR=$(JAVA_HOME)/bin/jar
+-JAVA_INCLUDE=-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
++JAVA_INCLUDE=-I/usr/lib/jvm/java/include/ -I/usr/lib/jvm/java/include/linux
+ 
+ 

gdal_no-diag-disable.patch

@@ -0,0 +1,12 @@
+diff -rupN --no-dereference gdal-3.4.3-fedora/configure.ac gdal-3.4.3-fedora-new/configure.ac
+--- gdal-3.4.3-fedora/configure.ac	2022-04-22 11:02:04.000000000 +0200
++++ gdal-3.4.3-fedora-new/configure.ac	2022-05-04 16:04:12.651099272 +0200
+@@ -73,7 +73,7 @@ dnl warning #2304: non-explicit construc
+ dnl warning #3280: declaration hides member
+ dnl remark #11074: Inlining inhibited by limit max-size
+ dnl remark #11076: To get full report use -qopt-report=4 -qopt-report-phase ipo
+-AX_CHECK_COMPILE_FLAG([-diag-disable 188,1684,2259,2304,3280,11074,11076],[C_WFLAGS="$C_WFLAGS -diag-disable 188,1684,2259,2304,3280,11074,11076" CXX_WFLAGS="$CXX_WFLAGS -diag-disable 188,1684,2259,2304,3280,11074,11076"],,[$ERROR_ON_UNKNOWN_OPTIONS])
++#AX_CHECK_COMPILE_FLAG([-diag-disable 188,1684,2259,2304,3280,11074,11076],[C_WFLAGS="$C_WFLAGS -diag-disable 188,1684,2259,2304,3280,11074,11076" CXX_WFLAGS="$CXX_WFLAGS -diag-disable 188,1684,2259,2304,3280,11074,11076"],,[$ERROR_ON_UNKNOWN_OPTIONS])
+ 
+ AX_CHECK_COMPILE_FLAG([-Wextra],[C_WFLAGS="$C_WFLAGS -Wextra" CXX_WFLAGS="$CXX_WFLAGS -Wextra"],,[$ERROR_ON_UNKNOWN_OPTIONS])
+ AX_CHECK_COMPILE_FLAG([-Winit-self],[C_WFLAGS="$C_WFLAGS -Winit-self" CXX_WFLAGS="$CXX_WFLAGS -Winit-self"],,[$ERROR_ON_UNKNOWN_OPTIONS])

gdal_nopdf.patch

@@ -0,0 +1,12 @@
+diff -rupN --no-dereference gdal-3.4.3-fedora/doc/source/index.rst gdal-3.4.3-fedora-new/doc/source/index.rst
+--- gdal-3.4.3-fedora/doc/source/index.rst	2022-04-22 11:02:04.000000000 +0200
++++ gdal-3.4.3-fedora-new/doc/source/index.rst	2022-05-04 16:04:12.215137970 +0200
+@@ -4,8 +4,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.4.3-fedora/doc/Makefile gdal-3.4.3-fedora-new/doc/Makefile
+--- gdal-3.4.3-fedora/doc/Makefile	2022-04-22 11:02:04.000000000 +0200
++++ gdal-3.4.3-fedora-new/doc/Makefile	2022-05-04 16:04:11.767177773 +0200
+@@ -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,24 +1,24 @@
-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.4.3-fedora/frmts/dods/GNUmakefile gdal-3.4.3-fedora-new/frmts/dods/GNUmakefile
+--- gdal-3.4.3-fedora/frmts/dods/GNUmakefile	2022-04-22 11:02:04.000000000 +0200
++++ gdal-3.4.3-fedora-new/frmts/dods/GNUmakefile	2022-05-04 16:04:11.324217168 +0200
 @@ -4,7 +4,7 @@ include ../../GDALmake.opt
  
  OBJ	=	dodsdataset2.o
  
--CPPFLAGS	:=	 $(CPPFLAGS) $(DODS_INC)
-+CPPFLAGS	:=	 $(CPPFLAGS) $(DODS_INC) -I/usr/include/tirpc
+-CPPFLAGS	:=	 $(CPPFLAGS) $(DODS_INC) $(LIBXML2_INC)
++CPPFLAGS	:=	 $(CPPFLAGS) $(DODS_INC) $(LIBXML2_INC) -I/usr/include/tirpc
  
  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.4.3-fedora/ogr/ogrsf_frmts/dods/GNUmakefile gdal-3.4.3-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile
+--- gdal-3.4.3-fedora/ogr/ogrsf_frmts/dods/GNUmakefile	2022-04-22 11:02:04.000000000 +0200
++++ gdal-3.4.3-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile	2022-05-04 16:04:11.324217168 +0200
 @@ -5,7 +5,7 @@ include ../../../GDALmake.opt
  OBJ	=	ogrdodsdriver.o ogrdodsdatasource.o ogrdodslayer.o \
  		ogrdodssequencelayer.o ogrdodsfielddefn.o ogrdodsgrid.o
  
--CPPFLAGS	:=	-I..  $(CPPFLAGS) $(DODS_INC) -DDO_NOT_USE_DEBUG_BOOL
-+CPPFLAGS	:=	-I..  $(CPPFLAGS) $(DODS_INC) -DDO_NOT_USE_DEBUG_BOOL -I/usr/include/tirpc
+-CPPFLAGS	:=	-iquote ..  $(CPPFLAGS) $(DODS_INC) $(LIBXML2_INC) -DDO_NOT_USE_DEBUG_BOOL
++CPPFLAGS	:=	-iquote ..  $(CPPFLAGS) $(DODS_INC) $(LIBXML2_INC) -DDO_NOT_USE_DEBUG_BOOL -I/usr/include/tirpc
  
  default:	$(O_OBJ:.o=.$(OBJ_EXT))
  

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.4.3-fedora.tar.xz) = dc71756be69a98c255ba1f7fded5826848babc2137b2d06dd2919bfa051b4417c8737d3c97f499ba6a7d84bdf6ce2d12e1dd874907399ab6dab29a2d89198f06
+SHA512 (gdalautotest-3.4.3.tar.gz) = 49f97eafbd223f2d6df433ec2936ca781301b3a7edd4ed597e1186139841ace4df2ff221edd46466afbd5d4e3541040bcc92fa779c7f06419472bc9d424a2c80