From 31524fb5ac54226b47340e5d82606561fe69f100 Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: Tue, 14 Jul 2015 13:40:51 +0200
Subject: [PATCH] multilib: fix wrong arch classification

This partly reverts e6acde1a9 commit where is no clear
justification why the change was actually done.  Because the
pg_config.h was not ready for ppc64p7 and aarch64 -- it was clear
breakage.  In 1242873 discussion, it appeared that ppc64p7 needs
special handling as it is compatible/equivalent with ppc64.

Resolves: rhbz#1242873
Version: 9.4.4-3
---
 postgresql.spec | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/postgresql.spec b/postgresql.spec
index 7734d49..ff18031 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -71,7 +71,7 @@ Summary: PostgreSQL client programs
 Name: postgresql
 %global majorversion 9.4
 Version: 9.4.4
-Release: 2%{?dist}
+Release: 3%{?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.
@@ -689,13 +689,15 @@ install -D -m 644 macros.%{name} \
 
 # multilib header hack; note pg_config.h is installed in two places!
 # we only apply this to known Red Hat multilib arches, per bug #177564
-case `uname -i` in
-  i386 | x86_64 | ppc | ppc64 | ppc64p7 | s390 | s390x | sparc | sparc64 | aarch64 )
-    mv $RPM_BUILD_ROOT%{_includedir}/pg_config.h $RPM_BUILD_ROOT%{_includedir}/pg_config_`uname -i`.h
+build_arch=`uname -i`
+test "$build_arch" = ppc64p7 && build_arch=ppc64
+case "$build_arch" in
+  i386 | x86_64 | ppc | ppc64 | s390 | s390x | sparc | sparc64 )
+    mv $RPM_BUILD_ROOT%{_includedir}/pg_config.h $RPM_BUILD_ROOT%{_includedir}/pg_config_"$build_arch".h
     install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_includedir}/
-    mv $RPM_BUILD_ROOT%{_includedir}/pgsql/server/pg_config.h $RPM_BUILD_ROOT%{_includedir}/pgsql/server/pg_config_`uname -i`.h
+    mv $RPM_BUILD_ROOT%{_includedir}/pgsql/server/pg_config.h $RPM_BUILD_ROOT%{_includedir}/pgsql/server/pg_config_"$build_arch".h
     install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_includedir}/pgsql/server/
-    mv $RPM_BUILD_ROOT%{_includedir}/ecpg_config.h $RPM_BUILD_ROOT%{_includedir}/ecpg_config_`uname -i`.h
+    mv $RPM_BUILD_ROOT%{_includedir}/ecpg_config.h $RPM_BUILD_ROOT%{_includedir}/ecpg_config_"$build_arch".h
     install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_includedir}/
     ;;
   *)
@@ -1198,6 +1200,9 @@ fi
 %endif
 
 %changelog
+* Tue Jul 14 2015 Pavel Raiskup <praiskup@redhat.com> - 9.4.4-3
+- revert/fix part of e6acde1a9 commit related to multilib hack (rhbz#1242873)
+
 * Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 9.4.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild