rpms/mailgraph/FC-6 mailgraph.spec,1.1,1.2

[Bernard Johnson (bjohnson)]

Author: bjohnson

Update of /cvs/extras/rpms/mailgraph/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7643/FC-6

Modified Files:
	mailgraph.spec 
Log Message:
- require initscripts because initfile uses daemon function
- use perl(...) requires (bz #233769)
- use /sbin/service instead of invoking initscript directly
- one line under %%files to own both %%{_datadir} and files below it



Index: mailgraph.spec
===================================================================
RCS file: /cvs/extras/rpms/mailgraph/FC-6/mailgraph.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mailgraph.spec	29 Jan 2007 21:09:14 -0000	1.1
+++ mailgraph.spec	25 Mar 2007 18:49:07 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           mailgraph
 Version:        1.12
-Release:        4%{?dist}%{?repotag:.%{repotag}}
+Release:        5%{?dist}%{?repotag:.%{repotag}}
 Summary:        A RRDtool frontend for Mail statistics
 
 Group:          System Environment/Daemons
@@ -14,10 +14,9 @@
 Patch0:         paths.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:       perl-File-Tail, rrdtool, httpd
+Requires:       perl(File::Tail), rrdtool, httpd
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Requires(preun): /sbin/chkconfig
-Requires(post):  /sbin/chkconfig
+Requires:       initscripts
 
 BuildArch:      noarch
 
@@ -57,14 +56,14 @@
 
 %preun
 if [ $1 = 0 ]; then
-  %{_initrddir}/%{name} stop 2>&1 > /dev/null || :
+  /sbin/service %{name} stop 2>&1 > /dev/null || :
   /sbin/chkconfig --del %{name} 2>&1 > /dev/null || :
 fi
 exit 0
 
 %postun
 if [ "$1" -ge "1" ]; then
-  %{_initrddir}/%{name} condrestart 2>&1 > /dev/null || :
+  /sbin/service %{name} condrestart 2>&1 > /dev/null || :
 fi
 
 
@@ -73,8 +72,7 @@
 %dir %{_localstatedir}/lib/mailgraph
 %dir %attr(0775,root,apache) %{_localstatedir}/cache/mailgraph
 %{_sbindir}/*
-%dir %{_datadir}/mailgraph
-%{_datadir}/mailgraph/*
+%{_datadir}/mailgraph
 %{_initrddir}/mailgraph
 %config(noreplace) %{_sysconfdir}/sysconfig/mailgraph
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/mailgraph.conf
@@ -82,6 +80,12 @@
 
 
 %changelog
+* Sun Mar 25 2007 Bernard Johnson <bjohnson at symetrix.com> - 1.12-5
+- require initscripts because initfile uses daemon function
+- use perl(...) requires (bz #233769)
+- use /sbin/service instead of invoking initscript directly
+- one line under %%files to own both %%{_datadir} and files below it
+
 * Sun Jan 28 2007 Bernard Johnson <bjohnson at symetrix.com> - 1.12-4
 - replace %%{_var} with %%{_localstatedir}