SPECS: shishi.spec - use %service, rel 3

[glen]

Author: glen                         Date: Fri Apr 14 16:14:44 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service, rel 3

---- Files affected:
SPECS:
   shishi.spec (1.39 -> 1.40) 

---- Diffs:

================================================================
Index: SPECS/shishi.spec
diff -u SPECS/shishi.spec:1.39 SPECS/shishi.spec:1.40
--- SPECS/shishi.spec:1.39	Thu Mar 16 19:52:57 2006
+++ SPECS/shishi.spec	Fri Apr 14 18:14:39 2006
@@ -3,7 +3,7 @@
 Summary(pl):	Shishi - implementacja RFC 1510(bis) (uwierzytelniania Kerberos V5)
 Name:		shishi
 Version:	0.0.22
-Release:	2
+Release:	3
 Epoch:		0
 License:	GPL
 Group:		Libraries
@@ -23,7 +23,7 @@
 BuildRequires:	libtasn1-devel >= 0.2.5
 BuildRequires:	libtool >= 2:1.5
 BuildRequires:	pam-devel
-BuildRequires:	rpmbuild(macros) >= 1.159
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	texinfo
 Requires(post,postun):	/sbin/ldconfig
 Provides:	group(shishi)
@@ -97,6 +97,7 @@
 Summary(pl):	shishid - serwer Kerberosa 5
 Group:		Networking/Daemons
 Requires(post,postun):	/sbin/chkconfig
+Requires(post,preun):	rc-scripts
 Requires(postun):	/usr/sbin/groupdel
 Requires(postun):	/usr/sbin/userdel
 Requires(pre):	/bin/id
@@ -161,6 +162,7 @@
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/shishid
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/shishid
+rm -f $RPM_BUILD_ROOT%{_datadir}/info/dir
 
 %find_lang %{name}
 
@@ -181,17 +183,11 @@
 
 %post shishid
 /sbin/chkconfig --add shishid
-if [ -f /var/lock/subsys/shishid ]; then
-	/etc/rc.d/init.d/shishid restart >&2
-else
-	echo "Run \"/etc/rc.d/init.d/shishid start\" to start shishid daemon." >&2
-fi
+%service shishid restart "shishid daemon"
 
 %preun shishid
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/shishid ]; then
-		/etc/rc.d/init.d/shishid stop >&2
-	fi
+	%service shishid stop
 	/sbin/chkconfig --del shishid
 fi
 
@@ -246,6 +242,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.40  2006/04/14 16:14:39  glen
+- use %service, rel 3
+
 Revision 1.39  2006/03/16 18:52:57  patrys
 - new libtasn
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/shishi.spec?r1=1.39&r2=1.40&f=u