RPM: update spec files for TDE 14.0.7

1 files changed, 6 insertions, 7 deletions

diff --git a/redhat/main/tdenetwork/tdenetwork-14.0.0.spec b/redhat/main/tdenetwork/tdenetwork.spec
index 28717c158..94345b490 100644
--- a/redhat/main/tdenetwork/tdenetwork-14.0.0.spec
+++ b/redhat/main/tdenetwork/tdenetwork.spec
@@ -26,7 +26,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg tdenetwork
 %define tde_prefix /opt/trinity
@@ -46,11 +46,8 @@
 # Avoids relinking, which breaks consolehelper
 %define dont_relink 1
 
-%if "%{?tde_version}" == "14.0.4"
-%define with_aim 1
-%else
+# Disable AIM support
 %define with_aim 0
-%endif
 
 Name:			trinity-%{tde_pkg}
 Summary:		Trinity Desktop Environment - Network Applications
@@ -184,7 +181,7 @@ BuildRequires:	libiw-devel
 %endif
 
 # OpenSLP support
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
+%if 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
 %define with_openslp 1
 BuildRequires: openslp-devel
 %endif
@@ -229,7 +226,7 @@ Requires:		jasper
 BuildRequires:	libacl-devel
 
 # MEANWHILE support
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?suse_version}
+%if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?fedora} >= 15 || 0%{?suse_version}
 %define with_meanwhile 1
 BuildRequires:	meanwhile-devel
 %endif
@@ -915,7 +912,9 @@ and shouldn't be run on a multi-user machine.
 %{tde_datadir}/icons/crystalsvg/*/apps/ktalkd.png
 %{tde_datadir}/icons/hicolor/*/apps/ktalkd.png
 %{tde_datadir}/sounds/ktalkd.wav
+%if 0%{?fedora} == 0 || 0%{?fedora} <= 30
 %dir %{_sysconfdir}/xinetd.d
+%endif
 %config(noreplace) %{_sysconfdir}/xinetd.d/ktalk
 %{tde_tdedocdir}/HTML/en/kcontrol/kcmtalkd
 %{tde_tdedocdir}/HTML/en/ktalkd