[openrtm-commit:01507] r2598 - branches/RELENG_1_1/OpenRTM-aist/packages/rpm

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2014-11-27 17:14:13 +0900 (Thu, 27 Nov 2014)
New Revision: 2598

Modified:
   branches/RELENG_1_1/OpenRTM-aist/packages/rpm/Makefile.am
   branches/RELENG_1_1/OpenRTM-aist/packages/rpm/OpenRTM-aist.spec.in
   branches/RELENG_1_1/OpenRTM-aist/packages/rpm/rpm_build.sh.in
Log:
[compat, ->RELEASE_1_1_1] Library installation path(/usr/lib or /usr/lib64) in rpm package,  has been modified to use %{_libdir} macro. Architecture of package name has been modified to get in the 'uname -i'.

Modified: branches/RELENG_1_1/OpenRTM-aist/packages/rpm/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/rpm/Makefile.am	2014-11-25 06:44:44 UTC (rev 2597)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/rpm/Makefile.am	2014-11-27 08:14:13 UTC (rev 2598)
@@ -27,7 +27,6 @@
 	echo "%define distname        $(dist_key)" >> $@
 	echo "%define rtm_includedir  $(rtm_includedir)" >> $@
 	echo "%define coil_includedir $(coil_includedir)" >> $@
-	echo "%define rtm_libdir      $(rtm_libdir)" >> $@
 	echo "%define rtm_datadir     $(rtm_datadir)" >> $@
 	cat OpenRTM-aist.spec.in >> $@
 

Modified: branches/RELENG_1_1/OpenRTM-aist/packages/rpm/OpenRTM-aist.spec.in
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/rpm/OpenRTM-aist.spec.in	2014-11-25 06:44:44 UTC (rev 2597)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/rpm/OpenRTM-aist.spec.in	2014-11-27 08:14:13 UTC (rev 2598)
@@ -11,6 +11,7 @@
 %define pkgver         0
 %define _unpackaged_files_terminate_build   1
 %define __os_install_post %{nil}
+%define rtm_libdir     %{_libdir}/openrtm-%{shortversion}
 
 #------------------------------------------------------------
 # Package information

Modified: branches/RELENG_1_1/OpenRTM-aist/packages/rpm/rpm_build.sh.in
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/rpm/rpm_build.sh.in	2014-11-25 06:44:44 UTC (rev 2597)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/rpm/rpm_build.sh.in	2014-11-27 08:14:13 UTC (rev 2598)
@@ -94,6 +94,6 @@
 # We have already extracted source under BUILD directory.
 # %prep process can be skiped. = --short-circuit -bc
 rpm_def="_topdir $builddir"
-rpmbuild --define "$rpm_def" -ba OpenRTM-aist.spec
+rpmbuild --target `uname -i` --define "$rpm_def" -ba OpenRTM-aist.spec
 cd ..
 rm $packagename