diff --git a/.gitignore b/.gitignore index 4582ae2..20afd86 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,5 @@ /postgis-3.1.3.tar.gz /postgis-3.1.4.pdf /postgis-3.1.4.tar.gz +/postgis-3.2.0.pdf +/postgis-3.2.0.tar.gz diff --git a/postgis.spec b/postgis.spec index 08b073b..f2c6cba 100644 --- a/postgis.spec +++ b/postgis.spec @@ -5,7 +5,7 @@ %{!?runselftest:%global runselftest 1} # Re-enable upgrade packages on next major version bump! -%global majorversion 3.1 +%global majorversion 3.2 %global soversion 3 %global prevmajorversion 2.5 %global prevversion %{prevmajorversion}.5 @@ -15,8 +15,8 @@ %global __provides_exclude_from %{_libdir}/pgsql Name: postgis -Version: %majorversion.4 -Release: 5%{?commit:.git%shortcommit}%{?dist} +Version: %majorversion.0 +Release: 1%{?commit:.git%shortcommit}%{?dist} Summary: Geographic Information Systems Extensions to PostgreSQL License: GPLv2+ @@ -57,7 +57,6 @@ BuildRequires: protobuf-c-devel %if %upgrade BuildRequires: postgresql-upgrade-devel %endif -%{?postgresql_module_requires} %if %runselftest BuildRequires: postgresql-test-rpm-macros %endif @@ -413,6 +412,9 @@ fi %changelog +* Sat Dec 18 2021 Sandro Mani - 3.2.0-1 +- Update to 3.2.0 + * Thu Nov 11 2021 Sandro Mani - 3.1.4-5 - Rebuild (gdal) diff --git a/relax-test-timing-constraints.patch b/relax-test-timing-constraints.patch index fe65cdc..77ceb70 100644 --- a/relax-test-timing-constraints.patch +++ b/relax-test-timing-constraints.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference postgis-3.1.4/regress/core/interrupt_buffer.sql postgis-3.1.4-new/regress/core/interrupt_buffer.sql ---- postgis-3.1.4/regress/core/interrupt_buffer.sql 2021-09-04 07:03:43.000000000 +0200 -+++ postgis-3.1.4-new/regress/core/interrupt_buffer.sql 2021-09-04 21:35:04.621994939 +0200 +diff -rupN --no-dereference postgis-3.2.0/regress/core/interrupt_buffer.sql postgis-3.2.0-new/regress/core/interrupt_buffer.sql +--- postgis-3.2.0/regress/core/interrupt_buffer.sql 2021-12-18 03:45:48.000000000 +0100 ++++ postgis-3.2.0-new/regress/core/interrupt_buffer.sql 2021-12-18 09:45:03.182621306 +0100 @@ -36,7 +36,7 @@ select ST_Buffer(g,100) from _inputs WHE --( select (st_dumppoints(st_buffer(st_makepoint(0,0),10000,100000))).geom g) foo; -- it may take some more to interrupt st_buffer, see @@ -10,9 +10,9 @@ diff -rupN --no-dereference postgis-3.1.4/regress/core/interrupt_buffer.sql post -- Not affected by old timeout SELECT '1', ST_NPoints(ST_Buffer('POINT(4 0)'::geometry, 2, 1)); -diff -rupN --no-dereference postgis-3.1.4/regress/core/interrupt_relate.sql postgis-3.1.4-new/regress/core/interrupt_relate.sql ---- postgis-3.1.4/regress/core/interrupt_relate.sql 2021-09-04 07:03:43.000000000 +0200 -+++ postgis-3.1.4-new/regress/core/interrupt_relate.sql 2021-09-04 21:35:04.621994939 +0200 +diff -rupN --no-dereference postgis-3.2.0/regress/core/interrupt_relate.sql postgis-3.2.0-new/regress/core/interrupt_relate.sql +--- postgis-3.2.0/regress/core/interrupt_relate.sql 2021-12-18 03:45:48.000000000 +0100 ++++ postgis-3.2.0-new/regress/core/interrupt_relate.sql 2021-12-18 09:45:03.182621306 +0100 @@ -34,29 +34,29 @@ UPDATE _time SET t = now(); -- reset tim SET statement_timeout TO 100; @@ -51,9 +51,9 @@ diff -rupN --no-dereference postgis-3.1.4/regress/core/interrupt_relate.sql post +SELECT _timecheck('relate', '750ms'); DROP FUNCTION _timecheck(text, interval); -diff -rupN --no-dereference postgis-3.1.4/regress/core/interrupt.sql postgis-3.1.4-new/regress/core/interrupt.sql ---- postgis-3.1.4/regress/core/interrupt.sql 2021-09-04 07:03:43.000000000 +0200 -+++ postgis-3.1.4-new/regress/core/interrupt.sql 2021-09-04 21:35:04.621994939 +0200 +diff -rupN --no-dereference postgis-3.2.0/regress/core/interrupt.sql postgis-3.2.0-new/regress/core/interrupt.sql +--- postgis-3.2.0/regress/core/interrupt.sql 2021-12-18 03:45:48.000000000 +0100 ++++ postgis-3.2.0-new/regress/core/interrupt.sql 2021-12-18 09:45:03.182621306 +0100 @@ -24,7 +24,7 @@ $$ LANGUAGE 'plpgsql' VOLATILE; SET statement_timeout TO 100; -- would run for many seconds if uninterruptible... diff --git a/sources b/sources index 2129a25..bd9e6a8 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ +SHA512 (postgis-3.2.0.pdf) = 03717957ec178beff433b5684b6c12784535b62444e1139d25f311d7aaeb9baea8af9aa7b6ee1f0aeb4b99c36645455378126caf988d04fc66a14ec22de640e7 +SHA512 (postgis-3.2.0.tar.gz) = b49b2fbb88ec07981c0fd05400ad807e85553164023a4b47326c21f48b4e07827a183676c497ad6823dc3a6b97518e1d40906826b8a91739c96966d62858b2b5 SHA512 (postgis-2.5.5.tar.gz) = 407c9ddf5b73aaa8d36ec606f974b86c16c9ed4aafbfd4a0b7f96cfc7a9f8a8fa38528cb4787bdd50de479416dbfb09934a85d189463cec549da66863060292e -SHA512 (postgis-3.1.4.pdf) = 8feb9a1b8260864d573acf03e0530add6eb9451d17fbfb1149116b869472884cf2473ee50950866ba470f16583c320242b55d56417387198a0bad69b0a0e07d0 -SHA512 (postgis-3.1.4.tar.gz) = afd84b45b146bdae310580fc9f8a878dd658f9e74f99c41f5d143f32974d5f5017ab4190855dcaea915a31ac2a78d34bf5561f206965264de3252f2c2ac57683