RPM: more updates

8 files changed, 30 insertions, 27 deletions

diff --git a/redhat/applications/basket/basket.spec b/redhat/applications/basket/basket.spec
index 99cc3f21b..3f805ace3 100644
--- a/redhat/applications/basket/basket.spec
+++ b/redhat/applications/basket/basket.spec
@@ -131,7 +131,7 @@ fi
   -DWITH_ALL_OPTIONS="ON" \
   ..
 
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
 
 
 %install
diff --git a/redhat/applications/bibletime/bibletime.spec b/redhat/applications/bibletime/bibletime.spec
index 2efbcfb47..4ecd291ea 100644
--- a/redhat/applications/bibletime/bibletime.spec
+++ b/redhat/applications/bibletime/bibletime.spec
@@ -124,7 +124,7 @@ unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
 
-%if 0%{?fedora} >= 31
+%if 0%{?fedora} >= 31 || 0%{?rhel} >= 8
 CXXFLAGS="${RPM_OPT_FLAGS} -std=c++11"
 %endif
 
diff --git a/redhat/applications/kcmldap/kcmldap.spec b/redhat/applications/kcmldap/kcmldap.spec
index 5fd5cef1e..499214d7e 100644
--- a/redhat/applications/kcmldap/kcmldap.spec
+++ b/redhat/applications/kcmldap/kcmldap.spec
@@ -105,12 +105,12 @@ BuildRequires:	openldap24-libs-devel
 #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
diff --git a/redhat/applications/kcmldapcontroller/kcmldapcontroller.spec b/redhat/applications/kcmldapcontroller/kcmldapcontroller.spec
index ab08b1b53..981d26b4c 100644
--- a/redhat/applications/kcmldapcontroller/kcmldapcontroller.spec
+++ b/redhat/applications/kcmldapcontroller/kcmldapcontroller.spec
@@ -95,12 +95,12 @@ BuildRequires:	openldap24-libs-devel
 #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
diff --git a/redhat/applications/kcmldapmanager/kcmldapmanager.spec b/redhat/applications/kcmldapmanager/kcmldapmanager.spec
index 4cb87cddd..49cf11bcd 100644
--- a/redhat/applications/kcmldapmanager/kcmldapmanager.spec
+++ b/redhat/applications/kcmldapmanager/kcmldapmanager.spec
@@ -92,12 +92,12 @@ BuildRequires:	openldap24-libs-devel
 #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
diff --git a/redhat/applications/kerberostray/kerberostray.spec b/redhat/applications/kerberostray/kerberostray.spec
index 7e91e0c72..9b1efc299 100644
--- a/redhat/applications/kerberostray/kerberostray.spec
+++ b/redhat/applications/kerberostray/kerberostray.spec
@@ -92,12 +92,12 @@ BuildRequires:	openldap24-libs-devel
 #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
diff --git a/redhat/applications/kgtk-qt3/kgtk-qt3.spec b/redhat/applications/kgtk-qt3/kgtk-qt3.spec
index 0f5e282f7..c05e7fb8e 100644
--- a/redhat/applications/kgtk-qt3/kgtk-qt3.spec
+++ b/redhat/applications/kgtk-qt3/kgtk-qt3.spec
@@ -180,8 +180,11 @@ echo "%{tde_libdir}/kgtk/libkgtk2.so" >"%{buildroot}%{tde_datadir}/kgtk/preload"
 %{tde_bindir}/kgtk-wrapper
 %{tde_bindir}/kgtk2-wrapper
 %{tde_bindir}/kqt3-wrapper
+%dir %{tde_datadir}/kgtk
+%dir %{tde_libdir}/kgtk
 %{tde_libdir}/kgtk/libkgtk2.so
 %{tde_libdir}/kgtk/libkqt3.so
 %{tde_datadir}/kgtk/preload
 
+
 %changelog
diff --git a/redhat/applications/mathemagics/mathemagics.spec b/redhat/applications/mathemagics/mathemagics.spec
index 22ccdd35b..698810832 100644
--- a/redhat/applications/mathemagics/mathemagics.spec
+++ b/redhat/applications/mathemagics/mathemagics.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package mathemagics (version R14.0.0)
+# spec file for package mathemagics (version R14)
 #
 # Copyright (c) 2014 Trinity Desktop Environment
 #