rpms/cups
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'f13' into f14

Browse Source
This commit is contained in:
Jiri Popelka 2010-12-03 14:11:23 +01:00
commit aa4d0b9c12
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cups.init Normal file → Executable file
View File

@ -49,7 +49,7 @@ DAEMON=cupsd
exec=/usr/sbin/cupsd exec=/usr/sbin/cupsd
prog=cups prog=cups
config=/etc/cups/cupsd.conf config=/etc/cups/cupsd.conf
lockfile=/var/lock/subsys/$DAEMON lockfile=/var/lock/subsys/cups
check() { check() {
# Check that we're a privileged user # Check that we're a privileged user
@ -129,7 +129,7 @@ case $1 in
echo echo
;; ;;
status) status)
status $DAEMON status -l $(basename $lockfile) $DAEMON
RETVAL=$? RETVAL=$?
;; ;;
restartlog) restartlog)

6
cups.spec
View File

@ -8,7 +8,7 @@
Summary: Common Unix Printing System Summary: Common Unix Printing System
Name: cups Name: cups
Version: 1.4.5 Version: 1.4.5
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv2 License: GPLv2
Group: System Environment/Daemons Group: System Environment/Daemons
Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@ -573,6 +573,10 @@ rm -rf $RPM_BUILD_ROOT
%{php_extdir}/phpcups.so %{php_extdir}/phpcups.so
%changelog %changelog
* Fri Dec 03 2010 Jiri Popelka <jpopelka@redhat.com> 1:1.4.5-2
- Changed subsystem lock file name in initscript
so the service is correctly stopped on reboot or halt (bug #659391).
* Fri Nov 12 2010 Jiri Popelka <jpopelka@redhat.com> 1:1.4.5-1 * Fri Nov 12 2010 Jiri Popelka <jpopelka@redhat.com> 1:1.4.5-1
- 1.4.5. - 1.4.5.
- No longer need CVE-2010-2941, str3608 - No longer need CVE-2010-2941, str3608