RPM: update metapackages

8 files changed, 49 insertions, 1022 deletions

diff --git a/redhat/extras/brp-check-trinity/brp-check-trinity-3.5.13.2.spec b/redhat/extras/brp-check-trinity/brp-check-trinity-3.5.13.2.spec
deleted file mode 100644
index 204996c77..000000000
--- a/redhat/extras/brp-check-trinity/brp-check-trinity-3.5.13.2.spec
+++ /dev/null
@@ -1,105 +0,0 @@
-#
-# spec file for package brp-check-trinity (version 3.5.13-SRU)
-#
-# Copyright (c) 2014 Trinity Desktop Environment
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-#
-# Please submit bugfixes or comments via http://www.trinitydesktop.org/
-#
-
-# TDE variables
-%define tde_version 3.5.13.2
-%define tde_prefix /opt/trinity
-
-Name:		brp-check-trinity
-Version:	1.0
-Release:	1%{?dist}
-Summary:	Build root policy check scripts for Trinity
-Group:		System Environment/Daemons 
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Project
-#Packager:	Francois Andriot <[email protected]>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-BuildRequires:	update-desktop-files
-BuildRequires:	brp-check-suse
-BuildRequires:	brp-extract-appdata
-Requires:	update-desktop-files
-Requires:	brp-check-suse
-Requires:	brp-extract-appdata
-Requires:	sed
-
-
-
-%description
-This package dynamically patches the openSUSE brp script to allow
-building of Trinity Desktop Environment (TDE) instead of KDE3.
-It should not be installed on runtime computer.
-
-
-%files
-
-%post
-for i in \
-	brp-desktop.data/applications.menu \
-	brp-desktop.data/kde-settings.menu \
-	brp-desktop.data/xdg_menu \
-	brp-suse.d/brp-25-symlink \
-	brp-suse.d/brp-72-extract-appdata \
-	suse_update_desktop_file.sh \
-; do
-	echo "Patching file '/usr/lib/rpm/${i}' ..."
-	install -D "/usr/lib/rpm/${i}" "/usr/lib/rpm.orig/${i}"
-	sed -i "/usr/lib/rpm/${i}" \
-		-e "s|opt/kde3|opt/trinity|g" \
-		-e "s|kde-settings-|tde-settings-|g" \
-		-e "s|doc/kde|doc/tde|g" \
-		-e "s|kde_xdgdata|tde_xdgdata|g" \
-done
-
-
-%postun
-for i in \
-	brp-desktop.data/applications.menu \
-	brp-desktop.data/kde-settings.menu \
-	brp-desktop.data/xdg_menu \
-	brp-suse.d/brp-25-symlink \
-	brp-suse.d/brp-72-extract-appdata \
-	suse_update_desktop_file.sh \
-; do
-	echo "Restoring file '/usr/lib/rpm/${i}' ..."
-	install "/usr/lib/rpm.orig/${i}" "/usr/lib/rpm/${i}"
-done
-rm -rf "/usr/lib/rpm.orig"
-
-##########
-
-%prep
-
-%build
-
-%install
-
-%clean
-%__rm -rf %{?buildroot}
-
-
-%changelog
diff --git a/redhat/extras/brp-check-trinity/brp-check-trinity-14.0.0.spec b/redhat/extras/brp-check-trinity/brp-check-trinity.spec
index 830add7f6..325f1aef4 100644
--- a/redhat/extras/brp-check-trinity/brp-check-trinity-14.0.0.spec
+++ b/redhat/extras/brp-check-trinity/brp-check-trinity.spec
@@ -25,7 +25,7 @@ Name:		brp-check-trinity
 Version:	1.0
 Release:	1%{?dist}
 Summary:	Build root policy check scripts for Trinity
-Group:		System Environment/Daemons 
+Group:		System Environment/Daemons
 URL:		http://www.trinitydesktop.org/
 
 %if 0%{?suse_version}
@@ -82,7 +82,11 @@ for i in \
 		-e "s|applications/kde|applications/tde|g" \
 		-e "s|KDE|TDE|g" \
 		-e "s|kde-|tde-|g" \
