rpms/system-config-printer
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Convert MFG and MDL to lowercase before D-Bus call to work around bug

Browse Source 
#566217.
This commit is contained in:
Tim Waugh 2010-02-17 16:15:41 +00:00
parent 428cafe142
commit de9c88b73f
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
system-config-printer-lowercase-mfg-mdl.patch Normal file
View File

@ -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,

8
system-config-printer.spec
View File

@ -7,7 +7,7 @@
Summary: A printer administration tool Summary: A printer administration tool
Name: system-config-printer Name: system-config-printer
Version: 1.1.91 Version: 1.1.91
Release: 2%{?dist} Release: 3%{?dist}
License: GPLv2+ License: GPLv2+
URL: http://cyberelk.net/tim/software/system-config-printer/ URL: http://cyberelk.net/tim/software/system-config-printer/
Group: System Environment/Base 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 Patch1: system-config-printer-no-epydoc.patch
Patch2: system-config-printer-device-settings.patch Patch2: system-config-printer-device-settings.patch
Patch3: system-config-printer-lowercase-mfg-mdl.patch
BuildRequires: cups-devel >= 1.2 BuildRequires: cups-devel >= 1.2
BuildRequires: python-devel >= 2.4 BuildRequires: python-devel >= 2.4
@ -77,6 +78,7 @@ printers.
%setup -q -a 1 -a 2 %setup -q -a 1 -a 2
%patch1 -p1 -b .no-epydoc %patch1 -p1 -b .no-epydoc
%patch2 -p1 -b .device-settings %patch2 -p1 -b .device-settings
%patch3 -p1 -b .lowercase-mfg-mdl
%build %build
%configure --with-udev-rules --with-polkit-1 %configure --with-udev-rules --with-polkit-1
@ -192,6 +194,10 @@ rm -rf %buildroot
exit 0 exit 0
%changelog %changelog
* Wed Feb 17 2010 Tim Waugh <twaugh@redhat.com> - 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 <twaugh@redhat.com> - 1.1.91-2 * Thu Feb 11 2010 Tim Waugh <twaugh@redhat.com> - 1.1.91-2
- Avoid clearing device settings when adding printer (bug #563989). - Avoid clearing device settings when adding printer (bug #563989).