From dcb6e8f599ce191dde50d524eabee4c0fc108265 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Mon, 12 Mar 2018 16:13:24 +0100
Subject: [PATCH] 3.18.3

---
 .gitignore                   |  1 +
 hplip-3.18.3.tar.gz.asc      |  7 +++++++
 hplip-jpeg-compression.patch | 17 -----------------
 hplip.spec                   | 13 ++++++-------
 sources                      |  2 +-
 5 files changed, 15 insertions(+), 25 deletions(-)
 create mode 100644 hplip-3.18.3.tar.gz.asc
 delete mode 100644 hplip-jpeg-compression.patch

diff --git a/.gitignore b/.gitignore
index 60ef22e..0e4e565 100644
--- a/.gitignore
+++ b/.gitignore
@@ -85,3 +85,4 @@ hplip-3.10.6.tar.gz
 /hplip-3.17.9.tar.gz
 /hplip-3.17.10.tar.gz
 /hplip-3.17.11.tar.gz
+/hplip-3.18.3.tar.gz
diff --git a/hplip-3.18.3.tar.gz.asc b/hplip-3.18.3.tar.gz.asc
new file mode 100644
index 0000000..d5a83de
--- /dev/null
+++ b/hplip-3.18.3.tar.gz.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+iEYEABECAAYFAlqeZhwACgkQc9dwzaWQR7miTQCdF1mnStRSshUVtqUdL0HFbWFI
+2pMAoNLy6A6v7d1+nn31Dit5eD4nvSy6
+=JNFd
+-----END PGP SIGNATURE-----
diff --git a/hplip-jpeg-compression.patch b/hplip-jpeg-compression.patch
deleted file mode 100644
index 0584834..0000000
--- a/hplip-jpeg-compression.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -up hplip-3.17.11/scan.py.jpeg-compression hplip-3.17.11/scan.py
---- hplip-3.17.11/scan.py.jpeg-compression	2018-01-08 09:26:42.547072815 +0100
-+++ hplip-3.17.11/scan.py	2018-01-08 09:29:39.753604411 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python3
- # -*- coding: utf-8 -*-
- #
- # (c) Copyright 2003-2015 HP Development Company, L.P.
-@@ -1079,6 +1079,7 @@ try:
-             log.info("Saving to file %s" % output)
- 
-             try:
-+                im = im.convert("RGB")
-                 im.save(output)
-             except IOError as e:
-                 log.error("Error saving file: %s (I/O)" % e)
diff --git a/hplip.spec b/hplip.spec
index 50cdc1b..4418000 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -6,8 +6,8 @@
 
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
-Version: 3.17.11
-Release: 10%{?dist}
+Version: 3.18.3
+Release: 1%{?dist}
 License: GPLv2+ and MIT and BSD
 
 Url: https://developers.hp.com/hp-linux-imaging-and-printing
@@ -42,7 +42,6 @@ Patch25: hplip-noernie.patch
 Patch26: hplip-appdata.patch
 Patch27: hplip-check-cups.patch
 Patch28: hplip-colorlaserjet-mfp-m278-m281.patch
-Patch29: hplip-jpeg-compression.patch
 Patch30: hplip-typo.patch
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
@@ -242,9 +241,6 @@ rm prnt/hpcups/ErnieFilter.{cpp,h} prnt/hpijs/ernieplatform.h
 # Add support for HP ColorLaserjet MFP M278-M281 (bug #1509394)
 %patch28 -p1 -b .colorlaserjet-mfp-m278-m281
 
-# Unable to scan and save jpg with color with hp-scan (bug #1528851)
-%patch29 -p1 -b .jpeg-compression
-
 # hp-firmware:NameError: name 'INTERACTIVE_MODE4' is not defined (bug #1533869)
 %patch30 -p1 -b .typo
 
@@ -259,7 +255,7 @@ sed -i.env-python -e 's,^#!/usr/bin/env python,#!%{__python3},' \
     prnt/filters/hpps \
     fax/filters/pstotiff
 
-rm hpps hpcups dat2drv
+rm locatedriver
 
 %build
 # Work-around Makefile.am imperfections.
@@ -527,6 +523,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Mon Mar 12 2018 Zdenek Dohnal <zdohnal@redhat.com> - 3.18.3-1
+- 3.18.3 
+
 * Wed Feb 28 2018 Zdenek Dohnal <zdohnal@redhat.com> - 3.17.11-10
 - name libraries explicitly
 
diff --git a/sources b/sources
index ef287de..6a7a3ed 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (hplip-3.17.11.tar.gz) = 29899d58959d49a0b5e730520ef598f245570b084db33d322859b4773a934167387893888a5829c5cfd5a2e4b66848b173fc7c60973fccdb6d3f854105ad7665
+SHA512 (hplip-3.18.3.tar.gz) = cb51e357cc9def3c087231b01752941b469e5fc4508ec83c6f5875352694249ef72339f2f20c4a6831c49ace7c1f6b902cc11a961c0e1f43ce098b2bf800728f