jmlich pushed to postgresql (master). "Using rpm macros instead of hard wired paths; Adding aarch64, ppc64p7"

notifications at fedoraproject.org notifications at fedoraproject.org
Thu Mar 26 09:02:37 UTC 2015


>From e6acde1a903c7360ec92d8fd61021888144212f7 Mon Sep 17 00:00:00 2001
From: Jozef Mlich <jmlich at redhat.com>
Date: Thu, 26 Mar 2015 09:44:50 +0100
Subject: Using rpm macros instead of hard wired paths; Adding aarch64, ppc64p7


diff --git a/postgresql.spec b/postgresql.spec
index 759838d..b32e8f6 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -683,13 +683,13 @@ 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 | s390 | s390x | sparc | sparc64 )
-    mv $RPM_BUILD_ROOT/usr/include/pg_config.h $RPM_BUILD_ROOT/usr/include/pg_config_`uname -i`.h
-    install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/
-    mv $RPM_BUILD_ROOT/usr/include/pgsql/server/pg_config.h $RPM_BUILD_ROOT/usr/include/pgsql/server/pg_config_`uname -i`.h
-    install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/pgsql/server/
-    mv $RPM_BUILD_ROOT/usr/include/ecpg_config.h $RPM_BUILD_ROOT/usr/include/ecpg_config_`uname -i`.h
-    install -m 644 %{SOURCE6} $RPM_BUILD_ROOT/usr/include/
+  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
+    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
+    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
+    install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_includedir}/
     ;;
   *)
     ;;
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/postgresql.git/commit/?h=master&id=e6acde1a903c7360ec92d8fd61021888144212f7


More information about the scm-commits mailing list