From 9cbd3ceb76482d6e3323d72437fd38bfa14531e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Wed, 12 Apr 2023 23:19:59 +0200
Subject: [PATCH] RPM: enable mplayer related packages on rhel9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: François Andriot <albator78@libertysurf.fr>
---
 redhat/Makefile                                    | 4 +---
 redhat/docker/el9/packages                         | 1 +
 redhat/extras/trinity-desktop/trinity-desktop.spec | 5 -----
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/redhat/Makefile b/redhat/Makefile
index eeb2778d2..b6712c9cc 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -23,7 +23,7 @@ buildpkg = \
   echo
 
 
-all: common dependencies core libraries applications i18n meta external
+all: dependencies core libraries applications i18n meta external
 dependencies: tde-cmake tqt3 tqtinterface akode arts libart_lgpl libcaldav libcarddav polkit-tqt pytqt sip4-tqt tqca tqscintilla avahi-tqt dbus-tqt dbus-1-tqt
 core: tdelibs tdebase tdeaccessibility tdeadmin tdegames tdemultimedia tdepim tdetoys tdevelop tdeaddons tdeartwork tdebindings tdeedu tdegraphics tdenetwork tdesdk tdeutils tdewebdev
 libraries: kipi-plugins libkdcraw libkexiv2 libkipi libksquirrel libtdeldap libtqt-perl pytdeextensions pytde
@@ -491,9 +491,7 @@ mathemagics: tdebase
 	$(call buildpkg,applications/utilities/mathemagics)
 
 mplayerthumbs: tdebase
-ifeq (,$(filter $(DIST),.el9))
 	$(call buildpkg,applications/multimedia/mplayerthumbs)
-endif
 
 piklab: tdebase
 	$(call buildpkg,applications/development/piklab)
diff --git a/redhat/docker/el9/packages b/redhat/docker/el9/packages
index aafbf92a4..93fe5d4c6 100644
--- a/redhat/docker/el9/packages
+++ b/redhat/docker/el9/packages
@@ -145,6 +145,7 @@ lirc-devel
 lm_sensors-devel
 mesa-libGL-devel
 meson
+mplayer
 mysql-devel
 neon-devel
 netpbm-progs
diff --git a/redhat/extras/trinity-desktop/trinity-desktop.spec b/redhat/extras/trinity-desktop/trinity-desktop.spec
index fb1a67e93..e05691fba 100644
--- a/redhat/extras/trinity-desktop/trinity-desktop.spec
+++ b/redhat/extras/trinity-desktop/trinity-desktop.spec
@@ -148,10 +148,7 @@ 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
@@ -191,9 +188,7 @@ 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