rpms/system-config-printer/F-12 system-config-printer-autoselect-raw.patch, NONE, 1.1 system-config-printer-find-return-accel.patch, NONE, 1.1 system-config-printer-network-model.patch, NONE, 1.1 system-config-printer-physdev-traceback.patch, NONE, 1.1 system-config-printer.spec, 1.299, 1.300
Tim Waugh
twaugh at fedoraproject.org
Wed Oct 28 15:44:13 UTC 2009
Author: twaugh
Update of /cvs/pkgs/rpms/system-config-printer/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16495
Modified Files:
system-config-printer.spec
Added Files:
system-config-printer-autoselect-raw.patch
system-config-printer-find-return-accel.patch
system-config-printer-network-model.patch
system-config-printer-physdev-traceback.patch
Log Message:
* Wed Oct 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-4
- Determine make/model for network printers (bug #524321).
- Auto-select the correct driver entry for raw queues.
- Avoid traceback in PhysicalDevice.py.
- Let Return key activate the Find button for Find Network Printer.
system-config-printer-autoselect-raw.patch:
system-config-printer.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE system-config-printer-autoselect-raw.patch ---
diff -up system-config-printer-1.1.13/system-config-printer.py.autoselect-raw system-config-printer-1.1.13/system-config-printer.py
--- system-config-printer-1.1.13/system-config-printer.py.autoselect-raw 2009-09-30 16:54:07.363635374 +0100
+++ system-config-printer-1.1.13/system-config-printer.py 2009-09-30 16:54:19.189761633 +0100
@@ -3948,8 +3948,8 @@ class NewPrinterGUI(GtkGUI):
cupshelpers.ppds.ppdMakeModelSplit (makeandmodel)
else:
# Special CUPS names for a raw queue.
- self.auto_make = 'Raw'
- self.auto_model = 'Queue'
+ self.auto_make = 'Generic'
+ self.auto_model = 'Raw Queue'
try:
if self.dialog_mode == "ppd":
system-config-printer-find-return-accel.patch:
NewPrinterWindow.glade | 1 +
1 file changed, 1 insertion(+)
--- NEW FILE system-config-printer-find-return-accel.patch ---
diff -up system-config-printer-1.1.13/glade/NewPrinterWindow.glade.find-return-accel system-config-printer-1.1.13/glade/NewPrinterWindow.glade
--- system-config-printer-1.1.13/glade/NewPrinterWindow.glade.find-return-accel 2009-09-04 10:35:48.000000000 +0100
+++ system-config-printer-1.1.13/glade/NewPrinterWindow.glade 2009-09-30 16:50:36.981760810 +0100
@@ -2580,6 +2580,7 @@ DTR/DSR (Hardware)</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_btnNetworkFind_clicked" last_modification_time="Fri, 19 Dec 2008 16:04:53 GMT"/>
+ <accelerator key="Return" modifiers="0" signal="activate"/>
</widget>
<packing>
<property name="left_attach">2</property>
system-config-printer-network-model.patch:
system-config-printer.py | 6 ++++++
1 file changed, 6 insertions(+)
--- NEW FILE system-config-printer-network-model.patch ---
diff -up system-config-printer-1.1.13/system-config-printer.py.network-model system-config-printer-1.1.13/system-config-printer.py
--- system-config-printer-1.1.13/system-config-printer.py.network-model 2009-09-30 16:55:46.115760592 +0100
+++ system-config-printer-1.1.13/system-config-printer.py 2009-09-30 16:55:52.545635754 +0100
@@ -4217,6 +4217,12 @@ class NewPrinterGUI(GtkGUI):
if not self.install_hplip_plugin(self.device.uri):
self.on_NPCancel(None)
return
+
+ if not devid and self.device.type in ["socket", "lpd", "ipp"]:
+ # This is a network printer whose model we don't yet know.
+ # Try to discover it.
+ self.getNetworkPrinterMakeModel ()
+
uri = self.device.uri
if uri and uri.startswith ("smb://"):
uri = SMBURI (uri=uri[6:]).sanitize_uri ()
system-config-printer-physdev-traceback.patch:
PhysicalDevice.py | 2 ++
1 file changed, 2 insertions(+)
--- NEW FILE system-config-printer-physdev-traceback.patch ---
diff -up system-config-printer-1.1.13/PhysicalDevice.py.physdev-traceback system-config-printer-1.1.13/PhysicalDevice.py
--- system-config-printer-1.1.13/PhysicalDevice.py.physdev-traceback 2009-09-01 12:08:33.000000000 +0100
+++ system-config-printer-1.1.13/PhysicalDevice.py 2009-09-30 16:52:24.486760364 +0100
@@ -48,6 +48,8 @@ class PhysicalDevice:
hostport = ipparam[3:]
else:
return None
+ else:
+ return None
else:
(hostport, rest) = urllib.splithost (rest)
if hostport == None:
Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-12/system-config-printer.spec,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -p -r1.299 -r1.300
--- system-config-printer.spec 22 Sep 2009 10:05:56 -0000 1.299
+++ system-config-printer.spec 28 Oct 2009 15:44:13 -0000 1.300
@@ -7,7 +7,7 @@
Summary: A printer administration tool
Name: system-config-printer
Version: 1.1.13
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPLv2+
URL: http://cyberelk.net/tim/software/system-config-printer/
Group: System Environment/Base
@@ -21,6 +21,10 @@ Patch3: system-config-printer-publish-pr
Patch4: system-config-printer-iconify.patch
Patch5: system-config-printer-fetchdevices.patch
Patch6: system-config-printer-missing-import.patch
+Patch7: system-config-printer-find-return-accel.patch
+Patch8: system-config-printer-physdev-traceback.patch
+Patch9: system-config-printer-autoselect-raw.patch
+Patch10: system-config-printer-network-model.patch
BuildRequires: cups-devel >= 1.2
BuildRequires: python-devel >= 2.4
@@ -87,6 +91,10 @@ printers.
%patch4 -p1 -b .iconify
%patch5 -p1 -b .fetchdevices
%patch6 -p1 -b .missing-import
+%patch7 -p1 -b .find-return-accel
+%patch8 -p1 -b .physdev-traceback
+%patch9 -p1 -b .autoselect-raw
+%patch10 -p1 -b .network-model
%build
%configure --with-udev-rules --with-polkit-1
@@ -198,6 +206,12 @@ rm -rf %buildroot
exit 0
%changelog
+* Wed Oct 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-4
+- Determine make/model for network printers (bug #524321).
+- Auto-select the correct driver entry for raw queues.
+- Avoid traceback in PhysicalDevice.py.
+- Let Return key activate the Find button for Find Network Printer.
+
* Tue Sep 22 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-3
- Fixed missing import in probe_printer module.
- Fixed race when fetching device list (bug #521110).
More information about the fedora-extras-commits
mailing list