$ git diff --patch-with-stat --summary 00ba5a22989c6c254624e3a5cf442e6ab7c4d6ed..1d049b0a6eb5c7fb8da1926dfa1964aa4f4aa499
.abf.yml | 2 +-
gdal-fix-python.patch | 2 +-
gdal-fix-pythontools-install.patch | 11 +--
gdal.spec | 151 ++++++++++++++++++++-----------------
4 files changed, 89 insertions(+), 77 deletions(-)
diff --git a/.abf.yml b/.abf.yml
index 8620ea5..3399817 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
sources:
- gdal-3.3.0.tar.xz: 3b3816a769f4c88ae9f78cf23209c2b07ccd58a4
+ gdal-3.5.2.tar.xz: b0189e056c11e1efae972f22aa247f3d10d56561
diff --git a/gdal-fix-python.patch b/gdal-fix-python.patch
index 3e5c252..b2b44c5 100644
--- a/gdal-fix-python.patch
+++ b/gdal-fix-python.patch
@@ -6,7 +6,7 @@ diff -up gdal-3.3.0/swig/python/GNUmakefile.4~ gdal-3.3.0/swig/python/GNUmakefil
rm -f setup_vars.ini
echo 'GNM_ENABLED=$(GNM_ENABLED)' >> setup_vars.ini
- $(PYTHON) setup.py build
-+ CC=clang CXX=clang++ LDFLAGS=-lpython3.9 $(PYTHON) setup.py build
++ CC=clang CXX=clang++ LDFLAGS=-lpython3.11 $(PYTHON) setup.py build
egg:
$(PYTHON) setup.py bdist_egg
diff --git a/gdal-fix-pythontools-install.patch b/gdal-fix-pythontools-install.patch
index a66a0c3..c9079f8 100644
--- a/gdal-fix-pythontools-install.patch
+++ b/gdal-fix-pythontools-install.patch
@@ -1,8 +1,9 @@
---- gdal-2.2.1/swig/python/GNUmakefile.0004~ 2017-08-29 14:30:49.303050535 +0200
-+++ gdal-2.2.1/swig/python/GNUmakefile 2017-08-29 14:31:11.789012503 +0200
-@@ -72,7 +72,7 @@ egg:
-
- site_package_dir=$(shell $(PYTHON) -c "from __future__ import print_function;from distutils.sysconfig import get_python_lib;print(get_python_lib(prefix=\"$(PREFIX)\"))")
+diff -up gdal-3.4.1/swig/python/GNUmakefile.3~ gdal-3.4.1/swig/python/GNUmakefile
+--- gdal-3.4.1/swig/python/GNUmakefile.3~ 2022-01-04 14:49:40.874264928 +0100
++++ gdal-3.4.1/swig/python/GNUmakefile 2022-01-04 14:49:58.502297758 +0100
+@@ -104,7 +104,7 @@ egg:
+
+ site_package_dir=$(shell $(PYTHON) -c "from trimmedsysconfig import get_python_lib;print(get_python_lib(prefix=\"$(PREFIX)\"))")
-ifeq ($(PY_HAVE_SETUPTOOLS),1)
+ifeq ($(PY_HAVE_SETUPTOOLS),0)
diff --git a/gdal.spec b/gdal.spec
index 8491f68..4d1dab3 100644
--- a/gdal.spec
+++ b/gdal.spec
@@ -7,9 +7,10 @@
%define _requires_exceptions devel\(libogdi31.*\)\\|devel\(libcfitsio.*\)\\|libgrass
%endif
-%define major 29
-%define libname %mklibname %{name} %{major}
-%define libnamedev %mklibname %{name} -d
+%define major 31
+%define oldlibname %mklibname %{name} 30
+%define libname %mklibname %{name}
+%define devname %mklibname %{name} -d
# Build gdal against libgrass. It is better to instead compile the new plugin
# which builds against grass itself (and thus has more features than the
@@ -22,32 +23,32 @@
%define ogdidir %{_includedir}
%define ogdidir %{_includedir}/ogdi
-Name: gdal
-Version: 3.3.0
-Release: 1
-Summary: The Geospatial Data Abstraction Library (GDAL)
-Group: Sciences/Geosciences
-License: MIT
-URL: http://www.gdal.org/
-Source0: http://download.osgeo.org/gdal/%{version}/%{name}-%{version}.tar.xz
-Patch2: gdal-2.3.2-libtoolsucks.patch
-Patch3: gdal-3.1.0-no-Lusrlib.patch
-Patch4: gdal-fix-pythontools-install.patch
+Summary: The Geospatial Data Abstraction Library (GDAL)
+Name: gdal
+Version: 3.5.2
+Release: 1
+Group: Sciences/Geosciences
+License: MIT
+URL: https://gdal.org/
+Source0: https://download.osgeo.org/gdal/%{version}/%{name}-%{version}.tar.xz
+Patch2: gdal-2.3.2-libtoolsucks.patch
+Patch3: gdal-3.1.0-no-Lusrlib.patch
+Patch4: gdal-fix-pythontools-install.patch
# cb - seems to use the /usr/bin/libtool as a linker which breaks
-Patch5: gdal-fix-python.patch
+Patch5: gdal-fix-python.patch
BuildRequires: libtool-devel
BuildRequires: zlib-devel
BuildRequires: geotiff-devel >= 1.2.0
BuildRequires: png-devel
BuildRequires: giflib-devel
-BuildRequires: postgresql-devel >= 9.0
+BuildRequires: postgresql-devel >= 9.0
BuildRequires: jpeg-devel
BuildRequires: lzma-devel
BuildRequires: pkgconfig(proj) >= 4.4.7
BuildRequires: pkgconfig(python3)
-BuildRequires: doxygen
-BuildRequires: pkgconfig(libtirpc)
+BuildRequires: doxygen
+BuildRequires: pkgconfig(libtirpc)
%if %{build_libgrass}
Requires: grass >= 6.4.0
BuildRequires: grass
@@ -64,7 +65,7 @@ BuildRequires: python-setuptools
BuildRequires: sqlite3-devel
BuildRequires: gettext-devel
BuildRequires: pkgconfig(libunwind-llvm)
-#BuildRequires: mysql-devel
+BuildRequires: mysql-devel
#BuildRequires: libdap-devel
#BuildRequires: librx-devel
BuildRequires: unixODBC-devel
@@ -81,6 +82,16 @@ efficient access, suitable for use in viewer applications,
and also attempts to preserve coordinate systems and metadata.
Python, C, and C++ interfaces are available.
+%files
+%{_datadir}/gdal/
+%{_bindir}/*
+%{_mandir}/man1/*
+
+%exclude %{_bindir}/gdal-config
+%doc VERSION
+
+#---------------------------------------------------------------------------
+
%package -n python-%{name}
Summary: The Python bindings for the GDAL library
Group: Sciences/Geosciences
@@ -90,24 +101,44 @@ Requires: %{libname} = %{version}
%description -n python-%{name}
The Python bindings for the GDAL library
+%files -n python-%{name}
+%py_platsitedir/*
+
+#---------------------------------------------------------------------------
+
%package -n %{libname}
Summary: Libraries required for the GDAL library
Group: System/Libraries
Provides: lib%{name} = %{version}
+Obsoletes: %{oldlibname} < %{EVRD}
%description -n %{libname}
Libraries required for the GDAL library
-%package -n %{libnamedev}
+%files -n %{libname}
+%{_libdir}/*.so.%{major}*
+%{_libdir}/gdalplugins
+
+#---------------------------------------------------------------------------
+
+%package -n %{devname}
Summary: Development files for using the GDAL library
Group: Development/C
Requires: %{libname} = %{version}-%{release}
Provides: lib%{name}-devel = %{version}
Provides: %{name}-devel = %{version}
-%description -n %{libnamedev}
+%description -n %{devname}
Development files for using the GDAL library
+%files -n %{devname}
+%{_bindir}/%{name}-config
+%{_libdir}/*.so
+%{_includedir}/*
+%{_libdir}/pkgconfig/gdal.pc
+
+#---------------------------------------------------------------------------
+
%prep
%autosetup -p1
@@ -125,7 +156,7 @@ sed -i "s|^mandir=.*|mandir='\${prefix}/share/man'|" configure
%build
cp -f %{_datadir}/gettext/config.rpath .
-libtoolize --force
+libtoolize -fiv
aclocal -I m4
autoconf
@@ -133,34 +164,34 @@ autoconf
--datadir=%_datadir/gdal \
--mandir=%_mandir \
--includedir=%_includedir/gdal \
- --with-dods-root=no \
- --with-ogdi=%{ogdidir} \
- --with-cfitsio=yes \
- --with-geotiff=internal \
- --with-libtiff \
- --with-libz \
- --with-liblzma=yes \
- --with-netcdf=%_prefix \
- --with-hdf5 \
- --with-geos \
- --with-jasper \
- --with-png \
- --with-gif \
- --with-jpeg \
- --with-odbc \
- --with-sqlite3 \
- --with-mysql \
- --with-curl \
- --with-python \
- --with-xerces \
- --with-xerces-lib='-lxerces-c' \
- --with-xerces-inc=%_includedir \
- --without-pcraster \
- --without-local \
- %if %{build_libgrass}
- --with-grass=%_libdir/grass64 \
- %endif
- --with-threads
+ --with-dods-root=no \
+ --with-ogdi=%{ogdidir} \
+ --with-cfitsio=yes \
+ --with-geotiff=internal \
+ --with-libtiff \
+ --with-libz \
+ --with-liblzma=yes \
+ --with-netcdf=%_prefix \
+ --with-hdf5 \
+ --with-geos \
+ --with-jasper \
+ --with-png \
+ --with-gif \
+ --with-jpeg \
+ --with-odbc \
+ --with-sqlite3 \
+ --with-mysql \
+ --with-curl \
+ --with-python \
+ --with-xerces \
+ --with-xerces-lib='-lxerces-c' \
+ --with-xerces-inc=%_includedir \
+ --without-pcraster \
+ --without-local \
+ %if %{build_libgrass}
+ --with-grass=%_libdir/grass64 \
+ %endif
+ --with-threads
sed -i -e 's,^INST_MAN.*,INST_MAN = %{_mandir},g' GDALmake.opt
@@ -175,23 +206,3 @@ unset PYTHONDONTWRITEBYTECODE
%make_install install-man
find %{buildroot}%{py_platsitedir} -name '*.py' -exec chmod a-x {} \;
-
-%files
-%{_datadir}/gdal/
-%{_bindir}/*
-%{_mandir}/man1/*
-
-%exclude %{_bindir}/gdal-config
-%doc NEWS VERSION
-
-%files -n %{libnamedev}
-%{_bindir}/%{name}-config
-%{_libdir}/*.so
-%{_includedir}/*
-%{_libdir}/pkgconfig/gdal.pc
-
-%files -n %{libname}
-%{_libdir}/*.so.%{major}*
-
-%files -n python-%{name}
-%py_platsitedir/*