[PATCH] bootchart: grub uninstall bug & splitting package

[Curtis Doty]

The %preun script in the current F8 bootchart will actually remove itself 
from the grub.conf the next time you try and upgrade bootchart. Therefore 
this really should be fixed now before F8 release.

Also, I took the liberty of splitting out the init script into a separate 
package so it can be deployed on systems that don't need all the 
heavyweight java deps. In hindsight, maybe the subpackage name could be 
"init" rather than "daemon".

../C

Index: bootchart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bootchart/devel/bootchart.spec,v
retrieving revision 1.1
diff -u -r1.1 bootchart.spec
--- bootchart.spec	27 Aug 2007 17:07:25 -0000	1.1
+++ bootchart.spec	11 Oct 2007 20:52:45 -0000
@@ -1,6 +1,6 @@
  Name:           bootchart
  Version:        0.9
-Release:        5%{?dist}
+Release:        6%{?dist}
  Summary:        Boot Process Performance Visualization
  License:        GPLv3+
  URL:            http://www.bootchart.org/
@@ -22,6 +22,15 @@
  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

@@ -53,20 +62,22 @@
  %clean
  rm -rf $RPM_BUILD_ROOT

-%post
+%post daemon
  # Add a new grub/lilo entry
  if [ -x /sbin/grubby ]; then
      grubby --update-kernel=ALL --args="init=/sbin/bootchartd"
  fi
+%post
  if [ -x %{_bindir}/rebuild-gcj-db ]; then
      %{_bindir}/rebuild-gcj-db
  fi

-%preun
+%preun daemon
  # Remove the grub/lilo entry
-if [ -x /sbin/grubby ]; then
+if [ $1 -eq 0 -a -x /sbin/grubby ]; then
      grubby --update-kernel=ALL --remove-args="init=/sbin/bootchartd"
  fi
+%preun
  if [ -x %{_bindir}/rebuild-gcj-db ]; then
     %{_bindir}/rebuild-gcj-db
  fi
@@ -76,12 +87,19 @@
  %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,-)
+%attr(0755,root,root) /sbin/bootchartd
+%config(noreplace) %{_sysconfdir}/bootchartd.conf
+
  %changelog
+* Wed Oct 10 2007 Curtis Doty <Curtis at GreenKey.net> 0.9-6
+- separate package for bootchart-daemon without java deps
+- bugfix: upgrade was removing grub changes rather than adding
+
  * Mon Aug 27 2007 Adam Jackson <ajax at redhat.com> 0.9-5
  - Additional minor spec cleanups from review bug (#219889)