rpms/system-config-printer/F-11 system-config-printer-troubleshoot-network-printers.patch, NONE, 1.1 system-config-printer.spec, 1.296, 1.297
Tim Waugh
twaugh at fedoraproject.org
Wed Oct 28 15:58:53 UTC 2009
Author: twaugh
Update of /cvs/pkgs/rpms/system-config-printer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20232
Modified Files:
system-config-printer.spec
Added Files:
system-config-printer-troubleshoot-network-printers.patch
Log Message:
* Wed Oct 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-4
- Troubleshoot: connect to the right server when choosing a network
queue (bug #531482).
system-config-printer-troubleshoot-network-printers.patch:
ChooseNetworkPrinter.py | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
--- NEW FILE system-config-printer-troubleshoot-network-printers.patch ---
diff -up system-config-printer-1.1.13/troubleshoot/ChooseNetworkPrinter.py.troubleshoot-network-printers system-config-printer-1.1.13/troubleshoot/ChooseNetworkPrinter.py
--- system-config-printer-1.1.13/troubleshoot/ChooseNetworkPrinter.py.troubleshoot-network-printers 2009-09-01 12:08:33.000000000 +0100
+++ system-config-printer-1.1.13/troubleshoot/ChooseNetworkPrinter.py 2009-10-28 15:57:10.771014583 +0000
@@ -2,8 +2,8 @@
## Printing troubleshooter
-## Copyright (C) 2008 Red Hat, Inc.
-## Copyright (C) 2008 Tim Waugh <twaugh at redhat.com>
+## Copyright (C) 2008, 2009 Red Hat, Inc.
+## Author: Tim Waugh <twaugh at redhat.com>
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -77,8 +77,9 @@ class ChooseNetworkPrinter(Question):
parent = self.troubleshooter.get_window ()
try:
- cups.setServer (server)
- self.op = TimedOperation (cups.Connection, parent=parent)
+ self.op = TimedOperation (cups.Connection,
+ kwargs={"host": server},
+ parent=parent)
c = self.op.run ()
self.op = TimedOperation (c.getDests, parent=parent)
dests = self.op.run ()
Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -p -r1.296 -r1.297
--- system-config-printer.spec 28 Oct 2009 15:55:15 -0000 1.296
+++ system-config-printer.spec 28 Oct 2009 15:58:53 -0000 1.297
@@ -26,6 +26,7 @@ Patch10: system-config-printer-network-m
Patch11: system-config-printer-no-cancel-properties-dialog.patch
Patch12: system-config-printer-jobs-window-visibility.patch
Patch13: system-config-printer-strip-zxs-pcl3.patch
+Patch14: system-config-printer-troubleshoot-network-printers.patch
BuildRequires: cups-devel >= 1.2
BuildRequires: python-devel >= 2.4
@@ -85,6 +86,7 @@ the configuration tool.
%patch11 -p1 -b .no-cancel-properties-dialog
%patch12 -p1 -b .jobs-window-visibility
%patch13 -p1 -b .strip-zxs-pcl3
+%patch14 -p1 -b .troubleshoot-network-printers
%build
%configure
@@ -187,6 +189,8 @@ exit 0
%changelog
* Wed Oct 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-4
+- Troubleshoot: connect to the right server when choosing a network
+ queue (bug #531482).
- Strip 'zxs' and 'pcl3' from make-and-model (bug #531048).
- Fixed visibility tracking for jobs window (bug #531438).
- Don't display properties dialog for first test page (bug #531490).
More information about the fedora-extras-commits
mailing list