From 5c0c497eea0f0d5d362813effe3ec03e1bc9087d5995c8222f534bbd4764bd37 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Mon, 22 Jul 2019 16:43:06 +0000 Subject: [PATCH 1/3] Accepting request 716585 from home:favogt:branches:network - Supplement libgtk-3-0 instead to avoid installation on a textmode install (boo#1142000) OBS-URL: https://build.opensuse.org/request/show/716585 OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=191 --- openssh-askpass-gnome.changes | 6 ++++++ openssh-askpass-gnome.spec | 4 ++-- openssh.spec | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/openssh-askpass-gnome.changes b/openssh-askpass-gnome.changes index 50f2001..77a3ebe 100644 --- a/openssh-askpass-gnome.changes +++ b/openssh-askpass-gnome.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jul 18 14:07:56 UTC 2019 - Fabian Vogt + +- Supplement libgtk-3-0 instead to avoid installation on a textmode install + (boo#1142000) + ------------------------------------------------------------------- Thu Feb 14 10:36:03 UTC 2019 - Tomáš Chvátal diff --git a/openssh-askpass-gnome.spec b/openssh-askpass-gnome.spec index 764615e..1bcae51 100644 --- a/openssh-askpass-gnome.spec +++ b/openssh-askpass-gnome.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -27,7 +27,7 @@ URL: http://www.openssh.com/ Source: http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/%{_name}-%{version}.tar.gz Source42: http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/%{_name}-%{version}.tar.gz.asc Requires: %{_name} = %{version} -Supplements: packageand(openssh:libX11-6) +Supplements: packageand(openssh:libgtk-3-0) %if 0%{?suse_version} >= 1550 BuildRequires: gtk3-devel %else diff --git a/openssh.spec b/openssh.spec index 4713cf3..5abeb31 100644 --- a/openssh.spec +++ b/openssh.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # From 084c35400e6146732651edb61e74069ad41ff5b9d38addd5da508970f4ba8301 Mon Sep 17 00:00:00 2001 From: Hans Petter Jansson Date: Mon, 22 Jul 2019 18:28:13 +0000 Subject: [PATCH 2/3] Accepting request 717662 from home:Vogtinator:branches:network - ssh-askpass: Try a fallback if the other option is not available OBS-URL: https://build.opensuse.org/request/show/717662 OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=192 --- openssh-askpass-gnome.spec | 2 +- openssh.changes | 5 +++++ openssh.spec | 2 +- ssh-askpass | 6 ++++-- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/openssh-askpass-gnome.spec b/openssh-askpass-gnome.spec index 1bcae51..64062f9 100644 --- a/openssh-askpass-gnome.spec +++ b/openssh-askpass-gnome.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # diff --git a/openssh.changes b/openssh.changes index 83d63c8..198178e 100644 --- a/openssh.changes +++ b/openssh.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 22 16:55:25 UTC 2019 - Fabian Vogt + +- ssh-askpass: Try a fallback if the other option is not available + ------------------------------------------------------------------- Fri May 31 11:14:42 UTC 2019 - Vítězslav Čížek diff --git a/openssh.spec b/openssh.spec index 5abeb31..4713cf3 100644 --- a/openssh.spec +++ b/openssh.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # diff --git a/ssh-askpass b/ssh-askpass index 0ad5300..fd58c70 100644 --- a/ssh-askpass +++ b/ssh-askpass @@ -15,10 +15,12 @@ KDE_SSH_ASKPASS="@LIBEXECDIR@/ssh/ksshaskpass" case "$SESSION" in kde) - exec $KDE_SSH_ASKPASS ${1+"$@"} + [ -e $KDE_SSH_ASKPASS ] && exec $KDE_SSH_ASKPASS ${1+"$@"} + exec $GNOME_SSH_ASKPASS ${1+"$@"} ;; *) - exec $GNOME_SSH_ASKPASS ${1+"$@"} + [ -e GNOME_SSH_ASKPASS ] && exec $GNOME_SSH_ASKPASS ${1+"$@"} + exec $KDE_SSH_ASKPASS ${1+"$@"} ;; esac From 80626684080630842039939c584516ad2bc97ef077c5d648ce5d07fb4b96468f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 24 Jul 2019 12:05:07 +0000 Subject: [PATCH 3/3] Accepting request 718210 from home:Vogtinator:branches:network Fixup last sr OBS-URL: https://build.opensuse.org/request/show/718210 OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=193 --- ssh-askpass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ssh-askpass b/ssh-askpass index fd58c70..230122f 100644 --- a/ssh-askpass +++ b/ssh-askpass @@ -19,7 +19,7 @@ case "$SESSION" in exec $GNOME_SSH_ASKPASS ${1+"$@"} ;; *) - [ -e GNOME_SSH_ASKPASS ] && exec $GNOME_SSH_ASKPASS ${1+"$@"} + [ -e $GNOME_SSH_ASKPASS ] && exec $GNOME_SSH_ASKPASS ${1+"$@"} exec $KDE_SSH_ASKPASS ${1+"$@"} ;; esac