svn commit: r1222584 - in /incubator/ambari/trunk: CHANGES.txt agent/src/packages/build.xml agent/src/packages/rpm/spec/ambari-agent.spec

[ey...@apache.org]

Author: eyang
Date: Fri Dec 23 06:39:18 2011
New Revision: 1222584

URL: http://svn.apache.org/viewvc?rev=1222584&view=rev
Log:
AMBARI-173. Fixed RPM build for OpenSUSE. (Eric Yang)

Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/agent/src/packages/build.xml
    incubator/ambari/trunk/agent/src/packages/rpm/spec/ambari-agent.spec

Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1222584&r1=1222583&r2=1222584&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Fri Dec 23 06:39:18 2011
@@ -2,6 +2,8 @@ Ambari Change log
 
 Release 0.1.0 - unreleased
 
+  AMBARI-173. Fixed RPM build for OpenSUSE. (Eric Yang)
+
   AMBARI-172. Remove the "ambari" category from the configuration element, put it as "globals" elemement in the stack. (vgogate)
 
   AMBARI-171. Agents retry failed actions for a configurable number of times

Modified: incubator/ambari/trunk/agent/src/packages/build.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/agent/src/packages/build.xml?rev=1222584&r1=1222583&r2=1222584&view=diff
==============================================================================
--- incubator/ambari/trunk/agent/src/packages/build.xml (original)
+++ incubator/ambari/trunk/agent/src/packages/build.xml Fri Dec 23 06:39:18 2011
@@ -91,7 +91,7 @@
         </replacetokens>
       </filterchain>
     </copy>
-    <rpm specFile="ambari-agent.spec" command="-bb" topDir="${project.build.directory}/rpm/ambari" cleanBuildDir="true" failOnError="true"/>
+    <rpm specFile="ambari-agent.spec" command="-bb --buildroot=${project.build.directory}/rpm/ambari/BUILDROOT" topDir="${project.build.directory}/rpm/ambari" cleanBuildDir="true" failOnError="true"/>
     <copy todir="${project.build.directory}" flatten="true">
       <fileset dir="${project.build.directory}/rpm/ambari/RPMS">
         <include name="**/*.rpm" />

Modified: incubator/ambari/trunk/agent/src/packages/rpm/spec/ambari-agent.spec
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/agent/src/packages/rpm/spec/ambari-agent.spec?rev=1222584&r1=1222583&r2=1222584&view=diff
==============================================================================
--- incubator/ambari/trunk/agent/src/packages/rpm/spec/ambari-agent.spec (original)
+++ incubator/ambari/trunk/agent/src/packages/rpm/spec/ambari-agent.spec Fri Dec 23 06:39:18 2011
@@ -88,6 +88,8 @@ mkdir -p ${RPM_BUILD_DIR}/etc/init.d
 cp ${RPM_BUILD_DIR}/../../../../src/packages/rpm/init.d/ambari-agent ${RPM_BUILD_DIR}/etc/init.d/ambari-agent
 chmod 0755 ${RPM_BUILD_DIR}/etc/init.d/ambari-agent
 
+cp -a ${RPM_BUILD_DIR}/* ${RPM_BUILD_DIR}/../BUILDROOT
+
 %preun
 rm -rf /etc/default/ambari-agent-env.sh