From 6223520efd000b759da1b58586e9982761ffcd66 Mon Sep 17 00:00:00 2001 From: Hugo Trippaers Date: Fri, 1 Mar 2013 14:54:11 +0100 Subject: [PATCH] CLOUDSTACK-1469 Commit 2f135be1 introduced jna as a dependency for hypervisor kvm, so make sure the version from the operating system is not used anymore --- packaging/centos63/cloud-agent.rc | 2 +- packaging/centos63/cloud.spec | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/packaging/centos63/cloud-agent.rc b/packaging/centos63/cloud-agent.rc index d885dad5bc5..152e61e4ac7 100755 --- a/packaging/centos63/cloud-agent.rc +++ b/packaging/centos63/cloud-agent.rc @@ -59,7 +59,7 @@ export JAVA_HOME SCP="" DCP="" ACP=`ls /usr/share/cloudstack-agent/cloud-plugin-hypervisor-kvm-*.jar`":"`ls /usr/share/cloudstack-agent/lib/* | tr '\n' ':'` -JCP="/usr/share/java/jna.jar:/usr/share/java/commons-daemon.jar" +JCP="/usr/share/java/commons-daemon.jar" # We need to append the JSVC daemon JAR to the classpath # AgentShell implements the JSVC daemon methods diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec index ab71d0ffea7..24ec2455c3f 100644 --- a/packaging/centos63/cloud.spec +++ b/packaging/centos63/cloud.spec @@ -113,7 +113,6 @@ Requires: libvirt Requires: bridge-utils Requires: ebtables Requires: jsvc -Requires: jna Requires: jakarta-commons-daemon Requires: jakarta-commons-daemon-jsvc Provides: cloud-agent