New upstream release 9.6.14

Per release notes:
https://www.postgresql.org/docs/9.6/release-9-6-14.html

postgresql-external-libpq.patch

@@ -6,7 +6,7 @@ in sync!
 Related: rhbz#1618698
 
 diff --git a/src/Makefile b/src/Makefile
-index bcdbd95..4bea236 100644
+index 977f80b..3d3b679 100644
 --- a/src/Makefile
 +++ b/src/Makefile
 @@ -20,7 +20,6 @@ SUBDIRS = \
@@ -15,29 +15,26 @@ index bcdbd95..4bea236 100644
  	include \
 -	interfaces \
  	backend/replication/libpqwalreceiver \
- 	backend/replication/pgoutput \
  	fe_utils \
+ 	bin \
 diff --git a/src/Makefile.global.in b/src/Makefile.global.in
-index b9d86ac..29df69f 100644
+index 2d51c83..2e61f43 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.)
+@@ -465,7 +465,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
  
- # libpq_pgport is for use by client executables (not libraries) that use libpq.
+ # 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
-@@ -579,7 +579,6 @@ endif
+@@ -491,7 +491,6 @@ endif
  # Commonly used submake targets
  
- submake-libpq: | submake-generated-headers
+ submake-libpq:
 -	$(MAKE) -C $(libpq_builddir) all
  
- submake-libpgport: | submake-generated-headers
+ submake-libpgport:
  	$(MAKE) -C $(top_builddir)/src/port all
--- 
-2.21.0
-

postgresql-logging.patch

@@ -13,9 +13,9 @@ diff -Naur postgresql-9.1rc1.orig/src/backend/utils/misc/postgresql.conf.sample
  					# into log files. Required to be on for
  					# csvlogs.
  					# (change requires restart)
-@@ -355,11 +355,11 @@
+@@ -287,11 +287,11 @@
  # These are only used if logging_collector is on:
- #log_directory = 'log'			# directory where log files are written,
+ #log_directory = 'pg_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,
@@ -27,7 +27,7 @@ diff -Naur postgresql-9.1rc1.orig/src/backend/utils/misc/postgresql.conf.sample
  					# same name as the new log file will be
  					# truncated rather than appended to.
  					# But such truncation only occurs on
-@@ -367,9 +367,9 @@
+@@ -299,9 +299,9 @@
  					# or size-driven rotation.  Default is
  					# off, meaning append to existing files
  					# in all cases.

postgresql-server-pg_config.patch

@@ -7,7 +7,7 @@ that we'll have to fix only a minimal set of packages which really build
 PostgreSQL server modules.
 
 diff --git a/src/bin/pg_config/Makefile b/src/bin/pg_config/Makefile
-index 02e6f9d..f7c844f 100644
+index 26fbaad..b225695 100644
 --- a/src/bin/pg_config/Makefile
 +++ b/src/bin/pg_config/Makefile
 @@ -11,28 +11,30 @@
@@ -48,12 +48,12 @@ index 02e6f9d..f7c844f 100644
  
  check:
 diff --git a/src/bin/pg_config/nls.mk b/src/bin/pg_config/nls.mk
-index 1d41f90..0f34f37 100644
+index 720efa2..970671b 100644
 --- a/src/bin/pg_config/nls.mk
 +++ b/src/bin/pg_config/nls.mk
 @@ -1,4 +1,4 @@
  # src/bin/pg_config/nls.mk
 -CATALOG_NAME     = pg_config
 +CATALOG_NAME     = pg_server_config
- AVAIL_LANGUAGES  = cs de es fr he it ja ko pl pt_BR ro ru sv tr uk vi zh_CN zh_TW
+ AVAIL_LANGUAGES  = cs de es fr it ja ko nb pl pt_BR ro ru sv ta tr zh_CN zh_TW
  GETTEXT_FILES    = pg_config.c ../../common/config_info.c ../../common/exec.c

postgresql.spec

@@ -32,14 +32,12 @@
 %{!?beta:%global beta 0}
 
 %{!?test:%global test 1}
-%{!?llvmjit:%global llvmjit 1}
 %{!?upgrade:%global upgrade 1}
 %{!?plpython:%global plpython 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}
@@ -57,30 +55,35 @@
 # https://fedoraproject.org/wiki/Packaging:Guidelines#Packaging_of_Additional_RPM_Macros
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
+%if 0%{?fedora} > 29
+%global external_libs 1
+%endif
+
 Summary: PostgreSQL client programs
 Name: postgresql
-%global majorversion 12
-Version: %{majorversion}.2
-Release: 2%{?dist}
+%global majorversion 9.6
+Version: 9.6.14
+%{?dirty_hack_epoch}
+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
+Group: Applications/Databases
 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 prevversion 11.7
-%global prevmajorversion 11
+%global prevversion 9.5.18
+%global prevmajorversion 9.5
 %global prev_prefix %{_libdir}/pgsql/postgresql-%{prevmajorversion}
 %global precise_version %{?epoch:%epoch:}%version-%release
 
 %global setup_version 8.4
 
 %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
 Source1: postgresql-%{version}-US.pdf
