Fix sources

Update to 3.3.3
Disable upgrade builds for now
2023-05-30 08:03:04 +02:00 · 2023-05-30 07:57:43 +02:00 · 2023-05-11 11:59:05 +02:00 · 2023-05-11 10:12:05 +02:00 · 2023-04-09 22:16:19 +02:00 · 2023-01-20 10:07:43 +00:00
10 changed files with 4055 additions and 150 deletions
--- a/.cvsignore
+++ b/.cvsignore
@ -1,2 +0,0 @@
-postgis-1.5.0.tar.gz
-postgis-1.5.0.pdf
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,33 @@
+/postgis-2.5.3.tar.gz
+/postgis-3.0.0.pdf
+/postgis-3.0.0.tar.gz
+/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
+/postgis-3.0.3.tar.gz
+/postgis-3.0.3.pdf
+/postgis-3.1.0.pdf
+/postgis-3.1.0.tar.gz
+/postgis-3.1.1.tar.gz
+/postgis-3.1.1.pdf
+/postgis-3.1.2.tar.gz
+/postgis-3.1.2.pdf
+/postgis-3.1.3.pdf
+/postgis-3.1.3.tar.gz
+/postgis-3.1.4.pdf
+/postgis-3.1.4.tar.gz
+/postgis-3.2.0.pdf
+/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-3.3.1.tar.gz
+/postgis-3.3.1.pdf
+/postgis-3.3.2.tar.gz
+/postgis-3.3.2.pdf
+/postgis-3.3.3.pdf
+/postgis-3.3.3.tar.gz
--- a/21
+++ b/21
@ -1,21 +0,0 @@
-# Makefile for source rpm: postgis
-# $Id: Makefile,v 1.1 2006/12/27 21:40:16 devrim Exp $
-NAME := postgis
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
--- a/filter-requires-perl-Pg.sh
+++ b/filter-requires-perl-Pg.sh
@ -1,3 +0,0 @@
-#!/bin/sh
-
-/usr/lib/rpm/perl.req $* | grep -v 'perl(Pg'
--- a/postgis-c99-2.patch
+++ b/postgis-c99-2.patch
@ -0,0 +1,17 @@
+Include <math.h> for isnan.  This avoids an implicit function
+declaration and a build failure with future compilers.
+
+Submitted upstream: <https://github.com/postgis/postgis/pull/725>
+
+diff -ur postgis-3.3.2.orig/loader/shp2pgsql-core.c postgis-3.3.2/loader/shp2pgsql-core.c
+--- postgis-3.3.2.orig/loader/shp2pgsql-core.c	2022-11-13 08:09:23.000000000 +0100
+++ postgis-3.3.2/loader/shp2pgsql-core.c	2023-04-09 22:01:46.377934865 +0200
+@@ -15,6 +15,8 @@
+ 
+ #include "../postgis_config.h"
+ 
+#include <math.h> /* for isnan */
+
+ #include "shp2pgsql-core.h"
+ #include "../liblwgeom/liblwgeom.h"
+ #include "../liblwgeom/lwgeom_log.h" /* for LWDEBUG macros */
--- a/postgis-c99.patch
+++ b/postgis-c99.patch
@ -0,0 +1,54 @@
+commit ae53a53246ccb26a6e82fede1a4184b41bcf097d
+Author: Regina Obe <lr@pcorp.us>
+Date:   Sat Feb 19 00:21:01 2022 -0500
+
+    Fix PG 15 building atoi removed.  References #5100 for PostGIS 3.3.0
+
+diff -ur postgis-3.3.2.orig/postgis-2.5.5/postgis/gserialized_typmod.c postgis-3.3.2/postgis-2.5.5/postgis/gserialized_typmod.c
+--- postgis-3.3.2.orig/postgis-2.5.5/postgis/gserialized_typmod.c	2023-04-09 21:52:47.909294055 +0200
+++ postgis-3.3.2/postgis-2.5.5/postgis/gserialized_typmod.c	2023-04-09 21:55:24.744826310 +0200
+@@ -35,7 +35,7 @@
+ 
+ #include "utils/elog.h"
+ #include "utils/array.h"
+-#include "utils/builtins.h"  /* for pg_atoi */
+#include "utils/builtins.h"  /* for cstring_to_text */
+ #include "lib/stringinfo.h"  /* For binary input */
+ #include "catalog/pg_type.h" /* for CSTRINGOID */
+ 
+@@ -267,8 +267,33 @@
+ 		}
+ 		if ( i == 1 ) /* SRID */
+ 		{
+-			int srid = pg_atoi(DatumGetCString(elem_values[i]),
+-			                   sizeof(int32), '\0');
+			char *int_string = DatumGetCString(elem_values[i]);
+			char *endp;
+			long l;
+			int32_t srid;
+
+			errno = 0;
+			l = strtol(int_string, &endp, 10);
+
+			if (int_string == endp)
+				ereport(ERROR,
+						(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
+						 errmsg("invalid input syntax for type %s: \"%s\"",
+								"integer", int_string)));
+
+			if (errno == ERANGE || l < INT_MIN || l > INT_MAX)
+				ereport(ERROR,
+						(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
+						 errmsg("value \"%s\" is out of range for type %s", int_string,
+								"integer")));
+
+			if (*endp != '\0')
+				ereport(ERROR,
+						(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
+						 errmsg("invalid input syntax for type %s: \"%s\"",
+								"integer", int_string)));
+
+			srid = clamp_srid(l);
+ 			srid = clamp_srid(srid);
+ 			POSTGIS_DEBUGF(3, "srid: %d", srid);
+ 			if ( srid != SRID_UNKNOWN )
--- a/postgis-loader-makefile.patch
+++ b/postgis-loader-makefile.patch
@ -1,50 +0,0 @@
--- loader/Makefile.in.old	2009-07-06 00:10:47.000000000 +0300
-+++ loader/Makefile.in	2009-07-06 00:12:35.000000000 +0300
-@@ -23,9 +23,6 @@
- PGSQL_FE_CPPFLAGS=@PGSQL_FE_CPPFLAGS@
- PGSQL_FE_LDFLAGS=@PGSQL_FE_LDFLAGS@
- 
-# PostgreSQL executable directory
-PGSQL_BINDIR=@PGSQL_BINDIR@
-
- # iconv flags
- ICONV_LDFLAGS=@ICONV_LDFLAGS@
- 
-@@ -36,6 +33,19 @@
- GTK_CFLAGS = @GTK_CFLAGS@
- GTK_LIBS = @GTK_LIBS@
- 
-+# PGXS information
-+#
-+# Note that PGXS currently doesn't handle building FE executables, but we need
-+# the INSTALL and DESTDIR variables so we can get the correct install paths. 
-+# Hence we include the PGXS Makefile here, but ensure that we override the
-+# 'all' and 'install' targets with the ones we really want to use below.
-+PG_CONFIG = @PGCONFIG@
-+PGXS := @PGXS@
-+include $(PGXS)
-+
-+# The real parts of the Makefile
-+
-+
- all: $(SHP2PGSQL) $(PGSQL2SHP) @GTK_BUILD@
- 
- gui: $(SHP2PGSQL-GUI) $(SHP2PGSQL-CLI)
-@@ -67,12 +77,13 @@
- 	$(CC) $(CFLAGS) $(ICONV_LDFLAGS) -lm $^ -o $@
- 
- install: all
-	@cp $(PGSQL2SHP) $(PGSQL_BINDIR)/$(PGSQL2SHP)
-	@cp $(SHP2PGSQL) $(PGSQL_BINDIR)/$(SHP2PGSQL)
-+	@mkdir -p $(DESTDIR)$(bindir)
-+	$(INSTALL) $(PGSQL2SHP) $(DESTDIR)$(bindir)
-+	$(INSTALL) $(SHP2PGSQL) $(DESTDIR)$(bindir)
- 
- uninstall:
-	@rm -f $(PGSQL_BINDIR)/$(PGSQL2SHP)
-	@rm -f $(PGSQL_BINDIR)/$(SHP2PGSQL)
-+	@rm -f $(DESTDIR)$(bindir)/$(PGSQL2SHP)
-+	@rm -f $(DESTDIR)$(bindir)/$(SHP2PGSQL)
- 
- clean:
- 	@rm -f *.o $(SHP2PGSQL) $(PGSQL2SHP) 
--- a/postgis.spec
+++ b/postgis.spec
@ -1,79 +1,183 @@
-%{!?javabuild:%define	javabuild 1}
-%{!?utils:%define	utils 1}
-%{!?gcj_support:%define	gcj_support 1}
+%{!?javabuild:%global javabuild 0}
+%{!?utils:%global utils 1}
+%{!?gcj_support:%global gcj_support 0}
+%{!?upgrade:%global upgrade 0}
+%{!?runselftest:%global runselftest 1}

-%global majorversion 1.5
+%global        majorversion 3.3
+%global        soversion 3
+%global        prevmajorversion 2.5
+%global        prevversion %{prevmajorversion}.5
+%global        so_files postgis postgis_topology rtpostgis
+%global        configure_opts --disable-rpath --enable-raster

-Summary:	Geographic Information Systems Extensions to PostgreSQL
-Name:		postgis
-Version:	1.5.0
-Release:	1%{?dist}
-License:	GPLv2+
-Group:		Applications/Databases
-Source0:	http://postgis.refractions.net/download/%{name}-%{version}.tar.gz
-Source2:	http://www.postgis.org/download/%{name}-%{version}.pdf
-Source4:	filter-requires-perl-Pg.sh
-URL:		http://postgis.refractions.net/
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%global        __provides_exclude_from %{_libdir}/pgsql
+
+Name:          postgis
+Version:       3.3.3
+Release:       1%{?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
+
+# Add proj8 compatibility to postgis-2.x (needed for upgrade package)
+Patch1:        postgis2-proj8.patch
+Patch2:	       postgis-c99.patch
+Patch3:	       postgis-c99-2.patch
+
+%ifnarch armv7hl
+BuildRequires: SFCGAL-devel
+%endif
+BuildRequires: make
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: byacc
+BuildRequires: clang
+BuildRequires: desktop-file-utils
+BuildRequires: docbook-dtds
+BuildRequires: flex
+BuildRequires: gcc-c++
+BuildRequires: gdal-devel >= 1.10.0
+BuildRequires: geos-devel >= 3.7.1
+BuildRequires: gtk2-devel
+BuildRequires: json-c-devel
+BuildRequires: libtool
+BuildRequires: libxml2-devel
+BuildRequires: libxslt
+BuildRequires: llvm
+BuildRequires: pcre2-devel
+BuildRequires: perl-generators
+BuildRequires: postgresql-server-devel
+BuildRequires: proj-devel >= 5.2.0
+BuildRequires: protobuf-c-devel
+%if %upgrade
+BuildRequires: postgresql-upgrade-devel
+%endif
+%if %runselftest
+BuildRequires: postgresql-test-rpm-macros
+%endif

-BuildRequires:	postgresql-devel >= 8.2, proj-devel, geos-devel >= 3.1.1, byacc, proj-devel, flex, sinjdoc, java, java-devel, ant
-BuildRequires:	gtk2-devel, libxml2-devel
-Requires:	postgresql >= 8.2, geos >= 3.1.1, proj

 %description
 PostGIS adds support for geographic objects to the PostgreSQL object-relational
 database. In effect, PostGIS "spatially enables" the PostgreSQL server,
 allowing it to be used as a backend spatial database for geographic information
-systems (GIS), much like ESRI's SDE or Oracle's Spatial extension. PostGIS 
-follows the OpenGIS "Simple Features Specification for SQL" and has been 
+systems (GIS), much like ESRI's SDE or Oracle's Spatial extension. PostGIS
+follows the OpenGIS "Simple Features Specification for SQL" and has been
 certified as compliant with the "Types and Functions" profile.

+
+%package llvmjit
+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
-Group:		Applications/Databases
+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
-Group:		Applications/Databases
-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: java-devel
+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
 The postgis-jdbc package provides the essential jdbc driver for PostGIS.
 %endif

+
 %if %utils
 %package utils
-Summary:	The utils for PostGIS
-Group:		Applications/Databases
-Requires:	%{name} = %{version}-%{release}, 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.
 %endif

-%define __perl_requires %{SOURCE4}
+
+%if %upgrade
+%package upgrade
+Summary:       Support for upgrading 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 as well as
+the current version of Postgis built against the previous version of PostgreSQL
+necessary for correct dump of schema from previous version of PostgreSQL.
+%endif
+
+%package gui
+Summary:       The shp2pgsql-gui utility for PostGIS
+Requires:      %{name}%{?_isa} = %{version}-%{release}
+
+%description gui
+The gui package provides shp2pgsql-gui for PostGIS.
+
+%package client
+Summary:       The CLI clients for PostGIS
+Requires:      %{name}%{?_isa} = %{version}-%{release}
+
+%description client
+The client package provides shp2pgsql, raster2pgsql and pgsql2shp for PostGIS.

 %prep
-%setup -q -n %{name}-%{version}
-# Copy .pdf file to top directory before installing.
+%setup -q -n %{name}-%{version} -a 3
+
+%if %upgrade
+(
+tar xf %{SOURCE0}
+
+cd %{name}-%{prevversion}
+%patch1 -p1
+%patch -P 2 -p2
+%patch -P 3 -p1
+./autogen.sh
+)
+%endif
+%patch -P 3 -p1
 cp -p %{SOURCE2} .

+
 %build
-%configure --with-gui
-#make %{?_smp_mflags} LPATH=`pg_config --pkglibdir` shlib="%{name}.so"
-make LPATH=`pg_config --pkglibdir` shlib="%{name}.so"
+%ifnarch armv7hl
+%configure %configure_opts --with-gui --with-pgconfig=%{_bindir}/pg_server_config --with-sfcgal
+%else
+%configure %configure_opts --with-gui --with-pgconfig=%{_bindir}/pg_server_config
+%endif
+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_build

 %if %javabuild
 export BUILDXML_DIR=%{_builddir}/%{name}-%{version}/java/jdbc
@ -86,27 +190,89 @@ popd
 %endif

 %if %utils
- make -C utils
+%make_build -C utils
 %endif

-%install
-rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
-install -d %{buildroot}%{_libdir}/pgsql/
-install -d  %{buildroot}%{_datadir}/pgsql/contrib/
-install -m 644 *.sql %{buildroot}%{_datadir}/pgsql/contrib/
-install -m 755 loader/shp2pgsql loader/shp2pgsql-gui %{buildroot}%{_bindir}/
-rm -f  %{buildroot}%{_datadir}/*.sql
+%if %upgrade
+(
+cd %{name}-%{version}

-if [ "%{_libdir}" = "/usr/lib64" ] ; then
-	mv %{buildroot}%{_datadir}/pgsql/contrib/%{name}-%{majorversion}/postgis.sql %{buildroot}%{_datadir}/pgsql/contrib/postgis-64.sql
-	mv %{buildroot}%{_datadir}/pgsql/contrib/%{name}-%{majorversion}/postgis_upgrade_13_to_15.sql %{buildroot}%{_datadir}/pgsql/contrib/%{name}-%{majorversion}/postgis_upgrade_13_to_15-64.sql
-	mv %{buildroot}%{_datadir}/pgsql/contrib/%{name}-%{majorversion}/postgis_upgrade_14_to_15.sql %{buildroot}%{_datadir}/pgsql/contrib/%{name}-%{majorversion}/postgis_upgrade_14_to_15-64.sql
-fi
+# Build current Postgis version against the previous PostgreSQL version.  We need only the so names.
+# We intentionally don't use %%configure here since there is too many
+# pre-defined directories, and not everything from postgis-%%prevversion
+# directory respects the `pg_config` output (liblwgeom especially).
+./configure %configure_opts \
+	--with-pgconfig=%postgresql_upgrade_prefix/bin/pg_config \
+	--libdir=%postgresql_upgrade_prefix/lib \
+	--includedir=%postgresql_upgrade_prefix/include
+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_build
+)
+
+(
+cd %{name}-%{prevversion}
+
+# Build previous Postgis version against the current PostgreSQL version.  We need only the so names.
+%configure %configure_opts
+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_build
+mkdir ../compat-build
+for so in %so_files; do
+    find -name $so.so -exec cp {} ../compat-build/$so-%{prevmajorversion}.so \;
+    find -name $so-%{prevmajorversion}.so -exec cp -t ../compat-build/ {} +
+done
+
+# Full build of previous Postgis version against previous PostgreSQL version
+# We intentionally don't use %%configure here since there is too many
+# pre-defined directories, and not everything from postgis-%%prevversion
+# directory respects the `pg_config` output (liblwgeom especially).
+./configure %configure_opts \
+	--with-pgconfig=%postgresql_upgrade_prefix/bin/pg_config \
+	--libdir=%postgresql_upgrade_prefix/lib \
+	--includedir=%postgresql_upgrade_prefix/include
+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_build
+)
+%endif
+
+
+%install
+%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}-%{version} && %make_install)
+(cd %{name}-%{prevversion} && %make_install)
+
+# drop unused stuff from upgrade-only installation
+/bin/rm -rf %buildroot%postgresql_upgrade_prefix/bin
+/bin/rm -rf %buildroot%postgresql_upgrade_prefix/lib/lib*
+
+# Manually install compat-build binary.
+for so in %so_files; do
+%{__install} -m 644 compat-build/$so-%{prevmajorversion}.so %{buildroot}/%{_libdir}/pgsql
+done
+%endif
+
+rm -f  %{buildroot}%{_datadir}/*.sql

 %if %javabuild
 install -d %{buildroot}%{_javadir}
-install -m 755 java/jdbc/%{name}-%{version}.jar %{buildroot}%{_javadir}
+install -m 755 java/jdbc/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
 %if %{gcj_support}
 aot-compile-rpm
 %endif
@ -118,29 +284,91 @@ install -d %{buildroot}%{_datadir}/%{name}
 install -m 755 utils/*.pl %{buildroot}%{_datadir}/%{name}
 %endif

-%clean
-rm -rf %{buildroot}
+find %buildroot \( -name '*.la' -or -name '*.a' \) -delete
+
+
+%check
+desktop-file-validate %{buildroot}/%{_datadir}/applications/shp2pgsql-gui.desktop
+%if %runselftest
+%postgresql_tests_run
+export PGIS_REG_TMPDIR=`mktemp -d`
+if ! LD_LIBRARY_PATH=%{buildroot}%_libdir make check %{_smp_mflags} ; then
+    for file in $(find $PGIS_REG_TMPDIR -name '*_diff'); do
+	echo "== $file =="
+	cat "$file"
+    done
+fi
+%endif
+

 %if %javabuild
 %if %gcj_support
-%post -p %{_bindir}/rebuild-gcj-db
-%postun -p %{_bindir}/rebuild-gcj-db
+%post   jdbc -p %{_bindir}/rebuild-gcj-db
+%postun jdbc -p %{_bindir}/rebuild-gcj-db
 %endif
 %endif

+
 %files
-%defattr(-,root,root)
-%doc COPYING CREDITS NEWS TODO README.%{name} doc/html loader/README.* doc/%{name}.xml doc/ZMSgeoms.txt 
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/pgsql/postgis-*.so
-%{_datadir}/pgsql/contrib/*.sql
-%{_datadir}/pgsql/contrib/%{name}-%{majorversion}/*.sql
+%license COPYING
+%doc CREDITS NEWS TODO README.%{name} loader/README.* doc/%{name}.xml doc/ZMSgeoms.txt
+
+%{_libdir}/pgsql/%{name}-%{soversion}.so
+%{_datadir}/pgsql/contrib/postgis-%{majorversion}/*.sql
+%{_datadir}/pgsql/extension/address_standardizer*.sql
+%{_datadir}/pgsql/extension/address_standardizer*.control
+%{_datadir}/pgsql/extension/postgis-*.sql
+%{_datadir}/pgsql/extension/postgis_raster*.sql
+%ifnarch armv7hl
+%{_datadir}/pgsql/extension/postgis_sfcgal*.sql
+%endif
+%{_datadir}/pgsql/extension/postgis_topology*.sql
+%{_datadir}/pgsql/extension/postgis.control
+%{_datadir}/pgsql/extension/postgis_raster.control
+%ifnarch armv7hl
+%{_datadir}/pgsql/extension/postgis_sfcgal.control
+%endif
+%{_datadir}/pgsql/extension/postgis_topology.control
+%{_datadir}/pgsql/extension/postgis_tiger_geocoder*.sql
+%{_datadir}/pgsql/extension/postgis_tiger_geocoder.control
+%{_datadir}/postgis/create_unpackaged.pl
+%{_datadir}/postgis/create_spatial_ref_sys_config_dump.pl
+%{_datadir}/postgis/repo_revision.pl
+%{_libdir}/pgsql/address_standardizer-%{soversion}.so
+%{_libdir}/pgsql/postgis_raster-%{soversion}.so
+%ifnarch armv7hl
+%{_libdir}/pgsql/postgis_sfcgal-%{soversion}.so
+%endif
+%{_libdir}/pgsql/postgis_topology-%{soversion}.so
+
+%files client
+%{_bindir}/pgsql2shp
+%{_bindir}/raster2pgsql
+%{_bindir}/shp2pgsql
+%{_bindir}/pgtopo_export
+%{_bindir}/pgtopo_import
+
+%files gui
+%{_bindir}/shp2pgsql-gui
+%{_datadir}/applications/shp2pgsql-gui.desktop
+%{_datadir}/icons/hicolor/*/apps/shp2pgsql-gui.png
+
+
+%files llvmjit
+%{_libdir}/pgsql/bitcode/address_standardizer-*
+%{_libdir}/pgsql/bitcode/postgis-*
+%{_libdir}/pgsql/bitcode/postgis_raster-*
+%ifnarch armv7hl
+%{_libdir}/pgsql/bitcode/postgis_sfcgal-*
+%endif
+%{_libdir}/pgsql/bitcode/postgis_topology-*
+

 %if %javabuild
 %files jdbc
-%defattr(-,root,root)
-%doc java/jdbc/COPYING_LGPL java/jdbc/README
-%attr(755,root,root) %{_javadir}/%{name}-%{version}.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
@ -148,28 +376,449 @@ rm -rf %{buildroot}
 %endif
 %endif

+
+%if %upgrade
+%files upgrade
+%postgresql_upgrade_prefix/*
+%_libdir/pgsql/*-%{prevmajorversion}.so
+%endif
+
+
 %if %utils
 %files utils
-%defattr(755,root,root)
 %doc utils/README
 %dir %{_datadir}/%{name}/
+%doc %{_datadir}/doc/pgsql/extension/README.address_standardizer
 %{_datadir}/%{name}/test_estimation.pl
 %{_datadir}/%{name}/profile_intersects.pl
 %{_datadir}/%{name}/test_joinestimation.pl
+%{_datadir}/%{name}/create_extension_unpackage.pl
 %{_datadir}/%{name}/create_undef.pl
-%{_datadir}/%{name}/%{name}_proc_upgrade.pl
 %{_datadir}/%{name}/%{name}_restore.pl
-%{_datadir}/%{name}/new_postgis_restore.pl
+%{_datadir}/pgsql/contrib/postgis-%{majorversion}/postgis_restore.pl
 %{_datadir}/%{name}/read_scripts_version.pl
 %{_datadir}/%{name}/test_geography_estimation.pl
 %{_datadir}/%{name}/test_geography_joinestimation.pl
+%{_datadir}/%{name}/create_or_replace_to_create.pl
+%{_datadir}/%{name}/create_upgrade.pl
 %endif

+
 %files docs
-%defattr(-,root,root)
 %doc postgis*.pdf

+
 %changelog
+* Tue May 30 2023 Sandro Mani <manisandro@gmail.com> - 3.3.3-1
+- Update to 3.3.3
+
+* Thu May 11 2023 Sandro Mani <manisandro@gmail.com> - 3.3.2-5
+- Rebuild (gdal)
+
+* Sun Apr 09 2023 Florian Weimer <fweimer@redhat.com> - 3.3.2-4
+- C99 compatibility fixes
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Wed Nov 16 2022 Ondřej Sloup <osloup@redhat.com> - 3.3.2-2
+- Rebuild for new PostgreSQL 15
+
+* Mon Nov 14 2022 Sandro Mani <manisandro@gmail.com> - 3.3.2-1
+- Update to 3.3.2
+
+* Sat Nov 12 2022 Sandro Mani <manisandro@gmail.com> - 3.3.1-2
+- Rebuild (gdal)
+
+* Sat Sep 10 2022 Sandro Mani <manisandro@gmail.com> - 3.3.1-1
+- Update to 3.3.1
+
+* Tue Aug 30 2022 Sandro Mani <manisandro@gmail.com> - 3.3.0-1
+- Update to 3.3.0
+
+* 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
+
+* Fri May 20 2022 Sandro Mani <manisandro@gmail.com> - 3.2.1-3
+- Rebuild for gdal-3.5.0 and/or openjpeg-2.5.0
+
+* Thu Mar 10 2022 Sandro Mani <manisandro@gmail.com> - 3.2.1-2
+- Rebuild for proj-9.0.0
+
+* Mon Feb 14 2022 Sandro Mani <manisandro@gmail.com> - 3.2.1-1
+- Update to 3.2.1
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Tue Jan 11 2022 Sandro Mani <manisandro@gmail.com> - 3.2.0-2
+- Rebuild (postgresql-14)
+
+* Sat Dec 18 2021 Sandro Mani <manisandro@gmail.com> - 3.2.0-1
+- Update to 3.2.0
+
+* Thu Nov 11 2021 Sandro Mani <manisandro@gmail.com> - 3.1.4-5
+- Rebuild (gdal)
+
+* Sat Nov 06 2021 Adrian Reber <adrian@lisas.de> - 3.1.4-4
+- Rebuilt for protobuf 3.19.0
+
+* Tue Oct 26 2021 Adrian Reber <adrian@lisas.de> - 3.1.4-3
+- Rebuilt for protobuf 3.18.1
+
+* Thu Oct 21 2021 Sandro Mani <manisandro@gmail.com> - 3.1.4-2
+- Rebuild (geos)
+
+* Sat Sep 04 2021 Sandro Mani <manisandro@gmail.com> - 3.1.4-1
+- Update to 3.1.4
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Sat Jul 10 2021 Björn Esser <besser82@fedoraproject.org> - 3.1.3-2
+- Rebuild for versioned symbols in json-c
+
+* Mon Jul 05 2021 Sandro Mani <manisandro@gmail.com> - 3.1.3-1
+- Update to 3.1.3
+
+* Mon Jul 5 2021 Basil Eric Rabi <ericbasil.rabi@gmail.com> - 3.1.2-2
+- Build with SFCGAL
+
+* 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)
+
+* Tue Mar 23 2021 Sandro Mani <manisandro@gmail.com> - 3.1.1-7
+- Bump
+
+* Sun Mar 07 2021 Sandro Mani <manisandro@gmail.com> - 3.1.1-6
+- Rebuild (proj)
+- Disable upgrade packages for now (not compatible with proj8)
+
+* Mon Feb 22 2021 Michael Scherer <misc@fedoraproject.org> - 3.1.1-5
+- split various utilities subpackages, to not pull gtk in the main rpm
+
+* Sat Feb 13 2021 Sandro Mani <manisandro@gmail.com> - 3.1.1-4
+- Rebuild (geos)
+
+* Tue Feb 09 2021 Sandro Mani <manisandro@gmail.com> - 3.1.1-3
+- Also ship current version of Postgis against previous version of PostgreSQL in
+  postgis-upgrade
+
+* Mon Feb 08 2021 Pavel Raiskup <praiskup@redhat.com> - 3.1.1-2
+- rebuild for libpq ABI fix rhbz#1908268
+
+* Fri Jan 29 2021 Sandro Mani <manisandro@gmail.com> - 3.1.1-1
+- Update to 3.1.1
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jan 13 16:41:55 CET 2021 Adrian Reber <adrian@lisas.de> - 3.1.0-2
+- Rebuilt for protobuf 3.14
+
+* Sat Dec 19 2020 Sandro Mani <manisandro@gmail.com> - 3.1.0-1
+- Update to 3.1.0
+
+* Mon Nov 23 2020 Sandro Mani <manisandro@gmail.com> - 3.0.3-1
+- Update to 3.0.3
+
+* Wed Nov 11 2020 Sandro Mani <manisandro@gmail.com> - 3.0.2-3
+- Rebuild (proj, gdal)
+- Cleanup spec
+
+* Thu Oct 08 2020 Jeff Law <law@redhat.com> - 3.0.2-2
+- Re-enable LTO
+
+* Mon Aug 17 2020 Sandro Mani <manisandro@gmail.com> - 3.0.2-1
+- Update to 3.0.2
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-10
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 3.0.1-8
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Thu May 21 2020 Sandro Mani <manisandro@gmail.com> - 3.0.1-7
+- Rebuild (gdal)
+
+* Mon May 04 2020 Sandro Mani <manisandro@gmail.com> - 3.0.1-6
+- Pass --with-pgconfig=%%{_bindir}/pg_server_config
+
+* Sun May 03 2020 Sandro Mani <manisandro@gmail.com> - 3.0.1-5
+- Move postgis-upgrade to 2.5.4
+
+* Wed Apr 22 2020 Björn Esser <besser82@fedoraproject.org> - 3.0.1-4
+- Re-enable selftests
+
+* Tue Apr 21 2020 Björn Esser <besser82@fedoraproject.org> - 3.0.1-3
+- Rebuild (json-c)
+- Disable selftests, as they seem to be flaky
+
+* Tue Mar 03 2020 Sandro Mani <manisandro@gmail.com> - 3.0.1-2
+- Rebuild (gdal)
+
+* Mon Mar 02 2020 Sandro Mani <manisandro@gmail.com> - 3.0.1-1
+- Update to 3.0.1
+
+* Sun Feb 16 2020 Devrim Gündüz <devrim@gunduz.org> - 3.0.0-1
+- Update to 3.0.0
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Wed Sep 4 2019 Devrim Gündüz <devrim@gunduz.org> - 2.5.3-1
+- Update to 2.5.3
+- Update prev version to 2.4.8
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Mon Feb 4 2019 Devrim Gündüz <devrim@gunduz.org> - 2.5.1-1
+- Update to 2.5.1
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Mon Oct 22 2018 Petr Kubat <pkubat@redhat.com> - 2.5.0-1
+- update to 2.5.0, per NEWS file:
+  https://svn.osgeo.org/postgis/tags/2.5.0/NEWS
+
+* Wed Sep 05 2018 Pavel Raiskup <praiskup@redhat.com> - 2.4.3-6
+- rebuild against postgresql-server-devel (rhbz#1618698)
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.3-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri Apr 13 2018 Pavel Raiskup <praiskup@redhat.com> - 2.4.3-4
+- postgresql.spec moved testing macros to postgresql-test-rpm-macros
+
+* Tue Mar 06 2018 Björn Esser <besser82@fedoraproject.org> - 2.4.3-3
+- Rebuilt for libjson-c.so.4 (json-c v0.13.1)
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Jan 18 2018 Pavel Raiskup <praiskup@redhat.com> - 2.4.3-1
+- rebase to latest upstream release (rhbz#1513788)
+
+* Fri Dec 15 2017 Björn Esser <besser82@fedoraproject.org> - 2.4.1-4
+- Add patch for changes in json-c >= 0.13
+
+* Sun Dec 10 2017 Björn Esser <besser82@fedoraproject.org> - 2.4.1-3
+- Rebuilt for libjson-c.so.3
+
+* Thu Oct 26 2017 Pavel Raiskup <praiskup@redhat.com> - 2.4.1-2
+- upgrade: drop not-used /bin directory and liblwgeom (rhbz#1055293)
+- upgrade: confess that we bundle postgis = prevversion
+
+* Mon Oct 23 2017 Pavel Raiskup <praiskup@redhat.com> - 2.4.1-1
+- update to 2.4.1, per NEWS file:
+  https://svn.osgeo.org/postgis/tags/2.4.1/NEWS
+
+* Wed Oct 18 2017 Pavel Raiskup <praiskup@redhat.com> - 2.4.0-2
+- build against json-c again (rhbz#1484031)
+- post/postun set for jdbc sub-package (rhbz#979685)
+
+* Tue Oct 17 2017 Pavel Raiskup <praiskup@redhat.com> - 2.4.0-1
+- install desktop files into /usr/share/applications
+- optimize build without %%upgrade
+- drop explicit requires on libraries (resolved by implicit lib*.so*())
+- enable build testsuite
+- disable hardening on f26 (all arches) and on s390x (all distros)
+
+* Tue Oct 10 2017 Pavel Raiskup <praiskup@redhat.com> - 2.4.0-1
+- provide postgis-upgrade package (rhbz#1475177)
+
+* Mon Oct 09 2017 Pavel Raiskup <praiskup@redhat.com> - 2.4.0-1
+- update to 2.4.0, per upstream release notes
+  https://postgis.net/2017/09/30/postgis-2.4.0/
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Sun Jul 2 2017 Devrim Gündüz <devrim@gunduz.org> - 2.3.3-1
+- Update to 2.3.3, per changes described at
+  http://postgis.net/2017/07/01/postgis-2.3.3/
+  rhbz #1467032
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Wed Jan 25 2017 Devrim Gündüz <devrim@gunduz.org> - 2.3.2-1
+- Update to 2.3.2, per changes described at
+  http://postgis.net/2017/01/31/postgis-2.3.2/
+  rhbz#1418136
+
+* Wed Jan 25 2017 Devrim Gündüz <devrim@gunduz.org> - 2.3.1-2
+- Rebuild against Proj 4.9.3
+
+* Wed Nov 30 2016 Devrim Gündüz <devrim@gunduz.org> - 2.3.1-1
+- Update to 2.3.1, per changes described at
+  http://postgis.net/2016/11/28/postgis-2.3.1
+- Update previous version to 2.2.4
+- Fix a few rpmlint warnings.
+
+* Mon Oct 10 2016 Pavel Raiskup <praiskup@redhat.com> - 2.3.0-3
+- bump: build in rawhide hit too early
+
+* Fri Oct 07 2016 Petr Kubat <pkubat@redhat.com> - 2.3.0-2
+- Rebuild for PostgreSQL 9.6.0
+
+* Tue Sep 27 2016 Jozef Mlich <imlich@fit.vutbr.cz> - 2.3.0-1
+- Update to 2.3.0, per changes described at
+  http://postgis.net/2016/09/26/postgis-2.3.0/
+
+* Fri Mar 25 2016 Devrim Gündüz <devrim@gunduz.org> - 2.2.2-1
+- Update to 2.2.2, per changes described at
+  http://postgis.net/2016/03/22/postgis-2.2.2
+
+* Mon Feb 15 2016 Pavel Raiskup <praiskup@redhat.com> - 2.2.1-3
+- install address_standardizer module (rhbz#1307872)
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Fri Jan 08 2016 Jozef Mlich <jmlich@redhat.com> - 2.2.1-1
+- Rebuild to 2.2.1, per changes described at:
+  http://svn.osgeo.org/postgis/tags/2.2.1/NEWS
+
+* Sun Aug 30 2015 Peter Robinson <pbrobinson@fedoraproject.org> 2.1.8-2
+- Rebuild again for GDAL 2.0
+
+* Tue Jul 28 2015 Devrim Gündüz <devrim@gunduz.org> - 2.1.8-1
+- Update to 2.1.8, per changes described at:
+  http://svn.osgeo.org/postgis/tags/2.1.8/NEWS
+- Rebuilt for GDAL 2.0
+
+* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Wed Apr 1 2015 Devrim Gündüz <devrim@gunduz.org> - 2.1.7-1
+- Update to 2.1.7, per changes described at:
+  http://svn.osgeo.org/postgis/tags/2.1.7/NEWS
+
+* Fri Mar 27 2015 Devrim Gündüz <devrim@gunduz.org> - 2.1.6-1
+- Update to 2.1.6, per changes described at:
+  http://postgis.net/2015/03/20/postgis-2.1.6
+
+* Wed Mar 11 2015 Devrim Gündüz <devrim@gunduz.org> - 2.1.5-3
+- Rebuild for Proj 4.9.1
+- Add patch to fix FTBFS -- patch by Sandro Mani <manisandro@gmail.com>
+
+* Thu Jan 08 2015 Jozef Mlich <jmlich@redhat.com> - 2.1.5-2
+- disable json-c/geojson just for upgrade part of postgis
+
+* Mon Dec 22 2014 Devrim Gündüz <devrim@gunduz.org> - 2.1.5-1
+- Update to 2.1.5, per changes described at:
+  http://postgis.net/2014/12/18/postgis-2.1.5 and
+  http://postgis.net/2014/09/10/postgis-2.1.4
+
+* Mon Aug 18 2014 Jozef Mlich <jmlich@redhat.com> - 2.1.3-5
+- Dropped json-c because it is not building anymore
+  Resolves: #1129292
+
+* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Thu Jun 26 2014 Jozef Mlich <jmlich@redhat.com> - 2.1.3-3
+- Removing static libraries
+  Resolves: #979179
+
+* Mon Jun 09 2014 Jozef Mlich <jmlich@redhat.com> - 2.1.3-2
+- removing sinjdoc from BuildRequires as it is not available
+  in rawhide anymore
+
+* Mon Jun 09 2014 Jozef Mlich <jmlich@redhat.com> - 2.1.3-1
+- Rebase to 2.1.3 and 2.0.6 (security bugfixes, feature bugfixes)
+  see http://svn.osgeo.org/postgis/tags/2.1.3/NEWS
+- json_c turned on
+- installation of .so file of previous version moved into install section
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Thu Jan 23 2014 Devrim Gündüz <devrim@gunduz.org> - 2.1.1-2
+- Install postgis-2.0.so file, by compiling it from 2.0 sources
+  Fixes bz #1055293.
+
+* Thu Dec 12 2013 Devrim Gündüz <devrim@gunduz.org> - 2.1.1-1
+- Update to 2.1.1
+
+* Fri Oct 25 2013 Dan Horák <dan[at]danny.cz> - 2.1.0-2
+- fix build on non-x86 64-bit arches
+
+* Thu Sep 12 2013 Devrim Gündüz <devrim@gunduz.org> - 2.1.0-1
+- Update to 2.1.0, per changes described at:
+  http://svn.osgeo.org/postgis/tags/2.1.0/NEWS
+
+* Tue Aug 27 2013 Orion Poplawski <orion@cora.nwra.com> - 2.0.3-4
+- Rebuild for gdal 1.10.0
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Wed Jul 17 2013 Petr Pisar <ppisar@redhat.com> - 2.0.3-2
+- Perl 5.18 rebuild
+
+* Wed Mar 6 2013 Devrim GÜNDÜZ <devrim@gunduz.org> - 2.0.3-1
+- Update to 2.0.3, and build against GeOS 3.3.8.
+- Update all URLs.
+
+* Fri Jan 25 2013 Devrim GÜNDÜZ <devrim@gunduz.org> - 2.0.2-2
+- Rebuilt against geos 3.3.7.
+- Apply changes for PostgreSQL 9.2 and extensions.
+
+* Wed Jan 16 2013 Devrim GÜNDÜZ <devrim@gunduz.org> - 2.0.2-1
+- Update to 2.0.2, for various changes described at:
+  http://www.postgis.org/news/20121203/
+
+* Tue Nov 13 2012 Devrim GÜNDÜZ <devrim@gunduz.org> - 2.0.1-1
+- Update to 2.0.1, so it works against PostgreSQL 9.2,
+  which also fixes #872710.
+- Add deps for gdal.
+- Don't build JDBC portions. I have already disabled it in
+  upstream packaging 8 months ago.
+
+* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Tue Oct 4 2011 Devrim GÜNDÜZ <devrim@gunduz.org> - 1.5.3-2
+- Provide postgis.jar instead of provide postgis-1.5.2.jar,
+  per #714856
+
+* Tue Oct 4 2011 Devrim GÜNDÜZ <devrim@gunduz.org> - 1.5.3-1
+- Update to 1.5.3
+
+* Tue Apr 19 2011 Devrim GÜNDÜZ <devrim@gunduz.org> - 1.5.2-1
+- Update to 1.5.2
+
+* Sun Apr 03 2011 Nils Philippsen <nils@redhat.com> - 1.5.1-3
+- cope with PostgreSQL 9.0 build environment
+- require pgsql version used for building
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Thu Mar 11 2010 Devrim GÜNDÜZ <devrim@gunduz.org> - 1.5.1-1
+- Update to 1.5.1
+
 * Tue Jan 12 2010 Devrim GÜNDÜZ <devrim@gunduz.org> - 1.5.0-1
 - Update to 1.5.0
 - Trim changelog a bit.
--- a/postgis2-proj8.patch
+++ b/postgis2-proj8.patch
--- a/5
+++ b/5
@ -1,2 +1,3 @@
-8c0d291296033deee4d7f545e5d8218f  postgis-1.5.0.tar.gz
-207ee6c233d9a2bcea4247583390630f  postgis-1.5.0.pdf
+SHA512 (postgis-3.3.3.pdf) = 3ec5ecd288a4f9428ca047dd537de20fdb9ee6e5b0addcdbf3ca1d11e6386d11e1e74b2952f3034a29b75213091f4ca2d36766548c0534b0d0b8686595a10e33
+SHA512 (postgis-3.3.3.tar.gz) = 0025a8a5c6be7e18dfb97a6a04c468a9da2d6e99462d20eec7bddf4048b8f2fa1e8029be9f819950c910a6f89190e8295f10e8dab9b4885d03d3dbcce41380c2
+SHA512 (postgis-2.5.5.tar.gz) = 407c9ddf5b73aaa8d36ec606f974b86c16c9ed4aafbfd4a0b7f96cfc7a9f8a8fa38528cb4787bdd50de479416dbfb09934a85d189463cec549da66863060292e