Update to 3.1.2

This commit is contained in:
Sandro Mani 2021-05-24 10:45:31 +02:00
parent 90b8f0f284
commit d6b818dc3a
5 changed files with 16 additions and 26 deletions

1
.gitignore vendored
View File

@ -13,3 +13,4 @@
/postgis-3.1.0.tar.gz
/postgis-3.1.1.tar.gz
/postgis-3.1.1.pdf
/postgis-3.1.2.tar.gz

View File

@ -15,8 +15,8 @@
%global __provides_exclude_from %{_libdir}/pgsql
Name: postgis
Version: %majorversion.1
Release: 8%{?commit:.git%shortcommit}%{?dist}
Version: %majorversion.2
Release: 1%{?commit:.git%shortcommit}%{?dist}
Summary: Geographic Information Systems Extensions to PostgreSQL
License: GPLv2+
@ -28,8 +28,6 @@ Source3: http://download.osgeo.org/%{name}/source/%{name}-%{prevversion}.t
# From debian
# This should increase chances of tests passing even on busy or slow systems.
Patch0: relax-test-timing-constraints.patch
# Fix proj8 detection
Patch1: postgis_proj8.patch
BuildRequires: make
BuildRequires: autoconf
@ -397,6 +395,9 @@ fi
%changelog
* Mon May 24 2021 Sandro Mani <manisandro@gmail.com> - 3.1.2-1
- Update to 3.1.2
* Fri May 07 2021 Sandro Mani <manisandro@gmail.com> - 3.1.1-8
- Rebuild (gdal)

View File

@ -1,12 +0,0 @@
diff -rupN postgis-3.1.1/configure.ac postgis-3.1.1-new/configure.ac
--- postgis-3.1.1/configure.ac 2021-01-28 20:10:31.000000000 +0100
+++ postgis-3.1.1-new/configure.ac 2021-03-08 16:36:09.677099539 +0100
@@ -902,7 +902,7 @@ AC_SUBST([PROJ_LDFLAGS])
dnl Ensure we can link against libproj
LIBS_SAVE="$LIBS"
LIBS="$PROJ_LDFLAGS"
-AC_CHECK_LIB([proj], [pj_get_release],
+AC_CHECK_LIB([proj], [proj_info],
[],
[AC_MSG_ERROR([could not find libproj - you may need to specify the directory of a PROJ installation using --with-projdir])],
[])

View File

@ -1,6 +1,6 @@
diff -rupN --no-dereference postgis-3.1.1/regress/core/interrupt_buffer.sql postgis-3.1.1-new/regress/core/interrupt_buffer.sql
--- postgis-3.1.1/regress/core/interrupt_buffer.sql 2021-01-28 20:10:32.000000000 +0100
+++ postgis-3.1.1-new/regress/core/interrupt_buffer.sql 2021-01-29 10:14:02.621993471 +0100
diff -rupN --no-dereference postgis-3.1.2/regress/core/interrupt_buffer.sql postgis-3.1.2-new/regress/core/interrupt_buffer.sql
--- postgis-3.1.2/regress/core/interrupt_buffer.sql 2021-05-22 01:05:03.000000000 +0200
+++ postgis-3.1.2-new/regress/core/interrupt_buffer.sql 2021-05-24 01:28:03.588219261 +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
@ -10,9 +10,9 @@ diff -rupN --no-dereference postgis-3.1.1/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.1/regress/core/interrupt_relate.sql postgis-3.1.1-new/regress/core/interrupt_relate.sql
--- postgis-3.1.1/regress/core/interrupt_relate.sql 2021-01-28 20:10:32.000000000 +0100
+++ postgis-3.1.1-new/regress/core/interrupt_relate.sql 2021-01-29 10:14:02.621993471 +0100
diff -rupN --no-dereference postgis-3.1.2/regress/core/interrupt_relate.sql postgis-3.1.2-new/regress/core/interrupt_relate.sql
--- postgis-3.1.2/regress/core/interrupt_relate.sql 2021-05-22 01:05:03.000000000 +0200
+++ postgis-3.1.2-new/regress/core/interrupt_relate.sql 2021-05-24 01:28:03.588219261 +0200
@@ -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.1/regress/core/interrupt_relate.sql post
+SELECT _timecheck('relate', '750ms');
DROP FUNCTION _timecheck(text, interval);
diff -rupN --no-dereference postgis-3.1.1/regress/core/interrupt.sql postgis-3.1.1-new/regress/core/interrupt.sql
--- postgis-3.1.1/regress/core/interrupt.sql 2021-01-28 20:10:32.000000000 +0100
+++ postgis-3.1.1-new/regress/core/interrupt.sql 2021-01-29 10:14:02.622993467 +0100
diff -rupN --no-dereference postgis-3.1.2/regress/core/interrupt.sql postgis-3.1.2-new/regress/core/interrupt.sql
--- postgis-3.1.2/regress/core/interrupt.sql 2021-05-22 01:05:03.000000000 +0200
+++ postgis-3.1.2-new/regress/core/interrupt.sql 2021-05-24 01:28:03.588219261 +0200
@@ -24,7 +24,7 @@ $$ LANGUAGE 'plpgsql' VOLATILE;
SET statement_timeout TO 100;
-- would run for many seconds if uninterruptible...

View File

@ -1,3 +1,3 @@
SHA512 (postgis-2.5.5.tar.gz) = 407c9ddf5b73aaa8d36ec606f974b86c16c9ed4aafbfd4a0b7f96cfc7a9f8a8fa38528cb4787bdd50de479416dbfb09934a85d189463cec549da66863060292e
SHA512 (postgis-3.1.1.tar.gz) = b975d26c1ad01fa6b90b5b3b51fd2b4b33204a380af0f76b98d1bfd6bd95f527d4ac3548f1b822e114be17bb3a133bc88c3d33a17d4effdfa1f90ec0c683e5e5
SHA512 (postgis-3.1.1.pdf) = c11ac0c283c38a35871340a7d20768e7535eb30dce8331d50ff3957f3c5eb1351af9416673c757095f3c9048e109a4e5ffa7ca8b64575272e91fcbf71d190e29
SHA512 (postgis-3.1.2.tar.gz) = df9d2fa118987e29acd635912a708e643770ad3df82c098f8129f11ab07a9eafde969302d2d2e59a68fea6fc7312fe768a231dd4cb5de7002c418725da75848a