parent
2e7e08dee6
commit
7f9d7f8363
@ -1,6 +1,6 @@
|
||||
diff -up hplip-3.13.11/scan.py.scan-tmp hplip-3.13.11/scan.py
|
||||
--- hplip-3.13.11/scan.py.scan-tmp 2014-04-04 17:17:50.529576108 +0100
|
||||
+++ hplip-3.13.11/scan.py 2014-04-04 17:18:26.807727330 +0100
|
||||
diff -up hplip-3.14.4/scan.py.scan-tmp hplip-3.14.4/scan.py
|
||||
--- hplip-3.14.4/scan.py.scan-tmp 2014-04-04 11:42:20.000000000 +0100
|
||||
+++ hplip-3.14.4/scan.py 2014-04-29 17:20:05.653622531 +0100
|
||||
@@ -1072,7 +1072,7 @@ try:
|
||||
if ('editor' in dest or 'viewer' in dest or 'email' in dest or 'print' in dest) \
|
||||
and not file_saved:
|
||||
@ -10,3 +10,16 @@ diff -up hplip-3.13.11/scan.py.scan-tmp hplip-3.13.11/scan.py
|
||||
try:
|
||||
im.save(output)
|
||||
except IOError, e:
|
||||
diff -up hplip-3.14.4/scan/sane.py.scan-tmp hplip-3.14.4/scan/sane.py
|
||||
--- hplip-3.14.4/scan/sane.py.scan-tmp 2014-04-04 11:41:13.000000000 +0100
|
||||
+++ hplip-3.14.4/scan/sane.py 2014-04-29 17:21:34.663061497 +0100
|
||||
@@ -424,7 +424,8 @@ class ScanThread(threading.Thread):
|
||||
self.dev = device
|
||||
self.update_queue = update_queue
|
||||
self.event_queue = event_queue
|
||||
- self.buffer_fd, self.buffer_path = utils.make_temp_file(prefix='hpscan')
|
||||
+ self.buffer_fd, self.buffer_path = utils.make_temp_file(dir='/var/tmp',
|
||||
+ prefix='hpscan')
|
||||
self.buffer = os.fdopen(self.buffer_fd, "w+b")
|
||||
self.format = -1
|
||||
self.format_name = ''
|
||||
|
@ -7,7 +7,7 @@
|
||||
Summary: HP Linux Imaging and Printing Project
|
||||
Name: hplip
|
||||
Version: 3.14.4
|
||||
Release: 3%{?dist}
|
||||
Release: 4%{?dist}
|
||||
License: GPLv2+ and MIT
|
||||
|
||||
Url: http://hplip.sourceforge.net/
|
||||
@ -474,6 +474,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
|
||||
%postun libs -p /sbin/ldconfig
|
||||
|
||||
%changelog
|
||||
* Tue Apr 29 2014 Tim Waugh <twaugh@redhat.com> - 3.14.4-4
|
||||
- Fixed scan-tmp patch (bug #1076954).
|
||||
|
||||
* Tue Apr 22 2014 Tim Waugh <twaugh@redhat.com> - 3.14.4-3
|
||||
- Fix for last fix (bug #984167).
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user