From 441e8036e36aba272928b5b87a775486f3eef5ae Mon Sep 17 00:00:00 2001
From: Pavel Kajaba <pkajaba@redhat.com>
Date: Wed, 2 Dec 2015 09:15:51 +0100
Subject: Move pg_upgrade to main package Removing files if certain packages
 are not included Does not work on F23 currently

---
 postgresql.spec | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/postgresql.spec b/postgresql.spec
index 12fc81e..a62f4f9 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -612,7 +612,10 @@ cd ..
 #   /builddir/.../...-9.4.1/README.rpm-dist: cpio: Bad magic
 cp $RPM_BUILD_ROOT/%{_pkgdocdir}/README.rpm-dist ./
 
-cat > $RPM_BUILD_ROOT%{_sysconfdir}/postgresql-setup/upgrade/postgresql.conf <<EOF
+# This creates config files for postgresql-setup to migrate dbs from various
+# versions to current one since data are not compatible with latest version
+# normal 9.2
+cat > $RPM_BUILD_ROOT%{_sysconfdir}/postgresql-setup/upgrade/postgresql92.conf <<EOF
 id              postgresql
 major           9.2
 data_default    /var/lib/pgsql/data
@@ -621,7 +624,8 @@ description     "Upgrade data from system PostgreSQL version (PostgreSQL 9.2)"
 redhat_sockets_hack yes
 EOF
 
-cat > $RPM_BUILD_ROOT%{_sysconfdir}/postgresql-setup/upgrade/postgresql92.conf <<EOF
+# collection 9.2
+cat > $RPM_BUILD_ROOT%{_sysconfdir}/postgresql-setup/upgrade/scl-postgresql92.conf <<EOF
 id              postgresql92-postgresql
 major           9.2
 data_default    /opt/rh/postgresql92/root/var/lib/pgsql/data
@@ -631,6 +635,27 @@ scls            "postgresql92"
 redhat_sockets_hack yes
 EOF
 
+# normal 9.4
+cat > $RPM_BUILD_ROOT%{_sysconfdir}/postgresql-setup/upgrade/postgresql94.conf <<EOF
+id              postgresql
+major           9.4
+data_default    /var/lib/pgsql/data
+engine          /usr/bin
+description     "Upgrade data from system PostgreSQL version (PostgreSQL 9.4)"
+redhat_sockets_hack yes
+EOF
+
+# collection 9.4
+cat > $RPM_BUILD_ROOT%{_sysconfdir}/postgresql-setup/upgrade/scl-postgresql94.conf <<EOF
+id              postgresql92-postgresql
+major           9.4
+data_default    /opt/rh/postgresql94/root/var/lib/pgsql/data
+engine          /opt/rh/postgresql94/root/usr/bin
+description     "Upgrade data from RHSCL 2.X PostgreSQL version (PostgreSQL 9.4)"
+scls            "postgresql94"
+redhat_sockets_hack yes
+EOF
+
 make DESTDIR=$RPM_BUILD_ROOT install-world
 
 %if %plpython3
-- 
cgit