From 1f6ceea57fcb2ea8689b719d2f05115391b38b62 Mon Sep 17 00:00:00 2001
From: Filip Janus <fjanus@redhat.com>
Date: Fri, 13 Oct 2023 11:44:59 +0200
Subject: [PATCH] Resolves: RHEL-3636 New postgresql stream - 16 Remove pdf
 documentation Update postgresql-setup to 8.9 postmaster binary no more
 shipped

---
 .gitignore                        |   12 +
 Makefile.regress                  |   69 ++
 generate-pdf.sh                   |   58 ++
 generate-sources-and-gitignore.sh |   13 +
 generate-sources.sh               |   12 +
 hstore-plperl-data-dumper.patch   |  192 +++++
 postgresql-bashprofile            |    4 +
 postgresql-external-libpq.patch   |   43 +
 postgresql-logging.patch          |   33 +
 postgresql-man.patch              |   49 ++
 postgresql-no-libecpg.patch       |   12 +
 postgresql-no-libs.patch          |   33 +
 postgresql-server-pg_config.patch |   57 ++
 postgresql-var-run-socket.patch   |   50 ++
 postgresql.pam                    |    3 +
 postgresql.spec                   | 1242 +++++++++++++++++++++++++++++
 postgresql.tmpfiles.d             |    1 +
 rpm-pgsql.patch                   |   72 ++
 sources                           |    5 +
 19 files changed, 1960 insertions(+)
 mode change 100644 => 100755 .gitignore
 create mode 100755 Makefile.regress
 create mode 100755 generate-pdf.sh
 create mode 100755 generate-sources-and-gitignore.sh
 create mode 100755 generate-sources.sh
 create mode 100755 hstore-plperl-data-dumper.patch
 create mode 100755 postgresql-bashprofile
 create mode 100755 postgresql-external-libpq.patch
 create mode 100755 postgresql-logging.patch
 create mode 100755 postgresql-man.patch
 create mode 100755 postgresql-no-libecpg.patch
 create mode 100755 postgresql-no-libs.patch
 create mode 100755 postgresql-server-pg_config.patch
 create mode 100755 postgresql-var-run-socket.patch
 create mode 100755 postgresql.pam
 create mode 100755 postgresql.spec
 create mode 100755 postgresql.tmpfiles.d
 create mode 100755 rpm-pgsql.patch
 create mode 100755 sources

