Downgrade to 3.5.3

This reverts commit f9c99ced77.

.gitignore

@@ -90,5 +90,3 @@ gdalautotest-1.7.0.tar.gz
 /gdal-3.6.1-fedora.tar.xz
 /gdal-3.6.2-fedora.tar.xz
 /gdalautotest-3.6.2.tar.gz
-/gdal-3.6.3-fedora.tar.xz
-/gdalautotest-3.6.3.tar.gz

gdal-fortify-source.patch

@@ -0,0 +1,21 @@
+diff -rupN --no-dereference gdal-3.5.3-fedora/port/vsipreload.cpp gdal-3.5.3-fedora-new/port/vsipreload.cpp
+--- gdal-3.5.3-fedora/port/vsipreload.cpp	2022-10-21 16:57:18.000000000 +0200
++++ gdal-3.5.3-fedora-new/port/vsipreload.cpp	2023-11-07 11:43:16.562899886 +0100
+@@ -46,6 +46,17 @@
+ // LD_PRELOAD=./vsipreload.so ls -al /vsicurl/http://download.osgeo.org/gdal/data/sqlite3
+ // LD_PRELOAD=./vsipreload.so find /vsicurl/http://download.osgeo.org/gdal/data/sqlite3
+ 
++
++/*
++ * We need to export open* etc., but _FORTIFY_SOURCE defines conflicting
++ * always_inline versions. Disable _FORTIFY_SOURCE for this file, so we
++ * can define our overrides.
++ */
++#ifdef _FORTIFY_SOURCE
++#undef _FORTIFY_SOURCE
++#endif
++
++
+ #define _GNU_SOURCE 1
+ #define _LARGEFILE64_SOURCE 1
+ #include <stdio.h>

gdal.spec

@@ -50,16 +50,16 @@
 
 
 Name:          gdal
-Version:       3.6.3
-Release:       1%{?dist}
+Version:       3.6.2
+Release:       8.really3.5.3%{?dist}
 Summary:       GIS file format library
 License:       MIT
 URL:           http://www.gdal.org
 # Source0:   http://download.osgeo.org/gdal/%%{version}/gdal-%%{version}.tar.xz
 # See PROVENANCE.TXT-fedora and the cleaner script for details!
 
-Source0:       %{name}-%{version}%{?pre:%pre}-fedora.tar.xz
-Source1:       http://download.osgeo.org/%{name}/%{version}/%{name}autotest-%{version}%{?pre:%pre}.tar.gz
+Source0:       %{name}-3.5.3%{?pre:%pre}-fedora.tar.xz
+Source1:       http://download.osgeo.org/%{name}/3.5.3/%{name}autotest-3.5.3%{?pre:%pre}.tar.gz
 # Multilib compatible cpl-config.h header
 Source2:       cpl-config.h
 # Multilib compatible gdal-config script
@@ -71,12 +71,16 @@ Source5:       %{name}-cleaner.sh
 
 # Add some utils to the default install target
 Patch0:        gdal_utils.patch
+# Fix build failure
+#   inlining failed in call to ‘always_inline’ ‘open.localalias’
+# See https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/2526 for a similar issue
+Patch1:        gdal-fortify-source.patch
+
 
 BuildRequires: cmake
 BuildRequires: gcc-c++
 
 BuildRequires: armadillo-devel
-BuildRequires: bison
 BuildRequires: cfitsio-devel
 BuildRequires: CharLS-devel
 BuildRequires: curl-devel
@@ -102,7 +106,6 @@ BuildRequires: libspatialite-devel
 BuildRequires: libtiff-devel
 BuildRequires: libtirpc-devel
 BuildRequires: libwebp-devel
-BuildRequires: libzstd-devel
 %if 0%{?with_mysql}
 BuildRequires: mariadb-connector-c-devel
 %endif
@@ -144,7 +147,7 @@ BuildRequires: mingw32-libtiff
 BuildRequires: mingw32-libwebp
 BuildRequires: mingw32-openexr
 BuildRequires: mingw32-openjpeg2
