rpms/cups/F-11 cups-str3356.patch,NONE,1.1 cups.spec,1.518,1.519
Tim Waugh
twaugh at fedoraproject.org
Wed Sep 30 12:51:54 UTC 2009
Author: twaugh
Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10922
Modified Files:
cups.spec
Added Files:
cups-str3356.patch
Log Message:
* Wed Sep 30 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-1
- Don't use cached PPD for raw queue (bug #526405, STR #3356).
cups-str3356.patch:
printers.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- NEW FILE cups-str3356.patch ---
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)
{
/*
Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.518
retrieving revision 1.519
diff -u -p -r1.518 -r1.519
--- cups.spec 30 Sep 2009 12:38:41 -0000 1.518
+++ cups.spec 30 Sep 2009 12:51:54 -0000 1.519
@@ -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
@@ -503,6 +505,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Wed Sep 30 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-1
- 1.4.1.
+- Don't use cached PPD for raw queue (bug #526405, STR #3356).
* Fri Sep 4 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.0-2
- Fixed the dnssd backend so that it only reports devices once avahi
More information about the fedora-extras-commits
mailing list