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

commit df16dfeea8fdaf65bb146c9f75532a002533f6af
Author: Rohit Yadav <[email protected]>
AuthorDate: Tue Aug 8 02:41:30 2017 +0200

    fix centos pkging
    
    Signed-off-by: Rohit Yadav <[email protected]>
---
 packaging/centos63/cloud.spec | 4 ++--
 packaging/centos7/cloud.spec  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index 47858a8..b6a037a 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -292,7 +292,7 @@ cp client/target/bcprov-jdk15on-1.55.jar 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-ma
 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
 
-cp client/target/classes/META-INF/webapp/WEB-INF/web.xml 
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/
+cp client/target/classes/META-INF/webapp/WEB-INF/web.xml 
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management
 
 for name in db.properties log4j-cloud.xml commons-logging.properties 
environment.properties java.security.ciphers
 do
@@ -531,12 +531,12 @@ pip install --upgrade 
/usr/share/cloudstack-marvin/Marvin-*.tar.gz
 %config(noreplace) %{_sysconfdir}/sudoers.d/%{name}-management
 %config(noreplace) %attr(0640,root,cloud) 
%{_sysconfdir}/%{name}/management/db.properties
 %config(noreplace) %{_sysconfdir}/%{name}/management/log4j-cloud.xml
+%config(noreplace) %{_sysconfdir}/%{name}/management/log4j.xml
 %config(noreplace) %{_sysconfdir}/%{name}/management/web.xml
 %config(noreplace) %{_sysconfdir}/%{name}/management/environment.properties
 %config(noreplace) %{_sysconfdir}/%{name}/management/java.security.ciphers
 %config(noreplace) %{_sysconfdir}/%{name}/management/commons-logging.properties
 %attr(0755,root,root) %{_initrddir}/%{name}-management
-
 %attr(0755,root,root) %{_bindir}/%{name}-setup-management
 %attr(0755,root,root) %{_bindir}/%{name}-update-xenserver-licenses
 %{_datadir}/%{name}-management/conf
diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec
index 9782711..6ce1d0a 100644
--- a/packaging/centos7/cloud.spec
+++ b/packaging/centos7/cloud.spec
@@ -262,7 +262,7 @@ cp client/target/bcprov-jdk15on-1.55.jar 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-ma
 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
 
-cp client/target/classes/META-INF/webapp/WEB-INF/web.xml 
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/
+cp client/target/classes/META-INF/webapp/WEB-INF/web.xml 
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management
 
 for name in db.properties log4j-cloud.xml commons-logging.properties 
environment.properties java.security.ciphers
 do
@@ -473,13 +473,13 @@ pip install --upgrade 
/usr/share/cloudstack-marvin/Marvin-*.tar.gz
 %config(noreplace) %{_sysconfdir}/security/limits.d/cloud
 %config(noreplace) %attr(0640,root,cloud) 
%{_sysconfdir}/%{name}/management/db.properties
 %config(noreplace) %{_sysconfdir}/%{name}/management/log4j-cloud.xml
+%config(noreplace) %{_sysconfdir}/%{name}/management/log4j.xml
 %config(noreplace) %{_sysconfdir}/%{name}/management/web.xml
 %config(noreplace) %{_sysconfdir}/%{name}/management/environment.properties
 %config(noreplace) %{_sysconfdir}/%{name}/management/java.security.ciphers
 %config(noreplace) %{_sysconfdir}/%{name}/management/commons-logging.properties
 %attr(0755,root,root) %{_unitdir}/%{name}-management.service
 %attr(0755,cloud,cloud) %{_localstatedir}/run/%{name}-management.pid
-
 %attr(0755,root,root) %{_bindir}/%{name}-setup-management
 %attr(0755,root,root) %{_bindir}/%{name}-update-xenserver-licenses
 %{_datadir}/%{name}-management/conf

-- 
To stop receiving notification emails like this one, please contact
"[email protected]" <[email protected]>.

Reply via email to