Rebuild for sqlite 3.30.0

.gitignore

@@ -1,3 +1 @@
 /spatialite-tools-4.*.tar.gz
-/spatialite-tools-5.0.0.tar.gz
-/spatialite-tools-5.0.1.tar.gz

sources

@@ -1 +1 @@
-SHA512 (spatialite-tools-5.0.1.tar.gz) = dad52f6ed3c66ffd95f3a5c21225cd1b20641523af616f7e8defba8e4e46921da169e5f7bf9c53a355e132b6e74750d6db3fe02c870a3386f850df49c83bb8cd
+83cb7b1f6c6b20fe5475586f1fb77088  spatialite-tools-4.3.0.tar.gz

spatialite-tools.spec

@@ -1,111 +1,68 @@
+%global sqlitever 3.30.0
+
 Name:           spatialite-tools
-Version:        5.0.1
-Release:        3%{?dist}
+Version:        4.3.0
+Release:        39%{?dist}
 Summary:        A set of useful CLI tools for SpatiaLite
-# Add missing -lxml2
-Patch0:         spatialite-tools_lxml2.patch
 
 License:        GPLv3+
 Source0:        http://www.gaia-gis.it/gaia-sins/%{name}-%{version}.tar.gz
 URL:            https://www.gaia-gis.it/fossil/spatialite-tools
 
-BuildRequires: make
+BuildRequires:  gcc
 BuildRequires:  expat-devel
 BuildRequires:  freexl-devel
-BuildRequires:  gcc
 BuildRequires:  geos-devel
 BuildRequires:  libspatialite-devel
-BuildRequires:  librttopo-devel
-BuildRequires:  libxml2-devel
-BuildRequires:  minizip-devel
 BuildRequires:  proj-devel
 BuildRequires:  readline-devel
 BuildRequires:  readosm-devel
-BuildRequires:  sqlite-devel
+BuildRequires:  sqlite-devel %{?sqlitever: = %{sqlitever}}
+BuildRequires:  libxml2-devel
 BuildRequires:  zlib-devel
+# BZ 1048587
+# The spatialite binary is a derivative of the sqlite shell and
+# inherits its check for the exact same library version.
+# This package thus requires a rebuild! Should be sorted out in 4.3!
+Requires:  sqlite %{?sqlitever: = %{sqlitever}}
 
 %description
 Spatialite-Tools is a set of useful CLI tools for SpatiaLite.
 
 
 %prep
-%autosetup -p1
+%setup -q
 
 # Remove unused Makefiles
 rm -f Makefile-static*
 
 
 %build
-%ifarch i686 armv7hl
-export LDFLAGS="%{__global_ldflags} -lm"
-%endif
 %configure
-%make_build
+
+make %{?_smp_mflags}
 
 
 %install
-%make_install
+make install DESTDIR=%{buildroot}
 
 
 %files
-%license COPYING
-%doc AUTHORS
+%doc AUTHORS COPYING
 %{_bindir}/exif_loader
 %{_bindir}/shp_doctor
-%{_bindir}/shp_sanitize
 %{_bindir}/spatialite
 %{_bindir}/spatialite_convert
-%{_bindir}/spatialite_dem
 %{_bindir}/spatialite_dxf
 %{_bindir}/spatialite_gml
 %{_bindir}/spatialite_network
 %{_bindir}/spatialite_osm*
 %{_bindir}/spatialite_tool
 %{_bindir}/spatialite_xml_*
-%{_bindir}/spatialite_xml2utf8
 
 %changelog
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Tue Dec 14 2021 Sandro Mani <manisandro@gmail.com> - 5.0.1-1
-- Update to 5.0.1
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Fri Nov 13 2020 Sandro Mani <manisandro@gmail.com> - 5.0.0-1
-- Update to 5.0.0
-
-* Thu Aug 20 08:46:50 GMT 2020 Sandro Mani <manisandro@gmail.com> - 4.3.0-46
-- Rebuild (sqlite)
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.3.0-45
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed Jun 24 2020 Ondrej Dubaj <odubaj@redhat.com> - 4.3.0-44
-- Rebuild for sqlite 3.32.3
-
-* Fri Jun 05 2020 Ondrej Dubaj <odubaj@redhat.com> - 4.3.0-43
-- Rebuild for sqlite 3.32.2
-
-* Tue May 26 2020 Ondrej Dubaj <odubaj@redhat.com> - 4.3.0-42
-- Rebuild for sqlite 3.32.1
-
-* Wed Feb 05 2020 Ondrej Dubaj <odubaj@redhat.com> - 4.3.0-41
-- Rebuild for sqlite 3.31.1
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.3.0-40
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Tue Oct 15 2019 Petr Kubat <pkubat@redhat.com> - 4.3.0-39
-- Rebuild for sqlite 3.30.1
+* Tue Nov 19 2019 Petr Kubat <pkubat@redhat.com> - 4.3.0-39
+- Rebuild for sqlite 3.30.0
 
 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.3.0-38
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

spatialite-tools_lxml2.patch

@@ -1,22 +0,0 @@
-diff -rupN spatialite-tools-5.0.1/Makefile.am spatialite-tools-5.0.1-new/Makefile.am
---- spatialite-tools-5.0.1/Makefile.am	2021-02-07 17:34:04.000000000 +0100
-+++ spatialite-tools-5.0.1-new/Makefile.am	2021-12-14 15:45:19.962324159 +0100
-@@ -49,6 +49,7 @@ shp_doctor_SOURCES = shp_doctor.c
- shp_sanitize_SOURCES = shp_sanitize.c
- exif_loader_SOURCES = exif_loader.c
- spatialite_xml_validator_SOURCES = spatialite_xml_validator.c
-+spatialite_xml_validator_LIBADD = @LIBXML2_LIBS@
- spatialite_xml_load_SOURCES = spatialite_xml_load.c
- spatialite_xml2utf8_SOURCES = spatialite_xml2utf8.c
- spatialite_xml_collapse_SOURCES = spatialite_xml_collapse.c
-diff -rupN spatialite-tools-5.0.1/Makefile.in spatialite-tools-5.0.1-new/Makefile.in
---- spatialite-tools-5.0.1/Makefile.in	2021-02-07 17:34:04.000000000 +0100
-+++ spatialite-tools-5.0.1-new/Makefile.in	2021-12-14 15:45:42.976287325 +0100
-@@ -492,6 +492,7 @@ shp_doctor_SOURCES = shp_doctor.c
- shp_sanitize_SOURCES = shp_sanitize.c
- exif_loader_SOURCES = exif_loader.c
- spatialite_xml_validator_SOURCES = spatialite_xml_validator.c
-+spatialite_xml_validator_LDADD = @LIBXML2_LIBS@
- spatialite_xml_load_SOURCES = spatialite_xml_load.c
- spatialite_xml2utf8_SOURCES = spatialite_xml2utf8.c
- spatialite_xml_collapse_SOURCES = spatialite_xml_collapse.c