You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by hu...@apache.org on 2013/02/07 13:52:46 UTC
[2/2] git commit: refs/heads/4.1 - Summary: Fix path so the right
files are removed from the install dir (cherry picked from commit
db3b0d325613b02eaed40e89f7c80db89f0b87ee)
Updated Branches:
refs/heads/4.1 91e284b17 -> c693cfb37
Summary: Fix path so the right files are removed from the install dir
(cherry picked from commit db3b0d325613b02eaed40e89f7c80db89f0b87ee)
Signed-off-by: Hugo Trippaers <ht...@schubergphilis.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/c693cfb3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/c693cfb3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/c693cfb3
Branch: refs/heads/4.1
Commit: c693cfb37f0fa5a773bc9a1c71f70d8286b6b332
Parents: 94d50fb
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Thu Feb 7 13:34:45 2013 +0100
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Thu Feb 7 13:47:33 2013 +0100
----------------------------------------------------------------------
packaging/centos63/cloud.spec | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c693cfb3/packaging/centos63/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index 7a034d7..66e2e11 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -217,8 +217,8 @@ cp -r client/target/utilities/scripts/db/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-
cp -r client/target/cloud-client-ui-4.1.0-SNAPSHOT/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client
# Don't package the scripts in the management webapp
-rm -rf {RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/WEB-INF/classes/scripts
-rm -rf {RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/WEB-INF/classes/vms
+rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/scripts
+rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/vms
for name in db.properties log4j-cloud.xml tomcat6-nonssl.conf tomcat6-ssl.conf server-ssl.xml server-nonssl.xml \
catalina.policy catalina.properties db-enc.properties classpath.conf tomcat-users.xml web.xml ; do