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 2013/02/20 12:13:33 UTC

[2/3] git commit: refs/heads/master - packaging: Don't depend on cloudstack snapshot version, copy using wildcard path

packaging: Don't depend on cloudstack snapshot version, copy using wildcard path

Signed-off-by: Rohit Yadav <bh...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/11219775
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/11219775
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/11219775

Branch: refs/heads/master
Commit: 1121977513ce2f911b489e7b4e89cbaaa142abe9
Parents: 35b83b2
Author: Rohit Yadav <bh...@apache.org>
Authored: Wed Feb 20 16:15:59 2013 +0530
Committer: Rohit Yadav <bh...@apache.org>
Committed: Wed Feb 20 16:42:51 2013 +0530

----------------------------------------------------------------------
 debian/rules                  |    2 +-
 packaging/centos63/cloud.spec |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/11219775/debian/rules
----------------------------------------------------------------------
diff --git a/debian/rules b/debian/rules
index 36b611d..69fba7a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -60,7 +60,7 @@ install:
 	mkdir -p debian/tmp/usr/share/cloud/management/webapps/client
 	
 	cp -r client/target/utilities/scripts/db/* debian/tmp/usr/share/cloud/setup/
-	cp -r client/target/cloud-client-ui-4.1.0-SNAPSHOT/* debian/tmp/usr/share/cloud/management/webapps/client/
+	cp -r client/target/cloud-client-ui-*-SNAPSHOT/* debian/tmp/usr/share/cloud/management/webapps/client/
 	dh_installdirs -s
 	dh_install -s
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/11219775/packaging/centos63/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index 5a15ce4..1267f47 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -215,7 +215,7 @@ install -D client/target/utilities/bin/cloud-sysvmadm ${RPM_BUILD_ROOT}%{_bindir
 install -D client/target/utilities/bin/cloud-update-xenserver-licenses ${RPM_BUILD_ROOT}%{_bindir}/%{name}-update-xenserver-licenses
 
 cp -r client/target/utilities/scripts/db/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/setup
-cp -r client/target/cloud-client-ui-4.1.0-SNAPSHOT/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client
+cp -r client/target/cloud-client-ui-*-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/client/WEB-INF/classes/scripts