rpms/system-config-printer/F-10 system-config-printer-1.0.x.patch, 1.9, 1.10 system-config-printer.spec, 1.230, 1.231
Tim Waugh
twaugh at fedoraproject.org
Wed Dec 10 14:28:10 UTC 2008
Author: twaugh
Update of /cvs/pkgs/rpms/system-config-printer/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26726
Modified Files:
system-config-printer-1.0.x.patch system-config-printer.spec
Log Message:
* Wed Dec 10 2008 Tim Waugh <twaugh at redhat.com> 1.0.12-3
- Updated patch for 1.0.x changes:
- Fixed problem that prevented authentication prompt being
displayed.
system-config-printer-1.0.x.patch:
Index: system-config-printer-1.0.x.patch
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-10/system-config-printer-1.0.x.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- system-config-printer-1.0.x.patch 5 Dec 2008 16:13:16 -0000 1.9
+++ system-config-printer-1.0.x.patch 10 Dec 2008 14:27:39 -0000 1.10
@@ -1,7 +1,13 @@
-diff -U0 system-config-printer-1.0.12/ChangeLog.1.0.x system-config-printer-1.0.12/ChangeLog
---- system-config-printer-1.0.12/ChangeLog.1.0.x 2008-12-01 13:37:03.000000000 +0000
-+++ system-config-printer-1.0.12/ChangeLog 2008-12-05 16:05:29.000000000 +0000
-@@ -0,0 +1,16 @@
+diff --git a/ChangeLog b/ChangeLog
+index 2851eeb..9c79cd3 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,24 @@
++2008-12-09 Tim Waugh <twaugh at redhat.com>
++
++ * system-config-printer.py (GUI.populateList): Allow prompting
++ again even if we disallowed it for one operation.
++
+2008-12-04 Tim Waugh <twaugh at redhat.com>
+
+ * system-config-printer.py (GUI.fillPrinterTab): Localize a copy
@@ -18,9 +24,13 @@
+ representation, to allow for a separate localized in-memory copy.
+ (Printer.__del__): Remove the temporary PPD file.
+
-diff -up system-config-printer-1.0.12/cupshelpers/cupshelpers.py.1.0.x system-config-printer-1.0.12/cupshelpers/cupshelpers.py
---- system-config-printer-1.0.12/cupshelpers/cupshelpers.py.1.0.x 2008-11-30 22:47:27.000000000 +0000
-+++ system-config-printer-1.0.12/cupshelpers/cupshelpers.py 2008-12-05 16:05:29.000000000 +0000
+ 2008-12-01 Tim Waugh <twaugh at redhat.com>
+
+ * configure.in: Version 1.0.12.
+diff --git a/cupshelpers/cupshelpers.py b/cupshelpers/cupshelpers.py
+index a19034f..fcf0f2c 100755
+--- a/cupshelpers/cupshelpers.py
++++ b/cupshelpers/cupshelpers.py
@@ -38,11 +38,11 @@ class Printer:
self.connection = connection
self.class_members = []
@@ -65,9 +75,10 @@
def setOption(self, name, value):
"""
-diff -up system-config-printer-1.0.12/po/sv.po.1.0.x system-config-printer-1.0.12/po/sv.po
---- system-config-printer-1.0.12/po/sv.po.1.0.x 2008-11-30 22:47:27.000000000 +0000
-+++ system-config-printer-1.0.12/po/sv.po 2008-12-05 16:05:29.000000000 +0000
+diff --git a/po/sv.po b/po/sv.po
+index 5a6b7bc..8fcccab 100644
+--- a/po/sv.po
++++ b/po/sv.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: system-config-printer\n"
@@ -206,7 +217,7 @@
msgid "Status"
msgstr "Status"
-@@ -186,15 +194,23 @@ msgstr "Dokumentets utskriftsstatus (%s)
+@@ -186,15 +194,23 @@ msgstr "Dokumentets utskriftsstatus (%s)"
msgid "Message"
msgstr "Meddelande"
@@ -552,7 +563,7 @@
#, python-format
msgid "Maintenance command submitted as job %d"
msgstr "Underhållskommando skickat som jobb %d"
-@@ -535,53 +566,49 @@ msgstr "Underhållskommando skickat som
+@@ -535,53 +566,49 @@ msgstr "Underhållskommando skickat som jobb %d"
#. The underlying cupsGetPPD2() function returned NULL without
#. setting an IPP error, so it'll be something like a failed
#. connection.
@@ -851,7 +862,10 @@
-msgstr ""
-"HPLIP-programvara driver en skrivare eller skrivfunktionen för en "
-"multifunktionsenhet."
--
++#: ../system-config-printer.py:4497
++msgid "HPLIP software driving a printer, or the printer function of a multi-function device."
++msgstr "HPLIP-programvara driver en skrivare eller skrivfunktionen för en multifunktionsenhet."
+
-#: ../system-config-printer.py:4480
-msgid ""
-"HPLIP software driving a fax machine, or the fax function of a multi-"
@@ -859,10 +873,6 @@
-msgstr ""
-"HPLIP-programvara en fax-maskin eller faxfunktionen för en "
-"multifunktionsenhet."
-+#: ../system-config-printer.py:4497
-+msgid "HPLIP software driving a printer, or the printer function of a multi-function device."
-+msgstr "HPLIP-programvara driver en skrivare eller skrivfunktionen för en multifunktionsenhet."
-+
+#: ../system-config-printer.py:4500
+msgid "HPLIP software driving a fax machine, or the fax function of a multi-function device."
+msgstr "HPLIP-programvara en fax-maskin eller faxfunktionen för en multifunktionsenhet."
@@ -1023,7 +1033,7 @@
#, python-format
msgid "The '%s' driver cannot be used with printer '%s %s'."
msgstr "Drivrutinen \"%s\" kan inte användas med skrivaren \"%s %s\"."
-@@ -897,64 +901,59 @@ msgstr "Drivrutinen \"%s\" kan inte anvÃ
+@@ -897,64 +901,59 @@ msgstr "Drivrutinen \"%s\" kan inte användas med skrivaren \"%s %s\"."
#. This printer references some XML that is not
#. installed by default. Point the user at the
#. package they need to install.
@@ -1725,11 +1735,7 @@
"Omvänt landskap (270°)\n"
"Omvänt porträtt (180°)"
-+#: ../system-config-printer.glade.h:192
-+msgid "PostScript Printer Description (PPD) files can often be found on the driver disk that comes with the printer. For PostScript printers they are often part of the Windows<sup>®</sup> driver."
-+msgstr "PostScript-skrivarbeskrivningsfilen (PPD) kan ofta hittas på drivrutinsskivan som levereras med skrivaren. För PostScript-skrivare är de ofta en del av Windows<sup>®</sup>-drivrutinen."
-+
- #: ../system-config-printer.glade.h:193
+-#: ../system-config-printer.glade.h:193
-msgid ""
-"PostScript Printer Description (PPD) files can often be found on the driver "
-"disk that comes with the printer. For PostScript printers they are often "
@@ -1738,8 +1744,12 @@
-"PostScript-skrivarbeskrivningsfilen (PPD) kan ofta hittas på "
-"drivrutinsskivan som levereras med skrivaren. För PostScript-skrivare är de "
-"ofta en del av Windows<sup>®</sup>-drivrutinen."
--
++#: ../system-config-printer.glade.h:192
++msgid "PostScript Printer Description (PPD) files can often be found on the driver disk that comes with the printer. For PostScript printers they are often part of the Windows<sup>®</sup> driver."
++msgstr "PostScript-skrivarbeskrivningsfilen (PPD) kan ofta hittas på drivrutinsskivan som levereras med skrivaren. För PostScript-skrivare är de ofta en del av Windows<sup>®</sup>-drivrutinen."
+
-#: ../system-config-printer.glade.h:194
++#: ../system-config-printer.glade.h:193
msgid "Pretty print"
msgstr "Skönutskrift"
@@ -2451,7 +2461,7 @@
#: ../troubleshoot/QueueRejectingJobs.py:31
msgid "Queue Rejecting Jobs"
-@@ -2408,23 +2288,16 @@ msgid "The queue `%s' is rejecting jobs.
+@@ -2408,23 +2288,16 @@ msgid "The queue `%s' is rejecting jobs."
msgstr "Kön \"%s\" vägrar att ta emot jobb."
#: ../troubleshoot/QueueRejectingJobs.py:70
@@ -2496,7 +2506,7 @@
#: ../troubleshoot/ServerFirewalled.py:26
msgid "Check Server Firewall"
-@@ -2458,24 +2325,16 @@ msgstr "Det är inte möjligt att anslut
+@@ -2458,24 +2325,16 @@ msgstr "Det är inte möjligt att ansluta till servern."
#: ../troubleshoot/ServerFirewalled.py:42
#, python-format
@@ -4135,10 +4145,20 @@
#~ msgid "Unknown printer"
#~ msgstr "Okänd"
+
-diff -up system-config-printer-1.0.12/system-config-printer.py.1.0.x system-config-printer-1.0.12/system-config-printer.py
---- system-config-printer-1.0.12/system-config-printer.py.1.0.x 2008-11-30 22:47:27.000000000 +0000
-+++ system-config-printer-1.0.12/system-config-printer.py 2008-12-05 16:05:29.000000000 +0000
-@@ -1750,6 +1750,8 @@ class GUI(GtkGUI, monitor.Watcher):
+diff --git a/system-config-printer.py b/system-config-printer.py
+index 349c6f0..6a57522 100755
+--- a/system-config-printer.py
++++ b/system-config-printer.py
+@@ -858,6 +858,8 @@ class GUI(GtkGUI, monitor.Watcher):
+ show_IPP_Error(e, m, self.MainWindow)
+ self.printers = {}
+ self.default_printer = None
++
++ self.cups._set_prompt_allowed (True)
+ else:
+ self.printers = {}
+ self.default_printer = None
+@@ -1750,6 +1752,8 @@ class GUI(GtkGUI, monitor.Watcher):
try:
self.ppd = printer.getPPD()
@@ -4147,7 +4167,7 @@
except cups.IPPError, (e, m):
# Some IPP error other than IPP_NOT_FOUND.
show_IPP_Error(e, m, self.MainWindow)
-@@ -1988,19 +1990,20 @@ class GUI(GtkGUI, monitor.Watcher):
+@@ -1988,19 +1992,20 @@ class GUI(GtkGUI, monitor.Watcher):
return
ppd = self.ppd
ppd.markDefaults()
@@ -4172,7 +4192,7 @@
tab_label = self.lblPInstallOptions
else:
frame = gtk.Frame("<b>%s</b>" % group.text)
-@@ -5110,7 +5113,6 @@ class NewPrinterGUI(GtkGUI):
+@@ -5110,7 +5115,6 @@ class NewPrinterGUI(GtkGUI):
ppd = self.NPDrivers[nr]
elif self.rbtnNPPPD.get_active():
ppd = cups.PPD(self.filechooserPPD.get_filename())
@@ -4180,7 +4200,7 @@
else:
# PPD of the driver downloaded from OpenPrinting XXX
treeview = self.tvNPDownloadableDrivers
-@@ -5132,7 +5134,6 @@ class NewPrinterGUI(GtkGUI):
+@@ -5132,7 +5136,6 @@ class NewPrinterGUI(GtkGUI):
ppdfile.write(ppdcontent)
ppdfile.close()
ppd = cups.PPD(ppdname)
@@ -4188,7 +4208,7 @@
os.unlink(ppdname)
except RuntimeError, e:
-@@ -5188,7 +5189,6 @@ class NewPrinterGUI(GtkGUI):
+@@ -5188,7 +5191,6 @@ class NewPrinterGUI(GtkGUI):
if (ppd != "raw"):
f = self.mainapp.cups.getServerPPD(ppd)
ppd = cups.PPD(f)
@@ -4196,7 +4216,7 @@
os.unlink(f)
except AttributeError:
nonfatalException()
-@@ -5373,7 +5373,6 @@ class NewPrinterGUI(GtkGUI):
+@@ -5373,7 +5375,6 @@ class NewPrinterGUI(GtkGUI):
try:
filename = self.mainapp.cups.getPPD(name)
ppd = cups.PPD(filename)
Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-10/system-config-printer.spec,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -r1.230 -r1.231
--- system-config-printer.spec 5 Dec 2008 16:13:17 -0000 1.230
+++ system-config-printer.spec 10 Dec 2008 14:27:39 -0000 1.231
@@ -7,7 +7,7 @@
Summary: A printer administration tool
Name: system-config-printer
Version: 1.0.12
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+
URL: http://cyberelk.net/tim/software/system-config-printer/
Group: System Environment/Base
@@ -152,6 +152,11 @@
exit 0
%changelog
+* Wed Dec 10 2008 Tim Waugh <twaugh at redhat.com> 1.0.12-3
+- Updated patch for 1.0.x changes:
+ - Fixed problem that prevented authentication prompt being
+ displayed.
+
* Fri Dec 5 2008 Tim Waugh <twaugh at redhat.com> 1.0.12-2
- Added patch for 1.0.x changes since 1.0.12:
- Smarter PPD cache in cupshelpers module.
More information about the fedora-extras-commits
mailing list