-BuildRequires: mingw32-pcre2
+BuildRequires: mingw32-pcre
 BuildRequires: mingw32-poppler
 BuildRequires: mingw32-postgresql
 BuildRequires: mingw32-proj
@@ -152,7 +155,6 @@ BuildRequires: mingw32-sqlite
 BuildRequires: mingw32-xerces-c
 BuildRequires: mingw32-xz-libs
 BuildRequires: mingw32-zlib
-BuildRequires: mingw32-zstd
 
 BuildRequires: mingw64-filesystem >= 102
 BuildRequires: mingw64-gcc-c++
@@ -174,7 +176,7 @@ BuildRequires: mingw64-libtiff
 BuildRequires: mingw64-libwebp
 BuildRequires: mingw64-openexr
 BuildRequires: mingw64-openjpeg2
-BuildRequires: mingw64-pcre2
+BuildRequires: mingw64-pcre
 BuildRequires: mingw64-poppler
 BuildRequires: mingw64-postgresql
 BuildRequires: mingw64-proj
@@ -182,7 +184,6 @@ BuildRequires: mingw64-sqlite
 BuildRequires: mingw64-xerces-c
 BuildRequires: mingw64-xz-libs
 BuildRequires: mingw64-zlib
-BuildRequires: mingw64-zstd
 %endif
 
 # Python
@@ -353,7 +354,7 @@ MinGW Windows Python3 GDAL bindings.
 %endif
 
 %prep
-%autosetup -N -p1 -n %{name}-%{version}-fedora
+%autosetup -p1 -n %{name}-3.5.3-fedora
 
 # Delete bundled libraries
 rm -rf frmts/zlib
@@ -368,10 +369,7 @@ rm -rf third_party/LercLib
 
 # Setup autotest directory
 tar xf %{SOURCE1}
-mv %{name}autotest-%{version} autotest
-
-# Need to patch autotest
-%autopatch -p1
+mv %{name}autotest-3.5.3 autotest
 
 # Copy in PROVENANCE.TXT-fedora
 cp -a %{SOURCE4} .
@@ -468,8 +466,8 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config
 %files libs
 %license LICENSE.TXT
 %doc NEWS.md PROVENANCE.TXT COMMITTERS PROVENANCE.TXT-fedora
-%{_libdir}/libgdal.so.32
-%{_libdir}/libgdal.so.32.*
+%{_libdir}/libgdal.so.31
+%{_libdir}/libgdal.so.31.*
 %{_datadir}/%{name}/
 %{_libdir}/gdalplugins/
 
@@ -485,7 +483,7 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config
 %if %{with mingw}
 %files -n mingw32-%{name}
 %license LICENSE.TXT
-%{mingw32_bindir}/libgdal-32.dll
+%{mingw32_bindir}/libgdal-31.dll
 %{mingw32_bindir}/gdal-config
 %{mingw32_libdir}/libgdal.dll.a
 %{mingw32_libdir}/cmake/gdal/
@@ -498,7 +496,7 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config
 
 %files -n mingw64-%{name}
 %license LICENSE.TXT
-%{mingw64_bindir}/libgdal-32.dll
+%{mingw64_bindir}/libgdal-31.dll
 %{mingw64_bindir}/gdal-config
 %{mingw64_libdir}/libgdal.dll.a
 %{mingw64_libdir}/cmake/gdal/
@@ -513,7 +511,7 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config
 %if %{with python3}
 %files -n python3-gdal
 %doc swig/python/README.rst
-%{python3_sitearch}/GDAL-%{version}-py*.egg-info/
+%{python3_sitearch}/GDAL-3.5.3-py*.egg-info/
 %{python3_sitearch}/osgeo/
 %{python3_sitearch}/osgeo_utils/
 
@@ -532,7 +530,6 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config
 %{_bindir}/gdalattachpct.py
 %{_bindir}/gdalcompare.py
 %{_bindir}/gdalmove.py
