- Initscript fixes (bug #237955).

- Resolves: rhbz#237955
This commit is contained in:
Tim Waugh 2007-04-26 12:50:08 +00:00
parent 72da82060f
commit 41fae3e439
2 changed files with 7 additions and 9 deletions

View File

@ -32,13 +32,7 @@
# Linux # Linux
# Source function library. # Source function library.
if [ -f /etc/init.d/functions ] ; then . /etc/init.d/functions
. /etc/init.d/functions
elif [ -f /etc/rc.d/init.d/functions ] ; then
. /etc/rc.d/init.d/functions
else
exit 0
fi
DAEMON=cupsd DAEMON=cupsd
@ -90,6 +84,7 @@ case $1 in
;; ;;
status) status)
status $DAEMON status $DAEMON
RETVAL=$?
;; ;;
restartlog) restartlog)
stop stop
@ -99,7 +94,7 @@ case $1 in
*) *)
echo $"Usage: $prog {start|stop|restart|condrestart|reload|status}" echo $"Usage: $prog {start|stop|restart|condrestart|reload|status}"
exit 1 exit 3
esac esac
exit $RETVAL exit $RETVAL

View File

@ -6,7 +6,7 @@
Summary: Common Unix Printing System Summary: Common Unix Printing System
Name: cups Name: cups
Version: 1.2.10 Version: 1.2.10
Release: 7%{?dist} Release: 8%{?dist}
License: GPL License: GPL
Group: System Environment/Daemons Group: System Environment/Daemons
Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@ -442,6 +442,9 @@ rm -rf $RPM_BUILD_ROOT
%{cups_serverbin}/daemon/cups-lpd %{cups_serverbin}/daemon/cups-lpd
%changelog %changelog
* Thu Apr 26 2007 Tim Waugh <twaugh@redhat.com> 1:1.2.10-8
- Initscript fixes (bug #237955).
* Wed Apr 25 2007 Tim Waugh <twaugh@redhat.com> 1:1.2.10-7 * Wed Apr 25 2007 Tim Waugh <twaugh@redhat.com> 1:1.2.10-7
- Until bug #236736 is fixed, work around the kernel usblp driver's - Until bug #236736 is fixed, work around the kernel usblp driver's
quirks so that we can detect paper-out conditions. quirks so that we can detect paper-out conditions.