From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Fri, 31 Jan 2003 11:47:54 +0000 (+0000)
Subject: - pass xauth path to configure, so it's not needed (BTW, XFree86-devel was not suffic... 
X-Git-Tag: deadbranch-1.18.2~32
X-Git-Url: https://git.pld-linux.org/?p=packages%2Fopenssh.git;a=commitdiff_plain;h=05fbd2e91356f549ed42baa5886ffd24137181a2

- pass xauth path to configure, so it's not needed (BTW, XFree86-devel was not sufficient)
- removed BR: chrpath - it's rpm-dependent thing

Changed files:
    openssh.spec -> 1.140
---

diff --git a/openssh.spec b/openssh.spec
index 6f99735..e69325b 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -33,20 +33,18 @@ Patch2:		%{name}-linux-ipv6.patch
 Patch3:		%{name}-pam_misc.patch
 Patch4:		%{name}-sigpipe.patch
 URL:		http://www.openssh.com/
-BuildRequires:	XFree86-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	chrpath
 %{!?_without_gnome:BuildRequires: gnome-libs-devel}
 BuildRequires:	libwrap-devel
 BuildRequires:	openssl-devel >= 0.9.6a
 BuildRequires:	pam-devel
 BuildRequires:	perl
 BuildRequires:	zlib-devel
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-Prereq:		openssl
-Prereq:		FHS >= 2.1-24
+PreReq:		openssl
+PreReq:		FHS >= 2.1-24
 Obsoletes:	ssh
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sysconfdir	/etc/ssh
 %define		_libexecdir	%{_libdir}/%{name}
@@ -392,7 +390,8 @@ GNOME.
 	--disable-suid-ssh \
 	--with-tcp-wrappers \
 	--with-privsep-path=%{_privsepdir} \
-	--with-pid-dir=%{_localstatedir}/run
+	--with-pid-dir=%{_localstatedir}/run \
+	--with-xauth=/usr/X11R6/bin/xauth
 
 echo '#define LOGIN_PROGRAM           "/bin/login"' >>config.h