RPM: update metapackages

4 files changed, 35 insertions, 430 deletions

diff --git a/redhat/extras/trinity-desktop/trinity-3.5.13-fedora.repo b/redhat/extras/trinity-desktop/trinity-3.5.13-fedora.repo
index 7a292aa39..05e45748c 100644
--- a/redhat/extras/trinity-desktop/trinity-3.5.13-fedora.repo
+++ b/redhat/extras/trinity-desktop/trinity-3.5.13-fedora.repo
@@ -1,23 +1,23 @@
 [trinity-3.5.13]
 name=trinity-3.5.13
-#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/f$releasever/trinity-3.5.13/RPMS/$basearch
-mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/f$releasever/trinity-3.5.13-$basearch.list
+#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/rpm/f$releasever/trinity-3.5.13/RPMS/$basearch
+mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/rpm/f$releasever/trinity-3.5.13-$basearch.list
 enabled=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity
 
 [trinity-3.5.13-noarch]
 name=trinity-3.5.13-noarch
-#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/f$releasever/trinity-3.5.13/RPMS/noarch
-mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/f$releasever/trinity-3.5.13-noarch.list
+#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/rpm/f$releasever/trinity-3.5.13/RPMS/noarch
+mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/rpm/f$releasever/trinity-3.5.13-noarch.list
 enabled=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity
 
 [trinity-3.5.13-source]
 name=trinity-3.5.13-source
-#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/f$releasever/trinity-3.5.13/SRPMS
-mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/f$releasever/trinity-3.5.13-SRPMS.list
+#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/rpm/f$releasever/trinity-3.5.13/SRPMS
+mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/rpm/f$releasever/trinity-3.5.13-SRPMS.list
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity
diff --git a/redhat/extras/trinity-desktop/trinity-3.5.13-rhel.repo b/redhat/extras/trinity-desktop/trinity-3.5.13-rhel.repo
index f415f006a..7ce5d3e31 100644
--- a/redhat/extras/trinity-desktop/trinity-3.5.13-rhel.repo
+++ b/redhat/extras/trinity-desktop/trinity-3.5.13-rhel.repo
@@ -1,23 +1,23 @@
 [trinity-3.5.13]
 name=trinity-3.5.13
-#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/el$releasever/trinity-3.5.13/RPMS/$basearch
-mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/el$releasever/trinity-3.5.13-$basearch.list
+#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/rpm/el$releasever/trinity-3.5.13/RPMS/$basearch
+mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/rpm/el$releasever/trinity-3.5.13-$basearch.list
 enabled=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity
 
 [trinity-3.5.13-noarch]
 name=trinity-3.5.13-noarch
-#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/el$releasever/trinity-3.5.13/RPMS/noarch
-mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/el$releasever/trinity-3.5.13-noarch.list
+#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/rpm/el$releasever/trinity-3.5.13/RPMS/noarch
+mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/rpm/el$releasever/trinity-3.5.13-noarch.list
 enabled=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity
 
 [trinity-3.5.13-source]
 name=trinity-3.5.13-noarch
