Summary: fixup spec file Remove duplicate entries in the config dir
Fix directory permisisons of some directories Remove the scripts from the webapp as they are packaged inside the cloudstack-common package (cherry picked from commit 5af6d16c5d6b046be911ed369919a0d9bba10d62) Signed-off-by: Hugo Trippaers <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/1404cf8c Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/1404cf8c Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/1404cf8c Branch: refs/heads/4.1 Commit: 1404cf8c1fa1af3ede9b9be47a16dfb3c1de4e54 Parents: 6287d45 Author: Hugo Trippaers <[email protected]> Authored: Wed Feb 6 22:44:56 2013 +0100 Committer: Hugo Trippaers <[email protected]> Committed: Wed Feb 6 23:00:28 2013 +0100 ---------------------------------------------------------------------- packaging/centos63/cloud.spec | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1404cf8c/packaging/centos63/cloud.spec ---------------------------------------------------------------------- diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec index 262b4d4..7a034d7 100644 --- a/packaging/centos63/cloud.spec +++ b/packaging/centos63/cloud.spec @@ -216,6 +216,10 @@ 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-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 + 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 mv ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/$name \ @@ -318,11 +322,19 @@ fi %dir %attr(0770,root,cloud) %{_localstatedir}/log/%{name}/agent %dir %attr(0770,root,cloud) %{_localstatedir}/log/%{name}/awsapi %config(noreplace) %{_sysconfdir}/sysconfig/%{name}-management -%config(noreplace) %{_sysconfdir}/%{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/tomcat6-nonssl.conf %config(noreplace) %{_sysconfdir}/%{name}/management/tomcat6-ssl.conf +%config(noreplace) %{_sysconfdir}/%{name}/management/Catalina/localhost/client/context.xml +%config(noreplace) %{_sysconfdir}/%{name}/management/catalina.policy +%config(noreplace) %{_sysconfdir}/%{name}/management/catalina.properties +%config(noreplace) %{_sysconfdir}/%{name}/management/classpath.conf +%config(noreplace) %{_sysconfdir}/%{name}/management/db-enc.properties +%config(noreplace) %{_sysconfdir}/%{name}/management/server-nonssl.xml +%config(noreplace) %{_sysconfdir}/%{name}/management/server-ssl.xml +%config(noreplace) %{_sysconfdir}/%{name}/management/tomcat-users.xml +%config(noreplace) %{_sysconfdir}/%{name}/management/web.xml %attr(0755,root,root) %{_initrddir}/%{name}-management %attr(0755,root,root) %{_bindir}/%{name}-setup-management %attr(0755,root,root) %{_bindir}/%{name}-update-xenserver-licenses @@ -363,10 +375,13 @@ fi %doc NOTICE %files common +%dir %attr(0755,root,root) %{_libdir}/python2.6/site-packages/cloudutils +%dir %attr(0755,root,root) %{_datadir}/%{name}-common/vms %attr(0755,root,root) %{_datadir}/%{name}-common/scripts -%attr(0644,root,root) %{_datadir}/%{name}-common/vms +%attr(0644, root, root) %{_datadir}/%{name}-common/vms/systemvm.iso +%attr(0644, root, root) %{_datadir}/%{name}-common/vms/systemvm.zip %attr(0644,root,root) %{_libdir}/python2.6/site-packages/cloud_utils.py -%attr(0644,root,root) %{_libdir}/python2.6/site-packages/cloudutils +%attr(0644,root,root) %{_libdir}/python2.6/site-packages/cloudutils/* %doc LICENSE %doc NOTICE
