rpms/system-config-printer/F-8 system-config-printer-0.7.74.x.patch, 1.8, 1.9 system-config-printer.spec, 1.162, 1.163 system-config-printer-state-reasons.patch, 1.1, NONE
Tim Waugh (twaugh)
fedora-extras-commits at redhat.com
Fri Mar 7 16:23:53 UTC 2008
Author: twaugh
Update of /cvs/pkgs/rpms/system-config-printer/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28596
Modified Files:
system-config-printer.spec
Added Files:
system-config-printer-0.7.74.x.patch
Removed Files:
system-config-printer-state-reasons.patch
Log Message:
* Fri Mar 7 2008 Tim Waugh <twaugh at redhat.com> 0.7.74.11-3
- Include troubleshooter from SVN.
system-config-printer-0.7.74.x.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.8 -r 1.9 system-config-printer-0.7.74.x.patch
Index: system-config-printer-0.7.74.x.patch
===================================================================
RCS file: system-config-printer-0.7.74.x.patch
diff -N system-config-printer-0.7.74.x.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ system-config-printer-0.7.74.x.patch 7 Mar 2008 16:23:45 -0000 1.9
@@ -0,0 +1,54299 @@
+diff -up system-config-printer-0.7.74.11/Makefile.am.0.7.74.x system-config-printer-0.7.74.11/Makefile.am
+--- system-config-printer-0.7.74.11/Makefile.am.0.7.74.x 2008-03-03 17:52:19.000000000 +0000
++++ system-config-printer-0.7.74.11/Makefile.am 2008-03-07 15:57:24.000000000 +0000
+@@ -4,17 +4,41 @@ nobase_pkgdata_SCRIPTS= \
+ ppds.py \
+ pysmb.py \
+ system-config-printer.py \
++ troubleshoot/__init__.py \
+ applet.py
+
+-nobase_pkgdata_DATA= \
+- config.py \
+- cupsd.py \
+- cupshelpers.py \
+- options.py \
+- optionwidgets.py \
+- probe_printer.py \
+- gtk_label_autowrap.py \
+- system-config-printer.glade \
++nobase_pkgdata_DATA= \
++ config.py \
++ cupsd.py \
++ cupshelpers.py \
++ options.py \
++ optionwidgets.py \
++ probe_printer.py \
++ gtk_label_autowrap.py \
++ 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 \
++ troubleshoot/LocalOrRemote.py \
++ troubleshoot/NetworkCUPSPrinterShared.py \
++ troubleshoot/PrinterStateReasons.py \
++ troubleshoot/PrintTestPage.py \
++ troubleshoot/QueueNotEnabled.py \
++ troubleshoot/QueueRejectingJobs.py \
++ troubleshoot/RemoteAddress.py \
++ troubleshoot/SchedulerNotRunning.py \
++ troubleshoot/ServerFirewalled.py \
++ troubleshoot/Shrug.py \
++ troubleshoot/Welcome.py \
+ applet.glade
+
+ nobase_sbin_SCRIPTS=\
+diff -up system-config-printer-0.7.74.11/po/de.po.0.7.74.x system-config-printer-0.7.74.11/po/de.po
+--- system-config-printer-0.7.74.11/po/de.po.0.7.74.x 2008-03-03 17:52:19.000000000 +0000
++++ system-config-printer-0.7.74.11/po/de.po 2008-03-07 15:57:24.000000000 +0000
+@@ -14,7 +14,7 @@ msgid ""
+ msgstr ""
+ "Project-Id-Version: system-config-printer.trunk.de\n"
+ "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/bugzilla\n"
+-"POT-Creation-Date: 2008-03-03 17:48+0000\n"
++"POT-Creation-Date: 2008-03-07 15:46+0000\n"
+ "PO-Revision-Date: 2008-01-29 22:35+0100\n"
+ "Last-Translator: Fabian Affolter <fab at fedoraproject.org>\n"
+ "Language-Team: <de at li.org>\n"
+@@ -30,7 +30,7 @@ msgstr ""
+ msgid "Idle"
+ msgstr "Bereit"
+
+-#: ../cupshelpers.py:28 ../applet.py:731
++#: ../cupshelpers.py:28 ../troubleshoot/PrintTestPage.py:35 ../applet.py:640
+ msgid "Processing"
+ msgstr "Verarbeite"
+
+@@ -38,11 +38,18 @@ msgstr "Verarbeite"
+ msgid "Busy"
+ msgstr "Beschäftigt"
+
+-#: ../cupshelpers.py:30 ../applet.py:732
++#: ../cupshelpers.py:30 ../troubleshoot/PrintTestPage.py:36 ../applet.py:641
+ msgid "Stopped"
+ msgstr "Angehalten"
+
+-#: ../cupshelpers.py:47 ../applet.py:741
++#: ../cupshelpers.py:47 ../troubleshoot/ChooseNetworkPrinter.py:96
++#: ../troubleshoot/ChooseNetworkPrinter.py:97
++#: ../troubleshoot/ChooseNetworkPrinter.py:100
++#: ../troubleshoot/ChooseNetworkPrinter.py:101
++#: ../troubleshoot/ChoosePrinter.py:85 ../troubleshoot/ChoosePrinter.py:86
++#: ../troubleshoot/ChoosePrinter.py:89 ../troubleshoot/ChoosePrinter.py:90
++#: ../troubleshoot/DeviceListed.py:84 ../troubleshoot/DeviceListed.py:85
++#: ../applet.py:650
+ msgid "Unknown"
+ msgstr "Unbekannt"
+
+@@ -59,11 +66,12 @@ msgid "_Set Default"
+ msgstr "_Standard setzen"
+
+ #: ../my-default-printer.py:148 ../system-config-printer.glade.h:198
+-#: ../applet.py:186 ../applet.py:226
++#: ../troubleshoot/PrintTestPage.py:73 ../applet.py:95 ../applet.py:135
+ msgid "Printer"
+ msgstr "Drucker"
+
+-#: ../my-default-printer.py:152
++#: ../my-default-printer.py:152 ../troubleshoot/ChooseNetworkPrinter.py:37
++#: ../troubleshoot/ChoosePrinter.py:38
+ msgid "Location"
+ msgstr "Ort"
+
+@@ -186,20 +194,20 @@ msgstr ""
+ "wenn diese Konflikte gelöst werden."
+
+ #: ../system-config-printer.py:1288 ../system-config-printer.py:1304
+-#: ../applet.py:349
++#: ../applet.py:258
+ msgid "Not authorized"
+ msgstr "Nicht berechtigt"
+
+-#: ../system-config-printer.py:1289 ../applet.py:350
++#: ../system-config-printer.py:1289 ../applet.py:259
+ msgid "The password may be incorrect."
+ msgstr "Das Passwort ist womöglich falsch."
+
+ #: ../system-config-printer.py:1292 ../system-config-printer.py:1325
+-#: ../applet.py:353
++#: ../applet.py:262
+ msgid "CUPS server error"
+ msgstr "CUPS-Serverfehler"
+
+-#: ../system-config-printer.py:1293 ../applet.py:354
++#: ../system-config-printer.py:1293 ../applet.py:263
+ #, python-format
+ msgid "There was an error during the CUPS operation: '%s'."
+ msgstr "Beim Betrieb von CUPS trat ein Fehler auf: '%s'."
+@@ -297,6 +305,7 @@ msgid "Cancel Tests"
+ msgstr "Tests abbrechen"
+
+ #: ../system-config-printer.py:1820 ../system-config-printer.glade.h:197
++#: ../troubleshoot/PrintTestPage.py:61
+ msgid "Print Test Page"
+ msgstr "Testseite drucken"
+
+@@ -829,7 +838,7 @@ msgstr "Beschreibung:"
+ msgid "Device"
+ msgstr "Gerät"
+
+-#: ../system-config-printer.glade.h:103
++#: ../system-config-printer.glade.h:103 ../troubleshoot/DeviceListed.py:40
+ msgid "Device URI"
+ msgstr "Geräte-URI"
+
+@@ -981,6 +990,8 @@ msgid "More"
+ msgstr "Mehr"
+
+ #: ../system-config-printer.glade.h:144
++#: ../troubleshoot/ChooseNetworkPrinter.py:35
++#: ../troubleshoot/ChoosePrinter.py:36 ../troubleshoot/DeviceListed.py:36
+ msgid "Name"
+ msgstr "Name"
+
+@@ -1090,7 +1101,8 @@ msgstr "Seiten pro Seite:"
+ msgid "Parity"
+ msgstr "Parität"
+
+-#: ../system-config-printer.glade.h:187 ../applet.glade.h:5
++#: ../system-config-printer.glade.h:187 ../troubleshoot/Welcome.py:64
++#: ../applet.glade.h:5
+ msgid "Password:"
+ msgstr "Passwort:"
+
+@@ -1363,235 +1375,611 @@ msgstr "Drucker konfigurieren"
+ msgid "Printing"
+ msgstr "Drucken"
+
+-#: ../applet.py:80
++#: ../statereason.py:73
+ msgid "Toner low"
+ msgstr "Wenig Toner"
+
+-#: ../applet.py:81
++#: ../statereason.py:74
+ #, python-format
+ msgid "Printer '%s' is low on toner."
+ msgstr "Drucker '%s' hat nur noch wenig Toner"
+
+-#: ../applet.py:82
++#: ../statereason.py:75
+ msgid "Toner empty"
+ msgstr "Toner leer"
+
+-#: ../applet.py:83
[...53906 lines suppressed...]
++
++ def _dump_answers (self):
++ debugprint (self.answers_as_text ())
++
++ def _report_traceback (self):
++ print "Traceback:"
++ (type, value, tb) = sys.exc_info ()
++ tblast = traceback.extract_tb (tb, limit=None)
++ if len (tblast):
++ tblast = tblast[:len (tblast) - 1]
++ extxt = traceback.format_exception_only (type, value)
++ for line in traceback.format_tb(tb):
++ print line.strip ()
++ print extxt[0].strip ()
++
++ def _display (self, question):
++ result = False
++ try:
++ result = question.display ()
++ except:
++ self._report_traceback ()
++
++ question.displayed = result
++ return result
++
++ def _can_click_forward (self, question):
++ try:
++ return question.can_click_forward ()
++ except:
++ self._report_traceback ()
++ return True
++
++ def _collect_answer (self, question):
++ try:
++ return question.collect_answer ()
++ except:
++ self._report_traceback ()
++ return {}
++
++QUESTIONS = ["Welcome",
++ "SchedulerNotRunning",
++ "CheckLocalServerPublishing",
++ "ChoosePrinter",
++ "CheckPrinterSanity",
++ "CheckPPDSanity",
++
++ "LocalOrRemote",
++ "DeviceListed",
++ "RemoteAddress",
++ "CheckNetworkServerSanity",
++ "ChooseNetworkPrinter",
++
++ "NetworkCUPSPrinterShared",
++
++ "QueueNotEnabled",
++ "QueueRejectingJobs",
++ "PrinterStateReasons",
++
++ "ServerFirewalled",
++ "ErrorLogCheckpoint",
++ "PrintTestPage",
++ "ErrorLogFetch",
++ "PrinterStateReasons",
++ "ErrorLogParse",
++ "Shrug"]
++
++def run (quitfn=None):
++ troubleshooter = Troubleshooter (quitfn)
++ modules_imported = []
++ for module in QUESTIONS:
++ try:
++ if not module in modules_imported:
++ exec ("from %s import %s" % (module, module))
++ exec ("%s.debug = %d" % (module, debug))
++ modules_imported.append (module)
++
++ exec ("%s (troubleshooter)" % module)
++ except:
++ troubleshooter._report_traceback ()
++ return troubleshooter
++
++if __name__ == "__main__":
++ import sys, getopt
++ base.debug = 0
++ try:
++ opts, args = getopt.gnu_getopt (sys.argv[1:], '',
++ ['debug'])
++ for opt, optarg in opts:
++ if opt == '--debug':
++ base.debug = 1
++ except getopt.GetoptError:
++ pass
++
++ import os.path
++ if sys.argv[0][0] != '/':
++ cwd = os.getcwd ()
++ path = cwd + os.path.sep + sys.argv[0]
++ else:
++ path = sys.argv[0]
++ sub = os.path.dirname (path)
++ root = os.path.dirname (sub)
++ debugprint ("Appending %s to path" % root)
++ sys.path.append (root)
++ run (gtk.main_quit)
++ gtk.main ()
+diff -up /dev/null system-config-printer-0.7.74.11/troubleshoot/Shrug.py
+--- /dev/null 2008-03-07 08:53:00.682001298 +0000
++++ system-config-printer-0.7.74.11/troubleshoot/Shrug.py 2008-03-07 15:57:24.000000000 +0000
+@@ -0,0 +1,91 @@
++#!/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.
++
++from base import *
++from base import _
++class Shrug(Question):
++ def __init__ (self, troubleshooter):
++ Question.__init__ (self, troubleshooter, "Shrug")
++ page = self.initial_vbox (_("Sorry!"),
++ _("I have not been able to work out what "
++ "the problem is, but I have collected "
++ "some useful information to put in a "
++ "bug report."))
++
++ sw = gtk.ScrolledWindow ()
++ textview = gtk.TextView ()
++ textview.set_editable (False)
++ sw.add (textview)
++ page.pack_start (sw)
++ self.buffer = textview.get_buffer ()
++
++ box = gtk.HButtonBox ()
++ box.set_border_width (0)
++ box.set_spacing (3)
++ box.set_layout (gtk.BUTTONBOX_END)
++ page.pack_start (box, False, False, 0)
++
++ self.copy = gtk.Button (stock='gtk-copy')
++ box.pack_start (self.copy, False, False, 0)
++
++ self.save = gtk.Button (stock='gtk-save')
++ box.pack_start (self.save, False, False, 0)
++
++ self.clipboard = gtk.Clipboard ()
++
++ troubleshooter.new_page (page, self)
++
++ def display (self):
++ self.buffer.set_text (self.troubleshooter.answers_as_text ())
++ return True
++
++ def connect_signals (self, handler):
++ self.copy_sigid = self.copy.connect ('clicked', self.on_copy_clicked)
++ self.save_sigid = self.save.connect ('clicked', self.on_save_clicked)
++
++ def disconnect_signals (self):
++ self.copy.disconnect (self.copy_sigid)
++ self.save.disconnect (self.save_sigid)
++
++ def on_copy_clicked (self, button):
++ text = self.buffer.get_text (self.buffer.get_start_iter (),
++ self.buffer.get_end_iter ())
++ self.clipboard.set_text (text)
++
++ def on_save_clicked (self, button):
++ dialog = gtk.FileChooserDialog (parent=self.troubleshooter.main,
++ action=gtk.FILE_CHOOSER_ACTION_SAVE,
++ buttons=('gtk-cancel',
++ gtk.RESPONSE_CANCEL,
++ 'gtk-save',
++ gtk.RESPONSE_OK))
++ dialog.set_do_overwrite_confirmation (True)
++ dialog.set_current_name ("troubleshoot.txt")
++ dialog.set_default_response (gtk.RESPONSE_OK)
++ response = dialog.run ()
++ dialog.hide ()
++ if response != gtk.RESPONSE_OK:
++ return
++
++ f = file (dialog.get_filename (), "w")
++ f.write (self.buffer.get_text (self.buffer.get_start_iter (),
++ self.buffer.get_end_iter ()))
++ del f
Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-8/system-config-printer.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- system-config-printer.spec 5 Mar 2008 10:15:54 -0000 1.162
+++ system-config-printer.spec 7 Mar 2008 16:23:46 -0000 1.163
@@ -3,7 +3,7 @@
Summary: A printer administration tool
Name: system-config-printer
Version: 0.7.74.11
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+
URL: http://cyberelk.net/tim/software/system-config-printer/
Group: System Environment/Base
@@ -11,7 +11,7 @@
Source1: pycups-%{pycups_version}.tar.bz2
Source2: system-config-printer.pam
Source3: system-config-printer.console
-Patch0: system-config-printer-state-reasons.patch
+Patch0: system-config-printer-0.7.74.x.patch
BuildRequires: cups-devel >= 1.2
BuildRequires: python-devel >= 2.4
@@ -53,7 +53,7 @@
%prep
%setup -q -a 1
-%patch0 -p1 -b .state-reasons
+%patch0 -p1 -b .0.7.74.x
%build
%configure
@@ -124,6 +124,9 @@
exit 0
%changelog
+* Fri Mar 7 2008 Tim Waugh <twaugh at redhat.com> 0.7.74.11-3
+- Include troubleshooter from SVN.
+
* Wed Mar 5 2008 Tim Waugh <twaugh at redhat.com> 0.7.74.11-2
- Updated pycups to 1.9.36.
- Include state-reasons work-around fix.
--- system-config-printer-state-reasons.patch DELETED ---
More information about the fedora-extras-commits
mailing list