Updated Branches: refs/heads/4.0 98eef5c94 -> 3b78d6980
Restore the lib directory Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/3b78d698 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/3b78d698 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/3b78d698 Branch: refs/heads/4.0 Commit: 3b78d6980af4720bd71784471c1b1b8b3dd2f34d Parents: 98eef5c Author: Alex Huang <[email protected]> Authored: Mon Oct 8 04:07:02 2012 -0700 Committer: Alex Huang <[email protected]> Committed: Mon Oct 8 04:07:28 2012 -0700 ---------------------------------------------------------------------- cloud.spec | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3b78d698/cloud.spec ---------------------------------------------------------------------- diff --git a/cloud.spec b/cloud.spec index 8698fb2..844d486 100644 --- a/cloud.spec +++ b/cloud.spec @@ -288,9 +288,11 @@ Requires: java >= 1.6.0 Requires: tomcat6 %if 0%{?fedora} > 15 Requires: apache-commons-lang +Requires: %{name}-utils = %{version} %endif %if 0%{?rhel} >= 5 Requires: jakarta-commons-lang +Requires: %{name}-utils = %{version} %endif Obsoletes: cloud-bridge < %{version}-%{release} %description aws-api @@ -397,18 +399,18 @@ fi /sbin/chkconfig --level 345 %{name}-management on > /dev/null 2>&1 || true root=/usr/share/cloud/bridge - target=/usr/share/cloud/management/ + target=/usr/share/cloud/management mkdir -p $target/webapps7080 - if [ ! -e $target/webapps7080/awsapi ]; then + if [ ! -h $target/webapps7080/awsapi ]; then ln -s $root/webapps7080/awsapi $target/webapps7080/awsapi fi -# jars=`ls $root/lib` -# for j in $jars -# do -# cp -f $root/lib/$j $root/webapps/awsapi/WEB-INF/lib/ -# done + jars=`ls $root/lib` + for j in $jars + do + cp -f $root/lib/$j $root/webapps7080/awsapi/WEB-INF/lib/ + done confs="cloud-bridge.properties ec2-service.properties" for c in $confs @@ -599,6 +601,7 @@ fi %files aws-api %defattr(0644,cloud,cloud,0755) %{_datadir}/cloud/bridge/conf/* +%{_datadir}/cloud/bridge/lib/* %{_datadir}/cloud/bridge/webapps7080/* %attr(0644,root,root) %{_datadir}/cloud/setup/bridge/db/* %attr(0755,root,root) %{_bindir}/cloudstack-aws-api-register