@@ -113,14 +116,13 @@ Patch9: postgresql-server-pg_config.patch
 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
-BuildRequires: libpq-devel >= %version
+BuildRequires: libpq-devel
 
 # postgresql-setup build requires
 BuildRequires: m4 elinks docbook-utils help2man
@@ -173,8 +175,9 @@ BuildRequires: systemtap-sdt-devel
 BuildRequires: libselinux-devel
 %endif
 
-%if %icu
-BuildRequires:	libicu-devel
+%if ! 0%{?external_libs}
+# main package requires -libs subpackage
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 %endif
 
 # https://bugzilla.redhat.com/1464368
@@ -190,16 +193,34 @@ over a network connection.  The PostgreSQL server can be found in the
 postgresql-server sub-package.
 
 
+%if ! 0%{?external_libs}
+%package libs
+Summary: The shared libraries required for any PostgreSQL clients
+Group: Applications/Databases
+Provides: libpq.so = %{version}-%{release}
+# for /sbin/ldconfig
+Requires(post): glibc
+Requires(postun): glibc
+
+%description libs
+The postgresql-libs package provides the essential shared libraries for any
+PostgreSQL client program or interface. You will need to install this package
+to use any other PostgreSQL package or any clients that need to connect to a
+PostgreSQL server.
+%endif
+
 %package server
 Summary: The programs needed to create and run a PostgreSQL server
+Group: Applications/Databases
 Requires: %{name}%{?_isa} = %precise_version
