diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2015-12-15 15:23:49 +1100 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2015-12-15 15:23:49 +1100 |
| commit | ee607cccb6636eb543282ba90e0677b0604d8b7a (patch) | |
| tree | 228b1a5a53b44b8575cef3ba5b2c331a956734dc /contrib | |
| parent | b5fa0cd73555b991a543145603658d7088ec6b60 (diff) | |
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.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/redhat/openssh.spec | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index 5b27106f..a3096f2d 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 \ |