Require curl, not curl-minimal

Requiring curl-minimal is not safe. The full curl package does
not provide curl-minimal, and the two conflict. So if you have
full curl installed, you cannot update, because installing
curl-minimal to satisfy hplip's requirement would require the
removal of full curl.

curl-minimal provides curl, so for a quick fix, just changing
this to "Requires: curl", which is satisfied by either. As a
refinement we might be able to add something like
"Suggests: curl-minimal" to 'cue' the use of curl-minimal rather
than curl if neither is currently installed, but I just wanted
to make the minimum change necessary to stop breaking openQA
tests for now.
This commit is contained in:
Adam Williamson 2023-07-18 11:42:36 -07:00
parent 9a35bb2322
commit 65ca3e41cf

View File

@ -7,7 +7,7 @@
Summary: HP Linux Imaging and Printing Project
Name: hplip
Version: 3.23.5
Release: 3%{?dist}
Release: 4%{?dist}
License: GPLv2+ and MIT and BSD and IJG and GPLv2+ with exceptions and ISC
Url: https://developers.hp.com/hp-linux-imaging-and-printing
@ -296,7 +296,7 @@ Recommends: python3-gobject
Requires: cups
# switch to curl by downstream patch from wget to workaround openstack dropping IPv6
# which causes great delays...
Requires: curl-minimal
Requires: curl
# for bash script acting as hp-plugin (Source7)
Requires: gawk
# set require directly to /usr/bin/gpg, because gnupg2 and gnupg ships it,
@ -955,6 +955,9 @@ find doc/images -type f -exec chmod 644 {} \;
%config(noreplace) %{_sysconfdir}/sane.d/dll.d/hpaio
%changelog
* Tue Jul 18 2023 Adam Williamson <awilliam@redhat.com> - 3.23.5-4
- Require curl, not curl-minimal, due to conflicts
* Mon Jul 17 2023 Zdenek Dohnal <zdohnal@redhat.com> - 3.23.5-3
- 2192131 - parseQueues() doesn't get device uri from 'lpstat -v', because parsing pattern changed
- switch to curl when downloading plugin