Skip to content

Commit c645d8f

Browse files
committed
RPM spec: don't require pass
Since `pass` requires some setup, don't require it if `libsecret` is available (which is more likely on a full desktop environment). This is useful because the `docker` CLI, as well as things like `helm`, assume that `pass` is set up if the command is found, because it is typically only manually installed. Unfortunately this cannot be implemented for Debian packages at this time as that isn't implemented in `debbuild`; see debbuild/debbuild#1 for details. To make this work we'd have to have explicit DSC files instead. Signed-off-by: Mark Yen <[email protected]> # Conflicts: # packaging/linux/rancher-desktop.spec
1 parent 02f8410 commit c645d8f

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.github/actions/spelling/expect.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -449,6 +449,7 @@ libgtk
449449
libnspr
450450
libnss
451451
libpango
452+
libsecret
452453
libva
453454
libx
454455
libxcb

packaging/linux/rancher-desktop.spec

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ Requires: qemu-utils
4949
Requires: qemu-system-x86
5050
Requires: pass
5151
Requires: openssh-client
52-
Requires: gnupg
5352
Requires: gnutls-bin # To enumerate system certificates
5453
Requires: libasound2
5554
Requires: libatk1.0-0
@@ -83,9 +82,9 @@ Requires: qemu
8382
Requires: openssh-clients
8483

8584
%if 0%{?fedora} || 0%{?rhel}
86-
Requires: pass
85+
Requires: (pass or libsecret)
8786
%else
88-
Requires: password-store
87+
Requires: (password-store or libsecret-1-0)
8988
Requires: qemu-img
9089
%endif
9190

0 commit comments

Comments
 (0)