From aea1ff0939a3189717eef06cda052860db755ce7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Sun, 3 Nov 2019 11:15:16 +0100
Subject: RPM: remove remaining references to heimdal library

---
 redhat/docker/el5/packages.trinity          | 1 -
 redhat/docker/el6/packages.trinity          | 1 -
 redhat/docker/el7/packages                  | 1 -
 redhat/docker/f25/packages                  | 1 -
 redhat/docker/f26/packages                  | 1 -
 redhat/docker/f27/packages                  | 1 -
 redhat/docker/f28/packages                  | 1 -
 redhat/docker/f29/packages                  | 1 -
 redhat/docker/f30/packages                  | 1 -
 redhat/libraries/libtdeldap/libtdeldap.spec | 8 ++++----
 10 files changed, 4 insertions(+), 13 deletions(-)

(limited to 'redhat')

diff --git a/redhat/docker/el5/packages.trinity b/redhat/docker/el5/packages.trinity
index da882fb5c..3e21635b2 100644
--- a/redhat/docker/el5/packages.trinity
+++ b/redhat/docker/el5/packages.trinity
@@ -63,7 +63,6 @@ gtk+-devel
 gtk-doc
 guile-devel
 hal-devel
-heimdal-devel
 hspell-devel
 htdig
 html2ps
diff --git a/redhat/docker/el6/packages.trinity b/redhat/docker/el6/packages.trinity
index 4ee743b2a..ee5f0ba89 100644
--- a/redhat/docker/el6/packages.trinity
+++ b/redhat/docker/el6/packages.trinity
@@ -65,7 +65,6 @@ gtk+-devel
 gtk-doc
 guile-devel
 hal-devel
-heimdal-devel
 hspell-devel
 htdig
 html2ps
diff --git a/redhat/docker/el7/packages b/redhat/docker/el7/packages
index 60229d64f..393dff1b5 100644
--- a/redhat/docker/el7/packages
+++ b/redhat/docker/el7/packages
@@ -61,7 +61,6 @@ gtk2-devel
 gtk+-devel
 gtk-doc
 guile-devel
-heimdal-devel
 hspell-devel
 html2ps
 icu
diff --git a/redhat/docker/f25/packages b/redhat/docker/f25/packages
index e7a74d19f..7578b0a9c 100644
--- a/redhat/docker/f25/packages
+++ b/redhat/docker/f25/packages
@@ -62,7 +62,6 @@ gtk3-devel
 gtk+-devel
 gtk-doc
 guile-devel
-heimdal-devel
 hspell-devel
 htdig
 html2ps
diff --git a/redhat/docker/f26/packages b/redhat/docker/f26/packages
index 28da2c8db..fd881d1fb 100644
--- a/redhat/docker/f26/packages
+++ b/redhat/docker/f26/packages
@@ -62,7 +62,6 @@ gtk3-devel
 gtk+-devel
 gtk-doc
 guile-devel
-heimdal-devel
 hspell-devel
 htdig
 html2ps
diff --git a/redhat/docker/f27/packages b/redhat/docker/f27/packages
index 658696a81..4ed40b178 100644
--- a/redhat/docker/f27/packages
+++ b/redhat/docker/f27/packages
@@ -62,7 +62,6 @@ gtk3-devel
 gtk+-devel
 gtk-doc
 guile-devel
-heimdal-devel
 hspell-devel
 htdig
 html2ps
diff --git a/redhat/docker/f28/packages b/redhat/docker/f28/packages
index 6ada73c34..39096bfee 100644
--- a/redhat/docker/f28/packages
+++ b/redhat/docker/f28/packages
@@ -63,7 +63,6 @@ gtk3-devel
 gtk+-devel
 gtk-doc
 guile-devel
-heimdal-devel
 hspell-devel
 htdig
 html2ps
diff --git a/redhat/docker/f29/packages b/redhat/docker/f29/packages
index ddaabadc8..d15aab174 100644
--- a/redhat/docker/f29/packages
+++ b/redhat/docker/f29/packages
@@ -63,7 +63,6 @@ gtk3-devel
 gtk+-devel
 gtk-doc
 guile-devel
-heimdal-devel
 hspell-devel
 htdig
 html2ps
diff --git a/redhat/docker/f30/packages b/redhat/docker/f30/packages
index fa29bfd39..17cd6fcfe 100644
--- a/redhat/docker/f30/packages
+++ b/redhat/docker/f30/packages
@@ -63,7 +63,6 @@ gtk3-devel
 gtk+-devel
 gtk-doc
 guile-devel
-heimdal-devel
 hspell-devel
 htdig
 html2ps
diff --git a/redhat/libraries/libtdeldap/libtdeldap.spec b/redhat/libraries/libtdeldap/libtdeldap.spec
index 57207a80c..32c88b4a9 100644
--- a/redhat/libraries/libtdeldap/libtdeldap.spec
+++ b/redhat/libraries/libtdeldap/libtdeldap.spec
@@ -171,10 +171,10 @@ if [ -d "%{_includedir}/openldap24" ]; then
   extra_libs="%{_libdir}/openldap24:${extra_libs}"
 fi
 
-if [ -d "%{_includedir}/heimdal" ]; then
-  extra_includes="%{_includedir}/heimdal:${extra_includes}"
-  extra_libs="%{_libdir}/heimdal:${extra_libs}"
-fi
+#if [ -d "%{_includedir}/heimdal" ]; then
+#  extra_includes="%{_includedir}/heimdal:${extra_includes}"
+#  extra_libs="%{_libdir}/heimdal:${extra_libs}"
+#fi
 
 %configure \
   --prefix=%{tde_prefix} \
-- 
cgit v1.2.1