- 3.10.6.

- Changed shebang /usr/bin/env python -> /usr/bin/python (bug #618351). - Corrected IEEE 1284 Device IDs: - HP Color LaserJet CP1518ni (bug #613689). - HP Color LaserJet 2600n (bug #613712).
2010-07-27 10:33:37 +00:00 · 2010-07-27 10:33:37 +00:00 · 2624b83f8a
commit 2624b83f8a
parent e41360ae7d
8 changed files with 510 additions and 185 deletions
--- a/.cvsignore
+++ b/.cvsignore
@ -35,3 +35,4 @@ hplip-3.9.12.tar.gz
 hplip-3.10.2.tar.gz
 hpcups-update-ppds.sh
 hplip-3.10.5.tar.gz
+hplip-3.10.6.tar.gz
--- a/hplip-3.10.5.tar.gz.asc
+++ b/hplip-3.10.5.tar.gz.asc
@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-iEYEABECAAYFAkvrPtwACgkQc9dwzaWQR7kBQQCg5QMDPz05Oz1r9aQtk7drg8mQ
-wxEAoMYrbJ7YkjqWyhsK/04y8tqZ022U
-=H4Nc
-----END PGP SIGNATURE-----
--- a/hplip-3.10.6.tar.gz.asc
+++ b/hplip-3.10.6.tar.gz.asc
@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iEYEABECAAYFAkxDtwQACgkQc9dwzaWQR7nApgCcC0cVr7w9rEJdir1Gyl71m9rB
+PEsAoK+qjoBn/ksBmhTiNQRYdr/XCE19
+=MeCZ
+-----END PGP SIGNATURE-----
--- a/hplip-bad-state-attr.patch
+++ b/hplip-bad-state-attr.patch
@ -1,17 +0,0 @@
-diff -up hplip-3.10.5/prnt/hpijs/hpijs.cpp.bad-state-attr hplip-3.10.5/prnt/hpijs/hpijs.cpp
--- hplip-3.10.5/prnt/hpijs/hpijs.cpp.bad-state-attr	2010-06-17 15:11:53.417989598 +0100
-+++ hplip-3.10.5/prnt/hpijs/hpijs.cpp	2010-06-17 15:28:41.169989632 +0100
-@@ -666,11 +666,11 @@ int main (int argc, char *argv[], char *
- 			case WARN_LOW_INK_YELLOW:
- 			case WARN_LOW_INK_MULTIPLE_PENS:
-                         {
-			   BUG ("STATE: +marker-supply-low-warning\n");
-+			   fputs("STATE: +marker-supply-low-warning\n", stderr);
-                            break;
-                         }
- 			default:
-			   BUG ("STATE: -marker-supply-low-warning\n");
-+			   fputs("STATE: -marker-supply-low-warning\n", stderr);
- 		}
-     }
- 
--- a/hplip-deviceIDs-drv.patch
+++ b/hplip-deviceIDs-drv.patch
--- a/hplip-env-python.patch
+++ b/hplip-env-python.patch
@ -0,0 +1,315 @@
+diff -up hplip-3.10.6/align.py.env_python hplip-3.10.6/align.py
+--- hplip-3.10.6/align.py.env_python	2010-07-19 04:17:45.000000000 +0200
+++ hplip-3.10.6/align.py	2010-07-26 20:21:01.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
+#!/usr/bin/python
+ # -*- coding: utf-8 -*-
+ #
+ # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P.
+diff -up hplip-3.10.6/check.py.env_python hplip-3.10.6/check.py
+--- hplip-3.10.6/check.py.env_python	2010-07-19 04:17:45.000000000 +0200
+++ hplip-3.10.6/check.py	2010-07-26 20:21:01.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
+#!/usr/bin/python
+ # -*- coding: utf-8 -*-
+ #
+ # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P.
+diff -up hplip-3.10.6/clean.py.env_python hplip-3.10.6/clean.py
+--- hplip-3.10.6/clean.py.env_python	2010-07-19 04:17:45.000000000 +0200
+++ hplip-3.10.6/clean.py	2010-07-26 20:21:01.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
+#!/usr/bin/python
+ # -*- coding: utf-8 -*-
+ #
+ # (c) Copyright 2003-2008 Hewlett-Packard Development Company, L.P.
+diff -up hplip-3.10.6/colorcal.py.env_python hplip-3.10.6/colorcal.py
+--- hplip-3.10.6/colorcal.py.env_python	2010-07-19 04:17:45.000000000 +0200
+++ hplip-3.10.6/colorcal.py	2010-07-26 20:21:01.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
+#!/usr/bin/python
+ # -*- coding: utf-8 -*-
+ #
+ # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P.
+diff -up hplip-3.10.6/dat2drv.py.env_python hplip-3.10.6/dat2drv.py
+--- hplip-3.10.6/dat2drv.py.env_python	2010-07-19 04:17:45.000000000 +0200
+++ hplip-3.10.6/dat2drv.py	2010-07-26 20:21:01.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
+#!/usr/bin/python
+ # -*- coding: utf-8 -*-
+ #
+ # (c) Copyright 2008-9 Hewlett-Packard Development Company, L.P.
+diff -up hplip-3.10.6/devicesettings.py.env_python hplip-3.10.6/devicesettings.py
+--- hplip-3.10.6/devicesettings.py.env_python	2010-07-19 04:17:45.000000000 +0200
+++ hplip-3.10.6/devicesettings.py	2010-07-26 20:21:01.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
+#!/usr/bin/python
+ # -*- coding: utf-8 -*-
+ #
+ # (c) Copyright 2003-2008 Hewlett-Packard Development Company, L.P.
+diff -up hplip-3.10.6/fab.py.env_python hplip-3.10.6/fab.py
+--- hplip-3.10.6/fab.py.env_python	2010-07-19 04:17:45.000000000 +0200
+++ hplip-3.10.6/fab.py	2010-07-26 20:21:01.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
+#!/usr/bin/python
+ # -*- coding: utf-8 -*-
+ #
+ # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P.
+diff -up hplip-3.10.6/fax/backend/hpfax.py.env_python hplip-3.10.6/fax/backend/hpfax.py
+--- hplip-3.10.6/fax/backend/hpfax.py.env_python	2010-07-19 04:17:35.000000000 +0200
+++ hplip-3.10.6/fax/backend/hpfax.py	2010-07-26 20:21:01.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
+#!/usr/bin/python
+ # -*- coding: utf-8 -*-
+ #
+ # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P.
+diff -up hplip-3.10.6/faxsetup.py.env_python hplip-3.10.6/faxsetup.py
+--- hplip-3.10.6/faxsetup.py.env_python	2010-07-19 04:17:45.000000000 +0200
+++ hplip-3.10.6/faxsetup.py	2010-07-26 20:21:01.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
+#!/usr/bin/python
+ # -*- coding: utf-8 -*-
+ #
+ # (c) Copyright 2003-2008 Hewlett-Packard Development Company, L.P.
+diff -up hplip-3.10.6/firmware.py.env_python hplip-3.10.6/firmware.py
+--- hplip-3.10.6/firmware.py.env_python	2010-07-19 04:17:45.000000000 +0200
+++ hplip-3.10.6/firmware.py	2010-07-26 20:21:01.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
+#!/usr/bin/python
+ # -*- coding: utf-8 -*-
+ #
+ # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P.
+diff -up hplip-3.10.6/hpdio.py.env_python hplip-3.10.6/hpdio.py
+--- hplip-3.10.6/hpdio.py.env_python	2010-07-19 04:17:45.000000000 +0200
+++ hplip-3.10.6/hpdio.py	2010-07-26 20:21:01.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
+#!/usr/bin/python
+ # -*- coding: utf-8 -*-
+ #
+ # (c) Copyright 2003-2008 Hewlett-Packard Development Company, L.P.
+diff -up hplip-3.10.6/hpssd.py.env_python hplip-3.10.6/hpssd.py
+--- hplip-3.10.6/hpssd.py.env_python	2010-07-19 04:17:45.000000000 +0200
+++ hplip-3.10.6/hpssd.py	2010-07-26 20:21:01.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
+#!/usr/bin/python
+ # -*- coding: utf-8 -*-
+ #
+ # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P.
+diff -up hplip-3.10.6/info.py.env_python hplip-3.10.6/info.py
+--- hplip-3.10.6/info.py.env_python	2010-07-19 04:17:45.000000000 +0200
+++ hplip-3.10.6/info.py	2010-07-26 20:21:01.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
+#!/usr/bin/python
+ # -*- coding: utf-8 -*-
+ #
+ # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P.
+diff -up hplip-3.10.6/installer/text_install.py.env_python hplip-3.10.6/installer/text_install.py
+--- hplip-3.10.6/installer/text_install.py.env_python	2010-07-19 04:17:37.000000000 +0200
+++ hplip-3.10.6/installer/text_install.py	2010-07-26 20:21:01.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
+#!/usr/bin/python
+ # -*- coding: utf-8 -*-
+ #
+ # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P.
+diff -up hplip-3.10.6/install.py.env_python hplip-3.10.6/install.py
+--- hplip-3.10.6/install.py.env_python	2010-07-19 04:17:45.000000000 +0200
+++ hplip-3.10.6/install.py	2010-07-26 20:21:01.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
+#!/usr/bin/python
+ # -*- coding: utf-8 -*-
+ #
+ # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P.
+diff -up hplip-3.10.6/levels.py.env_python hplip-3.10.6/levels.py
+--- hplip-3.10.6/levels.py.env_python	2010-07-19 04:17:45.000000000 +0200
+++ hplip-3.10.6/levels.py	2010-07-26 20:21:01.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
+#!/usr/bin/python
+ # -*- coding: utf-8 -*-
+ #
+ # (c) Copyright 2003-2008 Hewlett-Packard Development Company, L.P.
+diff -up hplip-3.10.6/linefeedcal.py.env_python hplip-3.10.6/linefeedcal.py
+--- hplip-3.10.6/linefeedcal.py.env_python	2010-07-19 04:17:45.000000000 +0200
+++ hplip-3.10.6/linefeedcal.py	2010-07-26 20:21:01.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
+#!/usr/bin/python
+ # -*- coding: utf-8 -*-
+ #
+ # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P.
+diff -up hplip-3.10.6/makecopies.py.env_python hplip-3.10.6/makecopies.py
+--- hplip-3.10.6/makecopies.py.env_python	2010-07-19 04:17:45.000000000 +0200
+++ hplip-3.10.6/makecopies.py	2010-07-26 20:21:01.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
+#!/usr/bin/python
+ # -*- coding: utf-8 -*-
+ #
+ # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P.
+diff -up hplip-3.10.6/makeuri.py.env_python hplip-3.10.6/makeuri.py
+--- hplip-3.10.6/makeuri.py.env_python	2010-07-19 04:17:45.000000000 +0200
+++ hplip-3.10.6/makeuri.py	2010-07-26 20:21:01.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
+#!/usr/bin/python
+ # -*- coding: utf-8 -*-
+ #
+ # (c) Copyright 2003-2008 Hewlett-Packard Development Company, L.P.
+diff -up hplip-3.10.6/pkservice.py.env_python hplip-3.10.6/pkservice.py
+--- hplip-3.10.6/pkservice.py.env_python	2010-07-19 04:17:45.000000000 +0200
+++ hplip-3.10.6/pkservice.py	2010-07-26 20:21:01.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
+#!/usr/bin/python
+ # -*- coding: utf-8 -*-
+ #
+ # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P.
+diff -up hplip-3.10.6/plugin.py.env_python hplip-3.10.6/plugin.py
+--- hplip-3.10.6/plugin.py.env_python	2010-07-19 04:17:45.000000000 +0200
+++ hplip-3.10.6/plugin.py	2010-07-26 20:21:01.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
+#!/usr/bin/python
+ # -*- coding: utf-8 -*-
+ #
+ # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P.
+diff -up hplip-3.10.6/pqdiag.py.env_python hplip-3.10.6/pqdiag.py
+--- hplip-3.10.6/pqdiag.py.env_python	2010-07-19 04:17:45.000000000 +0200
+++ hplip-3.10.6/pqdiag.py	2010-07-26 20:21:01.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
+#!/usr/bin/python
+ # -*- coding: utf-8 -*-
+ #
+ # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P.
+diff -up hplip-3.10.6/print.py.env_python hplip-3.10.6/print.py
+--- hplip-3.10.6/print.py.env_python	2010-07-19 04:17:45.000000000 +0200
+++ hplip-3.10.6/print.py	2010-07-26 20:21:01.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
+#!/usr/bin/python
+ # -*- coding: utf-8 -*-
+ #
+ # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P.
+diff -up hplip-3.10.6/printsettings.py.env_python hplip-3.10.6/printsettings.py
+--- hplip-3.10.6/printsettings.py.env_python	2010-07-19 04:17:45.000000000 +0200
+++ hplip-3.10.6/printsettings.py	2010-07-26 20:21:01.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
+#!/usr/bin/python
+ # -*- coding: utf-8 -*-
+ #
+ # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P.
+diff -up hplip-3.10.6/probe.py.env_python hplip-3.10.6/probe.py
+--- hplip-3.10.6/probe.py.env_python	2010-07-19 04:17:45.000000000 +0200
+++ hplip-3.10.6/probe.py	2010-07-26 20:21:01.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
+#!/usr/bin/python
+ # -*- coding: utf-8 -*-
+ #
+ # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P.
+diff -up hplip-3.10.6/query.py.env_python hplip-3.10.6/query.py
+--- hplip-3.10.6/query.py.env_python	2010-07-19 04:17:45.000000000 +0200
+++ hplip-3.10.6/query.py	2010-07-26 20:21:01.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
+#!/usr/bin/python
+ # -*- coding: utf-8 -*-
+ #
+ # (c) Copyright 2009 Hewlett-Packard Development Company, L.P.
+diff -up hplip-3.10.6/scan.py.env_python hplip-3.10.6/scan.py
+--- hplip-3.10.6/scan.py.env_python	2010-07-19 04:17:45.000000000 +0200
+++ hplip-3.10.6/scan.py	2010-07-26 20:21:01.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
+#!/usr/bin/python
+ # -*- coding: utf-8 -*-
+ #
+ # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P.
+diff -up hplip-3.10.6/scan/sane.py.env_python hplip-3.10.6/scan/sane.py
+--- hplip-3.10.6/scan/sane.py.env_python	2010-07-19 04:16:05.000000000 +0200
+++ hplip-3.10.6/scan/sane.py	2010-07-26 20:21:01.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
+#!/usr/bin/python
+ # -*- coding: utf-8 -*-
+ #
+ # (c) Copyright 2003-2008 Hewlett-Packard Development Company, L.P.
+diff -up hplip-3.10.6/sendfax.py.env_python hplip-3.10.6/sendfax.py
+--- hplip-3.10.6/sendfax.py.env_python	2010-07-19 04:17:45.000000000 +0200
+++ hplip-3.10.6/sendfax.py	2010-07-26 20:21:01.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
+#!/usr/bin/python
+ # -*- coding: utf-8 -*-
+ #
+ # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P.
+diff -up hplip-3.10.6/setup.py.env_python hplip-3.10.6/setup.py
+--- hplip-3.10.6/setup.py.env_python	2010-07-19 04:17:45.000000000 +0200
+++ hplip-3.10.6/setup.py	2010-07-26 20:21:01.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
+#!/usr/bin/python
+ # -*- coding: utf-8 -*-
+ #
+ # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P.
+diff -up hplip-3.10.6/testpage.py.env_python hplip-3.10.6/testpage.py
+--- hplip-3.10.6/testpage.py.env_python	2010-07-19 04:17:45.000000000 +0200
+++ hplip-3.10.6/testpage.py	2010-07-26 20:21:01.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
+#!/usr/bin/python
+ # -*- coding: utf-8 -*-
+ #
+ # (c) Copyright 2003-2008 Hewlett-Packard Development Company, L.P.
+diff -up hplip-3.10.6/timedate.py.env_python hplip-3.10.6/timedate.py
+--- hplip-3.10.6/timedate.py.env_python	2010-07-19 04:17:45.000000000 +0200
+++ hplip-3.10.6/timedate.py	2010-07-26 20:21:01.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
+#!/usr/bin/python
+ # -*- coding: utf-8 -*-
+ #
+ # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P.
+diff -up hplip-3.10.6/toolbox.py.env_python hplip-3.10.6/toolbox.py
+--- hplip-3.10.6/toolbox.py.env_python	2010-07-19 04:17:45.000000000 +0200
+++ hplip-3.10.6/toolbox.py	2010-07-26 20:21:01.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
+#!/usr/bin/python
+ # -*- coding: utf-8 -*-
+ #
+ # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P.
+diff -up hplip-3.10.6/unload.py.env_python hplip-3.10.6/unload.py
+--- hplip-3.10.6/unload.py.env_python	2010-07-19 04:17:45.000000000 +0200
+++ hplip-3.10.6/unload.py	2010-07-26 20:21:01.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
+#!/usr/bin/python
+ # -*- coding: utf-8 -*-
+ #
+ # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P.
+diff -up hplip-3.10.6/wificonfig.py.env_python hplip-3.10.6/wificonfig.py
+--- hplip-3.10.6/wificonfig.py.env_python	2010-07-19 04:17:45.000000000 +0200
+++ hplip-3.10.6/wificonfig.py	2010-07-26 20:21:01.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
+#!/usr/bin/python
+ # -*- coding: utf-8 -*-
+ #
+ # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P.
--- a/hplip.spec
+++ b/hplip.spec
@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
-Version: 3.10.5
-Release: 8%{?dist}
+Version: 3.10.6
+Release: 1%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@ -23,7 +23,7 @@ Patch9: hplip-snmp-quirks.patch
 Patch10: hplip-discovery-method.patch
 Patch11: hplip-device-reconnected.patch
 Patch12: hplip-clear-old-state-reasons.patch
