- 0.7.79.
This commit is contained in:
parent
3ad8ee1cfa
commit
65f976ba32
@ -150,3 +150,4 @@ pycups-1.9.31.tar.bz2
|
|||||||
system-config-printer-0.7.78.tar.bz2
|
system-config-printer-0.7.78.tar.bz2
|
||||||
pycups-1.9.32.tar.bz2
|
pycups-1.9.32.tar.bz2
|
||||||
pycups-1.9.33.tar.bz2
|
pycups-1.9.33.tar.bz2
|
||||||
|
system-config-printer-0.7.79.tar.bz2
|
||||||
|
2
sources
2
sources
@ -1,2 +1,2 @@
|
|||||||
300a038e623c4192a68b4a43cf9b5dd8 system-config-printer-0.7.78.tar.bz2
|
|
||||||
f976bcb6669118d0b87662901a91f996 pycups-1.9.33.tar.bz2
|
f976bcb6669118d0b87662901a91f996 pycups-1.9.33.tar.bz2
|
||||||
|
b5693bf3d9ed271bde034cbe221bbab1 system-config-printer-0.7.79.tar.bz2
|
||||||
|
Binary file not shown.
BIN
system-config-printer-0.7.79.tar.bz2.sig
Normal file
BIN
system-config-printer-0.7.79.tar.bz2.sig
Normal file
Binary file not shown.
@ -1,63 +0,0 @@
|
|||||||
diff -up system-config-printer-0.7.78/print-applet.desktop.in.0.7.x system-config-printer-0.7.78/print-applet.desktop.in
|
|
||||||
--- system-config-printer-0.7.78/print-applet.desktop.in.0.7.x 2007-11-22 15:23:59.000000000 +0000
|
|
||||||
+++ system-config-printer-0.7.78/print-applet.desktop.in 2007-11-27 12:51:17.000000000 +0000
|
|
||||||
@@ -5,6 +5,6 @@ _Comment=System tray icon for managing p
|
|
||||||
Exec=/usr/bin/system-config-printer-applet
|
|
||||||
Terminal=false
|
|
||||||
Type=Application
|
|
||||||
-Icon=printer.png
|
|
||||||
+Icon=printer
|
|
||||||
X-KDE-autostart-after=panel
|
|
||||||
StartupNotify=false
|
|
||||||
diff -up system-config-printer-0.7.78/system-config-printer.py.0.7.x system-config-printer-0.7.78/system-config-printer.py
|
|
||||||
--- system-config-printer-0.7.78/system-config-printer.py.0.7.x 2007-11-22 15:23:59.000000000 +0000
|
|
||||||
+++ system-config-printer-0.7.78/system-config-printer.py 2007-11-27 12:51:17.000000000 +0000
|
|
||||||
@@ -3231,10 +3231,16 @@ class NewPrinterGUI(GtkGUI):
|
|
||||||
try:
|
|
||||||
cups.setServer (match.group (2))
|
|
||||||
c = cups.Connection ()
|
|
||||||
- attributes = c.getPrinterAttributes (match.group (4))
|
|
||||||
+ try:
|
|
||||||
+ attributes = c.getPrinterAttributes (uri = uri)
|
|
||||||
+ except TypeError: # uri keyword introduced in pycups 1.9.32
|
|
||||||
+ print "Fetching printer attributes by name"
|
|
||||||
+ attributes = c.getPrinterAttributes (match.group (4))
|
|
||||||
verified = True
|
|
||||||
+ except cups.IPPError (e, msg):
|
|
||||||
+ print "Failed to get attributes:", e, msg
|
|
||||||
except:
|
|
||||||
- pass
|
|
||||||
+ nonfatalError ()
|
|
||||||
else:
|
|
||||||
print uri
|
|
||||||
|
|
||||||
@@ -3279,9 +3285,8 @@ class NewPrinterGUI(GtkGUI):
|
|
||||||
printers = c.getPrinters ()
|
|
||||||
classes = c.getClasses ()
|
|
||||||
del c
|
|
||||||
- except RuntimeError:
|
|
||||||
- failed = True
|
|
||||||
- except cups.IPP_Error, (e, msg):
|
|
||||||
+ except:
|
|
||||||
+ nonfatalException()
|
|
||||||
failed = True
|
|
||||||
|
|
||||||
gtk.gdk.threads_enter()
|
|
||||||
diff -U0 system-config-printer-0.7.78/ChangeLog.0.7.x system-config-printer-0.7.78/ChangeLog
|
|
||||||
--- system-config-printer-0.7.78/ChangeLog.0.7.x 2007-11-22 15:23:59.000000000 +0000
|
|
||||||
+++ system-config-printer-0.7.78/ChangeLog 2007-11-27 12:51:17.000000000 +0000
|
|
||||||
@@ -0,0 +1,14 @@
|
|
||||||
+2007-11-27 Tim Waugh <twaugh@redhat.com>
|
|
||||||
+
|
|
||||||
+ * system-config-printer.py
|
|
||||||
+ (NewPrinterGUI.browse_ipp_queues_thread): Handle exceptions other
|
|
||||||
+ than RuntimeError and cups.IPPError (bug #252304).
|
|
||||||
+ (NewPrinterGUI.on_btnIPPVerify_clicked): Get printer attributes by
|
|
||||||
+ printer URI not name, to prevent pycups constructing a CUPS URI
|
|
||||||
+ (bug #252304).
|
|
||||||
+
|
|
||||||
+2007-11-22 Till Kamppeter <till.kamppeter@gmail.com>
|
|
||||||
+
|
|
||||||
+ * print-applet.desktop.in: Removed the last printer.png (Ubuntu package
|
|
||||||
+ did not build with Icon=printer.png in the .desktop file).
|
|
||||||
+
|
|
@ -4,8 +4,8 @@
|
|||||||
|
|
||||||
Summary: A printer administration tool
|
Summary: A printer administration tool
|
||||||
Name: system-config-printer
|
Name: system-config-printer
|
||||||
Version: 0.7.78
|
Version: 0.7.79
|
||||||
Release: 5%{?dist}
|
Release: 1%{?dist}
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: http://cyberelk.net/tim/software/system-config-printer/
|
URL: http://cyberelk.net/tim/software/system-config-printer/
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
@ -13,7 +13,6 @@ Source0: system-config-printer-%{version}.tar.bz2
|
|||||||
Source1: pycups-%{pycups_version}.tar.bz2
|
Source1: pycups-%{pycups_version}.tar.bz2
|
||||||
Source2: system-config-printer.pam
|
Source2: system-config-printer.pam
|
||||||
Source3: system-config-printer.console
|
Source3: system-config-printer.console
|
||||||
Patch100: system-config-printer-0.7.x.patch
|
|
||||||
|
|
||||||
BuildRequires: cups-devel >= 1.2
|
BuildRequires: cups-devel >= 1.2
|
||||||
BuildRequires: python-devel >= 2.4
|
BuildRequires: python-devel >= 2.4
|
||||||
@ -59,8 +58,6 @@ the configuration tool.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -a 1
|
%setup -q -a 1
|
||||||
|
|
||||||
%patch100 -p1 -b .0.7.x
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure
|
%configure
|
||||||
|
|
||||||
@ -109,6 +106,7 @@ rm -rf %buildroot
|
|||||||
%{_sbindir}/%{name}
|
%{_sbindir}/%{name}
|
||||||
%{_datadir}/%{name}/config.py*
|
%{_datadir}/%{name}/config.py*
|
||||||
%{_datadir}/%{name}/my-default-printer.py*
|
%{_datadir}/%{name}/my-default-printer.py*
|
||||||
|
%{_datadir}/%{name}/openprinting.py*
|
||||||
%{_datadir}/%{name}/options.py*
|
%{_datadir}/%{name}/options.py*
|
||||||
%{_datadir}/%{name}/optionwidgets.py*
|
%{_datadir}/%{name}/optionwidgets.py*
|
||||||
%{_datadir}/%{name}/probe_printer.py*
|
%{_datadir}/%{name}/probe_printer.py*
|
||||||
@ -131,6 +129,9 @@ rm -rf %buildroot
|
|||||||
exit 0
|
exit 0
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jan 25 2008 Tim Waugh <twaugh@redhat.com> 0.7.79-1
|
||||||
|
- 0.7.79.
|
||||||
|
|
||||||
* Wed Jan 23 2008 Tim Waugh <twaugh@redhat.com> 0.7.78-5
|
* Wed Jan 23 2008 Tim Waugh <twaugh@redhat.com> 0.7.78-5
|
||||||
- Updated to pycups-1.9.33.
|
- Updated to pycups-1.9.33.
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user