Merge pull request #496 from Kegeruneku/ust_5587/int/5591_package_rpm…

…vercmp_properly Fixes #5591: Copy rpmvercmp as part of the necessary CFEngine system bin...
Normation · Sep 30, 2014 · a8e7f0b · a8e7f0b
2 parents cb2d1e4 + 23f2e18
commit a8e7f0b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/rudder-agent/SPECS/rudder-agent.spec b/rudder-agent/SPECS/rudder-agent.spec
@@ -428,6 +428,7 @@ if [ ${CFRUDDER_FIRST_INSTALL} -ne 1 -a -x /etc/init.d/rudder-agent ]; then /sbi
 
 # Copy CFEngine binaries
 %{cp_a_command} -f /opt/rudder/bin/cf-* /var/rudder/cfengine-community/bin/
+%{cp_a_command} -f /opt/rudder/bin/rpmvercmp /var/rudder/cfengine-community/bin/
 NB_COPIED_BINARIES=`ls -1 /var/rudder/cfengine-community/bin/ | wc -l`
 if [ ${NB_COPIED_BINARIES} -gt 0 ];then echo "CFEngine binaries copied to workdir"; fi
 

diff --git a/rudder-agent/debian/postinst b/rudder-agent/debian/postinst
@@ -46,6 +46,7 @@ case "$1" in
 
 		# Copy CFEngine binaries (Changed location from sbin/ to bin/ in version 3.4)
 		cp -a -f /opt/rudder/bin/cf-* /var/rudder/cfengine-community/bin/
+		cp -a -f /opt/rudder/bin/rpmvercmp /var/rudder/cfengine-community/bin/
 		NB_COPIED_BINARIES=`ls -1 /var/rudder/cfengine-community/bin/ | wc -l`
 		if [ ${NB_COPIED_BINARIES} -gt 0 ];then echo "CFEngine binaries copied to workdir"; fi