Skip to content

Commit 3652d43

Browse files
committed
Revert: "Restore the lib directory"
This reverts commit 3b78d69. Conflicts: cloud.spec
1 parent a52f446 commit 3652d43

1 file changed

Lines changed: 5 additions & 8 deletions

File tree

cloud.spec

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -288,11 +288,9 @@ Requires: java >= 1.6.0
288288
Requires: tomcat6
289289
%if 0%{?fedora} > 15
290290
Requires: apache-commons-lang
291-
Requires: %{name}-utils = %{version}
292291
%endif
293292
%if 0%{?rhel} >= 5
294293
Requires: jakarta-commons-lang
295-
Requires: %{name}-utils = %{version}
296294
%endif
297295
Obsoletes: cloud-bridge < %{version}-%{release}
298296
%description aws-api
@@ -406,11 +404,11 @@ fi
406404
ln -sf $root/webapps7080/awsapi $target/webapps7080/awsapi
407405
fi
408406

409-
jars=`ls $root/lib`
410-
for j in $jars
411-
do
412-
cp -f $root/lib/$j $root/webapps7080/awsapi/WEB-INF/lib/
413-
done
407+
# jars=`ls $root/lib`
408+
# for j in $jars
409+
# do
410+
# cp -f $root/lib/$j $root/webapps/awsapi/WEB-INF/lib/
411+
# done
414412

415413
confs="cloud-bridge.properties ec2-service.properties"
416414
for c in $confs
@@ -601,7 +599,6 @@ fi
601599
%files aws-api
602600
%defattr(0644,cloud,cloud,0755)
603601
%{_datadir}/cloud/bridge/conf/*
604-
%{_datadir}/cloud/bridge/lib/*
605602
%{_datadir}/cloud/bridge/webapps7080/*
606603
%attr(0644,root,root) %{_datadir}/cloud/setup/bridge/db/*
607604
%attr(0755,root,root) %{_bindir}/cloudstack-aws-api-register

0 commit comments

Comments
 (0)