-Patch13: hplip-bad-state-attr.patch
+Patch13: hplip-env-python.patch
 Patch14: hplip-hpcups-sigpipe.patch
 Patch16: hplip-bad-low-ink-warning.patch
 Patch17: hplip-deviceIDs-ppd.patch
@ -142,6 +142,8 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # HP Color LaserJet CM1312nfi (bug #581005).
 # HP Color LaserJet 3800 (bug #581935).
 # HP Color LaserJet 2840 (bug #582215).
+# HP Color LaserJet CP1518ni (bug #613689).
+# HP Color LaserJet 2600n (bug #613712).
 %patch5 -p1 -b .deviceIDs-drv

 # Stopped hpcups pointlessly trying to read spool files
@ -167,8 +169,8 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # Clear old printer-state-reasons we used to manage (bug #510926).
 %patch12 -p1 -b .clear-old-state-reasons

-# Fixed marker-supply attributes in hpijs (bug #605269).
-%patch13 -p1 -b .bad-state-attr
+# Change shebang /usr/bin/env python -> /usr/bin/python (bug #618351).
+%patch13 -p1 -b .env_python

 # Avoid busy loop in hpcups when backend has exited (bug #525944).
 %patch14 -p1 -b .hpcups-sigpipe
@ -218,7 +220,6 @@ do
  gzip -n ${ppd_file#*/}
 done

-
 sed -i.duplex-constraints \
    -e 's,\(UIConstraints.* \*Duplex\),//\1,' \
    prnt/drv/hpcups.drv.in
@ -441,6 +442,13 @@ fi
 %{_bindir}/hpcups-update-ppds &>/dev/null ||:

 %changelog
+* Tue Jul 27 2010 Jiri Popelka <jpopelka@redhat.com> - 3.10.6-1
+- 3.10.6.
+- Changed shebang /usr/bin/env python -> /usr/bin/python (bug #618351).
+- Corrected IEEE 1284 Device IDs:
+  - HP Color LaserJet CP1518ni (bug #613689).
+  - HP Color LaserJet 2600n (bug #613712).
+
 * Mon Jul 26 2010 Tim Waugh <twaugh@redhat.com>
 - Removed selinux-policy version conflict as it is no longer
  necessary.
--- a/2
+++ b/2
@ -1 +1 @@
-a4a3679d5987520226ef70d834b63b88  hplip-3.10.5.tar.gz
+96c36e3baf35e93cf9436a772f0c9ef4  hplip-3.10.6.tar.gz