From 6405abd5ed96fd34d41abf716ebf1d7fc68acbc0 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Thu, 20 Jun 2019 10:27:28 +0200
Subject: [PATCH] 1722222 - Broken hp-uiscan.desktop (upstream bug)

---
 hplip-uiscan-desktop.patch | 11 +++++++++++
 hplip.spec                 | 13 ++++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 hplip-uiscan-desktop.patch

diff --git a/hplip-uiscan-desktop.patch b/hplip-uiscan-desktop.patch
new file mode 100644
index 0000000..1f0e1a4
--- /dev/null
+++ b/hplip-uiscan-desktop.patch
@@ -0,0 +1,11 @@
+diff --git a/hp-uiscan.desktop.in b/hp-uiscan.desktop.in
+index 4a551e5..82d9360 100644
+--- a/hp-uiscan.desktop.in
++++ b/hp-uiscan.desktop.in
+@@ -5,4 +5,5 @@ Type=Application
+ Terminal=false
+ Name=hp-uiscan
+ Exec=/usr/bin/hp-uiscan
+-Icon=/usr/share/icons/Humanity/devices/48/printer.svg
++Icon=hp_logo
++Categories=Graphics;Scanning;
diff --git a/hplip.spec b/hplip.spec
index 796812f..6d33a90 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -7,7 +7,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.18.12
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPLv2+ and MIT and BSD and IJG and Public Domain and GPLv2+ with exceptions and ISC
 
 Url: https://developers.hp.com/hp-linux-imaging-and-printing
@@ -111,6 +111,10 @@ Patch46: hplip-m278-m281-needs-plugin.patch
 # bugzilla https://bugzilla.redhat.com/show_bug.cgi?id=1695716
 # reported upstream 
 Patch47: hplip-hpcups-crash.patch
+# hp-uiscan has bad link and missing entry in its desktop file
+# Reported upstream https://bugs.launchpad.net/hplip/+bug/1833510
+# bugzilla https://bugzilla.redhat.com/show_bug.cgi?id=1722222
+Patch48: hplip-uiscan-desktop.patch
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Requires: python3-pillow
@@ -346,6 +350,8 @@ rm prnt/hpcups/ErnieFilter.{cpp,h} prnt/hpijs/ernieplatform.h
 # bug caused by typo in QMessageBox constructor call
 # this patch fixes more of those typos - some fixed by tkorbar, some taken from ubuntu fix
 %patch38 -p1 -b .qmsgbox-typos-fix
+
+# removal of non open source code, taken from ubuntu
 %patch39 -p1 -b .libimageprocessor-removal
 
 %{_bindir}/rm prnt/hpcups/libImageProcessor-x86*
@@ -364,6 +370,8 @@ rm prnt/hpcups/ErnieFilter.{cpp,h} prnt/hpijs/ernieplatform.h
 %patch46 -p1 -b .m278-m281-needs-plugin
 # 1695716 - hpcups crashes in Compressor destructor
 %patch47 -p1 -b .hpcups-crash
+# 1722222 - Broken hp-uiscan.desktop (upstream bug).
+%patch48 -p1 -b .uiscan-desktop
 
 sed -i.duplex-constraints \
     -e 's,\(UIConstraints.* \*Duplex\),//\1,' \
@@ -664,6 +672,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
 %config(noreplace) %{_sysconfdir}/sane.d/dll.d/hpaio
 
 %changelog
+* Thu Jun 20 2019 Zdenek Dohnal <zdohnal@redhat.com> - 3.18.12-12
+- 1722222 - Broken hp-uiscan.desktop (upstream bug)
+
 * Thu May 16 2019 Zdenek Dohnal <zdohnal@redhat.com> - 3.18.12-11
 - 1706233 - hplip FTBFS with python38