+%{!?external_libs:Requires: %{name}-libs%{?_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-)devel and require
 # postgresql-server(:MODULE_COMPAT_%%{postgresql_major}).
 # This will automatically guard against incompatible server & plugin
 # installation (#1008939, #1007840)
@@ -215,6 +236,7 @@ and maintain PostgreSQL databases.
 
 %package docs
 Summary: Extra documentation for PostgreSQL
+Group: Applications/Databases
 Requires: %{name}%{?_isa} = %precise_version
 # Just for more intuitive documentation installation
 Provides: %{name}-doc = %precise_version
@@ -227,33 +249,28 @@ and source files for the PostgreSQL tutorial.
 
 %package contrib
 Summary: Extension modules distributed with PostgreSQL
+Group: Applications/Databases
 Requires: %{name}%{?_isa} = %precise_version
+%{!?external_libs:Requires: %{name}-libs%{?_isa} = %precise_version}
 
 %description contrib
 The postgresql-contrib package contains various extension modules that are
 included in the PostgreSQL distribution.
 
 
-%package server-devel
+%package %{?external_libs: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
+Group: Development/Libraries
+%{!?external_libs:Requires: %{name}-libs%{?_isa} = %precise_version}
+
+%description %{?external_libs:server-}devel
+Package contains the header files and configuration needed to compile PostgreSQL
+server extension.
 
-%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
@@ -262,7 +279,7 @@ 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
+Requires: %{name}-%{?external_libs:server-}devel%{?_isa} = %precise_version
 
 %description static
 Statically linked PostgreSQL libraries that do not have dynamically linked
@@ -272,7 +289,9 @@ counterparts.
 %if %upgrade
 %package upgrade
 Summary: Support for upgrading from the previous major release of PostgreSQL
+Group: Applications/Databases
 Requires: %{name}-server%{?_isa} = %precise_version
+%{!?external_libs:Requires: %{name}-libs%{?_isa} = %precise_version}
 Provides: bundled(postgresql-server) = %prevversion
 
 %description upgrade
@@ -283,6 +302,7 @@ version of PostgreSQL.
 
 %package upgrade-devel
 Summary: Support for build of extensions required for upgrade process
+Group: Development/Libraries
 Requires: %{name}-upgrade%{?_isa} = %precise_version
 
 %description upgrade-devel
@@ -295,6 +315,7 @@ process.
 %if %plperl
 %package plperl
 Summary: The Perl procedural language for PostgreSQL
+Group: Applications/Databases
 Requires: %{name}-server%{?_isa} = %precise_version
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 %if %runselftest
@@ -311,6 +332,7 @@ Install this if you want to write database functions in Perl.
 %if %plpython
 %package plpython
 Summary: The Python2 procedural language for PostgreSQL
+Group: Applications/Databases
 Requires: %{name}-server%{?_isa} = %precise_version
 Provides: %{name}-plpython2 = %precise_version
 
@@ -324,6 +346,7 @@ Install this if you want to write database functions in Python 2.
 %if %plpython3
 %package plpython3
 Summary: The Python3 procedural language for PostgreSQL
+Group: Applications/Databases
 Requires: %{name}-server%{?_isa} = %precise_version
 
 %description plpython3
@@ -336,6 +359,7 @@ Install this if you want to write database functions in Python 3.
 %if %pltcl
 %package pltcl
 Summary: The Tcl procedural language for PostgreSQL
+Group: Applications/Databases
 Requires: %{name}-server%{?_isa} = %precise_version
 
 %description pltcl
@@ -348,8 +372,9 @@ Install this if you want to write database functions in Tcl.
 %if %test
 %package test
 Summary: The test suite distributed with PostgreSQL
+Group: Applications/Databases
 Requires: %{name}-server%{?_isa} = %precise_version
-Requires: %{name}-server-devel%{?_isa} = %precise_version
+Requires: %{name}-%{?external_libs:server-}devel%{?_isa} = %precise_version
 
 %description test
 The postgresql-test package contains files needed for various tests for the
@@ -357,30 +382,6 @@ 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}
-
-%ifarch ppc64 ppc64le
-AutoReq:	0
-Requires:	advance-toolchain-%{atstring}-runtime
-%endif
-
-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
 (
@@ -390,13 +391,15 @@ goal of accelerating analytics queries.
   sha256sum -c %{SOURCE17}
 %endif
 )
-%setup -q -a 12 -n postgresql-%{version}
+%setup -q -a 12
 %patch1 -p1
 %patch2 -p1
 %patch5 -p1
 %patch6 -p1
+%if 0%{?external_libs}
 %patch8 -p1
 %patch9 -p1
+%endif
 
 # We used to run autoconf here, but there's no longer any real need to,
 # since Postgres ships with a reasonably modern configure script.
@@ -497,12 +500,6 @@ common_configure_options='
 	--with-system-tzdata=%_datadir/zoneinfo
 	--datadir=%_datadir/pgsql
 	--with-systemd
-%if %icu
-	--with-icu
-%endif
-%if %llvmjit
-	--with-llvm
-%endif
 '
 
 %if %plpython3
@@ -517,7 +514,6 @@ export PYTHON=/usr/bin/python3
 %global python_subdirs       \\\
 	src/pl/plpython          \\\
 	contrib/hstore_plpython  \\\
-	contrib/jsonb_plpython   \\\
 	contrib/ltree_plpython
 
 for dir in %python_subdirs; do
@@ -648,9 +644,6 @@ upgrade_configure ()
 		--enable-debug \
 		--enable-cassert \
 %endif
-%if %icu
-		--with-icu \
-%endif
 %if %plperl
 		--with-perl \
 %endif
@@ -665,6 +658,9 @@ upgrade_configure ()
 %if %plpython3
 	export PYTHON=/usr/bin/python3
 	upgrade_configure --with-python
+
+	%make_build -C src/backend submake-errcodes
+
 	for dir in %python_subdirs; do
 		# Previous version doesn't necessarily have this.
 		test -d "$dir" || continue
@@ -709,12 +705,14 @@ EOF
 
 make DESTDIR=$RPM_BUILD_ROOT install-world
 
+%if 0%{?external_libs}
 # We ship pg_config through libpq-devel
 mv $RPM_BUILD_ROOT/%_mandir/man1/pg_{,server_}config.1
 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/
+%endif
 
 %if %plpython3
 	mv src/Makefile.global src/Makefile.global.save
@@ -732,6 +730,11 @@ install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/pgsql/extension
 
 # multilib header hack
 for header in \
+%if ! 0%{?external_libs}
+	%{_includedir}/pg_config.h \
+	%{_includedir}/pg_config_ext.h \
+	%{_includedir}/ecpg_config.h \
+%endif
 	%{_includedir}/pgsql/server/pg_config.h \
 	%{_includedir}/pgsql/server/pg_config_ext.h
 do
@@ -762,7 +765,7 @@ 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
+%{?external_libs:rm $RPM_BUILD_ROOT/%{_datadir}/man/man1/ecpg.1}
 
 %if %upgrade
 	pushd postgresql-%{prevversion}
@@ -780,8 +783,10 @@ rm $RPM_BUILD_ROOT/%{_datadir}/man/man1/ecpg.1
 	pushd $RPM_BUILD_ROOT%{_libdir}/pgsql/postgresql-%{prevmajorversion}
 	rm bin/clusterdb
 	rm bin/createdb
+	rm bin/createlang
 	rm bin/createuser
 	rm bin/dropdb
+	rm bin/droplang
 	rm bin/dropuser
 	rm bin/ecpg
 	rm bin/initdb
@@ -789,7 +794,6 @@ rm $RPM_BUILD_ROOT/%{_datadir}/man/man1/ecpg.1
 	rm bin/pg_dump
 	rm bin/pg_dumpall
 	rm bin/pg_restore
-	rm bin/pgbench
 	rm bin/psql
 	rm bin/reindexdb
 	rm bin/vacuumdb
@@ -841,7 +845,11 @@ mv $RPM_BUILD_ROOT%{_docdir}/pgsql/html doc
 rm -rf $RPM_BUILD_ROOT%{_docdir}/pgsql
 
 # remove files not to be packaged
+%if 0%{?external_libs}
 rm $RPM_BUILD_ROOT%{_libdir}/libpgfeutils.a
+%else
+rm $RPM_BUILD_ROOT%{_libdir}/lib{ecpg,pq,ecpg_compat,pgfeutils,pgtypes}.a
+%endif
 
 %if !%plperl
 rm -f $RPM_BUILD_ROOT%{_bindir}/pgsql/hstore_plperl.so
@@ -861,14 +869,12 @@ find_lang_bins ()
 		cat "$binary"-%{majorversion}.lang >>"$lstfile"
 	done
 }
