From 0e158b66dbaace6c86f0249482248b026bf0f0ba Mon Sep 17 00:00:00 2001 From: Christophe Fergeau Date: Mon, 23 Aug 2021 16:10:49 +0200 Subject: [PATCH] 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 --- pass.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pass.spec b/pass.spec index a064fe5..e0d9a5d 100644 --- a/pass.spec +++ b/pass.spec @@ -6,7 +6,7 @@ Name: pass Summary: A password manager using standard Unix tools Version: 1.7.4 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Url: http://zx2c4.com/projects/password-store/ BuildArch: noarch @@ -17,7 +17,8 @@ BuildRequires: git-core BuildRequires: gnupg2 BuildRequires: perl-generators 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: gnupg2 Requires: qrencode @@ -79,6 +80,10 @@ make test %endif %changelog +* Thu Sep 09 2021 Christophe Fergeau - 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 - 1.7.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild