[openrtm-commit:01970] r2744 - in branches/RELENG_1_1/OpenRTM-aist: . packages/rpm

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2016-05-26 13:18:43 +0900 (Thu, 26 May 2016)
New Revision: 2744

Modified:
   branches/RELENG_1_1/OpenRTM-aist/
   branches/RELENG_1_1/OpenRTM-aist/packages/rpm/OpenRTM-aist.spec.in
Log:
[merge] r2743 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-2574,2592,2605,2610,2623,2626,2644,2648,2652-2653,2670,2677-2678,2681-2682,2684-2687,2689-2692,2696-2697,2700,2703,2706,2711-2712,2715-2721,2724,2728-2730,2733-2734,2738-2739
   + /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-2574,2592,2605,2610,2623,2626,2644,2648,2652-2653,2670,2677-2678,2681-2682,2684-2687,2689-2692,2696-2697,2700,2703,2706,2711-2712,2715-2721,2724,2728-2730,2733-2734,2738-2739,2743

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	2016-05-26 03:01:11 UTC (rev 2743)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/rpm/OpenRTM-aist.spec.in	2016-05-26 04:18:43 UTC (rev 2744)
@@ -136,7 +136,6 @@
 %defattr(-,root,root,-)
 %attr(755,root,root) %{rtm_datadir}/example/*Comp*
 %{rtm_datadir}/example/*.conf
-%{rtm_datadir}/example/*.conf.org
 %{rtm_datadir}/example/src/*
 %{rtm_datadir}/example/rtc/*
 %{rtm_datadir}/example/templates/*