diff --git a/.gitignore b/.gitignore index c862985..5a37f94 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,4 @@ hplip-3.10.6.tar.gz /hplip-3.12.10a.tar.gz /hplip-3.12.11.tar.gz /hplip-3.13.2.tar.gz +/hplip-3.13.3.tar.gz diff --git a/hplip-3.13.2.tar.gz.asc b/hplip-3.13.2.tar.gz.asc deleted file mode 100644 index f87397c..0000000 --- a/hplip-3.13.2.tar.gz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.11 (GNU/Linux) - -iEYEABECAAYFAlEbwoYACgkQc9dwzaWQR7nTIwCffAuhel9NfIayr90JvCVE+KEa -vbQAn28hbxJ7KjNVKoulFuaqNbscfTJC -=0fDW ------END PGP SIGNATURE----- diff --git a/hplip-3.13.3.tar.gz.asc b/hplip-3.13.3.tar.gz.asc new file mode 100644 index 0000000..ef698f0 --- /dev/null +++ b/hplip-3.13.3.tar.gz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.11 (GNU/Linux) + +iEYEABECAAYFAlE5kPoACgkQc9dwzaWQR7m4mwCfbJgo3GNIBg7Dmkcm7jLmmbfE +Uu0An0u9w+hysqpgGz6Qd4jjQoIhpo2c +=/sA6 +-----END PGP SIGNATURE----- diff --git a/hplip-pillow.patch b/hplip-pillow.patch deleted file mode 100644 index 0c13734..0000000 --- a/hplip-pillow.patch +++ /dev/null @@ -1,39 +0,0 @@ -Index: hplip-3.12.11/installer/core_install.py -=================================================================== ---- hplip-3.12.11.orig/installer/core_install.py -+++ hplip-3.12.11/installer/core_install.py -@@ -1100,7 +1100,7 @@ class CoreInstall(object): - def check_pil(self): - log.debug("Checking for PIL...") - try: -- import Image -+ from PIL import Image - return True - except ImportError: - return False -Index: hplip-3.12.11/installer/dcheck.py -=================================================================== ---- hplip-3.12.11.orig/installer/dcheck.py -+++ hplip-3.12.11/installer/dcheck.py -@@ -361,7 +361,7 @@ def get_xsane_version(): - - def get_pil_version(): - try: -- import Image -+ from PIL import Image - except ImportError: - return '-' - else: -Index: hplip-3.12.11/scan.py -=================================================================== ---- hplip-3.12.11.orig/scan.py -+++ hplip-3.12.11/scan.py -@@ -589,7 +589,7 @@ try: - from base import subproc as subprocess - - try: -- import Image -+ from PIL import Image - except ImportError: - log.error("%s requires the Python Imaging Library (PIL). Exiting." % __mod__) - sys.exit(1) diff --git a/hplip.spec b/hplip.spec index f01c481..989133a 100644 --- a/hplip.spec +++ b/hplip.spec @@ -6,7 +6,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip -Version: 3.13.2 +Version: 3.13.3 Release: 1%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons @@ -34,7 +34,6 @@ Patch16: hplip-bad-low-ink-warning.patch Patch17: hplip-deviceIDs-ppd.patch Patch18: hplip-skip-blank-lines.patch Patch19: hplip-dbglog-newline.patch -Patch20: hplip-pillow.patch Patch21: hplip-ppd-ImageableArea.patch Patch22: hplip-raw_deviceID-traceback.patch Patch23: hplip-UnicodeDecodeError.patch @@ -256,9 +255,6 @@ done # Added missing newline to string argument in dbglog() call (bug #585275). %patch19 -p1 -b .dbglog-newline -# Use the form of import of PIL that is pillow compatible (bug #895266). -%patch20 -p1 -b .pillow - # Fix ImageableArea for Laserjet 8150/9000 (bug #596298). for ppd_file in $(grep '^diff' %{PATCH21} | cut -d " " -f 4); do @@ -539,6 +535,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop %postun libs -p /sbin/ldconfig %changelog +* Fri Mar 08 2013 Jiri Popelka - 3.13.3-1 +- 3.13.3 + * Thu Feb 14 2013 Jiri Popelka - 3.13.2-1 - 3.13.2 diff --git a/sources b/sources index 9a02019..37e0f3f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cd7edef6b2df2cdb468b145cd2127e1b hplip-3.13.2.tar.gz +4a378cc08f7a4f131968c0966c1ceb8c hplip-3.13.3.tar.gz