Accepting request 632195 from home:frispete:Tumbleweed

Here's the corrected version..

OBS-URL: https://build.opensuse.org/request/show/632195
OBS-URL: https://build.opensuse.org/package/show/Printing/hplip?expand=0&rev=161

hplip.spec

@@ -54,7 +54,7 @@ BuildRequires:  systemd-rpm-macros
 %endif
 
 Name:           hplip
-Version:        3.17.9
+Version:        3.18.6
 Release:        0
 Summary:        HP's Printing, Scanning, and Faxing Software
 License:        BSD-3-Clause AND GPL-2.0-or-later AND MIT
@@ -75,6 +75,8 @@ Source2:        hplip.keyring
 # Source100... is for special SUSE sources:
 # Source102 is a small man page for /usr/bin/hpijs:
 Source102:      hpijs.1.gz
+# 
+Source1000:     %{name}-rpmlintrc
 # Patch100... is for special Suse patches:
 # Patch101 change-udev-rules.diff changes the udev rules file 56-hpmud.rules
 Patch101:       change-udev-rules.diff
@@ -90,11 +92,6 @@ Patch108:       add_missing_includes_and_define_GNU_SOURCE.patch
 # PATCH-FIX-SUSE: GNOME no longer provides a system tray, so don't warn the user that we can't find it
 Patch109:       no-systray-failure-message.patch
 Patch110:       hpijs-avoid-segfault-in-DJGenericVIP-DJGenericVIP.patch
-Patch111:       Fix-scanning-with-python-pillow-4.2.0.patch
-# Patch200 fixes device communication and detection via MDNS in some network setups:
-Patch200:       hplip-mdns.patch
-# Patch201 makes MDNS lookups more robust by retrying queries:
-Patch201:       hplip-mdns-retry-query.patch
 # Python3 port: cleanup patches
 Patch300:       pcardext-python3-fixes.patch
 Patch301:       hplip-misc-missing-includes-and-definitions.patch
@@ -393,16 +390,13 @@ This sub-package is only required by developers.
 # Patch106 disable_hp-upgrade.patch disables hp-upgrade/upgrade.py for security reasons,
 # see https://bugzilla.novell.com/show_bug.cgi?id=853405
 # To upgrade HPLIP an openSUSE software package manager like YaST or zypper should be used.
-%patch106 -b .disable_hp-upgrade.orig
+%patch106 -p1 -b .disable_hp-upgrade.orig
 %patch107 -p1 -b .udev_rules_dir.orig
 # Patch108 add_missing_includes_and_define_GNU_SOURCE.patch adds missing '#include <...>'
 # and missing '#define _GNU_SOURCE' see https://bugs.launchpad.net/hplip/+bug/1456590
 %patch108 -p1 -b .add_missing_includes_and_define_GNU_SOURCE.orig
 %patch109 -p1 -b .systemtray.py.orig
 %patch110 -p1 -b .boo1094141
-%patch111 -p1 -b .boo1096755
-%patch200 -p1 -b .mdns
-%patch201 -p1 -b .mdns-retry
 %patch300 -p1 -b .pcardext-python3
 %patch301 -p1 -b .misc-headers
 %patch302 -p1 -b .hp_ipp_missing_prototypes
@@ -480,6 +474,7 @@ export CXXFLAGS="%{optflags} -fno-strict-aliasing"
 	    CFLAGS='%{optflags}' \
 	    PYTHON=%{pyexe}
 make
+sed -i 's|ppd/hpcups/\*.ppd.gz ||g' Makefile
 
 %install
 make DESTDIR=%{buildroot} install