From 797d5ff9a7d5891da455f5bca4041f5408b1aba6 Mon Sep 17 00:00:00 2001
From: frank <frank@cloud.com>
Date: Wed, 14 Sep 2011 11:59:07 -0700
Subject: [PATCH] add usage back to spec file now FOSS including all stuff

---
 build/package.xml |  2 +-
 cloud.spec        | 10 +++++-----
 wscript_build     |  8 ++++++++
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/build/package.xml b/build/package.xml
index 175e47b61a4..9acbcab2d62 100755
--- a/build/package.xml
+++ b/build/package.xml
@@ -141,7 +141,7 @@
     </zip>
   </target>
 
-  <target name="build-all" depends="build-opensource, build-ui, build-war-oss, compile-testclient">
+  <target name="build-all" depends="build-opensource, build-ui, build-war-oss, compile-testclient, compile-usage">
   </target>
 
   <target name="build-all-with-simulator" depends="build-all, compile-agent-simulator">
diff --git a/cloud.spec b/cloud.spec
index 2b619df00c7..feaed5f2702 100644
--- a/cloud.spec
+++ b/cloud.spec
@@ -595,13 +595,13 @@ fi
 
 %files usage
 %defattr(0644,root,root,0775)
-#%{_javadir}/%{name}-usage.jar
+%{_javadir}/%{name}-usage.jar
 %attr(0755,root,root) %{_initrddir}/%{name}-usage
 %attr(0755,root,root) %{_libexecdir}/usage-runner
-#%dir %attr(0770,root,%{name}) %{_localstatedir}/log/%{name}/usage
-#%{_sysconfdir}/%{name}/usage/usage-components.xml
-#%config(noreplace) %{_sysconfdir}/%{name}/usage/log4j-%{name}_usage.xml
-#%config(noreplace) %attr(0640,root,%{name}) %{_sysconfdir}/%{name}/usage/db.properties
+%dir %attr(0770,root,%{name}) %{_localstatedir}/log/%{name}/usage
+%{_sysconfdir}/%{name}/usage/usage-components.xml
+%config(noreplace) %{_sysconfdir}/%{name}/usage/log4j-%{name}_usage.xml
+%config(noreplace) %attr(0640,root,%{name}) %{_sysconfdir}/%{name}/usage/db.properties
 
 %changelog
 * Mon May 3 2010 Manuel Amador (Rudd-O) <manuel@vmops.com> 1.9.12
diff --git a/wscript_build b/wscript_build
index 844d25a645c..544bd469bce 100644
--- a/wscript_build
+++ b/wscript_build
@@ -378,6 +378,13 @@ def build_test():
 		bld.install_files('${SYSCONFDIR}/${PACKAGE}/test','conf/*', cwd = start_path)
 	Utils.pprint ("GREEN", "Installed files of test/")
 
+def build_usage_dir ():
+	start_path = bld.path.find_dir ("usage")
+	bld.install_files_filtered("${USAGESYSCONFDIR}","conf/*", cwd = start_path)
+	bld.symlink_as("${USAGESYSCONFDIR}/db.properties", \
+			Utils.subst_vars("${MSCONF}/db.properties",bld.env))
+	Utils.pprint ("GREEN", "Installed files of usage/")
+
 
 
 # Get started to execute here
@@ -402,6 +409,7 @@ build_plugins ()
 build_xml_api_description ()
 build_ovm ()
 build_test()
+build_usage_dir()
 
 # ====================== Magic! =========================================
 bld.use_the_magic()