rpms/at/devel at.spec,1.65,1.66 atd.init,1.7,1.8

[Marcela Mašláňová (mmaslano)]

Author: mmaslano

Update of /cvs/pkgs/rpms/at/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18519

Modified Files:
	at.spec atd.init 
Log Message:
* Fri Jul 18 2008 Marcela Maslanova <mmaslano at redhat.com> - 3.1.10-24
- 446004 hope adding || into scriptlets fix removing old package after upgrade



Index: at.spec
===================================================================
RCS file: /cvs/pkgs/rpms/at/devel/at.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- at.spec	25 Mar 2008 14:00:46 -0000	1.65
+++ at.spec	18 Jul 2008 12:55:00 -0000	1.66
@@ -6,7 +6,7 @@
 Summary: Job spooling tools
 Name: at
 Version: 3.1.10
-Release: 23%{?dist}
+Release: 24%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://ftp.debian.org/debian/pool/main/a/at
@@ -159,13 +159,13 @@
 
 %preun
 if [ "$1" = 0 ] ; then
-	/sbin/service atd stop >/dev/null 2>&1
+	/sbin/service atd stop >/dev/null 2>&1 ||:
 	/sbin/chkconfig --del atd
 fi
 
 %postun
 if [ "$1" -ge "1" ]; then
-	/sbin/service atd condrestart >/dev/null 2>&1
+	/sbin/service atd condrestart >/dev/null 2>&1 ||:
 fi
 
 %files
@@ -187,6 +187,9 @@
 %attr(4755,root,root)	%{_bindir}/at
 
 %changelog
+* Fri Jul 18 2008 Marcela Maslanova <mmaslano at redhat.com> - 3.1.10-24
+- 446004 hope adding || into scriptlets fix removing old package after upgrade
+
 * Tue Mar 25 2008 Marcela Maslanova <mmaslano at redhat.com> - 3.1.10-23
 - 436952 use local instead of posix output date/time format.
 


Index: atd.init
===================================================================
RCS file: /cvs/pkgs/rpms/at/devel/atd.init,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- atd.init	28 Feb 2008 09:34:57 -0000	1.7
+++ atd.init	18 Jul 2008 12:55:00 -0000	1.8
@@ -26,7 +26,7 @@
 start() {
 	# Check if atd is already running
 	echo -n $"Starting $prog: "
-	$ATD $OPTS && success || failure
+	daemon $ATD $OPTS && success || failure
 	RETVAL=$?
 	[ "$RETVAL" = 0 ] && touch $LOCK_FILE
 	echo
@@ -36,11 +36,12 @@
 	echo -n $"Stopping $prog: "
     if [ -n "`pidfileofproc $ATD`" ] ; then
         killproc $ATD
+		RETVAL=3
     else
         failure $"Stopping $prog"
     fi
     RETVAL=$?
-    [ "$RETVAL" = 0 ] && rm -f $LOCK_FILE 
+    [ "$RETVAL" = 0 ] && rm -f $LOCK_FILE
     echo
 }