diff --git a/cups/cups.spec b/cups/cups.spec index a4bbc6e904..9164c4d237 100644 --- a/cups/cups.spec +++ b/cups/cups.spec @@ -33,7 +33,7 @@ Distribution: OpenPKG [EVAL] Group: Print License: GPL/LGPL with exceptions Version: 1.1.19 -Release: 20030719 +Release: 20030721 # package options %option with_openssl no diff --git a/cups/rc.cups b/cups/rc.cups index f5cf969952..bbba94e6bf 100644 --- a/cups/rc.cups +++ b/cups/rc.cups @@ -6,14 +6,33 @@ %config cups_enable="$openpkg_rc_def" +%common + cups_pidfile="@l_prefix@/var/cups/cupsd.pid" + cups_signal () { + [ -f $cups_pidfile ] && kill -$1 `cat $cups_pidfile` + } + +%status -p 200 -u @l_susr@ -o + cups_usable="unknown" + cups_active="no" + rcService cups enable yes && \ + cups_signal 0 && cups_active="yes" + echo "cups_enable=\"$cups_enable\"" + echo "cups_usable=\"$cups_usable\"" + echo "cups_active=\"$cups_active\"" + %start -p 200 -u @l_susr@ rcService cups enable yes || exit 0 @l_prefix@/libexec/cups/cupsd %stop -p 200 -u @l_susr@ rcService cups enable yes || exit 0 - if [ -f @l_prefix@/var/cups/cupsd.pid ]; then - kill -TERM `cat @l_prefix@/var/cups/cupsd.pid` - rm -f @l_prefix@/var/cups/cupsd.pid >/dev/null 2>&1 || true - fi + cups_signal TERM + rm -f $cups_pidfile 2>/dev/null || true + +%restart -p 200 -u @l_susr@ + rcService cups enable yes || exit 0 + rc cups stop + sleep 2 + rc cups start