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

Merge branch 'f13' into f14

Browse Source
This commit is contained in:
Tim Waugh 2010-08-20 12:06:30 +01:00
commit 1132f4e383
2 changed files with 39 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
cups-str3608.patch
View File

@ -1,18 +1,39 @@
diff -up cups-1.4.4/scheduler/subscriptions.c.str3608 cups-1.4.4/scheduler/subscriptions.c diff -up cups-1.4.4/scheduler/ipp.c.str3608 cups-1.4.4/scheduler/ipp.c
--- cups-1.4.4/scheduler/subscriptions.c.str3608 2010-06-28 12:07:54.611008831 +0100 --- cups-1.4.4/scheduler/ipp.c.str3608 2010-08-20 11:36:58.490089326 +0100
+++ cups-1.4.4/scheduler/subscriptions.c 2010-06-28 12:09:25.315887577 +0100 +++ cups-1.4.4/scheduler/ipp.c 2010-08-20 11:37:11.965213877 +0100
@@ -551,12 +551,14 @@ cupsdEventName( @@ -1245,7 +1245,7 @@ add_class(cupsd_client_t *con, /* I -
return ("printer-media-changed");
case CUPSD_EVENT_PRINTER_ADDED : if (modify)
+ case CUPSD_EVENT_PRINTER_ADDED | CUPSD_EVENT_PRINTER_CONFIG: {
return ("printer-added"); - cupsdAddEvent(CUPSD_EVENT_PRINTER_MODIFIED | CUPSD_EVENT_PRINTER_CONFIG,
+ cupsdAddEvent(CUPSD_EVENT_PRINTER_MODIFIED,
pclass, NULL, "Class \"%s\" modified by \"%s\".",
pclass->name, get_username(con));
case CUPSD_EVENT_PRINTER_DELETED : @@ -1256,7 +1256,7 @@ add_class(cupsd_client_t *con, /* I -
return ("printer-deleted"); {
cupsdAddPrinterHistory(pclass);
case CUPSD_EVENT_PRINTER_MODIFIED : - cupsdAddEvent(CUPSD_EVENT_PRINTER_ADDED | CUPSD_EVENT_PRINTER_CONFIG,
+ case CUPSD_EVENT_PRINTER_MODIFIED | CUPSD_EVENT_PRINTER_CONFIG: + cupsdAddEvent(CUPSD_EVENT_PRINTER_ADDED,
return ("printer-modified"); pclass, NULL, "New class \"%s\" added by \"%s\".",
pclass->name, get_username(con));
@@ -3034,7 +3034,7 @@ add_printer(cupsd_client_t *con, /* I -
if (modify)
{
- cupsdAddEvent(CUPSD_EVENT_PRINTER_MODIFIED | CUPSD_EVENT_PRINTER_CONFIG,
+ cupsdAddEvent(CUPSD_EVENT_PRINTER_MODIFIED,
printer, NULL, "Printer \"%s\" modified by \"%s\".",
printer->name, get_username(con));
@@ -3045,7 +3045,7 @@ add_printer(cupsd_client_t *con, /* I -
{
cupsdAddPrinterHistory(printer);
- cupsdAddEvent(CUPSD_EVENT_PRINTER_ADDED | CUPSD_EVENT_PRINTER_CONFIG,
+ cupsdAddEvent(CUPSD_EVENT_PRINTER_ADDED,
printer, NULL, "New printer \"%s\" added by \"%s\".",
printer->name, get_username(con));
case CUPSD_EVENT_PRINTER_QUEUE_ORDER_CHANGED :

5
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.4 Version: 1.4.4
Release: 8%{?dist} Release: 9%{?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
@ -571,6 +571,9 @@ rm -rf $RPM_BUILD_ROOT
%{php_extdir}/phpcups.so %{php_extdir}/phpcups.so
%changelog %changelog
* Fri Aug 20 2010 Tim Waugh <twaugh@redhat.com> 1:1.4.4-9
- Use better upstream fix for STR #3608 (bug #606909).
* Fri Aug 13 2010 Tim Waugh <twaugh@redhat.com> 1:1.4.4-8 * Fri Aug 13 2010 Tim Waugh <twaugh@redhat.com> 1:1.4.4-8
- Specify udevadm trigger action in initscript (bug #623959). - Specify udevadm trigger action in initscript (bug #623959).