From fc60840c84fae1d5c0e4d0980972032c86b8cfbf Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jul 05 2017 05:07:59 +0000
Subject: import rh-postgresql95-postgresql-9.5.7-2.el7


---

diff --git a/.gitignore b/.gitignore
index 306f5a9..bde4c3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-SOURCES/postgresql-9.5.4-US.pdf
-SOURCES/postgresql-9.5.4.tar.bz2
+SOURCES/postgresql-9.5.7-US.pdf
+SOURCES/postgresql-9.5.7.tar.bz2
 SOURCES/postgresql-setup-4.0.tar.gz
diff --git a/.rh-postgresql95-postgresql.metadata b/.rh-postgresql95-postgresql.metadata
index 7abe8cb..50bb040 100644
--- a/.rh-postgresql95-postgresql.metadata
+++ b/.rh-postgresql95-postgresql.metadata
@@ -1,3 +1,3 @@
-bd7640960061aa036e55db006662984acc94c6b0 SOURCES/postgresql-9.5.4-US.pdf
-bdbbecf691354a689c599631256d41eaa8824c66 SOURCES/postgresql-9.5.4.tar.bz2
+bec2a4c65c57aa53efb858e9e3cf196f1663fecb SOURCES/postgresql-9.5.7-US.pdf
+3bb9675025cf1c2a5722f45a0fc8d0891669e094 SOURCES/postgresql-9.5.7.tar.bz2
 827528d678764c60ab37e3e73adecf6113587842 SOURCES/postgresql-setup-4.0.tar.gz
diff --git a/SPECS/postgresql.spec b/SPECS/postgresql.spec
index f5b6b01..5b12ebb 100644
--- a/SPECS/postgresql.spec
+++ b/SPECS/postgresql.spec
@@ -62,8 +62,8 @@
 Summary: PostgreSQL client programs
 Name: %{?scl_prefix}postgresql
 %global majorversion 9.5
-Version: 9.5.4
-Release: 1%{?dist}
+Version: 9.5.7
+Release: 2%{?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.
@@ -601,12 +601,12 @@ cd ..
 # but I was unable to debug properly yet):
 #   error: create archive failed on file
 #   /builddir/.../...-9.4.1/README.rpm-dist: cpio: Bad magic
-cp $RPM_BUILD_ROOT/%{_pkgdocdir}/README.rpm-dist ./
+mv $RPM_BUILD_ROOT/%{_pkgdocdir}/README.rpm-dist ./
 
 # 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
+cat > $RPM_BUILD_ROOT%{_sysconfdir}/postgresql-setup/upgrade/postgresql.conf <<EOF
 id		postgresql
 major		9.2
 data_default	/var/lib/pgsql/data
@@ -615,8 +615,7 @@ description	"Upgrade data from system PostgreSQL version (PostgreSQL 9.2)"
 redhat_sockets_hack yes
 EOF
 
-# collection 9.2
-cat > $RPM_BUILD_ROOT%{_sysconfdir}/postgresql-setup/upgrade/scl-postgresql92.conf <<EOF
+cat > $RPM_BUILD_ROOT%{_sysconfdir}/postgresql-setup/upgrade/postgresql92.conf <<EOF
 id		postgresql92-postgresql
 major		9.2
 data_default	/opt/rh/postgresql92/root/var/lib/pgsql/data
@@ -626,13 +625,12 @@ scls		"postgresql92"
 redhat_sockets_hack yes
 EOF
 
-# collection 9.4
-cat > $RPM_BUILD_ROOT%{_sysconfdir}/postgresql-setup/upgrade/scl-postgresql94.conf <<EOF
+cat > $RPM_BUILD_ROOT%{_sysconfdir}/postgresql-setup/upgrade/rh-postgresql94.conf <<EOF
 id		rh-postgresql94-postgresql
 major		9.4
 data_default	/var/opt/rh/rh-postgresql94/lib/pgsql/data
 engine		/opt/rh/rh-postgresql94/root/usr/bin
-description	"Upgrade data from RHSCL 2.X PostgreSQL version (PostgreSQL 9.4)"
+description	"Upgrade data from RHSCL PostgreSQL version (PostgreSQL 9.4)"
 scls		"rh-postgresql94"
 redhat_sockets_hack yes
 EOF
@@ -1155,6 +1153,18 @@ cd -
 %endif
 
 %changelog
+* Mon May 22 2017 Pavel Raiskup <praiskup@redhat.com> - 9.5.7-2
+- rebiuld for missing s390x el6 buildroot (RCM-16369)
+
+* Thu May 11 2017 Pavel Raiskup <praiskup@redhat.com> - 9.5.7-1
+- Rebase to 9.5.7 per release notes
+  http://www.postgresql.org/docs/9.5/static/release-9-5-7.html
+  http://www.postgresql.org/docs/9.5/static/release-9-5-6.html
+  http://www.postgresql.org/docs/9.5/static/release-9-5-5.html
+
+* Mon Sep 26 2016 Pavel Raiskup <praiskup@redhat.com> - 9.5.4-2
+- fix upgrade from postgresql92-postgresql (rhbz#1378787)
+
 * Thu Aug 18 2016 Petr Kubat <pkubat@redhat.com> - 9.5.4-1
 - Rebase to 9.5.4 per release notes
   http://www.postgresql.org/docs/9.5/static/release-9-5-4.html