From 09facd80d71bfe7863c6cc0d022c8df64619b529480c4f2851129b4b85823c47 Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Fri, 14 Jan 2011 00:30:23 +0000 Subject: [PATCH] Accepting request 57969 from network Accepted submit request 57969 from user sbrabec OBS-URL: https://build.opensuse.org/request/show/57969 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openssh?expand=0&rev=60 --- openssh-askpass-gnome.changes | 5 +++++ openssh-askpass-gnome.spec | 3 +-- openssh.changes | 5 +++++ openssh.spec | 5 +---- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/openssh-askpass-gnome.changes b/openssh-askpass-gnome.changes index a943963..0ec2e59 100644 --- a/openssh-askpass-gnome.changes +++ b/openssh-askpass-gnome.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 12 13:37:38 CET 2011 - sbrabec@suse.cz + +- Removed relics of no more implemented opensc support. + ------------------------------------------------------------------- Tue Aug 24 15:50:17 CEST 2010 - anicka@suse.cz diff --git a/openssh-askpass-gnome.spec b/openssh-askpass-gnome.spec index ec284b4..14ef4de 100644 --- a/openssh-askpass-gnome.spec +++ b/openssh-askpass-gnome.spec @@ -19,7 +19,7 @@ Name: openssh-askpass-gnome -BuildRequires: gtk2-devel krb5-devel opensc-devel openssh openssl-devel pam-devel tcpd-devel update-desktop-files +BuildRequires: gtk2-devel krb5-devel openssh openssl-devel pam-devel tcpd-devel update-desktop-files License: BSD3c(or similar) Group: Productivity/Networking/SSH Version: 5.6p1 @@ -97,7 +97,6 @@ CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" \ --with-pam \ --with-kerberos5=/usr \ --with-privsep-path=/var/lib/empty \ - --with-opensc \ --disable-strip \ --target=%{_target_cpu}-suse-linux cd contrib diff --git a/openssh.changes b/openssh.changes index 5613d19..97a12f7 100644 --- a/openssh.changes +++ b/openssh.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 12 13:37:38 CET 2011 - sbrabec@suse.cz + +- Removed relics of no more implemented opensc support. + ------------------------------------------------------------------- Thu Nov 18 12:20:59 UTC 2010 - lnussel@suse.de diff --git a/openssh.spec b/openssh.spec index f030c90..0d36f38 100644 --- a/openssh.spec +++ b/openssh.spec @@ -21,7 +21,7 @@ Name: openssh %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services %define _appdefdir %{_prefix}/share/X11/app-defaults -BuildRequires: audit-devel krb5-devel opensc-devel openssl-devel pam-devel tcpd-devel xorg-x11-devel +BuildRequires: audit-devel krb5-devel openssl-devel pam-devel tcpd-devel xorg-x11-devel BuildRequires: libselinux-devel License: BSD3c(or similar) ; MIT License (or similar) Group: Productivity/Networking/SSH @@ -142,9 +142,6 @@ LDFLAGS="-pie" CFLAGS="$RPM_OPT_FLAGS $PIEFLAGS -fstack-protector" CXXFLAGS="$RP --with-pam \ --with-kerberos5=/usr \ --with-privsep-path=/var/lib/empty \ -%ifnarch s390 s390x - --with-opensc \ -%endif --disable-strip \ --with-linux-audit \ --with-xauth=%{_prefix}/bin/xauth \