From 3ef1aa95e8e7537541da501472e56a509806033bd28e97266b7d3101ff6c69c4 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 5 Mar 2010 01:24:21 +0000 Subject: [PATCH] Accepting request 33756 from Base:System Copy from Base:System/openssh based on submit request 33756 from user coolo OBS-URL: https://build.opensuse.org/request/show/33756 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openssh?expand=0&rev=37 --- openssh-askpass-gnome.spec | 2 +- openssh.changes | 5 ++++ openssh.spec | 50 ++------------------------------------ 3 files changed, 8 insertions(+), 49 deletions(-) diff --git a/openssh-askpass-gnome.spec b/openssh-askpass-gnome.spec index 4286107..37a0d1c 100644 --- a/openssh-askpass-gnome.spec +++ b/openssh-askpass-gnome.spec @@ -23,7 +23,7 @@ BuildRequires: gtk2-devel krb5-devel opensc-devel openssh openssl-devel pam-dev License: BSD3c(or similar) Group: Productivity/Networking/SSH Version: 5.2p1 -Release: 11 +Release: 12 Requires: openssh = %{version} openssh-askpass = %{version} AutoReqProv: on Summary: A GNOME-Based Passphrase Dialog for OpenSSH diff --git a/openssh.changes b/openssh.changes index bf99aac..ac220b5 100644 --- a/openssh.changes +++ b/openssh.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 2 09:09:18 UTC 2010 - coolo@novell.com + +- do not use paths at all, but prereq packages + ------------------------------------------------------------------- Sat Feb 27 20:35:01 UTC 2010 - aj@suse.de diff --git a/openssh.spec b/openssh.spec index bf3edd9..9f72bdd 100644 --- a/openssh.spec +++ b/openssh.spec @@ -32,11 +32,11 @@ BuildRequires: libselinux-devel License: BSD3c(or similar) ; MIT License (or similar) Group: Productivity/Networking/SSH Requires: /bin/netstat -PreReq: /usr/sbin/groupadd /usr/sbin/useradd %insserv_prereq %fillup_prereq /bin/mkdir /bin/cat permissions +PreReq: pwdutils %insserv_prereq %fillup_prereq coreutils permissions Conflicts: nonfreessh AutoReqProv: on Version: 5.2p1 -Release: 11 +Release: 12 %define xversion 1.2.4.1 Summary: Secure Shell Client and Server (Remote Login Program) Url: http://www.openssh.com/ @@ -88,57 +88,11 @@ hosts over an insecure network. xorg-x11 (X Window System) connections and arbitrary TCP/IP ports can also be forwarded over the secure channel. - - -Authors: --------- - Aaron Campbell - Bob Beck - Markus Friedl - Niels Provos - Theo de Raadt - Dug Song - Ben Taylor - Chip Salzenberg - Chris Saia - Dan Brosemer - Jim Knoble - Marc G. Fournier - Nalin Dahyabhai - Niels Kristian Bech Jensen - Phil Hands - Thomas Neumann - Tudor Bosman - Damien Miller - %description askpass Ssh (Secure Shell) is a program for logging into a remote machine and for executing commands on a remote machine. This package contains an X Window System passphrase dialog for OpenSSH. - - -Authors: --------- - Aaron Campbell - Bob Beck - Markus Friedl - Niels Provos - Theo de Raadt - Dug Song - Ben Taylor - Chip Salzenberg - Chris Saia - Dan Brosemer - Jim Knoble - Marc G. Fournier - Nalin Dahyabhai - Niels Kristian Bech Jensen - Phil Hands - Thomas Neumann - Tudor Bosman - Damien Miller - %define prefix /usr %prep