-find_lang_bins devel.lst pg_server_config
+find_lang_bins devel.lst %{?external_libs:pg_server_config}%{?!external_libs:pg_config ecpg}
+%{!?external_libs:find_lang_bins libs.lst ecpglib6 libpq5}
 find_lang_bins server.lst \
-	initdb pg_basebackup pg_controldata pg_ctl pg_resetwal pg_rewind plpgsql \
-	postgres pg_checksums
-find_lang_bins contrib.lst \
-	pg_archivecleanup pg_test_fsync pg_test_timing pg_waldump
+	initdb pg_basebackup pg_controldata pg_ctl pg_resetxlog pg_rewind plpgsql postgres
 find_lang_bins main.lst \
-	pg_dump pg_upgrade pgscripts psql
+	pg_dump pgscripts psql
 %if %plperl
 find_lang_bins plperl.lst plperl
 %endif
@@ -906,15 +912,21 @@ find_lang_bins pltcl.lst pltcl
 make -C postgresql-setup-%{setup_version} check
 %endif
 
+
+%clean
+
+
 # FILES sections.
 %files -f main.lst
 %doc doc/KNOWN_BUGS doc/MISSING_FEATURES doc/TODO
-%doc COPYRIGHT README HISTORY
+%doc COPYRIGHT README HISTORY doc/bug.template
 %doc README.rpm-dist
 %{_bindir}/clusterdb
 %{_bindir}/createdb
+%{_bindir}/createlang
 %{_bindir}/createuser
 %{_bindir}/dropdb
+%{_bindir}/droplang
 %{_bindir}/dropuser
 %{_bindir}/pg_dump
 %{_bindir}/pg_dumpall
@@ -926,8 +938,10 @@ make -C postgresql-setup-%{setup_version} check
 %{_bindir}/vacuumdb
 %{_mandir}/man1/clusterdb.*
 %{_mandir}/man1/createdb.*
+%{_mandir}/man1/createlang.*
 %{_mandir}/man1/createuser.*
 %{_mandir}/man1/dropdb.*
+%{_mandir}/man1/droplang.*
 %{_mandir}/man1/dropuser.*
 %{_mandir}/man1/pg_dump.*
 %{_mandir}/man1/pg_dumpall.*
