From e6b603072986cc33cd30fc78cbda1391ff71234b Mon Sep 17 00:00:00 2001
From: Jiri Popelka <jpopelka@redhat.com>
Date: Tue, 6 Sep 2011 17:09:15 +0200
Subject: [PATCH] Fixed xsane crash when doing a multi-image scan (bug #725878)

---
 hplip.spec | 9 ++++++++-
 sources    | 1 -
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/hplip.spec b/hplip.spec
index f17c3e4..523e3b2 100644
--- a/hplip.spec
+++ b/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
@@ -33,6 +33,7 @@ Patch18: hplip-skip-blank-lines.patch
 Patch19: hplip-dbglog-newline.patch
 Patch20: hplip-no-system-tray.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
@@ -258,6 +259,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
 
@@ -529,6 +533,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).
 
diff --git a/sources b/sources
index 6c417fb..cf99d53 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-96f17f58a81cb76828112cb70d01615a  hplip-3.11.5.tar.gz
 5cb89a00b0c680d8bf9bf4b4f1f863b1  hplip-3.11.7.tar.gz