From 1e1fb0cb5d1abf60657e6d41590b18bf1487ee88 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Thu, 11 Dec 2008 12:28:29 +0000
Subject: [PATCH] - Rediff libsane patch.

---
 hplip-libsane.patch | 26 +++++++++++++-------------
 hplip.spec          |  5 ++++-
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/hplip-libsane.patch b/hplip-libsane.patch
index a420023..f9c70b4 100644
--- a/hplip-libsane.patch
+++ b/hplip-libsane.patch
@@ -1,24 +1,24 @@
-diff -up hplip-2.8.6/Makefile.am.libsane hplip-2.8.6/Makefile.am
---- hplip-2.8.6/Makefile.am.libsane	2008-06-23 12:13:10.000000000 +0100
-+++ hplip-2.8.6/Makefile.am	2008-06-23 12:14:24.000000000 +0100
-@@ -187,7 +187,7 @@ else
- libsane_hpaio_la_LDFLAGS = $(BB_SCAN_VERSION)
+diff -up hplip-2.8.10/Makefile.am.libsane hplip-2.8.10/Makefile.am
+--- hplip-2.8.10/Makefile.am.libsane	2008-10-31 22:25:17.000000000 +0000
++++ hplip-2.8.10/Makefile.am	2008-12-11 12:26:58.000000000 +0000
+@@ -194,7 +194,7 @@ else
+ libsane_hpaio_la_LDFLAGS = -version-info 1:0:0
  endif
  # The following is a interlibrary dependency that must be compiled first.
 -libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la $(DBUS_LIBS) -lcups
 +libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la $(DBUS_LIBS) -lcups -lsane
  #libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DSOAP_DEBUG
- libsane_hpaio_la_CFLAGS = $(DBUS_CFLAGS) $(BB_SCAN_CFLAGS)
+ libsane_hpaio_la_CFLAGS = $(DBUS_CFLAGS) 
  
-diff -up hplip-2.8.6/Makefile.in.libsane hplip-2.8.6/Makefile.in
---- hplip-2.8.6/Makefile.in.libsane	2008-06-23 12:13:10.000000000 +0100
-+++ hplip-2.8.6/Makefile.in	2008-06-23 12:14:39.000000000 +0100
-@@ -1679,7 +1679,7 @@ lib_LTLIBRARIES = $(am__append_4)
- @DARWIN_BUILD_FALSE@@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LDFLAGS = $(BB_SCAN_VERSION)
- @DARWIN_BUILD_TRUE@@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LDFLAGS = -module -framework CoreFoundation $(BB_SCAN_VERSION)
+diff -up hplip-2.8.10/Makefile.in.libsane hplip-2.8.10/Makefile.in
+--- hplip-2.8.10/Makefile.in.libsane	2008-10-31 22:27:27.000000000 +0000
++++ hplip-2.8.10/Makefile.in	2008-12-11 12:26:58.000000000 +0000
+@@ -2653,7 +2653,7 @@ dist_unrel_DATA = 
+ @DARWIN_BUILD_FALSE@@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LDFLAGS = -version-info 1:0:0
+ @DARWIN_BUILD_TRUE@@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LDFLAGS = -module -framework CoreFoundation -version-info 1:0:0
  # The following is a interlibrary dependency that must be compiled first.
 -@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la $(DBUS_LIBS) -lcups
 +@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la $(DBUS_LIBS) -lcups -lsane
  #libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DSOAP_DEBUG
- @HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_CFLAGS = $(DBUS_CFLAGS) $(BB_SCAN_CFLAGS)
+ @HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_CFLAGS = $(DBUS_CFLAGS) 
  
diff --git a/hplip.spec b/hplip.spec
index 5501dc3..7cdf5ef 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 2.8.10
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -301,6 +301,9 @@ fi
 exit 0
 
 %changelog
+* Thu Dec 11 2008 Tim Waugh <twaugh@redhat.com> 2.8.10-2
+- Rediff libsane patch.
+
 * Thu Dec 11 2008 Tim Waugh <twaugh@redhat.com> 2.8.10-1
 - 2.8.10.  No longer need gzip-n or quiet patches.