SPECS (AC-branch): audit.spec - use %service, rel 2

[glen]

Author: glen                         Date: Thu May 11 21:05:46 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- use %service, rel 2

---- Files affected:
SPECS:
   audit.spec (1.7.2.2 -> 1.7.2.3) 

---- Diffs:

================================================================
Index: SPECS/audit.spec
diff -u SPECS/audit.spec:1.7.2.2 SPECS/audit.spec:1.7.2.3
--- SPECS/audit.spec:1.7.2.2	Wed Oct  5 13:00:41 2005
+++ SPECS/audit.spec	Thu May 11 23:05:41 2006
@@ -3,13 +3,13 @@
 Summary(pl):	Narzędzia przestrzeni użytkownika do audytu jąder 2.6
 Name:		audit
 Version:	1.0.3
-Release:	1.1
+Release:	2
 License:	GPL
 Group:		Daemons
 Source0:	http://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz
 # Source0-md5:	950daad97adfa3134289aa5b4e885f8f
 # http://people.redhat.com/sgrubb/audit/audit.h
-Source1:	audit.h
+Source1:	%{name}.h
 Source2:	%{name}d.init
 Source3:	%{name}d.sysconfig
 URL:		http://people.redhat.com/sgrubb/audit/
@@ -17,9 +17,10 @@
 BuildRequires:	automake >= 1.9
 BuildRequires:	libtool
 BuildRequires:	linux-libc-headers >= 2.6.11
-PreReq:		rc-scripts
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(post,preun):	/sbin/chkconfig
 Requires:	%{name}-libs = %{version}-%{release}
+Requires:	rc-scripts
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sbindir	/sbin
@@ -124,17 +125,11 @@
 
 %post
 /sbin/chkconfig --add auditd
-if [ -f /var/lock/subsys/auditd ]; then
-	/etc/rc.d/init.d/auditd restart >&2
-else
-	echo "Run \"/etc/rc.d/init.d/auditd start\" to start audit daemon." >&2
-fi
+%service auditd restart "audit daemon"
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/auditd ]; then
-		/etc/rc.d/init.d/auditd stop >&2
-	fi
+	%service auditd stop
 	/sbin/chkconfig --del auditd
 fi
 
@@ -173,6 +168,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7.2.3  2006/05/11 21:05:41  glen
+- use %service, rel 2
+
 Revision 1.7.2.2  2005/10/05 11:00:41  qboosh
 - kill -pie from LDFLAGS too to avoid build errors with newer gcc
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/audit.spec?r1=1.7.2.2&r2=1.7.2.3&f=u