From 98e583d9223c2c3158c575d8f0777fb5f48a68f2 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Tue, 3 Apr 2007 12:53:42 +0000
Subject: [PATCH] - Link libsane-hpaio against libsane (bug #234813). -
 Resolves: rhbz#234813

---
 hplip-libsane.patch | 22 ++++++++++++++++++++++
 hplip.spec          |  7 +++++++
 2 files changed, 29 insertions(+)
 create mode 100644 hplip-libsane.patch

diff --git a/hplip-libsane.patch b/hplip-libsane.patch
new file mode 100644
index 0000000..d41c98f
--- /dev/null
+++ b/hplip-libsane.patch
@@ -0,0 +1,22 @@
+--- hplip-1.7.2/Makefile.in.libsane	2007-04-03 13:52:04.000000000 +0100
++++ hplip-1.7.2/Makefile.in	2007-04-03 13:53:17.000000000 +0100
+@@ -579,7 +579,7 @@
+ #      scan/sane/dime.c scan/sane/dime.h scan/sane/webScanStub.h scan/sane/webScanH.h scan/sane/stdsoap2.h scan/sane/webScan.nsmap
+ @SCAN_BUILD_TRUE@libsane_hpaio_la_LDFLAGS = -version-info $(MAJORVER):$(MINORVER):$(AGEVER) 
+ # The following is a interlibrary dependency that must be compiled first.
+-@SCAN_BUILD_TRUE@libsane_hpaio_la_LIBADD = libhpip.la libhplip-api.la
++@SCAN_BUILD_TRUE@libsane_hpaio_la_LIBADD = libhpip.la libhplip-api.la -lsane
+ #libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DSOAP_DEBUG
+ @SCAN_BUILD_TRUE@libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DWITH_LEAN
+ 
+--- hplip-1.7.2/Makefile.am.libsane	2007-04-03 13:52:04.000000000 +0100
++++ hplip-1.7.2/Makefile.am	2007-04-03 13:52:40.000000000 +0100
+@@ -192,7 +192,7 @@
+ #      scan/sane/dime.c scan/sane/dime.h scan/sane/webScanStub.h scan/sane/webScanH.h scan/sane/stdsoap2.h scan/sane/webScan.nsmap
+ libsane_hpaio_la_LDFLAGS = -version-info $(MAJORVER):$(MINORVER):$(AGEVER) 
+ # The following is a interlibrary dependency that must be compiled first.
+-libsane_hpaio_la_LIBADD = libhpip.la libhplip-api.la
++libsane_hpaio_la_LIBADD = libhpip.la libhplip-api.la -lsane
+ #libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DSOAP_DEBUG
+ libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DWITH_LEAN
+ 
diff --git a/hplip.spec b/hplip.spec
index f66fbd0..e9070d2 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -20,6 +20,7 @@ Patch4: hplip-cups-backend.patch
 Patch5: hplip-libm.patch
 Patch6: hplip-ipv6.patch
 Patch7: hplip-marker-supply.patch
+Patch8: hplip-libsane.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
 Requires: desktop-file-utils >= 0.2.92
@@ -85,6 +86,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # Use marker-supply-low IPP message.
 %patch7 -p1 -b .marker-supply
 
+# Link libsane-hpaio against libsane (bug #234813).
+%patch8 -p1 -b .libsane
+
 autoconf # for patch4
 
 %build
@@ -185,6 +189,9 @@ fi
 exit 0
 
 %changelog
+* Tue Apr  3 2007 Tim Waugh <twaugh@redhat.com>
+- Link libsane-hpaio against libsane (bug #234813).
+
 * Fri Mar 30 2007 Tim Waugh <twaugh@redhat.com>
 - Use marker-supply-low IPP message.