From 3652d43cc76cca23a86aacc3e4058d369770e857 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Mon, 8 Oct 2012 17:22:08 +0530 Subject: [PATCH] Revert: "Restore the lib directory" This reverts commit 3b78d6980af4720bd71784471c1b1b8b3dd2f34d. Conflicts: cloud.spec --- cloud.spec | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/cloud.spec b/cloud.spec index 36860c9a34d..bdd380b4f96 100644 --- a/cloud.spec +++ b/cloud.spec @@ -288,11 +288,9 @@ 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 @@ -406,11 +404,11 @@ fi ln -sf $root/webapps7080/awsapi $target/webapps7080/awsapi fi - jars=`ls $root/lib` - for j in $jars - do - cp -f $root/lib/$j $root/webapps7080/awsapi/WEB-INF/lib/ - done +# jars=`ls $root/lib` +# for j in $jars +# do +# cp -f $root/lib/$j $root/webapps/awsapi/WEB-INF/lib/ +# done confs="cloud-bridge.properties ec2-service.properties" for c in $confs @@ -601,7 +599,6 @@ 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