[hplip/f13/master: 2/3] Merge branch 'f12' into f13

[Tim Waugh]

commit 1e701bb34f78e4abdd4b37ba1739e6936250ecca
Merge: 82aad95 7d0656f
Author: Tim Waugh <twaugh at redhat.com>
Date:   Wed Sep 15 12:15:28 2010 +0100

    Merge branch 'f12' into f13

 hplip.spec |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)
---
diff --cc hplip.spec
index 2714b5d,5c0ca5f..072be75
--- a/hplip.spec
+++ b/hplip.spec
@@@ -48,6 -45,8 +48,7 @@@ Requires(preun): /sbin/chkconfi
  Requires: hpijs = %{hpijs_epoch}:%{version}-%{release}
  Requires: %{name}-libs = %{version}-%{release}
  Requires: python-imaging
 -Requires: hal
+ Requires: cups
  
  BuildRequires: net-snmp-devel
  BuildRequires: cups-devel
@@@ -449,10 -415,19 +452,22 @@@ f
  %post -n hpijs
  %{_bindir}/hpcups-update-ppds &>/dev/null ||:
  
+ %post libs -p /sbin/ldconfig
+ 
+ %postun libs -p /sbin/ldconfig
+ 
  %changelog
+ * Wed Sep 15 2010 Tim Waugh <twaugh at redhat.com>
+ - Fixes from package review:
+   - Main package and hpijs sub-package require cups for directories.
+   - The common sub-package requires udev for directories.
+   - The libs sub-package requires python for directories.
+   - Avoided macro in comment.
+   - The lib sub-package now runs ldconfig for post/postun.
+ 
 +* Tue Sep 13 2010 Jiri Popelka <jpopelka at redhat.com> - 3.10.6-4
 +- Added IEEE 1284 Device ID for HP LaserJet 4000 (bug #633227).
 +
  * Fri Aug 20 2010 Tim Waugh <twaugh at redhat.com> - 3.10.6-3
  - Added another SNMP quirk for an OfficeJet Pro 8500 variant.