RPM: massive update and cleanup

1 files changed, 12 insertions, 14 deletions

diff --git a/redhat/applications/kcmldap/kcmldap.spec b/redhat/applications/kcmldap/kcmldap.spec
index 5fcf25a9b..5fd5cef1e 100644
--- a/redhat/applications/kcmldap/kcmldap.spec
+++ b/redhat/applications/kcmldap/kcmldap.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.1.0
 %endif
 %define tde_pkg kcmldap
 %define tde_prefix /opt/trinity
@@ -101,13 +101,16 @@ BuildRequires:	openldap2-devel
 BuildRequires:	openldap24-libs-devel
 %endif
 
+# KRB5 support
+#BuildRequires:	krb5-devel
+
 # HEIMDAL support
-%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires:	heimdal-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:	libheimdal-devel
-%endif
+#%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
+#BuildRequires:	heimdal-devel
+#%endif
+#%if 0%{?suse_version}
+#BuildRequires:	libheimdal-devel
+#%endif
 
 # UDEV support
 %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
@@ -141,7 +144,7 @@ This is a TDE control center module to manage TDE connections to Kerberos realms
 
 %files -n trinity-kcontrol-ldap-bonding
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING
+%doc AUTHORS COPYING
 %{tde_bindir}/tdeldapbonding
 %{tde_tdelibdir}/kcm_ldapbonding.la
 %{tde_tdelibdir}/kcm_ldapbonding.so
@@ -162,7 +165,7 @@ This is a small daemon which keeps the LDAP root certificate up to date with the
 
 %files -n trinity-tde-ldap-cert-updater
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING
+%doc AUTHORS COPYING
 %{tde_bindir}/tdeldapcertupdater
 
 ##########
@@ -208,11 +211,6 @@ fi
   -DBUILD_DOC=ON \
   -DBUILD_TRANSLATIONS=ON \
   \
-%if 0%{?suse_version}
-  -DKRB5_FOUND=1 \
-  -DKRB5_LIBRARIES="-lkrb5" \
-  -DKRB5_INCLUDE_DIRS="/usr/include" \
-%endif
   ..
 
 %__make %{?_smp_mflags} || %__make