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 2017/10/16 18:26:42 UTC
[cloudstack] branch CLOUDSTACK-10012 updated: fix rpm pkging
This is an automated email from the ASF dual-hosted git repository.
bhaisaab pushed a commit to branch CLOUDSTACK-10012
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/CLOUDSTACK-10012 by this push:
new f93c77d fix rpm pkging
f93c77d is described below
commit f93c77d63eeecf6903b302e9154c7403e7b3bbd4
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Mon Oct 16 23:56:28 2017 +0530
fix rpm pkging
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
---
packaging/centos63/cloud.spec | 2 +-
packaging/centos7/cloud.spec | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index 1a906f3..f4a14cf 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -284,7 +284,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/classes/META-INF/webapp $(DESTDIR)/usr/share/$(PACKAGE)-management/webapp
+cp -r client/target/classes/META-INF/webapp ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapp
cp client/target/cloud-client-ui-%{_maventag}.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/lib/cloudstack.jar
# Don't package the scripts in the management webapp
diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec
index fa4551c..5f0e8e6 100644
--- a/packaging/centos7/cloud.spec
+++ b/packaging/centos7/cloud.spec
@@ -255,7 +255,7 @@ install -D client/target/utilities/bin/cloud-update-xenserver-licenses ${RPM_BUI
cp -r client/target/utilities/scripts/db/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/setup
cp -r client/target/cloud-client-ui-%{_maventag}.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/
-cp -r client/target/classes/META-INF/webapp $(DESTDIR)/usr/share/$(PACKAGE)-management/webapp
+cp -r client/target/classes/META-INF/webapp ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapp
mv ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/cloud-client-ui-%{_maventag}.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/lib/cloudstack.jar
# Don't package the scripts in the management webapp
--
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" <co...@cloudstack.apache.org>'].