rpms/system-config-printer/devel system-config-printer-0.7.82.x.patch, 1.1, 1.2 system-config-printer.spec, 1.175, 1.176
Tim Waugh (twaugh)
fedora-extras-commits at redhat.com
Mon Mar 17 12:50:06 UTC 2008
- Previous message (by thread): rpms/system-config-printer/devel pycups-1.9.37.tar.bz2.sig, NONE, 1.1 .cvsignore, 1.162, 1.163 sources, 1.167, 1.168 system-config-printer.spec, 1.174, 1.175 pycups-1.9.36.tar.bz2.sig, 1.1, NONE
- Next message (by thread): rpms/system-config-printer/F-8 pycups-1.9.37.tar.bz2.sig, NONE, 1.1 .cvsignore, 1.157, 1.158 sources, 1.163, 1.164 system-config-printer-0.7.74.x.patch, 1.9, 1.10 system-config-printer.spec, 1.164, 1.165 pycups-1.9.35.tar.bz2.sig, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: twaugh
Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24672
Modified Files:
system-config-printer-0.7.82.x.patch
system-config-printer.spec
Log Message:
* Mon Mar 17 2008 Tim Waugh <twaugh at redhat.com> 0.7.82.1-3
- More fixes from upstream.
system-config-printer-0.7.82.x.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 system-config-printer-0.7.82.x.patch
Index: system-config-printer-0.7.82.x.patch
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer-0.7.82.x.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- system-config-printer-0.7.82.x.patch 5 Mar 2008 10:15:37 -0000 1.1
+++ system-config-printer-0.7.82.x.patch 17 Mar 2008 12:50:01 -0000 1.2
@@ -1,1174 +1,59123 @@
-diff -up system-config-printer-0.7.82.1/po/de.po.0.7.82.x system-config-printer-0.7.82.1/po/de.po
---- system-config-printer-0.7.82.1/po/de.po.0.7.82.x 2008-03-03 17:08:18.000000000 +0000
-+++ system-config-printer-0.7.82.1/po/de.po 2008-03-05 10:06:03.000000000 +0000
-@@ -13,12 +13,12 @@
- #
- msgid ""
+diff -up system-config-printer-0.7.82.1/Makefile.am.0.7.82.x system-config-printer-0.7.82.1/Makefile.am
+--- system-config-printer-0.7.82.1/Makefile.am.0.7.82.x 2008-03-03 17:08:18.000000000 +0000
++++ system-config-printer-0.7.82.1/Makefile.am 2008-03-17 12:45:42.000000000 +0000
+@@ -19,10 +19,13 @@ nobase_pkgdata_DATA= \
+ statereason.py \
+ system-config-printer.glade \
+ troubleshoot/base.py \
++ troubleshoot/CheckLocalServerPublishing.py \
+ troubleshoot/CheckNetworkServerSanity.py \
++ troubleshoot/CheckPPDSanity.py \
+ troubleshoot/CheckPrinterSanity.py \
+ troubleshoot/ChooseNetworkPrinter.py \
+ troubleshoot/ChoosePrinter.py \
++ troubleshoot/DeviceListed.py \
+ troubleshoot/ErrorLogCheckpoint.py \
+ troubleshoot/ErrorLogFetch.py \
+ troubleshoot/ErrorLogParse.py \
+diff -up system-config-printer-0.7.82.1/po/nl.po.0.7.82.x system-config-printer-0.7.82.1/po/nl.po
+--- system-config-printer-0.7.82.1/po/nl.po.0.7.82.x 2008-03-03 17:08:18.000000000 +0000
++++ system-config-printer-0.7.82.1/po/nl.po 2008-03-17 12:45:42.000000000 +0000
+@@ -11,7 +11,7 @@ msgid ""
msgstr ""
--"Project-Id-Version: system-config-printer 0.7.81\n"
-+"Project-Id-Version: system-config-printer\n"
+ "Project-Id-Version: system-config-printer\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/bugzilla\n"
-"POT-Creation-Date: 2008-03-03 17:02+0000\n"
--"PO-Revision-Date: 2008-02-29 11:39+0100\n"
-+"POT-Creation-Date: 2008-03-03 17:04+0000\n"
-+"PO-Revision-Date: 2008-03-04 00:11+0100\n"
- "Last-Translator: Fabian Affolter <fab at fedoraproject.org>\n"
--"Language-Team: German Translation Team <fedora-trans-de at redhat.com>\n"
-+"Language-Team: German <fedora-trans-de at redhat.com>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
-@@ -31,7 +31,9 @@ msgstr ""
++"POT-Creation-Date: 2008-03-10 11:01+0000\n"
+ "PO-Revision-Date: 2008-03-02 11:43+0100\n"
+ "Last-Translator: Peter van Egdom <p.van.egdom at gmail.com>\n"
+ "Language-Team: Dutch <fedora-trans-list at redhat.com>\n"
+@@ -24,7 +24,7 @@ msgstr ""
msgid "Idle"
- msgstr "Untätig"
+ msgstr "Inactief"
-#: ../cupshelpers.py:34 ../troubleshoot/PrintTestPage.py:35 ../applet.py:885
-+#: ../cupshelpers.py:34
-+#: ../troubleshoot/PrintTestPage.py:35
-+#: ../applet.py:885
++#: ../cupshelpers.py:34 ../troubleshoot/PrintTestPage.py:35 ../applet.py:883
msgid "Processing"
- msgstr "Ausführend"
+ msgstr "Verwerken"
-@@ -39,38 +41,49 @@ msgstr "Ausführend"
+@@ -32,7 +32,7 @@ msgstr "Verwerken"
msgid "Busy"
- msgstr "Beschäftigt"
+ msgstr "Bezig"
-#: ../cupshelpers.py:36 ../troubleshoot/PrintTestPage.py:36 ../applet.py:886
-+#: ../cupshelpers.py:36
-+#: ../troubleshoot/PrintTestPage.py:36
-+#: ../applet.py:886
++#: ../cupshelpers.py:36 ../troubleshoot/PrintTestPage.py:36 ../applet.py:884
msgid "Stopped"
- msgstr "Angehalten"
+ msgstr "Gestopt"
--#: ../cupshelpers.py:53 ../troubleshoot/ChooseNetworkPrinter.py:96
-+#: ../cupshelpers.py:53
-+#: ../troubleshoot/ChooseNetworkPrinter.py:96
- #: ../troubleshoot/ChooseNetworkPrinter.py:97
- #: ../troubleshoot/ChooseNetworkPrinter.py:100
+@@ -42,7 +42,8 @@ msgstr "Gestopt"
#: ../troubleshoot/ChooseNetworkPrinter.py:101
--#: ../troubleshoot/ChoosePrinter.py:85 ../troubleshoot/ChoosePrinter.py:86
--#: ../troubleshoot/ChoosePrinter.py:89 ../troubleshoot/ChoosePrinter.py:90
-+#: ../troubleshoot/ChoosePrinter.py:85
-+#: ../troubleshoot/ChoosePrinter.py:86
-+#: ../troubleshoot/ChoosePrinter.py:89
-+#: ../troubleshoot/ChoosePrinter.py:90
- #: ../applet.py:895
+ #: ../troubleshoot/ChoosePrinter.py:85 ../troubleshoot/ChoosePrinter.py:86
+ #: ../troubleshoot/ChoosePrinter.py:89 ../troubleshoot/ChoosePrinter.py:90
+-#: ../applet.py:895
++#: ../troubleshoot/DeviceListed.py:84 ../troubleshoot/DeviceListed.py:85
++#: ../applet.py:893
msgid "Unknown"
- msgstr "Unbekannt"
-
--#: ../my-default-printer.py:136 ../my-default-printer.desktop.in.h:1
-+#: ../my-default-printer.py:136
-+#: ../my-default-printer.desktop.in.h:1
- msgid "Default Printer"
- msgstr "Standarddrucker"
-
--#: ../my-default-printer.py:140 ../my-default-printer.py:171
-+#: ../my-default-printer.py:140
-+#: ../my-default-printer.py:171
- msgid "_Use System Default"
- msgstr "Standardeinstell_ung des Systems verwenden"
+ msgstr "Onbekend"
--#: ../my-default-printer.py:141 ../my-default-printer.py:173
-+#: ../my-default-printer.py:141
-+#: ../my-default-printer.py:173
- msgid "_Set Default"
- msgstr "_Standard setzen"
+@@ -59,11 +60,11 @@ msgid "_Set Default"
+ msgstr "Standaard _instellen"
--#: ../my-default-printer.py:151 ../troubleshoot/PrintTestPage.py:73
+ #: ../my-default-printer.py:151 ../troubleshoot/PrintTestPage.py:73
-#: ../applet.py:119 ../applet.py:159
-+#: ../my-default-printer.py:151
-+#: ../troubleshoot/PrintTestPage.py:73
-+#: ../applet.py:119
-+#: ../applet.py:159
++#: ../applet.py:118 ../applet.py:158
msgid "Printer"
- msgstr "Drucker"
+ msgstr "Printer"
-#: ../my-default-printer.py:155 ../system-config-printer.py:2373
-+#: ../my-default-printer.py:155
-+#: ../system-config-printer.py:2373
++#: ../my-default-printer.py:155 ../system-config-printer.py:2388
#: ../troubleshoot/ChooseNetworkPrinter.py:37
#: ../troubleshoot/ChoosePrinter.py:38
msgid "Location"
-@@ -84,11 +97,13 @@ msgstr "Konflikte mit:"
- msgid "Server Settings"
- msgstr "Serveroptionen"
-
--#: ../system-config-printer.py:366 ../system-config-printer.py:368
-+#: ../system-config-printer.py:366
-+#: ../system-config-printer.py:368
- msgid "Members of this class"
- msgstr "Mitglieder dieser Klasse"
-
--#: ../system-config-printer.py:367 ../system-config-printer.py:369
-+#: ../system-config-printer.py:367
-+#: ../system-config-printer.py:369
- msgid "Others"
- msgstr "Andere"
-
-@@ -108,7 +123,8 @@ msgstr "Modelle"
- msgid "Drivers"
- msgstr "Treiber"
-
--#: ../system-config-printer.py:374 ../system-config-printer.glade.h:107
-+#: ../system-config-printer.py:374
-+#: ../system-config-printer.glade.h:107
- msgid "Downloadable Drivers"
- msgstr "Herunterladbare Treiber"
-
-@@ -130,7 +146,8 @@ msgstr "Druckerkonfiguration - %s"
+@@ -123,28 +124,28 @@ msgstr "Printerconfiguratie - %s"
msgid "Connected to %s"
- msgstr "Verbunden mit %s"
+ msgstr "Verbonden met %s"
-#: ../system-config-printer.py:561 ../system-config-printer.py:1273
-+#: ../system-config-printer.py:561
-+#: ../system-config-printer.py:1273
++#: ../system-config-printer.py:561 ../system-config-printer.py:1271
msgid "Not connected"
- msgstr "Nicht verbunden"
+ msgstr "Niet verbonden"
+
+ # aanpassen hier iets beter dan bewerken.
+-#: ../system-config-printer.py:672
++#: ../system-config-printer.py:670
+ msgid "Local Printers"
+ msgstr "Lokale printers"
+
+-#: ../system-config-printer.py:673
++#: ../system-config-printer.py:671
+ msgid "Local Classes"
+ msgstr "Lokale klassen"
+
+-#: ../system-config-printer.py:674
++#: ../system-config-printer.py:672
[...60229 lines suppressed...]
++## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++## GNU General Public License for more details.
++
++## You should have received a copy of the GNU General Public License
++## along with this program; if not, write to the Free Software
++## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++
++import cups
++import gobject
++from base import *
++from base import _
++class DeviceListed(Question):
++ def __init__ (self, troubleshooter):
++ # Is the device listed?
++ Question.__init__ (self, troubleshooter, "Choose device")
++ page1 = self.initial_vbox (_("Choose Device"),
++ _("Please select the device you want "
++ "to use from the list below. "
++ "If it does not appear in the list, "
++ "select 'Not listed'."))
++ tv = gtk.TreeView ()
++ name = gtk.TreeViewColumn (_("Name"),
++ gtk.CellRendererText (), text=0)
++ info = gtk.TreeViewColumn (_("Information"),
++ gtk.CellRendererText (), text=1)
++ uri = gtk.TreeViewColumn (_("Device URI"),
++ gtk.CellRendererText (), text=2)
++ name.set_property ("resizable", True)
++ info.set_property ("resizable", True)
++ uri.set_property ("resizable", True)
++ tv.append_column (name)
++ tv.append_column (info)
++ tv.append_column (uri)
++ tv.set_rules_hint (True)
++ sw = gtk.ScrolledWindow ()
++ sw.set_policy (gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
++ sw.set_shadow_type (gtk.SHADOW_IN)
++ sw.add (tv)
++ page1.pack_start (sw, True, True, 0)
++ self.treeview = tv
++ troubleshooter.new_page (page1, self)
++
++ def display (self):
++ answers = self.troubleshooter.answers
++ if answers['cups_queue_listed']:
++ return False
++ if answers['printer_is_remote']:
++ return False
++
++ model = gtk.ListStore (gobject.TYPE_STRING,
++ gobject.TYPE_STRING,
++ gobject.TYPE_STRING,
++ gobject.TYPE_PYOBJECT)
++ self.treeview.set_model (model)
++ iter = model.append (None)
++ model.set (iter, 0, _("Not listed"), 1, '', 2, '', 3, None)
++
++ try:
++ cups.setServer ('')
++ c = cups.Connection ()
++ devices = c.getDevices ()
++ devices_list = []
++ for uri, device in devices.iteritems ():
++ if uri.find (':') == -1:
++ continue
++
++ if device.get('device-class') != 'direct':
++ continue
++
++ name = device.get('device-info', _("Unknown"))
++ info = device.get('device-make-and-model', _("Unknown"))
++ devices_list.append ((name, info, uri, device))
++
++ devices_list.sort (lambda x, y: cmp (x[0], y[0]))
++ for name, info, uri, device in devices_list:
++ iter = model.append (None)
++ model.set (iter, 0, name, 1, info, 2, uri, 3, device)
++
++ except cups.HTTPError:
++ pass
++ except cups.IPPError:
++ pass
++ except RuntimeError:
++ pass
++
++ return True
++
++ def connect_signals (self, handler):
++ self.signal_id = self.treeview.connect ("cursor-changed", handler)
++
++ def disconnect_signals (self):
++ self.treeview.disconnect (self.signal_id)
++
++ def can_click_forward (self):
++ model, iter = self.treeview.get_selection ().get_selected ()
++ if iter == None:
++ return False
++ return True
++
++ def collect_answer (self):
++ if not self.displayed:
++ return {}
++
++ model, iter = self.treeview.get_selection ().get_selected ()
++ device = model.get_value (iter, 3)
++ if device == None:
++ class enum_devices:
++ def __init__ (self, model):
++ self.devices = {}
++ model.foreach (self.each, None)
++
++ def each (self, model, path, iter, user_data):
++ uri = model.get_value (iter, 2)
++ device = model.get_value (iter, 3)
++ if device:
++ self.devices[uri] = device
++
++ return { 'cups_device_listed': False,
++ 'cups_devices_available': enum_devices (model).devices }
++ else:
++ uri = model.get_value (iter, 2)
++ return { 'cups_device_listed': True,
++ 'cups_device_uri': uri,
++ 'cups_device_attributes': device }
+diff -up /dev/null system-config-printer-0.7.82.1/troubleshoot/CheckLocalServerPublishing.py
+--- /dev/null 2008-03-17 09:07:56.686000901 +0000
++++ system-config-printer-0.7.82.1/troubleshoot/CheckLocalServerPublishing.py 2008-03-17 12:45:38.000000000 +0000
+@@ -0,0 +1,72 @@
++#!/usr/bin/env python
++
++## Printing troubleshooter
++
++## Copyright (C) 2008 Red Hat, Inc.
++## Copyright (C) 2008 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
++## the Free Software Foundation; either version 2 of the License, or
++## (at your option) any later version.
++
++## This program is distributed in the hope that it will be useful,
++## but WITHOUT ANY WARRANTY; without even the implied warranty of
++## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++## GNU General Public License for more details.
++
++## You should have received a copy of the GNU General Public License
++## along with this program; if not, write to the Free Software
++## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++
++import cups
++from base import *
++from base import _
++class CheckLocalServerPublishing(Question):
++ def __init__ (self, troubleshooter):
++ Question.__init__ (self, troubleshooter, "Is local server publishing?")
++ vbox = self.initial_vbox (_("Server Not Exporting Printers"),
++ _("Although one or more printers are marked "
++ "as being shared, this print server is "
++ "not exporting shared printers to the "
++ "network.") + '\n\n' +
++ _("Enable the 'Share published printers "
++ "connected to this system' option in "
++ "the server settings using the printing "
++ "administration tool.") + ' ' +
++ TEXT_start_print_admin_tool)
++ troubleshooter.new_page (vbox, self)
++
++ def display (self):
++ self.answers = {}
++ cups.setServer ('')
++ try:
++ c = cups.Connection ()
++ printers = c.getPrinters ()
++ if len (printers) == 0:
++ return False
++
++ for name, printer in printers.iteritems ():
++ if printer.get ('printer-is-shared', False):
++ break
++
++ attr = c.getPrinterAttributes (name)
++ except RuntimeError:
++ return False
++ except cups.IPPError:
++ return False
++
++ if not printer.get ('printer-is-shared', False):
++ return False
++
++ if attr.get ('server-is-sharing-printers', True):
++ # server-is-sharing-printers is in CUPS 1.4
++ return False
++
++ return True
++
++ def collect_answer (self):
++ if self.displayed:
++ return { 'local_server_exporting_printers': False }
++
++ return {}
Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- system-config-printer.spec 17 Mar 2008 12:43:54 -0000 1.175
+++ system-config-printer.spec 17 Mar 2008 12:50:01 -0000 1.176
@@ -5,7 +5,7 @@
Summary: A printer administration tool
Name: system-config-printer
Version: 0.7.82.1
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+
URL: http://cyberelk.net/tim/software/system-config-printer/
Group: System Environment/Base
@@ -133,8 +133,9 @@
exit 0
%changelog
-* Mon Mar 17 2008 Tim Waugh <twaugh at redhat.com>
+* Mon Mar 17 2008 Tim Waugh <twaugh at redhat.com> 0.7.82.1-3
- Updated pycups to 1.9.37.
+- More fixes from upstream.
* Wed Mar 5 2008 Tim Waugh <twaugh at redhat.com> 0.7.82.1-2
- Updated pycups to 1.9.36.
- Previous message (by thread): rpms/system-config-printer/devel pycups-1.9.37.tar.bz2.sig, NONE, 1.1 .cvsignore, 1.162, 1.163 sources, 1.167, 1.168 system-config-printer.spec, 1.174, 1.175 pycups-1.9.36.tar.bz2.sig, 1.1, NONE
- Next message (by thread): rpms/system-config-printer/F-8 pycups-1.9.37.tar.bz2.sig, NONE, 1.1 .cvsignore, 1.157, 1.158 sources, 1.163, 1.164 system-config-printer-0.7.74.x.patch, 1.9, 1.10 system-config-printer.spec, 1.164, 1.165 pycups-1.9.35.tar.bz2.sig, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list