From: nkadel Date: Sun, 16 Nov 2014 23:18:51 +0000 (-0500) Subject: Discard 'K5DIR' reporting. X-Git-Tag: V_7_7_P1~133 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94f8bf360eb0162e39ddf39d69925c2e93511e40;p=thirdparty%2Fopenssh-portable.git Discard 'K5DIR' reporting. It does not work inside 'mock' build environment. --- diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index a66502e9f..80a09ec30 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec @@ -193,11 +193,6 @@ environment. CFLAGS="$RPM_OPT_FLAGS -Os"; export CFLAGS %endif -%if %{kerberos5} -K5DIR=`rpm -ql krb5-devel | grep 'include/krb5\.h' | sed 's,\/include\/krb5.h,,'` -echo K5DIR=$K5DIR -%endif - %configure \ --sysconfdir=%{_sysconfdir}/ssh \ --libexecdir=%{_libexecdir}/openssh \ @@ -417,6 +412,7 @@ fi - Add 'dist' option to 'ver' so package names reflect OS at build time - Always include x11-ssh-askpass tarball in SRPM - Add openssh-x11-aspass BuildRequires for libXT-devel, imake, gtk2-devel +- Discard 'K5DIR' reporting, not usable inside 'mock' for RHEL 5 compatibility - Discard obsolete '--with-rsh' configure option - Update openssl-devel dependency to 0.9.8f, as found in autoconf