From 262a1cd4b3ed381d74add4238d165fae1916651e Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Feb 25 2011 12:51:58 +0000 Subject: Fixed dbus notifier support for job-state-changed. --- diff --git a/cups-job-state-changed.patch b/cups-job-state-changed.patch new file mode 100644 index 0000000..16b5677 --- /dev/null +++ b/cups-job-state-changed.patch @@ -0,0 +1,12 @@ +diff -up cups-1.4.6/notifier/dbus.c.job-state-changed cups-1.4.6/notifier/dbus.c +--- cups-1.4.6/notifier/dbus.c.job-state-changed 2011-02-25 12:42:11.084127808 +0000 ++++ cups-1.4.6/notifier/dbus.c 2011-02-25 12:42:31.312811947 +0000 +@@ -332,7 +332,7 @@ main(int argc, /* I - Number of comm + const char *word2 = event + 4; /* Second word */ + + params = PARAMS_JOB; +- if (!strcmp(word2, "state")) ++ if (!strcmp(word2, "state-changed")) + signame = "JobState"; + else if (!strcmp(word2, "created")) + signame = "JobCreated"; diff --git a/cups.spec b/cups.spec index 7dbf9fa..c9fd1d6 100644 --- a/cups.spec +++ b/cups.spec @@ -8,7 +8,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.4.6 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2 Group: System Environment/Daemons Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2 @@ -67,6 +67,7 @@ Patch36: cups-ricoh-deviceid-oid.patch Patch37: cups-texttops-rotate-page.patch Patch38: cups-autotype-crash.patch Patch39: cups-str3754.patch +Patch40: cups-job-state-changed.patch Patch100: cups-lspp.patch @@ -276,6 +277,8 @@ module. %patch38 -p1 -b .autotype-crash # Don't crash when job queued for printer that times out (bug #660604). %patch39 -p1 -b .str3754 +# Fixed dbus notifier support for job-state-changed. +%patch40 -p1 -b .job-state-changed %if %lspp # LSPP support. @@ -573,6 +576,9 @@ rm -rf $RPM_BUILD_ROOT %{php_extdir}/phpcups.so %changelog +* Fri Feb 25 2011 Tim Waugh 1:1.4.6-5 +- Fixed dbus notifier support for job-state-changed. + * Thu Feb 10 2011 Jiri Popelka 1:1.4.6-4 - Remove testing cups-usb-buffer-size.patch (bug #661814).