[openrtm-commit:01502] r2593 - in branches/RELENG_1_1/OpenRTM-aist: . build

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2014-11-13 17:34:39 +0900 (Thu, 13 Nov 2014)
New Revision: 2593

Modified:
   branches/RELENG_1_1/OpenRTM-aist/
   branches/RELENG_1_1/OpenRTM-aist/build/pkg_install_fedora.sh
Log:
[merge] r2592 has been merged from trunk.


Property changes on: branches/RELENG_1_1/OpenRTM-aist
___________________________________________________________________
Modified: svn:mergeinfo
   - /tags/RELEASE_1_1_0/OpenRTM-aist:2364-2372
/tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2176,2180,2183-2208,2213,2328,2346,2381-2383,2389-2393,2397-2398,2400-2401,2409,2411-2412,2512-2513,2515-2516,2522-2525,2530-2531,2534-2539,2542-2543,2545-2546,2548-2566,2568,2573-2574
   + /tags/RELEASE_1_1_0/OpenRTM-aist:2364-2372
/tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2176,2180,2183-2208,2213,2328,2346,2381-2383,2389-2393,2397-2398,2400-2401,2409,2411-2412,2512-2513,2515-2516,2522-2525,2530-2531,2534-2539,2542-2543,2545-2546,2548-2566,2568,2573-2574,2592

Modified: branches/RELENG_1_1/OpenRTM-aist/build/pkg_install_fedora.sh
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/build/pkg_install_fedora.sh	2014-11-13 08:27:34 UTC (rev 2592)
+++ branches/RELENG_1_1/OpenRTM-aist/build/pkg_install_fedora.sh	2014-11-13 08:34:39 UTC (rev 2593)
@@ -16,8 +16,8 @@
 # パッケージリスト
 #---------------------------------------
 version_num=`cat /etc/fedora-release | awk '/Fedora/{print $3}' -`
-if [ $version_num -ge 16 ] && [ $version_num -le 18 ]; then
-	# バージョンが16,17,18の場合
+if [ $version_num -ge 16 ]; then
+	# バージョンが16以降の場合
 	omni="omniORB omniORB-devel omniORB-doc omniORB-servers omniORB-utils"
 else
 	omni="omniORB omniORB-devel omniORB-doc omniORB-servers omniORB-utils omniORB-bootscripts"