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

Merge branch 'f14' into f15

Browse Source
This commit is contained in:
Tim Waugh 2011-02-25 12:52:59 +00:00
commit febbd65ad6
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cups-job-state-changed.patch Normal file
View File

@ -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";

8
cups.spec
View File

@ -13,7 +13,7 @@
Summary: Common Unix Printing System Summary: Common Unix Printing System
Name: cups Name: cups
Version: 1.4.6 Version: 1.4.6
Release: 10%{?dist} Release: 11%{?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
@ -74,6 +74,7 @@ Patch39: cups-str3754.patch
Patch40: cups-avahi.patch Patch40: cups-avahi.patch
Patch41: cups-icc.patch Patch41: cups-icc.patch
Patch42: cups-usb-parallel.patch Patch42: cups-usb-parallel.patch
Patch43: cups-job-state-changed.patch
Patch100: cups-lspp.patch Patch100: cups-lspp.patch
@ -293,6 +294,8 @@ module.
%patch41 -p1 -b .icc %patch41 -p1 -b .icc
# Till's patch to fix USB-Parallel adapter cable problem (bug #624564). # Till's patch to fix USB-Parallel adapter cable problem (bug #624564).
%patch42 -p1 -b .usb-parallel %patch42 -p1 -b .usb-parallel
# Fixed dbus notifier support for job-state-changed.
%patch43 -p1 -b .job-state-changed
%if %lspp %if %lspp
# LSPP support. # LSPP support.
@ -608,6 +611,9 @@ rm -rf $RPM_BUILD_ROOT
%{php_extdir}/phpcups.so %{php_extdir}/phpcups.so
%changelog %changelog
* Fri Feb 25 2011 Tim Waugh <twaugh@redhat.com> 1:1.4.6-11
- Fixed dbus notifier support for job-state-changed.
* Thu Feb 10 2011 Jiri Popelka <jpopelka@redhat.com> 1:1.4.6-10 * Thu Feb 10 2011 Jiri Popelka <jpopelka@redhat.com> 1:1.4.6-10
- Remove testing cups-usb-buffer-size.patch (bug #661814). - Remove testing cups-usb-buffer-size.patch (bug #661814).