From 5a09a92856d166aaedc27ff0f1dc950694e3008b80e7315c88558c8f217cde1f Mon Sep 17 00:00:00 2001 From: Petr Cerny Date: Wed, 21 Dec 2011 17:59:28 +0000 Subject: [PATCH] Accepting request 97537 from home:coolo:removeautoconf add autoconf to buildrequires OBS-URL: https://build.opensuse.org/request/show/97537 OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=18 --- openssh-askpass-gnome.changes | 5 +++++ openssh-askpass-gnome.spec | 18 ++++++++++-------- openssh.changes | 5 +++++ openssh.spec | 20 +++++++++++--------- 4 files changed, 31 insertions(+), 17 deletions(-) diff --git a/openssh-askpass-gnome.changes b/openssh-askpass-gnome.changes index 52793eb..3d90489 100644 --- a/openssh-askpass-gnome.changes +++ b/openssh-askpass-gnome.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Dec 21 10:31:42 UTC 2011 - coolo@suse.com + +- remove call to suse_update_config (very old work around) + ------------------------------------------------------------------- Wed Oct 19 00:40:15 UTC 2011 - pcerny@suse.com diff --git a/openssh-askpass-gnome.spec b/openssh-askpass-gnome.spec index fc9e97d..e8738de 100644 --- a/openssh-askpass-gnome.spec +++ b/openssh-askpass-gnome.spec @@ -15,17 +15,20 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: openssh-askpass-gnome -BuildRequires: gtk2-devel krb5-devel openssh openssl-devel pam-devel tcpd-devel update-desktop-files -License: BSD3c(or similar) -Group: Productivity/Networking/SSH +BuildRequires: gtk2-devel +BuildRequires: krb5-devel +BuildRequires: openssh +BuildRequires: openssl-devel +BuildRequires: pam-devel +BuildRequires: tcpd-devel +BuildRequires: update-desktop-files Version: 5.9p1 -Release: 1 +Release: 0 Requires: openssh = %{version} openssh-askpass = %{version} -AutoReqProv: on Summary: A GNOME-Based Passphrase Dialog for OpenSSH +License: BSD-3-Clause +Group: Productivity/Networking/SSH Url: http://www.openssh.com/ %define _name openssh Source: %{_name}-%{version}.tar.bz2 @@ -56,7 +59,6 @@ GNOME-based passphrase dialog for OpenSSH. %patch7 %build -%{?suse_update_config:%{suse_update_config}} aclocal autoheader autoconf diff --git a/openssh.changes b/openssh.changes index 04e610c..48654d4 100644 --- a/openssh.changes +++ b/openssh.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Dec 21 10:38:59 UTC 2011 - coolo@suse.com + +- add autoconf as buildrequire to avoid implicit dependency + ------------------------------------------------------------------- Tue Nov 29 19:48:29 UTC 2011 - crrodriguez@opensuse.org diff --git a/openssh.spec b/openssh.spec index 86b2197..da554eb 100644 --- a/openssh.spec +++ b/openssh.spec @@ -15,23 +15,27 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: openssh %define _fwdefdir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services %define _appdefdir %{_prefix}/share/X11/app-defaults -BuildRequires: audit-devel krb5-devel openssl-devel pam-devel tcpd-devel xorg-x11-devel -BuildRequires: libselinux-devel +BuildRequires: audit-devel +BuildRequires: autoconf +BuildRequires: krb5-devel BuildRequires: libedit-devel -License: BSD3c(or similar) ; MIT License (or similar) -Group: Productivity/Networking/SSH +BuildRequires: libselinux-devel +BuildRequires: openssl-devel +BuildRequires: pam-devel +BuildRequires: tcpd-devel +BuildRequires: xorg-x11-devel Requires: /bin/netstat PreReq: pwdutils %{insserv_prereq} %{fillup_prereq} coreutils Conflicts: nonfreessh Version: 5.9p1 -Release: 1 +Release: 0 %define xversion 1.2.4.1 Summary: Secure Shell Client and Server (Remote Login Program) +License: BSD-3-Clause ; MIT +Group: Productivity/Networking/SSH Url: http://www.openssh.com/ Source: %{name}-%{version}.tar.bz2 Source1: sshd.init @@ -73,11 +77,9 @@ BuildRequires: systemd %endif %package askpass -License: BSD3c(or similar) ; MIT License (or similar) Summary: A passphrase dialog for OpenSSH and the X Window System Requires: openssh = %{version} Provides: openssh:%{_libexecdir}/ssh/ssh-askpass -Group: Productivity/Networking/SSH %description SSH (Secure Shell) is a program for logging into and executing commands