[openrtm-commit:02504] r805 - trunk/OpenRTM-aist-Python/packages/rpm

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2017-03-08 11:41:53 +0900 (Wed, 08 Mar 2017)
New Revision: 805

Modified:
   trunk/OpenRTM-aist-Python/packages/rpm/rpm_build.sh
Log:
[compat,->RELENG_1_2] Now 32bit-Fedora rpm package build arch target is fixed to i686. refs #3647

Modified: trunk/OpenRTM-aist-Python/packages/rpm/rpm_build.sh
===================================================================
--- trunk/OpenRTM-aist-Python/packages/rpm/rpm_build.sh	2017-03-07 07:54:17 UTC (rev 804)
+++ trunk/OpenRTM-aist-Python/packages/rpm/rpm_build.sh	2017-03-08 02:41:53 UTC (rev 805)
@@ -7,6 +7,7 @@
 # $Id$
 #
 export LC_ALL=C
+arch=`uname -i | sed -s 's/i[3-5]/i6/g'`
 
 clean_dirs()
 {
@@ -86,7 +87,7 @@
 {
     clean_dirs
     mkdir {BUILD,RPMS,SOURCES,SPECS,SRPMS}
-    mkdir RPMS/{i386,i586,i686,x86_64,noarch}
+    mkdir RPMS/{$arch,noarch}
     export BUILD_DIR=`pwd`
 }
 
@@ -121,7 +122,7 @@
 {
     cd SPECS
     rpm_def="_topdir $BUILD_DIR"
-    if rpmbuild --target `uname -i` --define "$rpm_def" -ba openrtm-aist.spec ; then
+    if rpmbuild --target "$arch" --define "$rpm_def" -ba openrtm-aist.spec ; then
 	echo "Build successful"
     else
 	echo "Build failed"