From 8bb1b6616aa35993c6dfe34e2a6a0df7460ffbe8 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 17 Aug 2020 10:55:56 +0200 Subject: [PATCH] Update to 3.0.2 --- .gitignore | 3 +++ postgis.spec | 9 ++++--- relax-test-timing-constraints.patch | 40 +++++++++++++---------------- sources | 6 ++--- 4 files changed, 30 insertions(+), 28 deletions(-) diff --git a/.gitignore b/.gitignore index a923b6e..4c40cc5 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,6 @@ /postgis-3.0.1.tar.gz /postgis-3.0.1.pdf /postgis-2.5.4.tar.gz +/postgis-3.0.2.pdf +/postgis-3.0.2.tar.gz +/postgis-2.5.5.tar.gz diff --git a/postgis.spec b/postgis.spec index 847e8b6..4f3ed89 100644 --- a/postgis.spec +++ b/postgis.spec @@ -18,7 +18,7 @@ %global majorversion 3.0 %global soversion 3 %global prevmajorversion 2.5 -%global prevversion %{prevmajorversion}.4 +%global prevversion %{prevmajorversion}.5 %global so_files postgis postgis_topology rtpostgis address_standardizer %global configure_opts --disable-rpath --enable-raster @@ -28,8 +28,8 @@ Summary: Geographic Information Systems Extensions to PostgreSQL Name: postgis -Version: %majorversion.1 -Release: 10%{?dist} +Version: %majorversion.2 +Release: 1%{?dist} License: GPLv2+ Source0: http://download.osgeo.org/%{name}/source/%{name}-%{version}.tar.gz Source2: http://download.osgeo.org/%{name}/docs/%{name}-%{version}.pdf @@ -351,6 +351,9 @@ fi %changelog +* Mon Aug 17 2020 Sandro Mani - 3.0.2-1 +- Update to 3.0.2 + * Sat Aug 01 2020 Fedora Release Engineering - 3.0.1-10 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/relax-test-timing-constraints.patch b/relax-test-timing-constraints.patch index 9ef7de4..e4b7794 100644 --- a/relax-test-timing-constraints.patch +++ b/relax-test-timing-constraints.patch @@ -1,23 +1,6 @@ -Description: Relax timing constraints for some tests. - With a statement_timeout of 100ms, increase the allowed _timecheck interval - from 200ms or 250ms to 750ms. This should increase chances of tests passing - even on busy or slow systems. -Author: Markus Wanner -Forwarded: not-needed - ---- a/regress/core/interrupt.sql -+++ b/regress/core/interrupt.sql -@@ -24,7 +24,7 @@ $$ LANGUAGE 'plpgsql' VOLATILE; - SET statement_timeout TO 100; - -- would run for many seconds if uninterruptible... - SELECT ST_Segmentize(ST_MakeLine(ST_Point(4,39), ST_Point(1,41)), 1e-100); --SELECT _timecheck('segmentize', '250ms'); -+SELECT _timecheck('segmentize', '750ms'); - SET statement_timeout TO 0; - -- Not affected by old timeout - SELECT '1',ST_AsText(ST_Segmentize('LINESTRING(0 0,4 0)'::geometry, 2)); ---- a/regress/core/interrupt_buffer.sql -+++ b/regress/core/interrupt_buffer.sql +diff -rupN --no-dereference postgis-3.0.2/regress/core/interrupt_buffer.sql postgis-3.0.2-new/regress/core/interrupt_buffer.sql +--- postgis-3.0.2/regress/core/interrupt_buffer.sql 2020-08-15 21:33:47.000000000 +0200 ++++ postgis-3.0.2-new/regress/core/interrupt_buffer.sql 2020-08-17 10:32:17.196901029 +0200 @@ -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 @@ -27,8 +10,9 @@ Forwarded: not-needed -- Not affected by old timeout SELECT '1', ST_NPoints(ST_Buffer('POINT(4 0)'::geometry, 2, 1)); ---- a/regress/core/interrupt_relate.sql -+++ b/regress/core/interrupt_relate.sql +diff -rupN --no-dereference postgis-3.0.2/regress/core/interrupt_relate.sql postgis-3.0.2-new/regress/core/interrupt_relate.sql +--- postgis-3.0.2/regress/core/interrupt_relate.sql 2020-08-15 21:33:47.000000000 +0200 ++++ postgis-3.0.2-new/regress/core/interrupt_relate.sql 2020-08-17 10:32:17.196901029 +0200 @@ -34,29 +34,29 @@ UPDATE _time SET t = now(); -- reset tim SET statement_timeout TO 100; @@ -67,3 +51,15 @@ Forwarded: not-needed +SELECT _timecheck('relate', '750ms'); DROP FUNCTION _timecheck(text, interval); +diff -rupN --no-dereference postgis-3.0.2/regress/core/interrupt.sql postgis-3.0.2-new/regress/core/interrupt.sql +--- postgis-3.0.2/regress/core/interrupt.sql 2020-08-15 21:33:47.000000000 +0200 ++++ postgis-3.0.2-new/regress/core/interrupt.sql 2020-08-17 10:32:17.195901005 +0200 +@@ -24,7 +24,7 @@ $$ LANGUAGE 'plpgsql' VOLATILE; + SET statement_timeout TO 100; + -- would run for many seconds if uninterruptible... + SELECT ST_Segmentize(ST_MakeLine(ST_Point(4,39), ST_Point(1,41)), 1e-100); +-SELECT _timecheck('segmentize', '250ms'); ++SELECT _timecheck('segmentize', '750ms'); + SET statement_timeout TO 0; + -- Not affected by old timeout + SELECT '1',ST_AsText(ST_Segmentize('LINESTRING(0 0,4 0)'::geometry, 2)); diff --git a/sources b/sources index 020c679..2804aa8 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (postgis-2.5.4.tar.gz) = 767c146245ae11545ce4e0764f9bd313cfdf2eed78c485c5aa5530517edb8e433bcdbaffcf4d92b0c0f3c997de9831b5e3beed7638fc3bc773f264b45e5d8ab4 -SHA512 (postgis-3.0.1.pdf) = 6b87c1f41f576f2dcd0824c77e0ce365d75e3f83da02dacd19c00e1a570feef9bfd9c582776fe9c36b73638f24b1d6cded090546eab5a317605bfdc121f9e3f1 -SHA512 (postgis-3.0.1.tar.gz) = 5ebce2303d672bb342f7fae6cade08140c8a687fc38e82e5b41eebb8465cdf3dc7bdbeae53b1179df8112a01842dd65f362fc107b381e2a1fa6e161b77a50227 +SHA512 (postgis-3.0.2.pdf) = accbddc10c8890f40f9cb0b43e641c6dc34bfed1c51c1579e1f124fa83e40d5ea55fcd8de7fa15803fbabbbb6b0362abea0c4708de5b993a273c3c0a5fc1d2f1 +SHA512 (postgis-3.0.2.tar.gz) = 763d7818d195eca0b07d94a864b13da68e5734ae57b7c93c285dc2d0fa4a155715745e5da67e1a3bca49d8d4f89dc495ed3912c079722290ce9f220afca33f4d +SHA512 (postgis-2.5.5.tar.gz) = 407c9ddf5b73aaa8d36ec606f974b86c16c9ed4aafbfd4a0b7f96cfc7a9f8a8fa38528cb4787bdd50de479416dbfb09934a85d189463cec549da66863060292e