Accepting request 51975 from Base:System

Accepted submit request 51975 from user coolo

OBS-URL: https://build.opensuse.org/request/show/51975
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openssh?expand=0&rev=54
This commit is contained in:
Ruediger Oertel 2010-11-02 15:07:59 +00:00 committed by Git OBS Bridge
parent fbd21c05cb
commit 13568cee32
2 changed files with 7 additions and 11 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Nov 2 13:25:19 UTC 2010 - coolo@novell.com
- remove the code trying to patch X11 paths - which was broken
for a very long time and was useless anyway as the Makefiles
do this correctly themselves
-------------------------------------------------------------------
Sun Oct 31 12:37:02 UTC 2010 - jengelh@medozas.de

View File

@ -20,13 +20,7 @@
Name: openssh
%define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services
%define _prefix %(xft-config --prefix)
%if "%{_prefix}" == "/usr/X11R6"
%define _mandir %{_prefix}/man
%define _appdefdir %{_prefix}/lib/X11/app-defaults
%else
%define _appdefdir %{_prefix}/share/X11/app-defaults
%endif
BuildRequires: audit-devel krb5-devel opensc-devel openssl-devel pam-devel tcpd-devel xorg-x11-devel
BuildRequires: libselinux-devel
License: BSD3c(or similar) ; MIT License (or similar)
@ -125,11 +119,6 @@ cd ../x11-ssh-askpass-%{xversion}
# This package failed when testing with -Wl,-as-needed being default.
# So we disable it here, if you want to retest, just delete this comment and the line below.
export SUSE_ASNEEDED=0
%if "%{_prefix}" != "/usr/X11R6"
for i in configure.ac Makefile.in pathnames.h ssh_config.0 ssh_config.5 sshd_config.0 sshd_config.5 ; do
sed -i -e 's@%{_prefix}@/usr@g' $i
done
%endif
%{?suse_update_config:%{suse_update_config}}
aclocal
autoheader