The package rpms/postgis.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/postgis.git/commit/?id=784424e8f0....
Change:
-%ifnarch %ix86 ppc64 s390x
Thanks.
Full change:
============
commit 4921f6314140db65fcb5b5347eda9193873ce35b
Author: Sandro Mani <manisandro(a)gmail.com>
Date: Mon Nov 23 10:45:43 2020 +0100
Update to 3.0.3
diff --git a/.gitignore b/.gitignore
index 4c40cc5..5950928 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,5 @@
/postgis-3.0.2.pdf
/postgis-3.0.2.tar.gz
/postgis-2.5.5.tar.gz
+/postgis-3.0.3.tar.gz
+/postgis-3.0.3.pdf
diff --git a/postgis.spec b/postgis.spec
index a7d37ad..d333462 100644
--- a/postgis.spec
+++ b/postgis.spec
@@ -14,8 +14,8 @@
%global __provides_exclude_from %{_libdir}/pgsql
Name: postgis
-Version: %majorversion.2
-Release: 3%{?commit:.git%shortcommit}%{?dist}
+Version: %majorversion.3
+Release: 1%{?commit:.git%shortcommit}%{?dist}
Summary: Geographic Information Systems Extensions to PostgreSQL
License: GPLv2+
@@ -27,9 +27,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
-# rt_gdalwarp: Disable test that change under GDAL 3.1
-#
https://github.com/postgis/postgis/commit/28d3e83bcb1820bb4752d38530cd319...
-Patch1: postgis-disable-rt_gdalwarp.patch
BuildRequires: perl-generators
BuildRequires: postgresql-server-devel
@@ -332,6 +329,9 @@ fi
%changelog
+* Mon Nov 23 2020 Sandro Mani <manisandro(a)gmail.com> - 3.0.3-1
+- Update to 3.0.3
+
* Wed Nov 11 2020 Sandro Mani <manisandro(a)gmail.com> - 3.0.2-3
- Rebuild (proj, gdal)
- Cleanup spec
diff --git a/relax-test-timing-constraints.patch b/relax-test-timing-constraints.patch
index e4b7794..78d1fee 100644
--- a/relax-test-timing-constraints.patch
+++ b/relax-test-timing-constraints.patch
@@ -1,6 +1,6 @@
-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
+diff -rupN --no-dereference postgis-3.0.3/regress/core/interrupt_buffer.sql
postgis-3.0.3-new/regress/core/interrupt_buffer.sql
+--- postgis-3.0.3/regress/core/interrupt_buffer.sql 2020-11-21 01:48:34.000000000 +0100
++++ postgis-3.0.3-new/regress/core/interrupt_buffer.sql 2020-11-23 10:20:56.102865505
+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.0.2/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.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
+diff -rupN --no-dereference postgis-3.0.3/regress/core/interrupt_relate.sql
postgis-3.0.3-new/regress/core/interrupt_relate.sql
+--- postgis-3.0.3/regress/core/interrupt_relate.sql 2020-11-21 01:48:34.000000000 +0100
++++ postgis-3.0.3-new/regress/core/interrupt_relate.sql 2020-11-23 10:20:56.103865502
+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.0.2/regress/core/interrupt_relate.sql post
+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
+diff -rupN --no-dereference postgis-3.0.3/regress/core/interrupt.sql
postgis-3.0.3-new/regress/core/interrupt.sql
+--- postgis-3.0.3/regress/core/interrupt.sql 2020-11-21 01:48:34.000000000 +0100
++++ postgis-3.0.3-new/regress/core/interrupt.sql 2020-11-23 10:20:56.103865502 +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 2804aa8..f068ae5 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (postgis-3.0.2.pdf) =
accbddc10c8890f40f9cb0b43e641c6dc34bfed1c51c1579e1f124fa83e40d5ea55fcd8de7fa15803fbabbbb6b0362abea0c4708de5b993a273c3c0a5fc1d2f1
-SHA512 (postgis-3.0.2.tar.gz) =
763d7818d195eca0b07d94a864b13da68e5734ae57b7c93c285dc2d0fa4a155715745e5da67e1a3bca49d8d4f89dc495ed3912c079722290ce9f220afca33f4d
SHA512 (postgis-2.5.5.tar.gz) =
407c9ddf5b73aaa8d36ec606f974b86c16c9ed4aafbfd4a0b7f96cfc7a9f8a8fa38528cb4787bdd50de479416dbfb09934a85d189463cec549da66863060292e
+SHA512 (postgis-3.0.3.pdf) =
aea969a99ee50d5400045aa19e0c76a8fba81b0297b68b54c5a990af84f3fba64d7aad80085e6e46c5ce4b891a6d499b613d257d2364778de64e276413cc87a6
+SHA512 (postgis-3.0.3.tar.gz) =
478f0971e18c2a1bd651c9bf7b995236aad32fda037762505cf8ac9e67a4e40917436248c1e62827a1a6da96c15c4ae8d0b606d548fa080cdff453642b897115
commit 784424e8f06f0e05b43d294e39131ea9dea61087
Author: Sandro Mani <manisandro(a)gmail.com>
Date: Thu Nov 12 14:05:40 2020 +0100
Rebuild (proj, gdal), spec cleanups
diff --git a/postgis-disable-rt_gdalwarp.patch b/postgis-disable-rt_gdalwarp.patch
new file mode 100644
index 0000000..6497df0
--- /dev/null
+++ b/postgis-disable-rt_gdalwarp.patch
@@ -0,0 +1,406 @@
+diff -rupN --no-dereference postgis-3.0.2/raster/test/regress/rt_gdalwarp_expected
postgis-3.0.2-new/raster/test/regress/rt_gdalwarp_expected
+--- postgis-3.0.2/raster/test/regress/rt_gdalwarp_expected 2020-08-15 21:33:46.000000000
+0200
++++ postgis-3.0.2-new/raster/test/regress/rt_gdalwarp_expected 2020-11-12
05:15:08.610489276 +0100
+@@ -8,28 +8,16 @@ NOTICE: Raster has default geotransform
+ NOTICE: Values must be provided for both X and Y when specifying the scale. Returning
original raster
+ NOTICE: Values must be provided for both X and Y when specifying the scale. Returning
original raster
+ 0.0|||||||||||||
+-0.1|993310|12|12|1|1009.894|-1009.894|0.000|0.000|950732.188|1409281.783|t|t|t
+ 0.10|992163|10|10|1|1000.000|-1000.000|0.000|0.000|-500000.000|600000.000|t|t|t
+ 0.11|992163|11|10|1|1000.000|-1000.000|0.000|0.000|-500001.000|600000.000|t|t|t
+ 0.12|992163|10|11|1|1000.000|-1000.000|0.000|0.000|-500000.000|600009.000|t|t|t
+ 0.13|992163|11|11|1|1000.000|-1000.000|0.000|0.000|-500100.000|600950.000|t|t|t
+ 0.14|992163|201|201|1|50.000|50.000|0.000|0.000|-500040.000|589957.000|t|t|t
+ 0.15|992163|84|84|1|121.000|121.000|0.000|0.000|-500093.000|589875.000|t|t|t
+-0.16|993310|243|243|1|50.000|50.000|0.000|0.000|950710.000|1397157.000|t|t|t
+-0.17|993310|243|243|1|50.000|50.000|0.000|0.000|950710.000|1397157.000|t|t|t
+ 0.18|992163|10|10|1|1000.000|-1000.000|3.000|3.000|-500030.000|600000.000|t|t|t
+-0.19|993310|12|12|1|1009.894|-1009.894|3.000|3.000|950691.792|1409281.783|t|t|t
+-0.2|993310|12|12|1|1009.894|-1009.894|0.000|0.000|950732.188|1409281.783|t|t|t
+-0.20|993310|12|12|1|1009.894|-1009.894|1.000|3.000|950711.990|1409281.783|t|t|t
+-0.21|993310|24|24|1|500.000|500.000|3.000|3.000|950657.188|1397356.783|t|t|t
+-0.22|993310|26|26|1|500.000|500.000|0.000|6.000|950452.000|1396632.000|t|t|t
+-0.23|984269|12|8|1|0.012|-0.012|0.000|0.000|-107.029|50.206|t|t|t
+-0.24|974269|12|8|1|0.012|-0.012|0.000|0.000|-107.029|50.206|t|t|t
+ 0.25|0|5|5|1|2.000|-2.000|0.000|0.000|0.000|0.000|t|t|t
+ 0.26|0|2|2|1|5.000|-5.000|0.000|0.000|0.000|0.000|t|t|t
+ 0.27|0|100|100|1|0.100|-0.100|0.000|0.000|0.000|0.000|t|t|t
+-0.3|994269|12|8|1|0.012|-0.012|0.000|0.000|-107.029|50.206|t|t|t
+-0.4|993310|24|24|1|500.000|500.000|0.000|0.000|950732.188|1397281.783|t|t|t
+ 0.5|992163|10|10|1|1000.000|-1000.000|0.000|0.000|-500000.000|600000.000|t|t|t
+ 0.6|992163|10|10|1|1000.000|-1000.000|0.000|0.000|-500000.000|600000.000|t|t|t
+ 0.7|992163|20|20|1|500.000|500.000|0.000|0.000|-500000.000|590000.000|t|t|t
+@@ -61,21 +49,8 @@ NOTICE: Values must be provided for bot
+ 1.7|992163|40|40|1|250.000|250.000|0.000|0.000|-500000.000|590000.000|t|t|t
+ 1.8|992163|10|10|1|1000.000|-1000.000|0.000|0.000|-500000.000|600000.000|t|t|t
+ 1.9|992163|11|10|1|1000.000|-1000.000|0.000|0.000|-500001.000|600000.000|t|t|t
+-2.1|993310|12|12|1|1009.894|-1009.894|0.000|0.000|950732.188|1409281.783|t|t|t
+-2.10|993310|24|24|1|500.000|500.000|0.000|0.000|950732.188|1397281.783|t|t|t
+-2.11|993310|121|121|1|100.000|100.000|0.000|0.000|950732.188|1397181.783|t|t|t
+-2.12|993310|6|6|1|2000.000|2000.000|0.000|0.000|950732.188|1397281.783|t|t|t
+-2.13|993310|8|8|1|1500.000|1500.000|0.000|0.000|950732.188|1397281.783|t|t|t
+-2.14|993310|24|24|1|500.000|500.000|0.000|0.000|950732.188|1397281.783|t|t|t
+-2.15|993310|16|16|1|750.000|750.000|0.000|0.000|950732.188|1397281.783|t|t|t
+-2.2|993310|12|12|1|1009.894|-1009.894|0.000|0.000|950732.188|1409281.783|t|t|t
+-2.3|994269|12|8|1|0.012|-0.012|0.000|0.000|-107.029|50.206|t|t|t
+ 2.4|||||||||||||
+-2.5|993310|12|12|1|1009.894|-1009.894|0.000|0.000|950732.188|1409281.783|t|t|t
+ 2.6|||||||||||||
+-2.7|993310|12|12|1|1009.894|-1009.894|0.000|0.000|950732.188|1409281.783|t|t|t
+-2.8|993310|12|12|1|1009.894|-1009.894|0.000|0.000|950732.188|1409281.783|t|t|t
+-2.9|993310|12|12|1|1009.894|-1009.894|0.000|0.000|950732.188|1409281.783|t|t|t
+ 3.1|992163|100|100|1|100.000|100.000|0.000|0.000|-500000.000|590000.000|t|t|t
+ 3.2|992163|100|100|1|100.000|100.000|0.000|0.000|-500000.000|590000.000|t|t|t
+ 3.3|992163|10|10|1|1000.000|-1000.000|0.000|0.000|-500000.000|600000.000|t|t|t
+diff -rupN --no-dereference postgis-3.0.2/raster/test/regress/rt_gdalwarp.sql
postgis-3.0.2-new/raster/test/regress/rt_gdalwarp.sql
+--- postgis-3.0.2/raster/test/regress/rt_gdalwarp.sql 2020-08-15 21:33:46.000000000
+0200
++++ postgis-3.0.2-new/raster/test/regress/rt_gdalwarp.sql 2020-11-12 05:15:08.610489276
+0100
+@@ -54,33 +54,33 @@ INSERT INTO raster_gdalwarp_dst (rid, ra
+ NULL
+ ))
+ ), (
+- 0.1, (SELECT _st_gdalwarp(
+- rast,
+- 'NearestNeighbour', 0.125,
+- 993310
+- ) FROM raster_gdalwarp_src)
+-), (
+- 0.2, (SELECT _st_gdalwarp(
+- rast,
+- 'NearestNeighbour', 0.125,
+- 993310
+- ) FROM raster_gdalwarp_src)
+-), (
+- 0.3, (SELECT _st_gdalwarp(
+- rast,
+- 'NearestNeighbour', 0.125,
+- 994269
+- ) FROM raster_gdalwarp_src)
+-), (
+- 0.4, (SELECT _st_gdalwarp(
+- rast,
+- 'NearestNeighbor', 0.125,
+- 993310,
+- 500., 500.,
+- NULL, NULL,
+- 0, 0
+- ) FROM raster_gdalwarp_src)
+-), (
++-- 0.1, (SELECT _st_gdalwarp(
++-- rast,
++-- 'NearestNeighbour', 0.125,
++-- 993310
++-- ) FROM raster_gdalwarp_src)
++-- ), (
++-- 0.2, (SELECT _st_gdalwarp(
++-- rast,
++-- 'NearestNeighbour', 0.125,
++-- 993310
++-- ) FROM raster_gdalwarp_src)
++-- ), (
++-- 0.3, (SELECT _st_gdalwarp(
++-- rast,
++-- 'NearestNeighbour', 0.125,
++-- 994269
++-- ) FROM raster_gdalwarp_src)
++-- ), (
++-- 0.4, (SELECT _st_gdalwarp(
++-- rast,
++-- 'NearestNeighbor', 0.125,
++-- 993310,
++-- 500., 500.,
++-- NULL, NULL,
++-- 0, 0
++-- ) FROM raster_gdalwarp_src)
++-- ), (
+ 0.5, (SELECT _st_gdalwarp(
+ rast,
+ 'NearestNeighbor', 0.125,
+@@ -168,22 +168,22 @@ INSERT INTO raster_gdalwarp_dst (rid, ra
+ 0, 0
+ ) FROM raster_gdalwarp_src)
+ ), (
+- 0.16, (SELECT _st_gdalwarp(
+- rast,
+- 'NearestNeighbor', 0.125,
+- 993310,
+- 50., 50.,
+- -290, 7
+- ) FROM raster_gdalwarp_src)
+-), (
+- 0.17, (SELECT _st_gdalwarp(
+- rast,
+- 'NearestNeighbor', 0.125,
+- 993310,
+- 50., 50.,
+- -290, 7
+- ) FROM raster_gdalwarp_src)
+-), (
++-- 0.16, (SELECT _st_gdalwarp(
++-- rast,
++-- 'NearestNeighbor', 0.125,
++-- 993310,
++-- 50., 50.,
++-- -290, 7
++-- ) FROM raster_gdalwarp_src)
++-- ), (
++-- 0.17, (SELECT _st_gdalwarp(
++-- rast,
++-- 'NearestNeighbor', 0.125,
++-- 993310,
++-- 50., 50.,
++-- -290, 7
++-- ) FROM raster_gdalwarp_src)
++-- ), (
+ 0.18, (SELECT _st_gdalwarp(
+ rast,
+ 'NearestNeighbor', 0.125,
+@@ -193,54 +193,54 @@ INSERT INTO raster_gdalwarp_dst (rid, ra
+ 3, 3
+ ) FROM raster_gdalwarp_src)
+ ), (
+- 0.19, (SELECT _st_gdalwarp(
+- rast,
+- 'Cubic', 0,
+- 993310,
+- NULL, NULL,
+- NULL, NULL,
+- 3, 3
+- ) FROM raster_gdalwarp_src)
+-), (
+- 0.20, (SELECT _st_gdalwarp(
+- rast,
+- 'Bilinear', 0.125,
+- 993310,
+- NULL, NULL,
+- NULL, NULL,
+- 1, 3
+- ) FROM raster_gdalwarp_src)
+-), (
+- 0.21, (SELECT _st_gdalwarp(
+- rast,
+- 'Cubic', 0,
+- 993310,
+- 500., 500.,
+- NULL, NULL,
+- 3, 3
+- ) FROM raster_gdalwarp_src)
+-), (
+- 0.22, (SELECT _st_gdalwarp(
+- rast,
+- 'CubicSpline', 0.125,
+- 993310,
+- 500., 500.,
+- -12048, 14682,
+- 0, 6
+- ) FROM raster_gdalwarp_src)
+-), (
+- 0.23, (SELECT _st_gdalwarp(
+- rast,
+- 'NearestNeighbor', 0.125,
+- 984269
+- ) FROM raster_gdalwarp_src)
+-), (
+- 0.24, (SELECT _st_gdalwarp(
+- rast,
+- 'NearestNeighbor', 0.125,
+- 974269
+- ) FROM raster_gdalwarp_src)
+-), (
++-- 0.19, (SELECT _st_gdalwarp(
++-- rast,
++-- 'Cubic', 0,
++-- 993310,
++-- NULL, NULL,
++-- NULL, NULL,
++-- 3, 3
++-- ) FROM raster_gdalwarp_src)
++-- ), (
++-- 0.20, (SELECT _st_gdalwarp(
++-- rast,
++-- 'Bilinear', 0.125,
++-- 993310,
++-- NULL, NULL,
++-- NULL, NULL,
++-- 1, 3
++-- ) FROM raster_gdalwarp_src)
++-- ), (
++-- 0.21, (SELECT _st_gdalwarp(
++-- rast,
++-- 'Cubic', 0,
++-- 993310,
++-- 500., 500.,
++-- NULL, NULL,
++-- 3, 3
++-- ) FROM raster_gdalwarp_src)
++-- ), (
++-- 0.22, (SELECT _st_gdalwarp(
++-- rast,
++-- 'CubicSpline', 0.125,
++-- 993310,
++-- 500., 500.,
++-- -12048, 14682,
++-- 0, 6
++-- ) FROM raster_gdalwarp_src)
++-- ), (
++-- 0.23, (SELECT _st_gdalwarp(
++-- rast,
++-- 'NearestNeighbor', 0.125,
++-- 984269
++-- ) FROM raster_gdalwarp_src)
++-- ), (
++-- 0.24, (SELECT _st_gdalwarp(
++-- rast,
++-- 'NearestNeighbor', 0.125,
++-- 974269
++-- ) FROM raster_gdalwarp_src)
++-- ), (
+ 0.25, (SELECT _st_gdalwarp(
+ ST_SetGeoReference(ST_SetSRID(rast, 0), '1 0 0 -1 0 0'),
+ 'NearestNeighbor', 0.125,
+@@ -438,80 +438,80 @@ INSERT INTO raster_gdalwarp_dst (rid, ra
+
+ -- ST_Transform
+ INSERT INTO raster_gdalwarp_dst (rid, rast) VALUES (
+- 2.1, (SELECT ST_Transform(
+- rast,
+- 993310
+- ) FROM raster_gdalwarp_src)
+-), (
+- 2.2, (SELECT ST_Transform(
+- rast,
+- 993310
+- ) FROM raster_gdalwarp_src)
+-), (
+- 2.3, (SELECT ST_Transform(
+- rast,
+- 994269
+- ) FROM raster_gdalwarp_src)
+-), (
++-- 2.1, (SELECT ST_Transform(
++-- rast,
++-- 993310
++-- ) FROM raster_gdalwarp_src)
++-- ), (
++-- 2.2, (SELECT ST_Transform(
++-- rast,
++-- 993310
++-- ) FROM raster_gdalwarp_src)
++-- ), (
++-- 2.3, (SELECT ST_Transform(
++-- rast,
++-- 994269
++-- ) FROM raster_gdalwarp_src)
++-- ), (
+ 2.4, (SELECT ST_Transform(
+ rast,
+ 993310, NULL
+ ) FROM raster_gdalwarp_src)
+ ), (
+- 2.5, (SELECT ST_Transform(
+- rast,
+- 993310, 'Bilinear'
+- ) FROM raster_gdalwarp_src)
+-), (
++-- 2.5, (SELECT ST_Transform(
++-- rast,
++-- 993310, 'Bilinear'
++-- ) FROM raster_gdalwarp_src)
++-- ), (
+ 2.6, (SELECT ST_Transform(
+ rast,
+ 993310, 'Bilinear', NULL::double precision
+ ) FROM raster_gdalwarp_src)
+-), (
+- 2.7, (SELECT ST_Transform(
+- rast,
+- 993310, 'Cubic', 0.0
+- ) FROM raster_gdalwarp_src)
+-), (
+- 2.8, (SELECT ST_Transform(
+- rast,
+- 993310, 'NearestNeighbour', 0.0
+- ) FROM raster_gdalwarp_src)
+-), (
+- 2.9, (SELECT ST_Transform(
+- rast,
+- 993310, 'NearestNeighbor', 0.0
+- ) FROM raster_gdalwarp_src)
+-), (
+- 2.10, (SELECT ST_Transform(
+- rast,
+- 993310, 'NearestNeighbor', 0.125, 500, 500
+- ) FROM raster_gdalwarp_src)
+-), (
+- 2.11, (SELECT ST_Transform(
+- rast,
+- 993310, 'Cubic', 0., 100, 100
+- ) FROM raster_gdalwarp_src)
+-), (
+- 2.12, (SELECT ST_Transform(
+- rast,
+- 993310, 'CubicSpline', 0., 2000, 2000
+- ) FROM raster_gdalwarp_src)
+-), (
+- 2.13, (SELECT ST_Transform(
+- rast,
+- 993310, 'CubicSpline', 0.1, 1500, 1500
+- ) FROM raster_gdalwarp_src)
+-), (
+- 2.14, (SELECT ST_Transform(
+- rast,
+- 993310, 500, 500
+- ) FROM raster_gdalwarp_src)
+-), (
+- 2.15, (SELECT ST_Transform(
+- rast,
+- 993310, 750
+- ) FROM raster_gdalwarp_src)
++-- ), (
++-- 2.7, (SELECT ST_Transform(
++-- rast,
++-- 993310, 'Cubic', 0.0
++-- ) FROM raster_gdalwarp_src)
++-- ), (
++-- 2.8, (SELECT ST_Transform(
++-- rast,
++-- 993310, 'NearestNeighbour', 0.0
++-- ) FROM raster_gdalwarp_src)
++-- ), (
++-- 2.9, (SELECT ST_Transform(
++-- rast,
++-- 993310, 'NearestNeighbor', 0.0
++-- ) FROM raster_gdalwarp_src)
++-- ), (
++-- 2.10, (SELECT ST_Transform(
++-- rast,
++-- 993310, 'NearestNeighbor', 0.125, 500, 500
++-- ) FROM raster_gdalwarp_src)
++-- ), (
++-- 2.11, (SELECT ST_Transform(
++-- rast,
++-- 993310, 'Cubic', 0., 100, 100
++-- ) FROM raster_gdalwarp_src)
++-- ), (
++-- 2.12, (SELECT ST_Transform(
++-- rast,
++-- 993310, 'CubicSpline', 0., 2000, 2000
++-- ) FROM raster_gdalwarp_src)
++-- ), (
++-- 2.13, (SELECT ST_Transform(
++-- rast,
++-- 993310, 'CubicSpline', 0.1, 1500, 1500
++-- ) FROM raster_gdalwarp_src)
++-- ), (
++-- 2.14, (SELECT ST_Transform(
++-- rast,
++-- 993310, 500, 500
++-- ) FROM raster_gdalwarp_src)
++-- ), (
++-- 2.15, (SELECT ST_Transform(
++-- rast,
++-- 993310, 750
++-- ) FROM raster_gdalwarp_src)
+ );
+
+ -- ST_Rescale
diff --git a/postgis.spec b/postgis.spec
index e51351e..a7d37ad 100644
--- a/postgis.spec
+++ b/postgis.spec
@@ -1,60 +1,50 @@
-%{!?javabuild:%global javabuild 0}
-%{!?utils:%global utils 1}
-%{!?gcj_support:%global gcj_support 0}
-%{!?upgrade:%global upgrade 1}
-%{!?runselftest:%global runselftest 1}
-
-# rhbz#1503454
-%global _smp_mflags -j1
-
-%ifarch s390x
-# rhbz#1503476
-%undefine _hardened_build
-%endif
-%if 0%{?fedora} == 26
-%undefine _hardened_build
-%endif
-
-%global majorversion 3.0
-%global soversion 3
-%global prevmajorversion 2.5
-%global prevversion %{prevmajorversion}.5
-%global so_files postgis postgis_topology rtpostgis address_standardizer
-%global configure_opts --disable-rpath --enable-raster
-
-%global pg_version_minimum 9.4
-
-%global __provides_exclude_from %{_libdir}/pgsql
-
-Summary: Geographic Information Systems Extensions to PostgreSQL
-Name: postgis
-Version: %majorversion.2
-Release: 2%{?dist}
-License: GPLv2+
-Source0:
http://download.osgeo.org/%{name}/source/%{name}-%{version}.tar.gz
-Source2:
http://download.osgeo.org/%{name}/docs/%{name}-%{version}.pdf
-Source3:
http://download.osgeo.org/%{name}/source/%{name}-%{prevversion}.tar.gz
-Source4: filter-requires-perl-Pg.sh
-URL:
http://www.postgis.net
+%{!?javabuild:%global javabuild 0}
+%{!?utils:%global utils 1}
+%{!?gcj_support:%global gcj_support 0}
+%{!?upgrade:%global upgrade 1}
+%{!?runselftest:%global runselftest 1}
+
+%global majorversion 3.0
+%global soversion 3
+%global prevmajorversion 2.5
+%global prevversion %{prevmajorversion}.5
+%global so_files postgis postgis_topology rtpostgis address_standardizer
+%global configure_opts --disable-rpath --enable-raster
+
+%global __provides_exclude_from %{_libdir}/pgsql
+
+Name: postgis
+Version: %majorversion.2
+Release: 3%{?commit:.git%shortcommit}%{?dist}
+Summary: Geographic Information Systems Extensions to PostgreSQL
+License: GPLv2+
+
+URL:
http://www.postgis.net
+Source0:
http://download.osgeo.org/%{name}/source/%{name}-%{version}.tar.gz
+Source2:
http://download.osgeo.org/%{name}/docs/%{name}-%{version}.pdf
+Source3:
http://download.osgeo.org/%{name}/source/%{name}-%{prevversion}.tar.gz
# From debian
# This should increase chances of tests passing even on busy or slow systems.
-Patch0: relax-test-timing-constraints.patch
-
-BuildRequires: perl-generators
-BuildRequires: postgresql-server-devel >= %{pg_version_minimum}
-BuildRequires: libpq-devel, json-c-devel, gcc-c++, pcre-devel, autoconf
-BuildRequires: proj-devel >= 5.2.0, geos-devel >= 3.7.1 byacc, automake
-BuildRequires: flex, java, java-devel, gtk2-devel, ant, libtool
-BuildRequires: libxml2-devel, gdal-devel >= 1.10.0, desktop-file-utils
-BuildRequires: clang llvm
-BuildRequires: libxslt docbook-dtds
+Patch0: relax-test-timing-constraints.patch
+# rt_gdalwarp: Disable test that change under GDAL 3.1
+#
https://github.com/postgis/postgis/commit/28d3e83bcb1820bb4752d38530cd319...
+Patch1: postgis-disable-rt_gdalwarp.patch
+
+BuildRequires: perl-generators
+BuildRequires: postgresql-server-devel
+BuildRequires: libpq-devel, json-c-devel, gcc-c++, pcre-devel, autoconf
+BuildRequires: proj-devel >= 5.2.0, geos-devel >= 3.7.1 byacc, automake
+BuildRequires: flex, java, java-devel, gtk2-devel, ant, libtool
+BuildRequires: libxml2-devel, gdal-devel >= 1.10.0, desktop-file-utils
+BuildRequires: clang llvm
+BuildRequires: libxslt docbook-dtds
%if %upgrade
-BuildRequires: postgresql-upgrade-devel
+BuildRequires: postgresql-upgrade-devel
%endif
%{?postgresql_module_requires}
%if %runselftest
-BuildRequires: postgresql-test-rpm-macros
+BuildRequires: postgresql-test-rpm-macros
%endif
@@ -68,31 +58,35 @@ certified as compliant with the "Types and Functions"
profile.
%package llvmjit
-Summary: Just-in-time compilation support for PostGIS
-Requires: %{name}%{?_isa} = %{version}-%{release}
+Summary: Just-in-time compilation support for PostGIS
+Requires: %{name}%{?_isa} = %{version}-%{release}
%description llvmjit
Just-in-time compilation support for PostGIS.
%package docs
-Summary: Extra documentation for PostGIS
+Summary: Extra documentation for PostGIS
+
%description docs
The postgis-docs package includes PDF documentation of PostGIS.
%if %javabuild
%package jdbc
-Summary: The JDBC driver for PostGIS
-License: LGPLv2+
-Requires: %{name} = %{version}-%{release}, postgresql-jdbc
-BuildRequires: ant >= 0:1.6.2, junit >= 0:3.7, postgresql-jdbc
+Summary: The JDBC driver for PostGIS
+License: LGPLv2+
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: postgresql-jdbc
+BuildRequires: ant >= 0:1.6.2
+BuildRequires: junit >= 0:3.7
+BuildRequires: postgresql-jdbc
%if %{gcj_support}
-BuildRequires: gcc-java
-BuildRequires: java-1.5.0-gcj-devel
-Requires(post): %{_bindir}/rebuild-gcj-db
-Requires(postun): %{_bindir}/rebuild-gcj-db
+BuildRequires: gcc-java
+BuildRequires: java-1.5.0-gcj-devel
+Requires(post): %{_bindir}/rebuild-gcj-db
+Requires(postun): %{_bindir}/rebuild-gcj-db
%endif
%description jdbc
@@ -102,9 +96,9 @@ The postgis-jdbc package provides the essential jdbc driver for
PostGIS.
%if %utils
%package utils
-Summary: The utils for PostGIS
-Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: perl-DBD-Pg
+Summary: The utils for PostGIS
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: perl-DBD-Pg
%description utils
The postgis-utils package provides the utilities for PostGIS.
@@ -113,18 +107,16 @@ The postgis-utils package provides the utilities for PostGIS.
%if %upgrade
%package upgrade
-Summary: Support for upgrading from the previous major release of Postgis
-Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: postgresql-upgrade
-Provides: bundled(postgis) = %prevversion
+Summary: Support for upgrading from the previous major release of Postgis
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: postgresql-upgrade
+Provides: bundled(postgis) = %prevversion
%description upgrade
The postgis-upgrade package contains the previous version of postgis
necessary for correct dump of schema from previous version of PostgreSQL.
%endif
-%define __perl_requires %{SOURCE4}
-
%prep
%autosetup -p1 -n %{name}-%{version} -a 3
@@ -146,7 +138,7 @@ sed -i 's| -fstack-clash-protection | |' topology/Makefile
sed -i 's| -fstack-clash-protection | |'
extensions/address_standardizer/Makefile
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g'
libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-make %{?_smp_mflags}
+%make_build
%if %javabuild
export BUILDXML_DIR=%{_builddir}/%{name}-%{version}/java/jdbc
@@ -159,7 +151,7 @@ popd
%endif
%if %utils
-make %{?_smp_mflags} -C utils
+%make_build -C utils
%endif
%if %upgrade
@@ -174,7 +166,7 @@ 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
sed -i 's| -fstack-clash-protection | |'
extensions/address_standardizer/Makefile
-make %{?_smp_mflags}
+%make_build
mkdir ../compat-build
for so in %so_files; do
find -name $so.so -exec cp {} ../compat-build/$so-%{prevmajorversion}.so \;
@@ -193,24 +185,22 @@ 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
sed -i 's| -fstack-clash-protection | |'
extensions/address_standardizer/Makefile
-make %{?_smp_mflags}
+%make_build
)
%endif
%install
-make install DESTDIR=%{buildroot}
-make %{?_smp_mflags} -C utils install DESTDIR=%{buildroot}
-make %{?_smp_mflags} -C extensions install DESTDIR=%{buildroot}
+%make_install
+%make_install -C utils
+%make_install -C extensions
# move application metadata to correct location
mv %{buildroot}/%{_datadir}/pgsql/applications %{buildroot}/%{_datadir}
mv %{buildroot}/%{_datadir}/pgsql/icons %{buildroot}/%{_datadir}
%if %upgrade
-cd %{name}-%{prevversion}
-make install DESTDIR=%{buildroot}
-cd ..
+(cd %{name}-%{prevversion} && %make_install)
# drop unused stuff from upgrade-only installation
/bin/rm -rf %buildroot%postgresql_upgrade_prefix/bin
@@ -251,10 +241,6 @@ if ! LD_LIBRARY_PATH=%{buildroot}%_libdir make check %{_smp_mflags} ;
then
echo "== $file =="
cat "$file"
done
-%ifnarch %ix86 ppc64 s390x
- # rhbz#1503453
- false
-%endif
fi
%endif
@@ -270,12 +256,9 @@ fi
%files
%license COPYING
%doc CREDITS NEWS TODO README.%{name} loader/README.* doc/%{name}.xml doc/ZMSgeoms.txt
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/pgsql/%{name}-%{soversion}.so
+%{_bindir}/*
+%{_libdir}/pgsql/%{name}-%{soversion}.so
%{_datadir}/pgsql/contrib/postgis-%{majorversion}/*.sql
-#if {_lib} == lib64
-#{_datadir}/pgsql/contrib/postgis*.sql
-#endif
%{_datadir}/pgsql/extension/address_standardizer*.sql
%{_datadir}/pgsql/extension/address_standardizer*.control
%{_datadir}/pgsql/extension/postgis-*.sql
@@ -307,8 +290,9 @@ fi
%if %javabuild
%files jdbc
-%doc java/jdbc/COPYING_LGPL java/jdbc/README
-%attr(755,root,root) %{_javadir}/%{name}.jar
+%license java/jdbc/COPYING_LGPL
+%doc java/jdbc/README
+%{_javadir}/%{name}.jar
%if %{gcj_support}
%dir %{_libdir}/gcj/%{name}
%{_libdir}/gcj/%{name}/*.jar.so
@@ -348,6 +332,10 @@ fi
%changelog
+* Wed Nov 11 2020 Sandro Mani <manisandro(a)gmail.com> - 3.0.2-3
+- Rebuild (proj, gdal)
+- Cleanup spec
+
* Thu Oct 08 2020 Jeff Law <law(a)redhat.com> - 3.0.2-2
- Re-enable LTO
commit 1ed9759dddc278676ca24599bf70e9e257cd99fc
Author: Jeff Law <law(a)redhat.com>
Date: Thu Oct 8 15:22:53 2020 -0600
Re-enable LTO
diff --git a/postgis.spec b/postgis.spec
index 4f3ed89..e51351e 100644
--- a/postgis.spec
+++ b/postgis.spec
@@ -29,7 +29,7 @@
Summary: Geographic Information Systems Extensions to PostgreSQL
Name: postgis
Version: %majorversion.2
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
Source0:
http://download.osgeo.org/%{name}/source/%{name}-%{version}.tar.gz
Source2:
http://download.osgeo.org/%{name}/docs/%{name}-%{version}.pdf
@@ -139,9 +139,6 @@ cp -p %{SOURCE2} .
%build
-# Disable LTO for now, causes test failures
-%define _lto_cflags %{nil}
-
%configure %configure_opts --with-gui --with-pgconfig=%{_bindir}/pg_server_config
sed -i 's| -fstack-clash-protection | |' postgis/Makefile
sed -i 's| -fstack-clash-protection | |' raster/rt_pg/Makefile
@@ -351,6 +348,9 @@ fi
%changelog
+* Thu Oct 08 2020 Jeff Law <law(a)redhat.com> - 3.0.2-2
+- Re-enable LTO
+
* Mon Aug 17 2020 Sandro Mani <manisandro(a)gmail.com> - 3.0.2-1
- Update to 3.0.2