diff --git a/.gitignore b/.gitignore
old mode 100644
new mode 100755
index e69de29..121bee8
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,12 @@
+/postgresql-15.2.tar.bz2
+/postgresql-15.2.tar.bz2.sha256
+/postgresql-setup-8.8.tar.gz
+/postgresql-15.2-US.pdf
+/postgresql-13.7.tar.bz2
+/postgresql-13.7.tar.bz2.sha256
+/postgresql-15.3.tar.bz2
+/postgresql-15.3.tar.bz2.sha256
+/postgresql-15.3-US.pdf
+/postgresql-16.0.tar.bz2
+/postgresql-16.0.tar.bz2.sha256
+/postgresql-setup-8.9.tar.gz
diff --git a/Makefile.regress b/Makefile.regress
new file mode 100755
index 0000000..95bc589
--- /dev/null
+++ b/Makefile.regress
@@ -0,0 +1,69 @@
+#
+# Simplified makefile for running the PostgreSQL regression tests
+# in an RPM installation
+#
+
+# maximum simultaneous connections for parallel tests
+MAXCONNOPT =
+ifdef MAX_CONNECTIONS
+MAXCONNOPT += --max-connections=$(MAX_CONNECTIONS)
+endif
+
+# locale
+NOLOCALE =
+ifdef NO_LOCALE
+NOLOCALE += --no-locale
+endif
+
+srcdir := .
+
+REGRESS_OPTS += --dlpath=.
+
+pg_regress_locale_flags = $(if $(ENCODING),--encoding=$(ENCODING)) $(NOLOCALE)
+
+pg_regress_installcheck = ./pg_regress --inputdir=$(srcdir) --bindir=@bindir@ $(pg_regress_locale_flags)
+
+# Test input and expected files.  These are created by pg_regress itself, so we
+# don't have a rule to create them.  We do need rules to clean them however.
+ifile_list := $(subst .source,, $(notdir $(wildcard $(srcdir)/input/*.source)))
+input_files  := $(foreach file, $(ifile_list), sql/$(file).sql)
+ofile_list := $(subst .source,, $(notdir $(wildcard $(srcdir)/output/*.source)))
+output_files := $(foreach file, $(ofile_list), expected/$(file).out)
+
+abs_srcdir := $(shell pwd)
+abs_builddir := $(shell pwd)
+
+check: installcheck-parallel
+
+installcheck: cleandirs
+	$(pg_regress_installcheck) $(REGRESS_OPTS) --schedule=$(srcdir)/serial_schedule $(EXTRA_TESTS)
+
+installcheck-parallel: cleandirs
+	$(pg_regress_installcheck) $(REGRESS_OPTS) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(EXTRA_TESTS)
+
+# The tests command the server to write into testtablespace and results.
+# On a SELinux-enabled system this will fail unless we mark those directories
+# as writable by the server.
+cleandirs:
+	-rm -rf testtablespace results
+	mkdir testtablespace results
+	if test -x /usr/bin/chcon && ! test -f /.dockerenv; then \
+	    /usr/bin/chcon -u system_u -r object_r -t postgresql_db_t testtablespace results ; \
+	fi
+
+# old interfaces follow...
+
+runcheck: check
+runtest: installcheck
+runtest-parallel: installcheck-parallel
+
+
+##
+## Clean up
+##
+
+clean distclean maintainer-clean:
+	rm -f $(output_files) $(input_files)
+	rm -rf testtablespace
+	rm -rf results tmp_check log
+	rm -f regression.diffs regression.out regress.out run_check.out
diff --git a/generate-pdf.sh b/generate-pdf.sh
new file mode 100755
index 0000000..e0ed008
--- /dev/null
+++ b/generate-pdf.sh
@@ -0,0 +1,58 @@
+#! /bin/sh
+
+# This script builds the PDF version of the PostgreSQL documentation.
+#
+# In principle we could do this as part of the RPM build, but there are
+# good reasons not to:
+# 1. The build would take longer and have a larger BuildRequires footprint.
+# 2. The generated PDF has timestamps in it, which would inevitably result
+#    in multilib conflicts due to slightly different timestamps.
+# So instead, we run this manually when rebasing to a new upstream release,
+# and treat the resulting PDF as a separate Source file.
+#
+# You will need to have the docbook packages installed to run this.
+# Expect it to take about 20 minutes and use about 160MB of disk.
+
+set -e
+
+# Pass package version (e.g., 9.1.2) as argument
+VERSION=$1
+
+test -z "$VERSION" && VERSION=`awk '/^Version:/ { print $2; }' postgresql.spec`
+
+TARGETFILE=postgresql-$VERSION-US.pdf
+test -f "$TARGETFILE" && echo "$TARGETFILE exists" && exit 1
+
+echo Building $TARGETFILE ...
+
+# Unpack postgresql
+
+rm -rf postgresql-$VERSION
+
+tar xfj postgresql-$VERSION.tar.bz2
+
+cd postgresql-$VERSION
+
+# Apply any patches that affect the PDF documentation
+
+# patch -p1 < ../xxx.patch
+
+# Configure ...
+
+./configure >/dev/null
+
+# Build the PDF docs
+
+cd doc/src/sgml
+
+make postgres-US.pdf >make.log
+
+mv -f postgres-US.pdf ../../../../$TARGETFILE
+
+# Clean up
+
+cd ../../../..
+
+rm -rf postgresql-$VERSION
+
+exit 0
diff --git a/generate-sources-and-gitignore.sh b/generate-sources-and-gitignore.sh
new file mode 100755
index 0000000..51b2fc8
--- /dev/null
+++ b/generate-sources-and-gitignore.sh
@@ -0,0 +1,13 @@
+#! /bin/sh
+
+rm sources .gitignore
+set -e
+spectool -S *.spec | cut -d' ' -f2 \
+    | grep -E -e 'postgresql-.*\.tar\.*' -e 'postgresql.*\.pdf' | sort | \
+while read line
+do
+    base=`basename "$line"`
+    echo " * handling $base"
+    sha512sum --tag "$base" >> sources
+    echo "/$base" >> .gitignore
+done
diff --git a/generate-sources.sh b/generate-sources.sh
new file mode 100755
index 0000000..1d53682
--- /dev/null
+++ b/generate-sources.sh
@@ -0,0 +1,12 @@
+#! /bin/sh
+
+rm sources
+set -e
+spectool -S *.spec | cut -d' ' -f2 \
+    | grep -E -e 'postgresql-.*\.tar\.*' -e 'postgresql.*\.pdf' | sort | \
+while read line
+do
+    base=`basename "$line"`
+    echo " * handling $base"
+    sha512sum --tag "$base" >> sources
+done
diff --git a/hstore-plperl-data-dumper.patch b/hstore-plperl-data-dumper.patch
new file mode 100755
index 0000000..dfc2f23
--- /dev/null
+++ b/hstore-plperl-data-dumper.patch
@@ -0,0 +1,192 @@
+From 69db3b0cfccc0687dfbdf56afcfb2f8e536053c6 Mon Sep 17 00:00:00 2001
+From: Andrew Dunstan <andrew@dunslane.net>
+Date: Sun, 14 May 2017 01:10:18 -0400
+Subject: [PATCH] Suppress indentation from Data::Dumper in regression tests
+
+Ultra-modern versions of the perl Data::Dumper module have apparently
+changed how they indent output. Instead of trying to keep up we choose
+to tell it to supporess all indentation in the hstore_plperl regression
+tests.
+
+Backpatch to 9.5 where this feature was introduced.
+---
+ contrib/hstore_plperl/expected/hstore_plperlu.out | 44 ++++++-----------------
+ contrib/hstore_plperl/sql/hstore_plperlu.sql      |  6 ++++
+ 2 files changed, 17 insertions(+), 33 deletions(-)
+
+diff --git a/contrib/hstore_plperl/expected/hstore_plperlu.out b/contrib/hstore_plperl/expected/hstore_plperlu.out
+index b09fb78..d719d29 100644
+--- a/contrib/hstore_plperl/expected/hstore_plperlu.out
++++ b/contrib/hstore_plperl/expected/hstore_plperlu.out
+@@ -20,15 +20,12 @@ TRANSFORM FOR TYPE hstore
+ AS $$
+ use Data::Dumper;
+ $Data::Dumper::Sortkeys = 1;
++$Data::Dumper::Indent = 0;
+ elog(INFO, Dumper($_[0]));
+ return scalar(keys %{$_[0]});
+ $$;
+ SELECT test1('aa=>bb, cc=>NULL'::hstore);
+-INFO:  $VAR1 = {
+-          'aa' => 'bb',
+-          'cc' => undef
+-        };
+-
++INFO:  $VAR1 = {'aa' => 'bb','cc' => undef};
+  test1 
+ -------
+      2
+@@ -39,12 +36,12 @@ LANGUAGE plperlu
+ AS $$
+ use Data::Dumper;
+ $Data::Dumper::Sortkeys = 1;
++$Data::Dumper::Indent = 0;
+ elog(INFO, Dumper($_[0]));
+ return scalar(keys %{$_[0]});
+ $$;
+ SELECT test1none('aa=>bb, cc=>NULL'::hstore);
+ INFO:  $VAR1 = '"aa"=>"bb", "cc"=>NULL';
+-
+  test1none 
+ -----------
+          0
+@@ -56,15 +53,12 @@ TRANSFORM FOR TYPE hstore
+ AS $$
+ use Data::Dumper;
+ $Data::Dumper::Sortkeys = 1;
++$Data::Dumper::Indent = 0;
+ elog(INFO, Dumper($_[0]));
+ return scalar(keys %{$_[0]});
+ $$;
+ SELECT test1list('aa=>bb, cc=>NULL'::hstore);
+-INFO:  $VAR1 = {
+-          'aa' => 'bb',
+-          'cc' => undef
+-        };
+-
++INFO:  $VAR1 = {'aa' => 'bb','cc' => undef};
+  test1list 
+ -----------
+          2
+@@ -77,18 +71,12 @@ TRANSFORM FOR TYPE hstore
+ AS $$
+ use Data::Dumper;
+ $Data::Dumper::Sortkeys = 1;
++$Data::Dumper::Indent = 0;
+ elog(INFO, Dumper($_[0]->[0], $_[0]->[1]));
+ return scalar(keys %{$_[0]});
+ $$;
+ SELECT test1arr(array['aa=>bb, cc=>NULL'::hstore, 'dd=>ee']);
+-INFO:  $VAR1 = {
+-          'aa' => 'bb',
+-          'cc' => undef
+-        };
+-$VAR2 = {
+-          'dd' => 'ee'
+-        };
+-
++INFO:  $VAR1 = {'aa' => 'bb','cc' => undef};$VAR2 = {'dd' => 'ee'};
+  test1arr 
+ ----------
+         2
+@@ -101,6 +89,7 @@ TRANSFORM FOR TYPE hstore
+ AS $$
+ use Data::Dumper;
+ $Data::Dumper::Sortkeys = 1;
++$Data::Dumper::Indent = 0;
+ 
+ $rv = spi_exec_query(q{SELECT 'aa=>bb, cc=>NULL'::hstore AS col1});
+ elog(INFO, Dumper($rv->{rows}[0]->{col1}));
+@@ -111,13 +100,8 @@ $rv = spi_exec_prepared($plan, {}, $val);
+ elog(INFO, Dumper($rv->{rows}[0]->{col1}));
+ $$;
+ SELECT test3();
+-INFO:  $VAR1 = {
+-          'aa' => 'bb',
+-          'cc' => undef
+-        };
+-
++INFO:  $VAR1 = {'aa' => 'bb','cc' => undef};
+ INFO:  $VAR1 = '"a"=>"1", "b"=>"boo", "c"=>NULL';
+-
+  test3 
+ -------
+  
+@@ -138,6 +122,7 @@ TRANSFORM FOR TYPE hstore
+ AS $$
+ use Data::Dumper;
+ $Data::Dumper::Sortkeys = 1;
++$Data::Dumper::Indent = 0;
+ elog(INFO, Dumper($_TD->{new}));
+ if ($_TD->{new}{a} == 1) {
+     $_TD->{new}{b} = {a => 1, b => 'boo', c => undef};
+@@ -147,14 +132,7 @@ return "MODIFY";
+ $$;
+ CREATE TRIGGER test4 BEFORE UPDATE ON test1 FOR EACH ROW EXECUTE PROCEDURE test4();
+ UPDATE test1 SET a = a;
+-INFO:  $VAR1 = {
+-          'a' => '1',
+-          'b' => {
+-                 'aa' => 'bb',
+-                 'cc' => undef
+-               }
+-        };
+-
++INFO:  $VAR1 = {'a' => '1','b' => {'aa' => 'bb','cc' => undef}};
+ SELECT * FROM test1;
+  a |                b                
+ ---+---------------------------------
+diff --git a/contrib/hstore_plperl/sql/hstore_plperlu.sql b/contrib/hstore_plperl/sql/hstore_plperlu.sql
+index 8d8508c..c714b35 100644
+--- a/contrib/hstore_plperl/sql/hstore_plperlu.sql
++++ b/contrib/hstore_plperl/sql/hstore_plperlu.sql
+@@ -15,6 +15,7 @@ TRANSFORM FOR TYPE hstore
+ AS $$
+ use Data::Dumper;
+ $Data::Dumper::Sortkeys = 1;
++$Data::Dumper::Indent = 0;
+ elog(INFO, Dumper($_[0]));
+ return scalar(keys %{$_[0]});
+ $$;
+@@ -26,6 +27,7 @@ LANGUAGE plperlu
+ AS $$
+ use Data::Dumper;
+ $Data::Dumper::Sortkeys = 1;
++$Data::Dumper::Indent = 0;
+ elog(INFO, Dumper($_[0]));
+ return scalar(keys %{$_[0]});
+ $$;
+@@ -38,6 +40,7 @@ TRANSFORM FOR TYPE hstore
+ AS $$
+ use Data::Dumper;
+ $Data::Dumper::Sortkeys = 1;
++$Data::Dumper::Indent = 0;
+ elog(INFO, Dumper($_[0]));
+ return scalar(keys %{$_[0]});
+ $$;
+@@ -52,6 +55,7 @@ TRANSFORM FOR TYPE hstore
+ AS $$
+ use Data::Dumper;
+ $Data::Dumper::Sortkeys = 1;
++$Data::Dumper::Indent = 0;
+ elog(INFO, Dumper($_[0]->[0], $_[0]->[1]));
+ return scalar(keys %{$_[0]});
+ $$;
+@@ -66,6 +70,7 @@ TRANSFORM FOR TYPE hstore
+ AS $$
+ use Data::Dumper;
+ $Data::Dumper::Sortkeys = 1;
++$Data::Dumper::Indent = 0;
+ 
+ $rv = spi_exec_query(q{SELECT 'aa=>bb, cc=>NULL'::hstore AS col1});
+ elog(INFO, Dumper($rv->{rows}[0]->{col1}));
+@@ -90,6 +95,7 @@ TRANSFORM FOR TYPE hstore
+ AS $$
+ use Data::Dumper;
+ $Data::Dumper::Sortkeys = 1;
++$Data::Dumper::Indent = 0;
+ elog(INFO, Dumper($_TD->{new}));
+ if ($_TD->{new}{a} == 1) {
+     $_TD->{new}{b} = {a => 1, b => 'boo', c => undef};
+-- 
+2.1.4
diff --git a/postgresql-bashprofile b/postgresql-bashprofile
new file mode 100755
index 0000000..1cd70d3
--- /dev/null
+++ b/postgresql-bashprofile
@@ -0,0 +1,4 @@
+[ -f /etc/profile ] && source /etc/profile
+
+PGDATA=/var/lib/pgsql/data
+export PGDATA
diff --git a/postgresql-external-libpq.patch b/postgresql-external-libpq.patch
new file mode 100755
index 0000000..ba7ef73
--- /dev/null
+++ b/postgresql-external-libpq.patch
@@ -0,0 +1,43 @@
+We don't build/install interfaces by upstream's implicit rules.
+
+This patch is used on two places; postgresql.spec and libecpg.spec -- keep those
+in sync!
+
+Related: rhbz#1618698
+
+diff --git a/src/Makefile b/src/Makefile
+index bcdbd95..4bea236 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -20,7 +20,6 @@ SUBDIRS = \
+ 	backend/utils/mb/conversion_procs \
+ 	backend/snowball \
+ 	include \
+-	interfaces \
+ 	backend/replication/libpqwalreceiver \
+ 	backend/replication/pgoutput \
+ 	fe_utils \
+diff --git a/src/Makefile.global.in b/src/Makefile.global.in
+index b9d86ac..29df69f 100644
+--- a/src/Makefile.global.in
++++ b/src/Makefile.global.in
+@@ -549,7 +549,7 @@ endif
+ # How to link to libpq.  (This macro may be used as-is by backend extensions.
+ # Client-side code should go through libpq_pgport or libpq_pgport_shlib,
+ # instead.)
+-libpq = -L$(libpq_builddir) -lpq
++libpq = -lpq
+ 
+ # libpq_pgport is for use by client executables (not libraries) that use libpq.
+ # We force clients to pull symbols from the non-shared libraries libpgport
+@@ -579,7 +579,6 @@ endif
+ # Commonly used submake targets
+ 
+ submake-libpq: | submake-generated-headers
+-	$(MAKE) -C $(libpq_builddir) all
+ 
+ submake-libpgport: | submake-generated-headers
+ 	$(MAKE) -C $(top_builddir)/src/port all
+-- 
+2.21.0
+
diff --git a/postgresql-logging.patch b/postgresql-logging.patch
new file mode 100755
index 0000000..5af5625
--- /dev/null
+++ b/postgresql-logging.patch
@@ -0,0 +1,33 @@
+diff -ur postgresql-15.0/src/backend/utils/misc/postgresql.conf.sample patched/src/backend/utils/misc/postgresql.conf.sample
+--- postgresql-15.0/src/backend/utils/misc/postgresql.conf.sample	2022-10-10 22:57:37.000000000 +0200
++++ patched/src/backend/utils/misc/postgresql.conf.sample	2022-10-13 10:51:57.000000000 +0200
+@@ -448,7 +448,7 @@
+ 					# logging_collector to be on.
+ 
+ # This is used when logging to stderr:
+-#logging_collector = off		# Enable capturing of stderr, jsonlog,
++logging_collector = on			# Enable capturing of stderr, jsonlog,
+ 					# and csvlog into log files. Required
+ 					# to be on for csvlogs and jsonlogs.
+ 					# (change requires restart)
+@@ -456,16 +456,16 @@
+ # These are only used if logging_collector is on:
+ #log_directory = 'log'			# directory where log files are written,
+ 					# can be absolute or relative to PGDATA
+-#log_filename = 'postgresql-%Y-%m-%d_%H%M%S.log'	# log file name pattern,
++log_filename = 'postgresql-%a.log'	# log file name pattern,
+ 					# can include strftime() escapes
+ #log_file_mode = 0600			# creation mode for log files,
+ 					# begin with 0 to use octal notation
+-#log_rotation_age = 1d			# Automatic rotation of logfiles will
++log_rotation_age = 1d			# Automatic rotation of logfiles will
+ 					# happen after that time.  0 disables.
+-#log_rotation_size = 10MB		# Automatic rotation of logfiles will
++log_rotation_size = 0			# Automatic rotation of logfiles will
+ 					# happen after that much log output.
+ 					# 0 disables.
+-#log_truncate_on_rotation = off		# If on, an existing log file with the
++log_truncate_on_rotation = on		# If on, an existing log file with the
+ 					# same name as the new log file will be
+ 					# truncated rather than appended to.
+ 					# But such truncation only occurs on
diff --git a/postgresql-man.patch b/postgresql-man.patch
new file mode 100755
index 0000000..6b0ed00
--- /dev/null
+++ b/postgresql-man.patch
@@ -0,0 +1,49 @@
+PostgreSQL ecpg/initdb manual page fixes
+
+This was generated based on automatic Red Hat manual page scan (private
+RHBZ#948933).
+
+diff -up postgresql-13.1/doc/src/sgml/man1/ecpg.1.patch6 postgresql-13.1/doc/src/sgml/man1/ecpg.1
+--- postgresql-13.1/doc/src/sgml/man1/ecpg.1.patch6	2020-11-09 23:38:03.000000000 +0100
++++ postgresql-13.1/doc/src/sgml/man1/ecpg.1	2020-11-18 09:26:40.547324791 +0100
+@@ -81,6 +81,11 @@ ORACLE\&.
+ Define a C preprocessor symbol\&.
+ .RE
+ .PP
++\fB\-h \fR
++.RS 4
++Parse a header file, this option includes option \fB\-c\fR\&.
++.RE
++.PP
+ \fB\-h\fR
+ .RS 4
+ Process header files\&. When this option is specified, the output file extension becomes
+@@ -144,6 +149,11 @@ Allow question mark as placeholder for c
+ .RE
+ .RE
+ .PP
++\fB\-\-regression\fR
++.RS 4
++Run in regression testing mode\&.
++.RE
++.PP
+ \fB\-t\fR
+ .RS 4
+ Turn on autocommit of transactions\&. In this mode, each SQL command is automatically committed unless it is inside an explicit transaction block\&. In the default mode, commands are committed only when
+diff -up postgresql-13.1/doc/src/sgml/man1/initdb.1.patch6 postgresql-13.1/doc/src/sgml/man1/initdb.1
+--- postgresql-13.1/doc/src/sgml/man1/initdb.1.patch6	2020-11-09 23:38:05.000000000 +0100
++++ postgresql-13.1/doc/src/sgml/man1/initdb.1	2020-11-18 09:25:05.082348424 +0100
+@@ -311,6 +311,13 @@ determines that an error prevented it fr
+ .PP
+ Other options:
+ .PP
++\fB\-s\fR
++.br
++\fB\-\-show\fR
++.RS 4
++Print the internal settings, then exit\&.
++.RE
++.PP
+ \fB\-V\fR
+ .br
+ \fB\-\-version\fR
diff --git a/postgresql-no-libecpg.patch b/postgresql-no-libecpg.patch
new file mode 100755
index 0000000..0d2e9c1
--- /dev/null
+++ b/postgresql-no-libecpg.patch
@@ -0,0 +1,12 @@
+diff -up postgresql-13.1/src/interfaces/Makefile.patch10 postgresql-13.1/src/interfaces/Makefile
+--- postgresql-13.1/src/interfaces/Makefile.patch10	2021-02-02 21:33:23.235292305 +0100
++++ postgresql-13.1/src/interfaces/Makefile	2021-02-02 21:33:30.281365440 +0100
+@@ -12,7 +12,7 @@ subdir = src/interfaces
+ top_builddir = ../..
+ include $(top_builddir)/src/Makefile.global
+ 
+-SUBDIRS = libpq ecpg
++SUBDIRS = libpq
+ 
+ $(recurse)
+ 
diff --git a/postgresql-no-libs.patch b/postgresql-no-libs.patch
new file mode 100755
index 0000000..81e9dae
--- /dev/null
+++ b/postgresql-no-libs.patch
@@ -0,0 +1,33 @@
+diff --git a/src/Makefile b/src/Makefile
+index febbced..9737b55 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -20,7 +20,6 @@ SUBDIRS = \
+ 	backend/utils/mb/conversion_procs \
+ 	backend/snowball \
+ 	include \
+-	interfaces \
+ 	backend/replication/libpqwalreceiver \
+ 	backend/replication/pgoutput \
+ 	fe_utils \
+diff --git a/src/Makefile.global.in b/src/Makefile.global.in
+index 4ed5174..d0e0dae 100644
+--- a/src/Makefile.global.in
++++ b/src/Makefile.global.in
+@@ -457,7 +457,7 @@ endif
+ 
+ # This macro is for use by libraries linking to libpq.  (Because libpgport
+ # isn't created with the same link flags as libpq, it can't be used.)
+-libpq = -L$(libpq_builddir) -lpq
++libpq = -lpq
+ 
+ # This macro is for use by client executables (not libraries) that use libpq.
+ # We force clients to pull symbols from the non-shared libraries libpgport
+@@ -483,7 +483,6 @@ endif
+ # Commonly used submake targets
+ 
+ submake-libpq:
+-	$(MAKE) -C $(libpq_builddir) all
+ 
+ submake-libpgport:
+ 	$(MAKE) -C $(top_builddir)/src/port all
diff --git a/postgresql-server-pg_config.patch b/postgresql-server-pg_config.patch
new file mode 100755
index 0000000..943ff1d
--- /dev/null
+++ b/postgresql-server-pg_config.patch
@@ -0,0 +1,57 @@
+We should ideally provide '/bin/pg_config' in postgresql-server-devel, and
+provide no pg_config binary in libpq package.  But most of the Fedora packages
+that use pg_config actually only build against PG libraries (and
+postgresql-server-devel isn't needed).  So.., to avoid the initial rush around
+rhbz#1618698 change, rather provide pg_server_config binary, which int urn means
+that we'll have to fix only a minimal set of packages which really build
+PostgreSQL server modules.
+
+diff -ur postgresql-16beta1/src/bin/pg_config/Makefile postgresql16_pg_config_patch/src/bin/pg_config/Makefile
+--- postgresql-16beta1/src/bin/pg_config/Makefile	2023-05-22 23:08:08.000000000 +0200
++++ postgresql16_pg_config_patch/src/bin/pg_config/Makefile	2023-06-05 13:51:30.000000000 +0200
+@@ -11,6 +11,8 @@
+ PGFILEDESC = "pg_config - report configuration information"
+ PGAPPICON=win32
+
++PG_CONFIG = pg_server_config$(X)
++
+ subdir = src/bin/pg_config
+ top_builddir = ../../..
+ include $(top_builddir)/src/Makefile.global
+@@ -19,22 +21,22 @@
+ 	$(WIN32RES) \
+ 	pg_config.o
+
+-all: pg_config
++all: $(PG_CONFIG)
+
+-pg_config: $(OBJS) | submake-libpgport
+-	$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
++$(PG_CONFIG): $(OBJS) | submake-libpgport
++	$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@
+
+ install: all installdirs
+-	$(INSTALL_SCRIPT) pg_config$(X) '$(DESTDIR)$(bindir)/pg_config$(X)'
++	$(INSTALL_SCRIPT) $(PG_CONFIG) '$(DESTDIR)$(bindir)/$(PG_CONFIG)'
+
+ installdirs:
+ 	$(MKDIR_P) '$(DESTDIR)$(bindir)'
+
+ uninstall:
+-	rm -f '$(DESTDIR)$(bindir)/pg_config$(X)'
++	rm -f '$(DESTDIR)$(bindir)/$(PG_CONFIG)'
+
+ clean distclean maintainer-clean:
+-	rm -f pg_config$(X) $(OBJS)
++	rm -f $(PG_CONFIG) $(OBJS)
+ 	rm -rf tmp_check
+
+ check:
+diff -ur postgresql-16beta1/src/bin/pg_config/nls.mk postgresql16_pg_config_patch/src/bin/pg_config/nls.mk
+--- postgresql-16beta1/src/bin/pg_config/nls.mk	2023-05-22 23:08:08.000000000 +0200
++++ postgresql16_pg_config_patch/src/bin/pg_config/nls.mk	2023-06-05 13:49:37.000000000 +0200
+@@ -1,3 +1,3 @@
+ # src/bin/pg_config/nls.mk
+-CATALOG_NAME     = pg_config
++CATALOG_NAME     = pg_server_config
+ GETTEXT_FILES    = pg_config.c ../../common/config_info.c ../../common/exec.c
diff --git a/postgresql-var-run-socket.patch b/postgresql-var-run-socket.patch
new file mode 100755
index 0000000..1e554e5
--- /dev/null
+++ b/postgresql-var-run-socket.patch
@@ -0,0 +1,50 @@
+Change the built-in default socket directory to be /var/run/postgresql.
+For backwards compatibility with (probably non-libpq-based) clients that
+might still expect to find the socket in /tmp, also create a socket in
+/tmp.  This is to resolve communication problems with clients operating
+under systemd's PrivateTmp environment, which won't be using the same
+global /tmp directory as the server; see bug #825448.
+
+Note that we apply the socket directory change at the level of the
+hard-wired defaults in the C code, not by just twiddling the setting in
+postgresql.conf.sample; this is so that the change will take effect on
+server package update, without requiring any existing postgresql.conf
+to be updated.  (Of course, a user who dislikes this behavior can still
+override it via postgresql.conf.)
+
+diff -ur -x 'cscope*' postgresql-16beta1/src/backend/utils/misc/guc_tables.c postgresql16_socket_patch/src/backend/utils/misc/guc_tables.c
+--- postgresql-16beta1/src/backend/utils/misc/guc_tables.c	2023-05-22 23:08:08.000000000 +0200
++++ postgresql16_socket_patch/src/backend/utils/misc/guc_tables.c	2023-06-01 09:39:24.000000000 +0200
+@@ -4300,7 +4300,7 @@
+ 			GUC_LIST_INPUT | GUC_LIST_QUOTE | GUC_SUPERUSER_ONLY
+ 		},
+ 		&Unix_socket_directories,
+-		DEFAULT_PGSOCKET_DIR,
++		DEFAULT_PGSOCKET_DIR ", /tmp",
+ 		NULL, NULL, NULL
+ 	},
+
+diff -ur -x 'cscope*' postgresql-16beta1/src/bin/initdb/initdb.c postgresql16_socket_patch/src/bin/initdb/initdb.c
+--- postgresql-16beta1/src/bin/initdb/initdb.c	2023-05-22 23:08:08.000000000 +0200
++++ postgresql16_socket_patch/src/bin/initdb/initdb.c	2023-06-01 09:42:16.000000000 +0200
+@@ -1291,7 +1291,7 @@
+ 	 * these are indeed defaults, keep the postgresql.conf lines commented.
+ 	 */
+ 	conflines = replace_guc_value(conflines, "unix_socket_directories",
+-								  DEFAULT_PGSOCKET_DIR, true);
++								  DEFAULT_PGSOCKET_DIR ", /tmp", true);
+
+ 	conflines = replace_guc_value(conflines, "port",
+ 								  DEF_PGPORT_STR, true);
+diff -ur -x 'cscope*' postgresql-16beta1/src/include/pg_config_manual.h postgresql16_socket_patch/src/include/pg_config_manual.h
+--- postgresql-16beta1/src/include/pg_config_manual.h	2023-05-22 23:08:08.000000000 +0200
++++ postgresql16_socket_patch/src/include/pg_config_manual.h	2023-06-01 09:43:19.000000000 +0200
+@@ -206,7 +206,7 @@
+  * support them yet.
+  */
+ #ifndef WIN32
+-#define DEFAULT_PGSOCKET_DIR  "/tmp"
++#define DEFAULT_PGSOCKET_DIR  "/var/run/postgresql"
+ #else
+ #define DEFAULT_PGSOCKET_DIR ""
+ #endif
diff --git a/postgresql.pam b/postgresql.pam
new file mode 100755
index 0000000..1d78594
--- /dev/null
+++ b/postgresql.pam
@@ -0,0 +1,3 @@
+#%PAM-1.0
+auth		include		password-auth
+account		include		password-auth
diff --git a/postgresql.spec b/postgresql.spec
new file mode 100755
index 0000000..ef88668
--- /dev/null
+++ b/postgresql.spec
@@ -0,0 +1,1242 @@
+# This is the PostgreSQL Global Development Group Official RPMset spec file,
+# or a derivative thereof.
+# Copyright 2003-2009 Lamar Owen <lowen@pari.edu> <lamar.owen@wgcr.org>
+# and others listed.                 ** vi: ts=4 sw=4 noexpandtab nosmarttab
+
+# Major Contributors:
+# ---------------
+# Lamar Owen
+# Trond Eivind Glomsrd <teg@redhat.com>
+# Thomas Lockhart
+# Reinhard Max
+# Karl DeBisschop
+# Peter Eisentraut
+# Joe Conway
+# Andrew Overholt
+# David Jee
+# Kaj J. Niemi
+# Sander Steffann
+# Tom Lane
+# and others in the Changelog....
+
+# This spec file and ancillary files are licensed in accordance with
+# The PostgreSQL license.
+
+# In this file you can find the default build package list macros.
+# These can be overridden by defining on the rpm command line:
+# rpm --define 'packagename 1' .... to force the package to build.
+# rpm --define 'packagename 0' .... to force the package NOT to build.
+# The base package, the libs package, the devel package, and the server package
+# always get built.
+
+%{!?beta:%global beta 0}
+
+%{!?test:%global test 1}
+# Disable temporarily to be able to build the package
+# tracked in RHBZ#1940964
+%{!?llvmjit:%global llvmjit 0}
+%{!?external_libpq:%global external_libpq 0}
+%{!?upgrade:%global upgrade 1}
+%{!?plpython3:%global plpython3 1}
+%{!?pltcl:%global pltcl 1}
+%{!?plperl:%global plperl 1}
+%{!?ssl:%global ssl 1}
+%{!?icu:%global icu 1}
+%{!?kerberos:%global kerberos 1}
+%{!?ldap:%global ldap 1}
+%{!?nls:%global nls 1}
+%{!?uuid:%global uuid 1}
+%{!?xml:%global xml 1}
+%{!?pam:%global pam 1}
+%{!?sdt:%global sdt 1}
+%{!?selinux:%global selinux 1}
+%{!?runselftest:%global runselftest 1}
+
+# By default, patch(1) creates backup files when chunks apply with offsets.
+# Turn that off to ensure such files don't get included in RPMs.
+%global _default_patch_flags --no-backup-if-mismatch
+
+# https://fedoraproject.org/wiki/Packaging:Guidelines#Packaging_of_Additional_RPM_Macros
+%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
+
+Summary: PostgreSQL client programs
+Name: postgresql
+%global majorversion 16
+Version: %{majorversion}.0
+Release: 1%{?dist}
+
+# The PostgreSQL license is very similar to other MIT licenses, but the OSI
+# recognizes it as an independent license, so we do as well.
+License: PostgreSQL
+Url: http://www.postgresql.org/
+
+# This SRPM includes a copy of the previous major release, which is needed for
+# in-place upgrade of an old database.  In most cases it will not be critical
+# that this be kept up with the latest minor release of the previous series;
+# but update when bugs affecting pg_dump output are fixed.
+%global prevmajorversion 15
+%global prevversion %{prevmajorversion}.3
+%global prev_prefix %{_libdir}/pgsql/postgresql-%{prevmajorversion}
+%global precise_version %{?epoch:%epoch:}%version-%release
+
+%global setup_version 8.9
+
+%global service_name postgresql.service
+
+Source0: https://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2
+# The PDF file is generated by generate-pdf.sh, which see for comments
+Source3: https://ftp.postgresql.org/pub/source/v%{prevversion}/postgresql-%{prevversion}.tar.bz2
+Source4: Makefile.regress
+Source9: postgresql.tmpfiles.d
+Source10: postgresql.pam
+Source11: postgresql-bashprofile
+
+
+# git: https://github.com/devexp-db/postgresql-setup
+Source12: https://github.com/devexp-db/postgresql-setup/releases/download/v%{setup_version}/postgresql-setup-%{setup_version}.tar.gz
+
+# Those here are just to enforce packagers check that the tarball was downloaded
+# correctly.  Also, this allows us check that packagers-only tarballs do not
+# differ with publicly released ones.
+Source16: https://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2.sha256
+Source17: https://ftp.postgresql.org/pub/source/v%{prevversion}/postgresql-%{prevversion}.tar.bz2.sha256
+
+# Comments for these patches are in the patch files.
+Patch1: rpm-pgsql.patch
+Patch2: postgresql-logging.patch
+Patch5: postgresql-var-run-socket.patch
+Patch8: postgresql-external-libpq.patch
+Patch9: postgresql-server-pg_config.patch
+Patch12: postgresql-no-libecpg.patch
+
+BuildRequires: make
+BuildRequires: gcc
+BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk
+BuildRequires: perl(ExtUtils::Embed), perl-devel
+BuildRequires: perl(Opcode)
+%if 0%{?fedora} || 0%{?rhel} > 7
+BuildRequires: perl-generators
+%endif
+BuildRequires: readline-devel zlib-devel
+BuildRequires: systemd systemd-devel util-linux
+BuildRequires: multilib-rpm-config
+%if %external_libpq
+BuildRequires: libpq-devel >= %version
+%endif
+BuildRequires: docbook-style-xsl
+
+# postgresql-setup build requires
+BuildRequires: m4 elinks docbook-utils help2man
+
+%if %plpython3
+BuildRequires: python3-devel
+%endif
+
+%if %pltcl
+BuildRequires: tcl-devel
+%endif
+
+%if %ssl
+BuildRequires: openssl-devel
+%endif
+
+%if %kerberos
+BuildRequires: krb5-devel
+%endif
+
+%if %ldap
+BuildRequires: openldap-devel
+%endif
+
+%if %nls
+BuildRequires: gettext >= 0.10.35
+%endif
+
+%if %uuid
+BuildRequires: uuid-devel
+%endif
+
+%if %xml
+BuildRequires: libxml2-devel libxslt-devel
+%endif
+
+%if %pam
+BuildRequires: pam-devel
+%endif
+
+%if %sdt
+BuildRequires: systemtap-sdt-devel
+%endif
+
+%if %selinux
+BuildRequires: libselinux-devel
+%endif
+
+%if %icu
+BuildRequires:	libicu-devel
+%endif
+
+# https://bugzilla.redhat.com/1464368
+# and do not provide pkgconfig RPM provides (RHBZ#1980992)
+%global __provides_exclude_from %{_libdir}/(pgsql|pkgconfig)
+
+%description
+PostgreSQL is an advanced Object-Relational database management system (DBMS).
+The base postgresql package contains the client programs that you'll need to
+access a PostgreSQL DBMS server, as well as HTML documentation for the whole
+system.  These client programs can be located on the same machine as the
+PostgreSQL server, or on a remote machine that accesses a PostgreSQL server
+over a network connection.  The PostgreSQL server can be found in the
+postgresql-server sub-package.
+
+
+%if ! %external_libpq
+%package private-libs
+Summary: The shared libraries required only for this build of PostgreSQL server
+Group: Applications/Databases
+# for /sbin/ldconfig
+Requires(post): glibc
+Requires(postun): glibc
+
+%description private-libs
+The postgresql-private-libs package provides the shared libraries for this
+build of PostgreSQL server and plugins build with this version of server.
+For shared libraries used by client packages that need to connect to a
+PostgreSQL server, install libpq package instead.
+
+
+%package private-devel
+Summary: PostgreSQL development header files for this build of PostgreSQL server
+Group: Development/Libraries
+Requires: %{name}-private-libs%{?_isa} = %precise_version
+# Conflict is desired here, a user must pick one or another
+Conflicts: libpq-devel
+
+%description private-devel
+The postgresql-private-devel package contains the header files and libraries
+needed to compile C or C++ applications which will directly interact
+with a PostgreSQL database management server.
+You need to install this package if you want to develop applications which
+will interact with a PostgreSQL server.
+%endif
+
+
+%package server
+Summary: The programs needed to create and run a PostgreSQL server
+Requires: %{name}%{?_isa} = %precise_version
+Requires(pre): /usr/sbin/useradd
+# We require this to be present for %%{_prefix}/lib/tmpfiles.d
+Requires: systemd
+# Make sure it's there when scriptlets run, too
+%{?systemd_requires}
+# Packages which provide postgresql plugins should build-require
+# postgresql-server-devel and require
+# postgresql-server(:MODULE_COMPAT_%%{postgresql_major}).
+# This will automatically guard against incompatible server & plugin
+# installation (#1008939, #1007840)
+Provides: %{name}-server(:MODULE_COMPAT_%{majorversion})
+Provides: bundled(postgresql-setup) = %setup_version
+
+%description server
+PostgreSQL is an advanced Object-Relational database management system (DBMS).
+The postgresql-server package contains the programs needed to create
+and run a PostgreSQL server, which will in turn allow you to create
+and maintain PostgreSQL databases.
+
+
+%package docs
+Summary: Extra documentation for PostgreSQL
+Requires: %{name}%{?_isa} = %precise_version
+# Just for more intuitive documentation installation
+Provides: %{name}-doc = %precise_version
+
+%description docs
+The postgresql-docs package contains some additional documentation for
+PostgreSQL.  Currently, this includes the main documentation in PDF format
+and source files for the PostgreSQL tutorial.
+
+
+%package contrib
+Summary: Extension modules distributed with PostgreSQL
+Requires: %{name}%{?_isa} = %precise_version
+
+%description contrib
+The postgresql-contrib package contains various extension modules that are
+included in the PostgreSQL distribution.
+
+
+%package server-devel
+Summary: PostgreSQL development header files and libraries
+%if %icu
+Requires:	libicu-devel
+%endif
+%if %kerberos
+Requires: krb5-devel
+%endif
+%if %llvmjit
+Requires: clang-devel llvm-devel
+%endif
+%if %external_libpq
+# Some extensions require libpq
+# Do not make them care about whether server uses private or system-wide
+# libpq, simply let the server pull the correct one
+Requires: libpq-devel
+%else
+Requires: %{name}-private-devel
+%endif
+
+%description server-devel
+The postgresql-server-devel package contains the header files and configuration
+needed to compile PostgreSQL server extension.
+
+%package test-rpm-macros
+Summary: Convenience RPM macros for build-time testing against PostgreSQL server
+Requires: %{name}-server = %precise_version
+BuildArch: noarch
+
+%description test-rpm-macros
+This package is meant to be added as BuildRequires: dependency of other packages
+that want to run build-time testsuite against running PostgreSQL server.
+
+
+%package static
+Summary: Statically linked PostgreSQL libraries
+Requires: %{name}-server-devel%{?_isa} = %precise_version
+
+%description static
+Statically linked PostgreSQL libraries that do not have dynamically linked
+counterparts.
+
+
+%if %upgrade
+%package upgrade
+Summary: Support for upgrading from the previous major release of PostgreSQL
+Requires: %{name}-server%{?_isa} = %precise_version
+Provides: bundled(postgresql-server) = %prevversion
+
+%description upgrade
+The postgresql-upgrade package contains the pg_upgrade utility and supporting
+files needed for upgrading a PostgreSQL database from the previous major
+version of PostgreSQL.
+
+
+%package upgrade-devel
+Summary: Support for build of extensions required for upgrade process
+Requires: %{name}-upgrade%{?_isa} = %precise_version
+
+%description upgrade-devel
+The postgresql-devel package contains the header files and libraries
+needed to compile C or C++ applications which are necessary in upgrade
+process.
+%endif
+
+
+%if %plperl
+%package plperl
+Summary: The Perl procedural language for PostgreSQL
+Requires: %{name}-server%{?_isa} = %precise_version
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+%if %runselftest
+BuildRequires: perl(Opcode)
+BuildRequires: perl(Data::Dumper)
+%endif
+
+%description plperl
+The postgresql-plperl package contains the PL/Perl procedural language,
+which is an extension to the PostgreSQL database server.
+Install this if you want to write database functions in Perl.
+%endif
+
+
+%if %plpython3
+%package plpython3
+Summary: The Python3 procedural language for PostgreSQL
+Requires: %{name}-server%{?_isa} = %precise_version
+
+%description plpython3
+The postgresql-plpython3 package contains the PL/Python3 procedural language,
+which is an extension to the PostgreSQL database server.
+Install this if you want to write database functions in Python 3.
+%endif
+
+
+%if %pltcl
+%package pltcl
+Summary: The Tcl procedural language for PostgreSQL
+Requires: %{name}-server%{?_isa} = %precise_version
+
+%description pltcl
+The postgresql-pltcl package contains the PL/Tcl procedural language,
+which is an extension to the PostgreSQL database server.
+Install this if you want to write database functions in Tcl.
+%endif
+
+
+%if %test
+%package test
+Summary: The test suite distributed with PostgreSQL
+Requires: %{name}-server%{?_isa} = %precise_version
+Requires: %{name}-server-devel%{?_isa} = %precise_version
+
+%description test
+The postgresql-test package contains files needed for various tests for the
+PostgreSQL database management system, including regression tests and
+benchmarks.
+%endif
+
+%if %llvmjit
+%package llvmjit
+Summary:	Just-in-time compilation support for PostgreSQL
+Requires:	%{name}-server%{?_isa} = %{version}-%{release}
+%if 0%{?rhel} && 0%{?rhel} == 7
+Requires:	llvm5.0 >= 5.0
+%else
+Requires:	llvm => 5.0
+%endif
+Provides:	postgresql-llvmjit >= %{version}-%{release}
+
+BuildRequires:	llvm-devel >= 5.0 clang-devel >= 5.0
+
+%description llvmjit
+The postgresql-llvmjit package contains support for
+just-in-time compiling parts of PostgreSQL queries. Using LLVM it
+compiles e.g. expressions and tuple deforming into native code, with the
+goal of accelerating analytics queries.
+%endif
+
+%prep
+(
+  cd "$(dirname "%{SOURCE0}")"
+  sha256sum -c %{SOURCE16}
+%if %upgrade
+  sha256sum -c %{SOURCE17}
+%endif
+)
+%setup -q -a 12 -n postgresql-%{version}
+%patch1 -p1
+%patch2 -p1
+%patch5 -p1
+%if %external_libpq
+%patch8 -p1
+%else
+%patch12 -p1
+%endif
+%patch9 -p1
+
+
+%if ! %external_libpq
+%global private_soname private%{majorversion}
+find . -type f -name Makefile -exec sed -i -e "s/SO_MAJOR_VERSION=\s\?\([0-9]\+\)/SO_MAJOR_VERSION= %{private_soname}-\1/" {} \;
+%endif
+
+%if %upgrade
+tar xfj %{SOURCE3}
+
+# libpq from this upgrade-only build is dropped and the libpq from the main
+# version is used. Use the same major hack therefore.
+%if ! %external_libpq
+find . -type f -name Makefile -exec sed -i -e "s/SO_MAJOR_VERSION=\s\?\([0-9]\+\)/SO_MAJOR_VERSION= %{private_soname}-\1/" {} \;
+%endif
+
+# apply once SOURCE3 is extracted
+%endif
+
+# remove .gitignore files to ensure none get into the RPMs (bug #642210)
+find . -type f -name .gitignore | xargs rm
+
+
+%build
+# Avoid LTO on armv7hl as it runs out of memory
+%ifarch armv7hl s390x
+%define _lto_cflags %{nil}
+%endif
+# fail quickly and obviously if user tries to build as root
+%if %runselftest
+	if [ x"`id -u`" = x0 ]; then
+		echo "postgresql's regression tests fail if run as root."
+		echo "If you really need to build the RPM as root, use"
+		echo "--define='runselftest 0' to skip the regression tests."
+		exit 1
+	fi
+%endif
+
+# Building postgresql-setup
+
+cd postgresql-setup-%{setup_version}
+
+%configure \
+    pgdocdir=%{_pkgdocdir} \
+    PGVERSION=%{version} \
+    PGMAJORVERSION=%{majorversion} \
+    NAME_DEFAULT_PREV_SERVICE=postgresql
+
+make %{?_smp_mflags}
+cd ..
+
+# Fiddling with CFLAGS.
+
+CFLAGS="${CFLAGS:-%optflags}"
+# Strip out -ffast-math from CFLAGS....
+CFLAGS=`echo $CFLAGS|xargs -n 1|grep -v ffast-math|xargs -n 100`
+export CFLAGS
+
+common_configure_options='
+	--disable-rpath
+%if %beta
+	--enable-debug
+	--enable-cassert
+%endif
+%if %plperl
+	--with-perl
+%endif
+%if %pltcl
+	--with-tcl
+	--with-tclconfig=%_libdir
+%endif
+%if %ldap
+	--with-ldap
+%endif
+%if %ssl
+	--with-openssl
+%endif
+%if %pam
+	--with-pam
+%endif
+%if %kerberos
+	--with-gssapi
+%endif
+%if %uuid
+	--with-ossp-uuid
+%endif
+%if %xml
+	--with-libxml
+	--with-libxslt
+%endif
+%if %nls
+	--enable-nls
+%endif
+%if %sdt
+	--enable-dtrace
+%endif
+%if %selinux
+	--with-selinux
+%endif
+	--with-system-tzdata=%_datadir/zoneinfo
+	--datadir=%_datadir/pgsql
+	--with-systemd
+%if %icu
+	--with-icu
+%endif
+%if %llvmjit
+	--with-llvm
+%endif
+%if %plpython3
+	--with-python
+%endif
+'
+
+export PYTHON=/usr/bin/python3
+
+# These configure options must match main build
+%configure $common_configure_options
+
+%make_build world
+
+# Have to hack makefile to put correct path into tutorial scripts
+sed "s|C=\`pwd\`;|C=%{_libdir}/pgsql/tutorial;|" < src/tutorial/Makefile > src/tutorial/GNUmakefile
+make %{?_smp_mflags} -C src/tutorial NO_PGXS=1 all
+rm -f src/tutorial/GNUmakefile
+
+# The object files shouldn't be copied to rpm bz#1187514
+rm -f src/tutorial/*.o
+
+# run_testsuite WHERE
+# -------------------
+# Run 'make check' in WHERE path.  When that command fails, return the logs
+# given by PostgreSQL build system and set 'test_failure=1'.  This function
+# never exits directly nor stops rpmbuild where `set -e` is enabled.
+run_testsuite()
+{
+	make -k -C "$1" MAX_CONNECTIONS=5 check && return 0 || test_failure=1
+	(
+		set +x
+		echo "=== trying to find all regression.diffs files in build directory ==="
+		find "$1" -name 'regression.diffs' | \
+		while read line; do
+			echo "=== make failure: $line ==="
+			cat "$line"
+		done
+	)
+}
+
+test_failure=0
+
+%if %runselftest
+	run_testsuite "src/test/regress"
+	make clean -C "src/test/regress"
+	run_testsuite "src/pl"
+	run_testsuite "contrib"
+%endif
+
+# "assert(ALL_TESTS_OK)"
+test "$test_failure" -eq 0
+
+%if %test
+	# undo the "make clean" above
+	make all -C src/test/regress
+%endif
+
+%if %upgrade
+	pushd postgresql-%{prevversion}
+
+	# The upgrade build can be pretty stripped-down, but make sure that
+	# any options that affect on-disk file layout match the previous
+	# major release!
+
+	# The set of built server modules here should ideally create superset
+	# of modules we used to ship in %%prevversion (in the installation
+	# the user will upgrade from), including *-contrib or *-pl*
+	# subpackages.  This increases chances that the upgrade from
+	# %%prevversion will work smoothly.
+
+upgrade_configure ()
+{
+	# Note we intentionally do not use %%configure here, because we *don't* want
+	# its ideas about installation paths.
+
+	# The -fno-aggressive-loop-optimizations is hack for #993532
+	CFLAGS="$CFLAGS -fno-aggressive-loop-optimizations" ./configure \
+		--build=%{_build} \
+		--host=%{_host} \
+		--prefix=%prev_prefix \
+		--disable-rpath \
+%if %beta
+		--enable-debug \
+		--enable-cassert \
+%endif
+%if %icu
+		--with-icu \
+%endif
+%if %plperl
+		--with-perl \
+%endif
+%if %pltcl
+		--with-tcl \
+%endif
+%if %ssl
+	    --with-openssl \
+%endif
+%if %plpython3
+		--with-python \
+%endif
+		--with-tclconfig=%_libdir \
+		--with-system-tzdata=/usr/share/zoneinfo \
+		"$@"
+}
+
+	upgrade_configure \
+
+	make %{?_smp_mflags} all
+	make -C contrib %{?_smp_mflags} all
+	popd
+# endif upgrade
+%endif
+
+
+%install
+cd postgresql-setup-%{setup_version}
+make install DESTDIR=$RPM_BUILD_ROOT
+cd ..
+
+# For some reason, having '%%doc %%{_pkgdocdir}/README.rpm-dist' in %%files
+# causes FTBFS (at least on RHEL6), see rhbz#1250006.
+mv $RPM_BUILD_ROOT/%{_pkgdocdir}/README.rpm-dist ./
+
+cat > $RPM_BUILD_ROOT%{_sysconfdir}/postgresql-setup/upgrade/postgresql.conf <<EOF
+id              postgresql
+major           %{prevmajorversion}
+data_default    %{_localstatedir}/pgsql/data
+package         postgresql-upgrade
+engine          %{_libdir}/pgsql/postgresql-%{prevmajorversion}/bin
+description     "Upgrade data from system PostgreSQL version (PostgreSQL %{prevmajorversion})"
+redhat_sockets_hack no
+EOF
+
+make DESTDIR=$RPM_BUILD_ROOT install-world
+
+# We ship pg_config through libpq-devel
+mv $RPM_BUILD_ROOT/%_mandir/man1/pg_{,server_}config.1
+%if %external_libpq
+rm $RPM_BUILD_ROOT/%_includedir/pg_config*.h
+rm $RPM_BUILD_ROOT/%_includedir/libpq/libpq-fs.h
+rm $RPM_BUILD_ROOT/%_includedir/postgres_ext.h
+rm -r $RPM_BUILD_ROOT/%_includedir/pgsql/internal/
+%else
+ln -s pg_server_config $RPM_BUILD_ROOT/%_bindir/pg_config
+rm $RPM_BUILD_ROOT/%{_libdir}/libpq.a
+%endif
+
+# make sure these directories exist even if we suppressed all contrib modules
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/pgsql/contrib
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/pgsql/extension
+
+# multilib header hack
+for header in \
+	%{_includedir}/pg_config.h \
+	%{_includedir}/pg_config_ext.h
+do
+%multilib_fix_c_header --file "$header"
+done
+
+install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/pgsql/tutorial
+cp -p src/tutorial/* $RPM_BUILD_ROOT%{_libdir}/pgsql/tutorial
+
+%if %pam
+install -d $RPM_BUILD_ROOT/etc/pam.d
+install -m 644 %{SOURCE10} $RPM_BUILD_ROOT/etc/pam.d/postgresql
+%endif
+
+# Create the directory for sockets.
+install -d -m 755 $RPM_BUILD_ROOT%{?_localstatedir}/run/postgresql
+
+# ... and make a tmpfiles script to recreate it at reboot.
+mkdir -p $RPM_BUILD_ROOT%{_tmpfilesdir}
+install -m 0644 %{SOURCE9} $RPM_BUILD_ROOT%{_tmpfilesdir}/postgresql.conf
+
+# PGDATA needs removal of group and world permissions due to pg_pwd hole.
+install -d -m 700 $RPM_BUILD_ROOT%{?_localstatedir}/lib/pgsql/data
+
+# backups of data go here...
+install -d -m 700 $RPM_BUILD_ROOT%{?_localstatedir}/lib/pgsql/backups
+
+# postgres' .bash_profile
+install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{?_localstatedir}/lib/pgsql/.bash_profile
+
+rm $RPM_BUILD_ROOT/%{_datadir}/man/man1/ecpg.1
+
+%if %upgrade
+	pushd postgresql-%{prevversion}
+	make DESTDIR=$RPM_BUILD_ROOT install
+	make -C contrib DESTDIR=$RPM_BUILD_ROOT install
+	popd
+
+	# remove stuff we don't actually need for upgrade purposes
+	pushd $RPM_BUILD_ROOT%{_libdir}/pgsql/postgresql-%{prevmajorversion}
+	rm bin/clusterdb
+	rm bin/createdb
+	rm bin/createuser
+	rm bin/dropdb
+	rm bin/dropuser
+	rm bin/ecpg
+	rm bin/initdb
+	rm bin/pg_basebackup
+	rm bin/pg_dump
+	rm bin/pg_dumpall
+	rm bin/pg_restore
+	rm bin/pgbench
+	rm bin/psql
+	rm bin/reindexdb
+	rm bin/vacuumdb
+	rm -rf share/doc
+	rm -rf share/man
+	rm -rf share/tsearch_data
+	rm lib/*.a
+	# Drop libpq.  This might need some tweaks once there's
+	# soname bump between %%prevversion and %%version.
+	rm lib/libpq.so*
+	# Drop libraries.
+	rm lib/lib{ecpg,ecpg_compat,pgtypes}.so*
+	rm share/*.bki
+	rm share/*.sample
+	rm share/*.sql
+	rm share/*.txt
+	rm share/extension/*.sql
+	rm share/extension/*.control
+	popd
+	cat <<EOF > $RPM_BUILD_ROOT%macrosdir/macros.%name-upgrade
+%%postgresql_upgrade_prefix %prev_prefix
+EOF
+%endif
+
+# Let plugins use the same llvmjit settings as server has
+cat <<EOF >> $RPM_BUILD_ROOT%macrosdir/macros.%name
+%%postgresql_server_llvmjit %llvmjit
+EOF
+
+%if %test
+	# tests. There are many files included here that are unnecessary,
+	# but include them anyway for completeness.  We replace the original
+	# Makefiles, however.
+	mkdir -p $RPM_BUILD_ROOT%{_libdir}/pgsql/test
+	cp -a src/test/regress $RPM_BUILD_ROOT%{_libdir}/pgsql/test
+	# pg_regress binary should be only in one subpackage,
+	# there will be a symlink from -test to -devel
+	rm -f $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress/pg_regress
+	ln -sf ../../pgxs/src/test/regress/pg_regress $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress/pg_regress
+	pushd  $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress
+	rm -f GNUmakefile Makefile *.o
+	chmod 0755 pg_regress regress.so
+	popd
+	sed 's|@bindir@|%{_bindir}|g' \
+		< %{SOURCE4} \
+		> $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress/Makefile
+	chmod 0644 $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress/Makefile
+%endif
+
+rm -rf doc/html # HACK! allow 'rpmbuild -bi --short-circuit'
+mv $RPM_BUILD_ROOT%{_docdir}/pgsql/html doc
+rm -rf $RPM_BUILD_ROOT%{_docdir}/pgsql
+
+# remove files not to be packaged
+rm $RPM_BUILD_ROOT%{_libdir}/libpgfeutils.a
+
+%if !%plperl
+rm -f $RPM_BUILD_ROOT%{_bindir}/pgsql/hstore_plperl.so
+%endif
+
+# no python2, yet installed, remove
+rm -f $RPM_BUILD_ROOT%{_datadir}/pgsql/extension/*_plpythonu*
+rm -f $RPM_BUILD_ROOT%{_datadir}/pgsql/extension/*_plpython2u*
+
+%if %nls
+find_lang_bins ()
+{
+	lstfile=$1 ; shift
+	cp /dev/null "$lstfile"
+	for binary; do
+		%find_lang "$binary"-%{majorversion}
+		cat "$binary"-%{majorversion}.lang >>"$lstfile"
+	done
+}
+find_lang_bins devel.lst pg_server_config
+find_lang_bins server.lst \
+	initdb pg_basebackup pg_controldata pg_ctl pg_resetwal pg_rewind plpgsql \
+	postgres pg_checksums pg_verifybackup
+find_lang_bins contrib.lst \
+	pg_amcheck pg_archivecleanup pg_test_fsync pg_test_timing pg_waldump
+find_lang_bins main.lst \
+	pg_dump pg_upgrade pgscripts psql \
+%if ! %external_libpq
+libpq%{private_soname}-5
+%endif
+
+%if %plperl
+find_lang_bins plperl.lst plperl
+%endif
+%if %plpython3
+find_lang_bins plpython3.lst plpython
+%endif
+%if %pltcl
+find_lang_bins pltcl.lst pltcl
+%endif
+%endif
+
+%pre server
+/usr/sbin/groupadd -g 26 -o -r postgres >/dev/null 2>&1 || :
+/usr/sbin/useradd -M -N -g postgres -o -r -d /var/lib/pgsql -s /bin/bash \
+	-c "PostgreSQL Server" -u 26 postgres >/dev/null 2>&1 || :
+
+%post server
+%systemd_post %service_name
+
+
+%preun server
+%systemd_preun %service_name
+
+
+%postun server
+%systemd_postun_with_restart %service_name
+
+
+%check
+%if %runselftest
+make -C postgresql-setup-%{setup_version} check
+%endif
+
+# FILES sections.
+%files -f main.lst
+%doc doc/KNOWN_BUGS doc/MISSING_FEATURES doc/TODO
+%doc COPYRIGHT README HISTORY
+%doc README.rpm-dist
+%{_bindir}/clusterdb
+%{_bindir}/createdb
+%{_bindir}/createuser
+%{_bindir}/dropdb
+%{_bindir}/dropuser
+%{_bindir}/pg_dump
+%{_bindir}/pg_dumpall
+%{_bindir}/pg_isready
+%{_bindir}/pg_restore
+%{_bindir}/pg_upgrade
+%{_bindir}/psql
+%{_bindir}/reindexdb
+%{_bindir}/vacuumdb
+%{_mandir}/man1/clusterdb.*
+%{_mandir}/man1/createdb.*
+%{_mandir}/man1/createuser.*
+%{_mandir}/man1/dropdb.*
+%{_mandir}/man1/dropuser.*
+%{_mandir}/man1/pg_dump.*
+%{_mandir}/man1/pg_dumpall.*
+%{_mandir}/man1/pg_isready.*
+%{_mandir}/man1/pg_restore.*
+%{_mandir}/man1/pg_upgrade.*
+%{_mandir}/man1/psql.*
+%{_mandir}/man1/reindexdb.*
+%{_mandir}/man1/vacuumdb.*
+%{_mandir}/man7/*
+%if %llvmjit
+# Install bitcode directory along with the main package,
+# so that extensions can use this dir.
+%dir %{_libdir}/pgsql/bitcode
+%endif
+
+
+%if ! %external_libpq
+%files private-libs
+%{_libdir}/libpq.so.*
+%endif
+
+
+%files docs
+%doc doc/html
+%{_libdir}/pgsql/tutorial/
+
+
+%files contrib -f contrib.lst
+%doc contrib/spi/*.example
+%{_bindir}/oid2name
+%{_bindir}/pg_amcheck
+%{_bindir}/pg_archivecleanup
+%{_bindir}/pg_test_fsync
+%{_bindir}/pg_test_timing
+%{_bindir}/pg_waldump
+%{_bindir}/pgbench
+%{_bindir}/vacuumlo
+%{_datadir}/pgsql/extension/adminpack*
+%{_datadir}/pgsql/extension/amcheck*
+%{_datadir}/pgsql/extension/autoinc*
+%{_datadir}/pgsql/extension/bloom*
+%{_datadir}/pgsql/extension/btree_gin*
+%{_datadir}/pgsql/extension/btree_gist*
+%{_datadir}/pgsql/extension/citext*
+%{_datadir}/pgsql/extension/cube*
+%{_datadir}/pgsql/extension/dblink*
+%{_datadir}/pgsql/extension/dict_int*
+%{_datadir}/pgsql/extension/dict_xsyn*
+%{_datadir}/pgsql/extension/earthdistance*
+%{_datadir}/pgsql/extension/file_fdw*
+%{_datadir}/pgsql/extension/fuzzystrmatch*
+%{_datadir}/pgsql/extension/hstore*
+%{_datadir}/pgsql/extension/insert_username*
+%{_datadir}/pgsql/extension/intagg*
+%{_datadir}/pgsql/extension/intarray*
+%{_datadir}/pgsql/extension/isn*
+%if %{plperl}
+%{_datadir}/pgsql/extension/jsonb_plperl*
+%endif
+%if %{plpython3}
+%{_datadir}/pgsql/extension/jsonb_plpython3u*
+%endif
+%{_datadir}/pgsql/extension/lo*
+%{_datadir}/pgsql/extension/ltree*
+%{_datadir}/pgsql/extension/moddatetime*
+%{_datadir}/pgsql/extension/old_snapshot*
+%{_datadir}/pgsql/extension/pg_surgery*
+%{_datadir}/pgsql/extension/pageinspect*
+%{_datadir}/pgsql/extension/pg_buffercache*
+%{_datadir}/pgsql/extension/pg_freespacemap*
+%{_datadir}/pgsql/extension/pg_prewarm*
+%{_datadir}/pgsql/extension/pg_stat_statements*
+%{_datadir}/pgsql/extension/pg_trgm*
+%{_datadir}/pgsql/extension/pg_visibility*
+%{_datadir}/pgsql/extension/pgcrypto*
+%{_datadir}/pgsql/extension/pgrowlocks*
+%{_datadir}/pgsql/extension/pgstattuple*
+%{_datadir}/pgsql/extension/postgres_fdw*
+%{_datadir}/pgsql/extension/refint*
+%{_datadir}/pgsql/extension/seg*
+%{_datadir}/pgsql/extension/tablefunc*
+%{_datadir}/pgsql/extension/tcn*
+%{_datadir}/pgsql/extension/tsm_system_rows*
+%{_datadir}/pgsql/extension/tsm_system_time*
+%{_datadir}/pgsql/extension/unaccent*
+%{_datadir}/pgsql/extension/pg_walinspect*
+%{_libdir}/pgsql/_int.so
+%{_libdir}/pgsql/adminpack.so
+%{_libdir}/pgsql/amcheck.so
+%{_libdir}/pgsql/auth_delay.so
+%{_libdir}/pgsql/auto_explain.so
+%{_libdir}/pgsql/autoinc.so
+%{_libdir}/pgsql/bloom.so
+%{_libdir}/pgsql/btree_gin.so
+%{_libdir}/pgsql/btree_gist.so
+%{_libdir}/pgsql/citext.so
+%{_libdir}/pgsql/cube.so
+%{_libdir}/pgsql/dblink.so
+%{_libdir}/pgsql/dict_int.so
+%{_libdir}/pgsql/dict_xsyn.so
+%{_libdir}/pgsql/earthdistance.so
+%{_libdir}/pgsql/file_fdw.so
+%{_libdir}/pgsql/fuzzystrmatch.so
+%{_libdir}/pgsql/hstore.so
+%if %plperl
+%{_libdir}/pgsql/hstore_plperl.so
+%endif
+%if %plpython3
+%{_libdir}/pgsql/hstore_plpython3.so
+%endif
+%{_libdir}/pgsql/insert_username.so
+%{_libdir}/pgsql/isn.so
+%if %plperl
+%{_libdir}/pgsql/jsonb_plperl.so
+%endif
+%if %plpython3
+%{_libdir}/pgsql/jsonb_plpython3.so
+%endif
+%{_libdir}/pgsql/lo.so
+%{_libdir}/pgsql/ltree.so
+%if %plpython3
+%{_libdir}/pgsql/ltree_plpython3.so
+%endif
+%{_libdir}/pgsql/moddatetime.so
+%{_libdir}/pgsql/old_snapshot.so
+%{_libdir}/pgsql/pg_surgery.so
+%{_libdir}/pgsql/pageinspect.so
+%{_libdir}/pgsql/passwordcheck.so
+%{_libdir}/pgsql/pg_buffercache.so
+%{_libdir}/pgsql/pg_freespacemap.so
+%{_libdir}/pgsql/pg_stat_statements.so
+%{_libdir}/pgsql/pg_trgm.so
+%{_libdir}/pgsql/pg_visibility.so
+%{_libdir}/pgsql/pgcrypto.so
+%{_libdir}/pgsql/pgrowlocks.so
+%{_libdir}/pgsql/pgstattuple.so
+%{_libdir}/pgsql/postgres_fdw.so
+%{_libdir}/pgsql/refint.so
+%{_libdir}/pgsql/seg.so
+%{_libdir}/pgsql/tablefunc.so
+%{_libdir}/pgsql/tcn.so
+%{_libdir}/pgsql/test_decoding.so
+%{_libdir}/pgsql/tsm_system_rows.so
+%{_libdir}/pgsql/tsm_system_time.so
+%{_libdir}/pgsql/unaccent.so
+%{_libdir}/pgsql/basebackup_to_shell.so
+%{_libdir}/pgsql/basic_archive.so
+%{_libdir}/pgsql/pg_walinspect.so
+%{_mandir}/man1/oid2name.*
+%{_mandir}/man1/pg_amcheck.*
+%{_mandir}/man1/pg_archivecleanup.*
+%{_mandir}/man1/pg_recvlogical.*
+%{_mandir}/man1/pg_test_fsync.*
+%{_mandir}/man1/pg_test_timing.*
+%{_mandir}/man1/pg_waldump.*
+%{_mandir}/man1/pgbench.*
+%{_mandir}/man1/vacuumlo.*
+%{_mandir}/man3/dblink*
+%if %selinux
+%{_datadir}/pgsql/contrib/sepgsql.sql
+%{_libdir}/pgsql/sepgsql.so
+%endif
+%if %ssl
+%{_datadir}/pgsql/extension/sslinfo*
+%{_libdir}/pgsql/sslinfo.so
+%endif
+%if %uuid
+%{_datadir}/pgsql/extension/uuid-ossp*
+%{_libdir}/pgsql/uuid-ossp.so
+%endif
+%if %xml
+%{_datadir}/pgsql/extension/xml2*
+%{_libdir}/pgsql/pgxml.so
+%endif
+
+%files server -f server.lst
+%{_bindir}/initdb
+%{_bindir}/pg_basebackup
+%{_bindir}/pg_controldata
+%{_bindir}/pg_ctl
+%{_bindir}/pg_receivewal
+%{_bindir}/pg_recvlogical
+%{_bindir}/pg_resetwal
+%{_bindir}/pg_rewind
+%{_bindir}/pg_checksums
+%{_bindir}/pg_verifybackup
+%{_bindir}/postgres
+%{_bindir}/postgresql-setup
+%{_bindir}/postgresql-upgrade
+%dir %{_datadir}/pgsql
+%{_datadir}/pgsql/*.sample
+%dir %{_datadir}/pgsql/contrib
+%dir %{_datadir}/pgsql/extension
+%{_datadir}/pgsql/extension/plpgsql*
+%{_datadir}/pgsql/information_schema.sql
+%{_datadir}/pgsql/postgres.bki
+%{_datadir}/pgsql/snowball_create.sql
+%{_datadir}/pgsql/sql_features.txt
+%{_datadir}/pgsql/system_constraints.sql
+%{_datadir}/pgsql/system_functions.sql
+%{_datadir}/pgsql/system_views.sql
+%{_datadir}/pgsql/timezonesets/
+%{_datadir}/pgsql/tsearch_data/
+%dir %{_datadir}/postgresql-setup
+%{_datadir}/postgresql-setup/library.sh
+%dir %{_libdir}/pgsql
+%{_libdir}/pgsql/*_and_*.so
+%{_libdir}/pgsql/dict_snowball.so
+%{_libdir}/pgsql/euc2004_sjis2004.so
+%{_libdir}/pgsql/libpqwalreceiver.so
+%{_libdir}/pgsql/pg_prewarm.so
+%{_libdir}/pgsql/pgoutput.so
+%{_libdir}/pgsql/plpgsql.so
+%dir %{_libexecdir}/initscripts/legacy-actions/postgresql
+%{_libexecdir}/initscripts/legacy-actions/postgresql/*
+%{_libexecdir}/postgresql-check-db-dir
+%dir %{_sysconfdir}/postgresql-setup
+%dir %{_sysconfdir}/postgresql-setup/upgrade
+%config %{_sysconfdir}/postgresql-setup/upgrade/*.conf
+%{_mandir}/man1/initdb.*
+%{_mandir}/man1/pg_basebackup.*
+%{_mandir}/man1/pg_controldata.*
+%{_mandir}/man1/pg_ctl.*
+%{_mandir}/man1/pg_receivewal.*
+%{_mandir}/man1/pg_resetwal.*
+%{_mandir}/man1/pg_rewind.*
+%{_mandir}/man1/pg_checksums.*
+%{_mandir}/man1/pg_verifybackup.*
+%{_mandir}/man1/postgres.*
+%{_mandir}/man1/postgresql-new-systemd-unit.*
+%{_mandir}/man1/postgresql-setup.*
+%{_mandir}/man1/postgresql-upgrade.*
+%{_sbindir}/postgresql-new-systemd-unit
+%{_tmpfilesdir}/postgresql.conf
+%{_unitdir}/*postgresql*.service
+%attr(700,postgres,postgres) %dir %{?_localstatedir}/lib/pgsql
+%attr(644,postgres,postgres) %config(noreplace) %{?_localstatedir}/lib/pgsql/.bash_profile
+%attr(700,postgres,postgres) %dir %{?_localstatedir}/lib/pgsql/backups
+%attr(700,postgres,postgres) %dir %{?_localstatedir}/lib/pgsql/data
+%attr(755,postgres,postgres) %dir %{?_localstatedir}/run/postgresql
+%if %pam
+%config(noreplace) /etc/pam.d/postgresql
+%endif
+
+
+%files server-devel -f devel.lst
+%{_bindir}/pg_server_config
+%dir %{_datadir}/pgsql
+%{_datadir}/pgsql/errcodes.txt
+%dir %{_includedir}/pgsql
+%{_includedir}/pgsql/server
+%{_libdir}/pgsql/pgxs/
+%{_mandir}/man1/pg_server_config.*
+%{_mandir}/man3/SPI_*
+%{macrosdir}/macros.%name
+
+
+%if ! %external_libpq
+%files private-devel
+%{_bindir}/pg_config
+%{_includedir}/libpq-events.h
+%{_includedir}/libpq-fe.h
+%{_includedir}/postgres_ext.h
+%{_includedir}/pgsql/internal/*.h
+%{_includedir}/pgsql/internal/libpq/pqcomm.h
+%{_includedir}/libpq/*.h
+%exclude %{_libdir}/pkgconfig/*.pc
+%{_libdir}/libpq.so
+%{_includedir}/pg_config*.h
+%endif
+
+
+%files test-rpm-macros
+%{_datadir}/postgresql-setup/postgresql_pkg_tests.sh
+%{macrosdir}/macros.%name-test
+
+
+%files static
+%{_libdir}/libpgcommon.a
+%{_libdir}/libpgport.a
+%{_libdir}/libpgcommon_shlib.a
+%{_libdir}/libpgport_shlib.a
+
+
+%if %upgrade
+%files upgrade
+%{_libdir}/pgsql/postgresql-%{prevmajorversion}/bin
+%exclude %{_libdir}/pgsql/postgresql-%{prevmajorversion}/bin/pg_config
+%{_libdir}/pgsql/postgresql-%{prevmajorversion}/lib
+%exclude %{_libdir}/pgsql/postgresql-%{prevmajorversion}/lib/pgxs
+%exclude %{_libdir}/pgsql/postgresql-%{prevmajorversion}/lib/pkgconfig
+%{_libdir}/pgsql/postgresql-%{prevmajorversion}/share
+
+
+%files upgrade-devel
+%{_libdir}/pgsql/postgresql-%{prevmajorversion}/bin/pg_config
+%{_libdir}/pgsql/postgresql-%{prevmajorversion}/include
+%{_libdir}/pgsql/postgresql-%{prevmajorversion}/lib/pkgconfig
+%{_libdir}/pgsql/postgresql-%{prevmajorversion}/lib/pgxs
+%{macrosdir}/macros.%name-upgrade
+%endif
+
+%if %llvmjit
+%files llvmjit
+%defattr(-,root,root)
+%{_libdir}/pgsql/bitcode/*
+%{_libdir}/pgsql/llvmjit.so
+%{_libdir}/pgsql/llvmjit_types.bc
+%endif
+
+%if %plperl
+%files plperl -f plperl.lst
+%{_datadir}/pgsql/extension/bool_plperl*
+%{_datadir}/pgsql/extension/plperl*
+%{_libdir}/pgsql/bool_plperl.so
+%{_libdir}/pgsql/plperl.so
+%endif
+
+
+%if %pltcl
+%files pltcl -f pltcl.lst
+%{_datadir}/pgsql/extension/pltcl*
+%{_libdir}/pgsql/pltcl.so
+%endif
+
+
+%if %plpython3
+%files plpython3 -f plpython3.lst
+%{_datadir}/pgsql/extension/plpython3*
+%{_libdir}/pgsql/plpython3.so
+%endif
+
+
+%if %test
+%files test
+%attr(-,postgres,postgres) %{_libdir}/pgsql/test
+%endif
+
+
+%changelog
+* Mon Oct 09 2023 Filip Janus <fjanus@redhat.com> - 16.0-1
+- New postgresql stream - 16
+- Remove pdf documentation
+- Update postgresql-setup to 8.9
+- postmaster binary no more shipped
+- Resolves: RHEL-3636
+
+* Wed Aug 02 2023 Jorge San Emeterio <jsanemet@redhat.com> - 15.3-1
+- Update to upstream version 15.3
+- Fixes: CVE-2023-2454 CVE-2023-2455
+- Resolves: #2207934
+
+* Wed Feb 08 2023 Filip Januš <fjanus@redhat.com> - 15.2-1
+- Update to upstream version 15.2
+- Update postgresql-setup to 8.8
+- PostgreSQL systemd unit waits for the network to be up
+- Resolves: #2128241
+
+* Fri Oct 14 2022 Filip Januš <fjanus@redhat.com> - 15.0-1
+- Initial import for postgresql 15
+- Specfile is based on version locate in centos stream
+  It reflects changes with libpq. This version of databse server
+  will use private libpq library.
+- Resolves: #2128241
diff --git a/postgresql.tmpfiles.d b/postgresql.tmpfiles.d
new file mode 100755
index 0000000..6c48e34
--- /dev/null
+++ b/postgresql.tmpfiles.d
@@ -0,0 +1 @@
+d /run/postgresql 0755 postgres postgres -
diff --git a/rpm-pgsql.patch b/rpm-pgsql.patch
new file mode 100755
index 0000000..aec64ac
--- /dev/null
+++ b/rpm-pgsql.patch
@@ -0,0 +1,72 @@
+For the RPMs, we want the custom installation directories to end in
+/pgsql not /postgresql.  This is historical but not worth changing.
+
+Notice that this patch also makes the appending of /pgsql unconditional.
+This is to avoid unexpected behavior if the RPM is built in a working
+directory whose path happens to include "postgres" or "pgsql" already.
+However, datadir and sysconfdir are already set up in the specfile's
+configure call, so we do not have to append anything to them.
+
+
+diff -Naur postgresql-9.0.1.orig/src/Makefile.global.in postgresql-9.0.1/src/Makefile.global.in
+--- postgresql-9.0.1.orig/src/Makefile.global.in	2010-10-01 10:25:44.000000000 -0400
++++ postgresql-9.0.1/src/Makefile.global.in	2010-10-11 11:52:05.224975308 -0400
+@@ -55,8 +55,7 @@
+ # Installation directories
+ #
+ # These are set by the equivalent --xxxdir configure options.  We
+-# append "postgresql" to some of them, if the string does not already
+-# contain "pgsql" or "postgres", in order to avoid directory clutter.
++# append "pgsql" to some of them, in order to avoid directory clutter.
+ #
+ # In a PGXS build, we cannot use the values inserted into Makefile.global
+ # by configure, since the installation tree may have been relocated.
+@@ -74,45 +73,23 @@
+ bindir := @bindir@
+ 
+ datadir := @datadir@
+-ifeq "$(findstring pgsql, $(datadir))" ""
+-ifeq "$(findstring postgres, $(datadir))" ""
+-override datadir := $(datadir)/postgresql
+-endif
+-endif
+ 
+ sysconfdir := @sysconfdir@
+-ifeq "$(findstring pgsql, $(sysconfdir))" ""
+-ifeq "$(findstring postgres, $(sysconfdir))" ""
+-override sysconfdir := $(sysconfdir)/postgresql
+-endif
+-endif
+ 
+ libdir := @libdir@
+ 
+ pkglibdir = $(libdir)
+-ifeq "$(findstring pgsql, $(pkglibdir))" ""
+-ifeq "$(findstring postgres, $(pkglibdir))" ""
+-override pkglibdir := $(pkglibdir)/postgresql
+-endif
+-endif
++override pkglibdir := $(pkglibdir)/pgsql
+ 
+ includedir := @includedir@
+ 
+ pkgincludedir = $(includedir)
+-ifeq "$(findstring pgsql, $(pkgincludedir))" ""
+-ifeq "$(findstring postgres, $(pkgincludedir))" ""
+-override pkgincludedir := $(pkgincludedir)/postgresql
+-endif
+-endif
++override pkgincludedir := $(pkgincludedir)/pgsql
+ 
+ mandir := @mandir@
+ 
+ docdir := @docdir@
+-ifeq "$(findstring pgsql, $(docdir))" ""
+-ifeq "$(findstring postgres, $(docdir))" ""
+-override docdir := $(docdir)/postgresql
+-endif
+-endif
++override docdir := $(docdir)/pgsql
+ 
+ htmldir := @htmldir@
+ 
diff --git a/sources b/sources
new file mode 100755
index 0000000..3f32895
--- /dev/null
+++ b/sources
@@ -0,0 +1,5 @@
+SHA512 (postgresql-16.0.tar.bz2) = c66b72d2d9bc503b9ad19c67384517ae921c494b2916f32157c2528dcbb38aefeb4a8cd5003fd40ba8a19612ea64511d534ff5d99e7a1b266024232f983bcf39
+SHA512 (postgresql-16.0.tar.bz2.sha256) = 97bc69d8c0eee567059f32cea6af2a682009402a19941847ff73f73e9b98a7bc3605be7c5cec8489a6db852148a017ea36454c1eea751b88b204a2d69bc44ae5
+SHA512 (postgresql-15.3.tar.bz2) = cac97edeb40df1e8f2162f401b465751132929d7249495ef001e950645a2db46343bd732e7bd6504a7f795e25aea66724f2f4ab0065e3d9331b36db4b3a3bec6
+SHA512 (postgresql-15.3.tar.bz2.sha256) = 1c4874650352b8c61b24271d668e09fe64d7e3a961bb7fcf46a5cafe2d4daa8d7a25e2e0ff6fc49ad889c82be8fd03709ff1c032f87f943ba5feb5b3892c7b15
+SHA512 (postgresql-setup-8.9.tar.gz) = 9c9332136ada2e6152b70ec9688355158f819201526ee21521d9e65eba1caa32085260339b0aac1dddfeef0661d4ea8375838f0e39ca381f46af27cee6692a40