rpms/hplip/devel hplip.spec,1.233,1.234

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1551

Modified Files:
	hplip.spec 
Log Message:
* Fri Aug 28 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-13
- Use dll.d file instead of post scriptlet for hpaio (bug #519988).



Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -p -r1.233 -r1.234
--- hplip.spec	28 Aug 2009 08:39:48 -0000	1.233
+++ hplip.spec	28 Aug 2009 09:09:27 -0000	1.234
@@ -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 at 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 at redhat.com> - 3.9.8-12