From 744b8f82c0b0b8c5aff189d09d3da79835125e4d Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Fri, 15 Feb 2013 17:07:56 +0000
Subject: [PATCH] Fixed STR #4232 fix (STR #4276).

---
 cups-icc.patch | 2 +-
 cups.spec      | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/cups-icc.patch b/cups-icc.patch
index 3e5db6c..ee4079c 100644
--- a/cups-icc.patch
+++ b/cups-icc.patch
@@ -517,7 +517,7 @@ index 0000000..bd06e1c
 +                                         "DeleteDevice");
 +
 +  dbus_message_iter_init_append(message, &args);
-+  dbus_message_iter_append_basic(&args, DBUS_TYPE_OBJECT_PATH, &device_id);
++  dbus_message_iter_append_basic(&args, DBUS_TYPE_OBJECT_PATH, &device_path);
 +
 +  /* send syncronous */
 +  dbus_error_init(&error);
diff --git a/cups.spec b/cups.spec
index 0acfb16..e54f180 100644
--- a/cups.spec
+++ b/cups.spec
@@ -12,7 +12,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.5.4
-Release: 24%{?dist}
+Release: 25%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -763,6 +763,9 @@ rm -f %{cups_serverbin}/backend/smb
 %{_mandir}/man5/ipptoolfile.5.gz
 
 %changelog
+* Fri Feb 15 2013 Jiri Popelka <jpopelka@redhat.com> 1:1.5.4-25
+- Fixed STR #4232 fix (STR #4276).
+
 * Fri Jan 18 2013 Jiri Popelka <jpopelka@redhat.com> 1:1.5.4-24
 - Add quirk rule for Canon MP210 (#847923).