Update to 3.2.2

.gitignore

@@ -23,3 +23,5 @@
 /postgis-3.2.0.tar.gz
 /postgis-3.2.1.pdf
 /postgis-3.2.1.tar.gz
+/postgis-3.2.2.tar.gz
+/postgis-3.2.2.pdf

postgis.spec

@@ -1,7 +1,7 @@
 %{!?javabuild:%global javabuild 0}
 %{!?utils:%global utils 1}
 %{!?gcj_support:%global gcj_support 0}
-%{!?upgrade:%global upgrade 0}
+%{!?upgrade:%global upgrade 1}
 %{!?runselftest:%global runselftest 1}
 
 # Re-enable upgrade packages on next major version bump!
@@ -15,8 +15,8 @@
 %global        __provides_exclude_from %{_libdir}/pgsql
 
 Name:          postgis
-Version:       %majorversion.1
-Release:       4%{?commit:.git%shortcommit}%{?dist}
+Version:       %majorversion.2
+Release:       1%{?commit:.git%shortcommit}%{?dist}
 Summary:       Geographic Information Systems Extensions to PostgreSQL
 License:       GPLv2+
 
@@ -29,6 +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
 
+# Add proj8 compatibility to postgis-2.x (needed for upgrade package)
+Patch1:        postgis2-proj8.patch
+
 %ifnarch armv7hl
 BuildRequires: SFCGAL-devel
 %endif
@@ -148,23 +151,17 @@ Requires:      %{name}%{?_isa} = %{version}-%{release}
 The client package provides shp2pgsql, raster2pgsql and pgsql2shp for PostGIS.
 
 %prep
-%autosetup -p1 -n %{name}-%{version} -a 3
-# For patch1
-./autogen.sh
+%setup -q -n %{name}-%{version} -a 3
+%patch0 -p1
 
 %if %upgrade
-# postgis-upgrade
 (
-cd %{name}-%{prevversion}
-./autogen.sh
-)
 tar xf %{SOURCE0}
-(
-cd %{name}-%{version}
+
+cd %{name}-%{prevversion}
 %patch1 -p1
 ./autogen.sh
 )
-
 %endif
 cp -p %{SOURCE2} .
 
@@ -199,7 +196,6 @@ popd
 
 %if %upgrade
 (
-# TODO: report that out-of-tree (VPATH) build is broken
 cd %{name}-%{version}
 
 # Build current Postgis version against the previous PostgreSQL version.  We need only the so names.
@@ -218,7 +214,6 @@ sed -i 's| -fstack-clash-protection | |' extensions/address_standardizer/Makefil
 )
 
 (
-# TODO: report that out-of-tree (VPATH) build is broken
 cd %{name}-%{prevversion}
 
 # Build previous Postgis version against the current PostgreSQL version.  We need only the so names.
@@ -412,6 +407,10 @@ fi
 
 
 %changelog
+* Sat Aug 06 2022 Sandro Mani <manisandro@gmail.com> - 3.2.2-1
+- Update to 3.2.2
+- Re-enable upgrade subpackages
+
 * Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 

sources

@@ -1,3 +1,3 @@
-SHA512 (postgis-3.2.1.pdf) = e8a616d474c9b6c0fdf73ad5eb15da1d10115e028242192352ba5e309efcbc879e2d92e9f848a835e7c8bdf5d52e5ebb12b605b1f0f84b9854cc66a0deb4e28a
-SHA512 (postgis-3.2.1.tar.gz) = e0ea3d2304e71c98dd045a8031946235d9c26a1310e1ffa556db10dfd18378957ee3d88608fba7ff482835d8c8b41d7f7bddaff1279ce0b50cd7634237465b31
+SHA512 (postgis-3.2.2.tar.gz) = f0e6d8975be5efba60de23182787d89deb4945d6af0d2361eca42dc7db4e6f718c6e8395a77b3e71aa64aed791bed0223a249f66a96aac77015584199f35affa
+SHA512 (postgis-3.2.2.pdf) = ca6a456e69e6bf30733356b964f84aa550284cb56e18edc180a45c0bbfd7f965e1959b0b5f14a6dd54ca629891de57311121960323223681c4ed4bcb863cb4f5
 SHA512 (postgis-2.5.5.tar.gz) = 407c9ddf5b73aaa8d36ec606f974b86c16c9ed4aafbfd4a0b7f96cfc7a9f8a8fa38528cb4787bdd50de479416dbfb09934a85d189463cec549da66863060292e