From b64185802aa9772aa4c9cd2991cfa29b6f6cf937 Mon Sep 17 00:00:00 2001 From: Jiri Popelka Date: Mon, 25 Jul 2011 14:22:48 +0200 Subject: [PATCH] 3.11.7 --- .gitignore | 1 + hplip-3.11.3a.tar.gz.asc | 7 - hplip-3.11.7.tar.gz.asc | 7 + hplip-env-python.patch | 315 -------------------------------- hplip-pstotiff-is-rubbish.patch | 12 +- hplip-udev-rules.patch | 13 +- hplip.spec | 15 +- sources | 1 + 8 files changed, 29 insertions(+), 342 deletions(-) delete mode 100644 hplip-3.11.3a.tar.gz.asc create mode 100644 hplip-3.11.7.tar.gz.asc delete mode 100644 hplip-env-python.patch diff --git a/.gitignore b/.gitignore index 4ed299d..bc3e644 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ hplip-3.10.6.tar.gz /hplip-3.11.3.tar.gz /hplip-3.11.3a.tar.gz /hplip-3.11.5.tar.gz +/hplip-3.11.7.tar.gz diff --git a/hplip-3.11.3a.tar.gz.asc b/hplip-3.11.3a.tar.gz.asc deleted file mode 100644 index 2230bd4..0000000 --- a/hplip-3.11.3a.tar.gz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.9 (GNU/Linux) - -iEYEABECAAYFAk2MMigACgkQc9dwzaWQR7mfcQCfWGlPpnUaFTtAEc8xVnCQ/8Te -kyIAoNSFJKZ5wTb2ckNmzucl+h+2b9EO -=1QoL ------END PGP SIGNATURE----- diff --git a/hplip-3.11.7.tar.gz.asc b/hplip-3.11.7.tar.gz.asc new file mode 100644 index 0000000..9d0c036 --- /dev/null +++ b/hplip-3.11.7.tar.gz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) + +iEYEABECAAYFAk4sb9YACgkQc9dwzaWQR7l98wCfT9DH91wml2LcfPvsKq5BLSOp +EW4AoI2tK03vh/o+Q3NOjKkIJ++a/NDB +=vlbG +-----END PGP SIGNATURE----- diff --git a/hplip-env-python.patch b/hplip-env-python.patch deleted file mode 100644 index 673165c..0000000 --- a/hplip-env-python.patch +++ /dev/null @@ -1,315 +0,0 @@ -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. diff --git a/hplip-pstotiff-is-rubbish.patch b/hplip-pstotiff-is-rubbish.patch index 37cccbe..258e5f4 100644 --- a/hplip-pstotiff-is-rubbish.patch +++ b/hplip-pstotiff-is-rubbish.patch @@ -1,6 +1,6 @@ -diff -up hplip-3.10.5/fax/filters/pstotiff.pstotiff-is-rubbish hplip-3.10.5/fax/filters/pstotiff ---- hplip-3.10.5/fax/filters/pstotiff.pstotiff-is-rubbish 2010-05-13 01:44:57.000000000 +0200 -+++ hplip-3.10.5/fax/filters/pstotiff 2010-05-17 14:39:55.000000000 +0200 +diff -up hplip-3.11.7/fax/filters/pstotiff.pstotiff-is-rubbish hplip-3.11.7/fax/filters/pstotiff +--- hplip-3.11.7/fax/filters/pstotiff.pstotiff-is-rubbish 2011-07-24 21:06:43.000000000 +0200 ++++ hplip-3.11.7/fax/filters/pstotiff 2011-07-25 13:42:27.776988201 +0200 @@ -1,40 +1,16 @@ -#!/usr/bin/env python - @@ -21,7 +21,7 @@ diff -up hplip-3.10.5/fax/filters/pstotiff.pstotiff-is-rubbish hplip-3.10.5/fax/ -temp_out_handle, temp_out_fname = tempfile.mkstemp() - -font = "-I/usr/share/cups/fonts" --device = "-sDEVICE=tiffg4 -dMaxStripSize=0 -dNOPAUSE -dBATCH -dSAFER -dPARANOIDSAFER -dSHORTERRORS -dWRITESYSTEMDICT -dGHOSTSCRIPT -sstdout=%stderr -sOutputFile=" + temp_out_fname + " " + temp_in_file +-device = "-sDEVICE=tiffg4 -dMaxStripSize=0 -r204x196 -dNOPAUSE -dBATCH -dSAFER -dPARANOIDSAFER -dSHORTERRORS -dWRITESYSTEMDICT -dGHOSTSCRIPT -sstdout=%stderr -sOutputFile=" + temp_out_fname + " " + temp_in_file - -gs_command = "/usr/bin/gs" + " " + font + " " + device - @@ -50,8 +50,8 @@ diff -up hplip-3.10.5/fax/filters/pstotiff.pstotiff-is-rubbish hplip-3.10.5/fax/ +fi + +TMPFILE=`mktemp /tmp/pstotiff.XXXXXX` || exit 1 -+gs -I/usr/share/cups/fonts -sDEVICE=tiffg4 -dNOPAUSE -dBATCH \ -+ -dSAFER -dPARANOIDSAFER \ ++gs -I/usr/share/cups/fonts -sDEVICE=tiffg4 -dMaxStripSize=0 -r204x196 ++ -dNOPAUSE -dBATCH -dSAFER -dPARANOIDSAFER \ + -dSHORTERRORS -dWRITESYSTEMDICT -dGHOSTSCRIPT \ + -sstdout=%stderr -sOutputFile="$TMPFILE" "$IN" +RET=$? diff --git a/hplip-udev-rules.patch b/hplip-udev-rules.patch index c4037f2..afc61ea 100644 --- a/hplip-udev-rules.patch +++ b/hplip-udev-rules.patch @@ -1,6 +1,6 @@ -diff -up hplip-3.10.5/data/rules/56-hpmud_support.rules.udev-rules hplip-3.10.5/data/rules/56-hpmud_support.rules ---- hplip-3.10.5/data/rules/56-hpmud_support.rules.udev-rules 2010-05-13 01:44:22.000000000 +0200 -+++ hplip-3.10.5/data/rules/56-hpmud_support.rules 2010-05-17 16:12:42.000000000 +0200 +diff -up hplip-3.11.7/data/rules/56-hpmud_support.rules.udev-rules hplip-3.11.7/data/rules/56-hpmud_support.rules +--- hplip-3.11.7/data/rules/56-hpmud_support.rules.udev-rules 2011-07-24 21:04:13.000000000 +0200 ++++ hplip-3.11.7/data/rules/56-hpmud_support.rules 2011-07-25 13:52:09.379058787 +0200 @@ -6,10 +6,11 @@ SUBSYSTEM!="usb_device", GOTO="hpmud_rul LABEL="pid_test" @@ -11,10 +11,7 @@ diff -up hplip-3.10.5/data/rules/56-hpmud_support.rules.udev-rules hplip-3.10.5/ +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", ENV{hp_model}="$attr{product}", ENV{hp_test}="yes" # Check for LaserJet products (0x03f0xx2a). -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??2a", ENV{hp_model}="$sysfs{product}", ENV{hp_test}="yes" --ENV{hp_test}=="yes", RUN+="bin/sh -c '/usr/bin/hp-mkuri -c &'" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??2a", ENV{hp_model}="$attr{product}", ENV{hp_test}="yes" -+ENV{hp_test}=="yes", RUN+="/bin/sh -c '/usr/bin/hp-mkuri -c &'" + ENV{hp_test}=="yes", RUN+="/bin/sh -c '/usr/bin/hp-mkuri -c &'" --LABEL="hpmud_rules_end" -\ No newline at end of file -+LABEL="hpmud_rules_end" + LABEL="hpmud_rules_end" diff --git a/hplip.spec b/hplip.spec index d538b36..da267ff 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip -Version: 3.11.5 -Release: 4%{?dist} +Version: 3.11.7 +Release: 1%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -24,7 +24,6 @@ Patch9: hplip-snmp-quirks.patch Patch10: hplip-discovery-method.patch Patch11: hplip-hpijs-marker-supply.patch Patch12: hplip-clear-old-state-reasons.patch -Patch13: hplip-env-python.patch Patch14: hplip-hpcups-sigpipe.patch Patch15: hplip-fax-ppd.patch Patch16: hplip-bad-low-ink-warning.patch @@ -200,9 +199,6 @@ mv prnt/drv/hpijs.drv.in{,.deviceIDs-drv-hpijs} # Clear old printer-state-reasons we used to manage (bug #510926). %patch12 -p1 -b .clear-old-state-reasons -# 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 @@ -299,6 +295,10 @@ sed -i.duplex-constraints \ -e 's,\(UIConstraints.* \*Duplex\),//\1,' \ prnt/drv/hpcups.drv.in +# Change shebang /usr/bin/env python -> /usr/bin/python (bug #618351). +find -name '*.py' -print0 | xargs -0 \ + sed -i.env-python -e 's,^#!/usr/bin/env python,#!/usr/bin/python,' + %build %configure \ --enable-scan-build --enable-gui-build --enable-fax-build \ @@ -523,6 +523,9 @@ fi %postun libs -p /sbin/ldconfig %changelog +* Mon Jul 25 2011 Jiri Popelka 3.11.7-1 +- 3.11.7 + * Tue Jun 28 2011 Tim Waugh 3.11.5-4 - Added Device ID for HP LaserJet Professional P1606dn (bug #708472). - Update IEEE 1284 Device IDs in hpijs.drv from hpcups.drv. diff --git a/sources b/sources index a3d3e01..6c417fb 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 96f17f58a81cb76828112cb70d01615a hplip-3.11.5.tar.gz +5cb89a00b0c680d8bf9bf4b4f1f863b1 hplip-3.11.7.tar.gz