Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package password-store for openSUSE:Factory checked in at 2021-09-25 00:35:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/password-store (Old) and /work/SRC/openSUSE:Factory/.password-store.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "password-store" Sat Sep 25 00:35:33 2021 rev:15 rq:921295 version:1.7.4 Changes: -------- --- /work/SRC/openSUSE:Factory/password-store/password-store.changes 2021-07-30 23:23:00.127582002 +0200 +++ /work/SRC/openSUSE:Factory/.password-store.new.1899/password-store.changes 2021-09-25 00:36:22.531190830 +0200 @@ -1,0 +2,6 @@ +Fri Sep 24 08:04:36 UTC 2021 - Dan ??erm??k <dcer...@suse.com> + +- Add patch to fix boo#1185984: + Added default-to-xclip.patch + +------------------------------------------------------------------- New: ---- default-to-xclip.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ password-store.spec ++++++ --- /var/tmp/diff_new_pack.RkCgCw/_old 2021-09-25 00:36:22.947191264 +0200 +++ /var/tmp/diff_new_pack.RkCgCw/_new 2021-09-25 00:36:22.951191268 +0200 @@ -22,7 +22,9 @@ Summary: Utility to store, retrieve, generate and synchronize passwords License: GPL-2.0-or-later URL: https://zx2c4.com/projects/%{name}/ -Source: %{name}-%{version}.tar.xz +Source: https://git.zx2c4.com/password-store/snapshot/%{name}-%{version}.tar.xz +# remove on the next release after 1.7.4 +Patch0: https://git.zx2c4.com/password-store/patch/?id=85bb62f47ac2f518bfdb36c5dfedf5938219a9b7#/default-to-xclip.patch BuildRequires: bash-completion BuildRequires: git BuildRequires: gpg2 @@ -60,7 +62,7 @@ A dmenu interface to "pass", a password manager. %prep -%autosetup +%autosetup -p1 for shell_script in src/%{name}.sh contrib/dmenu/passmenu; do sed -i "s|#\!%{_bindir}/env bash|#\!/bin/bash|" $shell_script done ++++++ default-to-xclip.patch ++++++ >From 85bb62f47ac2f518bfdb36c5dfedf5938219a9b7 Mon Sep 17 00:00:00 2001 From: Santiago Zarate <santi...@zarate.co> Date: Thu, 23 Sep 2021 14:45:43 +0200 Subject: Default to xclip if wl-clip is not found In the strange case that the user is jumping back and forth from X11 to Wayland and viceversa, xclip might be installed but wl-clip might not, and in such combination user might end up with the -c opion not working. --- src/password-store.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/password-store.sh b/src/password-store.sh index a0dcf2e..7c6ea35 100755 --- a/src/password-store.sh +++ b/src/password-store.sh @@ -155,7 +155,7 @@ check_sneaky_paths() { # clip() { - if [[ -n $WAYLAND_DISPLAY ]]; then + if [[ -n $WAYLAND_DISPLAY ]] && command -v wl-copy > /dev/null; then local copy_cmd=( wl-copy ) local paste_cmd=( wl-paste -n ) if [[ $X_SELECTION == primary ]]; then @@ -163,12 +163,12 @@ clip() { paste_cmd+=( --primary ) fi local display_name="$WAYLAND_DISPLAY" - elif [[ -n $DISPLAY ]]; then + elif [[ -n $DISPLAY ]] && command -v xclip > /dev/null; then local copy_cmd=( xclip -selection "$X_SELECTION" ) local paste_cmd=( xclip -o -selection "$X_SELECTION" ) local display_name="$DISPLAY" else - die "Error: No X11 or Wayland display detected" + die "Error: No X11 or Wayland display and clipper detected" fi local sleep_argv0="password store sleep on display $display_name" -- cgit v1.2.3-11-g984f
