diff --git a/.gitignore b/.gitignore index 1eb0c64..2b57b51 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,5 @@ /postgis-3.1.1.pdf /postgis-3.1.2.tar.gz /postgis-3.1.2.pdf +/postgis-3.1.3.pdf +/postgis-3.1.3.tar.gz diff --git a/postgis.spec b/postgis.spec index 1cf59ed..92876c3 100644 --- a/postgis.spec +++ b/postgis.spec @@ -15,8 +15,8 @@ %global __provides_exclude_from %{_libdir}/pgsql Name: postgis -Version: %majorversion.2 -Release: 2%{?commit:.git%shortcommit}%{?dist} +Version: %majorversion.3 +Release: 1%{?commit:.git%shortcommit}%{?dist} Summary: Geographic Information Systems Extensions to PostgreSQL License: GPLv2+ @@ -29,7 +29,9 @@ Source3: http://download.osgeo.org/%{name}/source/%{name}-%{prevversion}.t # This should increase chances of tests passing even on busy or slow systems. Patch0: relax-test-timing-constraints.patch +%ifnarch armv7hl BuildRequires: SFCGAL-devel +%endif BuildRequires: make BuildRequires: autoconf BuildRequires: automake @@ -170,7 +172,11 @@ cp -p %{SOURCE2} . %build +%ifnarch armv7hl %configure %configure_opts --with-gui --with-pgconfig=%{_bindir}/pg_server_config --with-sfcgal +%else +%configure %configure_opts --with-gui --with-pgconfig=%{_bindir}/pg_server_config +%endif sed -i 's| -fstack-clash-protection | |' postgis/Makefile sed -i 's| -fstack-clash-protection | |' raster/rt_pg/Makefile sed -i 's| -fstack-clash-protection | |' topology/Makefile @@ -321,11 +327,15 @@ fi %{_datadir}/pgsql/extension/address_standardizer*.control %{_datadir}/pgsql/extension/postgis-*.sql %{_datadir}/pgsql/extension/postgis_raster*.sql +%ifnarch armv7hl %{_datadir}/pgsql/extension/postgis_sfcgal*.sql +%endif %{_datadir}/pgsql/extension/postgis_topology*.sql %{_datadir}/pgsql/extension/postgis.control %{_datadir}/pgsql/extension/postgis_raster.control +%ifnarch armv7hl %{_datadir}/pgsql/extension/postgis_sfcgal.control +%endif %{_datadir}/pgsql/extension/postgis_topology.control %{_datadir}/pgsql/extension/postgis_tiger_geocoder*.sql %{_datadir}/pgsql/extension/postgis_tiger_geocoder.control @@ -334,7 +344,9 @@ fi %{_datadir}/postgis/repo_revision.pl %{_libdir}/pgsql/address_standardizer-%{soversion}.so %{_libdir}/pgsql/postgis_raster-%{soversion}.so +%ifnarch armv7hl %{_libdir}/pgsql/postgis_sfcgal-%{soversion}.so +%endif %{_libdir}/pgsql/postgis_topology-%{soversion}.so %files client @@ -352,7 +364,9 @@ fi %{_libdir}/pgsql/bitcode/address_standardizer-* %{_libdir}/pgsql/bitcode/postgis-* %{_libdir}/pgsql/bitcode/postgis_raster-* +%ifnarch armv7hl %{_libdir}/pgsql/bitcode/postgis_sfcgal-* +%endif %{_libdir}/pgsql/bitcode/postgis_topology-* @@ -400,6 +414,9 @@ fi %changelog +* Mon Jul 05 2021 Sandro Mani - 3.1.3-1 +- Update to 3.1.3 + * Mon Jul 5 2021 Basil Eric Rabi - 3.1.2-2 - Build with SFCGAL diff --git a/sources b/sources index 4b5bc6d..cf119a5 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (postgis-2.5.5.tar.gz) = 407c9ddf5b73aaa8d36ec606f974b86c16c9ed4aafbfd4a0b7f96cfc7a9f8a8fa38528cb4787bdd50de479416dbfb09934a85d189463cec549da66863060292e -SHA512 (postgis-3.1.2.pdf) = c38ac0663784af9a325af261a70835f2c227d0bc809d8072f8dd677c63cf971f414a1e23c104786d6fff4073f406ce71b1ae406f10c2606e3a143b9aca3e7366 -SHA512 (postgis-3.1.2.tar.gz) = df9d2fa118987e29acd635912a708e643770ad3df82c098f8129f11ab07a9eafde969302d2d2e59a68fea6fc7312fe768a231dd4cb5de7002c418725da75848a +SHA512 (postgis-3.1.3.pdf) = c3ead49be4aef378ca1c5e0966f83c039b26b40d95ea890bb60966dd5669327c9d24ca6a118cfd641bb7cbfccee436bbc42352a4fb51141926567bd830f1c95c +SHA512 (postgis-3.1.3.tar.gz) = 525c982de6b5888d1f4a4f6d2cca5dfa945d8899d8038b1d62ce222e0149c4ab26a2a3602bb8c85e89ce22b3d5b20d278fc4f841144f4b0d19e6de4f48d819ad