-%{_bindir}/ogr_layer_algebra.py
 %{_bindir}/ogrmerge.py
 %{_bindir}/pct2rgb.py
 %{_bindir}/rgb2pct.py
@@ -541,13 +538,13 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config
 %if %{with mingw}
 %files -n mingw32-python3-%{name}
 %{mingw32_bindir}/*.py
-%{mingw32_python3_sitearch}/GDAL-%{version}-py%{mingw32_python3_version}.egg-info/
+%{mingw32_python3_sitearch}/GDAL-3.5.3-py%{mingw32_python3_version}.egg-info/
 %{mingw32_python3_sitearch}/osgeo/
 %{mingw32_python3_sitearch}/osgeo_utils/
 
 %files -n mingw64-python3-%{name}
 %{mingw64_bindir}/*.py
-%{mingw64_python3_sitearch}/GDAL-%{version}-py%{mingw32_python3_version}.egg-info/
+%{mingw64_python3_sitearch}/GDAL-3.5.3-py%{mingw32_python3_version}.egg-info/
 %{mingw64_python3_sitearch}/osgeo/
 %{mingw64_python3_sitearch}/osgeo_utils/
 %endif
@@ -555,61 +552,19 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config
 
 %if %{with java}
 %files java
-%{_jnidir}/%{name}/gdal-%{version}-sources.jar
-%{_jnidir}/%{name}/gdal-%{version}.jar
-%{_jnidir}/%{name}/gdal-%{version}.pom
+%{_jnidir}/%{name}/gdal-3.5.3-sources.jar
+%{_jnidir}/%{name}/gdal-3.5.3.jar
+%{_jnidir}/%{name}/gdal-3.5.3.pom
 %{_jnidir}/%{name}/libgdalalljni.so
 
 %files javadoc
-%{_jnidir}/%{name}/gdal-%{version}-javadoc.jar
+%{_jnidir}/%{name}/gdal-3.5.3-javadoc.jar
 %endif
 
 
 %changelog
-* Tue Mar 14 2023 Sandro Mani <manisandro@gmail.com> - 3.6.3-1
-- Update to 3.6.3
-
-* Sat Mar 04 2023 Sandro Mani <manisandro@gmail.com> - 3.6.2-6
-- Rebuild (proj)
-
-* Tue Feb 07 2023 Sandro Mani <manisandro@gmail.com> - 3.6.2-5
-- Rebuild (mingw-poppler)
-
-* Sat Feb 04 2023 Sandro Mani <manisandro@gmail.com> - 3.6.2-4
-- Rebuild (poppler)
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Thu Jan 12 2023 Maxwell G <gotmax@e.email> - 3.6.2-2
-- Rebuild for cfitsio 4.2
-
-* Thu Jan 05 2023 Sandro Mani <manisandro@gmail.com> - 3.6.2-1
-- Update to 3.6.2
-
-* Mon Jan 02 2023 Sandro Mani <manisandro@gmail.com> - 3.6.1-3
-- Rebuild (mingw-cfitsio)
-
-* Thu Dec 29 2022 Maxwell G <gotmax@e.email> - 3.6.1-2
-- Rebuild for cfitsio 4.2
-
-* Thu Dec 15 2022 Sandro Mani <manisandro@gmail.com> - 3.6.1-1
-- Update to 3.6.1
-
-* Mon Dec 05 2022 Sandro Mani <manisandro@gmail.com> - 3.6.0-4
-- Rebuild (mingw-xerces-c)
-
-* Mon Dec 05 2022 Sandro Mani <manisandro@gmail.com> - 3.6.0-3
-- Switch to pcre2 for mingw build
-
-* Fri Nov 18 2022 Sandro Mani <manisandro@gmail.com> - 3.6.0-2
-- Rebuild (mingw-postgresql)
-
-* Fri Nov 11 2022 Sandro Mani <manisandro@gmail.com> - 3.6.0-1
-- Update to 3.6.0
-
-* Thu Nov 03 2022 Sandro Mani <manisandro@gmail.com> - 3.6.0-0.1.rc1
-- Update to 3.6.0-rc1
+* Tue Nov 07 2023 Sandro Mani <manisandro@gmail.com> - 3.6.2-8.really3.5.3
+- Revert to 3.5.x series
 
 * Thu Nov 03 2022 Sandro Mani <manisandro@gmail.com> - 3.5.3-2
 - Re-enable java

gdal_utils.patch

@@ -1,6 +1,6 @@
-diff -rupN --no-dereference gdal-3.6.3-fedora/frmts/iso8211/CMakeLists.txt gdal-3.6.3-fedora-new/frmts/iso8211/CMakeLists.txt
---- gdal-3.6.3-fedora/frmts/iso8211/CMakeLists.txt	2023-03-07 18:14:55.000000000 +0100
-+++ gdal-3.6.3-fedora-new/frmts/iso8211/CMakeLists.txt	2023-03-14 09:21:05.455845507 +0100
+diff -rupN --no-dereference gdal-3.5.3-fedora/frmts/iso8211/CMakeLists.txt gdal-3.5.3-fedora-new/frmts/iso8211/CMakeLists.txt
+--- gdal-3.5.3-fedora/frmts/iso8211/CMakeLists.txt	2022-10-21 16:57:17.000000000 +0200
++++ gdal-3.5.3-fedora-new/frmts/iso8211/CMakeLists.txt	2023-11-07 11:43:16.335937254 +0100
 @@ -15,15 +15,18 @@ gdal_standard_includes(gdal_iso8211)
  
  # Because linking an OBJECT library
@@ -23,9 +23,9 @@ diff -rupN --no-dereference gdal-3.6.3-fedora/frmts/iso8211/CMakeLists.txt gdal-
      target_link_libraries(8211createfromxml PRIVATE $<TARGET_NAME:${GDAL_LIB_TARGET_NAME}> gdal_iso8211)
 +    install(TARGETS 8211createfromxml RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
  endif ()
-diff -rupN --no-dereference gdal-3.6.3-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.6.3-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt
---- gdal-3.6.3-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt	2023-03-07 18:14:55.000000000 +0100
-+++ gdal-3.6.3-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt	2023-03-14 09:21:05.455845507 +0100
+diff -rupN --no-dereference gdal-3.5.3-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.5.3-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt
+--- gdal-3.5.3-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt	2022-10-21 16:57:17.000000000 +0200
++++ gdal-3.5.3-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt	2023-11-07 11:43:16.335937254 +0100
 @@ -17,8 +17,9 @@ target_include_directories(ogr_S57 PRIVA
  gdal_standard_includes(ogr_S57)
  

sources

@@ -1,2 +1,2 @@
-SHA512 (gdal-3.6.3-fedora.tar.xz) = cacfde8de337fd922cdd22a6061fe14e28bfbd1e36ff58c0990d20fb1cb23c6e06ea02d8c92745028b1699821c19b00617b2cddfacfbe2f86759cb9c5e1b7013
-SHA512 (gdalautotest-3.6.3.tar.gz) = 2967c07a0c5cb426048ead60b6428e8ebb5c5f4bd1ff7409991537575b5a1eabd1d4da2d65607894e16153fd4ce8a31a501788b938a155ddf8cec581fddac1d4
+SHA512 (gdal-3.5.3-fedora.tar.xz) = da205c1a23cb076b904046d5a9cc8902933abd3e790aed4fb3e60ba39104035e478465eca2ea44b5c9d3e217580d124de4d6e6a6e7d5ac37b91e644beb9cab18
+SHA512 (gdalautotest-3.5.3.tar.gz) = 3b18c94d0b0e1d6d2d38ca82cddc8e69f2acf800fa1b4e7fbabaf112e9ad69fa807b92e652b43ebd122e3b5e8d6cc0d5644e92127a673676bc7df396720dab5e