rpms/system-config-printer/F-10 system-config-printer-1.0.x.patch, 1.8, 1.9 system-config-printer.spec, 1.229, 1.230
Tim Waugh
twaugh at fedoraproject.org
Fri Dec 5 16:13:47 UTC 2008
- Previous message (by thread): rpms/aria2/F-8 import.log, NONE, 1.1 .cvsignore, 1.8, 1.9 aria2.spec, 1.7, 1.8 sources, 1.8, 1.9
- Next message (by thread): rpms/gutenprint/F-10 gutenprint-locale.patch, NONE, 1.1 gutenprint-selinux.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 gutenprint-O6.patch, 1.2, 1.3 gutenprint.spec, 1.40, 1.41 sources, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: twaugh
Update of /cvs/pkgs/rpms/system-config-printer/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10375
Modified Files:
system-config-printer.spec
Added Files:
system-config-printer-1.0.x.patch
Log Message:
* 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.
- Don't write back localized versions of globalized PPDs.
system-config-printer-1.0.x.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.8 -r 1.9 system-config-printer-1.0.x.patch
Index: system-config-printer-1.0.x.patch
===================================================================
RCS file: system-config-printer-1.0.x.patch
diff -N system-config-printer-1.0.x.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ system-config-printer-1.0.x.patch 5 Dec 2008 16:13:16 -0000 1.9
@@ -0,0 +1,4206 @@
+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 @@
++2008-12-04 Tim Waugh <twaugh at redhat.com>
++
++ * system-config-printer.py (GUI.fillPrinterTab): Localize a copy
++ of the PPD, retaining the original in-memory representation.
++ (GUI.fillPrinterOptions): Use the localized PPD for widget labels,
++ and the original PPD for value writebacks.
++ (NewPrinterGUI.getNPPPD): Don't localize PPDs here.
++ (NewPrinterGUI.on_btnNPApply_clicked): Likewise.
++
++2008-12-04 Tim Waugh <twaugh at redhat.com>
++
++ * cupshelpers/cupshelpers.py (Printer.__init__, Printer.getPPD):
++ Cache the temporary PPD filename instead of the in-memory
++ 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
+@@ -38,11 +38,11 @@ class Printer:
+ self.connection = connection
+ self.class_members = []
+ self.update (**kw)
++ self._ppd = None # load on demand
+
+- if self.is_class:
+- self._ppd = False
+- else:
+- self._ppd = None # load on demand
++ def __del__ (self):
++ if self._ppd != None:
++ os.unlink(self._ppd)
+
+ def __repr__ (self):
+ return "<cupshelpers.Printer \"%s\">" % self.name
+@@ -184,18 +184,21 @@ class Printer:
+ @returns: cups.PPD object, or False for raw queues
+ @raise cups.IPPError: IPP error
+ """
++ result = None
+ if self._ppd is None:
+ try:
+- filename = self.connection.getPPD(self.name)
+- self._ppd = cups.PPD(filename)
+- self._ppd.localize ()
+- os.unlink(filename)
++ self._ppd = self.connection.getPPD(self.name)
++ result = cups.PPD (self._ppd)
+ except cups.IPPError, (e, m):
+ if e == cups.IPP_NOT_FOUND:
+- self._ppd = False
++ result = False
+ else:
+ raise
+- return self._ppd
++
++ if result != False and self._ppd != None:
++ result = cups.PPD (self._ppd)
++
++ return result
+
+ 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
+@@ -10,8 +10,8 @@ msgid ""
+ msgstr ""
+ "Project-Id-Version: system-config-printer\n"
+ "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/bugzilla\n"
+-"POT-Creation-Date: 2008-11-28 17:44+0000\n"
+-"PO-Revision-Date: 2008-11-18 09:12-0500\n"
++"POT-Creation-Date: 2008-11-19 01:18+0000\n"
++"PO-Revision-Date: 2008-12-01 23:34+0100\n"
+ "Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
+ "Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
+ "MIME-Version: 1.0\n"
+@@ -43,22 +43,20 @@ msgid "Browse Servers"
+ msgstr "Bläddra servrar"
+
+ #: ../AdvancedServerSettings.py:92
+-msgid ""
+-"Usually print servers broadcast their queues. Specify print servers below "
+-"to periodically ask for queues instead."
+-msgstr ""
+-"Vanligtvis brukar skrivarservrar annonsera ut sina köer. Ange skrivarservrar "
+-"nedan att fråga periodiskt efter köer istället."
++msgid "Usually print servers broadcast their queues. Specify print servers below to periodically ask for queues instead."
++msgstr "Vanligtvis brukar skrivarservrar annonsera ut sina köer. Ange skrivarservrar nedan att fråga periodiskt efter köer istället."
+
+-#: ../AdvancedServerSettings.py:224
++#: ../AdvancedServerSettings.py:213
+ msgid "Enter IP address"
+ msgstr "Ange IP-adress"
+
+-#: ../authconn.py:30 ../system-config-printer.glade.h:251
++#: ../authconn.py:30
++#: ../system-config-printer.glade.h:250
+ msgid "Username:"
+ msgstr "Användarnamn:"
+
+-#: ../authconn.py:31 ../system-config-printer.glade.h:185
++#: ../authconn.py:31
++#: ../system-config-printer.glade.h:184
+ msgid "Password:"
+ msgstr "Lösenord:"
+
+@@ -74,31 +72,33 @@ msgstr "Autentisering"
+ msgid "Operation canceled"
+ msgstr "Operation avbruten"
+
+-#: ../authconn.py:265 ../authconn.py:267 ../errordialogs.py:77 ../pysmb.py:80
++#: ../authconn.py:264
++#: ../authconn.py:266
++#: ../errordialogs.py:77
++#: ../pysmb.py:80
+ #: ../pysmb.py:82
+ msgid "Not authorized"
+ msgstr "Inte behörig"
+
+-#: ../authconn.py:268 ../pysmb.py:83
++#: ../authconn.py:267
++#: ../pysmb.py:83
+ msgid "The password may be incorrect."
+ msgstr "Lösenordet kan vara felaktigt."
+
+-#: ../errordialogs.py:68 ../errordialogs.py:82
++#: ../errordialogs.py:68
++#: ../errordialogs.py:82
+ msgid "CUPS server error"
+ msgstr "Fel i CUPS-server"
+
+-#: ../errordialogs.py:69 ../troubleshoot/PrintTestPage.py:326
++#: ../errordialogs.py:69
++#: ../troubleshoot/PrintTestPage.py:322
+ #, python-format
+ msgid "There was an error during the CUPS operation: '%s'."
+ msgstr "Det inträffade ett fel vid CUPS-operationen \"%s\"."
+
+ #: ../errordialogs.py:78
+-msgid ""
+-"The password may be incorrect, or the server may be configured to deny "
+-"remote administration."
+-msgstr ""
+-"Lösenordet kan vara fel eller servern kan vara konfigurerad att neka "
+-"fjärradministration."
++msgid "The password may be incorrect, or the server may be configured to deny remote administration."
++msgstr "Lösenordet kan vara fel eller servern kan vara konfigurerad att neka fjärradministration."
+
+ #: ../errordialogs.py:84
+ msgid "Bad request"
+@@ -120,7 +120,8 @@ msgstr "Uppgradering krävs"
+ msgid "Server error"
+ msgstr "Serverfel"
+
+-#: ../errordialogs.py:94 ../system-config-printer.py:804
++#: ../errordialogs.py:94
++#: ../system-config-printer.py:804
+ msgid "Not connected"
+ msgstr "Inte ansluten"
+
+@@ -134,7 +135,8 @@ msgstr "status %s"
+ msgid "There was an HTTP error: %s."
+ msgstr "Ett HTTP-fel uppstod: %s."
+
+-#: ../jobviewer.py:185 ../troubleshoot/PrintTestPage.py:77
++#: ../jobviewer.py:185
++#: ../troubleshoot/PrintTestPage.py:77
+ msgid "Job"
+ msgstr "Jobb"
+
+@@ -142,13 +144,18 @@ msgstr "Jobb"
+ msgid "User"
+ msgstr "Användare"
+
+-#: ../jobviewer.py:187 ../troubleshoot/PrintTestPage.py:81
++#: ../jobviewer.py:187
++#: ../troubleshoot/PrintTestPage.py:81
+ msgid "Document"
+ msgstr "Dokument"
+
+-#: ../jobviewer.py:188 ../jobviewer.py:252 ../my-default-printer.py:158
+-#: ../system-config-printer.py:305 ../system-config-printer.py:898
+-#: ../system-config-printer.py:3182 ../troubleshoot/PrintTestPage.py:79
++#: ../jobviewer.py:188
++#: ../jobviewer.py:252
++#: ../my-default-printer.py:158
++#: ../system-config-printer.py:305
++#: ../system-config-printer.py:898
[...3813 lines suppressed...]
+ #~ msgstr " och "
+-
+ #~ msgid ""
+ #~ ".\n"
+ #~ "They must begin with letters."
+ #~ msgstr ""
+ #~ ".\n"
+ #~ "De måste börja med bokstäver."
+-
+ #~ msgid ""
+ #~ "\n"
+ #~ "on the last screen."
+ #~ msgstr ""
+ #~ "\n"
+ #~ "på den sista skärmen."
+-
+ #~ msgid "Print US _Letter Postscript Test Page"
+ #~ msgstr "Skriv ut Postscript-testsida i US _Letter-format"
+-
+ #~ msgid ""
+ #~ "Translate \n"
+ #~ " => \r\n"
+ #~ msgstr ""
+ #~ "Ãversätt \n"
+ #~ " => \r\n"
+-
+ #~ msgid "You cannot edit an imported printer."
+ #~ msgstr "Du kan inte redigera en importerad skrivare."
+-
+ #~ msgid "Apply Changes and Restart LPD"
+ #~ msgstr "Verkställ ändringar och starta om LPD"
+-
+ #~ msgid "Raw"
+ #~ msgstr "RÃ¥"
+-
+ #~ msgid "%s queue on local device %s"
+ #~ msgstr "%s-kö på lokala enheten %s"
+-
+ #~ msgid "%s lpd queue %s@%s"
+ #~ msgstr "%s-lpd-kö %s@%s"
+-
+ #~ msgid "%s SMB queue on share %s"
+ #~ msgstr "%s-SMB-kö på utdelningen %s"
+-
+ #~ msgid "%s Novell queue %s on server %s"
+ #~ msgstr "%s-Novell-kö %s på servern %s"
+-
+ #~ msgid "%s JetDirect queue %s:%s"
+ #~ msgstr "%s-JetDirect-kö %s:%s"
+-
+ #~ msgid "%s unknown queue type %s"
+ #~ msgstr "%s okänd kötyp %s"
+-
+ #~ msgid ""
+ #~ "This queue is in an unknown format.\n"
+ #~ "Cannot Edit."
+ #~ msgstr ""
+ #~ "Denna kö är i ett okänt format.\n"
+ #~ "Kan inte redigera."
+-
+ #~ msgid ""
+ #~ "You must select a valid name.\n"
+ #~ "Use only the characters -,a-z,A-Z,0-9,_ please."
+ #~ msgstr ""
+ #~ "Du måste ange ett giltigt namn.\n"
+ #~ "Använd endast tecknen -,a-z,A-Z,0-9,_ är du snäll."
+-
+ #~ msgid "Another print queue is already using \"%s\" as a name."
+ #~ msgstr "En annan utskriftskö använder redan \"%s\" som namn."
+-
+ #~ msgid "You must select a valid name for an alias.\n"
+ #~ msgstr "Du måste välja ett giltigt namn på ett alias.\n"
+-
+ #~ msgid ""
+ #~ "You do not seem to have the samba client installed.\n"
+ #~ "You will not be able to print to SMB servers.\n"
+@@ -4152,7 +3561,6 @@ msgstr "Välj standardskrivare"
+ #~ "Du verkar inte ha samba-klienten installerad.\n"
+ #~ "Du kommer inte att kunna skriva ut till SMB-servrar.\n"
+ #~ "Ãverväg att installera rpm-paketet \"samba-client\"."
+-
+ #~ msgid ""
+ #~ "You do not seem to have the nprint program installed.\n"
+ #~ "You will not be able to print to NCP servers.\n"
+@@ -4161,30 +3569,24 @@ msgstr "Välj standardskrivare"
+ #~ "Du verkar inte ha programmet nprint installerat.\n"
+ #~ "Du kommer inte att kunna skriva ut till NCP-servrar.\n"
+ #~ "Ãverväg att installera rpm-paketet \"ncpfs\"."
+-
+ #~ msgid ""
+ #~ "Exiting will discard your unsaved changes.\n"
+ #~ "Continue?"
+ #~ msgstr ""
+ #~ "Att avsluta kommer att förkasta alla osparade ändringar.\n"
+ #~ "Fortsätta?"
+-
+ #~ msgid ""
+ #~ "FIXME:%s\n"
+ #~ "This feature is incomplete, and under development."
+ #~ msgstr ""
+ #~ "FIXME:%s\n"
+ #~ "Denna finess är ofullständig och under utveckling."
+-
+ #~ msgid "<b>Download Printer Driver</b>"
+ #~ msgstr "<b>Hämta skrivardrivrutin</b>"
+-
+ #~ msgid "<b>Installed Options</b>"
+ #~ msgstr "<b>Installerade alternativ</b>"
+-
+ #~ msgid "<b>Printers to be members of this Class</b>"
+ #~ msgstr "<b>Skrivare som ska vara medlemmar av denna klass</b>"
+-
+ #~ msgid "<b>Select Connection</b>"
+ #~ msgstr "<b>Välj anslutning</b>"
+
+@@ -4723,6 +4125,10 @@ msgstr "Välj standardskrivare"
+ #~ msgstr "Visa utskrifts_kö"
+
+ #, fuzzy
++#~ msgid "Printer IP:"
++#~ msgstr "Skrivare"
++
++#, fuzzy
+ #~ msgid "Select a print driver for your printer."
+ #~ msgstr "Välj skrivare från databasen"
+
+@@ -4749,3 +4155,4 @@ msgstr "Välj standardskrivare"
+ #, fuzzy
+ #~ 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):
+
+ try:
+ self.ppd = printer.getPPD()
++ self.ppd_local = printer.getPPD()
++ self.ppd_local.localize()
+ 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):
+ return
+ ppd = self.ppd
+ ppd.markDefaults()
++ self.ppd_local.markDefaults()
+
+ hasInstallableOptions = False
+
+ # build option tabs
+- for group in ppd.optionGroups:
++ for group in self.ppd_local.optionGroups:
+ if group.name == "InstallableOptions":
+ hasInstallableOptions = True
+ container = self.vbPInstallOptions
+ tab_nr = self.ntbkPrinter.page_num(self.swPInstallOptions)
+ if tab_nr == -1:
+- self.ntbkPrinter.insert_page(
+- self.swPInstallOptions, gtk.Label(group.text),
+- self.static_tabs)
++ self.ntbkPrinter.insert_page(self.swPInstallOptions,
++ gtk.Label(group.text),
++ self.static_tabs)
+ tab_label = self.lblPInstallOptions
+ else:
+ frame = gtk.Frame("<b>%s</b>" % group.text)
+@@ -5110,7 +5113,6 @@ class NewPrinterGUI(GtkGUI):
+ ppd = self.NPDrivers[nr]
+ elif self.rbtnNPPPD.get_active():
+ ppd = cups.PPD(self.filechooserPPD.get_filename())
+- ppd.localize ()
+ else:
+ # PPD of the driver downloaded from OpenPrinting XXX
+ treeview = self.tvNPDownloadableDrivers
+@@ -5132,7 +5134,6 @@ class NewPrinterGUI(GtkGUI):
+ ppdfile.write(ppdcontent)
+ ppdfile.close()
+ ppd = cups.PPD(ppdname)
+- ppd.localize ()
+ os.unlink(ppdname)
+
+ except RuntimeError, e:
+@@ -5188,7 +5189,6 @@ class NewPrinterGUI(GtkGUI):
+ if (ppd != "raw"):
+ f = self.mainapp.cups.getServerPPD(ppd)
+ ppd = cups.PPD(f)
+- ppd.localize ()
+ os.unlink(f)
+ except AttributeError:
+ nonfatalException()
+@@ -5373,7 +5373,6 @@ class NewPrinterGUI(GtkGUI):
+ try:
+ filename = self.mainapp.cups.getPPD(name)
+ ppd = cups.PPD(filename)
+- ppd.localize ()
+ os.unlink(filename)
+ except cups.IPPError, (e, msg):
+ if e == cups.IPP_NOT_FOUND:
Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-10/system-config-printer.spec,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -r1.229 -r1.230
--- system-config-printer.spec 1 Dec 2008 14:23:42 -0000 1.229
+++ system-config-printer.spec 5 Dec 2008 16:13:17 -0000 1.230
@@ -7,7 +7,7 @@
Summary: A printer administration tool
Name: system-config-printer
Version: 1.0.12
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
URL: http://cyberelk.net/tim/software/system-config-printer/
Group: System Environment/Base
@@ -15,6 +15,8 @@
Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
+Patch0: system-config-printer-1.0.x.patch
+
BuildRequires: cups-devel >= 1.2
BuildRequires: python-devel >= 2.4
BuildRequires: libsmbclient-devel >= 3.2
@@ -60,6 +62,7 @@
%prep
%setup -q -a 1 -a 2
+%patch0 -p1 -b .1.0.x
%build
%configure
@@ -149,6 +152,11 @@
exit 0
%changelog
+* 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.
+ - Don't write back localized versions of globalized PPDs.
+
* Mon Dec 1 2008 Tim Waugh <twaugh at redhat.com> 1.0.12-1
- Updated to 1.0.12:
- Don't automatically replace network printer URIs with
- Previous message (by thread): rpms/aria2/F-8 import.log, NONE, 1.1 .cvsignore, 1.8, 1.9 aria2.spec, 1.7, 1.8 sources, 1.8, 1.9
- Next message (by thread): rpms/gutenprint/F-10 gutenprint-locale.patch, NONE, 1.1 gutenprint-selinux.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 gutenprint-O6.patch, 1.2, 1.3 gutenprint.spec, 1.40, 1.41 sources, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list