From ee607cccb6636eb543282ba90e0677b0604d8b7a Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Tue, 15 Dec 2015 15:23:49 +1100
Subject: Increase robustness of redhat/openssh.spec

 - remove configure --with-rsh, because this option isn't supported anymore
 - replace last occurrence of BuildPreReq by BuildRequires
 - update grep statement to query the krb5 include directory

Patch from CarstenGrohmann via github, ok djm.
---
 contrib/redhat/openssh.spec | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'contrib/redhat/openssh.spec')

diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index 5b27106fb..a3096f2d8 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -89,7 +89,7 @@ Requires: initscripts >= 5.20
 BuildRequires: perl, openssl-devel
 BuildRequires: /bin/login
 %if ! %{build6x}
-BuildPreReq: glibc-devel, pam
+BuildRequires: glibc-devel, pam
 %else
 BuildRequires: /usr/include/security/pam_appl.h
 %endif
@@ -184,7 +184,7 @@ CFLAGS="$RPM_OPT_FLAGS -Os"; export CFLAGS
 %endif
 
 %if %{kerberos5}
-K5DIR=`rpm -ql krb5-devel | grep include/krb5.h | sed 's,\/include\/krb5.h,,'`
+K5DIR=`rpm -ql krb5-devel | grep 'include/krb5\.h' | sed 's,\/include\/krb5.h,,'`
 echo K5DIR=$K5DIR
 %endif
 
@@ -192,7 +192,6 @@ echo K5DIR=$K5DIR
 	--sysconfdir=%{_sysconfdir}/ssh \
 	--libexecdir=%{_libexecdir}/openssh \
 	--datadir=%{_datadir}/openssh \
-	--with-rsh=%{_bindir}/rsh \
 	--with-default-path=/usr/local/bin:/bin:/usr/bin \
 	--with-superuser-path=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin \
 	--with-privsep-path=%{_var}/empty/sshd \
-- 
cgit v1.2.3