From: Andrew Deason <adeason@sinenomine.net>
Date: Wed, 1 Sep 2010 15:32:53 +0000 (-0500)
Subject: RedHat: Update openafs.spec for configure changes
X-Git-Tag: upstream/1.8.0_pre1^2~4869
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=83f85c9ad6c439eb9676436a3e09c40c2813f1c1;p=packages%2Fo%2Fopenafs.git

RedHat: Update openafs.spec for configure changes

We no longer have the configure options --enable-disconnected and
--with-krb5-conf. Remove them from the spec file and instead specify
krb5-config via the KRB5_CONFIG variable.

Change-Id: Ic9d9505f0526e38bf084683d9be3367851005a97
Reviewed-on: http://gerrit.openafs.org/2641
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/packaging/RedHat/openafs.spec.in b/src/packaging/RedHat/openafs.spec.in
index f7fa34b32..d64eba1a1 100644
--- a/src/packaging/RedHat/openafs.spec.in
+++ b/src/packaging/RedHat/openafs.spec.in
@@ -852,6 +852,11 @@ fi
 
 CFLAGS="$RPM_OPT_FLAGS"; export CFLAGS
 
+%if %{krb5support}
+KRB5_CONFIG="%{krb5config}"
+export KRB5_CONFIG
+%endif
+
 ./configure --with-afs-sysname=${sysname} \
        --prefix=%{_prefix} \
        --libdir=%{_libdir} \
@@ -859,12 +864,11 @@ CFLAGS="$RPM_OPT_FLAGS"; export CFLAGS
        --sbindir=%{_sbindir} \
        --disable-strip-binaries \
        --with-linux-kernel-packaging \
-       --enable-disconnected \
 %if %{build_modules}
        --with-linux-kernel-headers=${ksrc} \
 %endif
 %if %{krb5support}
-	--with-krb5-conf=%{krb5config} \
+	--with-krb5 \
 %endif
        $config_opts \
        || exit 1