Merge branch 'f13' into f14

hplip-deviceIDs-ppd.patch

@@ -185,3 +185,14 @@ diff -up hplip-3.10.2/prnt/ps/hp-laserjet_p2015x_series-ps.ppd.deviceIDs-ppd hpl
  *PSVersion: "(3010.107) 0"
  
  *%=================================================
+diff -up hplip-3.10.6/prnt/ps/hp-laserjet_4000_series-ps.ppd.deviceIDs-ppd hplip-3.10.6/prnt/ps/hp-laserjet_4000_series-ps.ppd
+--- hplip-3.10.6/prnt/ps/hp-laserjet_4000_series-ps.ppd.deviceIDs-ppd	2010-09-13 12:42:36.000000000 +0200
++++ hplip-3.10.6/prnt/ps/hp-laserjet_4000_series-ps.ppd	2010-09-13 12:45:07.000000000 +0200
+@@ -51,6 +51,7 @@
+ 
+ 
+ *% Product Version Information
++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 4000 Series;DES:Hewlett-Packard LaserJet 4000 Series"
+ *Product: "(HP LaserJet 4000 Series)"
+ *Product: "(Hewlett-Packard HP LaserJet 4000 Series)"
+ *ModelName: "HP LaserJet 4000 Series"

hplip-network-timeout.patch

@@ -0,0 +1,30 @@
+diff -up hplip-3.10.6/installer/core_install.py.network-timeout hplip-3.10.6/installer/core_install.py
+--- hplip-3.10.6/installer/core_install.py.network-timeout	2010-07-19 04:17:37.000000000 +0200
++++ hplip-3.10.6/installer/core_install.py	2010-09-20 11:35:54.000000000 +0200
+@@ -1546,7 +1546,7 @@ class CoreInstall(object):
+         wget = utils.which("wget")
+         if wget:
+             wget = os.path.join(wget, "wget")
+-            cmd = "%s --timeout=10 --output-document=- %s" % (wget, HTTP_GET_TARGET)
++            cmd = "%s --timeout=30 --output-document=- %s" % (wget, HTTP_GET_TARGET)
+             log.debug(cmd)
+             status, output = self.run(cmd)
+             log.debug("wget returned: %d" % status)
+@@ -1556,7 +1556,7 @@ class CoreInstall(object):
+             curl = utils.which("curl")
+             if curl:
+                 curl = os.path.join(curl, "curl")
+-                cmd = "%s --output - --connect-timeout 5 --max-time 10 %s" % (curl, HTTP_GET_TARGET)
++                cmd = "%s --output - --connect-timeout 15 --max-time 30 %s" % (curl, HTTP_GET_TARGET)
+                 log.debug(cmd)
+                 status, output = self.run(cmd)
+                 log.debug("curl returned: %d" % status)
+@@ -1567,7 +1567,7 @@ class CoreInstall(object):
+ 
+                 if ping:
+                     ping = os.path.join(ping, "ping")
+-                    cmd = "%s -c1 -W1 -w10 %s" % (ping, PING_TARGET)
++                    cmd = "%s -c1 -W3 -w30 %s" % (ping, PING_TARGET)
+                     log.debug(cmd)
+                     status, output = self.run(cmd)
+                     log.debug("ping returned: %d" % status)

hplip.spec

@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.10.6
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -33,6 +33,7 @@ Patch19: hplip-dbglog-newline.patch
 Patch20: hplip-no-system-tray.patch
 Patch21: hplip-openPPD.patch
 Patch22: hplip-ppd-ImageableArea.patch
+Patch23: hplip-network-timeout.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -45,6 +46,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
@@ -77,6 +79,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.
@@ -103,6 +106,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.
@@ -217,12 +221,15 @@ for ppd_file in $(grep '^diff' %{PATCH22} | cut -d " " -f 4);
 do
   gunzip ${ppd_file#*/}.gz
 done
-%patch22 -p1 -b .deviceIDs-ppd
+%patch22 -p1 -b .ImageableArea
 for ppd_file in $(grep '^diff' %{PATCH22} | cut -d " " -f 4);
 do
   gzip -n ${ppd_file#*/}
 done
 
+# Increase timeouts for curl, wget, ping for high latency networks (bug #635388).
+%patch23 -p1 -b .network-timeout
+
 sed -i.duplex-constraints \
     -e 's,\(UIConstraints.* \*Duplex\),//\1,' \
     prnt/drv/hpcups.drv.in
@@ -327,7 +334,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
@@ -391,7 +398,7 @@ rm -rf %{buildroot}
 %{_libdir}/libhpip.so.*
 %{_libdir}/libhpmud.so*
 # Python extension
-%{_libdir}/python*/site-packages/*
+%{python_sitearch}/*
 
 %files gui
 %defattr(-,root,root,-)
@@ -444,10 +451,29 @@ fi
 %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@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@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@redhat.com>
+- Added IEEE 1284 Device ID for HP LaserJet 4000 (bug #633227).
+
 * Fri Aug 20 2010 Tim Waugh <twaugh@redhat.com> - 3.10.6-3
 - Added another SNMP quirk for an OfficeJet Pro 8500 variant.