[hplip: 6/6] Merge branch 'f13' into f14

[Jiří Popelka]

commit 63b2d70d127b805acc45d0c199615b8664c74489
Merge: 32ab38c 9600251
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Mon Sep 20 11:53:22 2010 +0200

    Merge branch 'f13' into f14

 hplip-deviceIDs-ppd.patch   |   11 +++++++++++
 hplip-network-timeout.patch |   30 ++++++++++++++++++++++++++++++
 hplip.spec                  |   34 ++++++++++++++++++++++++++++++----
 3 files changed, 71 insertions(+), 4 deletions(-)
---
diff --cc hplip.spec
index 36892ca,467fc11..46fa40b
--- a/hplip.spec
+++ b/hplip.spec
@@@ -444,10 -455,26 +451,29 @@@ f
  %post -n hpijs
  %{_bindir}/hpcups-update-ppds &>/dev/null ||:
  
+ %post libs -p /sbin/ldconfig
+ 
+ %postun libs -p /sbin/ldconfig
+ 
  %changelog
+ * Mon Sep 20 2010 Jiri Popelka <jpopelka at redhat.com> - 3.10.6-5
+ - Increased timeouts for curl, wget, ping for high latency networks (bug #635388).
+ 
 +* Sat Sep 18 2010 Dan Horák <dan[at]danny.cz> - 3.10.6-4
 +- drop the ExcludeArch for s390(x)
 +
+ * 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.
+   - Use python_sitearch macro.
+ 
 -* Tue Sep 13 2010 Jiri Popelka <jpopelka at redhat.com> - 3.10.6-4
++* Tue Sep 13 2010 Jiri Popelka <jpopelka at redhat.com>
+ - 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.