rpms/cups
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Don't use cached PPD for raw queue (bug #526405, STR #3356).

Browse Source
This commit is contained in:
Tim Waugh 2009-09-30 11:37:42 +00:00
parent fa873879c4
commit 0b04325081
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cups-str3356.patch Normal file
View File

@ -0,0 +1,13 @@
diff -up cups-1.4.1/scheduler/printers.c.str3356 cups-1.4.1/scheduler/printers.c
--- cups-1.4.1/scheduler/printers.c.str3356 2009-09-30 12:02:53.467761538 +0100
+++ cups-1.4.1/scheduler/printers.c 2009-09-30 12:03:28.489636706 +0100
@@ -3993,7 +3993,8 @@ load_ppd(cupsd_printer_t *p) /* I - Pri
ippDelete(p->ppd_attrs);
p->ppd_attrs = ippNew();
- if (cache_info.st_mtime >= ppd_info.st_mtime &&
+ if (ppd_info.st_mtime != 1 &&
+ cache_info.st_mtime >= ppd_info.st_mtime &&
(cache = cupsFileOpen(cache_name, "r")) != NULL)
{
/*

6
cups.spec
View File

@ -9,7 +9,7 @@
Summary: Common Unix Printing System
Name: cups
Version: 1.4.1
Release: 5%{?dist}
Release: 6%{?dist}
License: GPLv2
Group: System Environment/Daemons
Source: http://ftp.easysw.com/pub/cups/1.4.0/cups-%{version}-source.tar.bz2
@ -52,6 +52,7 @@ Patch30: cups-uri-compat.patch
Patch35: cups-cups-get-classes.patch
Patch37: cups-avahi.patch
Patch38: cups-str3332.patch
Patch39: cups-str3356.patch
Patch100: cups-lspp.patch
Epoch: 1
Url: http://www.cups.org/
@ -205,6 +206,7 @@ module.
%patch35 -p1 -b .cups-get-classes
%patch37 -p1 -b .avahi
%patch38 -p1 -b .str3332
%patch39 -p1 -b .str3356
%if %lspp
%patch100 -p1 -b .lspp
@ -505,6 +507,8 @@ rm -rf $RPM_BUILD_ROOT
%{php_extdir}/phpcups.so
%changelog
* Wed Sep 30 2009 Tim Waugh <twaugh@redhat.com> 1:1.4.1-6
- Don't use cached PPD for raw queue (bug #526405, STR #3356).
* Wed Sep 23 2009 Jiri Popelka <jpopelka@redhat.com> 1:1.4.1-5
- Fixed cups.init to be LSB compliant (bug #521641)