Fix wl-clipboard Requires

pass 1.7.4 will dynamically switch between xclip and wl-copy depending
on which environment is running. The (wl-clipboard or xclip) dependency
is not good enough to express this, as one could be running wayland, and
already have xclip installed.
The new Requires will install xclip and/or wl-clipboard depending on the
installation of the Xorg server and  the wayland client library.

This fixes https://bugzilla.redhat.com/show_bug.cgi?id=1996323
epel9
Christophe Fergeau 3 years ago
parent 3815b68999
commit 0e158b66db

@ -6,7 +6,7 @@
Name: pass Name: pass
Summary: A password manager using standard Unix tools Summary: A password manager using standard Unix tools
Version: 1.7.4 Version: 1.7.4
Release: 2%{?dist} Release: 3%{?dist}
License: GPLv2+ License: GPLv2+
Url: http://zx2c4.com/projects/password-store/ Url: http://zx2c4.com/projects/password-store/
BuildArch: noarch BuildArch: noarch
@ -17,7 +17,8 @@ BuildRequires: git-core
BuildRequires: gnupg2 BuildRequires: gnupg2
BuildRequires: perl-generators BuildRequires: perl-generators
BuildRequires: tree >= 1.7.0 BuildRequires: tree >= 1.7.0
Requires: (xclip or wl-clipboard) Requires: (wl-clipboard if libwayland-client else xclip)
Requires: (xclip if xorg-x11-server-Xorg else wl-clipboard)
Requires: git-core Requires: git-core
Requires: gnupg2 Requires: gnupg2
Requires: qrencode Requires: qrencode
@ -79,6 +80,10 @@ make test
%endif %endif
%changelog %changelog
* Thu Sep 09 2021 Christophe Fergeau <cfergeau@redhat.com> - 1.7.4-3
- adjust wl-copy/xclip requires so that they are actually installed when needed
Resolves: rhbz#1996323
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.4-2 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Loading…
Cancel
Save