RPM packaging: fix meta package dependencies

1 files changed, 20 insertions, 11 deletions

diff --git a/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec b/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec
index b1602ab5d..5a27ceb5e 100644
--- a/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec
+++ b/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec
@@ -118,8 +118,6 @@ Requires: trinity-digikam
 Requires: trinity-dolphin
 Requires: trinity-filelight
 Requires: trinity-gwenview
-Requires: trinity-k3b
-Requires: trinity-k9copy
 Requires: trinity-kaffeine
 Requires: trinity-kaffeine-mozilla
 Requires: trinity-kasablanca
@@ -131,20 +129,15 @@ Requires: trinity-kbiff
 Requires: trinity-kbookreader
 Requires: trinity-kchmviewer
 Requires: trinity-kcmautostart
-Requires: trinity-kcmldap
-Requires: trinity-kcmldapcontroller
-Requires: trinity-kcmldapmanager
 Requires: trinity-kcpuload
 Requires: trinity-kdbg
 Requires: trinity-kdbusnotification
 Requires: trinity-kdiff3
 Requires: trinity-kdirstat
 Requires: trinity-keep
-Requires: trinity-kerberostray
 Requires: trinity-keximdb
 Requires: trinity-kftpgrabber
 Requires: trinity-kile
-Requires: trinity-kima
 Requires: trinity-kiosktool
 Requires: trinity-kkbswitch
 Requires: trinity-klcddimmer
@@ -204,7 +197,6 @@ Requires: trinity-tdeio-umountwrapper
 Requires: trinity-tderadio
 Requires: trinity-tdesvn
 Requires: trinity-tdmtheme
-Requires: trinity-tellico
 Requires: trinity-tork
 Requires: trinity-twin-style-crystal
 Requires: trinity-wlassistant
@@ -215,9 +207,24 @@ Requires: trinity-yakuake
 Requires: trinity-tdesudo
 %endif
 
-# RHEL5: pilot library is too old
+# PCLinuxOS and RHEL 5 don't have heimdal ...
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%if 0%{?pclinuxos} == 0
+Requires: trinity-kcmldap
+Requires: trinity-kcmldapcontroller
+Requires: trinity-kcmldapmanager
+Requires: trinity-kerberostray
+%endif
+%endif
+
+# RHEL5: UDEV is too old
 %if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+Requires: trinity-k3b
+Requires: trinity-k9copy
+Requires: trinity-kima
 Requires: trinity-kpilot
+Requires: trinity-tellico
+Requires: trinity-tdepowersave
 %endif
 
 # Network management
@@ -234,7 +241,6 @@ Obsoletes: trinity-knetworkmanager8
 
 # Power management
 Obsoletes: trinity-tde-guidance-powermanager
-Requires: trinity-tdepowersave
 
 # Decoration-related stuff (not installed by default)
 #Requires: trinity-kgtk-qt3
@@ -292,7 +298,6 @@ Requires:	trinity-icons-oxygen
 Requires:	trinity-kdevmon
 Requires:	trinity-kdissert
 Requires:	trinity-klamav
-Requires:	trinity-klibido
 Requires:	trinity-knoda
 Requires:	trinity-kompose
 Requires:	trinity-koverartist
@@ -300,6 +305,10 @@ Requires:	trinity-kpacman
 Requires:	trinity-mathemagics
 #Requires:	trinity-tdeio-sysinfo-plugin
 
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+Requires:	trinity-klibido
+%endif
+
 
 %description extras
 %{summary}