@@ -938,11 +952,6 @@ make -C postgresql-setup-%{setup_version} check
 %{_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
 
 
 %files docs
@@ -951,22 +960,22 @@ make -C postgresql-setup-%{setup_version} check
 %{_libdir}/pgsql/tutorial/
 
 
-%files contrib -f contrib.lst
+%files contrib
 %doc contrib/spi/*.example
 %{_bindir}/oid2name
 %{_bindir}/pg_archivecleanup
 %{_bindir}/pg_standby
 %{_bindir}/pg_test_fsync
 %{_bindir}/pg_test_timing
-%{_bindir}/pg_waldump
+%{_bindir}/pg_xlogdump
 %{_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/chkpass*
 %{_datadir}/pgsql/extension/citext*
 %{_datadir}/pgsql/extension/cube*
 %{_datadir}/pgsql/extension/dblink*
@@ -980,16 +989,6 @@ make -C postgresql-setup-%{setup_version} check
 %{_datadir}/pgsql/extension/intagg*
 %{_datadir}/pgsql/extension/intarray*
 %{_datadir}/pgsql/extension/isn*
-%if %{plperl}
-%{_datadir}/pgsql/extension/jsonb_plperl*
-%endif
-%if %{plpython}
-%{_datadir}/pgsql/extension/jsonb_plpythonu*
-%{_datadir}/pgsql/extension/jsonb_plpython2u*
-%endif
-%if %{plpython3}
-%{_datadir}/pgsql/extension/jsonb_plpython3u*
-%endif
 %{_datadir}/pgsql/extension/lo*
 %{_datadir}/pgsql/extension/ltree*
 %{_datadir}/pgsql/extension/moddatetime*
@@ -1008,18 +1007,20 @@ make -C postgresql-setup-%{setup_version} check
 %{_datadir}/pgsql/extension/seg*
 %{_datadir}/pgsql/extension/tablefunc*
 %{_datadir}/pgsql/extension/tcn*
+%{_datadir}/pgsql/extension/timetravel*
+%{_datadir}/pgsql/extension/tsearch2*
 %{_datadir}/pgsql/extension/tsm_system_rows*
 %{_datadir}/pgsql/extension/tsm_system_time*
 %{_datadir}/pgsql/extension/unaccent*
 %{_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/chkpass.so
 %{_libdir}/pgsql/citext.so
 %{_libdir}/pgsql/cube.so
 %{_libdir}/pgsql/dblink.so
@@ -1040,15 +1041,6 @@ make -C postgresql-setup-%{setup_version} check
 %endif
 %{_libdir}/pgsql/insert_username.so
 %{_libdir}/pgsql/isn.so
-%if %plperl
-%{_libdir}/pgsql/jsonb_plperl.so
-%endif
-%if %plpython
-%{_libdir}/pgsql/jsonb_plpython2.so
-%endif
-%if %plpython3
-%{_libdir}/pgsql/jsonb_plpython3.so
-%endif
 %{_libdir}/pgsql/lo.so
 %{_libdir}/pgsql/ltree.so
 %if %plpython
@@ -1074,6 +1066,8 @@ make -C postgresql-setup-%{setup_version} check
 %{_libdir}/pgsql/tablefunc.so
 %{_libdir}/pgsql/tcn.so
 %{_libdir}/pgsql/test_decoding.so
+%{_libdir}/pgsql/timetravel.so
+%{_libdir}/pgsql/tsearch2.so
 %{_libdir}/pgsql/tsm_system_rows.so
 %{_libdir}/pgsql/tsm_system_time.so
 %{_libdir}/pgsql/unaccent.so
@@ -1083,7 +1077,7 @@ make -C postgresql-setup-%{setup_version} check
 %{_mandir}/man1/pg_standby.*
 %{_mandir}/man1/pg_test_fsync.*
 %{_mandir}/man1/pg_test_timing.*
-%{_mandir}/man1/pg_waldump.*
+%{_mandir}/man1/pg_xlogdump.*
 %{_mandir}/man1/pgbench.*
 %{_mandir}/man1/vacuumlo.*
 %{_mandir}/man3/dblink*
@@ -1104,22 +1098,32 @@ make -C postgresql-setup-%{setup_version} check
 %{_libdir}/pgsql/pgxml.so
 %endif
 
+%if ! 0%{?external_libs}
+%files libs -f libs.lst
+%doc COPYRIGHT
+%dir %{_libdir}/pgsql
+%{_libdir}/libecpg.so.*
+%{_libdir}/libecpg_compat.so.*
+%{_libdir}/libpgtypes.so.*
+%{_libdir}/libpq.so.*
+%endif
+
 %files server -f server.lst
 %{_bindir}/initdb
 %{_bindir}/pg_basebackup
 %{_bindir}/pg_controldata
 %{_bindir}/pg_ctl
-%{_bindir}/pg_receivewal
+%{_bindir}/pg_receivexlog
 %{_bindir}/pg_recvlogical
-%{_bindir}/pg_resetwal
+%{_bindir}/pg_resetxlog
 %{_bindir}/pg_rewind
-%{_bindir}/pg_checksums
 %{_bindir}/postgres
 %{_bindir}/postgresql-setup
 %{_bindir}/postmaster
 %dir %{_datadir}/pgsql
 %{_datadir}/pgsql/*.sample
 %dir %{_datadir}/pgsql/contrib
+%{_datadir}/pgsql/conversion_create.sql
 %dir %{_datadir}/pgsql/extension
 %{_datadir}/pgsql/extension/plpgsql*
 %{_datadir}/pgsql/information_schema.sql
@@ -1133,13 +1137,11 @@ make -C postgresql-setup-%{setup_version} check
 %{_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/*
@@ -1151,10 +1153,9 @@ make -C postgresql-setup-%{setup_version} check
 %{_mandir}/man1/pg_basebackup.*
 %{_mandir}/man1/pg_controldata.*
 %{_mandir}/man1/pg_ctl.*
-%{_mandir}/man1/pg_receivewal.*
-%{_mandir}/man1/pg_resetwal.*
+%{_mandir}/man1/pg_receivexlog.*
+%{_mandir}/man1/pg_resetxlog.*
 %{_mandir}/man1/pg_rewind.*
-%{_mandir}/man1/pg_checksums.*
 %{_mandir}/man1/postgres.*
 %{_mandir}/man1/postgresql-new-systemd-unit.*
 %{_mandir}/man1/postgresql-setup.*
@@ -1172,14 +1173,27 @@ make -C postgresql-setup-%{setup_version} check
 %endif
 
 
+%if 0%{?external_libs}
 %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.*
+%else
+%files devel -f devel.lst
+%{_bindir}/ecpg
+%{_bindir}/pg_config
+%{_includedir}/*
+%{_libdir}/libecpg.so
+%{_libdir}/libecpg_compat.so
+%{_libdir}/libpgtypes.so
+%{_libdir}/libpq.so
+%{_libdir}/pgsql/pgxs/
+%{_libdir}/pkgconfig/*.pc
+%{_mandir}/man1/ecpg.*
+%{_mandir}/man1/pg_config.*
+%endif
 %{_mandir}/man3/SPI_*
 %{macrosdir}/macros.%name
 
@@ -1192,8 +1206,6 @@ make -C postgresql-setup-%{setup_version} check
 %files static
 %{_libdir}/libpgcommon.a
 %{_libdir}/libpgport.a
-%{_libdir}/libpgcommon_shlib.a
-%{_libdir}/libpgport_shlib.a
 
 
 %if %upgrade
@@ -1214,13 +1226,6 @@ make -C postgresql-setup-%{setup_version} check
 %{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
@@ -1231,7 +1236,11 @@ make -C postgresql-setup-%{setup_version} check
 
 %if %pltcl
 %files pltcl -f pltcl.lst
+%{_bindir}/pltcl_delmod
+%{_bindir}/pltcl_listmod
+%{_bindir}/pltcl_loadmod
 %{_datadir}/pgsql/extension/pltcl*
+%{_datadir}/pgsql/unknown.pltcl
 %{_libdir}/pgsql/pltcl.so
 %endif
 
@@ -1258,195 +1267,37 @@ make -C postgresql-setup-%{setup_version} check
 
 
 %changelog
-* Thu Mar 12 2020 Patrik Novotný <panovotn@redhat.com> - 12.2-2
-- Fix requirements for JIT in postgresql-server-devel
-- Fix build issues regarding new perl update
+* Thu Jul 11 2019 Petr Kubat <pkubat@redhat.com> - 9.6.14-1
+- Rebase to upstream release 9.6.14
+  https://www.postgresql.org/docs/9.6/release-9-6-14.html
 
-* Fri Feb 14 2020 Patrik Novotný <panovotn@redhat.com> - 12.2-1
-- Rebase to upstream release 12.2
+* Thu May 09 2019 Patrik Novotný <panovotn@redhat.com> - 9.6.13-1
+- New postgresql-setup 8.4
+- Rebase to upstream release 9.6.13
+  https://www.postgresql.org/docs/9.6/release-9-6-13.html
 
-* Tue Feb 11 2020 Patrik Novotný <panovotn@redhat.com> - 12.1-1
-- Rebase to upstream release 12.1
+* Thu Feb 14 2019 Patrik Novotný <panovotn@redhat.com> - 9.6.12-1
+- Rebase to upstream release 9.6.12
+  https://www.postgresql.org/docs/9.6/release-9-6-12.html
 
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 11.6-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+* Wed Jan 09 2019 Pavel Raiskup <praiskup@redhat.com> - 9.6.11-1
+- initial commit for 9.6 stream, intherit from stream-postgresql-10 branch
 
-* Mon Nov 25 2019 Patrik Novotný <panovotn@redhat.com> - 11.6-1
-- Rebase to upstream version 11.6
+* Thu Mar 01 2018 Pavel Raiskup <praiskup@redhat.com> - 9.6.8-1
+- update to 9.6.8 per release notes:
+  https://www.postgresql.org/docs/9.6/static/release-9-6-8.html
 
-* Fri Nov 01 2019 Pete Walter <pwalter@fedoraproject.org> - 11.5-6
-- Rebuild for ICU 65
+* Thu Feb 08 2018 Petr Kubat <pkubat@redhat.com> - 9.6.7-1
+- update to 9.6.7 per release notes:
+  https://www.postgresql.org/docs/9.6/static/release-9-6-7.html
 
-* Thu Sep 05 2019 Patrik Novotný <panovotn@redhat.com> - 11.5-5
-- postgresql-server-devel requires krb5-devel
+* Wed Nov 08 2017 Pavel Raiskup <praiskup@redhat.com> - 9.6.6-1
+- update to 9.6.6 per release notes:
+  https://www.postgresql.org/docs/9.6/static/release-9-6-6.html
 
-* Tue Sep 03 2019 Patrik Novotný <panovotn@redhat.com> - 11.5-4
-- Add explicit obsoletes to plpython2 package
-
-* Mon Sep 02 2019 Patrik Novotný <panovotn@redhat.com> - 11.5-3
-- Rename plpython to plpython2 and provide plpython virtually.
-
-* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 11.5-2
-- Rebuilt for Python 3.8
-
-* Wed Aug 07 2019 Petr Kubat <pkubat@redhat.com> - 11.5-1
-- New upstream version 11.5
-  https://www.postgresql.org/docs/11/release-11-5.html
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 11.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Tue Jul 09 2019 Petr Kubat <pkubat@redhat.com> - 11.4-1
-- New upstream version 11.4
-  https://www.postgresql.org/docs/11/release-11-4.html
-
-* Fri May 31 2019 Jitka Plesnikova <jplesnik@redhat.com> - 11.3-2
-- Perl 5.30 rebuild
-
-* Thu May 09 2019 Patrik Novotný <panovotn@redhat.com> - 11.3-1
-- Rebase to upstream release 11.3
-  https://www.postgresql.org/docs/11/release-11-3.html
-
-* Tue Mar 05 2019 Pavel Raiskup <praiskup@redhat.com> - 11.2-3
-- update postgresql-setup to 8.4 (related to rhbz#1668301)
-
-* Sun Feb 17 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 11.2-2
-- Rebuild for readline 8.0
-
-* Thu Feb 14 2019 Patrik Novotný <panovotn@redhat.com> - 11.2-1
-- Rebase to upstream release 11.2
-
-* Thu Feb 14 2019 Pavel Raiskup <praiskup@redhat.com> - 11.1-5
-- protect against building server against older libpq library
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 11.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Tue Jan 22 2019 Pavel Raiskup <praiskup@redhat.com> - 11.1-3
-- build with ICU support, to provide more opt-in collations
-
-* Mon Jan 14 2019 Björn Esser <besser82@fedoraproject.org> - 11.1-2
-- Rebuilt for libcrypt.so.2 (#1666033)
-
-* Wed Nov 07 2018 Patrik Novotný <panovotn@redhat.com> - 11.1-1
-- Rebase to upstream release 11.1
-  https://www.postgresql.org/docs/11/release-11-1.html
-
-* Fri Oct 26 2018 Pavel Raiskup <praiskup@redhat.com> - 11.0-2
-- build also contrib *plpython3 modules
-
-* Tue Oct 16 2018 Pavel Raiskup <praiskup@redhat.com> - 11.0-1
-- new upstream release, per release notes:
-  https://www.postgresql.org/docs/11/static/release-11.html
-
-* Wed Sep 05 2018 Pavel Raiskup <praiskup@redhat.com> - 10.5-4
-- build without postgresql-libs; libraries moved to libpq and libecpg
-
-* Mon Aug 27 2018 Pavel Raiskup <praiskup@redhat.com> - 10.5-3
-- devel subpackage provides postgresql-server-devel and libecpg-devel
-  (first step for rhbz#1618698)
-
-* Mon Aug 27 2018 Pavel Raiskup <praiskup@redhat.com> - 10.5-2
-- packaging cleanup
-- devel subpackage to provide libpq-devel (first step for rhbz#1618698)
-
-* Wed Aug 08 2018 Pavel Raiskup <praiskup@redhat.com> - 10.5-1
-- update to 10.5 per release notes:
-  https://www.postgresql.org/docs/10/static/release-10-5.html
-
-* Thu Aug 02 2018 Pavel Raiskup <praiskup@redhat.com> - 10.4-8
-- new postgresql-setup, the %%postgresql_tests* macros now start
-  the build-time server on random port number
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 10.4-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Thu Jul 12 2018 Pavel Raiskup <praiskup@redhat.com> - 10.4-6
-- drop ppc64 patch, gcc is already fixed (rhbz#1544349)
-- move pg_config*.mo files into devel subpackage
-
-* Mon Jul 09 2018 Pavel Raiskup <praiskup@redhat.com> - 10.4-5
-- re-enable -O3 for 64bit PPC boxes
-- explicitly set PYTHON=python2, /bin/python doesn't exist fc29+
-
-* Tue Jul 03 2018 Petr Pisar <ppisar@redhat.com> - 10.4-4
-- Perl 5.28 rebuild
-
-* Wed Jun 27 2018 Jitka Plesnikova <jplesnik@redhat.com> - 10.4-3
-- Perl 5.28 rebuild
-
-* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 10.4-2
-- Rebuilt for Python 3.7
-
-* Wed May 09 2018 Pavel Raiskup <praiskup@redhat.com> - 10.4-1
-- update to 10.4 per release notes:
-  https://www.postgresql.org/docs/10/static/release-10-4.html
-
-* Thu Apr 26 2018 Pavel Raiskup <praiskup@redhat.com> - 10.3-5
-- pltcl: drop tcl-pltcl dependency (rhbz#1571181)
-
-* Thu Apr 19 2018 Pavel Raiskup <praiskup@redhat.com> - 10.3-4
-- upgrade: package plpython*.so modules
-
-* Mon Apr 16 2018 Pavel Raiskup <praiskup@redhat.com> - 10.3-3
-- upgrade: package plperl.so and pltcl.so
-- upgrade: package contrib modules
-- upgrade: drop dynamic libraries
-
-* Fri Apr 13 2018 Pavel Raiskup <praiskup@redhat.com> - 10.3-2
-- define %%precise_version helper macro
-- drop explicit libpq.so provide from *-libs
-- update postgresql-setup tarball
-- add postgresql-test-rpm-macros package
-
-* Thu Mar 01 2018 Pavel Raiskup <praiskup@redhat.com> - 10.3-1
-- update to 10.3 per release notes:
-  https://www.postgresql.org/docs/10/static/release-10-3.html
-
-* Thu Feb 08 2018 Petr Kubat <pkubat@redhat.com> - 10.2-1
-- update to 10.2 per release notes:
-  https://www.postgresql.org/docs/10/static/release-10-2.html
-
-* Sat Jan 20 2018 Björn Esser <besser82@fedoraproject.org> - 10.1-5
-- Rebuilt for switch to libxcrypt
-
-* Tue Dec 19 2017 Pavel Raiskup <praiskup@redhat.com> - 10.1-4
-- configure with --with-systemd (rhbz#1414314)
-- disable startup timeout of PostgreSQL service (rhbz#1525477)
-
-* Wed Dec 13 2017 Pavel Raiskup <praiskup@redhat.com> - 10.1-3
-- unify %%configure options for python2/python3 configure
-- drop --with-krb5 option, not supported since PostgreSQL 9.4
-- python packaging - requires/provides s/python/python2/
-
-* Tue Nov 14 2017 Pavel Raiskup <praiskup@redhat.com> - 10.1-2
-- postgresql-setup v7.0
-
-* Wed Nov 08 2017 Pavel Raiskup <praiskup@redhat.com> - 10.1-1
-- update to 10.1 per release notes:
-  https://www.postgresql.org/docs/10/static/release-10-1.html
-
-* Mon Nov 06 2017 Pavel Raiskup <praiskup@redhat.com> - 10.0-4
+* Wed Nov 08 2017 Pavel Raiskup <praiskup@redhat.com> - 9.6.5-2
 - rebase to new postgresql-setup 6.0 version, to fix CVE-2017-15097
 
-* Thu Oct 12 2017 Pavel Raiskup <praiskup@redhat.com> - 10.0-3
-- confess that we bundle setup scripts and previous version of ourseleves
-- provide %%postgresql_upgrade_prefix macro
-
-* Mon Oct 09 2017 Pavel Raiskup <praiskup@redhat.com> - 10.0-2
-- stricter separation of files in upgrade/upgrade-devel
-
-* Mon Oct 09 2017 Jozef Mlich <jmlich@redhat.com> - 10.0-2
-- support for upgrade with extenstions
-  i.e the postgresql-upgrade-devel subpackage was added (rhbz#1475177)
-
-* Fri Oct 06 2017 Pavel Raiskup <praiskup@redhat.com> - 10.0-1
-- update to 10.0 per release notes:
-  https://www.postgresql.org/docs/10/static/release-10.html
-
-* Tue Sep 05 2017 Pavel Raiskup <praiskup@redhat.com> - 9.6.5-2
-- move %%_libdir/pgsql into *-libs subpackage
-
 * Tue Aug 29 2017 Pavel Raiskup <praiskup@redhat.com> - 9.6.5-1
 - update to 9.6.5 per release notes:
   https://www.postgresql.org/docs/9.6/static/release-9-6-5.html

sources

@@ -1,6 +1,6 @@
-SHA512 (postgresql-12.2.tar.bz2) = 0e0ce8e21856e8f43e58b840c10c4e3ffae6d5207e0d778e9176e36f8e20e34633cbb06f0030a7c963c3491bb7e941456d91b55444c561cfc6f283fba76f33ee
-SHA512 (postgresql-12.2.tar.bz2.sha256) = 8f94163228bb7d854d6fe4924a8a2ded00f90af662dd4a7c39b415be0826d9395e55f9b8e3b472baf7c19550e7c35198a650604a28756ad85d096bcfbaa5d1fd
-SHA512 (postgresql-12.2-US.pdf) = f086fead2c094e0f1148bcadaf13e240a84b53be289aa0a323295f65879699e81041b4bbc6cc3ce2744aac3fcb15083fa1cab583cd86fdc8ef626499e3cb3e71
-SHA512 (postgresql-11.7.tar.bz2) = 32c7ace228f9895241ce0d925fbfc60c0cd39f4cd35368fb10dc7db046151ffd59a9895b4c30a529627f0103051e84b4992ed60312cccd292489f3037076ca1e
-SHA512 (postgresql-11.7.tar.bz2.sha256) = 1c8bc319da6bc49000f14e4636f4410b3eb52ab41b0698e7f3ee945efe8e93b6f1758e3f60d8658b0ea6836ea0f271a61031554a10e64c61d2c670e97c63812c
+SHA512 (postgresql-9.5.18.tar.bz2) = 0487ac2891c800de045135d4b153659ec10c28750a09e0b87343f8e7145a11f1783ed0b6ca60829776faae1430c8050cc7661c780f171f1b2621f1673a32e6d1
+SHA512 (postgresql-9.5.18.tar.bz2.sha256) = 3e1f800900f431102e9bf2143677207bab6bb42e8980155a0ced3bfe2510b020b4bea6a44cf3de00dbb07e42a3c98e19b4e2e783353d6c7f5fa82a581d12144f
+SHA512 (postgresql-9.6.14.tar.bz2) = dccc183a6992ef4ece4ef5c638339708ab484e571ecd66ed993c9071cd55f250b4277fd3367f9a5ee545aa83e29dc5f7a239200e200e3314d5acc847f35e790c
+SHA512 (postgresql-9.6.14.tar.bz2.sha256) = cf52b62d79623f8284509a02aece811e3a55e8275328a5379720f48a4cf7776215264c594579d429a9bd32d723a1e80af070c52705930dbde524c28ae3854c8a
 SHA512 (postgresql-setup-8.4.tar.gz) = eb73767d5c676481598aeb545e15027a29a438aa29480ad414f6af31c9df61138a51f5425999b4b35e776a3dbbb28c887790ea9771abc3328158dd1d34b1dce1
+SHA512 (postgresql-9.6.14-US.pdf) = b8c663004f7fd331adbc20e0ed4717d957062771c07df72c376dcab9b44f193444b1096fec8d50b78e5385caf9fa35835c04c570a4337cb3791f2939cc3b4b29

tests/tests.yml

@@ -1,16 +0,0 @@
-# This package uses external repositories for maintaining CI test cases.
-# Please don't edit this file if possible.
-
-- hosts: localhost
-  roles:
-  - role: standard-test-beakerlib
-    repositories:
-    - repo: https://src.fedoraproject.org/tests/postgresql.git
-      dest: postgresql
-      # TODO: minimize: https://pagure.io/standard-test-roles/issue/294
-      fmf_filter: "tier: 1"
-    # TODO: minimize: https://pagure.io/standard-test-roles/issue/294
-    tags:
-    - classic
-    - container
-    - atomic