From 2a31c011e3eb0d6a252f27fb8848668aeac0be21 Mon Sep 17 00:00:00 2001 From: Marcela Mašláňová Date: Jul 18 2008 12:55:00 +0000 Subject: - 446004 hope adding || into scriptlets fix removing old package after upgrade --- diff --git a/at.spec b/at.spec index f08b0e9..b85e5ff 100644 --- a/at.spec +++ b/at.spec @@ -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 @@ chown daemon:daemon %{_localstatedir}/spool/at/.SEQ %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 @@ fi %attr(4755,root,root) %{_bindir}/at %changelog +* Fri Jul 18 2008 Marcela Maslanova - 3.1.10-24 +- 446004 hope adding || into scriptlets fix removing old package after upgrade + * Tue Mar 25 2008 Marcela Maslanova - 3.1.10-23 - 436952 use local instead of posix output date/time format. diff --git a/atd.init b/atd.init index 8df2794..39ffcdf 100755 --- a/atd.init +++ b/atd.init @@ -26,7 +26,7 @@ LOCK_FILE=/var/lock/subsys/atd 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 @@ stop() { 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 }