RPM: updates (cherry-pick from TDE R14.0.13)

Signed-off-by: François Andriot <albator78@libertysurf.fr>

1 files changed, 13 insertions, 2 deletions

diff --git a/redhat/extras/trinity-desktop/trinity-desktop.spec b/redhat/extras/trinity-desktop/trinity-desktop.spec
index 06391b49f..9edde3e74 100644
--- a/redhat/extras/trinity-desktop/trinity-desktop.spec
+++ b/redhat/extras/trinity-desktop/trinity-desktop.spec
@@ -149,7 +149,10 @@ Requires: trinity-kkbswitch
 Requires: trinity-klamav
 %endif
 Requires: trinity-klcddimmer
+%if 0%{?rhel} <= 8
+# No mplayer on RHEL9
 Requires: trinity-kmplayer
+%endif
 Requires: trinity-kmyfirewall
 Requires: trinity-kmymoney
 Requires: trinity-knemo
@@ -165,7 +168,7 @@ Requires: trinity-konversation
 Requires: trinity-kooldock
 Requires: trinity-kopete-otr
 Requires: trinity-kpicosim
-%if 0%{?sle_version} <= 150300
+%if 0%{?sle_version} <= 150300 && 0%{?suse_version} != 1599
 %if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora} || 0%{?rhel} >= 6
 Requires: trinity-kpilot
 %endif
@@ -189,7 +192,9 @@ Requires: trinity-kvkbd
 Requires: trinity-kvpnc
 Requires: trinity-kxmleditor
 Requires: trinity-mathemagics
+%if 0%{?rhel} <= 8
 Requires: trinity-mplayerthumbs
+%endif
 Requires: trinity-piklab
 %if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora} || 0%{?rhel} >= 7
 # On RHEL6, polkit is too old
@@ -205,7 +210,7 @@ Requires: trinity-smb4k
 Requires: trinity-smartcardauth
 Requires: trinity-soundkonverter
 Requires: trinity-tastymenu
-%if 0%{?sle_version} <= 150300
+%if 0%{?sle_version} <= 150300 && 0%{?rhel} <= 8
 Requires: trinity-tde-guidance
 %endif
 Requires: trinity-tde-style-baghira
@@ -213,8 +218,13 @@ Requires: trinity-tde-style-domino
 Requires: trinity-tde-style-ia-ora
 Requires: trinity-tde-style-lipstik
 Requires: trinity-tde-style-qtcurve
+%if 0%{?sle_version} <= 150300 && 0%{?rhel} <= 8
 Requires: trinity-tde-systemsettings
+%endif
 Requires: trinity-tdedocker
+%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora} || 0%{?rhel} >= 7
+Requires: trinity-tdeio-appinfo
+%endif
 Requires: trinity-tdeio-apt
 Requires: trinity-tdeio-ftps
 Requires: trinity-tdeio-gopher
@@ -234,6 +244,7 @@ Requires: trinity-tellico
 Requires: trinity-tork
 Requires: trinity-twin-style-crystal
 Requires: trinity-twin-style-dekorator
+Requires: trinity-twin-style-machbunt
 Requires: trinity-twin-style-suse2
 Requires: trinity-wlassistant
 Requires: trinity-yakuake