Merge branch 'f12' into f13

hplip.spec

@@ -48,6 +48,7 @@ Requires(preun): /sbin/chkconfig
 Requires: hpijs = %{hpijs_epoch}:%{version}-%{release}
 Requires: %{name}-libs = %{version}-%{release}
 Requires: python-imaging
+Requires: cups
 
 BuildRequires: net-snmp-devel
 BuildRequires: cups-devel
@@ -80,6 +81,7 @@ Summary: HPLIP libraries
 Group: System Environment/Libraries
 License: GPLv2+ and MIT
 Requires: %{name}-common = %{version}-%{release}
+Requires: python
 
 %description libs
 Libraries needed by HPLIP.
@@ -106,6 +108,7 @@ Epoch: %{hpijs_epoch}
 Requires: %{name}-libs = %{version}-%{release}
 Requires: net-snmp
 Requires: cupsddk-drivers
+Requires: cups
 
 %description -n hpijs
 hpijs is a collection of optimized drivers for HP printers.
@@ -332,7 +335,7 @@ rm -rf %{buildroot}
 %{_bindir}/hp-timedate
 %{_bindir}/hp-unload
 %{_bindir}/hp-wificonfig
-# Note: this must be /usr/lib not %{_libdir}, since that's the
+# Note: this must be /usr/lib not %%{_libdir}, since that's the
 # CUPS serverbin directory.
 /usr/lib/cups/backend/hp
 /usr/lib/cups/backend/hpfax
@@ -449,7 +452,19 @@ fi
 %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@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@redhat.com> - 3.10.6-4
 - Added IEEE 1284 Device ID for HP LaserJet 4000 (bug #633227).