- (djm) Bug #776: Update contrib/redhat/openssh.spec to dynamically detect

   Kerberos location (and thus work with Fedora Core 1);
   from jason AT devrandom.org

diff --git a/ChangeLog b/ChangeLog
index 8839e28a8dece5b282961d6f8f94631653ea5317..8ee60a80f1730f517daa8e9df8d4d3d775d9ab76 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 20040123 
  - (djm) Do pam_session processing for systems with HAVE_LOGIN_CAP; from 
    ralf.hack AT pipex.net; ok dtucker@
+ - (djm) Bug #776: Update contrib/redhat/openssh.spec to dynamically detect
+   Kerberos location (and thus work with Fedora Core 1);
+   from jason AT devrandom.org
 
 20040122
  - (dtucker) [configure.ac] Use krb5-config where available for Kerberos/

diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index a4d49f61cbfcd7a45beec5bbaadd399ba28cfe19..30d026352ca97092bc0a22c471fb14241e3ea535 100644 (file)
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -1,5 +1,5 @@
 %define ver 3.7.1p2
-%define rel 1
+%define rel 0.2004012300
 
 # OpenSSH privilege separation requires a user & group ID
 %define sshd_uid    74
@@ -181,6 +181,11 @@ 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 \
@@ -200,7 +205,7 @@ CFLAGS="$RPM_OPT_FLAGS -Os"; export CFLAGS
        --with-pam \
 %endif
 %if %{kerberos5}
-        --with-kerberos5=/usr/kerberos \
+        --with-kerberos5=$K5DIR \
 %endif