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

Merge branch 'f13' into f14

Browse Source
This commit is contained in:
Tim Waugh 2010-10-29 16:02:27 +01:00
commit f09b7beabe
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
system-config-printer-uint32.patch Normal file
View File

@ -0,0 +1,26 @@
diff -up system-config-printer-1.2.5/installdriver.py.uint32 system-config-printer-1.2.5/installdriver.py
--- system-config-printer-1.2.5/installdriver.py.uint32 2010-10-29 14:42:04.310843583 +0100
+++ system-config-printer-1.2.5/installdriver.py 2010-10-29 15:30:47.524996563 +0100
@@ -49,7 +49,8 @@ class PrinterDriversInstaller(dbus.servi
interaction = "hide-finished"
debugprint ("Calling InstallPrinterDrivers (%s, %s, %s)" %
(repr (xid), repr (resources), repr (interaction)))
- proxy.InstallPrinterDrivers (xid, resources, interaction,
+ proxy.InstallPrinterDrivers (dbus.UInt32 (xid),
+ resources, interaction,
reply_handler=reply_handler,
error_handler=error_handler,
timeout=3600)
diff -up system-config-printer-1.2.5/ppdsloader.py.uint32 system-config-printer-1.2.5/ppdsloader.py
--- system-config-printer-1.2.5/ppdsloader.py.uint32 2010-10-29 14:42:04.323844010 +0100
+++ system-config-printer-1.2.5/ppdsloader.py 2010-10-29 15:30:47.525996440 +0100
@@ -169,7 +169,8 @@ class PPDsLoader:
interaction = "hide-finished"
debugprint ("Calling InstallPrinterDrivers (%s, %s, %s)" %
(repr (xid), repr (resources), repr (interaction)))
- proxy.InstallPrinterDrivers (xid, resources, interaction,
+ proxy.InstallPrinterDrivers (dbus.UInt32 (xid),
+ resources, interaction,
reply_handler=self._packagekit_reply,
error_handler=self._packagekit_error,
timeout=3600)

9
system-config-printer.spec
View File

@ -7,7 +7,7 @@
Summary: A printer administration tool
Name: system-config-printer
Version: 1.2.5
Release: 5%{?dist}
Release: 6%{?dist}
License: GPLv2+
URL: http://cyberelk.net/tim/software/system-config-printer/
Group: System Environment/Base
@ -19,6 +19,7 @@ Source2: http://pypi.python.org/packages/source/p/pysmbc/pysmbc-%{pysmbc_version
Patch1: system-config-printer-InstallPrinterDrivers-debug.patch
Patch2: system-config-printer-mfg-mdl.patch
Patch3: system-config-printer-NPTLpdQueue.patch
Patch4: system-config-printer-uint32.patch
Patch101: pysmbc-doczip.patch
BuildRequires: cups-devel >= 1.2
BuildRequires: python-devel >= 2.4
@ -88,6 +89,9 @@ printers.
# Don't check ComboBoxEntry for allowed characters (bug #644131).
%patch3 -p1 -b .NPTLpdQueue
# Make sure InstallPrinterDrivers gets correctly typed values (bug #647270).
%patch4 -p1 -b .uint32
pushd pysmbc-%{pysmbc_version}
%patch101 -p1 -b .doczip
popd
@ -211,6 +215,9 @@ rm -rf %buildroot
exit 0
%changelog
* Fri Oct 29 2010 Tim Waugh <twaugh@redhat.com> - 1.2.5-6
- Make sure InstallPrinterDrivers gets correctly typed values (bug #647270).
* Sun Oct 24 2010 Jiri Popelka <jpopelka@redhat.com> 1.2.5-5
- Correct newly added NPTLpdQueue.patch (bug #646002).