From 2a6366d191e6b214c83bd729d56a3f99656faf0c Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Mon, 11 Jun 2018 18:52:06 +0200
Subject: [PATCH] 3.18.6, have cups running because hp tools

---
 .gitignore              |  1 +
 hplip-3.18.5.tar.gz.asc |  7 -------
 hplip-3.18.6.tar.gz.asc |  7 +++++++
 hplip.spec              | 27 ++++++++++++++++++---------
 sources                 |  2 +-
 5 files changed, 27 insertions(+), 17 deletions(-)
 delete mode 100644 hplip-3.18.5.tar.gz.asc
 create mode 100644 hplip-3.18.6.tar.gz.asc

diff --git a/.gitignore b/.gitignore
index a1de539..3f89025 100644
--- a/.gitignore
+++ b/.gitignore
@@ -88,3 +88,4 @@ hplip-3.10.6.tar.gz
 /hplip-3.18.3.tar.gz
 /hplip-3.18.4.tar.gz
 /hplip-3.18.5.tar.gz
+/hplip-3.18.6.tar.gz
diff --git a/hplip-3.18.5.tar.gz.asc b/hplip-3.18.5.tar.gz.asc
deleted file mode 100644
index 346863a..0000000
--- a/hplip-3.18.5.tar.gz.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.11 (GNU/Linux)
-
-iEYEABECAAYFAlsGQVgACgkQc9dwzaWQR7mUjACeOwZ9fTlMmyQN9U0NQVKsTrGS
-lWEAmwYFt40RC2aKXYWfX39sAm4vtaF2
-=wCpt
------END PGP SIGNATURE-----
diff --git a/hplip-3.18.6.tar.gz.asc b/hplip-3.18.6.tar.gz.asc
new file mode 100644
index 0000000..8221531
--- /dev/null
+++ b/hplip-3.18.6.tar.gz.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+iEYEABECAAYFAlsYzCYACgkQc9dwzaWQR7k3kQCgpUG6Okb3nGf7qodmI9zTBf3A
+a8AAoLD0LiwifYlnEBlHS5Eaw/ylB9A8
+=H/1x
+-----END PGP SIGNATURE-----
diff --git a/hplip.spec b/hplip.spec
index 5632b93..dff7a44 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -6,8 +6,8 @@
 
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
-Version: 3.18.5
-Release: 2%{?dist}
+Version: 3.18.6
+Release: 1%{?dist}
 License: GPLv2+ and MIT and BSD
 
 Url: https://developers.hp.com/hp-linux-imaging-and-printing
@@ -386,6 +386,19 @@ rm -f %{buildroot}%{_unitdir}/hplip-printer@.service
 # window), so don't ship the launcher yet.
 rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
 
+# hp-setup needs to have cups service enabled and running for setups of queues
+%pre
+%{_bindir}/systemctl start cups &>/dev/null ||:
+%{_bindir}/systemctl enable cups &>/dev/null ||:
+
+%post
+%{_bindir}/hpcups-update-ppds &>/dev/null ||:
+
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
+
 %files
 %doc COPYING doc/*
 # ex-hpijs
@@ -523,14 +536,10 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
 %{_libdir}/sane/libsane-*.so.1.0.0
 %config(noreplace) %{_sysconfdir}/sane.d/dll.d/hpaio
 
-%post
-%{_bindir}/hpcups-update-ppds &>/dev/null ||:
-
-%post libs -p /sbin/ldconfig
-
-%postun libs -p /sbin/ldconfig
-
 %changelog
+* Mon Jun 11 2018 Zdenek Dohnal <zdohnal@redhat.com> - 3.18.6-1
+- 3.18.6, have cups running because hp tools
+
 * Fri May 25 2018 Zdenek Dohnal <zdohnal@redhat.com> - 3.18.5-2
 - hp-setup fails on fax setup - use binary strings 
 - m278-m281 doesn;t work correctly again
diff --git a/sources b/sources
index 260bf2a..0c9dbb3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (hplip-3.18.5.tar.gz) = 2c99bb446af604a2f011f9dd5ddf4bf5019b7cd36a0ecb1cbe6dce0c0358b8472a695ad85d09e52c3e63de8a69e2a3e7081c61ec36f44aae2770b5fef0f67516
+SHA512 (hplip-3.18.6.tar.gz) = deb4e6e1c7e9ea7452967f7d7d7fd93e92eb59406b4978bb9b874db93bc5022b25aab012a7420ac3e991259032bc7cb749cd924c93a164544e29a4152962184f