[bootchart] 475062 apply patch from Curtis Doty with few adjustment.

[Marcela Mašláňová]

commit fb42c0a00f3b3a7b1df90c3fdb347f5a5e754912
Author: Marcela Mašláňová <mmaslano at redhat.com>
Date:   Wed Nov 3 13:04:35 2010 +0100

    475062 apply patch from Curtis Doty with few adjustment.
    
    daemon sub-package shouldn't install useless requirements on server.

 bootchart.spec |   36 +++++++++++++++++++++++++++---------
 1 files changed, 27 insertions(+), 9 deletions(-)
---
diff --git a/bootchart.spec b/bootchart.spec
index 633f29f..e760513 100644
--- a/bootchart.spec
+++ b/bootchart.spec
@@ -1,6 +1,6 @@
 Name:           bootchart 
 Version:        0.9
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Boot Process Performance Visualization
 License:        GPLv3+
 URL:            http://www.bootchart.org/
@@ -14,15 +14,24 @@ BuildRequires:  jpackage-utils >= 0:1.5
 BuildRequires:  jakarta-commons-cli >= 0:1.0
 BuildRequires:  gcc-java >= 4.0.2
 BuildRequires:  java-gcj-compat-devel
+Requires:       %{name}-daemon
 Requires(post): java-gcj-compat
 Requires(postun): java-gcj-compat
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 A tool for performance analysis and visualization of the GNU/Linux boot
 process. Resource utilization and process information are collected during
 the boot process and are later rendered in a PNG, SVG or EPS encoded chart.
 
+%package daemon
+Summary:    Bootchart logger script
+Group:		Applications/System
+
+%description daemon
+A tool for performance analysis and visualization of the GNU/Linux boot
+process. This package includes the standalone logger daemon and config
+file without any java dependencies.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -33,8 +42,6 @@ rm -rf lib/org/apache/commons/cli lib/org/apache/commons/lang
 CLASSPATH=%{_javadir}/commons-cli.jar ant
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 # jar
 install -p -D -m 644 %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
 ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
@@ -55,7 +62,7 @@ install -p -D -m 644 script/bootchartd.conf $RPM_BUILD_ROOT/etc/bootchartd.conf
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
+%post daemon
 # Add a new grub/lilo entry
 if [ -x /sbin/grubby ] && [ -e /boot/grub/grub.conf ]; then
     eval $( /sbin/grubby --info /boot/vmlinuz-$(uname -r) ) >& /dev/null
@@ -64,30 +71,41 @@ if [ -x /sbin/grubby ] && [ -e /boot/grub/grub.conf ]; then
 	/sbin/grubby --update-kernel=/boot"$kernel" --args="init=/sbin/bootchartd"
     fi
 fi
+
+%post
 if [ -x %{_bindir}/rebuild-gcj-db ]; then
     %{_bindir}/rebuild-gcj-db
 fi
 
-%preun
+%preun daemon
 # Remove the grub/lilo entry, but only on uninstall, not on upgrade
 if [ $1 -eq 0 ] && [ -x /sbin/grubby ] && [ -e /boot/grub/grub.conf ]; then
     grubby --update-kernel=ALL --remove-args="init=/sbin/bootchartd"
 fi
+
+%preun
 if [ -x %{_bindir}/rebuild-gcj-db ]; then
    %{_bindir}/rebuild-gcj-db
 fi
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog COPYING INSTALL README README.logger TODO lib/LICENSE.cli.txt lib/LICENSE.compress.txt lib/LICENSE.epsgraphics.txt lib/NOTICE.txt
 %{_javadocdir}/%{name}-%{version}
 %{_javadir}/*
-%attr(0755,root,root) /sbin/bootchartd
-%config(noreplace) %{_sysconfdir}/bootchartd.conf
 %dir %attr(0755,root,root) %{_bindir}/bootchart
 %{_libdir}/gcj/%{name}
 
+%files daemon
+%defattr(-,root,root,-)
+%doc ChangeLog COPYING INSTALL README README.logger TODO lib/LICENSE.cli.txt lib/LICENSE.compress.txt lib/LICENSE.epsgraphics.txt lib/NOTICE.txt
+%attr(0755,root,root) /sbin/bootchartd
+%config(noreplace) %{_sysconfdir}/bootchartd.conf
+
 %changelog
+* Wed Nov  3 2010 Marcela Mašláňová <mmaslano at redhat.com> - 0.9-12
+- 475062 apply patch from Curtis Doty with few adjustment. daemon sub-package shouldn't
+ install useless requirements on server.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild