1.3.9.
- Updated translations. - Improved check-device-ids output. - Removed incorrect warning when using CUPS >= 1.5.3.
This commit is contained in:
Tim Waugh
parent
c948927e87
commit
4e2ace70f4
1
.gitignore
vendored
1
.gitignore
vendored
@ -237,3 +237,4 @@ pycups-1.9.51.tar.bz2
|
||||
/system-config-printer-1.3.6.tar.xz
|
||||
/system-config-printer-1.3.7.tar.xz
|
||||
/system-config-printer-1.3.8.tar.xz
|
||||
/system-config-printer-1.3.9.tar.xz
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
ca04568dd7ff1ef7a381ad637d4e915b system-config-printer-1.3.8.tar.xz
|
||||
df424f127eede63965608e5ec5e27519 system-config-printer-1.3.9.tar.xz
|
||||
|
||||
@ -1,39 +0,0 @@
|
||||
diff -up system-config-printer-1.3.8/newprinter.py.debuginfo system-config-printer-1.3.8/newprinter.py
|
||||
--- system-config-printer-1.3.8/newprinter.py.debuginfo 2012-01-06 15:20:36.000000000 +0100
|
||||
+++ system-config-printer-1.3.8/newprinter.py 2012-01-30 15:44:03.860339396 +0100
|
||||
@@ -1429,7 +1429,7 @@ class NewPrinterGUI(GtkGUI):
|
||||
new_environ['LC_ALL'] = "C"
|
||||
new_environ['DISPLAY'] = ""
|
||||
args = ["hp-info", "-x", "-i", "-d" + faxuri]
|
||||
- debugprint (faxuri + ": " + args)
|
||||
+ debugprint (faxuri + ": " + repr(args))
|
||||
try:
|
||||
p = subprocess.Popen (args, env=new_environ, close_fds=True,
|
||||
stdin=file("/dev/null"),
|
||||
@@ -1459,7 +1459,7 @@ class NewPrinterGUI(GtkGUI):
|
||||
|
||||
def get_hplip_scan_type_for_uri(self, uri):
|
||||
args = ["hp-query", "-k", "scan-type", "-d", uri]
|
||||
- debugprint (uri + ": " + args)
|
||||
+ debugprint (uri + ": " + repr(args))
|
||||
try:
|
||||
p = subprocess.Popen (args, close_fds=True,
|
||||
stdin=file("/dev/null"),
|
||||
@@ -1488,7 +1488,7 @@ class NewPrinterGUI(GtkGUI):
|
||||
elif mode == "fax": mod = "-f"
|
||||
else: mod = "-c"
|
||||
args = ["hp-makeuri", mod, host]
|
||||
- debugprint (host + ": " + args)
|
||||
+ debugprint (host + ": " + repr(args))
|
||||
uri = None
|
||||
try:
|
||||
p = subprocess.Popen (args, close_fds=True,
|
||||
@@ -1528,7 +1528,7 @@ class NewPrinterGUI(GtkGUI):
|
||||
# Try to get make and model via SNMP
|
||||
if host:
|
||||
args = ["/usr/lib/cups/backend/snmp", host]
|
||||
- debugprint (host + ": " + args)
|
||||
+ debugprint (host + ": " + repr(args))
|
||||
stdout = None
|
||||
try:
|
||||
p = subprocess.Popen (args, close_fds=True,
|
||||
Binary file not shown.
BIN
system-config-printer-1.3.9.tar.xz.sig
Normal file
BIN
system-config-printer-1.3.9.tar.xz.sig
Normal file
Binary file not shown.
@ -1,31 +0,0 @@
|
||||
diff -up system-config-printer-1.3.8/ppdcache.py.ppdcache-enoent system-config-printer-1.3.8/ppdcache.py
|
||||
--- system-config-printer-1.3.8/ppdcache.py.ppdcache-enoent 2011-10-26 13:14:20.000000000 +0100
|
||||
+++ system-config-printer-1.3.8/ppdcache.py 2012-02-03 15:40:36.215015934 +0000
|
||||
@@ -123,14 +123,20 @@ class PPDCache:
|
||||
# Store an open file object, then remove the actual
|
||||
# file. This way we don't leave temporary files
|
||||
# around.
|
||||
- self._cache[name] = file (filename)
|
||||
- debugprint ("%s: caching %s (fd %d) "
|
||||
- "(%s) - %s" % (self, filename,
|
||||
- self._cache[name].fileno (),
|
||||
- modtime, status))
|
||||
- os.unlink (filename)
|
||||
- self._modtimes[name] = modtime
|
||||
+ try:
|
||||
+ self._cache[name] = file (filename)
|
||||
+ debugprint ("%s: caching %s (fd %d) "
|
||||
+ "(%s) - %s" % (self, filename,
|
||||
+ self._cache[name].fileno (),
|
||||
+ modtime, status))
|
||||
+ os.unlink (filename)
|
||||
+ self._modtimes[name] = modtime
|
||||
+ except IOError:
|
||||
+ # File disappeared?
|
||||
+ debugprint ("%s: file %s disappeared? Unable to cache it"
|
||||
+ % (self, filename))
|
||||
|
||||
+ # Now fetch it from our own cache.
|
||||
self.fetch_ppd (name, callback, check_uptodate=False)
|
||||
else:
|
||||
self._schedule_callback (callback, name,
|
||||
@ -1,14 +1,12 @@
|
||||
Summary: A printer administration tool
|
||||
Name: system-config-printer
|
||||
Version: 1.3.8
|
||||
Release: 4%{?dist}
|
||||
Version: 1.3.9
|
||||
Release: 1%{?dist}
|
||||
License: GPLv2+
|
||||
URL: http://cyberelk.net/tim/software/system-config-printer/
|
||||
Group: System Environment/Base
|
||||
Source0: http://cyberelk.net/tim/data/system-config-printer/1.3/%{name}-%{version}.tar.xz
|
||||
Patch1: system-config-printer-no-applet-in-gnome.patch
|
||||
Patch2: system-config-printer-1.3.8-debuginfo.patch
|
||||
Patch3: system-config-printer-ppdcache-enoent.patch
|
||||
BuildRequires: cups-devel >= 1.2
|
||||
BuildRequires: desktop-file-utils >= 0.2.92
|
||||
BuildRequires: gettext-devel
|
||||
@ -64,10 +62,6 @@ printers.
|
||||
|
||||
# Don't start the applet in GNOME.
|
||||
%patch1 -p1 -b .no-applet-in-gnome
|
||||
# Fix several debugprints (#785581)
|
||||
%patch2 -p1 -b .debugprint
|
||||
# Upstream patch to fix ppdcache traceback (bug #786232).
|
||||
%patch3 -p1 -b .ppdcache-enoent
|
||||
|
||||
%build
|
||||
%configure --with-udev-rules
|
||||
@ -188,6 +182,12 @@ if [ $1 -ge 1 ] ; then
|
||||
fi
|
||||
|
||||
%changelog
|
||||
* Thu Mar 1 2012 Tim Waugh <twaugh@redhat.com> 1.3.9-1
|
||||
- 1.3.9:
|
||||
- Updated translations.
|
||||
- Improved check-device-ids output.
|
||||
- Removed incorrect warning when using CUPS >= 1.5.3.
|
||||
|
||||
* Thu Feb 23 2012 Tim Waugh <twaugh@redhat.com> 1.3.8-4
|
||||
- Added version to python-cups dependency (bug #796678).
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user