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#494ebc3d38dc306db43b2f1764f75a557fc81248

hplip-timeb-removed.patch

@@ -0,0 +1,12 @@
+diff --git a/prnt/hpcups/CommonDefinitions.h b/prnt/hpcups/CommonDefinitions.h
+index 082aec9..86763d4 100644
+--- a/prnt/hpcups/CommonDefinitions.h
++++ b/prnt/hpcups/CommonDefinitions.h
+@@ -48,7 +48,6 @@
+ #include <syslog.h>
+ #include <assert.h>
+ #include <time.h>
+-#include <sys/timeb.h>
+ #include <string.h>
+ 
+ #ifndef _GNU_SOURCE

hplip.spec

@@ -7,7 +7,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.20.9
-Release: 2%{?dist}
+Release: 3%{?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
@@ -161,6 +161,10 @@ Patch56: hplip-revert-plugins.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=1861055
 # reported upstream https://bugs.launchpad.net/fedora/+bug/1889280
 Patch57: hplip-thread-isalive-removed.patch
+# glibc moved timeb.h into compat package and it will be removed in the future
+# the code doesn't use anything from timeb.h, so it is safe to remove it
+# reported upstream https://bugs.launchpad.net/hplip/+bug/1900977
+Patch58: hplip-timeb-removed.patch
 
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
@@ -191,6 +195,8 @@ Requires(post): coreutils
 BuildRequires: gcc
 # gcc-c++ is needed for hpijs, hpcups drivers
 BuildRequires: gcc-c++
+# uses make
+BuildRequires: make
 
 BuildRequires: autoconf automake libtool
 BuildRequires: net-snmp-devel
@@ -436,6 +442,8 @@ rm prnt/hpcups/ErnieFilter.{cpp,h} prnt/hpijs/ernieplatform.h
 %patch56 -p1 -b .revert-plugins
 # 1861055 - hplip: remove threading.Thread.isAlive method calls - use threading.Thread.is_alive()
 %patch57 -p1 -b .thread-isalive-removed
+# timed.h is removed from glibc
+%patch58 -p1 -b .timed-removed
 
 sed -i.duplex-constraints \
     -e 's,\(UIConstraints.* \*Duplex\),//\1,' \
@@ -770,6 +778,12 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
 %config(noreplace) %{_sysconfdir}/sane.d/dll.d/hpaio
 
 %changelog
+* Thu Nov 05 2020 Zdenek Dohnal <zdohnal@redhat.com> - 3.20.9-3
+- make is no longer in buildroot by default
+
+* Thu Oct 22 2020 Zdenek Dohnal <zdohnal@redhat.com> - 3.20.9-2
+- timeb is removed from glibc
+
 * Tue Oct 13 2020 Zdenek Dohnal <zdohnal@redhat.com> - 3.20.9-2
 - downloading gpg key for plugin can take some time and wayland can
   kill the connection, work it around to prefer more stable keyservers