Update to 2.5.4

.gitignore

@@ -1,3 +1,5 @@
 /postgis-2.4.5.tar.gz
 /postgis-2.5.1.pdf
 /postgis-2.5.1.tar.gz
+/postgis-2.5.4.tar.gz
+/postgis-2.5.4.pdf

postgis-2.4.0-code-check-only.patch

@@ -1,21 +1,7 @@
-diff --git a/GNUmakefile.in b/GNUmakefile.in
-index 878548e..3c95a2f 100644
---- a/GNUmakefile.in
-+++ b/GNUmakefile.in
-@@ -35,7 +35,7 @@ clean-local:
- # TODO: drop 'test' target..
- test: check
- 
--check: all docs-check check-no-trailing-blanks
-+check: all
- 
- check-no-trailing-blanks:
-	! find . -name '*.c' -o -name '*.h' -o -name '*.proto' | \
-diff --git a/doc/Makefile.in b/doc/Makefile.in
-index 31fd778..6268e7f 100644
---- a/doc/Makefile.in
-+++ b/doc/Makefile.in
-@@ -397,6 +397,9 @@ check: $(XML_INPUTS)
+diff -rupN --no-dereference postgis-2.5.4/doc/Makefile.in postgis-2.5.4-new/doc/Makefile.in
+--- postgis-2.5.4/doc/Makefile.in	2020-02-28 18:35:29.000000000 +0100
++++ postgis-2.5.4-new/doc/Makefile.in	2020-05-01 14:45:58.325849139 +0200
+@@ -410,6 +410,9 @@ check: $(XML_INPUTS)
  	$(XMLLINT) --loaddtd --xinclude --valid postgis-out.xml > /dev/null
  endif
  
@@ -25,3 +11,15 @@ index 31fd778..6268e7f 100644
  check-localized:
  	@for lang in $(translations); do \
      echo "Creating html for language $$lang..."; \
+diff -rupN --no-dereference postgis-2.5.4/GNUmakefile.in postgis-2.5.4-new/GNUmakefile.in
+--- postgis-2.5.4/GNUmakefile.in	2020-02-28 18:35:29.000000000 +0100
++++ postgis-2.5.4-new/GNUmakefile.in	2020-05-01 14:45:58.325849139 +0200
+@@ -35,7 +35,7 @@ clean-local:
+ # TODO: drop 'test' target..
+ test: check
+ 
+-check: all docs-check check-no-trailing-blanks
++check: all
+ 
+ check-no-trailing-blanks:
+ 	! find . -name '*.c' -o -name '*.h' -o -name '*.proto' | \

postgis-2.4.0-install-desktop.patch

@@ -1,7 +1,6 @@
-diff --git a/loader/Makefile.in b/loader/Makefile.in
-index cb8df63..0ab2670 100644
---- a/loader/Makefile.in
-+++ b/loader/Makefile.in
+diff -rupN --no-dereference postgis-2.5.4/loader/Makefile.in postgis-2.5.4-new/loader/Makefile.in
+--- postgis-2.5.4/loader/Makefile.in	2020-02-28 18:35:29.000000000 +0100
++++ postgis-2.5.4-new/loader/Makefile.in	2020-05-01 14:45:57.670848846 +0200
 @@ -130,7 +130,9 @@ ifdef gtk_build
  	done
  endif

postgis-configureac21.patch

@@ -1,11 +0,0 @@
---- configure.ac.old	2015-03-19 10:18:35.555068815 +0200
-+++ configure.ac	2015-03-19 10:21:06.379456520 +0200
-@@ -1093,7 +1093,7 @@
- 		CPPFLAGS_SAVE="$CPPFLAGS"
- 		CPPFLAGS="$LIBGDAL_CFLAGS"
- 		CFLAGS_SAVE="$CFLAGS"
--		CFLAGS=""
-+		CFLAGS="-fPIC"
- 		LIBS_SAVE="$LIBS"
- 		LIBS="$LIBGDAL_LDFLAGS"
- 

postgis.spec

@@ -27,8 +27,8 @@
 
 Summary:	Geographic Information Systems Extensions to PostgreSQL
 Name:		postgis
-Version:	%majorversion.1
-Release:	2%{?dist}
+Version:	%majorversion.4
+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
@@ -136,10 +136,14 @@ cp -p %{SOURCE2} .
 
 
 %build
-%configure %configure_opts --with-gui
+%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
+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
@@ -152,7 +156,7 @@ popd
 %endif
 
 %if %utils
-make %{?_smp_mflags} -C utils
+%make_build -C utils
 %endif
 
 %if %upgrade
@@ -163,7 +167,7 @@ cd %{name}-%{prevversion}
 # first perform compat-build (against the actual PostgreSQL version).  We need
 # only the so names.
 %configure %configure_opts
-make %{?_smp_mflags}
+%make_build
 mkdir ../compat-build
 for so in %so_files; do
     find -name $so-%prevmajorversion.so -exec cp -t ../compat-build/ {} +
@@ -177,23 +181,24 @@ done
 	--with-pgconfig=%postgresql_upgrade_prefix/bin/pg_config \
 	--libdir=%postgresql_upgrade_prefix/lib \
 	--includedir=%postgresql_upgrade_prefix/include
-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
 
 # hack: this requires postgis-%%version-install-desktop.patch
 make -C loader install-rpm-desktop DESTDIR=%{buildroot} datadir=%{_datadir}
 
 %if %upgrade
+(
 cd %{name}-%{prevversion}
-make install DESTDIR=%{buildroot}
-cd ..
+%make_install
+)
 
 # drop unused stuff from upgrade-only installation
 /bin/rm -rf %buildroot%postgresql_upgrade_prefix/bin
@@ -329,6 +334,10 @@ fi
 
 
 %changelog
+* Fri May 01 2020 Sandro Mani <manisandro@gmail.com> - 2.5.4-1
+- Update to 2.5.4
+- Pass --with-pgconfig=%{_bindir}/pg_server_config to configure
+
 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 

sources

@@ -1,3 +1,3 @@
+SHA512 (postgis-2.5.4.tar.gz) = 767c146245ae11545ce4e0764f9bd313cfdf2eed78c485c5aa5530517edb8e433bcdbaffcf4d92b0c0f3c997de9831b5e3beed7638fc3bc773f264b45e5d8ab4
+SHA512 (postgis-2.5.4.pdf) = 120d72fbc1e06360a49f400b4930f5ffe32e9f24546164194382debd04741c7a272733d4dfc81143a6b29851d0d9954e54f9c1c0917d21db40b92187937444f1
 SHA512 (postgis-2.4.5.tar.gz) = 0bdde0c0f5b34ded684fa5623801fe0b2c324a46cf18145129d2f7fc2d29ee2eb6495656503f1392234954add0cc2411ea2896928f1f2683d98b8ca5cbb9fe8d
-SHA512 (postgis-2.5.1.pdf) = b3e4fa28518502a19fc53a7e49021e4fb72ef67fb1590545e4f770e8dc477f7f20cfe7269ba4efbad326e6393305ad9eb320c60655d29b959e1e2fbe8eca8ba4
-SHA512 (postgis-2.5.1.tar.gz) = c6c9c8c5befd945614e92d1062df1d753ca8b7fd69b70226065c2dac77a59783b14ece4da994187079b683ee090ba5a79389ba679f22fce8c20a5afc2c8dfca0