-		-e "s|tde-settings.menu|kde-settings.menu|"
+%if 0%{?suse_version} == 1550
+		-e "s|/usr/share/applications|/opt/trinity/share/applications|g" \
+		-e "/^for i in/ s|\\\| /\$RPM_BUILD_ROOT/opt/trinity/share/applnk \\\|" \
+%endif
+		-e "s|tde-settings.menu|kde-settings.menu|g"
 done
 
 
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 <[email protected]>
-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}
diff --git a/redhat/extras/trinity-filesystem/trinity-filesystem-3.5.13.2.spec b/redhat/extras/trinity-filesystem/trinity-filesystem-3.5.13.2.spec
deleted file mode 100644
index 5a8e7f9b0..000000000
--- a/redhat/extras/trinity-filesystem/trinity-filesystem-3.5.13.2.spec
+++ /dev/null
@@ -1,484 +0,0 @@
-#
-# spec file for package trinity-filesystem (version 3.5.13-SRU)
-#
-# Copyright (c) 2014 Trinity Desktop Environment
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-#
-# Please submit bugfixes or comments via http://www.trinitydesktop.org/
-#
-
-# TDE variables
-%define tde_version 3.5.13.2
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define _docdir %{tde_docdir}
-%define tde_docdir %{tde_datadir}/doc
-%define tde_mandir %{tde_datadir}/man
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_includedir %{tde_prefix}/include
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-
-Name:		trinity-filesystem
-Version:	%{tde_version}
-Release:	1%{?dist}
-Summary:	Trinity Directory Layout
-Group:		System/Fhs
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <[email protected]>
-
-Prefix:		/usr
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-
-%description
-This package installs the Trinity directory structure.
-
-
-%files
-%defattr(-,root,root,-)
-%dir %{tde_prefix}
-
-%dir %{tde_bindir}
-
-%dir %{tde_datadir}
-%dir %{tde_datadir}/config
-%dir %{tde_datadir}/config/magic
-
-%dir %{tde_docdir}
-%dir %{tde_tdedocdir}
-%dir %{tde_tdedocdir}/HTML
-%dir %{tde_tdedocdir}/HTML/en
-%dir %{tde_tdedocdir}/HTML/en/common
-
-%dir %{tde_includedir}
-%dir %{tde_tdeincludedir}
-
-%dir %{tde_libdir}
-%dir %{tde_libdir}/java
-%dir %{tde_libdir}/jni
-%dir %{tde_libdir}/pkgconfig
-%dir %{tde_tdelibdir}
-
-%dir %{tde_datadir}/applications
-%dir %{tde_datadir}/applications/kde
-%dir %{tde_datadir}/applnk
-%dir %{tde_datadir}/applnk/.hidden
-%dir %{tde_datadir}/applnk/*
-%dir %{tde_datadir}/applnk/*/*
-%dir %{tde_datadir}/apps
-%dir %{tde_datadir}/apps/*
-%dir %{tde_datadir}/cmake
-%dir %{tde_datadir}/config.kcfg
-%dir %{tde_datadir}/autostart
-%dir %{tde_datadir}/emoticons
-%dir %{tde_datadir}/icons
-%dir %{tde_datadir}/icons/crystalsvg
-%dir %{tde_datadir}/icons/crystalsvg/*
-%dir %{tde_datadir}/icons/crystalsvg/*/*
-%dir %{tde_datadir}/icons/hicolor
-%dir %{tde_datadir}/icons/hicolor/*
-%dir %{tde_datadir}/icons/hicolor/*/*
-%dir %{tde_datadir}/icons/locolor
-%dir %{tde_datadir}/icons/locolor/*
-%dir %{tde_datadir}/icons/locolor/*/*
-%dir %{tde_datadir}/locale
-%dir %{tde_datadir}/locale/en_US
-%dir %{tde_datadir}/locale/l10n
-%dir %{tde_datadir}/locale/l10n/*
-%dir %{tde_datadir}/man
-%dir %{tde_datadir}/man/*
-%dir %{tde_datadir}/mimelnk
-%dir %{tde_datadir}/mimelnk/*
-%dir %{tde_datadir}/services
-%dir %{tde_datadir}/services/*
-%dir %{tde_datadir}/servicetypes
-%dir %{tde_datadir}/wallpapers
-
-
-%dir %{_sysconfdir}/trinity
-%dir %{_sysconfdir}/xdg/menus
-
-##########
-
-%prep
-
-%build
-
-%install
-%__install -d -m 755 %{?buildroot}%{tde_prefix}
-
-%__install -d -m 755 %{?buildroot}%{tde_bindir}
-
-%__install -d -m 755 %{?buildroot}%{tde_datadir}
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/applications
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/applications/kde
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/.hidden
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Applications
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Development
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Edutainment
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Edutainment/Languages
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Edutainment/Mathematics
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Edutainment/Miscellaneous
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Edutainment/Science
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Edutainment/Tools
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Games
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Games/Board
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Graphics
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Internet
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Multimedia
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Office
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Settings
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Settings/LookNFeel
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Settings/WebBrowsing
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/System
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/System/ScreenSavers
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Toys
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Utilities
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/apps
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/apps/plugin
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/apps/profiles
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/apps/remoteview
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/apps/videothumbnail
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/apps/zeroconf
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/autostart
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/cmake
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/config
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/config/magic
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/config.kcfg
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/emoticons
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/man
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/man/man1
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/man/man2
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/man/man3
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/man/man4
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/man/man5
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/man/man6
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/man/man7
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/man/man8
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/man/man9
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/all
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/application
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/audio
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/fonts
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/image
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/interface
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/inode
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/media
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/message
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/model
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/multipart
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/print
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/text
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/uri
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/video
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/services
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/services/kconfiguredialog
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/servicetypes
-
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/wallpapers
-
-# Create icons directories
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/icons
-for t in crystalsvg hicolor locolor ; do
-  %__install -d -m 755 "%{?buildroot}%{tde_datadir}/icons/${t}"
-  %__install -d -m 755 "%{?buildroot}%{tde_datadir}/icons/${t}/scalable"
-  for i in {16,22,32,48,64,128} ; do
-    %__install -d -m 755 "%{?buildroot}%{tde_datadir}/icons/${t}/${i}x${i}"
-  done
-  
-  # Create subdirectories
-  for r in actions apps categories devices mimetypes places ; do
-    %__install -d -m 755 "%{?buildroot}%{tde_datadir}/icons/${t}/scalable/${r}"
-    for i in {16,22,32,48,64,128} ; do
-      %__install -d -m 755 "%{?buildroot}%{tde_datadir}/icons/${t}/${i}x${i}/${r}"
-    done
-  done
-done
-
-%__install -d -m 755 %{?buildroot}%{tde_docdir}
-%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}
-%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML
-%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/en
-%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/en/common
-
-%__install -d -m 755 %{?buildroot}%{tde_includedir}
-%__install -d -m 755 %{?buildroot}%{tde_tdeincludedir}
-
-%__install -d -m 755 %{?buildroot}%{tde_libdir}
-%__install -d -m 755 %{?buildroot}%{tde_libdir}/java
-%__install -d -m 755 %{?buildroot}%{tde_libdir}/jni
-%__install -d -m 755 %{?buildroot}%{tde_libdir}/pkgconfig
-%__install -d -m 755 %{?buildroot}%{tde_tdelibdir}
-
-%__install -d -m 755 %{?buildroot}%{_sysconfdir}/trinity
-%__install -d -m 755 %{?buildroot}%{_sysconfdir}/xdg/menus
-
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/en_US
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/C
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ad
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ae
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/af
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ag
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ai
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/al
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/am
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/an
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ao
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ar
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/as
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/at
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/au
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/aw
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ax
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/az
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ba
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bb
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bd
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/be
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bf
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bg
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bh
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bi
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bj
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bm
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bn
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bo
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/br
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bs
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bt
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bw
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/by
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bz
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ca
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/cc
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/cd
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/cf
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/cg
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ch
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ci
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ck
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/cl
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/cm
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/cn
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/co
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/cr
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/cu
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/cv
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/cx
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/cy
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/cz
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/de
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/dj
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/dk
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/dm
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/do
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/dz
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ec
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ee
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/eg
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/eh
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/er
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/es
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/et
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/fi
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/fj
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/fk
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/fm
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/fo
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/fr
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ga
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gb
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gd
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ge
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gh
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gi
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gl
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gm
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gn
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gp
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gq
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gr
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gt
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gu
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gw
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gy
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/hk
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/hn
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/hr
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ht
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/hu
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/id
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ie
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/il
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/in
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/iq
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ir
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/is
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/it
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/jm
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/jo
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/jp
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ke
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/kg
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/kh
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ki
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/km
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/kn
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/kp
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/kr
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/kw
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ky
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/kz
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/la
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/lb
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/lc
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/li
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/lk
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/lr
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ls
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/lt
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/lu
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/lv
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ly
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ma
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mc
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/md
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/me
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mg
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mh
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mk
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ml
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mm
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mn
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mo
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mq
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mr
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ms
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mt
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mu
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mv
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mw
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mx
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/my
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mz
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/na
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/nc
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ne
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/nf
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ng
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ni
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/nl
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/no
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/np
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/nr
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/nu
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/nz
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/om
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/pa
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/pe
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/pf
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/pg
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ph
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/pk
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/pl
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/pm
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/pn
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/pr
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ps
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/pt
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/pw
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/py
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/qa
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ro
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/rs
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ru
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/rw
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/sa
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/sb
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/sc
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/sd
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/se
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/sg
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/sh
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/si
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/sk
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/sm
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/sn
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/so
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/sr
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/st
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/sv
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/sy
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/sz
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/tc
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/td
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/tg
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/th
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/tj
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/tk
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/tm
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/tn
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/to
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/tp
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/tr
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/tt
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/tv
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/tw
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/tz
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ua
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ug
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/us
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/uy
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/uz
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/va
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/vc
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ve
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/vg
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/vi
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/vn
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/vu
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/wf
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ws
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ye
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/za
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/zm
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/zw
-
-%post
-%if 0%{?suse_version}
-# Add setuid files in '/etc/permissions.local'
-for b in kcheckpass kgrantpty kpac_dhcp_helper start_kdeinit kdmtsak ; do
-  if ! grep -q "^%{tde_bindir}/${b}" "/etc/permissions.local"; then
-    echo "%{tde_bindir}/${b}          root:root       4711" >>/etc/permissions.local
-  fi
-done
-%endif
-
-
-%changelog
diff --git a/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec b/redhat/extras/trinity-filesystem/trinity-filesystem.spec
index 9eef80818..71645c704 100644
--- a/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec
+++ b/redhat/extras/trinity-filesystem/trinity-filesystem.spec
@@ -91,6 +91,7 @@ This package installs the Trinity directory structure.
 %dir %{tde_datadir}/applnk/*/*
 %dir %{tde_datadir}/apps
 %dir %{tde_datadir}/apps/*
+%dir %{tde_datadir}/apps/*/*
 %dir %{tde_datadir}/cmake
 %dir %{tde_datadir}/config.kcfg
 %dir %{tde_datadir}/autostart
