rpms/cups/F-12 cups-str3356.patch,1.1,1.2 cups.spec,1.524,1.525
Tim Waugh
twaugh at fedoraproject.org
Wed Oct 7 16:46:27 UTC 2009
Author: twaugh
Update of /cvs/pkgs/rpms/cups/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32702
Modified Files:
cups-str3356.patch cups.spec
Log Message:
* Wed Oct 7 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-8
- Use upstream patch for STR #3356 (bug #526405).
cups-str3356.patch:
ipp.c | 52 +++++++++++++++++++++++++++++-----------------------
1 file changed, 29 insertions(+), 23 deletions(-)
Index: cups-str3356.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups-str3356.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cups-str3356.patch 30 Sep 2009 12:40:01 -0000 1.1
+++ cups-str3356.patch 7 Oct 2009 16:46:27 -0000 1.2
@@ -1,13 +1,101 @@
-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)
+diff -up cups-1.4.1/scheduler/ipp.c.str3356 cups-1.4.1/scheduler/ipp.c
+--- cups-1.4.1/scheduler/ipp.c.str3356 2009-10-07 17:26:27.504800579 +0100
++++ cups-1.4.1/scheduler/ipp.c 2009-10-07 17:26:31.311800539 +0100
+@@ -2324,8 +2324,9 @@ add_printer(cupsd_client_t *con, /* I -
+ dstfile[1024]; /* Destination Script/PPD file */
+ int modify; /* Non-zero if we are modifying */
+ char newname[IPP_MAX_NAME]; /* New printer name */
+- int need_restart_job; /* Need to restart job? */
+- int set_device_uri, /* Did we set the device URI? */
++ int changed_driver, /* Changed the PPD/interface script? */
++ need_restart_job, /* Need to restart job? */
++ set_device_uri, /* Did we set the device URI? */
+ set_port_monitor; /* Did we set the port monitor? */
+
+
+@@ -2469,6 +2470,7 @@ add_printer(cupsd_client_t *con, /* I -
+ * Look for attributes and copy them over as needed...
+ */
+
++ changed_driver = 0;
+ need_restart_job = 0;
+
+ if ((attr = ippFindAttribute(con->request, "printer-location",
+@@ -2731,6 +2733,7 @@ add_printer(cupsd_client_t *con, /* I -
+ if (con->filename)
{
- /*
+ need_restart_job = 1;
++ changed_driver = 1;
+
+ strlcpy(srcfile, con->filename, sizeof(srcfile));
+
+@@ -2801,18 +2804,6 @@ add_printer(cupsd_client_t *con, /* I -
+ cupsdLogMessage(CUPSD_LOG_DEBUG,
+ "Copied PPD file successfully!");
+ chmod(dstfile, 0644);
+-
+-#ifdef __APPLE__
+- /*
+- * (Re)register color profiles...
+- */
+-
+- if (!RunUser)
+- {
+- apple_unregister_profiles(printer);
+- apple_register_profiles(printer);
+- }
+-#endif /* __APPLE__ */
+ }
+ else
+ {
+@@ -2829,6 +2820,7 @@ add_printer(cupsd_client_t *con, /* I -
+ IPP_TAG_NAME)) != NULL)
+ {
+ need_restart_job = 1;
++ changed_driver = 1;
+
+ if (!strcmp(attr->values[0].string.text, "raw"))
+ {
+@@ -2866,19 +2858,33 @@ add_printer(cupsd_client_t *con, /* I -
+ cupsdLogMessage(CUPSD_LOG_DEBUG,
+ "Copied PPD file successfully!");
+ chmod(dstfile, 0644);
++ }
++ }
++
++ if (changed_driver)
++ {
++ /*
++ * If we changed the PPD/interface script, then remove the printer's cache
++ * file...
++ */
++
++ char cache_name[1024]; /* Cache filename for printer attrs */
++
++ snprintf(cache_name, sizeof(cache_name), "%s/%s.ipp", CacheDir,
++ printer->name);
++ unlink(cache_name);
+
+ #ifdef __APPLE__
+- /*
+- * (Re)register color profiles...
+- */
++ /*
++ * (Re)register color profiles...
++ */
+
+- if (!RunUser)
+- {
+- apple_unregister_profiles(printer);
+- apple_register_profiles(printer);
+- }
+-#endif /* __APPLE__ */
++ if (!RunUser)
++ {
++ apple_unregister_profiles(printer);
++ apple_register_profiles(printer);
+ }
++#endif /* __APPLE__ */
+ }
+
+ /*
Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups.spec,v
retrieving revision 1.524
retrieving revision 1.525
diff -u -p -r1.524 -r1.525
--- cups.spec 2 Oct 2009 12:02:44 -0000 1.524
+++ cups.spec 7 Oct 2009 16:46:27 -0000 1.525
@@ -9,7 +9,7 @@
Summary: Common Unix Printing System
Name: cups
Version: 1.4.1
-Release: 7%{?dist}
+Release: 8%{?dist}
License: GPLv2
Group: System Environment/Daemons
Source: http://ftp.easysw.com/pub/cups/1.4.0/cups-%{version}-source.tar.bz2
@@ -509,6 +509,9 @@ rm -rf $RPM_BUILD_ROOT
%{php_extdir}/phpcups.so
%changelog
+* Wed Oct 7 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-8
+- Use upstream patch for STR #3356 (bug #526405).
+
* Fri Oct 2 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-7
- Fixed orientation of page labels when printing text in landscape
mode (bug #520141, STR #3334).
More information about the fedora-extras-commits
mailing list