You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2012/10/08 19:39:13 UTC
[4/8] git commit: Revert: "Restore the lib directory"
Revert: "Restore the lib directory"
This reverts commit 3b78d6980af4720bd71784471c1b1b8b3dd2f34d.
Conflicts:
cloud.spec
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/3652d43c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/3652d43c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/3652d43c
Branch: refs/heads/master
Commit: 3652d43cc76cca23a86aacc3e4058d369770e857
Parents: a52f446
Author: Rohit Yadav <bh...@apache.org>
Authored: Mon Oct 8 17:22:08 2012 +0530
Committer: Rohit Yadav <bh...@apache.org>
Committed: Mon Oct 8 23:06:16 2012 +0530
----------------------------------------------------------------------
cloud.spec | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3652d43c/cloud.spec
----------------------------------------------------------------------
diff --git a/cloud.spec b/cloud.spec
index 36860c9..bdd380b 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