-#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/el$releasever/trinity-3.5.13/SRPMS
-mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/el$releasever/trinity-3.5.13-SRPMS.list
+#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/rpm/el$releasever/trinity-3.5.13/SRPMS
+mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/rpm/el$releasever/trinity-3.5.13-SRPMS.list
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity
diff --git a/redhat/extras/trinity-desktop/trinity-desktop-3.5.13.2.spec b/redhat/extras/trinity-desktop/trinity-desktop-3.5.13.2.spec
deleted file mode 100644
index 80eef7416..000000000
--- a/redhat/extras/trinity-desktop/trinity-desktop-3.5.13.2.spec
+++ /dev/null
@@ -1,330 +0,0 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _docdir %{_datadir}/doc
-%define tde_datadir %{tde_prefix}/share
-%endif
-
-Name:		trinity-desktop
-Version:	3.5.13.2
-Release:	2%{?dist}
-License:	GPL
-Summary:	Meta-package to install TDE
-Group:		User Interface/Desktops
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-Source0:	trinity-3.5.13-fedora.repo
-Source1:	trinity-3.5.13-rhel.repo
-Source2:	RPM-GPG-KEY-trinity
-
-Requires:	trinity-tdeaccessibility >= %{version}
-Requires:	trinity-tdeaddons >= %{version}
-Requires:	trinity-tdeadmin >= %{version}
-Requires:	trinity-tdeartwork >= %{version}
-Requires:	trinity-tdebase >= %{version}
-Requires:	trinity-tdebindings >= %{version}
-Requires:	trinity-tdeedu >= %{version}
-Requires:	trinity-tdegames >= %{version}
-Requires:	trinity-tdegraphics >= %{version}
-Requires:	trinity-tdemultimedia >= %{version}
-Requires:	trinity-tdenetwork >= %{version}
-Requires:	trinity-tdepim >= %{version}
-Requires:	trinity-tdeutils >= %{version}
-Requires:	trinity-tdetoys >= %{version}
-Requires:	hal
-
-%if 0%{?rhel} || 0%{?fedora}
-# YUM configuration file
-Requires:	trinity-repo >= %{version}
-%endif
-
-%description
-The TDE project aims to keep the KDE3.5 computing style alive, as well as 
-polish off any rough edges that were present as of KDE 3.5.10. Along 
-the way, new useful features will be added to keep the environment 
-up-to-date.
-Toward that end, significant new enhancements have already been made in 
-areas such as display control, network connectivity, user 
-authentication, and much more!
-
-%files
-
-##########
-
-%package devel
-Group:		User Interface/Desktops
-Summary:	Meta-package to install TDE development tools
-
-Obsoletes:	trinity-desktop-dev < %{version}-%{release}
-Provides:	trinity-desktop-dev = %{version}-%{release}
-
-Requires:	trinity-tdesdk >= %{version}
-Requires:	trinity-tdevelop >= %{version}
-Requires:	trinity-tdewebdev >= %{version}
-
-%description devel
-%{summary}
-
-%files devel
-
-##########
-
-%package applications
-Group:		User Interface/Desktops
-Summary:	Meta-package to install all TDE applications
-
-# Warning, k9copy requires ffmpeg
-# Warning, tderadio requires libmp3lame
-
-Requires: trinity-abakus
-Requires: trinity-amarok
-Requires: trinity-basket
-Requires: trinity-bibletime
-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-katapult
-Requires: trinity-kbarcode
-Requires: trinity-kbfx
-Requires: trinity-kbookreader
-Requires: trinity-kchmviewer
-Requires: trinity-kcpuload
-Requires: trinity-kdiff3
-Requires: trinity-kdirstat
-Requires: trinity-keep
-Requires: trinity-kile
-Requires: trinity-kiosktool
-Requires: trinity-kmyfirewall
-Requires: trinity-kmymoney
-Requires: trinity-knemo
-Requires: trinity-knetload
-Requires: trinity-knetstats
-Requires: trinity-knights
-Requires: trinity-knowit
-Requires: trinity-knutclient
-Requires: trinity-koffice-suite
-Requires: trinity-konversation
-Requires: trinity-kpicosim
-Requires: trinity-krename
-Requires: trinity-krusader
-Requires: trinity-ksplash-engine-moodin
-Requires: trinity-ksquirrel
-Requires: trinity-kstreamripper
-Requires: trinity-ksystemlog
-Requires: trinity-ktechlab
-Requires: trinity-ktorrent
-Requires: trinity-kuickshow
-Requires: trinity-kvirc
-Requires: trinity-kvkbd
-Requires: trinity-piklab
-Requires: trinity-potracegui
-Requires: trinity-smb4k
-Requires: trinity-smartcardauth
-Requires: trinity-soundkonverter
-Requires: trinity-tde-guidance
-Requires: trinity-tde-style-lipstik
-Requires: trinity-tde-style-qtcurve
-Requires: trinity-tde-systemsettings
-Requires: trinity-tdeio-apt
-Requires: trinity-tdeio-locate
-Requires: trinity-tdeio-umountwrapper
-Requires: trinity-tderadio
-Requires: trinity-tdmtheme
-Requires: trinity-tellico
-Requires: trinity-twin-style-crystal
-Requires: trinity-wlassistant
-Requires: trinity-yakuake
-
-# PCLinuxOS does not have sudo ...
-%if 0%{?pclinuxos} == 0
-Requires: trinity-tdesudo
-%endif
-
-# RHEL5: pilot library is too old
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-Requires: trinity-kpilot
-%endif
-
-# Network management
-# RHEL 6 and openSUSE 11.x: knetworkmanager8
-%if 0%{?rhel} == 6
-Requires: trinity-knetworkmanager
-%endif
-%if 0%{?suse_version} && 0%{?suse_version} <= 1140
-Requires: trinity-knetworkmanager
-%endif
-
-# Power management
-Requires: trinity-tde-guidance-powermanager
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-# On RHEL 5, HAL version is too old for kpowersave .
-Requires: trinity-kpowersave
-%endif
-
-# Decoration-related stuff (not installed by default)
-#Requires: trinity-kgtk-qt3
-#Requires: trinity-gtk-qt-engine
-#Requires: trinity-gtk3-tqt-engine
-#Requires: trinity-qt4-tqt-theme-engine
-
-# On RHEL 5/7, lilypond is not available, so no rosegarden :'-(
-%if 0%{?rhel} == 5 || 0%{?rhel} == 7
-%else
-Requires: trinity-rosegarden
-%endif
-
-# Compiz-related stuff does not work (obsolete)
-#Requires: trinity-compizconfig-backend-kconfig
-#Requires: trinity-desktop-effects-kde
-#Requires: trinity-fusion-icon
-
-# Useless l10n package
-#Requires: trinity-filelight-l10n
-
-# RHEL 4
-%if 0%{?rhel} >= 5 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-# HAL is mandatory for these apps, but too old
-Requires: trinity-kima
-Requires: trinity-kmplayer
-# No OTR support
-Requires: trinity-kopete-otr
-# No DBUS support
-Requires: trinity-kdbusfnotification
-# Subversion 1.1 is too old
-Requires: trinity-tdesvn
-%endif
-
-%description applications
-%{summary}
-
-%files  applications
-
-##########
-
-%if 0
-
-%package extras
-Group:		User Interface/Desktops
-Summary:	Meta-package to install all extras (unofficial) TDE packages
-
-Requires:	trinity-akode
-Requires:	trinity-kasablanca
-#Requires:	trinity-kdebluetooth
-#Requires:	trinity-kcheckgmail
-Requires:	trinity-icons-crystalsvg-updated
-Requires:	trinity-icons-kfaenza
-Requires:	trinity-icons-oxygen
-Requires:	trinity-kbibtex
-Requires:	trinity-kbiff
-Requires:	trinity-kcmautostart
-Requires:	trinity-kftpgrabber
-Requires:	trinity-kickoff-i18n
-Requires:	trinity-knmap
-#Requires:	trinity-knoda
-Requires:	trinity-ksensors
-Requires:	trinity-kshowmail
-Requires:	trinity-mplayerthumbs
-Requires:	trinity-style-ia-ora
-Requires:	trinity-tdeio-ftps-plugin
-#Requires:	trinity-tdeio-sysinfo-plugin
-Requires:	trinity-theme-baghira
-Requires:	trinity-tork
-
-
-# GLIBC too old on RHEL <= 5
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6
-Requires:	trinity-twinkle
-%endif
-
-%description extras
-%{summary}
-
-%files extras
-
-%endif
-
-##########
-
-%package all
-Group:		User Interface/Desktops
-Summary:	Meta-package to install all TDE packages
-
-Requires:	%{name} = %{version}
-Requires:	%{name}-applications = %{version}
-Requires:	%{name}-devel = %{version}
-#Requires:	%{name}-extras = %{version}
-
-%description all
-%{summary}
-
-%files all
-
-##########
-
-%if 0%{?rhel} || 0%{?fedora}
-%package -n trinity-repo
-Group:		User Interface/Desktops
-Summary:	Yum configuration files for Trinity
-Requires(pre):	coreutils
-
-%description -n trinity-repo
-%{summary}
-
-%pre -n trinity-repo
-# Make sure every Trinity related repository is deleted before installing new one.
-%__rm -f %{_sysconfdir}/yum.repos.d/trinity-*.repo
-
-%files -n trinity-repo
-%defattr(-,root,root,-)
-%{_sysconfdir}/yum.repos.d/*.repo
-%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-trinity
-%endif
-
-##########
-
-%prep
-
-%build
-
-%install
-%__rm -rf %{?buildroot}
-%__mkdir_p "%{?buildroot}%{_sysconfdir}/yum.repos.d"
-
-# FEDORA configuration for YUM
-%if 0%{?fedora}
-%__sed %{SOURCE0} \
-  -e 's/\$releasever/%{fedora}/g' \
-  -e 's/-fedora/-f%{fedora}/g' \
-  >"%{?buildroot}%{_sysconfdir}/yum.repos.d/trinity-3.5.13.repo"
-%endif
-
-# RHEL configuration for YUM
-# $releasever is replaced with its value
-%if 0%{?rhel}
-%__sed %{SOURCE1} \
-  -e 's/\$releasever/%{rhel}/g' \
-  >"%{?buildroot}%{_sysconfdir}/yum.repos.d/trinity-3.5.13.repo"
-%endif
-
-%if 0%{?fedora} || 0%{?rhel}
-%__chmod 644 %{?buildroot}%{_sysconfdir}/yum.repos.d/*.repo
-%endif
-
-# RPM signing key
-%if 0%{?rhel} || 0%{?fedora}
-%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-trinity"
-%endif
-
-
-%changelog
diff --git a/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec b/redhat/extras/trinity-desktop/trinity-desktop.spec
index f540aee6a..f2ecb741b 100644
--- a/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec
+++ b/redhat/extras/trinity-desktop/trinity-desktop.spec
@@ -61,8 +61,8 @@ Requires:	trinity-tdegraphics >= %{version}
 Requires:	trinity-tdemultimedia >= %{version}
 Requires:	trinity-tdenetwork >= %{version}
 Requires:	trinity-tdepim >= %{version}
-Requires:	trinity-tdeutils >= %{version}
 Requires:	trinity-tdetoys >= %{version}
+Requires:	trinity-tdeutils >= %{version}
 
 %if 0%{?rhel} || 0%{?fedora}
 # YUM configuration file
@@ -70,12 +70,12 @@ Requires:	trinity-repo >= %{version}
 %endif
 
 %description
-The TDE project aims to keep the KDE3.5 computing style alive, as well as 
-polish off any rough edges that were present as of KDE 3.5.10. Along 
-the way, new useful features will be added to keep the environment 
+The TDE project aims to keep the KDE3.5 computing style alive, as well as
+polish off any rough edges that were present as of KDE 3.5.10. Along
+the way, new useful features will be added to keep the environment
 up-to-date.
-Toward that end, significant new enhancements have already been made in 
-areas such as display control, network connectivity, user 
+Toward that end, significant new enhancements have already been made in
+areas such as display control, network connectivity, user
 authentication, and much more!
 
 %files
@@ -86,9 +86,6 @@ authentication, and much more!
 Group:		User Interface/Desktops
 Summary:	Meta-package to install TDE development tools
 
-Obsoletes:	trinity-desktop-dev < %{version}-%{release}
-Provides:	trinity-desktop-dev = %{version}-%{release}
-
 Requires:	trinity-tdesdk >= %{version}
 Requires:	trinity-tdevelop >= %{version}
 Requires:	trinity-tdewebdev >= %{version}
@@ -105,16 +102,18 @@ Group:		User Interface/Desktops
 Summary:	Meta-package to install all TDE applications
 
 # Warning, k9copy requires ffmpeg
-# Warning, tderadio requires libmp3lame
 
 Requires: trinity-abakus
 Requires: trinity-amarok
 Requires: trinity-basket
 Requires: trinity-bibletime
+Requires: trinity-codeine
 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
@@ -126,15 +125,21 @@ 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-kerry
 Requires: trinity-keximdb
 Requires: trinity-kftpgrabber
 Requires: trinity-kile
+Requires: trinity-kima
 Requires: trinity-kiosktool
 Requires: trinity-kkbswitch
 Requires: trinity-klcddimmer
@@ -153,21 +158,21 @@ Requires: trinity-konversation
 Requires: trinity-kooldock
 Requires: trinity-kopete-otr
 Requires: trinity-kpicosim
+Requires: trinity-kpilot
 Requires: trinity-kplayer
 Requires: trinity-krecipes
 Requires: trinity-krename
 Requires: trinity-krusader
 Requires: trinity-kscope
 Requires: trinity-ksensors
-Requires: trinity-ksplash-engine-moodin
-Requires: trinity-ksquirrel
 Requires: trinity-kshowmail
 Requires: trinity-kshutdown
+Requires: trinity-ksplash-engine-moodin
+Requires: trinity-ksquirrel
 Requires: trinity-kstreamripper
 Requires: trinity-ksystemlog
 Requires: trinity-ktechlab
 Requires: trinity-ktorrent
-Requires: trinity-kuickshow
 Requires: trinity-kvirc
 Requires: trinity-kvkbd
 Requires: trinity-kvpnc
@@ -188,14 +193,18 @@ Requires: trinity-tde-style-ia-ora
 Requires: trinity-tde-style-lipstik
 Requires: trinity-tde-style-qtcurve
 Requires: trinity-tde-systemsettings
+Requires: trinity-tdedocker
 Requires: trinity-tdeio-apt
 Requires: trinity-tdeio-ftps
 Requires: trinity-tdeio-locate
 Requires: trinity-tdeio-sword
 Requires: trinity-tdeio-umountwrapper
+Requires: trinity-tdepacman
 %if 0%{?rhel} != 5
+Requires: trinity-tdepowersave
 %endif
 Requires: trinity-tderadio
+Requires: trinity-tdesudo
 Requires: trinity-tdesvn
 Requires: trinity-tdmtheme
 Requires: trinity-tellico
@@ -204,31 +213,6 @@ Requires: trinity-twin-style-crystal
 Requires: trinity-wlassistant
 Requires: trinity-yakuake
 
-# PCLinuxOS does not have sudo ...
-%if 0%{?pclinuxos} == 0
-Requires: trinity-tdesudo
-%endif
-
-# 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
 # RHEL 6 and openSUSE 11.x: knetworkmanager8
 %if 0%{?suse_version} && 0%{?suse_version} <= 1140 || 0%{?rhel} == 6
@@ -237,8 +221,6 @@ Requires: trinity-knetworkmanager
 # Other distros use tdenetworkmanager (since R14)
 %if 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora}
 Requires: trinity-tdenetworkmanager
-Obsoletes: trinity-knetworkmanager
-Obsoletes: trinity-knetworkmanager8
 %endif
 
 # Power management
@@ -250,13 +232,8 @@ Obsoletes: trinity-tde-guidance-powermanager
 #Requires: trinity-gtk3-tqt-engine
 #Requires: trinity-qt4-tqt-theme-engine
 
-# Missing qalculate on older RHEL ...
-%if 0%{?rhel} == 0 || 0%{?rhel} >= 7
-Requires: trinity-qalculate-tde
-%endif
-
 # On RHEL 5/7, lilypond is not available, so no rosegarden :'-(
-%if 0%{?rhel} == 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora}
+%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora}
 Requires: trinity-rosegarden
 %endif
 
@@ -265,16 +242,6 @@ Requires: trinity-rosegarden
 #Requires: trinity-desktop-effects-kde
 #Requires: trinity-fusion-icon
 
-# Useless l10n package
-#Requires: trinity-filelight-l10n
-
-# Not even an RPM package ...
-#Requires: trinity-konstruct
-
-# Debian/Ubuntu specific ...
-#Requires: trinity-adept
-
-#Requires: trinity-gwenview-i18n
 
 %description applications
 %{summary}
@@ -283,37 +250,6 @@ Requires: trinity-rosegarden
 
 ##########
 
-%package extras
-Group:		User Interface/Desktops
-Summary:	Meta-package to install all extras (unofficial) TDE packages
-
-Requires:	trinity-icons-crystalsvg-updated
-Requires:	trinity-icons-kfaenza
-Requires:	trinity-icons-nuvola
-Requires:	trinity-icons-oxygen
-#Requires:	trinity-kickoff-i18n
-#Requires:	trinity-kcheckgmail
-#Requires:	trinity-kdebluetooth
-Requires:	trinity-kdevmon
-Requires:	trinity-kdissert
-Requires:	trinity-kompose
-Requires:	trinity-koverartist
-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}
-
-%files extras
-
-##########
-
 %package all
 Group:		User Interface/Desktops
 Summary:	Meta-package to install all TDE packages
@@ -321,7 +257,6 @@ Summary:	Meta-package to install all TDE packages
 Requires:	%{name} = %{version}
 Requires:	%{name}-applications = %{version}
 Requires:	%{name}-devel = %{version}
-#Requires:	%{name}-extras = %{version}
 
 %description all
 %{summary}