From 0bee91b52ac7ff52d461095336cdd46abf8fe4dd Mon Sep 17 00:00:00 2001 From: edison Date: Thu, 4 Nov 2010 16:15:33 -0700 Subject: [PATCH] bug 7001: fix rpm build for new UI, some files should be put into $(catalina_home)/resource status 7001: resolved fixed --- client/wscript_build | 2 +- cloud.spec | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/client/wscript_build b/client/wscript_build index e6955c6a1bc..2cc94177383 100644 --- a/client/wscript_build +++ b/client/wscript_build @@ -5,7 +5,7 @@ bld.install_files('${MSENVIRON}/webapps/client/WEB-INF', start_path.ant_glob("**",src=True,bld=False,dir=False,flat=True), cwd=start_path,relative_trick=True) -bld.install_files("${MSCONF}",'WEB-INF/classes/resources/*.properties',chmod=0640) +bld.install_files("${MSCONF}/resources",'WEB-INF/classes/resources/*.properties',chmod=0640) if not Options.options.PRESERVECONFIG: bld.install_files_filtered("${MSCONF}","tomcatconf/*") diff --git a/cloud.spec b/cloud.spec index d3f5e448897..f15b8f58529 100644 --- a/cloud.spec +++ b/cloud.spec @@ -559,6 +559,7 @@ fi %defattr(0644,root,root,0755) %{_sysconfdir}/%{name}/management/catalina.policy %{_sysconfdir}/%{name}/management/*.properties +%{_sysconfdir}/%{name}/management/resources/*.properties %{_sysconfdir}/%{name}/management/components.xml %{_sysconfdir}/%{name}/management/context.xml %config(noreplace) %attr(640,root,%{name}) %{_sysconfdir}/%{name}/management/db.properties