From f4f7ca146f69ba303c452f2fdf07176165c857db Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Mon, 4 Aug 2008 17:16:20 +0000
Subject: [PATCH] - 2.8.7. - Avoid hard-coded rpaths.

---
 .cvsignore |  1 +
 hplip.spec | 12 +++++++++---
 sources    |  2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 01a0e6b..66eaa4c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -24,3 +24,4 @@ hplip-2.8.2.tar.gz
 hplip-2.8.5.tar.gz
 hplip-2.8.6.tar.gz
 hplip-2.8.6b.tar.gz
+hplip-2.8.7.tar.gz
diff --git a/hplip.spec b/hplip.spec
index bac9d36..8404bb8 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
-Version: 2.8.6b
-Release: 2%{?dist}
+Version: 2.8.7
+Release: 1%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -131,6 +131,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 %configure --disable-foomatic-xml-install --disable-cups-install \
 	--enable-scan-build --enable-gui-build --enable-fax-build \
 	--disable-foomatic-rip-hplip-install --enable-dbus
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
 make hpppddir=%{_datadir}/foomatic/db/source/PPD/HP
 
 %install
@@ -172,6 +175,7 @@ find doc/images -type f -exec chmod 644 {} \;
 rm -f %{buildroot}%{_datadir}/hplip/hpaio.desc
 rm -f %{buildroot}%{_datadir}/hplip/hplip-install
 rm -rf %{buildroot}%{_datadir}/hplip/install.*
+rm -f %{buildroot}%{_datadir}/hplip/hpijs.drv.in.template
 
 # The systray applet doesn't work properly (displays icon as a
 # window), so don't ship the launcher yet.
@@ -303,7 +307,9 @@ fi
 exit 0
 
 %changelog
-* Mon Aug  4 2008 Tim Waugh <twaugh@redhat.com>
+* Mon Aug  4 2008 Tim Waugh <twaugh@redhat.com> 2.8.7-1
+- 2.8.7.
+- Avoid hard-coded rpaths.
 - New libs sub-package (bug #444016).
 
 * Thu Jul 31 2008 Tim Waugh <twaugh@redhat.com>
diff --git a/sources b/sources
index 9764c3d..1b7a65f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-66a7dbbf5b2928ef0c6f827d460016de  hplip-2.8.6b.tar.gz
+011593f03603f10259eb2fa41b1d64f2  hplip-2.8.7.tar.gz