Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/hplip.git#b249f70f9c695daf035004b1b08966f1871f440f

hplip.spec

@@ -7,7 +7,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.20.11
-Release: 1%{?dist}
+Release: 2%{?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
@@ -171,7 +171,9 @@ Patch59: hplip-check-userperms.patch
 
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+%if 0%{?rhel} <= 8 || 0%{?fedora}
 Requires: python3-pillow
+%endif
 Requires: cups
 Requires: wget
 Requires: python3-dbus
@@ -540,12 +542,14 @@ rm -rf %{buildroot}%{_bindir}/hp-check \
        %{buildroot}%{_bindir}/hp-print \
        %{buildroot}%{_bindir}/hp-printsettings \
        %{buildroot}%{_bindir}/hp-systray \
+       %{buildroot}%{_bindir}/hp-scan \
        %{buildroot}%{_bindir}/hp-toolbox \
        %{buildroot}%{_bindir}/hp-uiscan \
        %{buildroot}%{_bindir}/hp-wificonfig \
        %{buildroot}%{_datadir}/applications/*.desktop \
        %{buildroot}%{_datadir}/metainfo/hplip.appdata.xml \
        %{buildroot}%{_datadir}/icons/hicolor/*/apps/* \
+       %{buildroot}%{_datadir}/hplip/base/imageprocessing.py* \
        %{buildroot}%{_datadir}/hplip/check.py* \
        %{buildroot}%{_datadir}/hplip/devicesettings.py* \
        %{buildroot}%{_datadir}/hplip/faxsetup.py* \
@@ -554,11 +558,15 @@ rm -rf %{buildroot}%{_bindir}/hp-check \
        %{buildroot}%{_datadir}/hplip/print.py* \
        %{buildroot}%{_datadir}/hplip/printsettings.py* \
        %{buildroot}%{_datadir}/hplip/systray.py* \
+       %{buildroot}%{_datadir}/hplip/scan.py* \
        %{buildroot}%{_datadir}/hplip/toolbox.py* \
        %{buildroot}%{_datadir}/hplip/uiscan.py* \
        %{buildroot}%{_datadir}/hplip/wificonfig.py* \
        %{buildroot}%{_datadir}/hplip/data/images \
-       %{buildroot}%{_datadir}/hplip/ui5
+       %{buildroot}%{_datadir}/hplip/scan \
+       %{buildroot}%{_datadir}/hplip/ui5 \
+       %{buildroot}%{_docdir}/hplip/hpscan.html \
+       doc/hpscan.html
 %endif
 
 %if 0%{?rhel} <= 8 || 0%{?fedora}
@@ -663,7 +671,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
 %{_bindir}/hp-plugin
 %{_bindir}/hp-probe
 %{_bindir}/hp-query
+%if 0%{?rhel} <= 8 || 0%{?fedora}
 %{_bindir}/hp-scan
+%endif
 %{_bindir}/hp-sendfax
 %{_bindir}/hp-setup
 %{_bindir}/hp-testpage
@@ -700,7 +710,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
 %{_datadir}/hplip/plugin.py*
 %{_datadir}/hplip/probe.py*
 %{_datadir}/hplip/query.py*
+%if 0%{?rhel} <= 8 || 0%{?fedora}
 %{_datadir}/hplip/scan.py*
+%endif
 %{_datadir}/hplip/sendfax.py*
 %{_datadir}/hplip/setup.py*
 %{_datadir}/hplip/testpage.py*
@@ -716,7 +728,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
 %{_datadir}/hplip/installer
 %{_datadir}/hplip/pcard
 %{_datadir}/hplip/prnt
+%if 0%{?rhel} <= 8 || 0%{?fedora}
 %{_datadir}/hplip/scan
+%endif
 %{_datadir}/ppd
 %{_sharedstatedir}/hp
 %dir %attr(0775,root,lp) /run/hplip
@@ -783,6 +797,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
 %config(noreplace) %{_sysconfdir}/sane.d/dll.d/hpaio
 
 %changelog
+* Thu Jan 14 2021 Zdenek Dohnal <zdohnal@redhat.com> - 3.20.11-2
+- apply eln changes
+
 * Wed Dec 02 2020 Zdenek Dohnal <zdohnal@redhat.com> - 3.20.11-1
 - 1903029 - hplip-3.20.11 is available