From da5da14e0e3c9e65a8057b7237bb07944f6e155f Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Fri, 28 Aug 2009 09:09:27 +0000
Subject: [PATCH] - Use dll.d file instead of post scriptlet for hpaio (bug
 #519988).

---
 hplip.spec | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/hplip.spec b/hplip.spec
index a19bfcb..8c8d3fe 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -179,6 +179,9 @@ desktop-file-install --vendor HP				\
 	--add-category Application				\
 	hplip.desktop
 
+%{__mkdir_p} %{buildroot}%{_sysconfdir}/sane.d/dll.d
+echo hpaio > %{buildroot}%{_sysconfdir}/sane.d/dll.d/hpaio
+
 # Images in docdir should not be executable (bug #440552).
 find doc/images -type f -exec chmod 644 {} \;
 
@@ -318,6 +321,7 @@ rm -rf %{buildroot}
 %files -n libsane-hpaio
 %defattr(-,root,root)
 %{_libdir}/sane/libsane-*.so*
+%config(noreplace) %{_sysconfdir}/sane.d/dll.d/hpaio
 
 %pre
 # No daemons any more.
@@ -332,16 +336,9 @@ fi
 %postun gui
 /usr/bin/update-desktop-database &>/dev/null ||:
 
-%post -n libsane-hpaio
-/sbin/ldconfig
-if [ -f /etc/sane.d/dll.conf ] && \
-   ! grep ^hpaio /etc/sane.d/dll.conf >/dev/null 2>/dev/null ; then \
-        echo hpaio >> /etc/sane.d/dll.conf; \
-fi
-exit 0
-
 %changelog
 * Fri Aug 28 2009 Tim Waugh <twaugh@redhat.com> 3.9.8-13
+- Use dll.d file instead of post scriptlet for hpaio (bug #519988).
 - Fixed RequiresPageRegion patch (bug #518756).
 
 * Thu Aug 27 2009 Tomas Mraz <tmraz@redhat.com> - 3.9.8-12