Merge branch 'f14' into f15

hplip.spec

@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.11.7
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -36,6 +36,7 @@ Patch19: hplip-dbglog-newline.patch
 Patch20: hplip-no-system-tray.patch
 Patch21: hplip-cups15.patch
 Patch22: hplip-ppd-ImageableArea.patch
+Patch23: hplip-sane-crash.patch
 Patch25: hplip-raw_deviceID-traceback.patch
 Patch26: hplip-UnicodeDecodeError.patch
 Patch27: hplip-emit-SIGNAL.patch
@@ -265,6 +266,9 @@ do
   gzip -n ${ppd_file#*/}
 done
 
+# Fixed xsane crash when doing a multi-image scan (bug #725878)
+%patch23 -p1 -b .sane-crash
+
 # Fixed traceback on error condition in device.py (bug #628125).
 %patch25 -p1 -b .raw_deviceID-traceback
 
@@ -538,6 +542,9 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Tue Sep 06 2011 Jiri Popelka <jpopelka@redhat.com> 3.11.7-4
+- Fixed xsane crash when doing a multi-image scan (bug #725878)
+
 * Fri Sep  2 2011 Tim Waugh <twaugh@redhat.com> 3.11.7-3
 - Fixed hpcups crash when required plugin missing (bug #733461).
 

sources

@@ -1,2 +1 @@
-96f17f58a81cb76828112cb70d01615a  hplip-3.11.5.tar.gz
 5cb89a00b0c680d8bf9bf4b4f1f863b1  hplip-3.11.7.tar.gz