From de9c88b73fbbbb616498eff7e873de76e5d4159d Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Wed, 17 Feb 2010 16:15:41 +0000 Subject: [PATCH] - Convert MFG and MDL to lowercase before D-Bus call to work around bug #566217. --- system-config-printer-lowercase-mfg-mdl.patch | 12 ++++++++++++ system-config-printer.spec | 8 +++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 system-config-printer-lowercase-mfg-mdl.patch diff --git a/system-config-printer-lowercase-mfg-mdl.patch b/system-config-printer-lowercase-mfg-mdl.patch new file mode 100644 index 0000000..7255696 --- /dev/null +++ b/system-config-printer-lowercase-mfg-mdl.patch @@ -0,0 +1,12 @@ +diff -up system-config-printer-1.1.91/installdriver.py.lowercase-mfg-mdl system-config-printer-1.1.91/installdriver.py +--- system-config-printer-1.1.91/installdriver.py.lowercase-mfg-mdl 2010-02-08 17:25:56.000000000 +0000 ++++ system-config-printer-1.1.91/installdriver.py 2010-02-17 15:49:19.064410563 +0000 +@@ -43,6 +43,8 @@ class PrinterDriversInstaller(dbus.servi + obj = bus.get_object ("org.freedesktop.PackageKit", + "/org/freedesktop/PackageKit") + proxy = dbus.Interface (obj, "org.freedesktop.PackageKit.Modify") ++ mfg = mfg.lower () ++ mdl = mdl.lower () + proxy.InstallPrinterDrivers (0, ["MFG:%s;MDL:%s;" % (mfg, mdl)], + "hide-finished", + reply_handler=reply_handler, diff --git a/system-config-printer.spec b/system-config-printer.spec index be99460..0cb9450 100644 --- a/system-config-printer.spec +++ b/system-config-printer.spec @@ -7,7 +7,7 @@ Summary: A printer administration tool Name: system-config-printer Version: 1.1.91 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: http://cyberelk.net/tim/software/system-config-printer/ Group: System Environment/Base @@ -17,6 +17,7 @@ Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2 Patch1: system-config-printer-no-epydoc.patch Patch2: system-config-printer-device-settings.patch +Patch3: system-config-printer-lowercase-mfg-mdl.patch BuildRequires: cups-devel >= 1.2 BuildRequires: python-devel >= 2.4 @@ -77,6 +78,7 @@ printers. %setup -q -a 1 -a 2 %patch1 -p1 -b .no-epydoc %patch2 -p1 -b .device-settings +%patch3 -p1 -b .lowercase-mfg-mdl %build %configure --with-udev-rules --with-polkit-1 @@ -192,6 +194,10 @@ rm -rf %buildroot exit 0 %changelog +* Wed Feb 17 2010 Tim Waugh - 1.1.91-3 +- Convert MFG and MDL to lowercase before D-Bus call to work around + bug #566217. + * Thu Feb 11 2010 Tim Waugh - 1.1.91-2 - Avoid clearing device settings when adding printer (bug #563989).