@@ -117,6 +118,8 @@ This package installs the Trinity directory structure.
 %dir %{tde_datadir}/services
 %dir %{tde_datadir}/services/*
 %dir %{tde_datadir}/servicetypes
+%dir %{tde_datadir}/tdestyle
+%dir %{tde_datadir}/tdestyle/*
 %dir %{tde_datadir}/X11
 %dir %{tde_datadir}/X11/xkb
 %dir %{tde_datadir}/X11/xkb/symbols
@@ -169,6 +172,8 @@ This package installs the Trinity directory structure.
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/apps/profiles
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/apps/remotes
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/apps/remoteview
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/apps/tdedisplay
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/apps/tdedisplay/color-schemes
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/apps/videothumbnail
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/apps/zeroconf
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/autostart
@@ -209,6 +214,8 @@ This package installs the Trinity directory structure.
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/services
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/services/tdeconfiguredialog
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/servicetypes
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/tdestyle
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/tdestyle/themes
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/X11/xkb/symbols
 
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/wallpapers
@@ -221,7 +228,7 @@ for t in crystalsvg hicolor locolor ; do
   for i in {16,22,32,48,64,128,256} ; do
     %__install -d -m 755 "%{?buildroot}%{tde_datadir}/icons/${t}/${i}x${i}"
   done
-  
+
   # Create subdirectories
   for r in actions apps categories devices mimetypes places ; do
     %__install -d -m 755 "%{?buildroot}%{tde_datadir}/icons/${t}/scalable/${r}"