SPECS: idled.spec - use %service, fixed %post script, rel 8

glen glen at pld-linux.org
Tue Feb 28 20:22:05 CET 2006


Author: glen                         Date: Tue Feb 28 19:22:05 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service, fixed %post script, rel 8

---- Files affected:
SPECS:
   idled.spec (1.24 -> 1.25) 

---- Diffs:

================================================================
Index: SPECS/idled.spec
diff -u SPECS/idled.spec:1.24 SPECS/idled.spec:1.25
--- SPECS/idled.spec:1.24	Sat Jun 18 00:48:14 2005
+++ SPECS/idled.spec	Tue Feb 28 20:21:59 2006
@@ -3,7 +3,7 @@
 Summary(pl):	Demon który kończy nieaktywne sesje użytkowników
 Name:		idled
 Version:	1.16
-Release:	7
+Release:	8
 License:	non-profit
 Group:		Daemons
 Source0:	http://www.darkwing.com/idled/download/%{name}-%{version}.tar.gz
@@ -16,10 +16,11 @@
 Patch4:		%{name}-yacc.patch
 BuildRequires:	bison
 BuildRequires:	flex
-PreReq:		rc-scripts
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(post):	fileutils
 Requires(post,preun):	/sbin/chkconfig
 Requires:	/bin/mail
+Requires:	rc-scripts
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -69,20 +70,16 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-touch /var/log/idled.log
-chmod 640 /var/log/cron
-/sbin/chkconfig --add idled
-if [ -f /var/lock/subsys/idled ]; then
-	/etc/rc.d/init.d/idled restart >&2
-else
-	echo "Run \"/etc/rc.d/init.d/idled start\" to start idled."
+if [ ! -f /var/log/idled.log ]; then
+	touch /var/log/idled.log
+	chmod 640 /var/log/idled.log
 fi
+/sbin/chkconfig --add idled
+%service idled restart
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/idled ]; then
-		/etc/rc.d/init.d/idled stop >&2
-	fi
+	%service idled stop
 	/sbin/chkconfig --del idled
 fi
 
@@ -102,6 +99,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2006/02/28 19:21:59  glen
+- use %service, fixed %post script, rel 8
+
 Revision 1.24  2005/06/17 22:48:14  zbyniu
 - BR: flex
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/idled.spec?r1=1.24&r2=1.25&f=u



More information about the pld-cvs-commit mailing list