Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

author: Michele Calgaro <michele.calgaro@yahoo.it> 2014-10-12 18:24:41 +0900
committer: Michele Calgaro <michele.calgaro@yahoo.it> 2014-10-12 18:24:41 +0900
commit: b72b2f09d3239813de7f3e4cf44310ca25561e64 (patch)
tree: 02502370332e8fbb612ef4d1290998499a7e6ca1 /redhat
parent: 9d54bb35b5fb67dd052757e3a22cb83acbba9c50 (diff)
parent: 9806eb7f9c92362ca0d03e7410d1ecee9b61a38f (diff)
download: tde-packaging-b72b2f09d3239813de7f3e4cf44310ca25561e64.tar.gz
tde-packaging-b72b2f09d3239813de7f3e4cf44310ca25561e64.zip
52 files changed, 2578 insertions, 6572 deletions
diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14
index cc299d719..1c8c8d56e 100644
--- a/redhat/Makefile.r14
+++ b/redhat/Makefile.r14
@@ -26,14 +26,14 @@ main:	tdelibs tdebase tdeaccessibility tdeadmin tdegames tdemultimedia tdepim td
 libraries:	libkdcraw libkexiv2 libkipi libksquirrel libtdeldap libtqt-perl pytdeextensions python-trinity
 applications:	abakus amarok basket bibletime digikam dolphin filelight gtk3-tqt-engine gtk-qt-engine gwenview k3b k9copy kaffeine kaffeine-mozilla kasablanca katapult kbarcode kbfx kbibtex kbiff kbookreader kchmviewer kcmautostart kcmldap kcmldapcontroller kcmldapmanager kcpuload kdbg kdbusnotification kdiff3 kdirstat keep kerberostray kftpgrabber kile kima kiosktool kkbswitch klcddimmer kmplayer kmyfirewall kmymoney knemo knetload knetstats knights knmap knowit knutclient koffice konversation kopete-otr kpicosim kpilot krecipes krename krusader kscope ksensors kshowmail kshutdown ksplash-engine-moodin ksquirrel kstreamripper ksystemlog ktechlab ktorrent kuickshow kvirc kvkbd kvpnc mplayerthumbs piklab potracegui qt4-tqt-theme-engine rosegarden smartcardauth smb4k soundkonverter tde-guidance tdeio-apt tdeio-ftps tdeio-locate tdeio-sword tdeio-umountwrapper tdenetworkmanager tdepowersave tderadio tde-style-lipstik tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico tork twin-style-crystal wlassistant yakuake
 i18n:	gwenview-i18n k3b-i18n koffice-i18n tde-i18n
-extras:	icons-nuvola kdevmon kdissert klamav kompose koverartist kpacman png2qrgb style-ia-ora
+extras:	icons-nuvola kdevmon kdissert klamav kompose koverartist kpacman mathemagics png2qrgb style-ia-ora
 
 
 ### Trinity Dependencies
 arts:	tqtinterface trinity-filesystem esound cmake
 	$(call buildpkg,dependencies/arts)
 
-avahi-tqt:	tqtinterface
+avahi-tqt:	tqtinterface autoconf automake libtool
 	$(call buildpkg,dependencies/avahi-tqt)
 
 dbus-1-tqt:	tqtinterface cmake
@@ -42,7 +42,7 @@ dbus-1-tqt:	tqtinterface cmake
 dbus-tqt: tqtinterface cmake
 	$(call buildpkg,dependencies/dbus-tqt)
 
-libart_lgpl:	tqtinterface
+libart_lgpl:	tqtinterface libtool
 	$(call buildpkg,dependencies/libart-lgpl)
 
 libcaldav: tqtinterface autoconf libcurl
@@ -85,7 +85,7 @@ tdeadmin:	tdebase
 tdeartwork:	tdebase
 	$(call buildpkg,tdeartwork)
 
-tdebase:	tdelibs cmake htdig fileshareset
+tdebase:	tdelibs cmake htdig fileshareset libconfig
 	$(call buildpkg,tdebase)
 
 tdebindings:	tdebase tqscintilla
@@ -100,7 +100,7 @@ tdegames:	tdebase tdemultimedia
 tdegraphics:	tdebase poppler cmake
 	$(call buildpkg,tdegraphics)
 
-tdelibs:	tqt3 tqtinterface trinity-filesystem arts dbus-tqt dbus-1-tqt cmake avahi-tqt
+tdelibs:	tqt3 tqtinterface arts dbus-tqt dbus-1-tqt cmake avahi-tqt fileshareset trinity-filesystem libart_lgpl
 	$(call buildpkg,tdelibs)
 
 tdemultimedia:	tdebase akode
@@ -141,9 +141,9 @@ ifneq ($(wildcard /boot/vmlinuz*.el5*),)
 endif
 
 cmake:
-# Build on CentOS only
+# Build on CentOS 5/6 only
 ifneq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el6*),)
-#	$(call buildpkg,3rdparty/cmake)
+	$(call buildpkg,3rdparty/cmake)
 endif
 
 esound:
@@ -174,6 +174,13 @@ endif
 endif
 endif
 
+libconfig:
+# Build on CentOS 5 only
+ifneq ($(wildcard /boot/vmlinuz*.el5*),)
+	$(call buildpkg,3rdparty/libconfig)
+endif
+	
+
 libcurl: automake libtool
 # Build on CentOS 5 only
 ifneq ($(wildcard /boot/vmlinuz*.el5*),)
@@ -324,8 +331,8 @@ fusion-icon:	tdebase
 	$(call buildpkg,applications/fusion-icon)
 
 gtk3-tqt-engine:	tdebase
-# Do NOT build on CentOS
-ifeq ($(wildcard /etc/centos-release),)
+# Do NOT build on CentOS 5, CentOS 6
+ifeq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el6*),)
 	$(call buildpkg,applications/gtk3-tqt-engine)
 endif
 
@@ -575,7 +582,7 @@ smb4k:	tdebase
 soundkonverter:	tdebase
 	$(call buildpkg,applications/soundkonverter)
 
-tde-guidance:	 pytdeextensions
+tde-guidance:	tdebase pytdeextensions
 	$(call buildpkg,applications/tde-guidance)
 
 tdeio-apt:	tdebase
@@ -662,6 +669,9 @@ meta:
 fileshareset:
 	$(call buildpkg,extras/fileshareset)
 
+trinity-filesystem:
+	$(call buildpkg,extras/trinity-filesystem)
+
 icons-nuvola:
 	$(call buildpkg,extras/icons-nuvola)
 
@@ -683,11 +693,14 @@ koverartist:
 kpacman:
 	$(call buildpkg,extras/kpacman)
 
+mathemagics:
+	$(call buildpkg,extras/mathemagics)
+
 png2qrgb:
 	$(call buildpkg,extras/png2qrgb)
 
+scribus:
+	$(call buildpkg,extras/scribus)
+
 style-ia-ora:
 	$(call buildpkg,extras/style-ia-ora)
-
-trinity-filesystem:
-	$(call buildpkg,extras/trinity-filesystem)
diff --git a/redhat/Makefile.v3.5.13-sru b/redhat/Makefile.v3.5.13-sru
index 31b0cdd7c..f6cc214ef 100644
--- a/redhat/Makefile.v3.5.13-sru
+++ b/redhat/Makefile.v3.5.13-sru
@@ -1,9 +1,11 @@
 SHELL := /bin/bash
+PACKAGING_DIR := $(shell cd ..; pwd)
 PATH := $(PATH):$(shell pwd)/build
 TDE_VERSION = 3.5.13.2
 
 buildpkg = \
-  @echo "Now processing '$(1)' ."; \
+  @echo "Now processing '$(1)' [from $(PACKAGING_DIR)]."; \
+  export PACKAGING_DIR=$(PACKAGING_DIR); \
   if [ "${REBUILD}" = "$(1)" ] || ! is_latest_package_installed.sh "$(1)" ${TDE_VERSION}; then \
     echo "  Package '${1}' is not yet installed."; \
     if [ "${REBUILD}" = "$(1)" ] || ! is_latest_package_built.sh "$(1)" ${TDE_VERSION}; then \
@@ -18,7 +20,7 @@ buildpkg = \
   echo
 
 
-all:	dependencies main libraries applications i18n meta
+all:	dependencies main libraries applications i18n meta extras
 dependencies:	qt3 tqtinterface arts libcaldav libcarddav tqca tqca-tls avahi-tqt dbus-tqt dbus-1-tqt akode hal
 main:	tdelibs tdebase tdeaccessibility tdeadmin tdegames tdemultimedia tdepim tdetoys tdevelop tdeaddons tdeartwork tdebindings tdeedu tdegraphics tdenetwork tdesdk tdeutils tdewebdev
 libraries:	libkdcraw libkexiv2 libkipi libksquirrel pytdeextensions python-trinity
@@ -27,10 +29,10 @@ i18n:	gwenview-i18n k3b-i18n koffice-i18n tde-i18n
 
 
 ### Trinity Dependencies
-arts:	tqtinterface esound cmake
+arts:	tqtinterface trinity-filesystem esound cmake
 	$(call buildpkg,dependencies/arts)
 
-avahi-tqt:	tqtinterface
+avahi-tqt:	tqtinterface autoconf automake libtool
 	$(call buildpkg,dependencies/avahi-tqt)
 
 dbus-1-tqt:	tqtinterface cmake
@@ -70,7 +72,7 @@ tdeadmin:	tdebase
 tdeartwork:	tdebase
 	$(call buildpkg,tdeartwork)
 
-tdebase:	tdelibs htdig cmake hal
+tdebase:	tdelibs cmake htdig fileshareset hal
 	$(call buildpkg,tdebase)
 
 tdebindings:	tdebase
@@ -85,7 +87,7 @@ tdegames:	tdebase tdemultimedia
 tdegraphics:	tdebase poppler cmake
 	$(call buildpkg,tdegraphics)
 
-tdelibs:	qt3 tqtinterface arts dbus-tqt dbus-1-tqt cmake
+tdelibs:	qt3 tqtinterface arts dbus-tqt dbus-1-tqt cmake avahi-tqt fileshareset trinity-filesystem
 	$(call buildpkg,tdelibs)
 
 tdemultimedia:	tdebase akode
@@ -126,8 +128,8 @@ ifneq ($(wildcard /boot/vmlinuz*.el5*),)
 endif
 
 cmake:
-# Build on CentOS only
-ifneq ($(wildcard /etc/centos-release /boot/vmlinuz*.el5*),)
+# Build on CentOS 5/6 only
+ifneq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el6*),)
 	$(call buildpkg,3rdparty/cmake)
 endif
 
@@ -158,7 +160,7 @@ endif
 htdig:
 # build on Mageia, and CentOS >= 7
 ifneq ($(wildcard /etc/mageia-release /boot/vmlinuz*.el7*),)
-	$(call buildpkg,3rdparty/htdig)
+	$(call buildpkg,extras/htdig)
 endif
 
 imlib1:
@@ -196,7 +198,7 @@ ifneq ($(wildcard /boot/vmlinuz*.el6*),)
 endif
 
 m4:
-# Build on CentOS 5 only (vendor-provided Poppler is too old)
+# Build on CentOS 5 only (vendor-provided m4 is too old)
 ifneq ($(wildcard /boot/vmlinuz*.el5*),)
 	$(call buildpkg,3rdparty/m4)
 endif
@@ -244,6 +246,11 @@ endif
 akode:	tqtinterface
 	$(call buildpkg,extras/akode)
 
+cmake-macros: cmake
+ifneq ($(wildcard /etc/SuSE-release),)
+	$(call buildpkg,extras/trinity-cmake-macros)
+endif
+
 ### Trinity Libraries
 kipi-plugins:	tqtinterface libkipi
 	$(call buildpkg,libraries/kipi-plugins)
@@ -263,9 +270,6 @@ libksquirrel:	tqtinterface
 mlt:	tqtinterface
 	$(call buildpkg,libraries/mlt)
 
-mlt++:	tqtinterface
-	$(call buildpkg,libraries/mlt++)
-
 pytdeextensions:	tqtinterface python-trinity
 	$(call buildpkg,libraries/pytdeextensions)
 
@@ -558,5 +562,11 @@ meta:
 	$(call buildpkg,extras/trinity-desktop)
 
 ### Extra packages
+fileshareset:
+	$(call buildpkg,extras/fileshareset)
+
+trinity-filesystem:
+	$(call buildpkg,extras/trinity-filesystem)
+
 ksensors:
 	$(call buildpkg,applications/ksensors)
diff --git a/redhat/build/build_rpm_package.sh b/redhat/build/build_rpm_package.sh
index 718efa648..9aae43d36 100755
--- a/redhat/build/build_rpm_package.sh
+++ b/redhat/build/build_rpm_package.sh
@@ -44,11 +44,6 @@ if [ -r "${TEMPDIR}/one.patch" ]; then
       -e "/%setup/ s/$/\n%patch0 -p1/"
 fi
 
-# Determines if we are running an i386 or x86_64 distro
-if [ "$(rpm -q --qf '%{arch}\n' kernel | tail -n 1)" = "i686" ]; then
-	ARGS="${ARGS} --target=i686"
-fi
-
 [ -d "${BUILDDIR}" ] || mkdir -p "${BUILDDIR}"
 
 RPMDIR="$(rpm -E %{_rpmdir}.tde-${TDE_VERSION})"
@@ -67,6 +62,8 @@ rpmbuild -ba \
   --define "tde_version ${TDE_VERSION}" \
   --define "tde_prefix /opt/trinity" \
   --define "preversion ${PREVERSION:-}" \
+  --define "with_jack 1" \
+  --define "with_xscreensaver 1" \
   ${ARGS} \
   "${TEMPDIR}/${SPECFILE##*/}"
 RET=$?
diff --git a/redhat/build/get_latest_built_package_filename.sh b/redhat/build/get_latest_built_package_filename.sh
index b414b8400..ccbb0acf0 100755
--- a/redhat/build/get_latest_built_package_filename.sh
+++ b/redhat/build/get_latest_built_package_filename.sh
@@ -5,12 +5,8 @@ PKGNAME="$1"
 TDE_VERSION="${2:-14.0.0}"
 
 RPMDIR="$(rpm -E %{_rpmdir}.tde-${TDE_VERSION})"
-if [ $(uname -i) == "x86_64" ]; then
-  RPMDIR_ARCH=${RPMDIR}/x86_64
-else
-  RPMDIR_ARCH=${RPMDIR}/i?86
-fi
-RPMDIR_NOARCH=${RPMDIR}/noarch
+RPMDIR_ARCH="${RPMDIR}/$(rpm -E %_target_cpu)"
+RPMDIR_NOARCH="${RPMDIR}/noarch"
 RPMDIRS="${RPMDIR_ARCH} ${RPMDIR_NOARCH}"
 
 case "${PKGNAME##*/}" in
diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh
index 507dc7665..18255e1a1 100755
--- a/redhat/build/get_rpm_package_name.sh
+++ b/redhat/build/get_rpm_package_name.sh
@@ -18,7 +18,7 @@ DEVEL="$2"
 # Some runtime packages are prefixed with 'trinity-', some are not.
 case "${PKGNAME}" in
   "trinity-"*|"qt3"|"tqt3"|"tqtinterface"|"python-qt3"|"esound"|"avahi-tqt"|"dbus-tqt"|"dbus-1-tqt"|"libart-lgpl"|"fileshareset") PREFIX="";;
-  "autoconf"|"automake"|"cmake"|"gnuchess"|"htdig"|"imlib1"|"libotr3"|"libtool"|"lilypond"|"m4"|"mftrace"|"pcsc-perl"|"torsocks"|"wv2") PREFIX="";;
+  "autoconf"|"automake"|"cmake"|"gnuchess"|"htdig"|"imlib1"|"libconfig"|"libotr3"|"libtool"|"lilypond"|"m4"|"mftrace"|"pcsc-perl"|"torsocks"|"wv2") PREFIX="";;
   "curl") PREFIX="trinity-lib";;
   *) PREFIX="trinity-";;
 esac
diff --git a/redhat/dependencies/arts/arts-14.0.0.spec b/redhat/dependencies/arts/arts-14.0.0.spec
index cee5c0bae..59a9086d4 100644
--- a/redhat/dependencies/arts/arts-14.0.0.spec
+++ b/redhat/dependencies/arts/arts-14.0.0.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package arts
+# spec file for package arts (version R14.0.0)
 #
 # Copyright (c) 2014 Trinity Desktop Environment
 #
@@ -20,8 +20,9 @@
 #  Having KDE libraries may cause FTBFS here !
 
 # TDE variables
+%define tde_epoch 2
 %define tde_version 14.0.0
-%define tde_pkg tdeaddons
+%define tde_pkg arts
 %define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
@@ -39,10 +40,10 @@
 %endif
 
 
-Name:		trinity-arts
-Epoch:		2
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
 Version:	1.5.10
-Release:	%{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
 Summary:	ARTS (analog realtime synthesizer) - the TDE sound system
 Group:		System Environment/Daemons 
 URL:		http://www.trinitydesktop.org/
@@ -61,7 +62,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	libtqt4-devel >= 2:4.2.0
+BuildRequires:	libtqt4-devel >= %{tde_epoch}:4.2.0
 BuildRequires:	trinity-filesystem >= %{tde_version}
 Requires:		trinity-filesystem >= %{tde_version}
 
@@ -80,7 +81,7 @@ BuildRequires:	libvorbis-devel
 BuildRequires:	esound-devel
 
 # JACK support
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version}
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?with_jack}
 %define with_jack 1
 %if 0%{?mgaversion} || 0%{?mdkversion}
 %define jack_devel %{_lib}jack-devel
@@ -128,7 +129,7 @@ BuildRequires:		%{mad_devel}
 %define with_pulseaudio 1
 %endif
 
-Requires:		libtqt4 >= 2:4.2.0
+Requires:		libtqt4 >= %{tde_epoch}:4.2.0
 Requires:		audiofile
 
 %if "%{?tde_prefix}" == "/usr"
diff --git a/redhat/dependencies/arts/arts-3.5.13.2-pkgconfig_requires.patch b/redhat/dependencies/arts/arts-3.5.13.2-pkgconfig_requires.patch
deleted file mode 100644
index c8dc7931e..000000000
--- a/redhat/dependencies/arts/arts-3.5.13.2-pkgconfig_requires.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c122548..ad4f028 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -226,6 +226,34 @@ configure_file( config.h.cmake config.h @ONLY )
- 
- ##### write pkgconfig file ######################
- 
-+set( PC_LIB_REQUIRE "" )
-+if( WITH_ALSA )
-+  list( APPEND PC_LIB_REQUIRE "alsa" )
-+endif( WITH_ALSA )
-+if( WITH_AUDIOFILE )
-+  list( APPEND PC_LIB_REQUIRE "audiofile" )
-+endif( WITH_AUDIOFILE )
-+if( WITH_VORBIS )
-+  list( APPEND PC_LIB_REQUIRE "vorbis" )
-+  list( APPEND PC_LIB_REQUIRE "vorbisfile" )
-+endif( WITH_VORBIS )
-+if( WITH_MAD )
-+  list( APPEND PC_LIB_REQUIRE "mad" )
-+endif( WITH_MAD )
-+if( WITH_ESOUND )
-+  list( APPEND PC_LIB_REQUIRE "esound" )
-+endif( WITH_ESOUND )
-+if( WITH_JACK )
-+  list( APPEND PC_LIB_REQUIRE "jack" )
-+endif( WITH_JACK )
-+
-+list( LENGTH PC_LIB_REQUIRE PC_LIB_REQUIRES_FOUND )
-+if( PC_LIB_REQUIRES_FOUND GREATER 0 )
-+  string( REPLACE ";" " " PC_LIB_REQUIRES "Requires: ${PC_LIB_REQUIRE}" )
-+else( )
-+  set( PC_LIB_REQUIRES "" )
-+endif( )
-+
- string( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "\${prefix}" PC_EXEC_PREFIX ${EXEC_INSTALL_PREFIX} )
- string( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "\${prefix}" PC_INCLUDE_DIR ${INCLUDE_INSTALL_DIR} )
- string( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "\${prefix}" PC_LIB_DIR ${LIB_INSTALL_DIR} )
-diff --git a/arts.pc.cmake b/arts.pc.cmake
-index 2c26a41..77332d2 100644
---- a/arts.pc.cmake
-+++ b/arts.pc.cmake
-@@ -8,3 +8,4 @@ Description: Soundserver for the Trinity Desktop Environment (TDE)
- Version: @ARTS_VERSION@
- Libs: -L${libdir}
- Cflags: -I${includedir}
-+@PC_LIB_REQUIRES@
diff --git a/redhat/dependencies/arts/arts-3.5.13.2.spec b/redhat/dependencies/arts/arts-3.5.13.2.spec
index 5a1d676e0..9becd9c53 100644
--- a/redhat/dependencies/arts/arts-3.5.13.2.spec
+++ b/redhat/dependencies/arts/arts-3.5.13.2.spec
@@ -1,41 +1,75 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
+#
+# spec file for package arts (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/
+#
+
+# BUILD WARNING:
+#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
+#  Having KDE libraries may cause FTBFS here !
+
+# TDE variables
+%define tde_epoch 1
 %define tde_version 3.5.13.2
-
+%define tde_pkg arts
+%define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_datadir %{tde_prefix}/share
-
+%define tde_tdeappdir %{tde_datadir}/applications/kde
+%define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?tde_prefix}" != "/usr"
+%define _variant .opt
+%endif
 
-%define _docdir %{tde_datadir}/doc
 
-Name:		trinity-arts
-Epoch:		1
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
 Version:	1.5.10
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
-License:	GPL
-Summary:	aRts (analog realtime synthesizer) - the TDE sound system
+Release:	%{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
+Summary:	ARTS (analog realtime synthesizer) - the TDE sound system
 Group:		System Environment/Daemons 
-
-Vendor:		Trinity Project
 URL:		http://www.trinitydesktop.org/
-Packager:	Francois Andriot <francois.andriot@free.fr>
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Project
+#Packager:	Francois Andriot <francois.andriot@free.fr>
 
 Prefix:		%{tde_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Source1:	kcmartsrc-pulseaudio
 
-Patch1:		arts-3.5.13.2-pkgconfig_requires.patch
+BuildRequires:	libtqt4-devel >= %{tde_epoch}:4.2.0
+BuildRequires:	trinity-filesystem >= %{tde_version}
+Requires:		trinity-filesystem >= %{tde_version}
 
 BuildRequires:	cmake >= 2.8
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+
 BuildRequires:	audiofile-devel
 BuildRequires:	alsa-lib-devel
 BuildRequires:	glib2-devel
@@ -47,18 +81,18 @@ BuildRequires:	libvorbis-devel
 BuildRequires:	esound-devel
 
 # JACK support
-#  Not on RHEL4 !
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?with_jack}
 %define with_jack 1
 %if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}jack-devel
+%define jack_devel %{_lib}jack-devel
 %endif
 %if 0%{?rhel} >= 5 || 0%{?fedora}
-BuildRequires:	jack-audio-connection-kit-devel
+%define jack_devel jack-audio-connection-kit-devel
 %endif
 %if 0%{?suse_version}
-BuildRequires:	libjack-devel
+%define jack_devel libjack-devel
 %endif
+BuildRequires:	%{jack_devel}
 %endif
 
 # LIBTOOL
@@ -77,13 +111,16 @@ BuildRequires:	libtool
 %endif
 
 # MAD support
+%ifarch %{ix86} x86_64
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} 
 %define with_libmad 1
 %if 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires:		%{_lib}mad-devel
+%define mad_devel %{_lib}mad-devel
 %endif
 %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
-BuildRequires:		libmad-devel
+%define mad_devel libmad-devel
+%endif
+BuildRequires:		%{mad_devel}
 %endif
 %endif
 
@@ -92,7 +129,7 @@ BuildRequires:		libmad-devel
 %define with_pulseaudio 1
 %endif
 
-Requires:		trinity-tqtinterface >= %{tde_version}
+Requires:		libtqt4 >= %{tde_epoch}:4.2.0
 Requires:		audiofile
 
 %if "%{?tde_prefix}" == "/usr"
@@ -127,7 +164,7 @@ playing a wave file with some effects.
 %{tde_bindir}/artsrec
 %{tde_bindir}/artsshell
 %{tde_bindir}/artswrapper
-# The '.la' files are runtime, not devel !
+# The '.la' files are needed for runtime, not devel !
 %{tde_libdir}/lib*.la
 
 %post
@@ -140,14 +177,30 @@ playing a wave file with some effects.
 
 %package devel
 Group:		Development/Libraries
-Summary:	%{name} - Development files
+Summary:	ARTS (analog realtime synthesizer) - the TDE sound system (Development files)
 Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %if "%{?tde_prefix}" == "/usr"
 Obsoletes:	arts-devel
 %endif
 
+Requires:	alsa-lib-devel
+Requires:	audiofile-devel
+Requires:	libvorbis-devel
+Requires:	esound-devel
+%{?with_libmad:Requires: %{mad_devel}}
+%{?with_jack:Requires: %{jack_devel}}
+
 %description devel
-Development files for %{name}
+arts (analog real-time synthesizer) is the sound system of TDE.
+
+The principle of arts is to create/process sound using small modules which do
+certain tasks. These may be create a waveform (oscillators), play samples,
+filter data, add signals, perform effects like delay/flanger/chorus, or
+output the data to the soundcard.
+
+By connecting all those small modules together, you can perform complex
+tasks like simulating a mixer, generating an instrument or things like
+playing a wave file with some effects.
 
 %files devel
 %defattr(-,root,root,-)
@@ -173,11 +226,12 @@ Development files for %{name}
 
 %package config-pulseaudio
 Group:		System Environment/Daemons
-Summary:	%{name} - Default configuration file for Pulseaudio
+Summary:	ARTS - Default configuration file for Pulseaudio
 Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description config-pulseaudio
-%{summary}
+This package contains a default ARTS configuration file, that is 
+intended for systems running the Pulseaudio server.
 
 %files config-pulseaudio
 %defattr(-,root,root,-)
@@ -187,16 +241,14 @@ Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 ##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos}
 %debug_package
 %endif
 
 ##########
 
-
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch1 -p1 -b .mad
 
 
 %build
@@ -216,6 +268,7 @@ fi
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
   -DCMAKE_SKIP_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   \
   -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
@@ -239,9 +292,18 @@ fi
 %__rm -rf %{?buildroot}
 %__make install -C build DESTDIR=%{?buildroot}
 
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/config
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/doc
+
 # Installs the Pulseaudio configuration file
 %if 0%{?with_pulseaudio}
-%__install -D -m 644 %{SOURCE1} %{?buildroot}%{tde_datadir}/config/kcmartsrc
+cat <<EOF >"%{?buildroot}%{tde_datadir}/config/kcmartsrc"
+[Arts]
+Arguments=\s-F 10 -S 4096 -a esd -n -s 1 -m artsmessage -c drkonqi -l 3 -f
+NetworkTransparent=true
+SuspendTime=1
+EOF
+chmod 644 "%{?buildroot}%{tde_datadir}/config/kcmartsrc"
 %endif
 
 
@@ -250,6 +312,9 @@ fi
 
 
 %changelog
+* Sat Oct 11 2014 Francois Andriot <francois.andriot@free.fr> - 1:1.5.10-2
+- Rebuild.
+
 * Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1:1.5.10-1
 - Build for Fedora 19
 
diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
index 58400a76d..f0c4c250a 100644
--- a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
+++ b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package avahi-tqt
+# spec file for package avahi-tqt (version R14.0.0)
 #
 # Copyright (c) 2014 Trinity Desktop Environment
 #
@@ -16,6 +16,7 @@
 #
 
 # TDE variables
+%define tde_epoch 2
 %define tde_version 14.0.0
 
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
@@ -26,7 +27,7 @@
 
 
 Name:		trinity-avahi-tqt
-Epoch:		2
+Epoch:		%{tde_epoch}
 Version:	0.6.30
 Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
 Summary:	Avahi TQt integration library
@@ -47,7 +48,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	libtqt4-devel >= 2:4.2.0
+BuildRequires:	libtqt4-devel >= %{tde_epoch}:4.2.0
 
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
@@ -64,6 +65,9 @@ BuildRequires:	dbus-1-devel
 BuildRequires:	dbus-devel
 %endif
 
+# PCAP support
+BuildRequires:	libcap-devel
+
 # AVAHI support
 %if 0%{?mgaversion} || 0%{?mdkversion}
 %define avahi_devel %{_lib}avahi-client-devel
@@ -141,7 +145,7 @@ Group:		Development/Libraries/C and C++
 Provides:	libavahi-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 Requires:	%{libavahi}-tqt1 = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	libtqt4-devel >= 2:4.2.0
+Requires:	libtqt4-devel >= %{tde_epoch}:4.2.0
 %{?avahi_devel:Requires: %{avahi_devel}}
 
 Obsoletes:		trinity-avahi-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.2.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.2.spec
index dbfe6c2d7..8ecd7f82c 100644
--- a/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.2.spec
+++ b/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.2.spec
@@ -1,50 +1,83 @@
-# TDE specific building variables
+#
+# spec file for package avahi-tqt (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_epoch 1
 %define tde_version 3.5.13.2
-%define tde_prefix /usr
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
+
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
+%define libavahi %{_lib}avahi
+%else
+%define libavahi libavahi
+%endif
 
 
 Name:		trinity-avahi-tqt
-Epoch:		1
+Epoch:		%{tde_epoch}
 Version:	0.6.30
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
-License:	GPL
-Summary:	Avahi TQT Interface
-Group:		System Environment/Libraries
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
+Release:	%{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
+Summary:	Avahi TQt integration library
+Group:		System/Libraries
 URL:		http://www.trinitydesktop.org/
 
-Prefix:		%{tde_prefix}
+%if 0%{?suse_version}
+License:	LGPL-2.0+
+%else
+License:	LGPLv2+
+%endif
+
+#Vendor:		Trinity Project
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		/usr
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
+BuildRequires:	libtqt4-devel >= %{tde_epoch}:4.2.0
+
 BuildRequires:	gcc-c++
-BuildRequires:	qt3-devel >= 3.3.8d
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	gettext-devel
+BuildRequires:	pkgconfig
 BuildRequires:	libtool
+
+# GETTEXT support
+BuildRequires:	gettext-devel
+
+# DBUS support
 %if 0%{?suse_version}
 BuildRequires:	dbus-1-devel
 %endif
 %if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	dbus-devel
 %endif
+
+# PCAP support
 BuildRequires:	libcap-devel
 
-# AVAHI support
+# AVAHI support
 %if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}avahi-client-devel
-Provides:		%{_lib}avahi-qt3
+%define avahi_devel %{_lib}avahi-client-devel
 %endif
 %if 0%{?suse_version} || 0%{?rhel} || 0%{?fedora}
-BuildRequires:	avahi-devel
+%define avahi_devel avahi-devel
 %endif
+%{?avahi_devel:BuildRequires: %{avahi_devel}}
 
-# EXPAT support
+# EXPAT support
 %if 0%{?rhel} || 0%{?fedora}
 BuildRequires:	expat-devel
 %endif
@@ -52,59 +85,135 @@ BuildRequires:	expat-devel
 BuildRequires:	libexpat-devel
 %endif
 
-Requires:		qt3 >= 3.3.8d
-Requires:		trinity-tqtinterface >= %{tde_version}
-
-Obsoletes:		avahi-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		avahi-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
+# NAS support
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_nas 1
+BuildRequires: nas-devel
+%endif
 
+# XT support
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
+BuildRequires: libXt-devel
+%endif
 
 %description
-Avahi TQT Interface
-
+Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
+It allows programs to publish and discover services and hosts
+running on a local network with no specific configuration. For
+example you can plug into a network and instantly find printers to
+print to, files to look at and people to talk to.
+ .
+This library contains the interface to integrate the Avahi libraries
+into a TQt main loop application.
+
+##########
+
+%package -n %{libavahi}-tqt1
+Summary:	Avahi TQt integration library
+Group:		System/Libraries
+Provides:	libavahi-tqt1 = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Obsoletes:		trinity-avahi-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-avahi-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n %{libavahi}-tqt1
+Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
+It allows programs to publish and discover services and hosts
+running on a local network with no specific configuration. For
+example you can plug into a network and instantly find printers to
+print to, files to look at and people to talk to.
+ .
+This library contains the interface to integrate the Avahi libraries
+into a TQt main loop application.
+
+%post -n %{libavahi}-tqt1
+/sbin/ldconfig || :
 
-%package devel
-Summary:	%{name} - Development files
-Group:		Development/Libraries
-Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+%postun -n %{libavahi}-tqt1
+/sbin/ldconfig || :
 
-%if 0%{?mgaversion} || 0%{?mdkversion}
-Provides:		%{_lib}avahi-qt3-devel
-%endif
+%files -n %{libavahi}-tqt1
+%defattr(-,root,root,-)
+%{_libdir}/libavahi-tqt.so.1
+%{_libdir}/libavahi-tqt.so.1.0.0
+
+##########
+
+%package -n %{libavahi}-tqt-devel
+Summary:	Avahi TQt integration library (Development Files)
+Group:		Development/Libraries/C and C++
+Provides:	libavahi-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Requires:	%{libavahi}-tqt1 = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	libtqt4-devel >= %{tde_epoch}:4.2.0
+%{?avahi_devel:Requires: %{avahi_devel}}
+
+Obsoletes:		trinity-avahi-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-avahi-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n %{libavahi}-tqt-devel
+Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
+It allows programs to publish and discover services and hosts
+running on a local network with no specific configuration. For
+example you can plug into a network and instantly find printers to
+print to, files to look at and people to talk to.
+ .
+This library contains the interface to integrate the Avahi libraries
+into a TQt main loop application.
+
+%post -n %{libavahi}-tqt-devel
+/sbin/ldconfig || :
 
-Obsoletes:		avahi-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		avahi-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+%postun -n %{libavahi}-tqt-devel
+/sbin/ldconfig || :
 
-%description devel
-Development files for %{name}
+%files -n %{libavahi}-tqt-devel
+%defattr(-,root,root,-)
+%{_includedir}/avahi-tqt/
+%{_libdir}/libavahi-tqt.so
+%{_libdir}/libavahi-tqt.la
+%{_libdir}/pkgconfig/avahi-tqt.pc
 
+##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos}
 %debug_package
 %endif
 
+##########
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+export NOCONFIGURE=1
 ./autogen.sh
 
 
 %build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
+unset QTDIR QTINC QTLIB
+. /etc/profile.d/qt3.sh
 export PATH="%{tde_bindir}:${PATH}"
 
 %configure \
-  --exec-prefix=%{tde_prefix} \
-  --includedir=%{tde_includedir} \
-  --libdir=%{tde_libdir} \
+  --exec-prefix=%{_prefix} \
+  --includedir=%{_includedir} \
+  --libdir=%{_libdir} \
   \
   --disable-static \
   --disable-dependency-tracking \
   \
   --enable-compat-libdns_sd \
-  --with-systemdsystemunitdir=/lib/systemd/system
+  --with-systemdsystemunitdir=/lib/systemd/system \
+%if 0%{?suse_version}
+  --with-distro=suse \
+%endif
+%if 0%{?fedora} || 0%{?rhel}
+  --with-distro=fedora \
+%endif
+%if 0%{?mdkversion} || 0%{?mgaversion}
+  --with-distro=mandriva \
+%endif
 
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
 
 
 %install
@@ -115,30 +224,10 @@ export PATH="%{tde_bindir}:${PATH}"
 %clean
 %__rm -rf %{?buildroot}
 
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-%files
-%defattr(-,root,root,-)
-%{tde_libdir}/libavahi-tqt.so.1
-%{tde_libdir}/libavahi-tqt.so.1.0.0
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_includedir}/avahi-tqt/
-%{tde_libdir}/libavahi-tqt.so
-%{tde_libdir}/libavahi-tqt.la
-%{tde_libdir}/pkgconfig/avahi-tqt.pc
 
 %changelog
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
+* Sat Oct 11 2014 Francois Andriot <francois.andriot@free.fr> - 1:0.6.30-2
+- Rename package to 'libavahi-tqt'
+
+* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1:0.6.30-1
 - Initial release for TDE 3.5.13.2
diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
index 067cc3e7c..e20b0c3b1 100644
--- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
+++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package dbus-1-tqt
+# spec file for package dbus-1-tqt (version R14.0.0)
 #
 # Copyright (c) 2014 Trinity Desktop Environment
 #
@@ -16,6 +16,7 @@
 #
 
 # TDE variables
+%define tde_epoch 2
 %define tde_version 14.0.0
 
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
@@ -26,7 +27,7 @@
 
 
 Name:		trinity-dbus-1-tqt
-Epoch:		2
+Epoch:		%{tde_epoch}
 Version:	0.9
 Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
 Summary:	dbus bindings for the Trinity Qt [TQt] interface
@@ -48,7 +49,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
 BuildRequires:	libtqt3-mt-devel >= 3.5.0
-BuildRequires:	libtqt4-devel >= 2:4.2.0
+BuildRequires:	libtqt4-devel >= %{tde_epoch}:4.2.0
 
 BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
@@ -167,7 +168,7 @@ fi
   -DLIB_INSTALL_DIR=%{_libdir} \
   ..
 
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
 
 
 %install
diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.2.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.2.spec
index f89fcf807..ce1fa478c 100644
--- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.2.spec
+++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.2.spec
@@ -1,89 +1,147 @@
-# TDE specific building variables
+#
+# spec file for package dbus-1-tqt (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_epoch 1
 %define tde_version 3.5.13.2
-%define tde_prefix /usr
-%define tde_bindir %{tde_prefix}/bin
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
+
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
+%define libdbus %{_lib}dbus
+%else
+%define libdbus libdbus
+%endif
+
 
 Name:		trinity-dbus-1-tqt
-Epoch:		1
+Epoch:		%{tde_epoch}
 Version:	0.9
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
-License:	GPL
-Summary:	Dbus TQT Interface
-Group:		System Environment/Libraries
+Release:	%{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
+Summary:	dbus bindings for the Trinity Qt [TQt] interface
+Group:		System/Libraries
+URL:		http://www.trinitydesktop.org/
 
-Obsoletes:		dbus-1-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		dbus-1-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
 
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
+#Vendor:		Trinity Project
+#Packager:	Francois Andriot <francois.andriot@free.fr>
 
-Prefix:		%{tde_prefix}
+Prefix:		/usr
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
+BuildRequires:	qt3-devel >= 3.3.8d
+BuildRequires:	libtqt4-devel >= %{tde_epoch}:4.2.0
+
+BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+
+# DBUS support
 %if 0%{?suse_version}
 BuildRequires:	dbus-1-devel
 %else
 BuildRequires:	dbus-devel
 %endif
 
-BuildRequires:	cmake >= 2.8
-BuildRequires:	qt3-devel >= 3.3.8d
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-Requires:		qt3 >= 3.3.8d
+%description
+D-BUS is a message bus, used for sending messages between applications.
+Conceptually, it fits somewhere in between raw sockets and CORBA in
+terms of complexity.
 
+This package provides bindings for the Trinity Qt TQt interface.
 
-%description
-Dbus TQT Interface
+See the dbus description for more information about D-BUS in general.
+
+###########
+
+%package -n %{libdbus}-1-tqt0
+Summary:		dbus bindings for the Trinity Qt [TQt] interface
+Group:			System/Libraries
+Provides:		libdbus-1-tqt0 = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Obsoletes:		trinity-dbus-1-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-dbus-1-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n %{libdbus}-1-tqt0
+D-BUS is a message bus, used for sending messages between applications.
+Conceptually, it fits somewhere in between raw sockets and CORBA in
+terms of complexity.
 
-%post
+This package provides bindings for the Trinity Qt TQt interface.
+
+See the dbus description for more information about D-BUS in general.
+
+%post -n %{libdbus}-1-tqt0
 /sbin/ldconfig || :
 
-%postun
+%postun -n %{libdbus}-1-tqt0
 /sbin/ldconfig || :
 
-%files
+%files -n %{libdbus}-1-tqt0
 %defattr(-,root,root,-)
-%{tde_bindir}/dbusxml2qt3
-%{tde_libdir}/libdbus-1-tqt.so.0
-%{tde_libdir}/libdbus-1-tqt.so.0.0.0
+%{_libdir}/libdbus-1-tqt.so.0
+%{_libdir}/libdbus-1-tqt.so.0.0.0
 
 ##########
 
-%package devel
-Requires:	%{name}
-Summary:	%{name} - Development files
-Group:		Development/Libraries
+%package -n %{libdbus}-1-tqt-devel
+Summary:		dbus bindings for the Trinity Qt [TQt] interface (Development Files)
+Group:			Development/Libraries/C and C++
+Provides:		libdbus-1-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:		%{libdbus}-1-tqt0 = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Obsoletes:		trinity-dbus-1-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-dbus-1-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
-Obsoletes:		dbus-1-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		dbus-1-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+%description -n %{libdbus}-1-tqt-devel
+D-BUS is a message bus, used for sending messages between applications.
+Conceptually, it fits somewhere in between raw sockets and CORBA in
+terms of complexity.
 
-%description devel
-Development files for %{name}
+This package provides bindings for the Trinity Qt TQt interface.
 
-%post devel
+See the dbus description for more information about D-BUS in general.
+
+%post -n %{libdbus}-1-tqt-devel
 /sbin/ldconfig || :
 
-%postun devel
+%postun -n %{libdbus}-1-tqt-devel
 /sbin/ldconfig || :
 
-%files devel
+%files -n %{libdbus}-1-tqt-devel
 %defattr(-,root,root,-)
-%{tde_includedir}/*.h
-%{tde_libdir}/libdbus-1-tqt.so
-%{tde_libdir}/libdbus-1-tqt.la
-%{tde_libdir}/pkgconfig/*.pc
+%{_bindir}/dbusxml2qt3
+%{_includedir}/*.h
+%{_libdir}/libdbus-1-tqt.so
+%{_libdir}/libdbus-1-tqt.la
+%{_libdir}/pkgconfig/*.pc
 
 ##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos}
 %debug_package
 %endif
 
+##########
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
@@ -91,8 +149,7 @@ Development files for %{name}
 
 %build
 unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt?.sh
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+. /etc/profile.d/qt3.sh
 
 if ! rpm -E %%cmake|grep -q "cd build"; then
   %__mkdir_p build
@@ -106,12 +163,12 @@ fi
   -DCMAKE_SKIP_RPATH=ON \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_includedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DBIN_INSTALL_DIR=%{_bindir} \
+  -DINCLUDE_INSTALL_DIR=%{_includedir} \
+  -DLIB_INSTALL_DIR=%{_libdir} \
   ..
 
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
 
 
 %install
@@ -124,6 +181,9 @@ fi
 
 
 %changelog
+* Sat Oct 11 2014 Francois Andriot <francois.andriot@free.fr> - 1:0.9-2
+- Rename package to 'libdbus-1-tqt'
+
 * Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1:0.9-1
 - Build for Fedora 19
 
diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
index ff27c4a95..fe8c2948e 100644
--- a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
+++ b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package dbus-tqt
+# spec file for package dbus-tqt (version R14.0.0)
 #
 # Copyright (c) 2014 Trinity Desktop Environment
 #
@@ -16,6 +16,7 @@
 #
 
 # TDE variables
+%define tde_epoch 2
 %define tde_version 14.0.0
 
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
@@ -26,7 +27,7 @@
 
 
 Name:		trinity-dbus-tqt
-Epoch:		2
+Epoch:		%{tde_epoch}
 Version:	0.63
 Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
 Summary:	Simple inter-process messaging system
@@ -47,8 +48,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	libtqt3-mt-devel >= 3.5.0
-BuildRequires:	libtqt4-devel >= 2:4.2.0
+BuildRequires:	libtqt4-devel >= %{tde_epoch}:4.2.0
 
 BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.2.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.2.spec
index 717d2043d..f61010da4 100644
--- a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.2.spec
+++ b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.2.spec
@@ -1,21 +1,49 @@
-# TDE specific building variables
+#
+# spec file for package dbus-tqt (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_epoch 1
 %define tde_version 3.5.13.2
-%define tde_prefix /usr
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
+
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
+%define libdbus %{_lib}dbus
+%else
+%define libdbus libdbus
+%endif
+
 
 Name:		trinity-dbus-tqt
-Epoch:		1
+Epoch:		%{tde_epoch}
 Version:	0.63
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
-License:	GPL
-Summary:	Dbus TQT Interface
-Group:		System Environment/Libraries
+Release:	%{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
+Summary:	Simple inter-process messaging system
+Group:		System/Libraries
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
 
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
+#Vendor:		Trinity Project
+#Packager:	Francois Andriot <francois.andriot@free.fr>
 
-Prefix:		%{tde_prefix}
+Prefix:		/usr
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
@@ -23,68 +51,101 @@ Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 # [dbus-tqt] Fix build on RHEL 4
 Patch1:		dbus-tqt-3.5.13-fix_old_dbus_types.patch
 
+BuildRequires:	libtqt4-devel >= %{tde_epoch}:4.2.0
+
+BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+
+# DBUS support
 %if 0%{?suse_version}
 BuildRequires:	dbus-1-devel
 %else
 BuildRequires:	dbus-devel
 %endif
-BuildRequires:	trinity-tqtinterface-devel >= %{version}
 
-BuildRequires:	cmake >= 2.8
-BuildRequires:	qt3-devel >= 3.3.8d
-Requires:		qt3 >= 3.3.8d
+%description
+D-BUS is a message bus, used for sending messages between applications.
+Conceptually, it fits somewhere in between raw sockets and CORBA in
+terms of complexity.
 
-Obsoletes:		dbus-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		dbus-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
+This package provides the TQt-based shared library for applications using the
+Qt interface to D-BUS.
 
+See the dbus description for more information about D-BUS in general.
 
-%description
-Dbus TQT Interface
+##########
+
+%package -n %{libdbus}-tqt-1-0
+Summary:		Simple inter-process messaging system (TQt-based shared library)
+Group:			System/Libraries
+Provides:		libdbus-tqt-1-0 = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Obsoletes:		trinity-dbus-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-dbus-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n %{libdbus}-tqt-1-0
+D-BUS is a message bus, used for sending messages between applications.
+Conceptually, it fits somewhere in between raw sockets and CORBA in
+terms of complexity.
 
-%post
+This package provides the TQt-based shared library for applications using the
+Qt interface to D-BUS.
+
+See the dbus description for more information about D-BUS in general.
+
+%post -n %{libdbus}-tqt-1-0
 /sbin/ldconfig || :
 
-%postun
+%postun -n %{libdbus}-tqt-1-0
 /sbin/ldconfig || :
 
-%files
+%files -n %{libdbus}-tqt-1-0
 %defattr(-,root,root,-)
-%{tde_libdir}/libdbus-tqt-1.so.0
-%{tde_libdir}/libdbus-tqt-1.so.0.0.0
+%{_libdir}/libdbus-tqt-1.so.0
+%{_libdir}/libdbus-tqt-1.so.0.0.0
 
 ##########
 
-%package devel
-Requires:		%{name}
-Summary:		%{name} - Development files
-Group:			Development/Libraries
+%package -n %{libdbus}-tqt-1-devel
+Summary:		Simple inter-process messaging system (TQt interface)
+Group:			Development/Libraries/C and C++
+Provides:		libdbus-tqt-1-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:		%{libdbus}-tqt-1-0 = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Obsoletes:		trinity-dbus-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-dbus-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
-Obsoletes:		dbus-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		dbus-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+%description -n %{libdbus}-tqt-1-devel
+D-BUS is a message bus, used for sending messages between applications.
+Conceptually, it fits somewhere in between raw sockets and CORBA in
+terms of complexity.
 
-%description devel
-Development files for %{name}
+This package provides the TQt-based shared library for applications using the
+Qt interface to D-BUS.
 
-%post devel
+See the dbus description for more information about D-BUS in general.
+
+%post -n %{libdbus}-tqt-1-devel
 /sbin/ldconfig || :
 
-%postun devel
+%postun -n %{libdbus}-tqt-1-devel
 /sbin/ldconfig || :
 
-%files devel
+%files -n %{libdbus}-tqt-1-devel
 %defattr(-,root,root,-)
-%{tde_includedir}/dbus-1.0/*
-%{tde_libdir}/libdbus-tqt-1.so
-%{tde_libdir}/libdbus-tqt-1.la
-%{tde_libdir}/pkgconfig/dbus-tqt.pc
+%{_includedir}/dbus-1.0/*
+%{_libdir}/libdbus-tqt-1.so
+%{_libdir}/libdbus-tqt-1.la
+%{_libdir}/pkgconfig/dbus-tqt.pc
 
 ##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos}
 %debug_package
 %endif
 
+##########
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
@@ -96,8 +157,7 @@ Development files for %{name}
 
 %build
 unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt?.sh
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+. /etc/profile.d/qt3.sh
 
 %if 0%{?rhel} == 4
 export CXXFLAGS="-DDBUS_API_SUBJECT_TO_CHANGE ${CXXFLAGS}"
@@ -115,8 +175,8 @@ fi
   -DCMAKE_SKIP_RPATH=ON \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   \
-  -DINCLUDE_INSTALL_DIR=%{tde_includedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DINCLUDE_INSTALL_DIR=%{_includedir} \
+  -DLIB_INSTALL_DIR=%{_libdir} \
   ..
 
 %__make %{?_smp_mflags}
@@ -132,6 +192,9 @@ fi
 
 
 %changelog
+* Sat Oct 11 2014 Francois Andriot <francois.andriot@free.fr> - 1:0.63-2
+- Rename package to 'libdbus-tqt-1'
+
 * Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1:0.63-1
 - Build for Fedora 19
 
diff --git a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
index 002a9574c..edafd991c 100644
--- a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
+++ b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package libart-lgpl
+# spec file for package libart-lgpl (version R14.0.0)
 #
 # Copyright (c) 2014 Trinity Desktop Environment
 #
@@ -17,6 +17,7 @@
 
 
 # TDE variables
+%define tde_epoch 2
 %define tde_version 14.0.0
 
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index b8efae18a..48b6bd825 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package tqt3
+# spec file for package tqt3 (version R14.0.0)
 #
 # Copyright (c) 2014 Trinity Desktop Environment
 #
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
index 1f7430170..164552d13 100755
--- a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package tqtinterface
+# spec file for package tqtinterface (version R14.0.0)
 #
 # Copyright (c) 2014 Trinity Desktop Environment
 #
@@ -20,8 +20,9 @@
 #  Having KDE libraries may cause FTBFS here !
 
 # TDE variables
+%define tde_epoch 2
 %define tde_version 14.0.0
-%define tde_pkg tdeaddons
+%define tde_pkg tqtinterface
 %define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
@@ -32,6 +33,7 @@
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
+%define cmake_modules_dir %{_datadir}/cmake/Modules
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?tde_prefix}" != "/usr"
@@ -44,8 +46,8 @@
 %define libtqt4 libtqt4
 %endif
 
-Name:		trinity-tqtinterface
-Epoch:		2
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
 Version:	4.2.0
 Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
 Summary:	The Trinity Qt Interface Libraries
@@ -95,6 +97,19 @@ BuildRequires: Mesa-libGL-devel
 BuildRequires: Mesa-libGLU-devel
 %endif
 
+# X11 libraries
+%if 0%{?rhel} == 4
+BuildRequires:	xorg-x11-devel
+%endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}xi-devel
+%endif
+%if 0%{?suse_version} >= 1220 || 0%{?rhel} >= 5 || 0%{?fedora}
+BuildRequires:	libXi-devel
+%endif
+%if 0%{?suse_version} == 1140
+BuildRequires:	libXi6-devel
+%endif
 
 %description
 The Trinity Qt Interface is a library that abstracts Qt from Trinity.
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.12-qtinterface-makefile.patch b/redhat/dependencies/tqtinterface/tqtinterface-3.5.12-qtinterface-makefile.patch
deleted file mode 100644
index 687aef612..000000000
--- a/redhat/dependencies/tqtinterface/tqtinterface-3.5.12-qtinterface-makefile.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-*** tqtinterface/qtinterface/Makefile.am.ORI	2011-09-16 20:05:43.000000000 +0200
---- tqtinterface/qtinterface/Makefile.am	2011-09-16 20:05:54.000000000 +0200
-***************
-*** 150,156 ****
-  endif
-  
-  install-exec-local:
-! 	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-  	cp -Rp "$(srcdir)/tqt-replace" "$(DESTDIR)$(bindir)/"
-  	cp -Rp "$(srcdir)/tqt-replace-stream" "$(DESTDIR)$(bindir)/"
-  	cp -Rp "$(srcdir)/moc-tqt" "$(DESTDIR)$(bindir)/"
---- 150,156 ----
-  endif
-  
-  install-exec-local:
-! 	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
-  	cp -Rp "$(srcdir)/tqt-replace" "$(DESTDIR)$(bindir)/"
-  	cp -Rp "$(srcdir)/tqt-replace-stream" "$(DESTDIR)$(bindir)/"
-  	cp -Rp "$(srcdir)/moc-tqt" "$(DESTDIR)$(bindir)/"
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.12.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.12.spec
deleted file mode 100755
index edb284609..000000000
--- a/redhat/dependencies/tqtinterface/tqtinterface-3.5.12.spec
+++ /dev/null
@@ -1,139 +0,0 @@
-# Default version for this component
-%if "%{?version}" == ""
-%define version 3.5.12
-%endif
-%define release 9
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# Older RHEL/Fedora versions use packages named "qt", "qt-devel", ..
-# whereas newer versions use "qt3", "qt3-devel" ...
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 8
-%define _qt_suffix 3
-%endif
-
-
-# TQT include files may conflict with QT4 includes, so we move them to a subdirectory.
-# Later compiled Trinity products should be aware of that !
-%define _includedir %{_prefix}/include/tqt
-
-# TDE 3.5.12 specific building variables
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	qt%{?_qt_suffix}-devel >= 3.3.8b
-Requires:		qt%{?_qt_suffix} >= 3.3.8b
-
-
-Name:		tqtinterface
-Version:	%{version}
-Release:	%{release}%{?dist}%{?_variant}
-License:	GPL
-Summary:	Trinity QT Interface
-Group:		System Environment/Libraries
-
-Vendor:		Trinity Project
-URL:		http://www.trinitydesktop.org/
-Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0:	%{name}-%{version}.tar.gz
-
-Patch0:		tqtinterface-3.5.12-qtinterface-makefile.patch
-
-BuildRequires:	gcc-c++
-BuildRequires:	libXi-devel
-BuildRequires:	pth-devel
-
-
-%description
-Trinity QT Interface
-
-%package devel
-Group:		Development/Libraries
-Summary:	%{name} - Development files
-Requires:	%{name} = %{version}-%{release}
-
-%description devel
-Development files for %{name}
-
-%prep
-%setup -q -n dependencies/%{name}
-%patch0 -p1
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-CFLAGS=$( pkg-config --libs qt-mt )
-%configure \
-  --enable-new-ldflags \
-  --disable-dependency-tracking \
-  --disable-debug --disable-warnings --enable-final
-
-%__make %{?_smp_mflags}
-
-
-%install
-%__rm -rf %{?buildroot}
-%__mkdir_p %{?buildroot}%{_includedir}
-%__make install DESTDIR=%{?buildroot}
-
-# RHEL 5: add newline at end of include files
-%if 0%{?rhel} && 0%{?rhel} <= 5
-for i in %{?buildroot}%{_includedir}/*.h; do
-  echo "" >>${i}
-done
-%endif
-
-%clean
-%__rm -rf %{?buildroot}
-
-%files
-%{_bindir}/*
-%{_libdir}/*.so.*
-
-%files devel
-%{_includedir}
-%{_libdir}/*.so
-%{_libdir}/*.la
-
-
-%changelog
-* Fri Sep 16 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-9
-- Add support for RHEL 5.
-
-* Mon Sep 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-8
-- Add "Group"
-
-* Sun Sep 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-7
-- Import to GIT
-- Removes cmake stuff, build with autotools only
-
-* Thu Aug 25 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-6
-- Use '/etc/profile.d/qt.sh' to source QT environment
-
-* Tue Aug 23 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-5
-- Add missing BuildRequires
-
-* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-4
-- Correct macro to install under "/opt", if desired
-
-* Wed Dec 22 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-3
-- Re-add '.la' files, needed for kdelibs compilation
-
-* Sat Dec 18 2010  Francois Andriot <francois.andriot@free.fr> - 3.5.12-2
-- Add cmake support
-- Removes '.la' files
-
-* Fri Dec 17 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
-- Add macro _trinity_prefix to define custom installation prefix (ex: /opt/trinity)
-- Move TQT includes into 'tqt' subdirectory to avoid conflict with 'qt-devel' package (from KDE4)
-
-* Tue Dec 07 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-0
-- Initial version
-
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13-add_missing_endianness_defines.patch b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13-add_missing_endianness_defines.patch
deleted file mode 100644
index 9f4dc4eed..000000000
--- a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13-add_missing_endianness_defines.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- tqtinterface/qtinterface/tqt.h.cmake.orig	2011-10-09 02:40:38.000000000 -0400
-+++ tqtinterface/qtinterface/tqt.h.cmake	2012-05-01 15:10:09.220681454 -0400
-@@ -74,6 +74,11 @@
- #define TQS_OK				QS_OK
- #define TQTSFUNC			QTSFUNC
- #define TQ_TYPENAME			Q_TYPENAME
-+
-+#define TQ_BYTE_ORDER                   Q_BYTE_ORDER
-+#define TQ_LITTLE_ENDIAN                Q_LITTLE_ENDIAN
-+#define TQ_BIG_ENDIAN                   Q_BIG_ENDIAN
-+
- #define TQT_CHECK_INVALID_MAP_ELEMENT	QT_CHECK_INVALID_MAP_ELEMENT
- 
- #define TQT_VERSION			QT_VERSION
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.1.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.1.spec
deleted file mode 100755
index 0f0111f3d..000000000
--- a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.1.spec
+++ /dev/null
@@ -1,150 +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 _variant .opt
-%define cmake_modules_dir %{tde_prefix}/share/cmake
-%else
-%define cmake_modules_dir %{_datadir}/cmake/Modules
-%endif
-
-# TQT include files may conflict with QT4 includes, so we move them to a subdirectory.
-# Later compiled Trinity products should be aware of that !
-%define tde_bindir %{tde_prefix}/bin
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-
-Name:		trinity-tqtinterface
-Version:	3.5.13.1
-Release:	1%{?dist}%{?_variant}
-License:	GPL
-Summary:	Trinity QT Interface
-Group:		System Environment/Libraries
-
-Vendor:		Trinity Project
-URL:		http://www.trinitydesktop.org/
-Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0:	tqtinterface-3.5.13.1.tar.gz
-
-# [tqtinterface] Add missing endian-ness defines [Bug #727] [Commit #458e74a6]
-Patch1:		tqtinterface-3.5.13-add_missing_endianness_defines.patch
-
-# TDE 3.5.13 specific building variables
-BuildRequires:	cmake >= 2.8
-BuildRequires:	qt3-devel
-Requires:		qt3
-
-BuildRequires:	gcc-c++
-%if 0%{?rhel} == 4
-BuildRequires:	xorg-x11-devel
-%else
-BuildRequires:	pth-devel
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}xi-devel
-%else
-BuildRequires:	libXi-devel
-%endif
-%endif
-
-Obsoletes:	tqtinterface < %{version}-%{release}
-Provides:	tqtinterface = %{version}-%{release}
-
-
-%description
-Trinity QT Interface
-
-%package devel
-Group:		Development/Libraries
-Summary:	%{name} - Development files
-Requires:	%{name} = %{version}-%{release}
-Requires:	qt3-devel
-
-Obsoletes:	tqtinterface-devel < %{version}-%{release}
-Provides:	tqtinterface-devel = %{version}-%{release}
-
-%description devel
-Development files for %{name}
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n tqtinterface-3.5.13.1
-%patch1 -p1
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__mkdir_p build
-cd build
-%endif
-
-# Note: specifying 'QT_LIBRARY_DIR' allow using QT3 libraries under
-#  another directory than QT3_PREFIX. (E.g. Mageia 2, Mandriva ...)
-#  Otherwise, it defaults to ${QTDIR}/lib !
-%cmake \
-  -DQT_PREFIX_DIR=${QTDIR} \
-  -DQT_VERSION=3 \
-  -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-  -DINCLUDE_INSTALL_DIR=%{tde_includedir}/tqt \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DPKGCONFIG_INSTALL_DIR=%{tde_libdir}/pkgconfig \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DQT_LIBRARY_DIR=${QTLIB:-${QTDIR}/%{_lib}} \
-  ..
-
-%__make %{?_smp_mflags}
-
-
-%install
-%__rm -rf %{?buildroot}
-%__mkdir_p %{?buildroot}%{_includedir}
-%__make install DESTDIR=%{?buildroot} -C build
-
-# RHEL 5: add newline at end of include files to avoid warnings
-%if 0%{?rhel} && 0%{?rhel} <= 5
-for i in %{?buildroot}%{tde_includedir}/tqt/*.h; do
-  echo "" >>${i}
-done
-%endif
-
-# Install 'cmake' modules for development use
-%__mkdir_p %{?buildroot}%{cmake_modules_dir}
-for i in cmake/modules/*.cmake; do
-  %__install -m 644 $i %{?buildroot}%{cmake_modules_dir}
-done
-
-%clean
-%__rm -rf %{?buildroot}
-
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-%files
-%{tde_bindir}/*
-%{tde_libdir}/*.so.*
-
-%files devel
-%{tde_includedir}/tqt
-%{tde_libdir}/*.so
-%{tde_libdir}/*.la
-%{tde_libdir}/pkgconfig/*.pc
-%{cmake_modules_dir}/*.cmake
-
-
-%changelog
-* Tue Sep 11 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Switch to v3.5.13-sru branch
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec
index 25e2c0256..bcc92d97d 100755
--- a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec
@@ -1,37 +1,102 @@
-# TDE specific building variables
+#
+# spec file for package tqtinterface (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/
+#
+
+# BUILD WARNING:
+#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
+#  Having KDE libraries may cause FTBFS here !
+
+# TDE variables
+%define tde_epoch 1
 %define tde_version 3.5.13.2
-%define tde_prefix /usr
+%define tde_pkg tqtinterface
+%define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_tdeappdir %{tde_datadir}/applications/kde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
 %define cmake_modules_dir %{_datadir}/cmake/Modules
 
-Name:		trinity-tqtinterface
-Version:	%{tde_version}
-Release:	%{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
-License:	GPL
-Summary:	Trinity QT Interface
-Group:		System Environment/Libraries
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?tde_prefix}" != "/usr"
+%define _variant .opt
+%endif
+
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
+%define libtqt4 %{_lib}tqt4
+%else
+%define libtqt4 libtqt4
+%endif
 
-Vendor:		Trinity Project
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	4.2.0
+Release:	%{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant}
+Summary:	The Trinity Qt Interface Libraries
+Group:		System/GUI/Other
 URL:		http://www.trinitydesktop.org/
-Packager:	Francois Andriot <francois.andriot@free.fr>
 
-Prefix:		%{tde_prefix}
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Project
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		/usr
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	cmake >= 2.8
+Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	qt3 >= 3.3.8d
 BuildRequires:	qt3-devel >= 3.3.8d
-Requires:		qt3 >= 3.3.8d
 
+%if 0%{?suse_version} && 0%{?suse_version} < 1300
+BuildRequires:	trinity-cmake-macros
+%endif
+
+BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
 
 # PTHREAD support
 %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
 BuildRequires:	pth-devel
 %endif
 
+# MESA support
+%if 0%{?rhel} || 0%{?fedora}
+BuildRequires: mesa-libGL-devel
+BuildRequires: mesa-libGLU-devel
+%endif
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: mesaglu-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires: Mesa-libGL-devel
+BuildRequires: Mesa-libGLU-devel
+%endif
+
 # X11 libraries
 %if 0%{?rhel} == 4
 BuildRequires:	xorg-x11-devel
@@ -46,78 +111,110 @@ BuildRequires:	libXi-devel
 BuildRequires:	libXi6-devel
 %endif
 
-Obsoletes:	tqtinterface < %{version}-%{release}
-Provides:	tqtinterface = %{version}-%{release}
+%description
+The Trinity Qt Interface is a library that abstracts Qt from Trinity.
+This allows the Trinity code to rapidly port from one version of Qt to another.
+This is primarily accomplished by defining old functions in terms of new functions,
+although some code has been added for useful functions that are no longer part of Qt.
 
 
-%description
-Trinity QT Interface
+##########
 
+%package -n %{libtqt4}
+Group:		System/GUI/Other
+Summary:	The Trinity Qt Interface Libraries
+Provides:	libtqt4 = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%post
-/sbin/ldconfig || :
+Requires:	qt3 >= 3.3.8d
 
-%postun
-/sbin/ldconfig || :
+%if 0%{?suse_version} && 0%{?suse_version} < 1300
+Requires:		trinity-cmake-macros
+%endif
+
+Obsoletes:	trinity-tqtinterface < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-tqtinterface = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n %{libtqt4}
+The Trinity Qt Interface is a library that abstracts Qt from Trinity.
+This allows the Trinity code to rapidly port from one version of Qt to another.
+This is primarily accomplished by defining old functions in terms of new functions,
+although some code has been added for useful functions that are no longer part of Qt.
 
-%files
+%files -n %{libtqt4}
 %defattr(-,root,root,-)
-%{tde_bindir}/convert_qt_tqt1
-%{tde_bindir}/convert_qt_tqt2
-%{tde_bindir}/convert_qt_tqt3
-%{tde_bindir}/dcopidl-tqt
-%{tde_bindir}/dcopidl2cpp-tqt
-%{tde_bindir}/dcopidlng-tqt
-%{tde_bindir}/mcopidl-tqt
-%{tde_bindir}/moc-tqt
-%{tde_bindir}/tmoc
-%{tde_bindir}/tqt-replace
-%{tde_bindir}/tqt-replace-stream
-%{tde_bindir}/uic-tqt
-%{tde_libdir}/libtqassistantclient.so.4
-%{tde_libdir}/libtqassistantclient.so.4.2.0
-%{tde_libdir}/libtqt.so.4
-%{tde_libdir}/libtqt.so.4.2.0
+%{_libdir}/libtqassistantclient.so.4
+%{_libdir}/libtqassistantclient.so.4.2.0
+%{_libdir}/libtqt.so.4
+%{_libdir}/libtqt.so.4.2.0
+
+%post -n %{libtqt4}
+/sbin/ldconfig || :
+
+%postun -n %{libtqt4}
+/sbin/ldconfig || :
 
 ##########
 
-%package devel
-Group:		Development/Libraries
-Summary:	%{name} - Development files
-Requires:	%{name} = %{version}-%{release}
+%package -n %{libtqt4}-devel
+Group:		Development/Libraries/X11
+Summary:	The Trinity Qt Interface Libraries (Development Files)
+Provides:	libtqt4-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Requires:	%{libtqt4} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	qt3-devel >= 3.3.8d
 
-Obsoletes:	tqtinterface-devel < %{version}-%{release}
-Provides:	tqtinterface-devel = %{version}-%{release}
+%if 0%{?suse_version} && 0%{?suse_version} < 1300
+Requires:		trinity-cmake-macros
+%endif
+
+Obsoletes:	trinity-tqtinterface-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-tqtinterface-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description devel
-Development files for %{name}
+%description -n %{libtqt4}-devel
+The Trinity Qt Interface is a library that abstracts Qt from Trinity.
+This allows the Trinity code to rapidly port from one version of Qt to another.
+This is primarily accomplished by defining old functions in terms of new functions,
+although some code has been added for useful functions that are no longer part of Qt.
 
-%post devel
+%post -n %{libtqt4}-devel
 /sbin/ldconfig || :
 
-%postun devel
+%postun -n %{libtqt4}-devel
 /sbin/ldconfig || :
 
-%files devel
+%files -n %{libtqt4}-devel
 %defattr(-,root,root,-)
-%{tde_includedir}/tqt/
-%{tde_libdir}/libtqassistantclient.la
-%{tde_libdir}/libtqassistantclient.so
-%{tde_libdir}/libtqt.la
-%{tde_libdir}/libtqt.so
-%{tde_libdir}/pkgconfig/tqt.pc
+%{_bindir}/convert_qt_tqt1
+%{_bindir}/convert_qt_tqt2
+%{_bindir}/convert_qt_tqt3
+%{_bindir}/dcopidl-tqt
+%{_bindir}/dcopidl2cpp-tqt
+%{_bindir}/dcopidlng-tqt
+%{_bindir}/mcopidl-tqt
+%{_bindir}/moc-tqt
+%{_bindir}/tmoc
+%{_bindir}/tqt-replace
+%{_bindir}/tqt-replace-stream
+%{_bindir}/uic-tqt
+%{_includedir}/tqt/
+%{_libdir}/libtqassistantclient.la
+%{_libdir}/libtqassistantclient.so
+%{_libdir}/libtqt.la
+%{_libdir}/libtqt.so
+%{_libdir}/pkgconfig/tqt.pc
 %{cmake_modules_dir}/*.cmake
 
 ##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos}
 %debug_package
 %endif
 
+##########
 
 %prep
-%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
 
 %build
 unset QTDIR QTINC QTLIB
@@ -128,8 +225,6 @@ if ! rpm -E %%cmake|grep -q "cd build"; then
   cd build
 fi
 
-pwd
-
 # Note: specifying 'QT_LIBRARY_DIR' allow using QT3 libraries under
 #  another directory than QT3_PREFIX. (E.g. Mageia 2, Mandriva ...)
 #  Otherwise, it defaults to ${QTDIR}/lib !
@@ -144,43 +239,49 @@ pwd
   -DQT_VERSION=3 \
   -DQT_LIBRARY_DIR="${QTLIB:-${QTDIR}/%{_lib}}" \
   \
-  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-  -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
-  -DINCLUDE_INSTALL_DIR=%{tde_includedir}/tqt \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DCMAKE_INSTALL_PREFIX="%{_prefix}" \
+  -DPKGCONFIG_INSTALL_DIR="%{_libdir}/pkgconfig" \
+  -DINCLUDE_INSTALL_DIR=%{_includedir}/tqt \
+  -DLIB_INSTALL_DIR=%{_libdir} \
+  -DBIN_INSTALL_DIR=%{_bindir} \
+  \
+  -DCMAKE_LIBRARY_PATH="%{_libdir}" \
+  -DCMAKE_INCLUDE_PATH="%{_includedir}" \
   \
   -DWITH_QT3="ON" \
   -DBUILD_ALL="ON" \
   -DUSE_QT3="ON" \
   ..
 
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
 
 
 %install
-%__rm -rf %{?buildroot}
-%__make install DESTDIR=%{?buildroot} -C build
+%__rm -rf "%{?buildroot}"
+%__make install DESTDIR="%{?buildroot}" -C build
 
 # RHEL 5: add newline at end of include files to avoid warnings
 %if 0%{?rhel} && 0%{?rhel} <= 5
-for i in %{?buildroot}%{tde_includedir}/tqt/*.h; do
+for i in %{?buildroot}%{_includedir}/tqt/*.h; do
   echo "" >>${i}
 done
 %endif
 
 # Install 'cmake' modules for development use
-%__mkdir_p %{?buildroot}%{cmake_modules_dir}
+%__mkdir_p "%{?buildroot}%{cmake_modules_dir}"
 for i in cmake/modules/*.cmake; do
-  %__install -m 644 $i %{?buildroot}%{cmake_modules_dir}
+  %__install -m 644 "$i" "%{?buildroot}%{cmake_modules_dir}"
 done
 
 
 %clean
-%__rm -rf %{?buildroot}
+%__rm -rf "%{?buildroot}"
 
 
 %changelog
+* Sat Oct 11 2014 Francois Andriot <francois.andriot@free.fr> - 1:4.2.0-3
+- Rename package to 'libtqt4'
+
 * Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2
 - Build for Fedora 19
 
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec
deleted file mode 100755
index 2616720d7..000000000
--- a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec
+++ /dev/null
@@ -1,161 +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 _variant .opt
-%define cmake_modules_dir %{tde_prefix}/share/cmake
-%else
-%define cmake_modules_dir %{_datadir}/cmake/Modules
-%endif
-
-# TQT include files may conflict with QT4 includes, so we move them to a subdirectory.
-# Later compiled Trinity products should be aware of that !
-%define tde_bindir %{tde_prefix}/bin
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-
-Name:		trinity-tqtinterface
-Version:	3.5.13
-Release:	3%{?dist}%{?_variant}
-License:	GPL
-Summary:	Trinity QT Interface
-Group:		System Environment/Libraries
-
-Vendor:		Trinity Project
-URL:		http://www.trinitydesktop.org/
-Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0:	tqtinterface-3.5.13.tar.gz
-
-# [tqtinterface] Add missing endian-ness defines [Bug #727] [Commit #458e74a6]
-Patch1:		tqtinterface-3.5.13-add_missing_endianness_defines.patch
-
-# TDE 3.5.13 specific building variables
-BuildRequires:	cmake >= 2.8
-BuildRequires:	qt3-devel
-Requires:		qt3
-
-BuildRequires:	gcc-c++
-%if 0%{?rhel} == 4
-BuildRequires:	xorg-x11-devel
-%else
-BuildRequires:	pth-devel
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}xi-devel
-%else
-BuildRequires:	libXi-devel
-%endif
-%endif
-
-Obsoletes:	tqtinterface < %{version}-%{release}
-Provides:	tqtinterface = %{version}-%{release}
-
-
-%description
-Trinity QT Interface
-
-%package devel
-Group:		Development/Libraries
-Summary:	%{name} - Development files
-Requires:	%{name} = %{version}-%{release}
-Requires:	qt3-devel
-
-Obsoletes:	tqtinterface-devel < %{version}-%{release}
-Provides:	tqtinterface-devel = %{version}-%{release}
-
-%description devel
-Development files for %{name}
-
-%if 0%{?suse_version}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n dependencies/tqtinterface
-%patch1 -p1
-
-%build
-unset QTDIR; . /etc/profile.d/qt?.sh
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__mkdir_p build
-cd build
-%endif
-
-# Note: specifying 'QT_LIBRARY_DIR' allow using QT3 libraries under
-#  another directory than QT3_PREFIX. (E.g. Mageia 2, Mandriva ...)
-#  Otherwise, it defaults to ${QTDIR}/lib !
-%cmake \
-  -DQT_PREFIX_DIR=${QTDIR} \
-  -DQT_VERSION=3 \
-  -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-  -DINCLUDE_INSTALL_DIR=%{tde_includedir}/tqt \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DPKGCONFIG_INSTALL_DIR=%{tde_libdir}/pkgconfig \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DQT_LIBRARY_DIR=${QTLIB:-${QTDIR}/%{_lib}} \
-  ..
-
-%__make %{?_smp_mflags}
-
-
-%install
-%__rm -rf %{?buildroot}
-%__mkdir_p %{?buildroot}%{_includedir}
-%__make install DESTDIR=%{?buildroot} -C build
-
-# RHEL 5: add newline at end of include files to avoid warnings
-%if 0%{?rhel} && 0%{?rhel} <= 5
-for i in %{?buildroot}%{tde_includedir}/tqt/*.h; do
-  echo "" >>${i}
-done
-%endif
-
-# Install 'cmake' modules for development use
-%__mkdir_p %{?buildroot}%{cmake_modules_dir}
-for i in cmake/modules/*.cmake; do
-  %__install -m 644 $i %{?buildroot}%{cmake_modules_dir}
-done
-
-%clean
-%__rm -rf %{?buildroot}
-
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-%files
-%{tde_bindir}/*
-%{tde_libdir}/*.so.*
-
-%files devel
-%{tde_includedir}/tqt
-%{tde_libdir}/*.so
-%{tde_libdir}/*.la
-%{tde_libdir}/pkgconfig/*.pc
-%{cmake_modules_dir}/*.cmake
-
-
-%changelog
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
-- Rebuilt for Fedora 17
-- Add missing endian-ness defines [Bug #727] [Commit #458e74a6]
-
-* Sun Nov 06 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
-- Add missing Requires
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
-- Initial release for RHEL 6, RHEL 5 and Fedora 15
-
-* Sun Aug 28 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
-- Import to GIT
-- Built with future TDE version (3.5.13 + cmake + QT3.3.8d)
diff --git a/redhat/extras/brp-check-trinity/brp-check-trinity.spec b/redhat/extras/brp-check-trinity/brp-check-trinity.spec
index 3030ccf5f..4cabb5782 100644
--- a/redhat/extras/brp-check-trinity/brp-check-trinity.spec
+++ b/redhat/extras/brp-check-trinity/brp-check-trinity.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package brp-check-trinity
+# spec file for package brp-check-trinity (version R14.0.0)
 #
-# Copyright (c) 2014 François Andriot <francois.andriot@free.fr>
+# 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
diff --git a/redhat/extras/fileshareset/fileshareset.spec b/redhat/extras/fileshareset/fileshareset.spec
index 96c69e81d..408798e28 100644
--- a/redhat/extras/fileshareset/fileshareset.spec
+++ b/redhat/extras/fileshareset/fileshareset.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package fileshareset
 #
-# Copyright (c) 2014 François Andriot <francois.andriot@free.fr>
+# 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
diff --git a/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec b/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec
new file mode 100644
index 000000000..7738ecaa9
--- /dev/null
+++ b/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec
@@ -0,0 +1,453 @@
+#
+# spec file for package trinity-filesystem (version R14.0.0)
+#
+# 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 14.0.0
+%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_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 <francois.andriot@free.fr>
+
+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_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}/pkgconfig
+%dir %{tde_tdelibdir}
+
+%dir %{tde_datadir}/applications
+%dir %{tde_datadir}/applications/tde
+%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/plugin
+%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}/locale
+%dir %{tde_datadir}/locale/en_US
+%dir %{tde_datadir}/locale/l10n
+%dir %{tde_datadir}/locale/l10n/*
+%dir %{tde_datadir}/mimelnk
+%dir %{tde_datadir}/mimelnk/*
+%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/tde
+%__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/Games
+%__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/WebBrowsing
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/System
+%__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}/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.kcfg
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/emoticons
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale
+%__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/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}/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 ; 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 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}/pkgconfig
+%__install -d -m 755 %{?buildroot}%{tde_tdelibdir}
+
+%__install -d -m 755 %{?buildroot}%{_datadir}/icons/hicolor
+%__install -d -m 755 %{?buildroot}%{_datadir}/icons/hicolor/32x32
+%__install -d -m 755 %{?buildroot}%{_datadir}/icons/hicolor/32x32/apps
+
+%__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_tdeinit tdmtsak tdekbdledsync ; 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
+* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
+- Initial build for TDE R14
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
new file mode 100644
index 000000000..64fc09820
--- /dev/null
+++ b/redhat/extras/trinity-filesystem/trinity-filesystem-3.5.13.2.spec
@@ -0,0 +1,453 @@
+#
+# 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_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 <francois.andriot@free.fr>
+
+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_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}/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/plugin
+%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}/locale
+%dir %{tde_datadir}/locale/en_US
+%dir %{tde_datadir}/locale/l10n
+%dir %{tde_datadir}/locale/l10n/*
+%dir %{tde_datadir}/mimelnk
+%dir %{tde_datadir}/mimelnk/*
+%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/Games
+%__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/WebBrowsing
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/System
+%__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}/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.kcfg
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/emoticons
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale
+%__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/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}/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 ; 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 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}/pkgconfig
+%__install -d -m 755 %{?buildroot}%{tde_tdelibdir}
+
+%__install -d -m 755 %{?buildroot}%{_datadir}/icons/hicolor
+%__install -d -m 755 %{?buildroot}%{_datadir}/icons/hicolor/32x32
+%__install -d -m 755 %{?buildroot}%{_datadir}/icons/hicolor/32x32/apps
+
+%__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
+* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
+- Initial build for TDE R14
diff --git a/redhat/extras/trinity-filesystem/trinity-filesystem.spec b/redhat/extras/trinity-filesystem/trinity-filesystem.spec
deleted file mode 100644
index 32320ba90..000000000
--- a/redhat/extras/trinity-filesystem/trinity-filesystem.spec
+++ /dev/null
@@ -1,183 +0,0 @@
-#
-# spec file for package trinity-filesystem
-#
-# Copyright (c) 2014 François Andriot <francois.andriot@free.fr>
-#
-# 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 14.0.0
-%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_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 <francois.andriot@free.fr>
-
-Prefix:		/usr
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-
-%description
-This package installs the Trinity directory structure.
-
-
-%files
-%dir %{tde_prefix}
-
-%dir %{tde_bindir}
-
-%dir %{tde_datadir}
-%dir %{tde_datadir}/config
-
-%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}/pkgconfig
-%dir %{tde_tdelibdir}
-
-%dir %{tde_datadir}/applications
-%dir %{tde_datadir}/applications/tde
-%dir %{tde_datadir}/applnk
-%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/hicolor
-%dir %{tde_datadir}/locale
-%dir %{tde_datadir}/mimelnk
-%dir %{tde_datadir}/mimelnk/all
-%dir %{tde_datadir}/mimelnk/application
-%dir %{tde_datadir}/mimelnk/audio
-%dir %{tde_datadir}/mimelnk/image
-%dir %{tde_datadir}/mimelnk/inode
-%dir %{tde_datadir}/mimelnk/message
-%dir %{tde_datadir}/mimelnk/model
-%dir %{tde_datadir}/mimelnk/multipart
-%dir %{tde_datadir}/mimelnk/text
-%dir %{tde_datadir}/mimelnk/uri
-%dir %{tde_datadir}/mimelnk/video
-%dir %{tde_datadir}/services
-%dir %{tde_datadir}/servicetypes
-
-%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/tde
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/apps
-%__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.kcfg
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/emoticons
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/icons
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/icons/crystalsvg
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/icons/hicolor
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale
-%__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/image
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/inode
-%__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/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}/servicetypes
-
-%__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}/pkgconfig
-%__install -d -m 755 %{?buildroot}%{tde_tdelibdir}
-
-%__install -d -m 755 %{?buildroot}%{_datadir}/icons/hicolor
-%__install -d -m 755 %{?buildroot}%{_datadir}/icons/hicolor/32x32
-%__install -d -m 755 %{?buildroot}%{_datadir}/icons/hicolor/32x32/apps
-
-%__install -d -m 755 %{?buildroot}%{_sysconfdir}/trinity
-%__install -d -m 755 %{?buildroot}%{_sysconfdir}/xdg/menus
-
-
-%post
-%if 0%{?suse_version}
-# Add setuid files in '/etc/permissions.local'
-for b in kgrantpty kpac_dhcp_helper start_tdeinit; 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
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial build for TDE R14
diff --git a/redhat/tdebase/plasma-desktop b/redhat/tdebase/plasma-desktop
deleted file mode 100644
index 9e14070d8..000000000
--- a/redhat/tdebase/plasma-desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-# This stupid scripts prevent the launch of 'plasma-desktop'
-# (from KDE4) alongside with TDE.
-
-case "${DESKTOP_SESSION}" in
-	"kde3"|"trinity"|"TDE") ;;
-	*) exec /usr/bin/plasma-desktop;;
-esac
diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec
index 1934eab27..c8e6f1a72 100644
--- a/redhat/tdebase/tdebase-14.0.0.spec
+++ b/redhat/tdebase/tdebase-14.0.0.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package tdebase
+# spec file for package tdebase (version R14.0.0)
 #
 # Copyright (c) 2014 Trinity Desktop Environment
 #
@@ -16,6 +16,7 @@
 #
 
 # TDE variables
+%define tde_epoch 2
 %define tde_version 14.0.0
 %define tde_pkg tdebase
 %define tde_prefix /opt/trinity
@@ -29,6 +30,10 @@
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
+%define tdm tdm
+%define tdm_datadir %{tde_datadir}/apps/%{tdm}
+%define starttde starttde
+
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
@@ -55,6 +60,7 @@ Prefix:			%{tde_prefix}
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+Source1:		trinity-tdebase-rpmlintrc
 
 # Pam configuration files for RHEL / Fedora
 %if 0%{?suse_version} == 0
@@ -65,7 +71,7 @@ Source5:		pamd.kscreensaver-trinity%{?dist}
 %endif
 
 # openSUSE: configuration file for TDM
-Source6:	suse-displaymanagers-tdm
+Source6:		suse-displaymanagers-tdm
 
 # Fedora 18: use SYSTEMD for TDM startup
 %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
@@ -116,10 +122,6 @@ BuildRequires:	brp-check-trinity
 Requires:	lovelock-backgrounds-single
 %define tde_bg /usr/share/backgrounds/lovelock/default/standard/lovelock.png
 %define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-
-Requires:	fedora-release-notes
-%define tde_aboutlabel Fedora 15
-%define tde_aboutpage /usr/share/doc/HTML/fedora-release-notes/index.html
 %endif
 
 # Fedora 16 Theme: "Verne"
@@ -127,10 +129,6 @@ Requires:	fedora-release-notes
 Requires:	verne-backgrounds-single
 %define tde_bg /usr/share/backgrounds/verne/default/standard/verne.png
 %define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-
-Requires:	fedora-release-notes
-%define tde_aboutlabel Fedora 16
-%define tde_aboutpage /usr/share/doc/HTML/fedora-release-notes/index.html
 %endif
 
 # Fedora 17 Theme: "Beefy Miracle"
@@ -138,10 +136,6 @@ Requires:	fedora-release-notes
 Requires:	beefy-miracle-backgrounds-single
 %define tde_bg /usr/share/backgrounds/beefy-miracle/default/standard/beefy-miracle.png
 %define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-
-Requires:	fedora-release-notes
-%define tde_aboutlabel Fedora 17
-%define tde_aboutpage /usr/share/doc/HTML/fedora-release-notes/index.html
 %endif
 
 # Fedora 18 Theme: "Spherical Cow"
@@ -150,10 +144,6 @@ Requires:	spherical-cow-backgrounds-single
 %define tde_bg /usr/share/backgrounds/spherical-cow/default/standard/spherical-cow.png
 Requires:	fedora-logos
 %define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-
-Requires:	fedora-release-notes
-%define tde_aboutlabel Fedora 18
-%define tde_aboutpage /usr/share/doc/HTML/fedora-release-notes/index.html
 %endif
 
 # Fedora 19 Theme: "Schroedinger's cat"
@@ -162,10 +152,6 @@ Requires:	schroedinger-cat-backgrounds-base
 %define tde_bg /usr/share/backgrounds/schroedinger-cat/default/standard/schroedinger-cat.jpg
 Requires:	fedora-logos
 %define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-
-Requires:	fedora-release-notes
-%define tde_aboutlabel Fedora 19
-%define tde_aboutpage /usr/share/doc/fedora-release-notes-19/index.html
 %endif
 
 # Fedora 20 Theme: "Heisenbug"
@@ -174,10 +160,6 @@ Requires:	heisenbug-backgrounds-base
 %define tde_bg /usr/share/backgrounds/heisenbug/default/standard/heisenbug.png
 Requires:	fedora-logos
 %define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-
-Requires:	fedora-release-notes
-%define tde_aboutlabel Fedora 20
-%define tde_aboutpage /usr/share/doc/fedora-release-notes/index.html
 %endif
 
 # RHEL 4 Theme
@@ -186,10 +168,6 @@ Requires:	desktop-backgrounds-basic
 %define tde_bg /usr/share/backgrounds/images/default.png
 Requires:	redhat-logos
 %define tde_starticon /usr/share/pixmaps/redhat/rpmlogo-64.xpm
-
-Requires:	indexhtml
-%define tde_aboutlabel Enterprise Linux 4
-%define tde_aboutpage /usr/share/doc/HTML/index.html
 %endif
 
 # RHEL 5 Theme
@@ -197,10 +175,6 @@ Requires:	indexhtml
 Requires:	desktop-backgrounds-basic
 %define tde_bg /usr/share/backgrounds/images/default.jpg
 %define tde_starticon /usr/share/pixmaps/redhat-starthere.png
-
-Requires:	indexhtml
-%define tde_aboutlabel Enterprise Linux 5
-%define tde_aboutpage /usr/share/doc/HTML/index.html
 %endif
 
 # RHEL 6 Theme
@@ -208,10 +182,6 @@ Requires:	indexhtml
 Requires:	redhat-logos
 %define tde_bg /usr/share/backgrounds/default.png
 %define tde_starticon /usr/share/icons/hicolor/96x96/apps/system-logo-icon.png
-
-Requires:	redhat-indexhtml
-%define tde_aboutlabel Enterprise Linux 6
-%define tde_aboutpage /usr/share/doc/HTML/index.html
 %endif
 
 # RHEL 7 Theme
@@ -219,10 +189,6 @@ Requires:	redhat-indexhtml
 Requires:	redhat-logos
 %define tde_bg /usr/share/backgrounds/day.jpg
 %define tde_starticon /usr/share/icons/hicolor/96x96/apps/system-logo-icon.png
-
-Requires:	redhat-indexhtml
-%define tde_aboutlabel Enterprise Linux 7
-%define tde_aboutpage /usr/share/doc/HTML/index.html
 %endif
 
 # Mageia 2 Theme
@@ -230,10 +196,6 @@ Requires:	redhat-indexhtml
 Requires:	mageia-theme-Default
 %define tde_bg /usr/share/mga/backgrounds/default.jpg
 %define tde_starticon /usr/share/icons/hicolor/scalable/apps/mageia-menu.svg
-
-Requires:	indexhtml
-%define tde_aboutlabel Mageia 2
-%define tde_aboutpage /usr/share/mga/about/index.html
 %endif
 
 # Mageia 3 Theme
@@ -241,10 +203,6 @@ Requires:	indexhtml
 Requires:	mageia-theme-Default
 %define tde_bg /usr/share/mga/backgrounds/default.jpg
 %define tde_starticon %{tde_datadir}/oxygen/scalable/mgabutton.svg
-
-Requires:	indexhtml
-%define tde_aboutlabel Mageia 3
-%define tde_aboutpage /usr/share/mga/about/index.html
 %endif
 
 # Mageia 4 Theme
@@ -252,10 +210,6 @@ Requires:	indexhtml
 Requires:	mageia-theme-Default
 %define tde_bg /usr/share/mga/backgrounds/default.jpg
 %define tde_starticon %{tde_datadir}/oxygen/scalable/mgabutton.svg
-
-Requires:	indexhtml
-%define tde_aboutlabel Mageia 4
-%define tde_aboutpage /usr/share/mga/about/index.html
 %endif
 
 # Mandriva 2011 Theme: "rosa"
@@ -263,30 +217,18 @@ Requires:	indexhtml
 Requires:	mandriva-theme
 %define tde_bg /usr/share/mdk/backgrounds/default.jpg
 %define tde_starticon /usr/share/icons/mandriva.png
-
-Requires:	indexhtml
-%define tde_aboutlabel Mandriva 2011
-%define tde_aboutpage /usr/share/mdk/about/index.html
 %endif
 
 # PCLINUXOS
 %if 0%{?pclinuxos}
 Requires:	desktop-common-data
 %define tde_starticon /usr/share/icons/pclinuxos.png
-
-Requires:	indexhtml
-%define tde_aboutlabel PCLinuxOS
-%define tde_aboutpage /usr/share/mdk/about/index.html
 %endif
 
 # OpenSuse 11.4 Theme
 %if "%{?suse_version}" == "1140"
 Requires:	hicolor-icon-theme-branding
 %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
-
-Requires:	opensuse-manuals_en
-%define tde_aboutlabel OpenSuse 11.4
-%define tde_aboutpage /usr/share/doc/manual/opensuse-manuals_en/manual/book.opensuse.startup.html
 %endif
 
 # OpenSuse 12.2 Theme
@@ -295,10 +237,6 @@ Requires:	wallpaper-branding
 %define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
 Requires:	hicolor-icon-theme-branding
 %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
-
-Requires:	opensuse-manuals_en
-%define tde_aboutlabel OpenSuse 12.2
-%define tde_aboutpage /usr/share/doc/manual/opensuse-manuals_en/book.opensuse.startup.html
 %endif
 
 # OpenSuse 12.3 Theme
@@ -307,10 +245,6 @@ Requires:	wallpaper-branding
 %define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
 Requires:	hicolor-icon-theme-branding
 %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
-
-Requires:	opensuse-manuals_en
-%define tde_aboutlabel OpenSuse 12.3
-%define tde_aboutpage /usr/share/doc/manual/opensuse-manuals_en/book.opensuse.startup.html
 %endif
 
 # OpenSuse 13.1 Theme
@@ -319,18 +253,16 @@ Requires:	wallpaper-branding
 %define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
 Requires:	hicolor-icon-theme-branding
 %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
-
-Requires:	opensuse-manuals_en
-%define tde_aboutlabel OpenSuse 13.1
-%define tde_aboutpage /usr/share/doc/manual/opensuse-manuals_en/book.opensuse.startup.html
 %endif
 
-BuildRequires:	trinity-arts-devel >= 2:1.5.10
+BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 
 BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
 BuildRequires:	make
+
+# HTDIG support
 BuildRequires:	htdig
 
 # OPENSSL support
@@ -402,7 +334,7 @@ BuildRequires:	lm_sensors-devel
 BuildRequires:	libsensors4-devel
 %endif
 
-# UDEV support (requires libudev)
+# TSAK support (requires libudev-devel)
 #  On RHEL5, udev is built statically, so TSAK cannot build.
 %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
 BuildRequires:	libudev-devel
@@ -410,11 +342,6 @@ BuildRequires:	libudev-devel
 %define with_tdehwlib 1
 %endif
 
-# HAL support
-%if 0%{?rhel} == 5
-%define with_hal 1
-%endif
-
 # XRANDR support
 #  On RHEL5, xrandr library is too old.
 %if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
@@ -427,6 +354,13 @@ BuildRequires:	libudev-devel
 %define with_xtest 1
 %endif
 
+# HAL support
+# Only for RHEL5
+%if 0%{?rhel} == 5
+%define with_hal 1
+BuildRequires:	hal-devel >= 0.5
+%endif
+
 # OPENEXR support
 #  Disabled on RHEL4
 %if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
@@ -436,7 +370,7 @@ BuildRequires:	OpenEXR-devel
 
 # XSCREENSAVER support
 #  Disabled on RHEL4, RHEL >= 7
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 7 || 0%{?suse_version}
+%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 7 || 0%{?suse_version} || 0%{?with_xscreensaver}
 %if 0%{?rhel} == 0 || 0%{?rhel} <= 6
 %define with_xscreensaver 1
 %if 0%{?rhel} == 5
@@ -495,9 +429,9 @@ BuildRequires:	nas-devel
 BuildRequires:	dbus-devel >= 0.22-12.EL.9p1
 Requires:		dbus-qt >= 0.22-12.EL.9p1
 %else
-BuildRequires:	libdbus-tqt-1-devel >= 2:0.63
-BuildRequires:	libdbus-1-tqt-devel >= 2:0.9
-Requires:		libdbus-tqt-1-0 >= 2:0.63
+BuildRequires:	libdbus-tqt-1-devel >= %{tde_epoch}:0.63
+BuildRequires:	libdbus-1-tqt-devel >= %{tde_epoch}:0.9
+Requires:		libdbus-tqt-1-0 >= %{tde_epoch}:0.63
 %endif
 
 %if 0%{?fedora} >= 17
@@ -561,18 +495,6 @@ BuildRequires:	%{_lib}xdamage-devel
 BuildRequires:	libXdamage-devel
 %endif
 
-# XCOMPOSITE support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?mgaversion} >= 4
-BuildRequires:	%{_lib}xcomposite-devel
-%else
-BuildRequires:	%{_lib}xcomposite%{?mgaversion:1}-devel
-%endif
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
-BuildRequires:	libXcomposite-devel
-%endif
-
 # Requires 'usb.ids'
 BuildRequires:	usbutils
 
@@ -611,6 +533,7 @@ BuildRequires:	bdftopcf
 BuildRequires:	drakconf
 %endif
 
+# LIBCONFIG support
 # Needed for "compton" stuff
 BuildRequires:	libconfig-devel
 
@@ -648,9 +571,7 @@ Requires: trinity-libkonq = %{version}-%{release}
 Requires: %{name}-libtqt3-integration = %{version}-%{release}
 Requires: %{name}-tdeio-smb-plugin = %{version}-%{release}
  
-Requires:	libtqt3-mt >= 3.5.0
-Requires:	libtqt4 >= 2:4.2.0
-Requires:	trinity-arts >= 2:1.5.10
+Requires:	trinity-arts >= %{tde_epoch}:1.5.10
 Requires:	trinity-tdelibs >= %{tde_version}
 Requires:	openssl
 
@@ -688,8 +609,7 @@ web browser, X terminal emulator, and many other programs and components.
 Summary:	%{summary} - Development files
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	libtqt4-devel >= 2:4.2.0
-Requires:	trinity-arts-devel >= 2:1.5.10
+Requires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
 Requires:	trinity-tdelibs-devel >= %{tde_version}
 
 Requires:	%{name}-bin-devel = %{version}-%{release}
@@ -778,7 +698,7 @@ Such as the desktop right-click-"Create New" list
 %files runtime-data-common
 %defattr(-,root,root,-)
 %{tde_datadir}/autostart/khotkeys.desktop
-%{tde_datadir}/desktop-directories/*
+%{tde_datadir}/desktop-directories/
 %{tde_datadir}/icons/hicolor/*/apps/kxkb.png
 %{tde_datadir}/icons/hicolor/*/apps/knetattach.*
 %{tde_datadir}/icons/hicolor/*/apps/khotkeys.png
@@ -806,7 +726,7 @@ done
 ##########
 
 %package -n trinity-kappfinder
-Summary:	non-TDE application finder for TDE
+Summary:	Non-TDE application finder for TDE
 Group:		Applications/Utilities
 Requires:	%{name}-data = %{version}-%{release}
 
@@ -858,7 +778,7 @@ Group:		Environment/Libraries
 ##########
 
 %package -n trinity-kate
-Summary:	advanced text editor for TDE
+Summary:	Advanced text editor for TDE
 Group:		Applications/Text
 Requires:	%{name}-data = %{version}-%{release}
 Requires:	trinity-kwrite = %{version}-%{release}
@@ -943,7 +863,7 @@ Requires:	trinity-kate = %{version}-%{release}
 ##########
 
 %package -n trinity-kwrite
-Summary:	advanced text editor for TDE
+Summary:	Advanced text editor for TDE
 Group:		Applications/Utilities
 Requires:	%{name}-data = %{version}-%{release}
 Requires:	trinity-libkateinterfaces = %{version}-%{release}
@@ -959,7 +879,7 @@ Kwrite is a text editor for TDE.
 %{tde_libdir}/libtdeinit_kwrite.la
 %{tde_libdir}/libtdeinit_kwrite.so
 %{tde_tdeappdir}/kwrite.desktop
-%{tde_datadir}/apps/kwrite/kwriteui.rc
+%{tde_datadir}/apps/kwrite/
 %{tde_datadir}/icons/hicolor/*/apps/kwrite.png
 %{tde_datadir}/icons/hicolor/*/apps/kwrite2.svgz
 %{tde_tdedocdir}/HTML/en/kwrite/
@@ -982,7 +902,7 @@ update-desktop-database %{tde_appdir} 2> /dev/null || :
 ##########
 
 %package -n trinity-kcontrol
-Summary:	control center for TDE
+Summary:	Control center for TDE
 Group:		Applications/Utilities
 Requires:	%{name}-data = %{version}-%{release}
 
@@ -1058,8 +978,8 @@ plugdev group.
 %{tde_tdelibdir}/kcm_joystick.so
 %{tde_tdelibdir}/kcm_kded.la
 %{tde_tdelibdir}/kcm_kded.so
-%{tde_tdelibdir}/kcm_tdm.la
-%{tde_tdelibdir}/kcm_tdm.so
+%{tde_tdelibdir}/kcm_%{tdm}.la
+%{tde_tdelibdir}/kcm_%{tdm}.so
 %{tde_tdelibdir}/kcm_tdednssd.so
 %{tde_tdelibdir}/kcm_tdednssd.la
 %{tde_tdelibdir}/kcm_keys.la
@@ -1166,7 +1086,7 @@ plugdev group.
 %{tde_tdeappdir}/kcmusb.desktop
 %{tde_tdeappdir}/kcmview1394.desktop
 %{tde_tdeappdir}/KControl.desktop
-%{tde_tdeappdir}/tdm.desktop
+%{tde_tdeappdir}/%{tdm}.desktop
 %{tde_tdeappdir}/keys.desktop
 %{tde_tdeappdir}/tdefontview.desktop
 %{tde_tdeappdir}/tdehtml_behavior.desktop
@@ -1250,11 +1170,9 @@ plugdev group.
 %{tde_datadir}/icons/hicolor/*/apps/kcmkhtml_filter.png
 %{tde_datadir}/icons/hicolor/*/apps/kcmsmserver.png
 %{tde_datadir}/icons/hicolor/*/apps/kcmspellchecking.png
-%{tde_datadir}/icons/hicolor/*/apps/kcmkhtml_filter.png
-%{tde_datadir}/icons/hicolor/*/apps/kcmspellchecking.png
 
 %{tde_datadir}/apps/usb.ids
-%{tde_datadir}/apps/kcmview1394/oui.db
+%{tde_datadir}/apps/kcmview1394/
 
 # The following features are not compiled under RHEL 5 and older
 %if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
@@ -1305,7 +1223,7 @@ Requires:	trinity-kcontrol = %{version}-%{release}
 ##########
 
 %package bin
-Summary:	core binaries for the TDE base module
+Summary:	Core binaries for the TDE base module
 Group:		Applications/Utilities
 Requires:	%{name}-data = %{version}-%{release}
 Requires:	pam
@@ -1321,7 +1239,6 @@ TDE applications, particularly those in the TDE base module.
 %defattr(-,root,root,-)
 %{tde_bindir}/krootbacking
 %if 0%{?with_tsak}
-%attr(4511,root,root) %{tde_bindir}/tdmtsak
 %{tde_bindir}/tsak
 %endif
 %{tde_bindir}/compton-tde
@@ -1334,11 +1251,9 @@ TDE applications, particularly those in the TDE base module.
 %{tde_bindir}/crashtest
 %{tde_bindir}/kapplymousetheme
 %{tde_bindir}/kblankscrn.kss
-%attr(4755,root,root) %{tde_bindir}/kcheckpass
 %{tde_bindir}/kcminit
 %{tde_bindir}/kcminit_startup
 %{tde_bindir}/kdcop
-%attr(4755,root,root) %{tde_bindir}/tdekbdledsync
 %{tde_bindir}/tdesu
 %attr(0755,root,root) %{tde_bindir}/tdesud
 %{tde_bindir}/kdialog
@@ -1347,6 +1262,7 @@ TDE applications, particularly those in the TDE base module.
 %{tde_bindir}/krandom.kss
 %{tde_bindir}/ksystraycmd
 %{tde_bindir}/kxkb
+%dir %{tde_libdir}/tdeconf_update_bin
 %{tde_libdir}/tdeconf_update_bin/khotkeys_update
 %{tde_tdelibdir}/kcminit.la
 %{tde_tdelibdir}/kcminit.so
@@ -1388,7 +1304,7 @@ TDE applications, particularly those in the TDE base module.
 %{tde_datadir}/apps/tdeconf_update/khotkeys_32b1_update.upd
 %{tde_datadir}/apps/tdeconf_update/khotkeys_printscreen.upd
 %{tde_datadir}/apps/tdeconf_update/konqueror_gestures_trinity21_update.upd
-%{tde_datadir}/apps/kdcop/kdcopui.rc
+%{tde_datadir}/apps/kdcop/
 %{tde_datadir}/apps/khotkeys/
 %{tde_datadir}/services/kded/khotkeys.desktop
 %{tde_datadir}/services/kxkb.desktop
@@ -1402,6 +1318,22 @@ TDE applications, particularly those in the TDE base module.
 %{tde_tdedocdir}/HTML/en/knetattach/
 %{tde_tdedocdir}/HTML/en/kxkb/
 
+# SETUID binaries
+# Some setuid binaries need special care
+%if 0%{?suse_version}
+%if 0%{?with_tsak}
+%verify(not mode) %{tde_bindir}/%{tdm}tsak
+%endif
+%verify(not mode) %{tde_bindir}/kcheckpass
+%verify(not mode) %{tde_bindir}/tdekbdledsync
+%else
+%if 0%{?with_tsak}
+%attr(4511,root,root) %{tde_bindir}/%{tdm}tsak
+%endif
+%attr(4755,root,root) %{tde_bindir}/kcheckpass
+%attr(4755,root,root) %{tde_bindir}/tdekbdledsync
+%endif
+
 %post bin
 /sbin/ldconfig || :
 update-desktop-database %{tde_appdir} 2> /dev/null || : 
@@ -1437,7 +1369,7 @@ Provides:	tdebase-bin-devel = %{version}-%{release}
 ##########
 
 %package data
-Summary:	shared data files for the TDE base module
+Summary:	Shared data files for the TDE base module
 Group:		Environment/Libraries
 Requires:	%{name}-runtime-data-common = %{version}-%{release}
 
@@ -1464,11 +1396,11 @@ needed for a basic TDE desktop installation.
 %{tde_datadir}/applnk/.hidden/socks.desktop
 %{tde_datadir}/applnk/.hidden/userinfo.desktop
 %{tde_datadir}/applnk/.hidden/virtualdesktops.desktop
-%{tde_datadir}/apps/kaccess/eventsrc
-%{tde_datadir}/apps/kcmcss/template.css
+%{tde_datadir}/apps/kaccess/
+%{tde_datadir}/apps/kcmcss/
 %{tde_datadir}/apps/kcminput/
 %{tde_datadir}/apps/kcmkeys/
-%{tde_datadir}/apps/kcmlocale/pics/background.png
+%{tde_datadir}/apps/kcmlocale/
 %{tde_datadir}/apps/tdeconf_update/convertShortcuts.pl
 %{tde_datadir}/apps/tdeconf_update/tdeaccel.upd
 %{tde_datadir}/apps/tdeconf_update/kcmdisplayrc.upd
@@ -1478,7 +1410,7 @@ needed for a basic TDE desktop installation.
 %{tde_datadir}/apps/kcontrol/
 %{tde_datadir}/apps/tdedisplay/
 %{tde_datadir}/apps/tdefontview/
-%{tde_datadir}/apps/kthememanager/themes/*
+%{tde_datadir}/apps/kthememanager/
 %{tde_datadir}/icons/crystalsvg/*/apps/access.png
 %{tde_datadir}/icons/crystalsvg/*/apps/acroread.png
 %{tde_datadir}/icons/crystalsvg/*/apps/applixware.png
@@ -1505,7 +1437,7 @@ needed for a basic TDE desktop installation.
 %{tde_datadir}/icons/crystalsvg/*/apps/kcmpartitions.png
 %{tde_datadir}/icons/crystalsvg/*/apps/kcmpci.png
 %{tde_datadir}/icons/crystalsvg/*/apps/kcontrol.png
-%{tde_datadir}/icons/crystalsvg/*/apps/tdmconfig.png
+%{tde_datadir}/icons/crystalsvg/*/apps/%{tdm}config.png
 %{tde_datadir}/icons/crystalsvg/*/apps/key_bindings.png
 %{tde_datadir}/icons/crystalsvg/*/apps/kfm_home.png
 %{tde_datadir}/icons/crystalsvg/*/apps/tdescreensaver.png
@@ -1698,7 +1630,7 @@ needed for a basic TDE desktop installation.
 %{tde_datadir}/icons/crystalsvg/*/apps/wmaker_apps.png
 %{tde_datadir}/icons/crystalsvg/*/apps/qtella.png
 %{tde_datadir}/services/searchproviders
-%{tde_datadir}/services/useragentstrings/*.desktop
+%{tde_datadir}/services/useragentstrings/
 %{tde_datadir}/servicetypes/searchprovider.desktop
 %{tde_datadir}/servicetypes/uasprovider.desktop
 %exclude %{tde_datadir}/sounds/pop.wav
@@ -1713,7 +1645,6 @@ needed for a basic TDE desktop installation.
 
 %{tde_tdedocdir}/HTML/en/kcontrol/
 %exclude %{tde_tdedocdir}/HTML/en/kcontrol/kcmkonsole/
-#%{tde_tdedocdir}/HTML/en/kinfocenter/
 
 %post data
 for f in crystalsvg ; do
@@ -1746,11 +1677,14 @@ done
 ##########
 
 %package tdeio-plugins
-Summary:	core I/O slaves for TDE
+Summary:	Core I/O slaves for TDE
 Group:		Applications/Utilities
 Requires:	trinity-kdesktop = %{version}-%{release}
 Requires:	cyrus-sasl
 Requires:	psmisc
+%if 0%{?with_hal}
+Requires:	hal >= 0.5
+%endif
 %if 0%{?rhel} == 4 || 0%{?suse_version}
 Requires:	cryptsetup
 %else
@@ -1845,12 +1779,10 @@ group.
 %{tde_tdelibdir}/textthumbnail.la
 %{tde_tdelibdir}/textthumbnail.so
 %{tde_tdeappdir}/kcmcgi.desktop
-%{tde_datadir}/apps/tdeio_finger/tdeio_finger.css
-%{tde_datadir}/apps/tdeio_finger/tdeio_finger.pl
-%{tde_datadir}/apps/tdeio_info/kde-info2html
-%{tde_datadir}/apps/tdeio_info/kde-info2html.conf
-%{tde_datadir}/apps/tdeio_man/tdeio_man.css
-%{tde_datadir}/apps/systemview/*.desktop
+%{tde_datadir}/apps/tdeio_finger/
+%{tde_datadir}/apps/tdeio_info/
+%{tde_datadir}/apps/tdeio_man/
+%{tde_datadir}/apps/systemview/
 %{tde_datadir}/config.kcfg/mediamanagersettings.kcfg
 %{tde_datadir}/mimelnk/application/x-smb-server.desktop
 %{tde_datadir}/mimelnk/inode/system_directory.desktop
@@ -1918,7 +1850,7 @@ update-desktop-database %{tde_appdir} 2> /dev/null || :
 ##########
 
 %package -n trinity-tdepasswd
-Summary:	password changer for TDE
+Summary:	Password changer for TDE
 Group:		Applications/Utilities
 
 Obsoletes:	trinity-kdepasswd < %{version}-%{release}
@@ -1976,7 +1908,7 @@ update-desktop-database %{tde_tdeappdir} 2> /dev/null || :
 ##########
 
 %package -n trinity-tdeprint
-Summary:	print system for TDE
+Summary:	Print system for TDE
 Group:		Applications/Utilities
 Requires:	%{name}-data = %{version}-%{release}
 Requires:	psutils
@@ -2013,7 +1945,7 @@ Installation of smbclient will make you able to use smb shared printers.
 %{tde_datadir}/apps/tdeprint/
 %{tde_datadir}/apps/tdeprintfax/
 %{tde_datadir}/apps/kjobviewer/
-%{tde_datadir}/apps/tdeprint_part/tdeprint_part.rc
+%{tde_datadir}/apps/tdeprint_part/
 %{tde_datadir}/icons/hicolor/*/apps/tdeprintfax.png
 %{tde_datadir}/icons/hicolor/*/apps/kjobviewer.png
 %{tde_datadir}/icons/hicolor/*/apps/printmgr.png
@@ -2053,7 +1985,7 @@ done
 ##########
 
 %package -n trinity-kdesktop
-Summary:	miscellaneous binaries and files for the TDE desktop
+Summary:	Miscellaneous binaries and files for the TDE desktop
 Group:		Applications/Utilities
 Requires:	%{name}-bin = %{version}-%{release}
 Requires:	%{name}-data = %{version}-%{release}
@@ -2127,6 +2059,7 @@ Group:		Applications/Utilities
 Requires:	%{name}-bin = %{version}-%{release}
 Requires:	%{name}-data = %{version}-%{release}
 Requires:	pam
+Requires:	logrotate
 
 # Provides the global Xsession script (/etc/X11/xinit/Xsession or /etc/X11/Xsession)
 %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 4
@@ -2149,7 +2082,7 @@ Provides:	service(graphical-login)
 # Required for Mandriva's installer
 %if 0%{?mgaversion} || 0%{?mdkversion}
 Provides:	dm
-Provides:	tdm
+Provides:	%{tdm}
 %endif
 
 %description -n trinity-tdm
@@ -2172,30 +2105,34 @@ already. Most users won't need this.
 %defattr(-,root,root,-)
 %{tde_tdelibdir}/kgreet_pam.la
 %{tde_tdelibdir}/kgreet_pam.so
-%{tde_bindir}/gentdmconf
-%{tde_bindir}/tdm
-%{tde_bindir}/tdm_config
-%{tde_bindir}/tdmctl
-%{tde_bindir}/tdm_greet
+%{tde_bindir}/gen%{tdm}conf
+%{tde_bindir}/%{tdm}
+%{tde_bindir}/%{tdm}_config
+%{tde_bindir}/%{tdm}ctl
+%{tde_bindir}/%{tdm}_greet
 %{tde_bindir}/krootimage
-%{tde_datadir}/apps/tdm/pics/kdelogo.png
-%{tde_datadir}/apps/tdm/pics/shutdown.jpg
-%{tde_datadir}/apps/tdm/pics/users
-%{tde_datadir}/apps/tdm/sessions/*.desktop
-%{tde_datadir}/apps/tdm/themes/
-%{tde_datadir}/config/tdm
-%dir %{_sysconfdir}/trinity/tdm
+%dir %{tdm_datadir}
+%dir %{tdm_datadir}/pics
+%{tdm_datadir}/pics/kdelogo.png
+%{tdm_datadir}/pics/shutdown.jpg
+%{tdm_datadir}/pics/users
+%dir %{tdm_datadir}/sessions
+%{tdm_datadir}/sessions/*.desktop
+%{tdm_datadir}/themes/
+%{tde_datadir}/config/%{tdm}
+%dir %{_sysconfdir}/trinity/%{tdm}
 %if 0%{?with_selinux_policy}
-%exclude %{?_sysconfdir}/trinity/tdm/tdm.pp
+%exclude %{?_sysconfdir}/trinity/%{tdm}/tdm.pp
 %endif
-%config(noreplace) %{_sysconfdir}/trinity/tdm/*
-%{tde_tdedocdir}/HTML/en/tdm/
+%config(noreplace) %{_sysconfdir}/trinity/%{tdm}/*
+%{tde_tdedocdir}/HTML/en/%{tdm}/
 %if 0%{?suse_version} == 0
 %config(noreplace) %{_sysconfdir}/pam.d/tdm-trinity
 %config(noreplace) %{_sysconfdir}/pam.d/tdm-trinity-np
 %endif
 
 # XDG user faces
+%dir %{_datadir}/faces
 %{_datadir}/faces/default1.png
 %{_datadir}/faces/default2.png
 %{_datadir}/faces/default3.png
@@ -2224,34 +2161,34 @@ already. Most users won't need this.
 
 # SELINUX policy
 %if 0%{?with_selinux_policy}
-%{?_sysconfdir}/trinity/tdm/tdm.pp
+%{?_sysconfdir}/trinity/%{tdm}/tdm.pp
 %endif
 
 # Logrotate configuration
-%{_sysconfdir}/logrotate.d/tdm
+%config %{_sysconfdir}/logrotate.d/tdm
 
 %pre -n trinity-tdm
 # Make sure that TDM configuration files are now under '/etc/trinity/tdm'
-if [ -d "%{tde_datadir}/config/tdm" ] && [ ! -L "%{tde_datadir}/config/tdm" ]; then
-  if [ -d "%{_sysconfdir}/trinity/tdm" ]; then
-    # If there is already something under '/etc/trinity/tdm', simply delete old configuration
-    echo "Deleting TDM configuration under '%{tde_datadir}/config/tdm'"
-    rm -rf "%{tde_datadir}/config/tdm"
+if [ -d "%{tde_datadir}/config/%{tdm}" ] && [ ! -L "%{tde_datadir}/config/%{tdm}" ]; then
+  if [ -d "%{_sysconfdir}/trinity/%{tdm}" ]; then
+    # If there is already something under '/etc/trinity/%{tdm}', simply delete old configuration
+    echo "Deleting TDM configuration under '%{tde_datadir}/config/%{tdm}'"
+    rm -rf "%{tde_datadir}/config/%{tdm}"
   else
     # Else, move '/opt/trinity/share/config/tdm' to '/etc/trinity/tdm'
     if [ ! -d "%{_sysconfdir}/trinity" ]; then
       mkdir -p "%{_sysconfdir}/trinity"
     fi
-    echo "Migrating TDM configuration from '%{tde_datadir}/config/tdm' to '%{_sysconfdir}/trinity/tdm'"
-    mv -f "%{tde_datadir}/config/tdm" "%{_sysconfdir}/trinity/tdm.migr"
+    echo "Migrating TDM configuration from '%{tde_datadir}/config/%{tdm}' to '%{_sysconfdir}/trinity/%{tdm}'"
+    mv -f "%{tde_datadir}/config/%{tdm}" "%{_sysconfdir}/trinity/%{tdm}.migr"
   fi
 fi
 
 # Remove actual directory before creating a symlink
-if [ ! -L "%{tde_datadir}/apps/tdm/pics/users" ]; then
+if [ ! -L "%{tdm_datadir}/pics/users" ]; then
   [ -d "%{_datadir}/faces" ] || mkdir -p "%{_datadir}/faces"
-  cp -f "%{tde_datadir}/apps/tdm/pics/users/"* "%{_datadir}/faces"
-  rm -rf "%{tde_datadir}/apps/tdm/pics/users"
+  cp -f "%{tdm_datadir}/pics/users/"* "%{_datadir}/faces"
+  rm -rf "%{tdm_datadir}/pics/users"
 fi
 
 %post -n trinity-tdm
@@ -2259,19 +2196,19 @@ fi
 %make_session
 %endif
 %if 0%{?with_selinux_policy}
-/usr/sbin/semodule -i "%{?_sysconfdir}/trinity/tdm/tdm.pp"
+/usr/sbin/semodule -i "%{?_sysconfdir}/trinity/%{tdm}/tdm.pp"
 %endif
 
 # Sets default user icon in TDM
-if [ ! -r "%{tde_datadir}/apps/tdm/faces/.default.face.icon" ]; then
-  [ -d "%{tde_datadir}/apps/tdm/faces" ] || mkdir -p "%{tde_datadir}/apps/tdm/faces"
-  %__cp -f "%{tde_datadir}/apps/tdm/pics/users/default2.png" "%{tde_datadir}/apps/tdm/faces/.default.face.icon"
+if [ ! -r "%{tdm_datadir}/faces/.default.face.icon" ]; then
+  [ -d "%{tdm_datadir}/faces" ] || mkdir -p "%{tdm_datadir}/faces"
+  cp -f "%{tdm_datadir}/pics/users/default2.png" "%{tdm_datadir}/faces/.default.face.icon"
 fi
 
 # Sets default language for TDM
 if [ "$1" = "1" ]; then
   if [ -n "${LANG}" ] && [ "${LANG}" != "C" ]; then
-    %__sed -i "%{_sysconfdir}/trinity/tdm/tdmrc" -e "s|^#*Language=.*|Language=${LANG}|"
+    sed -i "%{_sysconfdir}/trinity/%{tdm}/%{tdm}rc" -e "s|^#*Language=.*|Language=${LANG}|"
   fi
 fi
 
@@ -2283,9 +2220,9 @@ fi
 
 %posttrans -n trinity-tdm
 # Make sure that TDM configuration files are now under '/etc/trinity/tdm'
-if [ -d "%{_sysconfdir}/trinity/tdm.migr" ] && [ -d "%{_sysconfdir}/trinity/tdm" ]; then
-  %__mv -f "%{_sysconfdir}/trinity/tdm.migr/"* "%{_sysconfdir}/trinity/tdm/"
-  rmdir "%{_sysconfdir}/trinity/tdm.migr/"
+if [ -d "%{_sysconfdir}/trinity/%{tdm}.migr" ] && [ -d "%{_sysconfdir}/trinity/%{tdm}" ]; then
+  mv -f "%{_sysconfdir}/trinity/%{tdm}.migr/"* "%{_sysconfdir}/trinity/%{tdm}/"
+  rmdir "%{_sysconfdir}/trinity/%{tdm}.migr/"
 fi
 
 %postun -n trinity-tdm
@@ -2310,7 +2247,7 @@ Requires:	trinity-tdm = %{version}-%{release}
 ##########
 
 %package -n trinity-kfind
-Summary:	file-find utility for TDE
+Summary:	File-find utility for TDE
 Group:		Applications/Utilities
 Requires:	%{name}-data = %{version}-%{release}
 
@@ -2347,7 +2284,7 @@ done
 ##########
 
 %package -n trinity-khelpcenter
-Summary:	help center for TDE
+Summary:	Help center for TDE
 Group:		Applications/Utilities
 Requires:	%{name}-data = %{version}-%{release}
 Requires:	htdig
@@ -2396,7 +2333,7 @@ done
 ##########
 
 %package -n trinity-kicker
-Summary:	desktop panel for TDE
+Summary:	Desktop panel for TDE
 Group:		Applications/Utilities
 Requires:	%{name}-data = %{version}-%{release}
 
@@ -2481,15 +2418,14 @@ functionality.
 %{tde_datadir}/applnk/.hidden/kicker_config_arrangement.desktop
 %{tde_datadir}/applnk/.hidden/kicker_config_hiding.desktop
 %{tde_datadir}/applnk/.hidden/kicker_config_menus.desktop
-%{tde_datadir}/apps/clockapplet/pics/lcd.png
+%{tde_datadir}/apps/clockapplet/
 %{tde_datadir}/apps/tdeconf_update/kicker-3.1-properSizeSetting.pl
 %{tde_datadir}/apps/tdeconf_update/kicker-3.5-taskbarEnums.pl
 %{tde_datadir}/apps/tdeconf_update/kickerrc.upd
 %{tde_datadir}/apps/kicker/
 %exclude %{tde_datadir}/apps/kicker/applets/klipper.desktop
 %exclude %{tde_datadir}/apps/kicker/applets/ksysguardapplet.desktop
-%{tde_datadir}/apps/naughtyapplet/pics/naughty-happy.png
-%{tde_datadir}/apps/naughtyapplet/pics/naughty-sad.png
+%{tde_datadir}/apps/naughtyapplet/
 %{tde_datadir}/autostart/panel.desktop
 %{tde_datadir}/config.kcfg/kickerSettings.kcfg
 %{tde_datadir}/config.kcfg/launcherapplet.kcfg
@@ -2561,7 +2497,7 @@ Requires:	trinity-kicker = %{version}-%{release}
 ##########
 
 %package -n trinity-klipper
-Summary:	clipboard utility for Trinity
+Summary:	Clipboard utility for Trinity
 Group:		Applications/Utilities
 Requires:	%{name}-data = %{version}-%{release}
 
@@ -2610,7 +2546,7 @@ done
 ##########
 
 %package -n trinity-kmenuedit
-Summary:	menu editor for TDE
+Summary:	Menu editor for TDE
 Group:		Applications/Utilities
 Requires:	%{name}-data = %{version}-%{release}
 
@@ -2739,15 +2675,15 @@ ever launching another application.
 %{tde_datadir}/apps/tdeconf_update/kfmclient_3_2_update.sh
 %{tde_datadir}/apps/tdeconf_update/konqsidebartng.upd
 %{tde_datadir}/apps/tdeconf_update/move_konqsidebartng_entries.sh
-%{tde_datadir}/apps/keditbookmarks/keditbookmarks-genui.rc
-%{tde_datadir}/apps/keditbookmarks/keditbookmarksui.rc
-%{tde_datadir}/apps/tdehtml/kpartplugins/tdehtmlkttsd.desktop
-%{tde_datadir}/apps/tdehtml/kpartplugins/tdehtmlkttsd.rc
+%{tde_datadir}/apps/keditbookmarks/
+%{tde_datadir}/apps/tdehtml/kpartplugins/
 %{tde_datadir}/apps/konqiconview/
 %{tde_datadir}/apps/konqlistview/
 %exclude %{tde_datadir}/apps/konqsidebartng/virtual_folders/services/fonts.desktop
 %{tde_datadir}/apps/konqsidebartng/
 %{tde_datadir}/apps/konqueror/about/
+%dir %{tde_datadir}/apps/konqueror/dirtree
+%dir %{tde_datadir}/apps/konqueror/dirtree/remote
 %{tde_datadir}/apps/konqueror/icons/
 %{tde_datadir}/apps/konqueror/konq-simplebrowser.rc
 %{tde_datadir}/apps/konqueror/konqueror.rc
@@ -2761,7 +2697,7 @@ ever launching another application.
 %exclude %{tde_datadir}/apps/konqueror/servicemenus/installfont.desktop
 %{tde_datadir}/apps/konqueror/servicemenus/*.desktop
 %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase
-%{tde_datadir}/apps/konqueror/tiles/*.png
+%{tde_datadir}/apps/konqueror/tiles/
 %{tde_datadir}/autostart/konqy_preload.desktop
 %{tde_datadir}/config.kcfg/keditbookmarks.kcfg
 %{tde_datadir}/config.kcfg/konq_listview.kcfg
@@ -2907,7 +2843,7 @@ Using Konsole, a user can open:
 %{tde_datadir}/servicetypes/terminalemulator.desktop
 %{tde_tdedocdir}/HTML/en/konsole/
 %{tde_tdedocdir}/HTML/en/kcontrol/kcmkonsole/
-%{_sysconfdir}/fonts/conf.d/99-konsole.conf
+%config %{_sysconfdir}/fonts/conf.d/99-konsole.conf
 
 %post -n trinity-konsole
 update-desktop-database %{tde_appdir} 2> /dev/null || : 
@@ -2928,7 +2864,7 @@ done
 ##########
 
 %package -n trinity-kpager
-Summary:	desktop pager for TDE
+Summary:	Desktop pager for TDE
 Group:		Applications/Utilities
 Requires:	%{name}-data = %{version}-%{release}
 
@@ -2962,7 +2898,7 @@ done
 ##########
 
 %package -n trinity-kpersonalizer
-Summary:	installation personalizer for TDE
+Summary:	Installation personalizer for TDE
 Group:		Applications/Utilities
 Requires:	%{name}-data = %{version}-%{release}
 
@@ -2997,7 +2933,7 @@ done
 ##########
 
 %package -n trinity-ksmserver
-Summary:	session manager for TDE
+Summary:	Session manager for TDE
 Group:		Applications/Utilities
 Requires:	%{name}-data = %{version}-%{release}
 Requires:	trinity-twin = %{version}-%{release}
@@ -3016,7 +2952,7 @@ TDE will start, but many good defaults will not be set.
 %files -n trinity-ksmserver
 %defattr(-,root,root,-)
 %{tde_bindir}/ksmserver
-%{tde_bindir}/starttde
+%{tde_bindir}/%{starttde}
 %{tde_bindir}/migratekde3
 %{tde_bindir}/r14-xdg-update
 %{tde_bindir}/tdeinit_displayconfig
@@ -3027,8 +2963,7 @@ TDE will start, but many good defaults will not be set.
 %{tde_libdir}/libtdeinit_ksmserver.so
 %{tde_datadir}/apps/tdeconf_update/ksmserver.upd
 %{tde_datadir}/apps/tdeconf_update/move_session_config.sh
-%{tde_datadir}/apps/ksmserver/pics/shutdown.png
-%{tde_datadir}/apps/ksmserver/pics/shutdownkonq.png
+%{tde_datadir}/apps/ksmserver/
 
 %post -n trinity-ksmserver
 /sbin/ldconfig || :
@@ -3045,7 +2980,7 @@ fndSession
 ##########
 
 %package -n trinity-ksplash
-Summary:	the TDE splash screen
+Summary:	The TDE splash screen
 Group:		Applications/Utilities
 Requires:	%{name}-data = %{version}-%{release}
 
@@ -3098,7 +3033,7 @@ Requires:	trinity-ksplash = %{version}-%{release}
 
 %files -n trinity-ksplash-devel
 %defattr(-,root,root,-)
-%{tde_tdeincludedir}/ksplash/*
+%{tde_tdeincludedir}/ksplash/
 %{tde_libdir}/libksplashthemes.la
 %{tde_libdir}/libksplashthemes.so
 
@@ -3111,7 +3046,7 @@ Requires:	trinity-ksplash = %{version}-%{release}
 ##########
 
 %package -n trinity-ksysguard
-Summary:	system guard for TDE
+Summary:	System guard for TDE
 Group:		Applications/Utilities
 Requires:	%{name}-data = %{version}-%{release}
 Requires:	trinity-ksysguardd = %{version}-%{release}
@@ -3162,7 +3097,7 @@ Requires:	trinity-ksysguard = %{version}-%{release}
 
 %files -n trinity-ksysguard-devel
 %defattr(-,root,root,-)
-%{tde_tdeincludedir}/ksgrd/*
+%{tde_tdeincludedir}/ksgrd/
 %{tde_libdir}/libksgrd.la
 %{tde_libdir}/libksgrd.so
 
@@ -3175,7 +3110,7 @@ Requires:	trinity-ksysguard = %{version}-%{release}
 ##########
 
 %package -n trinity-ksysguardd
-Summary:	system guard daemon for TDE
+Summary:	System guard daemon for TDE
 Group:		Applications/Utilities
 Requires:	%{name}-data = %{version}-%{release}
 
@@ -3204,8 +3139,7 @@ ktip provides many useful tips on using TDE when you log in.
 %{tde_bindir}/ktip
 %{tde_tdeappdir}/ktip.desktop
 %{tde_datadir}/applnk/Toys/ktip.desktop
-%{tde_datadir}/apps/tdewizard/pics/wizard_small.png
-%{tde_datadir}/apps/tdewizard/tips
+%{tde_datadir}/apps/tdewizard/
 %{tde_datadir}/autostart/ktip.desktop
 %{tde_datadir}/icons/hicolor/*/apps/ktip.*
 
@@ -3226,7 +3160,7 @@ done
 ##########
 
 %package -n trinity-twin
-Summary:	the TDE window manager
+Summary:	The TDE window manager
 Group:		Applications/Utilities
 Requires:	%{name}-data = %{version}-%{release}
 
@@ -3324,7 +3258,7 @@ Requires:	trinity-twin = %{version}-%{release}
 ##########
 
 %package -n trinity-libkonq
-Summary:	core libraries for Konqueror
+Summary:	Core libraries for Konqueror
 Group:		Environment/Libraries
 
 %description -n trinity-libkonq
@@ -3338,9 +3272,10 @@ Konqueror and the kdesktop package.
 %{tde_tdelibdir}/konq_sound.la
 %{tde_tdelibdir}/konq_sound.so
 %{tde_libdir}/libkonq.so.*
-%{tde_datadir}/apps/kbookmark/directory_bookmarkbar.desktop
+%{tde_datadir}/apps/kbookmark/
 %{tde_datadir}/apps/tdeconf_update/favicons.upd
 %{tde_datadir}/apps/tdeconf_update/move_favicons.sh
+%dir %{tde_datadir}/apps/konqueror/pics
 %{tde_datadir}/apps/konqueror/pics/arrow_bottomleft.png
 %{tde_datadir}/apps/konqueror/pics/arrow_bottomright.png
 %{tde_datadir}/apps/konqueror/pics/arrow_topleft.png
@@ -3369,6 +3304,7 @@ These libraries allow you to use TDE dialogs in native TQt3 applications.
 
 %files libtqt3-integration
 %defattr(-,root,root,-)
+%dir %{tde_tdelibdir}/plugins/integration
 %{tde_tdelibdir}/plugins/integration/libqtkde.la
 %{tde_tdelibdir}/plugins/integration/libqtkde.so
 %{tde_tdelibdir}/plugins/integration/libqtkde.so.*
@@ -3379,7 +3315,7 @@ These libraries allow you to use TDE dialogs in native TQt3 applications.
 ##########
 
 %package -n trinity-libkonq-devel
-Summary:	development files for Konqueror's core libraries
+Summary:	Development files for Konqueror's core libraries
 Group:		Development/Libraries
 Requires:	trinity-libkonq = %{version}-%{release}
 
@@ -3423,6 +3359,7 @@ Windows and Samba shares.
 %{tde_tdelibdir}/tdeio_smb.so
 %{tde_datadir}/services/smb.protocol
 %{tde_datadir}/apps/konqueror/dirtree/remote/smb-network.desktop
+%dir %{tde_datadir}/apps/remoteview
 %{tde_datadir}/apps/remoteview/smb-network.desktop
 %{tde_datadir}/mimelnk/application/x-smb-workgroup.desktop
 
@@ -3440,40 +3377,28 @@ Windows and Samba shares.
 # Applies an optional distro-specific graphical theme
 %if "%{?tde_bg}" != ""
 # TDM Background
-%__sed -i "tdm/kfrontend/gentdmconf.c" \
+%__sed -i "%{tdm}/kfrontend/gen%{tdm}conf.c" \
 	-e 's|"Wallpaper=isadora.png\n"|"Wallpaper=%{tde_bg}\n"|'
 
 # TDE user default background
 %__sed -i "kpersonalizer/keyecandypage.cpp" \
 	-e 's|#define DEFAULT_WALLPAPER "isadora.png"|#define DEFAULT_WALLPAPER "%{tde_bg}"|'
-%__sed -i "starttde" \
+%__sed -i "%{starttde}" \
 	-e 's|/usr/share/wallpapers/isadora.png.desktop|%{tde_bg}|' \
 	-e 's|Wallpaper=isadora.png|Wallpaper=%{tde_bg}|'
 %endif
 
-# TDE branding: removes KUbuntu references [Bug #617]
-%__sed -i "kcontrol/tdm/tdm-appear.cpp" \
-	-e "s|Welcome to Kubuntu |Welcome to %{tde_aboutlabel} |"
-%__sed -i "konqueror/about/konq_aboutpage.cc" \
-	-e "s|About Kubuntu|About %{tde_aboutlabel}|" \
-	-e "s|help:/kubuntu/|%{tde_aboutpage}|" \
-	-e "s|Kubuntu Documentation|%{tde_aboutlabel} Documentation|"
-%__sed -i "konqueror/about/launch.html" \
-	-e "s|help:/kubuntu/about-kubuntu/index.html|%{tde_aboutpage}|"
-%__sed -i "tdm/config.def" \
-	-e "s|Welcome to Trinity |Welcome to %{tde_aboutlabel} |"
-
 # TDE default directory and icon in startup script
-%__sed -i "starttde" \
+%__sed -i "%{starttde}" \
 	-e "s|/opt/trinity|%{tde_prefix}|g" \
 	-e "s|%%{tde_starticon}|%{tde_starticon}|g"
 
 # Xsession script location may vary on some distro
 %if 0%{?rhel} || 0%{?fedora}
-%__sed -i "tdm/kfrontend/gentdmconf.c" -e "s|/etc/X11/Xsession|/etc/X11/xinit/Xsession|"
+%__sed -i "%{tdm}/kfrontend/gen%{tdm}conf.c" -e "s|/etc/X11/Xsession|/etc/X11/xinit/Xsession|"
 %endif
 %if 0%{?suse_version}
-%__sed -i "tdm/kfrontend/gentdmconf.c" -e "s|/etc/X11/Xsession|/etc/X11/xdm/Xsession|"
+%__sed -i "%{tdm}/kfrontend/gen%{tdm}conf.c" -e "s|/etc/X11/Xsession|/etc/X11/xdm/Xsession|"
 %endif
 
 # Reboot command location may vary on some distributions
@@ -3483,9 +3408,9 @@ if [ -x "/usr/bin/reboot" ]; then
 fi
 if [ -n "${REBOOT}" ]; then
   %__sed -i \
-    "doc/tdm/tdmrc-ref.docbook" \
-    "kcontrol/tdm/tdm-shut.cpp" \
-    "tdm/config.def" \
+    "doc/%{tdm}/%{tdm}rc-ref.docbook" \
+    "kcontrol/%{tdm}/%{tdm}-shut.cpp" \
+    "%{tdm}/config.def" \
   -e "s|/sbin/poweroff|${POWEROFF}|g" \
   -e "s|/sbin/reboot|${REBOOT}|g"
 fi
@@ -3608,21 +3533,21 @@ fi
 # Under RHEL/Fedora/Suse, static 'xsessions' files go to '/usr/share/xsessions'.
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
 %__install -D -m 644 \
-	"%{?buildroot}%{tde_datadir}/apps/tdm/sessions/tde.desktop" \
+	"%{?buildroot}%{tdm_datadir}/sessions/tde.desktop" \
 	"%{?buildroot}%{_datadir}/xsessions/tde.desktop"
 %endif
 
 # Mageia/Mandriva/PCLinuxOS stores its session file in different folder than RHEL/Fedora
-# Generated files for TDM go to '/usr/share/xsessions'
+# Generated files for TDM/KDM4 go to '/usr/share/apps/kdm/sessions'
 %if 0%{?mgaversion} || 0%{?mdkversion}
 %__install -d -m 755 %{?buildroot}%{_sysconfdir}/X11/wmsession.d
 cat <<EOF >"%{?buildroot}%{_sysconfdir}/X11/wmsession.d/45TDE"
 NAME=TDE
 ICON=kde-wmsession.xpm
 DESC=The Trinity Desktop Environment
-EXEC=%{tde_bindir}/starttde
+EXEC=%{tde_bindir}/%{starttde}
 SCRIPT:
-exec %{tde_bindir}/starttde
+exec %{tde_bindir}/%{starttde}
 EOF
 
 %__install -d -m 755 %{?buildroot}%{_datadir}/X11/dm.d
@@ -3630,7 +3555,7 @@ cat <<EOF >"%{?buildroot}%{_datadir}/X11/dm.d/45TDE.conf"
 NAME=TDM
 DESCRIPTION=TDM (Trinity Display Manager)
 PACKAGE=trinity-tdm
-EXEC=%{tde_bindir}/tdm
+EXEC=%{tde_bindir}/%{tdm}
 %if 0%{?pclinuxos}
 FNDSESSION_EXEC="/usr/sbin/chksession -k"
 %else
@@ -3648,7 +3573,7 @@ EOF
 %endif
 
 # TDM configuration
-%__sed -i "%{?buildroot}%{_sysconfdir}/trinity/tdm/tdmrc" \
+%__sed -i "%{?buildroot}%{_sysconfdir}/trinity/%{tdm}/%{tdm}rc" \
 %if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7
 	-e "s/^#*MinShowUID=.*/MinShowUID=1000/"
 %else
@@ -3682,11 +3607,11 @@ EOF
 
 # Symlink TDM configuration
 %__mkdir_p "%{?buildroot}%{tde_datadir}/config"
-%__ln_s "%{_sysconfdir}/trinity/tdm" "%{?buildroot}%{tde_datadir}/config/tdm"
+%__ln_s "%{_sysconfdir}/trinity/%{tdm}" "%{?buildroot}%{tde_datadir}/config/%{tdm}"
 
 # SELINUX policy for RHEL / Fedora
 %if 0%{?with_selinux_policy}
-%__install -D -m 644 "%{SOURCE8}" "%{?buildroot}%{?_sysconfdir}/trinity/tdm/tdm.pp"
+%__install -D -m 644 "%{SOURCE8}" "%{?buildroot}%{?_sysconfdir}/trinity/%{tdm}/tdm.pp"
 %endif
 
 # Mageia icon for TDE menu
@@ -3724,10 +3649,10 @@ EOF
 # Move faces icon to XDG directory '/usr/share/faces'
 if [ ! -d "%{?buildroot}%{_datadir}/faces" ]; then
   %__mkdir_p "%{?buildroot}%{_datadir}/faces"
-  %__mv -f "%{?buildroot}%{tde_datadir}/apps/tdm/pics/users/"* "%{?buildroot}%{_datadir}/faces"
-  rmdir "%{?buildroot}%{tde_datadir}/apps/tdm/pics/users"
+  %__mv -f "%{?buildroot}%{tdm_datadir}/pics/users/"* "%{?buildroot}%{_datadir}/faces"
+  rmdir "%{?buildroot}%{tdm_datadir}/pics/users"
 fi
-%__ln_s "%{_datadir}/faces" "%{?buildroot}%{tde_datadir}/apps/tdm/pics/users"
+%__ln_s "%{_datadir}/faces" "%{?buildroot}%{tdm_datadir}/pics/users"
 
 # Adds missing icons in 'hicolor' theme
 # These icons are copied from 'crystalsvg' theme, provided by 'tdelibs'.
@@ -3797,11 +3722,30 @@ for i in ksysguard tde-kcontrol tdefontview showdesktop; do
   echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/${i}.desktop"
 done
 
+# Remove setuid bit on some binaries.
+%if 0%{?with_tsak}
+chmod 0511 "%{?buildroot}%{tde_bindir}/%{tdm}tsak"
+%endif
+chmod 0755 "%{?buildroot}%{tde_bindir}/kcheckpass"
+chmod 0755 "%{?buildroot}%{tde_bindir}/tdekbdledsync"
+
+
 
 %clean
 %__rm -rf %{?buildroot}
 
 
+%if 0%{?suse_version}
+# Check permissions on setuid files (openSUSE specific)
+%verifyscript
+%if 0%{?with_tsak}
+%verify_permissions -e %{tde_bindir}/%{tdm}tsak
+%endif
+%verify_permissions -e %{tde_bindir}/kcheckpass
+%verify_permissions -e %{tde_bindir}/tdekbdledsync
+%endif
+
+
 %changelog
 * Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
 - Initial release for TDE 14.0.0
diff --git a/redhat/tdebase/tdebase-3.5.13.2.spec b/redhat/tdebase/tdebase-3.5.13.2.spec
index 36302b99c..c349bc37e 100644
--- a/redhat/tdebase/tdebase-3.5.13.2.spec
+++ b/redhat/tdebase/tdebase-3.5.13.2.spec
@@ -1,77 +1,86 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
+#
+# spec file for package tdebase (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_epoch 1
 %define tde_version 3.5.13.2
-
-# TDE specific building variables
+%define tde_pkg tdebase
+%define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
-
 %define tde_tdeappdir %{tde_datadir}/applications/kde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
-# Older RHEL/Fedora versions use packages named "qt", "qt-devel", ..
-# whereas newer versions use "qt3", "qt3-devel" ...
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 8 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define _qt_suffix 3
+%define tdm kdm
+%define tdm_datadir %{tde_datadir}/apps/%{tdm}
+%define starttde startkde
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?tde_prefix}" != "/usr"
+%define _variant .opt
 %endif
 
 
-Name:		trinity-tdebase
-Version:	%{tde_version}
-Release:	%{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant}
-License:	GPL
-Summary:	Trinity Base Programs
-Group:		User Interface/Desktops
+Name:			trinity-%{tde_pkg}
+Version:		%{tde_version}
+Release:		%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
+Summary:		Trinity Base Programs
+Group:			User Interface/Desktops
+URL:			http://www.trinitydesktop.org/
 
-Obsoletes:	trinity-kdebase < %{version}-%{release}
-Provides:	trinity-kdebase = %{version}-%{release}
-Obsoletes:	trinity-kdebase-libs < %{version}-%{release}
-Provides:	trinity-kdebase-libs = %{version}-%{release}
-Obsoletes:	trinity-kdebase-extras < %{version}-%{release}
-Provides:	trinity-kdebase-extras = %{version}-%{release}
-Obsoletes:	tdebase < %{version}-%{release}
-Provides:	tdebase = %{version}-%{release}
-
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
+%if 0%{?suse_version}
+License:		GPL-2.0+
+%else
+License:		GPLv2+
+%endif
 
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+#Vendor:			Trinity Desktop
+#Packager:		Francois Andriot <francois.andriot@free.fr>
 
-Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+Prefix:			%{tde_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# Wrapper script to prevent Plasma launch at Trinity Startup
-Source1:	plasma-desktop
+Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+Source1:		trinity-tdebase-rpmlintrc
 
 # Pam configuration files for RHEL / Fedora
 %if 0%{?suse_version} == 0
-Source2:	pamd.kdm-trinity%{?dist}
-Source3:	pamd.kdm-trinity-np%{?dist}
-Source4:	pamd.kcheckpass-trinity%{?dist}
-Source5:	pamd.kscreensaver-trinity%{?dist}
+Source2:		pamd.kdm-trinity%{?dist}
+Source3:		pamd.kdm-trinity-np%{?dist}
+Source4:		pamd.kcheckpass-trinity%{?dist}
+Source5:		pamd.kscreensaver-trinity%{?dist}
 %endif
 
 # openSUSE: configuration file for TDM
-Source6:	suse-displaymanagers-tdm
+Source6:		suse-displaymanagers-tdm
 
 # Fedora 18: use SYSTEMD for TDM startup
 %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
-Source7:	tdm.service%{?dist}
+Source7:		tdm.service%{?dist}
 %endif
 
 # openSUSE 11.4: overwrite distribution-provided '/etc/init.d/xdm' !!!
 %if 0%{?suse_version} == 1140
-Source7:	xdm.oss114
+Source7:		xdm.oss114
 %endif
 
 # Fedora >= 17: special selinux policy required for TDM
@@ -90,6 +99,21 @@ Source8:	tdm%{?dist}.pp
 Source9:	mgabutton.svg
 %endif
 
+Obsoletes:	trinity-kdebase < %{version}-%{release}
+Provides:	trinity-kdebase = %{version}-%{release}
+Obsoletes:	trinity-kdebase-libs < %{version}-%{release}
+Provides:	trinity-kdebase-libs = %{version}-%{release}
+Obsoletes:	trinity-kdebase-extras < %{version}-%{release}
+Provides:	trinity-kdebase-extras = %{version}-%{release}
+Obsoletes:	tdebase < %{version}-%{release}
+Provides:	tdebase = %{version}-%{release}
+
+%if 0%{?suse_version}
+# for set_permissions macro
+PreReq: permissions
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
 
 ### Distribution-specific settings ###
 
@@ -307,19 +331,35 @@ Requires:	opensuse-manuals_en
 %define tde_aboutpage /usr/share/doc/manual/opensuse-manuals_en/book.opensuse.startup.html
 %endif
 
-BuildRequires:	cmake >= 2.8
-BuildRequires:	qt%{?_qt_suffix}-devel >= 3.3.8.d
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
+BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+
+BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
 BuildRequires:	make
+
+# HTDIG support
+BuildRequires:	htdig
+
+# OPENSSL support
 BuildRequires:	openssl-devel
+
+# AUDIOFILE support
 BuildRequires:	audiofile-devel
+
+# ALSA supportl
 BuildRequires:	alsa-lib-devel
+
+# RAW1394 support
 BuildRequires:	libraw1394-devel
+
+# VORBIS support
 BuildRequires:	libvorbis-devel
+
+# GLIB2 support
 BuildRequires:	glib2-devel
+
+# PCRE support
 BuildRequires:	pcre-devel
 
 # SASL support
@@ -345,6 +385,16 @@ BuildRequires:	libusb-devel
 BuildRequires:	esound-devel
 %endif
 
+# IDN support
+BuildRequires:	libidn-devel
+
+# GAMIN support
+#  Not on openSUSE.
+%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_gamin 1
+BuildRequires:	gamin-devel
+%endif
+
 # OPENLDAP support
 %if 0%{?suse_version}
 BuildRequires:	openldap2-devel
@@ -362,9 +412,9 @@ BuildRequires:	libsensors4-devel
 
 # TSAK support (requires libudev-devel)
 #  On RHEL5, udev is built statically, so TSAK cannot build.
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
-%define with_tsak 1
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
 BuildRequires:	libudev-devel
+%define with_tsak 1
 %endif
 
 # XRANDR support
@@ -383,7 +433,7 @@ BuildRequires:	libudev-devel
 #  On RHEL4, we do not use HAL (too old)
 %if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
 %define with_hal 1
-BuildRequires:	hal-devel >= 0.4.8
+BuildRequires:	hal-devel >= 0.5
 %endif
 
 # OPENEXR support
@@ -395,7 +445,7 @@ BuildRequires:	OpenEXR-devel
 
 # XSCREENSAVER support
 #  Disabled on RHEL4, RHEL >= 7
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
+%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 7 || 0%{?suse_version} || 0%{?with_xscreensaver}
 %if 0%{?rhel} == 0 || 0%{?rhel} <= 6
 %define with_xscreensaver 1
 %if 0%{?rhel} == 5
@@ -412,6 +462,9 @@ BuildRequires:	%{_lib}xscrnsaver%{?mgaversion:1}-devel
 %if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} >= 1220
 BuildRequires:	xscreensaver
 BuildRequires:	libXScrnSaver-devel
+%if 0%{?suse_version}
+BuildRequires:	xscreensaver-data-extra
+%endif
 %endif
 %if 0%{?suse_version} == 1140
 BuildRequires:	xscreensaver
@@ -422,15 +475,20 @@ BuildRequires:	xscreensaver
 # AVAHI support
 #  Disabled on RHEL4 and RHEL5
 %if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
-BuildRequires:	trinity-avahi-tqt-devel
-Requires:		trinity-avahi-tqt
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}avahi-client-devel
-Requires:		%{_lib}avahi-client3
-%else
-BuildRequires:	avahi-devel
-Requires:		avahi
+BuildRequires:	libavahi-tqt-devel
 %endif
+
+# MESA support
+%if 0%{?rhel} || 0%{?fedora}
+BuildRequires: mesa-libGL-devel
+BuildRequires: mesa-libGLU-devel
+%endif
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: mesaglu-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires: Mesa-libGL-devel
+BuildRequires: Mesa-libGLU-devel
 %endif
 
 # NAS support
@@ -446,22 +504,15 @@ BuildRequires:	nas-devel
 BuildRequires:	dbus-devel >= 0.22-12.EL.9p1
 Requires:		dbus-qt >= 0.22-12.EL.9p1
 %else
-BuildRequires:	trinity-dbus-tqt-devel >= 1:0.63
-Requires:		trinity-dbus-tqt >= 1:0.63
+BuildRequires:	libdbus-tqt-1-devel >= %{tde_epoch}:0.63
+BuildRequires:	libdbus-1-tqt-devel >= %{tde_epoch}:0.9
+Requires:		libdbus-tqt-1-0 >= %{tde_epoch}:0.63
 %endif
 
 %if 0%{?fedora} >= 17
 BuildRequires:	perl-Digest-MD5
 %endif
 
-# JACK support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}jack-devel
-%endif
-%if 0%{?fedora} || 0%{?rhel} >= 5
-BuildRequires:	jack-audio-connection-kit-devel
-%endif
-
 # LIBART_LGPL support
 %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} || 0%{?fedora} || 0%{?rhel} >= 5
 %define with_libart 1
@@ -526,31 +577,22 @@ BuildRequires:	%{_lib}xdamage-devel
 BuildRequires:	libXdamage-devel
 %endif
 
-# XCOMPOSITE support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?mgaversion} >= 4
-BuildRequires:	%{_lib}xcomposite-devel
-%else
-BuildRequires:	%{_lib}xcomposite%{?mgaversion:1}-devel
-%endif
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
-BuildRequires:	libXcomposite-devel
-%endif
-
-# Other X11 stuff ...
-%if 0%{?rhel} == 4
-BuildRequires:	xorg-x11-devel
-%endif
+# Requires 'usb.ids'
+BuildRequires:	usbutils
 
+# LIBFONTENC support
 %if 0%{?suse_version} == 1140
 BuildRequires:	xorg-x11-libfontenc-devel
 %endif
-
 %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1220
 BuildRequires:	libfontenc-devel
 %endif
 
+# Other X11 stuff ...
+%if 0%{?rhel} == 4
+BuildRequires:	xorg-x11-devel
+%endif
+
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	x11-font-util
 BuildRequires:	x11-proto-devel
@@ -607,9 +649,7 @@ Requires: trinity-libkonq = %{version}-%{release}
 Requires: %{name}-libtqt3-integration = %{version}-%{release}
 Requires: %{name}-tdeio-smb-plugin = %{version}-%{release}
  
-Requires:	qt%{?_qt_suffix}
-Requires:	trinity-tqtinterface >= %{tde_version}
-Requires:	trinity-arts >= 1:1.5.10
+Requires:	trinity-arts >= %{tde_epoch}:1.5.10
 Requires:	trinity-tdelibs >= %{tde_version}
 Requires:	openssl
 
@@ -644,8 +684,7 @@ web browser, X terminal emulator, and many other programs and components.
 Summary:	%{summary} - Development files
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	trinity-tqtinterface-devel >= %{tde_version}
-Requires:	trinity-arts-devel >= 1:1.5.10
+Requires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
 Requires:	trinity-tdelibs-devel >= %{tde_version}
 
 Requires:	%{name}-bin-devel = %{version}-%{release}
@@ -694,10 +733,10 @@ Obsoletes:	trinity-tdebase-kio-pim-plugins < %{version}-%{release}
 
 %description tdeio-pim-plugins
 Protocol handlers (TDEIOslaves) for personal information management, including:
- * kio_ldap
- * kio_nntp
- * kio_pop3
- * kio_smtp
+ * tdeio_ldap
+ * tdeio_nntp
+ * tdeio_pop3
+ * tdeio_smtp
 
 %files tdeio-pim-plugins
 %defattr(-,root,root,-)
@@ -734,7 +773,7 @@ Such as the desktop right-click-"Create New" list
 %files runtime-data-common
 %defattr(-,root,root,-)
 %{tde_datadir}/autostart/khotkeys.desktop
-%{tde_datadir}/desktop-directories/*
+%{tde_datadir}/desktop-directories/
 %{tde_datadir}/icons/hicolor/*/apps/kxkb.png
 %{tde_datadir}/icons/hicolor/*/apps/knetattach.*
 %{tde_datadir}/icons/hicolor/*/apps/khotkeys.png
@@ -762,7 +801,7 @@ done
 ##########
 
 %package -n trinity-kappfinder
-Summary:	non-TDE application finder for TDE
+Summary:	Non-TDE application finder for TDE
 Group:		Applications/Utilities
 Requires:	%{name}-data = %{version}-%{release}
 
@@ -814,7 +853,7 @@ Group:		Environment/Libraries
 ##########
 
 %package -n trinity-kate
-Summary:	advanced text editor for TDE
+Summary:	Advanced text editor for TDE
 Group:		Applications/Text
 Requires:	%{name}-data = %{version}-%{release}
 Requires:	trinity-kwrite = %{version}-%{release}
@@ -899,7 +938,7 @@ Requires:	trinity-kate = %{version}-%{release}
 ##########
 
 %package -n trinity-kwrite
-Summary:	advanced text editor for TDE
+Summary:	Advanced text editor for TDE
 Group:		Applications/Utilities
 Requires:	%{name}-data = %{version}-%{release}
 Requires:	trinity-libkateinterfaces = %{version}-%{release}
@@ -915,7 +954,7 @@ Kwrite is a text editor for TDE.
 %{tde_libdir}/libkdeinit_kwrite.la
 %{tde_libdir}/libkdeinit_kwrite.so
 %{tde_tdeappdir}/kwrite.desktop
-%{tde_datadir}/apps/kwrite/kwriteui.rc
+%{tde_datadir}/apps/kwrite/
 %{tde_datadir}/icons/hicolor/*/apps/kwrite.png
 %{tde_datadir}/icons/hicolor/*/apps/kwrite2.svgz
 %{tde_tdedocdir}/HTML/en/kwrite/
@@ -938,7 +977,7 @@ update-desktop-database %{tde_appdir} 2> /dev/null || :
 ##########
 
 %package -n trinity-kcontrol
-Summary:	control center for TDE
+Summary:	Control center for TDE
 Group:		Applications/Utilities
 Requires:	%{name}-data = %{version}-%{release}
 
@@ -1015,8 +1054,8 @@ plugdev group.
 %{tde_tdelibdir}/kcm_joystick.so
 %{tde_tdelibdir}/kcm_kded.la
 %{tde_tdelibdir}/kcm_kded.so
-%{tde_tdelibdir}/kcm_kdm.la
-%{tde_tdelibdir}/kcm_kdm.so
+%{tde_tdelibdir}/kcm_%{tdm}.la
+%{tde_tdelibdir}/kcm_%{tdm}.so
 %{tde_tdelibdir}/kcm_kdnssd.so
 %{tde_tdelibdir}/kcm_kdnssd.la
 %{tde_tdelibdir}/kcm_keys.la
@@ -1104,7 +1143,6 @@ plugdev group.
 %{tde_tdeappdir}/filebrowser.desktop
 %{tde_tdeappdir}/filetypes.desktop
 %{tde_tdeappdir}/fonts.desktop
-#%{tde_tdeappdir}/hwmanager.desktop
 %{tde_tdeappdir}/icons.desktop
 %{tde_tdeappdir}/installktheme.desktop
 %{tde_tdeappdir}/interrupts.desktop
@@ -1124,7 +1162,7 @@ plugdev group.
 %{tde_tdeappdir}/kcmusb.desktop
 %{tde_tdeappdir}/kcmview1394.desktop
 %{tde_tdeappdir}/KControl.desktop
-%{tde_tdeappdir}/kdm.desktop
+%{tde_tdeappdir}/%{tdm}.desktop
 %{tde_tdeappdir}/keys.desktop
 %{tde_tdeappdir}/kfontview.desktop
 %{tde_tdeappdir}/khtml_behavior.desktop
@@ -1153,6 +1191,7 @@ plugdev group.
 %{tde_tdeappdir}/sound.desktop
 %{tde_tdeappdir}/spellchecking.desktop
 %{tde_tdeappdir}/style.desktop
+%{tde_tdeappdir}/tde-kcontrol.desktop
 %{tde_tdeappdir}/useragent.desktop
 %{tde_tdeappdir}/xserver.desktop
 %{tde_datadir}/applnk/.hidden/energy.desktop
@@ -1186,9 +1225,30 @@ plugdev group.
 %{tde_datadir}/services/kuriikwsfilter.desktop
 %{tde_datadir}/services/kurisearchfilter.desktop
 %{tde_datadir}/services/localdomainurifilter.desktop
+%{tde_datadir}/icons/hicolor/*/apps/kcmcolors.png
+%{tde_datadir}/icons/hicolor/*/apps/kcmcomponentchooser.png
+%{tde_datadir}/icons/hicolor/*/apps/kcmdesktop.png
+%{tde_datadir}/icons/hicolor/*/apps/kcmdesktopbehavior.png
+%{tde_datadir}/icons/hicolor/*/apps/kcmkdnssd.png
+%{tde_datadir}/icons/hicolor/*/apps/kcmlaunch.png
+%{tde_datadir}/icons/hicolor/*/apps/kcmmedia.png
+%{tde_datadir}/icons/hicolor/*/apps/kcmmouse.png
+%{tde_datadir}/icons/hicolor/*/apps/kcmnetpref.png
+%{tde_datadir}/icons/hicolor/*/apps/kcmnic.png
+%{tde_datadir}/icons/hicolor/*/apps/kcmperformance.png
+%{tde_datadir}/icons/hicolor/*/apps/kcmprivacy.png
+%{tde_datadir}/icons/hicolor/*/apps/kcmtaskbar.png
+%{tde_datadir}/icons/hicolor/*/apps/kcmcgi.png
+%{tde_datadir}/icons/hicolor/*/apps/kcmcrypto.png
+%{tde_datadir}/icons/hicolor/*/apps/kcmhistory.png
+%{tde_datadir}/icons/hicolor/*/apps/kcmjoystick.png
+%{tde_datadir}/icons/hicolor/*/apps/kcmkded.png
+%{tde_datadir}/icons/hicolor/*/apps/kcmkhtml_filter.png
+%{tde_datadir}/icons/hicolor/*/apps/kcmsmserver.png
+%{tde_datadir}/icons/hicolor/*/apps/kcmspellchecking.png
 
 %{tde_datadir}/apps/usb.ids
-%{tde_datadir}/apps/kcmview1394/oui.db
+%{tde_datadir}/apps/kcmview1394/
 
 # The following features are not compiled under RHEL 5 and older
 %if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
@@ -1238,7 +1298,7 @@ Requires:	trinity-kcontrol = %{version}-%{release}
 ##########
 
 %package bin
-Summary:	core binaries for the TDE base module
+Summary:	Core binaries for the TDE base module
 Group:		Applications/Utilities
 Requires:	%{name}-data = %{version}-%{release}
 Requires:	pam
@@ -1254,7 +1314,6 @@ TDE applications, particularly those in the TDE base module.
 %defattr(-,root,root,-)
 %{tde_bindir}/krootbacking
 %if 0%{?with_tsak}
-%attr(4511,root,root) %{tde_bindir}/kdmtsak
 %{tde_bindir}/tsak
 %endif
 %{tde_bindir}/kdebugdialog
@@ -1266,7 +1325,6 @@ TDE applications, particularly those in the TDE base module.
 %{tde_bindir}/crashtest
 %{tde_bindir}/kapplymousetheme
 %{tde_bindir}/kblankscrn.kss
-%attr(4755,root,root) %{tde_bindir}/kcheckpass
 %{tde_bindir}/kcminit
 %{tde_bindir}/kcminit_startup
 %{tde_bindir}/kdcop
@@ -1278,6 +1336,7 @@ TDE applications, particularly those in the TDE base module.
 %{tde_bindir}/krandom.kss
 %{tde_bindir}/ksystraycmd
 %{tde_bindir}/kxkb
+%dir %{tde_libdir}/kconf_update_bin
 %{tde_libdir}/kconf_update_bin/khotkeys_update
 %{tde_tdelibdir}/kcminit.la
 %{tde_tdelibdir}/kcminit.so
@@ -1319,7 +1378,7 @@ TDE applications, particularly those in the TDE base module.
 %{tde_datadir}/apps/kconf_update/khotkeys_32b1_update.upd
 %{tde_datadir}/apps/kconf_update/khotkeys_printscreen.upd
 %{tde_datadir}/apps/kconf_update/konqueror_gestures_trinity21_update.upd
-%{tde_datadir}/apps/kdcop/kdcopui.rc
+%{tde_datadir}/apps/kdcop/
 %{tde_datadir}/apps/khotkeys/
 %{tde_datadir}/services/kded/khotkeys.desktop
 %{tde_datadir}/services/kxkb.desktop
@@ -1333,6 +1392,20 @@ TDE applications, particularly those in the TDE base module.
 %{tde_tdedocdir}/HTML/en/knetattach/
 %{tde_tdedocdir}/HTML/en/kxkb/
 
+# SETUID binaries
+# Some setuid binaries need special care
+%if 0%{?suse_version}
+%if 0%{?with_tsak}
+%verify(not mode) %{tde_bindir}/%{tdm}tsak
+%endif
+%verify(not mode) %{tde_bindir}/kcheckpass
+%else
+%if 0%{?with_tsak}
+%attr(4511,root,root) %{tde_bindir}/%{tdm}tsak
+%endif
+%attr(4755,root,root) %{tde_bindir}/kcheckpass
+%endif
+
 %post bin
 /sbin/ldconfig || :
 update-desktop-database %{tde_appdir} 2> /dev/null || : 
@@ -1368,7 +1441,7 @@ Provides:	tdebase-bin-devel = %{version}-%{release}
 ##########
 
 %package data
-Summary:	shared data files for the TDE base module
+Summary:	Shared data files for the TDE base module
 Group:		Environment/Libraries
 Requires:	%{name}-runtime-data-common = %{version}-%{release}
 
@@ -1395,11 +1468,11 @@ needed for a basic TDE desktop installation.
 %{tde_datadir}/applnk/.hidden/socks.desktop
 %{tde_datadir}/applnk/.hidden/userinfo.desktop
 %{tde_datadir}/applnk/.hidden/virtualdesktops.desktop
-%{tde_datadir}/apps/kaccess/eventsrc
-%{tde_datadir}/apps/kcmcss/template.css
+%{tde_datadir}/apps/kaccess/
+%{tde_datadir}/apps/kcmcss/
 %{tde_datadir}/apps/kcminput/
 %{tde_datadir}/apps/kcmkeys/
-%{tde_datadir}/apps/kcmlocale/pics/background.png
+%{tde_datadir}/apps/kcmlocale/
 %{tde_datadir}/apps/kconf_update/convertShortcuts.pl
 %{tde_datadir}/apps/kconf_update/kaccel.upd
 %{tde_datadir}/apps/kconf_update/kcmdisplayrc.upd
@@ -1409,8 +1482,8 @@ needed for a basic TDE desktop installation.
 %{tde_datadir}/apps/kcontrol/
 %{tde_datadir}/apps/kdisplay/
 %{tde_datadir}/apps/kfontview/
-%{tde_datadir}/apps/kinfocenter/kinfocenterui.rc
-%{tde_datadir}/apps/kthememanager/themes/*
+%{tde_datadir}/apps/kinfocenter/
+%{tde_datadir}/apps/kthememanager/
 %{tde_datadir}/icons/crystalsvg/*/apps/access.png
 %{tde_datadir}/icons/crystalsvg/*/apps/acroread.png
 %{tde_datadir}/icons/crystalsvg/*/apps/applixware.png
@@ -1437,7 +1510,7 @@ needed for a basic TDE desktop installation.
 %{tde_datadir}/icons/crystalsvg/*/apps/kcmpartitions.png
 %{tde_datadir}/icons/crystalsvg/*/apps/kcmpci.png
 %{tde_datadir}/icons/crystalsvg/*/apps/kcontrol.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kdmconfig.png
+%{tde_datadir}/icons/crystalsvg/*/apps/%{tdm}config.png
 %{tde_datadir}/icons/crystalsvg/*/apps/key_bindings.png
 %{tde_datadir}/icons/crystalsvg/*/apps/kfm_home.png
 %{tde_datadir}/icons/crystalsvg/*/apps/kscreensaver.png
@@ -1630,7 +1703,7 @@ needed for a basic TDE desktop installation.
 %{tde_datadir}/icons/crystalsvg/*/apps/wmaker_apps.png
 %{tde_datadir}/icons/crystalsvg/*/apps/qtella.png
 %{tde_datadir}/services/searchproviders
-%{tde_datadir}/services/useragentstrings/*.desktop
+%{tde_datadir}/services/useragentstrings/
 %{tde_datadir}/servicetypes/searchprovider.desktop
 %{tde_datadir}/servicetypes/uasprovider.desktop
 %exclude %{tde_datadir}/sounds/pop.wav
@@ -1659,13 +1732,13 @@ done
 eval $(tr "," ";" </etc/product.id) 2>/dev/null
 # Then, we create a symbolic link to the corresponding background
 if [ -r "%{_datadir}/mdk/backgrounds/Mandriva-${product:-Free}-1280x1024-1300.jpg" "%{tde_bg}" ]; then
-  %__ln -sf "%{_datadir}/mdk/backgrounds/Mandriva-${product:-Free}-1280x1024-1300.jpg" "%{tde_bg}"
+  ln -sf "%{_datadir}/mdk/backgrounds/Mandriva-${product:-Free}-1280x1024-1300.jpg" "%{tde_bg}"
 fi
 %endif
 
 %if "%{distribution}" == "Mageia"
 if [ ! -r "%{tde_bg}" ] && [ -r "%{_datadir}/mga/backgrounds/Mageia-Default-1920x1440.png" ]; then
-  %__ln -sf "%{_datadir}/mga/backgrounds/Mageia-Default-1920x1440.png" "%{tde_bg}"
+  ln -sf "%{_datadir}/mga/backgrounds/Mageia-Default-1920x1440.png" "%{tde_bg}"
 fi
 %endif
 
@@ -1678,7 +1751,7 @@ done
 ##########
 
 %package tdeio-plugins
-Summary:	core I/O slaves for TDE
+Summary:	Core I/O slaves for TDE
 Group:		Applications/Utilities
 Requires:	trinity-kdesktop = %{version}-%{release}
 Requires:	cyrus-sasl
@@ -1780,12 +1853,10 @@ group.
 %{tde_tdelibdir}/textthumbnail.la
 %{tde_tdelibdir}/textthumbnail.so
 %{tde_tdeappdir}/kcmcgi.desktop
-%{tde_datadir}/apps/kio_finger/kio_finger.css
-%{tde_datadir}/apps/kio_finger/kio_finger.pl
-%{tde_datadir}/apps/kio_info/kde-info2html
-%{tde_datadir}/apps/kio_info/kde-info2html.conf
-%{tde_datadir}/apps/kio_man/kio_man.css
-%{tde_datadir}/apps/systemview/*.desktop
+%{tde_datadir}/apps/kio_finger/
+%{tde_datadir}/apps/kio_info/
+%{tde_datadir}/apps/kio_man/
+%{tde_datadir}/apps/systemview/
 %{tde_datadir}/config.kcfg/mediamanagersettings.kcfg
 %{tde_datadir}/mimelnk/application/x-smb-server.desktop
 %{tde_datadir}/mimelnk/inode/system_directory.desktop
@@ -1853,39 +1924,65 @@ update-desktop-database %{tde_appdir} 2> /dev/null || :
 
 ##########
 
-%package -n trinity-kdepasswd
-Summary:	password changer for TDE
+%package -n trinity-tdepasswd
+Summary:	Password changer for TDE
 Group:		Applications/Utilities
 
-%description -n trinity-kdepasswd
+Obsoletes:	trinity-kdepasswd < %{version}-%{release}
+Provides:	trinity-kdepasswd = %{version}-%{release}
+
+%description -n trinity-tdepasswd
 This is a simple application which allows users to change their
 system passwords.
 
-%files -n trinity-kdepasswd
+%files -n trinity-tdepasswd
 %defattr(-,root,root,-)
 %{tde_bindir}/kdepasswd
 %{tde_tdelibdir}/kcm_useraccount.la
 %{tde_tdelibdir}/kcm_useraccount.so
 %{tde_tdeappdir}/kcm_useraccount.desktop
 %{tde_tdeappdir}/kdepasswd.desktop
-%exclude %{tde_datadir}/apps/kdm/pics/users/default1.png
-%exclude %{tde_datadir}/apps/kdm/pics/users/default2.png
-%exclude %{tde_datadir}/apps/kdm/pics/users/default3.png
-%exclude %{tde_datadir}/apps/kdm/pics/users/root1.png
-%{tde_datadir}/apps/kdm/pics/users/*.png
 %{tde_datadir}/config.kcfg/kcm_useraccount.kcfg
 %{tde_datadir}/config.kcfg/kcm_useraccount_pass.kcfg
-
-%post -n trinity-kdepasswd
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-%postun -n trinity-kdepasswd
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
+%{_datadir}/faces/Apple.png
+%{_datadir}/faces/BeachBall.png
+%{_datadir}/faces/Blowfish.png
+%{_datadir}/faces/Bug.png
+%{_datadir}/faces/Butterfly.png
+%{_datadir}/faces/Car.png
+%{_datadir}/faces/Cow.png 
+%{_datadir}/faces/Daemon.png
+%{_datadir}/faces/Dog.png
+%{_datadir}/faces/Elephant.png
+%{_datadir}/faces/Flower.png
+%{_datadir}/faces/Frog.png
+%{_datadir}/faces/Ghost.png
+%{_datadir}/faces/Guitar.png
+%{_datadir}/faces/Heart.png
+%{_datadir}/faces/Konqui.png
+%{_datadir}/faces/Lion.png
+%{_datadir}/faces/Monkey.png
+%{_datadir}/faces/Penguin.png
+%{_datadir}/faces/Pig.png
+%{_datadir}/faces/Rabbit.png
+%{_datadir}/faces/Ring.png
+%{_datadir}/faces/Scream.png
+%{_datadir}/faces/Shark.png
+%{_datadir}/faces/Splash.png
+%{_datadir}/faces/Star.png
+%{_datadir}/faces/Teddybear.png
+%{_datadir}/faces/Turtle.png
+
+%post -n trinity-tdepasswd
+update-desktop-database %{tde_tdeappdir} 2> /dev/null || : 
+
+%postun -n trinity-tdepasswd
+update-desktop-database %{tde_tdeappdir} 2> /dev/null || : 
 
 ##########
 
 %package -n trinity-tdeprint
-Summary:	print system for TDE
+Summary:	Print system for TDE
 Group:		Applications/Utilities
 Requires:	%{name}-data = %{version}-%{release}
 Requires:	psutils
@@ -1922,7 +2019,7 @@ Installation of smbclient will make you able to use smb shared printers.
 %{tde_datadir}/apps/kdeprint/
 %{tde_datadir}/apps/kdeprintfax/
 %{tde_datadir}/apps/kjobviewer/
-%{tde_datadir}/apps/kdeprint_part/kdeprint_part.rc
+%{tde_datadir}/apps/kdeprint_part/
 %{tde_datadir}/icons/hicolor/*/apps/kdeprintfax.png
 %{tde_datadir}/icons/hicolor/*/apps/kjobviewer.png
 %{tde_datadir}/icons/hicolor/*/apps/printmgr.png
@@ -1960,7 +2057,7 @@ done
 ##########
 
 %package -n trinity-kdesktop
-Summary:	miscellaneous binaries and files for the TDE desktop
+Summary:	Miscellaneous binaries and files for the TDE desktop
 Group:		Applications/Utilities
 Requires:	%{name}-bin = %{version}-%{release}
 Requires:	%{name}-data = %{version}-%{release}
@@ -2034,6 +2131,7 @@ Group:		Applications/Utilities
 Requires:	%{name}-bin = %{version}-%{release}
 Requires:	%{name}-data = %{version}-%{release}
 Requires:	pam
+Requires:	logrotate
 
 # Provides the global Xsession script (/etc/X11/xinit/Xsession or /etc/X11/Xsession)
 %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 4
@@ -2056,10 +2154,11 @@ Provides:	service(graphical-login)
 # Required for Mandriva's installer
 %if 0%{?mgaversion} || 0%{?mdkversion}
 Provides:	dm
+Provides:	%{tdm}
 %endif
 
 %description -n trinity-tdm
-tdm manages a collection of X servers, which may be on the local host or
+TDM manages a collection of X servers, which may be on the local host or
 remote machines. It provides services similar to those provided by init,
 getty, and login on character-based terminals: prompting for login name and
 password, authenticating the user, and running a session. tdm supports XDMCP
@@ -2068,7 +2167,7 @@ process which presents the user with a menu of possible hosts that offer
 XDMCP display management.
 
 A collection of icons to associate with individual users is included with
-TDE, but as part of the kdepasswd package.
+TDE, but as part of the tdepasswd package.
 
 The menu package will help to provide TDM with a list of window managers
 that can be launched, if the window manager does not register with TDM
@@ -2078,30 +2177,40 @@ already. Most users won't need this.
 %defattr(-,root,root,-)
 %{tde_tdelibdir}/kgreet_pam.la
 %{tde_tdelibdir}/kgreet_pam.so
-%{tde_bindir}/genkdmconf
-%{tde_bindir}/kdm
-%{tde_bindir}/kdm_config
-%{tde_bindir}/kdmctl
-%{tde_bindir}/kdm_greet
+%{tde_bindir}/gen%{tdm}conf
+%{tde_bindir}/%{tdm}
+%{tde_bindir}/%{tdm}_config
+%{tde_bindir}/%{tdm}ctl
+%{tde_bindir}/%{tdm}_greet
 %{tde_bindir}/krootimage
-%{tde_datadir}/apps/kdm/pics/kdelogo.png
-%{tde_datadir}/apps/kdm/pics/kdelogo-crystal.png
-%{tde_datadir}/apps/kdm/pics/shutdown.jpg
-%{tde_datadir}/apps/kdm/pics/users/default1.png
-%{tde_datadir}/apps/kdm/pics/users/default2.png
-%{tde_datadir}/apps/kdm/pics/users/default3.png
-%{tde_datadir}/apps/kdm/pics/users/root1.png
-%{tde_datadir}/apps/kdm/sessions/*.desktop
-%{tde_datadir}/apps/kdm/themes/
-%{tde_datadir}/config/kdm
-%dir %{_sysconfdir}/trinity/kdm
-%config(noreplace) %{_sysconfdir}/trinity/kdm/*
-%{tde_tdedocdir}/HTML/en/kdm/
+%dir %{tdm_datadir}
+%dir %{tdm_datadir}/pics
+%{tdm_datadir}/pics/kdelogo.png
+%{tdm_datadir}/pics/kdelogo-crystal.png
+%{tdm_datadir}/pics/shutdown.jpg
+%{tdm_datadir}/pics/users
+%dir %{tdm_datadir}/sessions
+%{tdm_datadir}/sessions/*.desktop
+%{tdm_datadir}/themes/
+%{tde_datadir}/config/%{tdm}
+%dir %{_sysconfdir}/trinity/%{tdm}
+%if 0%{?with_selinux_policy}
+%exclude %{?_sysconfdir}/trinity/%{tdm}/tdm.pp
+%endif
+%config(noreplace) %{_sysconfdir}/trinity/%{tdm}/*
+%{tde_tdedocdir}/HTML/en/%{tdm}/
 %if 0%{?suse_version} == 0
 %config(noreplace) %{_sysconfdir}/pam.d/tdm-trinity
 %config(noreplace) %{_sysconfdir}/pam.d/tdm-trinity-np
 %endif
 
+# XDG user faces
+%dir %{_datadir}/faces
+%{_datadir}/faces/default1.png
+%{_datadir}/faces/default2.png
+%{_datadir}/faces/default3.png
+%{_datadir}/faces/root1.png
+
 # Distribution specific stuff
 %if 0%{?suse_version} == 1140
 %{_sysconfdir}/init.d/xdm.tde
@@ -2124,44 +2233,57 @@ already. Most users won't need this.
 
 # SELINUX policy
 %if 0%{?with_selinux_policy}
-%{?_sysconfdir}/trinity/kdm/tdm.pp
+%{?_sysconfdir}/trinity/%{tdm}/tdm.pp
 %endif
 
+# Logrotate configuration
+%config %{_sysconfdir}/logrotate.d/tdm
+
 %pre -n trinity-tdm
-# Make sure that TDM configuration files are now under '/etc/trinity/kdm'
-if [ -d "%{tde_datadir}/config/kdm" ] && [ ! -L "%{tde_datadir}/config/kdm" ]; then
-  if [ -d "%{_sysconfdir}/trinity/kdm" ]; then
-    # If there is already something under '/etc/trinity/kdm', simply delete old configuration
-    echo "Deleting TDM configuration under '%{tde_datadir}/config/kdm'"
-    %__rm -rf "%{tde_datadir}/config/kdm"
+# Make sure that TDM configuration files are now under '/etc/trinity/tdm'
+if [ -d "%{tde_datadir}/config/%{tdm}" ] && [ ! -L "%{tde_datadir}/config/%{tdm}" ]; then
+  if [ -d "%{_sysconfdir}/trinity/%{tdm}" ]; then
+    # If there is already something under '/etc/trinity/%{tdm}', simply delete old configuration
+    echo "Deleting TDM configuration under '%{tde_datadir}/config/%{tdm}'"
+    rm -rf "%{tde_datadir}/config/%{tdm}"
   else
-    # Else, move '/opt/trinity/share/config/kdm' to '/etc/trinity/kdm'
+    # Else, move '/opt/trinity/share/config/tdm' to '/etc/trinity/tdm'
     if [ ! -d "%{_sysconfdir}/trinity" ]; then
-      %__mkdir_p "%{_sysconfdir}/trinity"
+      mkdir -p "%{_sysconfdir}/trinity"
     fi
-    echo "Migrating TDM configuration from '%{tde_datadir}/config/kdm' to '%{_sysconfdir}/trinity/kdm'"
-    %__mv -f "%{tde_datadir}/config/kdm" "%{_sysconfdir}/trinity/kdm.migr"
+    echo "Migrating TDM configuration from '%{tde_datadir}/config/%{tdm}' to '%{_sysconfdir}/trinity/%{tdm}'"
+    mv -f "%{tde_datadir}/config/%{tdm}" "%{_sysconfdir}/trinity/%{tdm}.migr"
   fi
 fi
 
+# Remove actual directory before creating a symlink
+if [ ! -L "%{tdm_datadir}/pics/users" ]; then
+  [ -d "%{_datadir}/faces" ] || mkdir -p "%{_datadir}/faces"
+  cp -f "%{tdm_datadir}/pics/users/"* "%{_datadir}/faces"
+  rm -rf "%{tdm_datadir}/pics/users"
+fi
+
 %post -n trinity-tdm
 %if 0%{?mgaversion} || 0%{?mdkversion}
 %make_session
 %endif
 %if 0%{?with_selinux_policy}
-/usr/sbin/semodule -i "%{?_sysconfdir}/trinity/kdm/tdm.pp"
+/usr/sbin/semodule -i "%{?_sysconfdir}/trinity/%{tdm}/tdm.pp"
 %endif
+
 # Sets default user icon in TDM
-if [ ! -r "%{tde_datadir}/apps/kdm/faces/.default.face.icon" ]; then
-  [ -d "%{tde_datadir}/apps/kdm/faces" ] || mkdir -p "%{tde_datadir}/apps/kdm/faces"
-  %__cp -f "%{tde_datadir}/apps/kdm/pics/users/default2.png" "%{tde_datadir}/apps/kdm/faces/.default.face.icon"
+if [ ! -r "%{tdm_datadir}/faces/.default.face.icon" ]; then
+  [ -d "%{tdm_datadir}/faces" ] || mkdir -p "%{tdm_datadir}/faces"
+  cp -f "%{tdm_datadir}/pics/users/default2.png" "%{tdm_datadir}/faces/.default.face.icon"
 fi
+
 # Sets default language for TDM
 if [ "$1" = "1" ]; then
   if [ -n "${LANG}" ] && [ "${LANG}" != "C" ]; then
-    %__sed -i "%{_sysconfdir}/trinity/kdm/kdmrc" -e "s|^#*Language=.*|Language=${LANG}|"
+    sed -i "%{_sysconfdir}/trinity/%{tdm}/%{tdm}rc" -e "s|^#*Language=.*|Language=${LANG}|"
   fi
 fi
+
 # openSUSE 11.4 tdm's startup script
 if [ -r "%{_sysconfdir}/init.d/xdm.tde" ]; then
   cat "%{_sysconfdir}/init.d/xdm.tde" >"%{_sysconfdir}/init.d/xdm"
@@ -2169,10 +2291,10 @@ fi
 
 
 %posttrans -n trinity-tdm
-# Make sure that TDM configuration files are now under '/etc/trinity/kdm'
-if [ -d "%{_sysconfdir}/trinity/kdm.migr" ] && [ -d "%{_sysconfdir}/trinity/kdm" ]; then
-  %__mv -f "%{_sysconfdir}/trinity/kdm.migr/"* "%{_sysconfdir}/trinity/kdm/"
-  rmdir "%{_sysconfdir}/trinity/kdm.migr/"
+# Make sure that TDM configuration files are now under '/etc/trinity/tdm'
+if [ -d "%{_sysconfdir}/trinity/%{tdm}.migr" ] && [ -d "%{_sysconfdir}/trinity/%{tdm}" ]; then
+  mv -f "%{_sysconfdir}/trinity/%{tdm}.migr/"* "%{_sysconfdir}/trinity/%{tdm}/"
+  rmdir "%{_sysconfdir}/trinity/%{tdm}.migr/"
 fi
 
 %postun -n trinity-tdm
@@ -2197,7 +2319,7 @@ Requires:	trinity-tdm = %{version}-%{release}
 ##########
 
 %package -n trinity-kfind
-Summary:	file-find utility for TDE
+Summary:	File-find utility for TDE
 Group:		Applications/Utilities
 Requires:	%{name}-data = %{version}-%{release}
 
@@ -2234,7 +2356,7 @@ done
 ##########
 
 %package -n trinity-khelpcenter
-Summary:	help center for TDE
+Summary:	Help center for TDE
 Group:		Applications/Utilities
 Requires:	%{name}-data = %{version}-%{release}
 Requires:	htdig
@@ -2247,8 +2369,6 @@ documentation.
 
 %files -n trinity-khelpcenter
 %defattr(-,root,root,-)
-#%{tde_bindir}/khc_beagle_index.pl
-#%{tde_bindir}/khc_beagle_search.pl
 %{tde_bindir}/khc_docbookdig.pl
 %{tde_bindir}/khc_htdig.pl
 %{tde_bindir}/khc_htsearch.pl
@@ -2285,7 +2405,7 @@ done
 ##########
 
 %package -n trinity-kicker
-Summary:	desktop panel for TDE
+Summary:	Desktop panel for TDE
 Group:		Applications/Utilities
 Requires:	%{name}-data = %{version}-%{release}
 
@@ -2370,7 +2490,7 @@ functionality.
 %{tde_datadir}/applnk/.hidden/kicker_config_arrangement.desktop
 %{tde_datadir}/applnk/.hidden/kicker_config_hiding.desktop
 %{tde_datadir}/applnk/.hidden/kicker_config_menus.desktop
-%{tde_datadir}/apps/clockapplet/pics/lcd.png
+%{tde_datadir}/apps/clockapplet/
 %{tde_datadir}/apps/kconf_update/kicker-3.1-properSizeSetting.pl
 %{tde_datadir}/apps/kconf_update/kicker-3.5-kconfigXTize.pl
 %{tde_datadir}/apps/kconf_update/kicker-3.5-taskbarEnums.pl
@@ -2378,8 +2498,7 @@ functionality.
 %{tde_datadir}/apps/kicker/
 %exclude %{tde_datadir}/apps/kicker/applets/klipper.desktop
 %exclude %{tde_datadir}/apps/kicker/applets/ksysguardapplet.desktop
-%{tde_datadir}/apps/naughtyapplet/pics/naughty-happy.png
-%{tde_datadir}/apps/naughtyapplet/pics/naughty-sad.png
+%{tde_datadir}/apps/naughtyapplet/
 %{tde_datadir}/autostart/panel.desktop
 %{tde_datadir}/config.kcfg/kickerSettings.kcfg
 %{tde_datadir}/config.kcfg/launcherapplet.kcfg
@@ -2451,7 +2570,7 @@ Requires:	trinity-kicker = %{version}-%{release}
 ##########
 
 %package -n trinity-klipper
-Summary:	clipboard utility for Trinity
+Summary:	Clipboard utility for Trinity
 Group:		Applications/Utilities
 Requires:	%{name}-data = %{version}-%{release}
 
@@ -2500,7 +2619,7 @@ done
 ##########
 
 %package -n trinity-kmenuedit
-Summary:	menu editor for TDE
+Summary:	Menu editor for TDE
 Group:		Applications/Utilities
 Requires:	%{name}-data = %{version}-%{release}
 
@@ -2567,7 +2686,7 @@ ever launching another application.
 
 %files -n trinity-konqueror
 %defattr(-,root,root,-)
-%{_sysconfdir}/trinity/konqsidebartng.rc
+%config(noreplace) %{_sysconfdir}/trinity/konqsidebartng.rc
 %{tde_bindir}/kbookmarkmerger
 %{tde_bindir}/keditbookmarks
 %{tde_bindir}/kfmclient
@@ -2629,15 +2748,15 @@ ever launching another application.
 %{tde_datadir}/apps/kconf_update/kfmclient_3_2_update.sh
 %{tde_datadir}/apps/kconf_update/konqsidebartng.upd
 %{tde_datadir}/apps/kconf_update/move_konqsidebartng_entries.sh
-%{tde_datadir}/apps/keditbookmarks/keditbookmarks-genui.rc
-%{tde_datadir}/apps/keditbookmarks/keditbookmarksui.rc
-%{tde_datadir}/apps/khtml/kpartplugins/khtmlkttsd.desktop
-%{tde_datadir}/apps/khtml/kpartplugins/khtmlkttsd.rc
+%{tde_datadir}/apps/keditbookmarks/
+%{tde_datadir}/apps/khtml/kpartplugins/
 %{tde_datadir}/apps/konqiconview/
 %{tde_datadir}/apps/konqlistview/
 %exclude %{tde_datadir}/apps/konqsidebartng/virtual_folders/services/fonts.desktop
 %{tde_datadir}/apps/konqsidebartng/
 %{tde_datadir}/apps/konqueror/about/
+%dir %{tde_datadir}/apps/konqueror/dirtree
+%dir %{tde_datadir}/apps/konqueror/dirtree/remote
 %{tde_datadir}/apps/konqueror/icons/
 %{tde_datadir}/apps/konqueror/konq-simplebrowser.rc
 %{tde_datadir}/apps/konqueror/konqueror.rc
@@ -2651,7 +2770,7 @@ ever launching another application.
 %exclude %{tde_datadir}/apps/konqueror/servicemenus/installfont.desktop
 %{tde_datadir}/apps/konqueror/servicemenus/*.desktop
 %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase
-%{tde_datadir}/apps/konqueror/tiles/*.png
+%{tde_datadir}/apps/konqueror/tiles/
 %{tde_datadir}/autostart/konqy_preload.desktop
 %{tde_datadir}/config.kcfg/keditbookmarks.kcfg
 %{tde_datadir}/config.kcfg/konq_listview.kcfg
@@ -2796,6 +2915,7 @@ Using Konsole, a user can open:
 %{tde_datadir}/servicetypes/terminalemulator.desktop
 %{tde_tdedocdir}/HTML/en/konsole/
 %{tde_tdedocdir}/HTML/en/kcontrol/kcmkonsole/
+%config %{_sysconfdir}/fonts/conf.d/99-konsole.conf
 
 %post -n trinity-konsole
 update-desktop-database %{tde_appdir} 2> /dev/null || : 
@@ -2816,7 +2936,7 @@ done
 ##########
 
 %package -n trinity-kpager
-Summary:	desktop pager for TDE
+Summary:	Desktop pager for TDE
 Group:		Applications/Utilities
 Requires:	%{name}-data = %{version}-%{release}
 
@@ -2850,7 +2970,7 @@ done
 ##########
 
 %package -n trinity-kpersonalizer
-Summary:	installation personalizer for TDE
+Summary:	Installation personalizer for TDE
 Group:		Applications/Utilities
 Requires:	%{name}-data = %{version}-%{release}
 
@@ -2885,7 +3005,7 @@ done
 ##########
 
 %package -n trinity-ksmserver
-Summary:	session manager for TDE
+Summary:	Session manager for TDE
 Group:		Applications/Utilities
 Requires:	%{name}-data = %{version}-%{release}
 Requires:	trinity-twin = %{version}-%{release}
@@ -2904,7 +3024,7 @@ TDE will start, but many good defaults will not be set.
 %files -n trinity-ksmserver
 %defattr(-,root,root,-)
 %{tde_bindir}/ksmserver
-%{tde_bindir}/startkde
+%{tde_bindir}/%{starttde}
 %{tde_bindir}/migratekde3
 %{tde_tdelibdir}/ksmserver.la
 %{tde_tdelibdir}/ksmserver.so
@@ -2934,7 +3054,7 @@ fndSession
 ##########
 
 %package -n trinity-ksplash
-Summary:	the TDE splash screen
+Summary:	The TDE splash screen
 Group:		Applications/Utilities
 Requires:	%{name}-data = %{version}-%{release}
 
@@ -2987,7 +3107,7 @@ Requires:	trinity-ksplash = %{version}-%{release}
 
 %files -n trinity-ksplash-devel
 %defattr(-,root,root,-)
-%{tde_tdeincludedir}/ksplash/*
+%{tde_tdeincludedir}/ksplash/
 %{tde_libdir}/libksplashthemes.la
 %{tde_libdir}/libksplashthemes.so
 
@@ -3000,7 +3120,7 @@ Requires:	trinity-ksplash = %{version}-%{release}
 ##########
 
 %package -n trinity-ksysguard
-Summary:	system guard for TDE
+Summary:	System guard for TDE
 Group:		Applications/Utilities
 Requires:	%{name}-data = %{version}-%{release}
 Requires:	trinity-ksysguardd = %{version}-%{release}
@@ -3051,7 +3171,7 @@ Requires:	trinity-ksysguard = %{version}-%{release}
 
 %files -n trinity-ksysguard-devel
 %defattr(-,root,root,-)
-%{tde_tdeincludedir}/ksgrd/*
+%{tde_tdeincludedir}/ksgrd/
 %{tde_libdir}/libksgrd.la
 %{tde_libdir}/libksgrd.so
 
@@ -3064,7 +3184,7 @@ Requires:	trinity-ksysguard = %{version}-%{release}
 ##########
 
 %package -n trinity-ksysguardd
-Summary:	system guard daemon for TDE
+Summary:	System guard daemon for TDE
 Group:		Applications/Utilities
 Requires:	%{name}-data = %{version}-%{release}
 
@@ -3093,8 +3213,7 @@ ktip provides many useful tips on using TDE when you log in.
 %{tde_bindir}/ktip
 %{tde_tdeappdir}/ktip.desktop
 %{tde_datadir}/applnk/Toys/ktip.desktop
-%{tde_datadir}/apps/kdewizard/pics/wizard_small.png
-%{tde_datadir}/apps/kdewizard/tips
+%{tde_datadir}/apps/kdewizard/
 %{tde_datadir}/autostart/ktip.desktop
 %{tde_datadir}/icons/hicolor/*/apps/ktip.*
 
@@ -3115,7 +3234,7 @@ done
 ##########
 
 %package -n trinity-twin
-Summary:	the TDE window manager
+Summary:	The TDE window manager
 Group:		Applications/Utilities
 Requires:	%{name}-data = %{version}-%{release}
 
@@ -3127,7 +3246,6 @@ This package contains the default X window manager for TDE.
 %{tde_bindir}/kompmgr
 %{tde_bindir}/kwin
 %{tde_bindir}/kwin_killer_helper
-#%{tde_bindir}/kwin_resumer_helper
 %{tde_bindir}/kwin_rules_dialog
 %{tde_libdir}/kconf_update_bin/kwin_update_default_rules
 %{tde_libdir}/kconf_update_bin/kwin_update_window_settings
@@ -3213,7 +3331,7 @@ Requires:	trinity-twin = %{version}-%{release}
 ##########
 
 %package -n trinity-libkonq
-Summary:	core libraries for Konqueror
+Summary:	Core libraries for Konqueror
 Group:		Environment/Libraries
 
 %description -n trinity-libkonq
@@ -3227,9 +3345,10 @@ Konqueror and the kdesktop package.
 %{tde_tdelibdir}/konq_sound.la
 %{tde_tdelibdir}/konq_sound.so
 %{tde_libdir}/libkonq.so.*
-%{tde_datadir}/apps/kbookmark/directory_bookmarkbar.desktop
+%{tde_datadir}/apps/kbookmark/
 %{tde_datadir}/apps/kconf_update/favicons.upd
 %{tde_datadir}/apps/kconf_update/move_favicons.sh
+%dir %{tde_datadir}/apps/konqueror/pics
 %{tde_datadir}/apps/konqueror/pics/arrow_bottomleft.png
 %{tde_datadir}/apps/konqueror/pics/arrow_bottomright.png
 %{tde_datadir}/apps/konqueror/pics/arrow_topleft.png
@@ -3258,6 +3377,7 @@ These libraries allow you to use TDE dialogs in native TQt3 applications.
 
 %files libtqt3-integration
 %defattr(-,root,root,-)
+%dir %{tde_tdelibdir}/plugins/integration
 %{tde_tdelibdir}/plugins/integration/libqtkde.la
 %{tde_tdelibdir}/plugins/integration/libqtkde.so
 %{tde_tdelibdir}/plugins/integration/libqtkde.so.*
@@ -3268,7 +3388,7 @@ These libraries allow you to use TDE dialogs in native TQt3 applications.
 ##########
 
 %package -n trinity-libkonq-devel
-Summary:	development files for Konqueror's core libraries
+Summary:	Development files for Konqueror's core libraries
 Group:		Development/Libraries
 Requires:	trinity-libkonq = %{version}-%{release}
 
@@ -3311,6 +3431,7 @@ Windows and Samba shares.
 %{tde_tdelibdir}/kio_smb.so
 %{tde_datadir}/services/smb.protocol
 %{tde_datadir}/apps/konqueror/dirtree/remote/smb-network.desktop
+%dir %{tde_datadir}/apps/remoteview
 %{tde_datadir}/apps/remoteview/smb-network.desktop
 %{tde_datadir}/mimelnk/application/x-smb-workgroup.desktop
 
@@ -3328,13 +3449,13 @@ Windows and Samba shares.
 # Applies an optional distro-specific graphical theme
 %if "%{?tde_bg}" != ""
 # TDM Background
-%__sed -i "kdm/kfrontend/genkdmconf.c" \
+%__sed -i "%{tdm}/kfrontend/gen%{tdm}conf.c" \
 	-e 's|"Wallpaper=isadora.png\n"|"Wallpaper=%{tde_bg}\n"|'
 
 # TDE user default background
 %__sed -i "kpersonalizer/keyecandypage.cpp" \
 	-e 's|#define DEFAULT_WALLPAPER "isadora.png"|#define DEFAULT_WALLPAPER "%{tde_bg}"|'
-%__sed -i "startkde" \
+%__sed -i "%{starttde}" \
 	-e 's|/usr/share/wallpapers/isadora.png.desktop|%{tde_bg}|' \
 	-e 's|Wallpaper=isadora.png|Wallpaper=%{tde_bg}|'
 %endif
@@ -3352,16 +3473,16 @@ Windows and Samba shares.
 	-e "s|Welcome to Trinity |Welcome to %{tde_aboutlabel} |"
 
 # TDE default directory and icon in startup script
-%__sed -i "startkde" \
+%__sed -i "%{starttde}" \
 	-e "s|/opt/trinity|%{tde_prefix}|g" \
 	-e "s|%%{tde_starticon}|%{tde_starticon}|g"
 
 # Xsession script location may vary on some distro
 %if 0%{?rhel} || 0%{?fedora}
-%__sed -i "kdm/kfrontend/genkdmconf.c" -e "s|/etc/X11/Xsession|/etc/X11/xinit/Xsession|"
+%__sed -i "%{tdm}/kfrontend/gen%{tdm}conf.c" -e "s|/etc/X11/Xsession|/etc/X11/xinit/Xsession|"
 %endif
 %if 0%{?suse_version}
-%__sed -i "kdm/kfrontend/genkdmconf.c" -e "s|/etc/X11/Xsession|/etc/X11/xdm/Xsession|"
+%__sed -i "%{tdm}/kfrontend/gen%{tdm}conf.c" -e "s|/etc/X11/Xsession|/etc/X11/xdm/Xsession|"
 %endif
 
 # Reboot command location may vary on some distributions
@@ -3371,21 +3492,42 @@ if [ -x "/usr/bin/reboot" ]; then
 fi
 if [ -n "${REBOOT}" ]; then
   %__sed -i \
-    "doc/kdm/kdmrc-ref.docbook" \
-    "kcontrol/kdm/kdm-shut.cpp" \
-    "kdm/config.def" \
+    "doc/%{tdm}/%{tdm}rc-ref.docbook" \
+    "kcontrol/%{tdm}/%{tdm}-shut.cpp" \
+    "%{tdm}/config.def" \
   -e "s|/sbin/poweroff|${POWEROFF}|g" \
   -e "s|/sbin/reboot|${REBOOT}|g"
 fi
 
+# Update icons for some control center modules
+%__sed -i "kcontrol/componentchooser/componentchooser.desktop"        -e "s|^Icon=.*|Icon=kcmcomponentchooser|"
+%__sed -i "kcontrol/taskbar/kcmtaskbar.desktop"                       -e "s|^Icon=.*|Icon=kcmtaskbar|"
+%__sed -i "kcontrol/nics/nic.desktop"                                 -e "s|^Icon=.*|Icon=kcmnic|"
+%__sed -i "kcontrol/input/mouse.desktop"                              -e "s|^Icon=.*|Icon=kcmmouse|"
+%__sed -i "kcontrol/smserver/kcmsmserver.desktop"                     -e "s|^Icon=.*|Icon=kcmsmserver|"
+%__sed -i "kcontrol/kded/kcmkded.desktop"                             -e "s|^Icon=.*|Icon=kcmkded|"
+%__sed -i "kcontrol/konq/desktop.desktop"                             -e "s|^Icon=.*|Icon=kcmdesktop|"
+%__sed -i "kcontrol/konq/desktopbehavior.desktop"                     -e "s|^Icon=.*|Icon=kcmdesktopbehavior|"
+%__sed -i "kcontrol/privacy/privacy.desktop"                          -e "s|^Icon=.*|Icon=kcmprivacy|"
+%__sed -i "kcontrol/crypto/crypto.desktop"                            -e "s|^Icon=.*|Icon=kcmcrypto|"
+%__sed -i "kcontrol/kio/netpref.desktop"                              -e "s|^Icon=.*|Icon=kcmnetpref|"
+%__sed -i "kcontrol/konqhtml/khtml_filter.desktop"                    -e "s|^Icon=.*|Icon=kcmkhtml_filter|"
+%__sed -i "kcontrol/joystick/joystick.desktop"                        -e "s|^Icon=.*|Icon=kcmjoystick|"
+%__sed -i "kcontrol/colors/colors.desktop"                            -e "s|^Icon=.*|Icon=kcmcolors|"
+%__sed -i "kcontrol/performance/kcmperformance.desktop"               -e "s|^Icon=.*|Icon=kcmperformance|"
+%__sed -i "kcontrol/launch/kcmlaunch.desktop"                         -e "s|^Icon=.*|Icon=kcmlaunch|"
+%__sed -i "kcontrol/dnssd/kcm_kdnssd.desktop"                         -e "s|^Icon=.*|Icon=kcmkdnssd|"
+%__sed -i "kcontrol/spellchecking/spellchecking.desktop"              -e "s|^Icon=.*|Icon=kcmspellchecking|"
+%__sed -i "konqueror/sidebar/trees/history_module/kcmhistory.desktop" -e "s|^Icon=.*|Icon=kcmhistory|"
+%__sed -i "kioslave/cgi/kcmcgi/kcmcgi.desktop"                        -e "s|^Icon=.*|Icon=kcmcgi|"
+%__sed -i "kioslave/media/kcmodule/media.desktop"                     -e "s|^Icon=.*|Icon=kcmmedia|" 
+
 
 %build
 unset QTDIR QTINC QTLIB
 . /etc/profile.d/qt3.sh
 export PATH="%{tde_bindir}:${PATH}"
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-
-# Avoids building against KDE3's old stuff, if installed
 export KDEDIR=%{tde_prefix}
 
 # Shitty hack for RHEL4 ...
@@ -3410,6 +3552,7 @@ fi
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
   -DCMAKE_SKIP_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   \
   -DBIN_INSTALL_DIR="%{tde_bindir}" \
@@ -3474,7 +3617,7 @@ fi
 # Under RHEL/Fedora/Suse, static 'xsessions' files go to '/usr/share/xsessions'.
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
 %__install -D -m 644 \
-	"%{?buildroot}%{tde_datadir}/apps/kdm/sessions/tde.desktop" \
+	"%{?buildroot}%{tdm_datadir}/sessions/tde.desktop" \
 	"%{?buildroot}%{_datadir}/xsessions/tde.desktop"
 
 # Force session name to be 'TDE'
@@ -3490,9 +3633,9 @@ cat <<EOF >"%{?buildroot}%{_sysconfdir}/X11/wmsession.d/45TDE"
 NAME=TDE
 ICON=kde-wmsession.xpm
 DESC=The Trinity Desktop Environment
-EXEC=%{tde_bindir}/startkde
+EXEC=%{tde_bindir}/%{starttde}
 SCRIPT:
-exec %{tde_bindir}/startkde
+exec %{tde_bindir}/%{starttde}
 EOF
 
 %__install -d -m 755 %{?buildroot}%{_datadir}/X11/dm.d
@@ -3500,7 +3643,7 @@ cat <<EOF >"%{?buildroot}%{_datadir}/X11/dm.d/45TDE.conf"
 NAME=TDM
 DESCRIPTION=TDM (Trinity Display Manager)
 PACKAGE=trinity-tdm
-EXEC=%{tde_bindir}/kdm
+EXEC=%{tde_bindir}/%{tdm}
 %if 0%{?pclinuxos}
 FNDSESSION_EXEC="/usr/sbin/chksession -k"
 %else
@@ -3511,7 +3654,18 @@ EOF
 
 # TDE 3.5.12: add script "plasma-desktop" to avoid conflict with KDE4
 %if "%{?tde_prefix}" != "/usr"
-%__install -m 755 "%{SOURCE1}" "%{?buildroot}%{tde_bindir}"
+cat <<EOF >"%{?buildroot}%{tde_bindir}/plasma-desktop"
+#!/bin/sh
+
+# This stupid scripts prevent the launch of 'plasma-desktop'
+# (from KDE4) alongside with TDE.
+
+case "\${DESKTOP_SESSION}" in
+        "kde3"|"trinity"|"TDE") exit 0;;
+        *) exec /usr/bin/plasma-desktop;;
+esac
+EOF
+chmod 755 "%{?buildroot}%{tde_bindir}/plasma-desktop"
 %endif
 
 # PAM configuration files (except openSUSE)
@@ -3523,7 +3677,7 @@ EOF
 %endif
 
 # TDM configuration
-%__sed -i "%{?buildroot}%{_sysconfdir}/trinity/kdm/kdmrc" \
+%__sed -i "%{?buildroot}%{_sysconfdir}/trinity/%{tdm}/%{tdm}rc" \
 %if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7
 	-e "s/^#*MinShowUID=.*/MinShowUID=1000/"
 %else
@@ -3538,7 +3692,8 @@ EOF
 %__ln_s -f "/usr/share/hwdata/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids"
 %endif
 
-# Makes 'media_safelyremove.desktop' an alternative
+# Makes 'media_safelyremove.desktop' an alternative.
+# This allows the use of 'tdeio-umountwrapper' package.
 %__mv -f "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop" "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase"
 
 # SUSE >= 12 : creates DM config file, used by '/etc/init.d/xdm'
@@ -3548,21 +3703,21 @@ EOF
 %__sed -i "%{?buildroot}/usr/lib/X11/displaymanagers/tdm" -e "s|/opt/trinity/bin|%{tde_bindir}|g"
 %endif
 
-# Fedora 18: no more SYSV init script, we have to use systemd.
+# Fedora 18 / RHEL 7: no more SYSV init script, we have to use systemd to launch TDM.
 %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
 %__install -D -m 644 "%{SOURCE7}" "%{?buildroot}/usr/lib/systemd/system/tdm.service"
 %endif
 
 # Symlink TDM configuration
 %__mkdir_p "%{?buildroot}%{tde_datadir}/config"
-%__ln_s "%{_sysconfdir}/trinity/kdm" "%{?buildroot}%{tde_datadir}/config/kdm"
+%__ln_s "%{_sysconfdir}/trinity/%{tdm}" "%{?buildroot}%{tde_datadir}/config/%{tdm}"
 
-# SELINUX policy
+# SELINUX policy for RHEL / Fedora
 %if 0%{?with_selinux_policy}
-%__install -D -m 644 "%{SOURCE8}" "%{?buildroot}%{?_sysconfdir}/trinity/kdm/tdm.pp"
+%__install -D -m 644 "%{SOURCE8}" "%{?buildroot}%{?_sysconfdir}/trinity/%{tdm}/tdm.pp"
 %endif
 
-# Mageia icon
+# Mageia icon for TDE menu
 %if 0%{?mgaversion} >= 3
 %__install -D -m 644 "%{SOURCE9}" "%{?buildroot}%{tde_datadir}/oxygen/scalable/mgabutton.svg"
 %endif
@@ -3572,12 +3727,132 @@ EOF
 %__install -D -m 755 "%{SOURCE7}" "%{?buildroot}%{?_sysconfdir}/init.d/xdm.tde"
 %endif
 
+# Console font to fontconfig
+%__mkdir_p "%{buildroot}%{_sysconfdir}/fonts/conf.d"
+cat <<EOF >"%{buildroot}%{_sysconfdir}/fonts/conf.d/99-konsole.conf"
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <!-- Font directory list -->
+  <dir>%{tde_datadir}/apps/konsole/fonts</dir>
+</fontconfig>
+EOF
+
+# logrotate configuration
+mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
+cat << EOF > "%{buildroot}%{_sysconfdir}/logrotate.d/tdm"
+/var/log/tdm.log {
+    weekly
+    notifempty
+    missingok
+    nocompress
+}
+EOF
+
+# Move faces icon to XDG directory '/usr/share/faces'
+if [ ! -d "%{?buildroot}%{_datadir}/faces" ]; then
+  %__mkdir_p "%{?buildroot}%{_datadir}/faces"
+  %__mv -f "%{?buildroot}%{tdm_datadir}/pics/users/"* "%{?buildroot}%{_datadir}/faces"
+  rmdir "%{?buildroot}%{tdm_datadir}/pics/users"
+fi
+%__ln_s "%{_datadir}/faces" "%{?buildroot}%{tdm_datadir}/pics/users"
+
+# Adds missing icons in 'hicolor' theme
+# These icons are copied from 'crystalsvg' theme, provided by 'tdelibs'.
+mkdir -p "%{?buildroot}%{tde_datadir}/icons/hicolor/{16x16,22x22,32x32,48x48,64x64,128x128}/apps/"
+pushd "%{?buildroot}%{tde_datadir}/icons"
+for i in {16,32,48,64,128};    do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/mimetypes/misc.png              hicolor/"$i"x"$i"/apps/kcmcomponentchooser.png  ;done
+for i in {16,22,32,48,128};    do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/launch.png              hicolor/"$i"x"$i"/apps/kcmperformance.png       ;done
+for i in 16;                   do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/services.png            hicolor/"$i"x"$i"/apps/kcmkded.png              ;done
+for i in {16,22,32,48};        do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/exit.png                hicolor/"$i"x"$i"/apps/kcmsmserver.png          ;done
+for i in {16,22,32};           do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/spellcheck.png          hicolor/"$i"x"$i"/apps/kcmspellchecking.png     ;done
+for i in {16,22,32,48,64,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/filesystems/desktop.png         hicolor/"$i"x"$i"/apps/kcmdesktopbehavior.png   ;done
+for i in {16,22,32,48,64,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/filesystems/desktop.png         hicolor/"$i"x"$i"/apps/kcmdesktop.png           ;done
+for i in {16,22,32,48,64,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/kmenu.png                  hicolor/"$i"x"$i"/apps/kcmtaskbar.png           ;done
+for i in {16,22,32,48,64,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/mimetypes/colorscm.png          hicolor/"$i"x"$i"/apps/kcmcolors.png            ;done
+for i in {16,22,32,48,128};    do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/launch.png              hicolor/"$i"x"$i"/apps/kcmlaunch.png            ;done
+for i in {16,22,32};           do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/filter.png              hicolor/"$i"x"$i"/apps/kcmkhtml_filter.png      ;done
+for i in {16,22,32};           do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/run.png                 hicolor/"$i"x"$i"/apps/kcmcgi.png               ;done
+for i in {16,22};              do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/history.png             hicolor/"$i"x"$i"/apps/kcmhistory.png           ;done
+for i in {16,22,32,48,64,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/filesystems/network.png         hicolor/"$i"x"$i"/apps/kcmnetpref.png           ;done
+for i in {16,32,48,64,128};    do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/blockdevice.png         hicolor/"$i"x"$i"/apps/kcmkdnssd.png            ;done
+for i in {16,22,32,48,64};     do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/joystick.png            hicolor/"$i"x"$i"/apps/kcmjoystick.png          ;done
+for i in {16,32,48,64,128};    do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/mouse.png               hicolor/"$i"x"$i"/apps/kcmmouse.png             ;done
+for i in {16,22,32,48,64,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/system.png              hicolor/"$i"x"$i"/apps/kcmmedia.png             ;done
+for i in {16,22,32};           do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/encrypted.png           hicolor/"$i"x"$i"/apps/kcmcrypto.png            ;done
+for i in {16,22,32,48,64,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/filesystems/trashcan_empty.png  hicolor/"$i"x"$i"/apps/kcmprivacy.png           ;done
+for i in {16,22,32,48,64,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/filesystems/network.png         hicolor/"$i"x"$i"/apps/kcmnic.png               ;done
+popd
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+# Other applications
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/Help.desktop             Documentation Viewer
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/Home.desktop             System FileManager core
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kate.desktop             TextEditor
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/KControl.desktop         X-SuSE-core
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/Kfind.desktop            System Filesystem core
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kjobviewer.desktop       PrintingUtility
+%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/klipper.desktop          System TrayIcon
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kmenuedit.desktop        Core-Configuration
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/knetattach.desktop       System Network
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/konqbrowser.desktop      WebBrowser
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/konquerorsu.desktop      System FileManager
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/konsole.desktop          TerminalEmulator
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/konsolesu.desktop        TerminalEmulator
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kpager.desktop           Utility  DesktopUtility
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kpersonalizer.desktop    DesktopUtility
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/ksysguard.desktop        System Monitor
+%suse_update_desktop_file -u %{?buildroot}%{tde_tdeappdir}/ktip.desktop             System Utility
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kwrite.desktop           TextEditor
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kprintfax.desktop        PrintingUtility
+%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/kfontview.desktop        Graphics Viewer
+%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/krandrtray.desktop       Applet X-KDE-settings-desktop
+%suse_update_desktop_file    %{?buildroot}%{tde_datadir}/applnk/.hidden/konqfilemgr.desktop      System FileManager
+%endif
+
+# Icons from TDE Control Center should only be displayed in TDE
+for i in %{?buildroot}%{tde_tdeappdir}/*.desktop ; do
+  if grep -q "^Categories=.*X-KDE-settings" "${i}"; then
+    if ! grep -q "OnlyShowIn=KDE" "${i}" ; then
+      echo "OnlyShowIn=KDE;" >>"${i}"
+    fi
+  fi
+done
+
+# Other apps that should stay in TDE
+for i in ksysguard tde-kcontrol kfontview showdesktop; do
+  echo "OnlyShowIn=KDE;" >>"%{?buildroot}%{tde_tdeappdir}/${i}.desktop"
+done
+
+# Remove setuid bit on some binaries.
+%if 0%{?with_tsak}
+chmod 0511 "%{?buildroot}%{tde_bindir}/%{tdm}tsak"
+%endif
+chmod 0755 "%{?buildroot}%{tde_bindir}/kcheckpass"
+
+
 
 %clean
 %__rm -rf %{?buildroot}
 
 
+%if 0%{?suse_version}
+# Check permissions on setuid files (openSUSE specific)
+%verifyscript
+%if 0%{?with_tsak}
+%verify_permissions -e %{tde_bindir}/%{tdm}tsak
+%endif
+%verify_permissions -e %{tde_bindir}/kcheckpass
+%endif
+
+
 %changelog
+* Sat Oct 11 2014 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-5
+- Add logrotate configuration file.
+- Add font configuration file.
+- Install missing icons.
+
 * Sun May 18 2014 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-4
 - Fix Fedora 20 theme
 - Fix some Mageia 4 path problems
diff --git a/redhat/tdebase/trinity-tdebase-rpmlintrc b/redhat/tdebase/trinity-tdebase-rpmlintrc
new file mode 100644
index 000000000..9584d7f54
--- /dev/null
+++ b/redhat/tdebase/trinity-tdebase-rpmlintrc
@@ -0,0 +1,2 @@
+setBadness('permissions-file-setuid-bit', 0)
+setBadness('non-position-independent-executable', 0)
diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec
index 9da0a7bfe..09f64bcbf 100644
--- a/redhat/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/tdelibs/tdelibs-14.0.0.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package tdelibs
+# spec file for package tdelibs (version R14.0.0)
 #
 # Copyright (c) 2014 Trinity Desktop Environment
 #
@@ -20,6 +20,7 @@
 #  Having KDE libraries may cause FTBFS here !
 
 # TDE variables
+%define tde_epoch 2
 %define tde_version 14.0.0
 %define tde_pkg tdelibs
 %define tde_prefix /opt/trinity
@@ -74,14 +75,13 @@ PreReq: permissions
 %endif
 
 # Trinity dependencies
-BuildRequires:	libtqt3-mt-devel >= 3.5.0
-BuildRequires:	libtqt4-devel = 2:4.2.0
-BuildRequires:	trinity-arts-devel >= 2:1.5.10
-BuildRequires:	libdbus-tqt-1-devel >= 2:0.63
-BuildRequires:	libdbus-1-tqt-devel >= 2:0.9
+BuildRequires:	libtqt4-devel = %{tde_epoch}:4.2.0
+BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
+BuildRequires:	libdbus-tqt-1-devel >= %{tde_epoch}:0.63
+BuildRequires:	libdbus-1-tqt-devel >= %{tde_epoch}:0.9
 BuildRequires:	trinity-filesystem >= %{tde_version}
 
-Requires:		trinity-arts >= 2:1.5.10
+Requires:		trinity-arts >= %{tde_epoch}:1.5.10
 Requires:		trinity-filesystem >= %{tde_version}
 Requires:		fileshareset >= 2.0
 
@@ -292,8 +292,14 @@ Requires:		ca-certificates
 %endif
 %{?xt_devel:BuildRequires: %{xt_devel}}
 
+### New features in TDE R14
+
 # LIBMAGIC support
+%if 0%{?rhel} == 5
+BuildRequires:	file
+%else
 BuildRequires:	file-devel
+%endif
 
 # NETWORKMANAGER support
 %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?suse_version}
@@ -425,7 +431,6 @@ kimgio (image manipulation).
 %{tde_bindir}/meinproc
 %{tde_bindir}/networkstatustestservice
 %{tde_bindir}/start_tdeinit_wrapper
-%{tde_bindir}/tde_dbus_hardwarecontrol
 %{tde_bindir}/checkXML
 %{tde_bindir}/ksvgtopng
 %{tde_bindir}/tdeunittestmodrunner
@@ -464,8 +469,13 @@ kimgio (image manipulation).
 
 %config %{_sysconfdir}/xdg/menus/tde-applications.menu
 %config %{_sysconfdir}/xdg/menus/tde-applications.menu-no-kde
+
+# DBUS stuff, related to TDE hwlib
+%if 0%{?with_tdehwlib}
+%{tde_bindir}/tde_dbus_hardwarecontrol
 %config %{_sysconfdir}/dbus-1/system.d/org.trinitydesktop.hardwarecontrol.conf
 %{_datadir}/dbus-1/system-services/org.trinitydesktop.hardwarecontrol.service
+%endif
 
 %pre
 # TDE Bug #1074
@@ -499,9 +509,9 @@ Obsoletes:	trinity-kdelibs-devel < %{version}-%{release}
 Provides:	trinity-kdelibs-devel = %{version}-%{release}
 
 Requires:	libtqt3-mt-devel >= 3.5.0
-Requires:	libtqt4-devel = 2:4.2.0
-Requires:	trinity-arts-devel >= 2:1.5.10
-Requires:	libart_lgpl-devel >= 2.3.22
+Requires:	libtqt4-devel = %{tde_epoch}:4.2.0
+Requires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
+Requires:	libart_lgpl-devel
 %{?xcomposite_devel:Requires: %{xcomposite_devel}}
 %{?xt_devel:Requires: %{xt_devel}}
 
@@ -651,7 +661,6 @@ chmod 0755 "%{?buildroot}%{tde_bindir}/start_tdeinit"
 %clean
 %__rm -rf "%{?buildroot}"
 
-
 %if 0%{?suse_version}
 # Check permissions on setuid files (openSUSE specific)
 %verifyscript
diff --git a/redhat/tdelibs/tdelibs-3.5.13.2.spec b/redhat/tdelibs/tdelibs-3.5.13.2.spec
index c7c44212c..61cbf5344 100644
--- a/redhat/tdelibs/tdelibs-3.5.13.2.spec
+++ b/redhat/tdelibs/tdelibs-3.5.13.2.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package tdelibs
+# spec file for package tdelibs (version 3.5.13-SRU)
 #
-# Copyright (c) 2014 François Andriot <francois.andriot@free.fr>
+# 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
@@ -20,17 +20,19 @@
 #  Having KDE libraries may cause FTBFS here !
 
 # TDE variables
+%define tde_epoch 1
 %define tde_version 3.5.13.2
+%define tde_pkg tdelibs
 %define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_tdeappdir %{tde_datadir}/applications/kde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
-%define _docdir %{tde_docdir}
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?tde_prefix}" != "/usr"
@@ -38,7 +40,7 @@
 %endif
 
 
-Name:			trinity-tdelibs
+Name:			trinity-%{tde_pkg}
 Version:		%{tde_version}
 Release:		%{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant}
 Summary:		TDE Libraries
@@ -46,18 +48,19 @@ Group:			System/GUI/Other
 URL:			http://www.trinitydesktop.org/
 
 %if 0%{?suse_version}
-License:	GPL-2.0+
+License:		GPL-2.0+
 %else
-License:	GPLv2+
+License:		GPLv2+
 %endif
 
-#Vendor:			Trinity Project
+#Vendor:			Trinity Desktop
 #Packager:		Francois Andriot <francois.andriot@free.fr>
 
 Prefix:			%{tde_prefix}
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+Source1:		trinity-tdelibs-rpmlintrc
 
 Obsoletes:		tdelibs < %{version}-%{release}
 Provides:		tdelibs = %{version}-%{release}
@@ -66,27 +69,53 @@ Provides:		trinity-kdelibs = %{version}-%{release}
 Obsoletes:		trinity-kdelibs-apidocs < %{version}-%{release}
 Provides:		trinity-kdelibs-apidocs = %{version}-%{release}
 
-# Trinity dependencies
-BuildRequires:	qt3-devel >= 3.3.8.d
-BuildRequires:	libtqt4-devel = 1:4.2.0
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	libdbus-tqt-1-devel >= 1:0.63
-BuildRequires:	libdbus-1-tqt-devel >= 1:0.9
+# for set_permissions macro
+%if 0%{?suse_version}
+PreReq: permissions
+%endif
 
-Requires:		trinity-arts >= 1:1.5.10
+# Trinity dependencies
+BuildRequires:	libtqt4-devel = %{tde_epoch}:4.2.0
+BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
+BuildRequires:	libdbus-tqt-1-devel >= %{tde_epoch}:0.63
+BuildRequires:	libdbus-1-tqt-devel >= %{tde_epoch}:0.9
+BuildRequires:	trinity-filesystem >= %{tde_version}
+
+Requires:		trinity-arts >= %{tde_epoch}:1.5.10
+Requires:		trinity-filesystem >= %{tde_version}
+Requires:		fileshareset >= 2.0
 
 BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
 
+# KRB5 support
 BuildRequires:	krb5-devel
+
+# XSLT support
 BuildRequires:	libxslt-devel
-BuildRequires:	cups-devel
-BuildRequires:	openssl-devel
+
+# ALSA support
 BuildRequires:	alsa-lib-devel
+
+# IDN support
 BuildRequires:	libidn-devel
+
+# CUPS support
+BuildRequires:	cups-devel
+
+# TIFF support
 BuildRequires:	libtiff-devel
 
+# OPENSSL support
+BuildRequires:	openssl-devel
+
 # GLIB2 support
 BuildRequires:	glib2-devel
 
@@ -159,7 +188,7 @@ BuildRequires:	jasper-devel
 # AVAHI support
 %if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
 %define with_avahi 1
-BuildRequires:	trinity-avahi-tqt-devel >= 1:0.6.30
+BuildRequires:	libavahi-tqt-devel >= 1:0.6.30
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	%{_lib}avahi-client-devel
 Requires:		%{_lib}avahi-client3
@@ -185,18 +214,6 @@ BuildRequires:	%{_lib}ltdl-devel
 BuildRequires:	libtool-ltdl-devel
 %endif
 
-# XCOMPOSITE support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?mgaversion} >= 4
-BuildRequires:	%{_lib}xcomposite-devel
-%else
-BuildRequires:	%{_lib}xcomposite%{?mgaversion:1}-devel
-%endif
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
-BuildRequires:	libXcomposite-devel
-%endif
-
 # X11 support
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	x11-proto-devel
@@ -230,9 +247,10 @@ BuildRequires:	xz-devel
 %endif
 %endif
 
-# Certificates support
+# Certificates support
 %if 0%{?rhel} >= 6 || 0%{?fedora}
 %define	cacert	%{_sysconfdir}/ssl/certs/ca-certificates.crt
+BuildRequires:	ca-certificates
 Requires:		ca-certificates
 %endif
 %if 0%{?mgaversion} || 0%{?mdkversion}
@@ -243,6 +261,11 @@ Requires:		openssl
 %define	cacert	%{_sysconfdir}/pki/tls/certs/ca-bundle.crt
 Requires:		openssl
 %endif
+%if 0%{?suse_version}
+%define cacert	%{_sysconfdir}/ssl/ca-bundle.pem
+BuildRequires:	ca-certificates
+Requires:		ca-certificates
+%endif
 
 # XRANDR support
 #  On RHEL5, xrandr library is too old.
@@ -250,10 +273,24 @@ Requires:		openssl
 %define with_xrandr 1
 %endif
 
+# XCOMPOSITE support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} >= 4
+%define xcomposite_devel %{_lib}xcomposite-devel
+%else
+%define xcomposite_devel %{_lib}xcomposite%{?mgaversion:1}-devel
+%endif
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
+%define xcomposite_devel libXcomposite-devel
+%endif
+%{?xcomposite_devel:BuildRequires: %{xcomposite_devel}}
+
 # XT support
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-BuildRequires: libXt-devel
+%define xt_devel libXt-devel
 %endif
+%{?xt_devel:BuildRequires: %{xt_devel}}
 
 
 
@@ -279,8 +316,6 @@ kimgio (image manipulation).
 %{tde_bindir}/dcopserver
 %{tde_bindir}/dcopserver_shutdown
 %{tde_bindir}/dcopstart
-%{tde_bindir}/filesharelist
-%{tde_bindir}/fileshareset
 %{tde_bindir}/imagetops
 %{tde_bindir}/kab2kabc
 %{tde_bindir}/kaddprinterwizard
@@ -309,7 +344,6 @@ kimgio (image manipulation).
 %{tde_bindir}/klauncher
 %{tde_bindir}/kmailservice
 %{tde_bindir}/kmimelist
-%attr(4755,root,root) %{tde_bindir}/kpac_dhcp_helper
 %{tde_bindir}/ksendbugmail
 %{tde_bindir}/kshell
 %{tde_bindir}/kstartupconfig
@@ -321,9 +355,7 @@ kimgio (image manipulation).
 %{tde_bindir}/make_driver_db_lpr
 %{tde_bindir}/meinproc
 %{tde_bindir}/networkstatustestservice
-%{tde_bindir}/start_kdeinit
 %{tde_bindir}/start_kdeinit_wrapper
-%attr(4755,root,root) %{tde_bindir}/kgrantpty
 %{tde_bindir}/checkXML
 %{tde_bindir}/ksvgtopng
 %{tde_bindir}/kunittestmodrunner
@@ -350,7 +382,18 @@ kimgio (image manipulation).
 %{tde_tdedocdir}/HTML/en/common/*
 %{tde_tdedocdir}/HTML/en/kspell/
 
-%{_sysconfdir}/xdg/menus/tde-applications.menu
+# Some setuid binaries need special care
+%if 0%{?suse_version}
+%verify(not mode) %{tde_bindir}/kgrantpty
+%verify(not mode) %{tde_bindir}/kpac_dhcp_helper
+%verify(not mode) %{tde_bindir}/start_kdeinit
+%else
+%attr(4755,root,root) %{tde_bindir}/kgrantpty
+%attr(4755,root,root) %{tde_bindir}/kpac_dhcp_helper
+%attr(4711,root,root) %{tde_bindir}/start_kdeinit
+%endif
+
+%config %{_sysconfdir}/xdg/menus/tde-applications.menu
 
 %pre
 # TDE Bug #1074
@@ -361,14 +404,21 @@ fi
 %post
 /sbin/ldconfig || :
 
+%if 0%{?suse_version}
+# Sets permissions on setuid files (openSUSE specific)
+%set_permissions %{tde_bindir}/kgrantpty
+%set_permissions %{tde_bindir}/kpac_dhcp_helper
+%set_permissions %{tde_bindir}/start_kdeinit
+%endif
+
 %postun
 /sbin/ldconfig || :
 
 ##########
 
 %package devel
-Summary:	%{name} - Development files
-Group:		Development/Libraries
+Summary:	TDE Libraries (Development files)
+Group:		Development/Libraries/X11
 Requires:	%{name} = %{version}-%{release}
 
 Obsoletes:	tdelibs-devel < %{version}-%{release}
@@ -376,6 +426,13 @@ Provides:	tdelibs-devel = %{version}-%{release}
 Obsoletes:	trinity-kdelibs-devel < %{version}-%{release}
 Provides:	trinity-kdelibs-devel = %{version}-%{release}
 
+Requires:	qt3-devel >= 3.3.8d
+Requires:	libtqt4-devel = %{tde_epoch}:4.2.0
+Requires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
+Requires:	libart_lgpl-devel
+%{?xcomposite_devel:Requires: %{xcomposite_devel}}
+%{?xt_devel:Requires: %{xt_devel}}
+
 %description devel
 This package includes the header files you will need to compile
 applications for TDE.
@@ -476,18 +533,48 @@ fi
 %__rm -rf "%{?buildroot}"
 %__make install DESTDIR="%{?buildroot}" -C build
 
-# Use system-wide CA certificate
+# Use system-wide CA certificates
 %if "%{?cacert}" != ""
 %__rm -f "%{?buildroot}%{tde_datadir}/apps/kssl/ca-bundle.crt"
 %__ln_s "%{cacert}" "%{?buildroot}%{tde_datadir}/apps/kssl/ca-bundle.crt"
 %endif
 
+# Symlinks duplicate files (mostly under 'ksgmltools2')
+%fdupes -s "%{?buildroot}"
+
+# Fix 'tderesources.desktop' (openSUSE only)
+%if 0%{?suse_version}
+%suse_update_desktop_file -r tderesources Qt X-TDE-settings-desktop
+%endif
+
+# Remove setuid bit on some binaries.
+chmod 0755 "%{?buildroot}%{tde_bindir}/kgrantpty"
+chmod 0755 "%{?buildroot}%{tde_bindir}/kpac_dhcp_helper"
+chmod 0755 "%{?buildroot}%{tde_bindir}/start_kdeinit"
+
+# fileshareset 2.0 is provided separately.
+# Remove integrated fileshareset 1.0 .
+%__rm -f "%{?buildroot}%{tde_bindir}/filesharelist"
+%__rm -f "%{?buildroot}%{tde_bindir}/fileshareset"
+
 
 %clean
 %__rm -rf "%{?buildroot}"
 
+%if 0%{?suse_version}
+# Check permissions on setuid files (openSUSE specific)
+%verifyscript
+%verify_permissions -e %{tde_bindir}/kgrantpty
+%verify_permissions -e %{tde_bindir}/kpac_dhcp_helper
+%verify_permissions -e %{tde_bindir}/start_kdeinit
+%endif
+
 
 %changelog
+* Sat Oct 11 2014 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-4
+- Remove integrated fileshareset.
+- Update dependencies.
+
 * Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-3
 - Build for Fedora 19
 
diff --git a/redhat/tdemultimedia/kdemultimedia-3.4.0-xdg.patch b/redhat/tdemultimedia/kdemultimedia-3.4.0-xdg.patch
deleted file mode 100644
index 445d88a40..000000000
--- a/redhat/tdemultimedia/kdemultimedia-3.4.0-xdg.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- kdemultimedia-3.4.0/kappfinder-data/kde-multimedia-music.menu.tn	2005-04-25 16:16:32.000000000 +0200
-+++ kdemultimedia-3.4.0/kappfinder-data/kde-multimedia-music.menu	2005-04-25 16:17:51.000000000 +0200
-@@ -2,6 +2,7 @@
-   "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
- 
- <Menu>
-+<Name>Applications</Name>
- <Menu>
- 	<Name>Multimedia</Name>
- 	<Exclude>
diff --git a/redhat/tdemultimedia/kdemultimedia-3.5.12.spec b/redhat/tdemultimedia/kdemultimedia-3.5.12.spec
deleted file mode 100644
index 28565c4a9..000000000
--- a/redhat/tdemultimedia/kdemultimedia-3.5.12.spec
+++ /dev/null
@@ -1,396 +0,0 @@
-# Default version for this component
-%if "%{?version}" == ""
-%define version 3.5.12
-%endif
-%define release 2
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
-%define _variant .opt
-%define _docdir %{_prefix}/share/doc
-%endif
-
-# TDE 3.5.12 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/kde3
-
-
-%define appdir %{_datadir}/applications/kde
-
-# former extras bits
-#define _with_akode --with-akode
-## not currently compatible with libtunepimp-0.5 (only libtunepimp-0.4)
-#define _with_musicbrainz --with-musicbrainz
-%define _with_taglib --with-taglib
-%define _with_xine --with-xine
-
-Name:    trinity-kdemultimedia
-Summary: Multimedia applications for the K Desktop Environment (KDE)
-Version: %{?version}
-Release: %{?release}%{?dist}%{?_variant}
-
-License: GPLv2
-Group:   Applications/Multimedia
-
-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)
-
-Source0: kdemultimedia-%{version}.tar.gz
-
-Provides: kdemultimedia3 = %{version}-%{release}
-
-# RedHat Legacy patches (from Fedora 8)
-Patch3: kdemultimedia-3.4.0-xdg.patch
-Patch5: kdemultimedia-3.5.7-pthread.patch
-
-Provides: kdemultimedia3 = %{version}-%{release}
-
-Requires: %{name}-libs = %{version}-%{release}
-
-BuildRequires: zlib-devel
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: libvorbis-devel
-BuildRequires: audiofile-devel
-BuildRequires: desktop-file-utils
-BuildRequires: libtheora-devel
-BuildRequires: flac-devel
-BuildRequires: alsa-lib-devel 
-BuildRequires: cdparanoia-devel cdparanoia
-BuildRequires: gstreamer-devel
-BuildRequires: automake libtool
-%{?_with_akode:BuildRequires: akode-devel}
-%{?_with_musicbrainz:BuildRequires: libmusicbrainz-devel libtunepimp-devel}
-%{?_with_taglib:BuildRequires: taglib-devel}
-%{?_with_xine:BuildRequires: xine-lib-devel}
-BuildRequires:	libXxf86dga-devel
-BuildRequires:	libXxf86vm-devel
-
-%description
-The K Desktop Environment (KDE) is a GUI desktop for the X Window
-System. The %{name} package contains multimedia applications for
-KDE, including:
-  kmid, a midi player
-  kmix, an audio mixer
-  arts, additional functionality for the aRts sound system
-  krec, a recording tool
-  kscd, an Audio-CD player
-  kaudiocreator, a graphical frontend for audio file creation 
-
-%package devel
-Summary: Development files for %{name}, aRts and noatun plugins
-Group: Development/Libraries
-Provides: kdemultimedia3-devel = %{version}-%{release}
-Requires: %{name}-libs = %{version}-%{release}
-# for noatun shlib(s)
-Requires: %{name}-extras-libs = %{version}-%{release}
-Requires: trinity-kdelibs-devel
-%description devel
-{summary}.
-Install %{name}-devel if you wish to develop or compile any
-applications using aRtsbuilder, aRtsmidi, aRtskde, aRts modules or
-noatun plugins.
-
-%package extras
-Summary: Extra applications from %{name} 
-Group: Applications/Multimedia
-Requires: %{name}-extras-libs = %{version}-%{release}
-%description extras
-%{summary}, including:
- * juk, a media player
- * kaboodle, a media player
- * noatun, a media player
-
-%package extras-libs
-Summary: Extra %{name} runtime libraries 
-Group: System Environment/Libraries 
-Requires: %{name}-libs = %{version}-%{release}
-%description extras-libs
-%{summary}.
-
-%package libs
-Summary: %{name} runtime libraries
-Group:   System Environment/Libraries
-Requires: trinity-kdelibs
-# include to be paranoid, installing libs-only is still mostly untested -- Rex
-Requires: %{name} = %{version}-%{release}
-%description libs
-%{summary}.
-
-
-%prep
-%setup -q -n kdemultimedia
-%patch3 -p1 -b .xdg
-%patch5 -p1 -b .pthread
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
-
-%if 0%{?fedora} > 0
-export CXXFLAGS="${CXXFLAGS} -lDCOP"
-%endif
-
-%configure  \
-   --enable-new-ldflags \
-   --disable-dependency-tracking \
-   --includedir=%{tde_includedir} \
-   --with-cdparanoia \
-   --with-flac \
-   --with-theora \
-   --with-vorbis \
-   --with-alsa \
-   --with-gstreamer \
-   --without-lame \
-   --disable-debug \
-   --disable-warnings \
-   --enable-final \
-   --disable-rpath \
-  %{?_with_akode} %{!?_with_akode:--without-akode} \
-  %{?_with_musicbrainz} %{!?_with_musicbrainz:--without-musicbrainz} \
-  %{?_with_taglib} %{!?_with_taglib:--without-taglib} \
-  %{?_with_xine} %{!?_with_xine:--without-xine} \
-   --with-extra-includes=%{_usr}/include/cdda:%{_includedir}/tqt \
-   --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{_bindir}:${PATH}"
-%__rm -rf %{?buildroot} 
-
-%__make install DESTDIR=%{?buildroot} 
-%__make install DESTDIR=%{?buildroot}  -C kaudiocreator
-
-## Remove/uninstall (conflicting) bits we don't want
-%__rm -f $RPM_BUILD_ROOT%{_libdir}/mcop/akode*MPEGPlayObject.mcopclass
-
-# only show in KDE, really? -- Rex (FIXME)
-for f in %{buildroot}%{appdir}/*.desktop ; do
-  if [ -f %{buildroot}%{appdir}/*.desktop ] ; then
-    echo "OnlyShowIn=KDE;" >> $f
-  fi
-done
-
-# don't make these world-writeable
-chmod go-w %{buildroot}%{_datadir}/apps/kscd/*
-
-# locale's
-%find_lang %{name} || touch %{name}.lang
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}$HTML_DIR ]; then
-for lang_dir in %{buildroot}$HTML_DIR/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-    # replace absolute symlinks with relative ones
-    pushd $lang_dir
-      for i in *; do
-        [ -d $i -a -L $i/common ] && ln -nsf ../common $i/common
-      done
-    popd
-  fi
-done
-fi
-
-# rpmdocs
-for dir in k* ; do
-  for file in AUTHORS ChangeLog README TODO ; do
-    if test -s "$dir/$file" ; then
-       install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file"
-       # exclude kaboodle, juk, noatun
-       if [ $dir != kaboodle -a $dir != juk -a $dir != noatun ] ; then
-         echo "%doc rpmdocs/$dir/" >> %{name}.lang
-       fi
-    fi
-  done
-done
-
-
-%post
-/sbin/ldconfig
-for f in crystalsvg hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-
-%postun
-/sbin/ldconfig
-for f in crystalsvg hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-
-%post libs
-/sbin/ldconfig
-
-%postun libs
-/sbin/ldconfig
-
-%post extras-libs
-/sbin/ldconfig
-
-%postun extras-libs
-/sbin/ldconfig
-
-%post extras
-/sbin/ldconfig
-for f in crystalsvg hicolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-
-%postun extras
-/sbin/ldconfig
-for f in crystalsvg hicolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files extras
-%defattr(-,root,root,-)
-
-# kaboodle
-%doc rpmdocs/kaboodle/
-%doc %lang(en) %{_docdir}/HTML/en/kaboodle/
-%{_bindir}/kaboodle
-%{tde_libdir}/libkaboodlepart.*
-%{_datadir}/applications/kde/kaboodle.desktop
-%{_datadir}/apps/kaboodle/
-%{_datadir}/icons/hicolor/*/apps/kaboodle.png
-%{_datadir}/services/kaboodle*
-
-# noatun
-%doc %lang(en) %{_docdir}/HTML/en/noatun/
-%{_bindir}/noatun
-%{_libdir}/kconf_update_bin/noatun20update
-%{tde_libdir}/noatun*
-%{_libdir}/libartseffects.*
-%{_libdir}/libwinskinvis.*
-%{_libdir}/libkdeinit_noatun.*
-%{_datadir}/applications/kde/noatun.desktop
-%{_datadir}/apps/kconf_update/noatun.upd
-%{_datadir}/apps/noatun/
-%{_datadir}/icons/hicolor/*/apps/noatun.png
-%{_datadir}/mimelnk/interface/x-winamp-skin.desktop
-
-# juk
-%doc %lang(en) %{_docdir}/HTML/en/juk/
-%{_bindir}/juk
-%{_datadir}/applications/kde/juk.desktop
-%{_datadir}/apps/juk/
-%{_datadir}/apps/konqueror/servicemenus/jukservicemenu.desktop
-%{_datadir}/icons/crystalsvg/*/*/juk*
-%{_datadir}/icons/hicolor/*/apps/juk.png
-
-%files extras-libs
-%defattr(-,root,root,-)
-%{_libdir}/libnoatun*.la
-%{_libdir}/libnoatun*.so.*
-%{_libdir}/libnoatunarts.so
-
-%files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc COPYING
-
-# kaboodle
-%exclude %{tde_docdir}/HTML/en/kaboodle/
-%exclude %{_bindir}/kaboodle
-%exclude %{tde_libdir}/libkaboodlepart.*
-%exclude %{_datadir}/applications/kde/kaboodle.desktop
-%exclude %{_datadir}/apps/kaboodle/
-%exclude %{_datadir}/icons/hicolor/*/apps/kaboodle.png
-%exclude %{_datadir}/services/kaboodle*
-
-# noatun
-%exclude %{tde_docdir}/HTML/en/noatun/
-%exclude %{_bindir}/noatun
-%exclude %{_libdir}/kconf_update_bin/noatun20update
-%exclude %{tde_libdir}/noatun*
-%exclude %{_libdir}/libartseffects.*
-%exclude %{_libdir}/libkdeinit_noatun.*
-%exclude %{_libdir}/libnoatunarts.*
-%exclude %{_libdir}/libnoatuncontrols.*
-%exclude %{_libdir}/libnoatun.*
-%exclude %{_libdir}/libnoatuntags.*
-%exclude %{_libdir}/libwinskinvis.*
-%exclude %{_datadir}/applications/kde/noatun.desktop
-%exclude %{_datadir}/apps/kconf_update/noatun.upd
-%exclude %{_datadir}/apps/noatun/
-%exclude %{_datadir}/icons/hicolor/*/apps/noatun.png
-%exclude %{_datadir}/mimelnk/interface/x-winamp-skin.desktop
-
-# juk
-%exclude %{tde_docdir}/HTML/en/juk/
-%exclude %{_bindir}/juk
-%exclude %{_datadir}/applications/kde/juk.desktop
-%exclude %{_datadir}/apps/juk/
-%exclude %{_datadir}/apps/konqueror/servicemenus/jukservicemenu.desktop
-%exclude %{_datadir}/icons/crystalsvg/*/*/juk*
-%exclude %{_datadir}/icons/hicolor/*/apps/juk.png
-
-/etc/xdg/menus/applications-merged/*
-%{_libdir}/mcop/*
-%{_libdir}/libkdeinit_*.so
-#%{_libdir}/liboggarts.so
-%{tde_libdir}/*
-%{_libdir}/kconf_update_bin/*
-%{_bindir}/*
-%{_datadir}/applications/kde/*
-%{_datadir}/apps/*
-%{_datadir}/autostart/*
-%{_datadir}/config.kcfg/*
-%{_datadir}/desktop-directories/*
-%{_datadir}/icons/crystalsvg/*/*/*
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/icons/locolor/*/*/*
-%{_datadir}/mimelnk/*
-%{_datadir}/services/*
-%{_datadir}/servicetypes/*
-
-%files libs
-%defattr(-,root,root,-)
-%exclude %{_libdir}/libnoatun*.*
-%{_libdir}/lib*.so.*
-%{_libdir}/lib*.la
-
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_includedir}/*
-%{_libdir}/lib*.so
-%exclude %{_libdir}/libkdeinit_*.so
-%exclude %{_libdir}/libartseffects.so
-%exclude %{_libdir}/libnoatunarts.*
-#exclude %{_libdir}/liboggarts.so
-%exclude %{_libdir}/libwinskinvis.so
-
-
-%changelog
-* Mon Sep 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2
-- Add support for RHEL5
-
-* Sat Sep 09 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
-- Initial release for RHEL 6
-- Spec file based on Fedora 8 "kdemultimedia-6:3.5.10-2"
diff --git a/redhat/tdemultimedia/kdemultimedia-3.5.13-fix_autostart_again.patch b/redhat/tdemultimedia/kdemultimedia-3.5.13-fix_autostart_again.patch
deleted file mode 100644
index 75fdf0610..000000000
--- a/redhat/tdemultimedia/kdemultimedia-3.5.13-fix_autostart_again.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-commit 7eb7626c8a6d819c040cd9aba0b0bca3b484fde7
-Author: Darrell Anderson <humanreadable@yahoo.com>
-Date:   1337622268 -0500
-
-    Reverse patch from GIT hash 2cc2e3a2.
-
-diff --git a/kmix/CMakeLists.txt b/kmix/CMakeLists.txt
-index 237c95d..a8a419f 100644
---- a/kmix/CMakeLists.txt
-+++ b/kmix/CMakeLists.txt
-@@ -26,7 +26,6 @@ link_directories(
- ##### other data ################################
- 
- install( FILES kmix.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
--install( FILES kmix.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} )
- install( FILES kmixui.rc DESTINATION ${DATA_INSTALL_DIR}/kmix )
- install( FILES restore_kmix_volumes.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} )
- install( FILES kmixapplet.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/applets )
-diff --git a/kmix/Makefile.am b/kmix/Makefile.am
-index d2da702..5051363 100644
---- a/kmix/Makefile.am
-+++ b/kmix/Makefile.am
-@@ -49,7 +49,7 @@ xdg_apps_DATA = kmix.desktop
- rcdir = $(kde_datadir)/kmix
- rc_DATA = kmixui.rc
- 
--autostart_DATA = kmix.desktop restore_kmix_volumes.desktop
-+autostart_DATA = restore_kmix_volumes.desktop
- autostartdir = $(datadir)/autostart
- 
- lnkdir = $(kde_datadir)/kicker/applets
diff --git a/redhat/tdemultimedia/kdemultimedia-3.5.13-fix_kmix_autostart.patch b/redhat/tdemultimedia/kdemultimedia-3.5.13-fix_kmix_autostart.patch
deleted file mode 100644
index 93a4796a4..000000000
--- a/redhat/tdemultimedia/kdemultimedia-3.5.13-fix_kmix_autostart.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-commit 7da06e558a75c035ea881347e9da69ef9ee57927
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1343199702 -0500
-
-    Fix kmix autostart
-    This resolves Bug 503, and re-applies commit 2cc2e3a2 as part of the fix
-
-
-diff --git a/kmix/KMixApp.cpp b/kmix/KMixApp.cpp
-index d1df895..10e7b6a 100644
---- a/kmix/KMixApp.cpp
-+++ b/kmix/KMixApp.cpp
-@@ -28,6 +28,8 @@
- KMixApp::KMixApp()
-     : KUniqueApplication(), m_kmix( 0 )
- {
-+   // We handle autostart via standard autostart-enabled .desktop file instead of the session manager
-+   disableSessionManagement();
- }
- 
- 
-diff --git a/kmix/Makefile.am b/kmix/Makefile.am
-index 5051363..d2da702 100644
---- a/kmix/Makefile.am
-+++ b/kmix/Makefile.am
-@@ -49,7 +49,7 @@ xdg_apps_DATA = kmix.desktop
- rcdir = $(kde_datadir)/kmix
- rc_DATA = kmixui.rc
- 
--autostart_DATA = restore_kmix_volumes.desktop
-+autostart_DATA = kmix.desktop restore_kmix_volumes.desktop
- autostartdir = $(datadir)/autostart
- 
- lnkdir = $(kde_datadir)/kicker/applets
diff --git a/redhat/tdemultimedia/kdemultimedia-3.5.13-fix_linear_alphabet.patch b/redhat/tdemultimedia/kdemultimedia-3.5.13-fix_linear_alphabet.patch
deleted file mode 100644
index 4bd48f89a..000000000
--- a/redhat/tdemultimedia/kdemultimedia-3.5.13-fix_linear_alphabet.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit fd6afacf70587de329d9b2647b96469bae5e74da
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1327530995 -0600
-
-    Fix linear alphabet string errors
-
-diff --git a/mpg123_artsplugin/mpg123/httpget.c b/mpg123_artsplugin/mpg123/httpget.c
-index 12c6941..7175011 100644
---- a/mpg123_artsplugin/mpg123/httpget.c
-+++ b/mpg123_artsplugin/mpg123/httpget.c
-@@ -83,7 +83,7 @@ void readstring (char *string, int maxlen, FILE *f)
- void encode64 (char *source,char *destination)
- {
-   static char *Base64Digits =
--    "ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-+    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-   int n = 0;
-   int ssiz=strlen(source);
-   int i;
diff --git a/redhat/tdemultimedia/kdemultimedia-3.5.13-fix_mmx_detection.patch b/redhat/tdemultimedia/kdemultimedia-3.5.13-fix_mmx_detection.patch
deleted file mode 100644
index 785b9d150..000000000
--- a/redhat/tdemultimedia/kdemultimedia-3.5.13-fix_mmx_detection.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN tdemultimedia/configure.in.in tdemultimedia.new/configure.in.in
---- tdemultimedia/configure.in.in	2010-08-11 22:36:30.000000000 -0500
-+++ tdemultimedia.new/configure.in.in	2012-01-12 22:54:04.000000000 -0600
-@@ -35,7 +35,7 @@
- 	then
- 		MMX_SUPPORT="no"
- 	else
--		as_ver=`echo $as_ver |sed -e "s/.*version //;s/ .*//"`
-+		as_ver=`echo|as -v 2>&1 | grep ".*version.*" | awk '{print $NF}'`
- 		as_major=`echo $as_ver |cut -d. -f1`
- 		if test $as_major -gt 2
- 		then
diff --git a/redhat/tdemultimedia/kdemultimedia-3.5.13-missing_ldflags.patch b/redhat/tdemultimedia/kdemultimedia-3.5.13-missing_ldflags.patch
deleted file mode 100644
index 7ce3dfda7..000000000
--- a/redhat/tdemultimedia/kdemultimedia-3.5.13-missing_ldflags.patch
+++ /dev/null
@@ -1,133 +0,0 @@
---- kdemultimedia/arts/runtime/Makefile.am.ORI	2012-07-31 13:56:06.508165053 +0200
-+++ kdemultimedia/arts/runtime/Makefile.am	2012-07-31 13:57:03.018059604 +0200
-@@ -11,7 +11,7 @@
-   structurebuilder_impl.cc structures_impl.cc moduleinfo.cc \
-   compatibility.cc localfactory_impl.cc artsbuilderloader_impl.cc
- 
--libartsbuilder_la_LIBADD = -lmcop -lartsflow $(LIBDL)
-+libartsbuilder_la_LIBADD = -lmcop -lartsflow $(LIBDL) -lartsflow_idl
- libartsbuilder_la_COMPILE_FIRST = artsbuilder.h
- libartsbuilder_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) \
-   -no-undefined
---- kdemultimedia/arts/gui/kde/Makefile.am.ORI	2012-07-31 14:06:50.128691312 +0200
-+++ kdemultimedia/arts/gui/kde/Makefile.am	2012-07-31 14:07:00.431493289 +0200
-@@ -15,7 +15,7 @@
-   klevelmeter_normalbars.cpp klevelmeter_firebars.cpp \
-   ktickmarks_impl.cpp kvolumefader_impl.cpp klabel_impl.cpp
- 
--libartsgui_kde_la_LIBADD = $(LIB_KIO) -lkdecore -lkdeui \
-+libartsgui_kde_la_LIBADD = $(LIB_KIO) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_QT) -lkdefx \
-   $(top_builddir)/arts/gui/common/libartsgui_idl.la
- libartsgui_kde_la_LDFLAGS = $(all_libraries) -no-undefined
- libartsgui_kde_la_COMPILE_FIRST = ../common/artsgui.h
---- kdemultimedia/arts/modules/synth/Makefile.am.ORI	2012-07-31 12:30:46.465821368 +0000
-+++ kdemultimedia/arts/modules/synth/Makefile.am	2012-07-31 12:32:09.287170210 +0000
-@@ -31,7 +31,7 @@
- libartsmodulessynth_la_LIBADD = \
- 	$(top_builddir)/arts/runtime/libartsbuilder.la \
- 	$(top_builddir)/arts/midi/libartsmidi_idl.la \
--	-lartsflow -lartsgsl -lartsflow_idl -lmcop
-+	-lartsflow -lartsgsl -lartsflow_idl -lmcop -lglib-2.0
- 
- #libartsmodulessynth_la_LIBADD = $(top_builddir)/arts/gui/common/libartsgui_idl.la $(top_builddir)/arts/midi/libartsmidi_idl.la -lartsflow -lartsflow_idl -lmcop $(LIBDL) $(LIB_KDEUI) $(LIB_KDECORE)
- libartsmodulessynth_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) -lartsflow -lartsgsl -no-undefined
---- kdemultimedia/arts/modules/common/Makefile.am.ORI	2012-07-31 12:36:08.682126035 +0000
-+++ kdemultimedia/arts/modules/common/Makefile.am	2012-07-31 12:36:17.362939295 +0000
-@@ -25,7 +25,7 @@
- 	$(top_builddir)/arts/gui/common/libartsgui_idl.la \
- 	$(top_builddir)/arts/midi/libartsmidi_idl.la \
- 	$(top_builddir)/arts/modules/synth/libartsmodulessynth.la \
--	-lartsflow -lartsflow_idl -lmcop $(LIB_KDECORE)
-+	-lartsflow -lartsflow_idl -lmcop $(LIB_KDECORE) $(LIB_QT) $(VORBISFILE_LIBS) -lgthread-2.0
- 
- libartsmodulescommon_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) -no-undefined
- 
---- kdemultimedia/juk/Makefile.am.ORI	2012-07-31 14:39:39.222531330 +0200
-+++ kdemultimedia/juk/Makefile.am	2012-07-31 14:40:03.805986466 +0200
-@@ -85,7 +85,7 @@
- ##################################################
- 
- juk_LDADD = -lm $(LDADD_GST) $(mblibs) $(LIB_KIO) $(taglib_libs) $(akode_libs) $(LIB_KHTML) $(LIB_ARTS)
--juk_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LDFLAGS_GST) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl
-+juk_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LDFLAGS_GST) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl $(akode_libs)
- 
- KDE_CXXFLAGS = $(USE_EXCEPTIONS)
- 
---- kdemultimedia/kmid/Makefile.am.ORI	2012-07-31 14:42:26.666868929 +0200
-+++ kdemultimedia/kmid/Makefile.am	2012-07-31 14:43:01.345123193 +0200
-@@ -4,7 +4,7 @@
- lib_LTLIBRARIES = libkmidlib.la
- 
- libkmidlib_la_LDFLAGS = $(all_libraries)
--libkmidlib_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KIO) -lkmid
-+libkmidlib_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KIO) -lkmid $(LIB_QT) $(LIB_KDEUI) -lDCOP $(LIB_KDECORE)
- 
- libkmidpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
- libkmidpart_la_LIBADD = libkmidlib.la
---- kdemultimedia/kmix/Makefile.am.ORI	2012-07-31 14:45:49.958546243 +0200
-+++ kdemultimedia/kmix/Makefile.am	2012-07-31 14:47:51.780002978 +0200
-@@ -25,13 +25,13 @@
- 	volume.cpp kledbutton.cpp verticaltext.cpp mixerIface.skel \
- 	kmixtoolbox.cpp mixertoolbox.cpp dialogviewconfiguration.cpp KMixApp.cpp dialogselectmaster.cpp
- 
--kmix_la_LIBADD = $(LIB_KDEUI) $(LIB_KUTILS) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND)
-+kmix_la_LIBADD = $(LIB_KDEUI) $(LIB_KUTILS) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) $(LIB_QT) $(LIB_KDECORE) -lDCOP
- kmix_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -avoid-version
- 
- kmixctrl_la_SOURCES = kmixctrl.cpp mixer.cpp mixset.cpp mixdevice.cpp volume.cpp mixerIface.skel \
- 	mixertoolbox.cpp mixer_backend.cpp
- 
--kmixctrl_la_LIBADD = $(LIB_KDECORE) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND)
-+kmixctrl_la_LIBADD = $(LIB_KDECORE) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) $(LIB_QT) -lDCOP
- kmixctrl_la_LDFLAGS = $(all_libraries) -module -avoid-version
- 
- kmix_panelapplet_la_SOURCES = kmixapplet.cpp \
---- kdemultimedia/libkcddb/Makefile.am.ORI	2012-07-31 14:54:00.740438712 +0200
-+++ kdemultimedia/libkcddb/Makefile.am	2012-07-31 14:54:14.899151410 +0200
-@@ -14,7 +14,7 @@
-     cdinfoencodingwidget.cpp cdinfoencodingwidgetbase.ui
- 
- libkcddb_la_LDFLAGS = $(all_libraries) -version-info 1:0:0
--libkcddb_la_LIBADD  = $(LIB_KDECORE) $(LIB_KIO)
-+libkcddb_la_LIBADD  = $(LIB_KDECORE) $(LIB_KIO) $(LIB_QT) $(LIB_KDEUI)
- 
- METASOURCES = AUTO
- 
---- kdemultimedia/noatun/library/noatunarts/Makefile.am.ORI	2012-07-31 15:07:07.507909928 +0200
-+++ kdemultimedia/noatun/library/noatunarts/Makefile.am	2012-07-31 15:07:17.378685278 +0200
-@@ -7,7 +7,7 @@
-                            StereoVolumeControl_impl.cpp Session_impl.cpp
- libnoatunarts_la_COMPILE_FIRST = noatunarts.h
- libnoatunarts_la_LDFLAGS = $(all_libraries) -avoid-version -no-undefined
--libnoatunarts_la_LIBADD =  -lkmedia2_idl -lsoundserver_idl -lartsflow
-+libnoatunarts_la_LIBADD =  -lkmedia2_idl -lsoundserver_idl -lartsflow -lmcop -lartsflow_idl
- libnoatunarts_la_METASOURCES = AUTO
- 
- noatunarts.mcoptype: noatunarts.h
---- kdemultimedia/noatun/library/Makefile.am.ftbfs	2011-10-28 21:13:18.000000000 +0200
-+++ kdemultimedia/noatun/library/Makefile.am	2012-07-31 15:20:52.961371759 +0200
-@@ -30,11 +30,11 @@
- libnoatun_la_LIBADD      = $(top_builddir)/arts/gui/common/libartsgui.la \
- 	$(top_builddir)/arts/gui/kde/libartsgui_kde.la $(top_builddir)/arts/modules/libartsmodules.la \
- 	-lkio -lqtmcop -lkmedia2_idl $(top_builddir)/noatun/library/noatunarts/libnoatunarts.la \
--	-lartsflow -lsoundserver_idl -lartskde $(LIBDL)
-+	-lartsflow -lsoundserver_idl -lartskde $(LIBDL) $(LIB_QT) -lDCOP
- 
- libnoatuncontrols_la_SOURCES = controls.cpp scrollinglabel.cpp
- libnoatuncontrols_la_LDFLAGS = -version-info 3:0:2 $(KDE_RPATH) $(all_libraries) -no-undefined
--libnoatuncontrols_la_LIBADD  = $(LIBDL) $(LIB_KDEUI)
-+libnoatuncontrols_la_LIBADD  = $(LIBDL) $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE)
- 
- METASOURCES = AUTO
- META_INCLUDES = $(srcdir)/noatun
---- kdemultimedia/noatun/modules/winskin/vis/Makefile.am.ORI	2012-07-31 15:26:20.619544165 +0200
-+++ kdemultimedia/noatun/modules/winskin/vis/Makefile.am	2012-07-31 15:26:33.802272534 +0200
-@@ -17,7 +17,7 @@
- libwinskinvis_la_LDFLAGS=	$(all_libraries) -avoid-version \
- 				-no-undefined
- 
--libwinskinvis_la_LIBADD =	-lkmedia2_idl -lsoundserver_idl -lartsflow
-+libwinskinvis_la_LIBADD =	-lkmedia2_idl -lsoundserver_idl -lartsflow -lartsflow_idl -lmcop
- libwinskinvis_la_COMPILE_FIRST = winskinvis.cc
- libwinskinvis_la_METASOURCES =	AUTO
- 
diff --git a/redhat/tdemultimedia/kdemultimedia-3.5.13-remove_more_applications.patch b/redhat/tdemultimedia/kdemultimedia-3.5.13-remove_more_applications.patch
deleted file mode 100644
index 213fd6410..000000000
--- a/redhat/tdemultimedia/kdemultimedia-3.5.13-remove_more_applications.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-commit 31e44a7b933cb32eaf1c9e3d8bbbaae806963956
-Author: Darrell Anderson <humanreadable@yahoo.com>
-Date:   1331690438 -0500
-
-    Remove "More Applications" from TDE menu.
-    This partially resolves bug report 653.
-
-diff --git a/arts/builder/artsbuilder.desktop b/arts/builder/artsbuilder.desktop
-index 52a1b53..22e78e3 100644
---- a/arts/builder/artsbuilder.desktop
-+++ b/arts/builder/artsbuilder.desktop
-@@ -119,5 +119,5 @@ MimeType=application/x-artsbuilder;
- DocPath=artsbuilder/index.html
- X-DCOP-ServiceType=Multi
- OnlyShowIn=KDE;
--Categories=Qt;KDE;AudioVideo;X-KDE-More;
-+Categories=Qt;KDE;AudioVideo;
- NoDisplay=true
-diff --git a/arts/tools/artscontrol.desktop b/arts/tools/artscontrol.desktop
-index d4bc38f..39a2640 100644
---- a/arts/tools/artscontrol.desktop
-+++ b/arts/tools/artscontrol.desktop
-@@ -133,5 +133,5 @@ Terminal=false
- X-DCOP-ServiceType=Multi
- DocPath=artsbuilder/index.html
- OnlyShowIn=KDE;
--Categories=Qt;KDE;AudioVideo;X-KDE-More;
-+Categories=Qt;KDE;AudioVideo;
- NoDisplay=true
-diff --git a/kaboodle/kaboodle.desktop b/kaboodle/kaboodle.desktop
-index 2bddd99..f8f96e9 100644
---- a/kaboodle/kaboodle.desktop
-+++ b/kaboodle/kaboodle.desktop
-@@ -80,4 +80,4 @@ GenericName[zu]=Umdlali Womculo
- Terminal=false
- InitialPreference=6
- X-DCOP-ServiceType=Multi
--Categories=Qt;KDE;AudioVideo;X-KDE-More;
-+Categories=Qt;KDE;AudioVideo;
-diff --git a/kmid/kmid.desktop b/kmid/kmid.desktop
-index 3920b85..f99bdda 100644
---- a/kmid/kmid.desktop
-+++ b/kmid/kmid.desktop
-@@ -85,4 +85,4 @@ ServiceTypes=Browser/View
- X-KDE-Library=libkmidpart
- X-KDE-StartupNotify=true
- X-DCOP-ServiceType=Multi
--Categories=Qt;KDE;AudioVideo;X-KDE-More;
-+Categories=Qt;KDE;AudioVideo;
diff --git a/redhat/tdemultimedia/kdemultimedia-3.5.13.1.spec b/redhat/tdemultimedia/kdemultimedia-3.5.13.1.spec
deleted file mode 100644
index 519d50aaa..000000000
--- a/redhat/tdemultimedia/kdemultimedia-3.5.13.1.spec
+++ /dev/null
@@ -1,1185 +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 _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-# former extras bits
-%define _with_akode --with-akode
-## not currently compatible with libtunepimp-0.5 (only libtunepimp-0.4)
-#define _with_musicbrainz --with-musicbrainz
-%define _with_taglib --with-taglib
-
-Name:		trinity-tdemultimedia
-Summary:	Multimedia applications for the Trinity Desktop Environment (TDE)
-Version:	3.5.13.1
-Release:	1%{?dist}%{?_variant}
-
-License:	GPLv2
-Group:		Applications/Multimedia
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	kdemultimedia-%{version}.tar.gz
-
-
-# RedHat Legacy patches (from Fedora 8)
-Patch3:		kdemultimedia-3.4.0-xdg.patch
-Patch5:		kdemultimedia-3.5.7-pthread.patch
-
-
-Obsoletes:	trinity-kdemultimedia < %{version}-%{release}
-Provides:	trinity-kdemultimedia = %{version}-%{release}
-Obsoletes:	trinity-kdemultimedia-libs < %{version}-%{release}
-Provides:	trinity-kdemultimedia-libs = %{version}-%{release}
-Obsoletes:	trinity-kdemultimedia-extras < %{version}-%{release}
-Provides:	trinity-kdemultimedia-extras = %{version}-%{release}
-Obsoletes:	trinity-kdemultimedia-extras-libs < %{version}-%{release}
-Provides:	trinity-kdemultimedia-extras-libs = %{version}-%{release}
-
-
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	qt3-devel
-BuildRequires:	trinity-tqtinterface-devel >= %{version}
-BuildRequires:	trinity-arts-devel >= %{version}
-BuildRequires:	trinity-tdelibs-devel >= %{version}
-%{?_with_akode:BuildRequires: trinity-akode-devel}
-
-BuildRequires:	desktop-file-utils
-BuildRequires:	zlib-devel
-
-# Audio libraries
-BuildRequires:	libvorbis-devel
-BuildRequires:	audiofile-devel
-BuildRequires:	libtheora-devel
-BuildRequires:	alsa-lib-devel 
-%{?_with_musicbrainz:BuildRequires: libmusicbrainz-devel libtunepimp-devel}
-%{?_with_taglib:BuildRequires: taglib-devel}
-BuildRequires:	cdparanoia
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}gstreamer0.10-devel
-BuildRequires:	%{_lib}flac-devel
-BuildRequires:	libcdda-devel
-%else
-BuildRequires:	gstreamer-devel
-BuildRequires:	flac-devel
-BuildRequires:	cdparanoia-devel
-%endif
-
-# X11 Libraries
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}xxf86dga-devel
-BuildRequires:	%{_lib}xxf86vm-devel
-BuildRequires:	%{_lib}xtst-devel
-%endif
-%if 0%{?rhel} == 4
-BuildRequires:	xorg-x11-devel
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
-BuildRequires:	libXxf86dga-devel
-BuildRequires:	libXxf86vm-devel
-BuildRequires:	libXt-devel
-%endif
-
-# XINE support
-%if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_xine 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}xine-devel
-%endif
-%if 0%{?fedora} || 0%{?rhel}
-BuildRequires: xine-lib-devel
-%endif
-%if 0%{?suse_version} >= 1220
-BuildRequires: libxine-devel
-%endif
-%endif
-
-Requires: trinity-artsbuilder = %{version}-%{release}
-Requires: trinity-juk = %{version}-%{release}
-Requires: trinity-kaboodle = %{version}-%{release}
-Requires: trinity-kaudiocreator = %{version}-%{release}
-Requires: %{name}-kfile-plugins = %{version}-%{release}
-Requires: %{name}-kappfinder-data = %{version}-%{release}
-Requires: %{name}-kio-plugins = %{version}-%{release}
-Requires: trinity-kmid = %{version}-%{release}
-Requires: trinity-kmix = %{version}-%{release}
-Requires: trinity-krec = %{version}-%{release}
-Requires: trinity-kscd = %{version}-%{release}
-Requires: trinity-libarts-akode = %{version}-%{release}
-Requires: trinity-libarts-audiofile = %{version}-%{release}
-Requires: trinity-libarts-mpeglib = %{version}-%{release}
-%{?with_xine:Requires: trinity-libarts-xine = %{version}-%{release}}
-Requires: trinity-libkcddb = %{version}-%{release}
-Requires: trinity-mpeglib = %{version}-%{release}
-Requires: trinity-noatun = %{version}-%{release}
-
-
-%description
-The Trinity Desktop Environment (TDE) is a GUI desktop for the X Window
-System. The %{name} package contains multimedia applications for
-TDE, including:
-  artsbuilder, Synthesizer designer for aRts
-  juk, a media player
-  kmid, a midi player
-  kmix, an audio mixer
-  arts, additional functionality for the aRts sound system
-  krec, a recording tool
-  kscd, an Audio-CD player
-  kaudiocreator, a graphical frontend for audio file creation 
-  kaboodle, a media player
-  noatun, a media player
-
-%files
-
-##########
-
-%package -n trinity-artsbuilder
-Summary:	Synthesizer designer for aRts
-Group:		Applications/Multimedia
-
-%description -n trinity-artsbuilder
-This is the analog Realtime synthesizer's graphical design tool.
-
-%files -n trinity-artsbuilder
-%defattr(-,root,root,-)
-%{tde_bindir}/artsbuilder
-%{tde_bindir}/artscontrol
-%{tde_bindir}/midisend
-%{tde_libdir}/libartsbuilder.la
-%{tde_libdir}/libartsbuilder.so.*
-%{tde_libdir}/libartscontrolapplet.la
-%{tde_libdir}/libartscontrolapplet.so.*
-%{tde_libdir}/libartscontrolsupport.la
-%{tde_libdir}/libartscontrolsupport.so.*
-%{tde_libdir}/libartsgui_idl.la
-%{tde_libdir}/libartsgui_idl.so.*
-%{tde_libdir}/libartsgui_kde.la
-%{tde_libdir}/libartsgui_kde.so.*
-%{tde_libdir}/libartsgui.la
-%{tde_libdir}/libartsgui.so.*
-%{tde_libdir}/libartsmidi_idl.la
-%{tde_libdir}/libartsmidi_idl.so.*
-%{tde_libdir}/libartsmidi.la
-%{tde_libdir}/libartsmidi.so.*
-%{tde_libdir}/libartsmodulescommon.la
-%{tde_libdir}/libartsmodulescommon.so.*
-%{tde_libdir}/libartsmoduleseffects.la
-%{tde_libdir}/libartsmoduleseffects.so.*
-%{tde_libdir}/libartsmodulesmixers.la
-%{tde_libdir}/libartsmodulesmixers.so.*
-%{tde_libdir}/libartsmodules.la
-%{tde_libdir}/libartsmodules.so.*
-%{tde_libdir}/libartsmodulessynth.la
-%{tde_libdir}/libartsmodulessynth.so.*
-%{tde_libdir}/mcop/Arts/ArtsBuilderLoader.mcopclass
-%{tde_libdir}/mcop/artsbuilder.mcopclass
-%{tde_libdir}/mcop/artsbuilder.mcoptype
-%{tde_libdir}/mcop/Arts/Button.mcopclass
-%{tde_libdir}/mcop/Arts/EffectRackGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/Effect_WAVECAPTURE.mcopclass
-%{tde_libdir}/mcop/Arts/Environment/Container.mcopclass
-%{tde_libdir}/mcop/Arts/Environment/EffectRackItem.mcopclass
-%{tde_libdir}/mcop/Arts/Environment/InstrumentItemGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/Environment/InstrumentItem.mcopclass
-%{tde_libdir}/mcop/Arts/Environment/MixerItem.mcopclass
-%{tde_libdir}/mcop/Arts/Fader.mcopclass
-%{tde_libdir}/mcop/Arts/FiveBandMonoComplexEQGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/FiveBandMonoComplexEQ.mcopclass
-%{tde_libdir}/mcop/Arts/FreeverbGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/GenericGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/GraphLine.mcopclass
-%{tde_libdir}/mcop/artsgui.mcopclass
-%{tde_libdir}/mcop/artsgui.mcoptype
-%{tde_libdir}/mcop/Arts/HBox.mcopclass
-%{tde_libdir}/mcop/Arts/Label.mcopclass
-%{tde_libdir}/mcop/Arts/LayoutBox.mcopclass
-%{tde_libdir}/mcop/Arts/LevelMeter.mcopclass
-%{tde_libdir}/mcop/Arts/LineEdit.mcopclass
-%{tde_libdir}/mcop/Arts/LittleStereoMixerChannelGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/LittleStereoMixerChannel.mcopclass
-%{tde_libdir}/mcop/Arts/LocalFactory.mcopclass
-%{tde_libdir}/mcop/Arts/MidiManager.mcopclass
-%{tde_libdir}/mcop/artsmidi.mcopclass
-%{tde_libdir}/mcop/artsmidi.mcoptype
-%{tde_libdir}/mcop/Arts/MixerGuiFactory.mcopclass
-%{tde_libdir}/mcop/artsmodulescommon.mcopclass
-%{tde_libdir}/mcop/artsmodulescommon.mcoptype
-%{tde_libdir}/mcop/artsmoduleseffects.mcopclass
-%{tde_libdir}/mcop/artsmoduleseffects.mcoptype
-%{tde_libdir}/mcop/artsmodules.mcopclass
-%{tde_libdir}/mcop/artsmodules.mcoptype
-%{tde_libdir}/mcop/artsmodulesmixers.mcopclass
-%{tde_libdir}/mcop/artsmodulesmixers.mcoptype
-%{tde_libdir}/mcop/artsmodulessynth.mcopclass
-%{tde_libdir}/mcop/artsmodulessynth.mcoptype
-%{tde_libdir}/mcop/Arts/MonoSimpleMixerChannelGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/MonoSimpleMixerChannel.mcopclass
-%{tde_libdir}/mcop/Arts/MonoToStereo.mcopclass
-%{tde_libdir}/mcop/Arts/PopupBox.mcopclass
-%{tde_libdir}/mcop/Arts/Poti.mcopclass
-%{tde_libdir}/mcop/Arts/SimpleMixerChannelGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/SimpleMixerChannel.mcopclass
-%{tde_libdir}/mcop/Arts/SpinBox.mcopclass
-%{tde_libdir}/mcop/Arts/StereoBalanceGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/StereoBalance.mcopclass
-%{tde_libdir}/mcop/Arts/StereoCompressorGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/StereoFirEqualizerGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/StereoToMono.mcopclass
-%{tde_libdir}/mcop/Arts/StereoVolumeControlGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/StereoVolumeControlGui.mcopclass
-%{tde_libdir}/mcop/Arts/StructureBuilder.mcopclass
-%{tde_libdir}/mcop/Arts/StructureDesc.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_ATAN_SATURATE.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_AUTOPANNER.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_BRICKWALL_LIMITER.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_CAPTURE_WAV.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_CDELAY.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_COMPRESSOR.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_DATA.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_DEBUG.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_DELAY.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_DIV.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_ENVELOPE_ADSR.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_FM_SOURCE.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_FREEVERB.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_FX_CFLANGER.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_MIDI_DEBUG.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_MIDI_TEST.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_MOOG_VCF.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_NIL.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_NOISE.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_OSC.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_PITCH_SHIFT_FFT.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_PITCH_SHIFT.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_PLAY_PAT.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_PSCALE.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_RC.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_SEQUENCE_FREQ.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_SEQUENCE.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_SHELVE_CUTOFF.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_STD_EQUALIZER.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_STEREO_COMPRESSOR.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_STEREO_FIR_EQUALIZER.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_STEREO_PITCH_SHIFT_FFT.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_STEREO_PITCH_SHIFT.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_TREMOLO.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_VOICE_REMOVAL.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_WAVE_PULSE.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_WAVE_SOFTSAW.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_WAVE_SQUARE.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_WAVE_TRI.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_XFADE.mcopclass
-%{tde_libdir}/mcop/Arts/VBox.mcopclass
-%{tde_libdir}/mcop/Arts/VoiceRemovalGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/Widget.mcopclass
-%{tde_tdeappdir}/artsbuilder.desktop
-%{tde_tdeappdir}/artscontrol.desktop
-%{tde_datadir}/apps/artsbuilder/
-%{tde_datadir}/apps/artscontrol/
-%{tde_datadir}/apps/kicker/applets/artscontrolapplet.desktop
-%{tde_datadir}/icons/crystalsvg/*/actions/artsaudiomanager.png
-%{tde_datadir}/icons/crystalsvg/*/actions/artsbuilderexecute.png
-%{tde_datadir}/icons/crystalsvg/*/actions/artsenvironment.png
-%{tde_datadir}/icons/crystalsvg/*/actions/artsfftscope.png
-%{tde_datadir}/icons/crystalsvg/*/actions/artsmediatypes.png
-%{tde_datadir}/icons/crystalsvg/*/actions/artsmidimanager.png
-%{tde_datadir}/icons/crystalsvg/scalable/actions/artsaudiomanager.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/actions/artsenvironment.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/actions/artsfftscope.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/actions/artsmediatypes.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/actions/artsmidimanager.svgz
-%{tde_datadir}/icons/hicolor/*/apps/artsbuilder.png
-%{tde_datadir}/icons/hicolor/*/apps/artscontrol.png
-%{tde_datadir}/icons/hicolor/scalable/apps/artsbuilder.svgz
-%{tde_datadir}/icons/hicolor/scalable/apps/artscontrol.svgz
-%{tde_datadir}/mimelnk/application/x-artsbuilder.desktop
-%{tde_tdedocdir}/HTML/en/artsbuilder/
-
-%post -n trinity-artsbuilder
-/sbin/ldconfig
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-artsbuilder
-/sbin/ldconfig
-for f in crystalsvg hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-juk
-Summary:	Music organizer and player for Trinity
-Group:		Applications/Multimedia
-
-%description -n trinity-juk
-JuK (pronounced "jook") is a jukebox and music manager for the TDE
-desktop similar to jukebox software on other platforms such as
-iTunes or RealOne.
-
-Some of JuK's features include:
-* Support for Ogg Vorbis and MP3 formats
-* Tag editing support for both formats, including ID3v2 for MP3 files.
-  Multitagging or editing a selection of multiple files at once is also
-  supported
-* Output to either the aRts, default KDE sound system, or GStreamer
-* Management of your "collection" and multiple playlists
-* Import and export to m3u playlists
-* Binary caching of audio meta-data and playlist information for faster
-  load times (starting with the second time you run JuK)
-* Integration into TDE that allows drag-and-drop and clipboard usage
-  with other TDE and X apps
-
-%files -n trinity-juk
-%defattr(-,root,root,-)
-%{tde_bindir}/juk
-%{tde_tdeappdir}/juk.desktop
-%{tde_datadir}/apps/juk/
-%{tde_datadir}/apps/konqueror/servicemenus/jukservicemenu.desktop
-%{tde_datadir}/icons/crystalsvg/*/actions/juk_dock.png
-%{tde_datadir}/icons/hicolor/*/apps/juk.png
-%{tde_tdedocdir}/HTML/en/juk/
-
-%post -n trinity-juk
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-juk
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kaboodle
-Summary:	light, embedded media player for Trinity
-Group:		Applications/Multimedia
-
-%if 0%{?with_xine}
-Requires:	trinity-libarts-xine = %{version}-%{release}
-%endif
-
-%description -n trinity-kaboodle
-Kaboodle is a light, embedded media player, supporting both video and audio,
-for TDE. It uses the aRts framework for playing media files.
-
-%files -n trinity-kaboodle
-%defattr(-,root,root,-)
-%{tde_bindir}/kaboodle
-%{tde_tdelibdir}/libkaboodlepart.la
-%{tde_tdelibdir}/libkaboodlepart.so
-%{tde_tdeappdir}/kaboodle.desktop
-%{tde_datadir}/apps/kaboodle/
-%{tde_datadir}/icons/hicolor/*/apps/kaboodle.png
-%{tde_datadir}/services/kaboodle_component.desktop
-%{tde_datadir}/services/kaboodleengine.desktop
-%{tde_tdedocdir}/HTML/en/kaboodle/
-
-%post -n trinity-kaboodle
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kaboodle
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kaudiocreator
-Summary:	CD ripper and audio encoder frontend for Trinity
-Group:		Applications/Multimedia
-
-Requires:	%{name}-kio-plugins = %{version}-%{release}
-Requires:	vorbis-tools
-Requires:	flac
-
-%description -n trinity-kaudiocreator
-KAudioCreator is a tool for audio extraction (ripping) and encoding. It can
-keep your WAV files, or convert them to Ogg/Vorbis, MP3, or FLAC. It also
-searches CDDB to retrieve the information of the disk.
-
-%files -n trinity-kaudiocreator
-%defattr(-,root,root,-)
-%{tde_bindir}/kaudiocreator
-%{tde_tdeappdir}/kaudiocreator.desktop
-%{tde_datadir}/apps/kaudiocreator/
-%{tde_datadir}/apps/kconf_update/kaudiocreator-libkcddb.upd
-%{tde_datadir}/apps/kconf_update/kaudiocreator-meta.upd
-%{tde_datadir}/apps/kconf_update/upgrade-kaudiocreator-metadata.sh
-%{tde_datadir}/apps/konqueror/servicemenus/audiocd_extract.desktop
-%{tde_datadir}/config.kcfg/kaudiocreator.kcfg
-%{tde_datadir}/config.kcfg/kaudiocreator_encoders.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kaudiocreator.png
-%{tde_datadir}/icons/locolor/*/apps/kaudiocreator.png
-%{tde_tdedocdir}/HTML/en/kaudiocreator/
-
-%post -n trinity-kaudiocreator
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kaudiocreator
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package kfile-plugins
-Summary:	au/avi/m3u/mp3/ogg/wav plugins for kfile
-Group:		Applications/Multimedia
-
-%description kfile-plugins
-au/avi/m3u/mp3/ogg/wav file metainformation plugins for Trinity.
-
-%files kfile-plugins
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kfile_au.la
-%{tde_tdelibdir}/kfile_au.so
-%{tde_tdelibdir}/kfile_avi.la
-%{tde_tdelibdir}/kfile_avi.so
-%{tde_tdelibdir}/kfile_flac.la
-%{tde_tdelibdir}/kfile_flac.so
-%{tde_tdelibdir}/kfile_m3u.la
-%{tde_tdelibdir}/kfile_m3u.so
-%{tde_tdelibdir}/kfile_mp3.la
-%{tde_tdelibdir}/kfile_mp3.so
-%{tde_tdelibdir}/kfile_mpc.la
-%{tde_tdelibdir}/kfile_mpc.so
-%{tde_tdelibdir}/kfile_mpeg.la
-%{tde_tdelibdir}/kfile_mpeg.so
-%{tde_tdelibdir}/kfile_ogg.la
-%{tde_tdelibdir}/kfile_ogg.so
-%{tde_tdelibdir}/kfile_sid.la
-%{tde_tdelibdir}/kfile_sid.so
-%{tde_tdelibdir}/kfile_theora.la
-%{tde_tdelibdir}/kfile_theora.so
-%{tde_tdelibdir}/kfile_wav.la
-%{tde_tdelibdir}/kfile_wav.so
-%{tde_datadir}/services/kfile_au.desktop
-%{tde_datadir}/services/kfile_avi.desktop
-%{tde_datadir}/services/kfile_flac.desktop
-%{tde_datadir}/services/kfile_m3u.desktop
-%{tde_datadir}/services/kfile_mp3.desktop
-%{tde_datadir}/services/kfile_mpc.desktop
-%{tde_datadir}/services/kfile_mpeg.desktop
-%{tde_datadir}/services/kfile_ogg.desktop
-%{tde_datadir}/services/kfile_sid.desktop
-%{tde_datadir}/services/kfile_theora.desktop
-%{tde_datadir}/services/kfile_wav.desktop
-
-##########
-
-%package kappfinder-data
-Summary:	multimedia data for kappfinder-trinity
-Group:		Applications/Multimedia
-
-Requires: 	trinity-kappfinder
-
-%description kappfinder-data
-This package provides data on multimedia applications for kappfinder.
-
-%files kappfinder-data
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/kappfinder/*
-%{tde_datadir}/desktop-directories/[kt]de-multimedia-music.directory
-%{tde_prefix}/etc/xdg/menus/applications-merged/trinity-multimedia-music.menu
-
-##########
-
-%package kio-plugins
-Summary:	Enables the browsing of audio CDs under Konqueror
-Group:		Applications/Multimedia
-
-%description kio-plugins
-This package allow audio CDs to be browsed like a file system using
-Konqueror and the audiocd:/ URL.
-
-%files kio-plugins
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kcm_audiocd.la
-%{tde_tdelibdir}/kcm_audiocd.so
-%{tde_tdelibdir}/kio_audiocd.la
-%{tde_tdelibdir}/kio_audiocd.so
-%{tde_tdelibdir}/libaudiocd_encoder_flac.la
-%{tde_tdelibdir}/libaudiocd_encoder_flac.so
-%{tde_tdelibdir}/libaudiocd_encoder_lame.la
-%{tde_tdelibdir}/libaudiocd_encoder_lame.so
-%{tde_tdelibdir}/libaudiocd_encoder_vorbis.la
-%{tde_tdelibdir}/libaudiocd_encoder_vorbis.so
-%{tde_tdelibdir}/libaudiocd_encoder_wav.la
-%{tde_tdelibdir}/libaudiocd_encoder_wav.so
-%{tde_libdir}/libaudiocdplugins.so.*
-%{tde_tdeappdir}/audiocd.desktop
-%{tde_datadir}/apps/kconf_update/audiocd.upd
-%{tde_datadir}/apps/kconf_update/upgrade-metadata.sh
-%{tde_datadir}/config.kcfg/audiocd_lame_encoder.kcfg
-%{tde_datadir}/config.kcfg/audiocd_vorbis_encoder.kcfg
-%{tde_datadir}/services/audiocd.protocol
-%{tde_tdedocdir}/HTML/en/kioslave/audiocd.docbook
-
-%post kio-plugins
-/sbin/ldconfig
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun kio-plugins
-/sbin/ldconfig
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kmid
-Summary:	MIDI/karaoke player for Trinity
-Group:		Applications/Multimedia
-
-%description -n trinity-kmid
-This package provides a MIDI and karaoke player for TDE.
-
-%files -n trinity-kmid
-%defattr(-,root,root,-)
-%{tde_bindir}/kmid
-%{tde_tdelibdir}/libkmidpart.la
-%{tde_tdelibdir}/libkmidpart.so
-%{tde_libdir}/libkmidlib.so.*
-%{tde_tdeappdir}/kmid.desktop
-%{tde_datadir}/apps/kmid/
-%{tde_datadir}/icons/hicolor/*/apps/kmid.png
-%{tde_datadir}/mimelnk/audio/x-karaoke.desktop
-%{tde_datadir}/servicetypes/audiomidi.desktop
-%{tde_tdedocdir}/HTML/en/kmid/
-
-%post -n trinity-kmid
-/sbin/ldconfig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kmid
-/sbin/ldconfig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kmix
-Summary:	Sound mixer applet for Trinity
-Group:		Applications/Multimedia
-
-%description -n trinity-kmix
-This package includes TDE's dockable sound mixer applet.
-
-%files -n trinity-kmix
-%defattr(-,root,root,-)
-%{tde_bindir}/kmix
-%{tde_bindir}/kmixctrl
-%{tde_tdelibdir}/kmix.la
-%{tde_tdelibdir}/kmix.so
-%{tde_tdelibdir}/kmix_panelapplet.la
-%{tde_tdelibdir}/kmix_panelapplet.so
-%{tde_tdelibdir}/kmixctrl.la
-%{tde_tdelibdir}/kmixctrl.so
-%{tde_libdir}/lib[kt]deinit_kmix.so
-%{tde_libdir}/lib[kt]deinit_kmixctrl.so
-%{tde_tdeappdir}/kmix.desktop
-%{tde_datadir}/apps/kicker/applets/kmixapplet.desktop
-%{tde_datadir}/apps/kmix/
-%{tde_datadir}/autostart/kmix.desktop
-%{tde_datadir}/autostart/restore_kmix_volumes.desktop
-%{tde_datadir}/icons/hicolor/*/apps/kmix.png
-%{tde_datadir}/services/kmixctrl_restore.desktop
-%{tde_tdedocdir}/HTML/en/kmix/
-
-%post -n trinity-kmix
-/sbin/ldconfig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kmix
-/sbin/ldconfig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-krec
-Summary:	Sound recorder utility for Trinity
-Group:		Applications/Multimedia
-
-%description -n trinity-krec
-This is a sound recording utility for Trinity.
-
-%files -n trinity-krec
-%defattr(-,root,root,-)
-%{tde_bindir}/krec
-%{tde_tdelibdir}/kcm_krec.la
-%{tde_tdelibdir}/kcm_krec.so
-%{tde_tdelibdir}/kcm_krec_files.la
-%{tde_tdelibdir}/kcm_krec_files.so
-%{tde_tdelibdir}/krec.la
-%{tde_tdelibdir}/krec.so
-%{tde_tdelibdir}/libkrecexport_ogg.la
-%{tde_tdelibdir}/libkrecexport_ogg.so
-%{tde_tdelibdir}/libkrecexport_wave.la
-%{tde_tdelibdir}/libkrecexport_wave.so
-%{tde_libdir}/lib[kt]deinit_krec.so
-%{tde_tdeappdir}/krec.desktop
-%{tde_datadir}/apps/krec/
-%{tde_datadir}/icons/hicolor/*/apps/krec.png
-%{tde_datadir}/services/kcm_krec.desktop
-%{tde_datadir}/services/kcm_krec_files.desktop
-%{tde_datadir}/services/krec_exportogg.desktop
-%{tde_datadir}/services/krec_exportwave.desktop
-%{tde_datadir}/servicetypes/krec_exportitem.desktop
-%{tde_tdedocdir}/HTML/en/krec/
-
-%post -n trinity-krec
-/sbin/ldconfig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-krec
-/sbin/ldconfig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kscd
-Summary:	Audio CD player for Trinity
-Group:		Applications/Multimedia
-
-%description -n trinity-kscd
-This is Trinity's audio CD player.
-
-%files -n trinity-kscd
-%defattr(-,root,root,-)
-%{tde_bindir}/kscd
-%{tde_bindir}/workman2cddb.pl
-%{tde_tdeappdir}/kscd.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/audiocd_play.desktop
-%{tde_datadir}/apps/kscd/
-%{tde_datadir}/apps/profiles/kscd.profile.xml
-%{tde_datadir}/config.kcfg/kscd.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kscd.png
-%{tde_datadir}/mimelnk/text/xmcd.desktop
-%{tde_tdedocdir}/HTML/en/kscd/
-
-%post -n trinity-kscd
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kscd
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-libarts-akode
-Summary:	Akode plugin for aRts
-Group:		Environment/Libraries
-
-%description -n trinity-libarts-akode
-This package contains akode plugins for aRts.
-
-%files -n trinity-libarts-akode
-%defattr(-,root,root,-)
-%{tde_libdir}/libarts_akode.so.*
-%{tde_libdir}/libarts_akode.la
-%{tde_libdir}/mcop/akodearts.mcoptype
-%{tde_libdir}/mcop/akodearts.mcopclass
-%{tde_libdir}/mcop/akodeMPCPlayObject.mcopclass
-%{tde_libdir}/mcop/akodePlayObject.mcopclass
-%{tde_libdir}/mcop/akodeSpeexStreamPlayObject.mcopclass
-%{tde_libdir}/mcop/akodeVorbisStreamPlayObject.mcopclass
-%{tde_libdir}/mcop/akodeXiphPlayObject.mcopclass
-
-# -devel
-
-%post -n trinity-libarts-akode
-/sbin/ldconfig
-
-%postun -n trinity-libarts-akode
-/sbin/ldconfig
-
-##########
-
-%package -n trinity-libarts-audiofile
-Summary:	Audiofile plugin for aRts
-Group:		Environment/Libraries
-
-%description -n trinity-libarts-audiofile
-This package contains audiofile plugins for aRts.
-
-%files -n trinity-libarts-audiofile
-%defattr(-,root,root,-)
-%{tde_libdir}/libarts_audiofile.so.*
-%{tde_libdir}/libarts_audiofile.la
-%{tde_libdir}/mcop/Arts/audiofilePlayObject.mcopclass
-%{tde_libdir}/mcop/audiofilearts.mcopclass
-%{tde_libdir}/mcop/audiofilearts.mcoptype
-
-%post -n trinity-libarts-audiofile
-/sbin/ldconfig
-
-%postun -n trinity-libarts-audiofile
-/sbin/ldconfig
-
-##########
-
-%package -n trinity-libarts-mpeglib
-Summary:	Mpeglib plugin for aRts, supporting mp3 and mpeg audio/video
-Group:		Environment/Libraries
-
-%description -n trinity-libarts-mpeglib
-This package contains the mpeglib aRts plugin, supporting mp3 and mpeg
-audio and video.
-
-This is the arts (TDE Sound daemon) plugin.
-
-%files -n trinity-libarts-mpeglib
-%defattr(-,root,root,-)
-%{tde_bindir}/mpeglibartsplay
-%{tde_libdir}/libarts_mpeglib-0.3.0.so.*
-%{tde_libdir}/libarts_mpeglib.la
-%{tde_libdir}/libarts_splay.so.*
-%{tde_libdir}/libarts_splay.la
-%{tde_libdir}/mcop/CDDAPlayObject.mcopclass
-%{tde_libdir}/mcop/MP3PlayObject.mcopclass
-%{tde_libdir}/mcop/NULLPlayObject.mcopclass
-%{tde_libdir}/mcop/OGGPlayObject.mcopclass
-%{tde_libdir}/mcop/SplayPlayObject.mcopclass
-%{tde_libdir}/mcop/WAVPlayObject.mcopclass
-
-%post -n trinity-libarts-mpeglib
-/sbin/ldconfig
-
-%postun -n trinity-libarts-mpeglib
-/sbin/ldconfig
-
-##########
-
-%if 0%{?with_xine}
-%package -n trinity-libarts-xine
-Summary:	aRts plugin enabling xine support
-Group:		Environment/Libraries
-
-%description -n trinity-libarts-xine
-This package contains aRts' xine plugin, allowing the use of the xine
-multimedia engine though aRts.
-
-%files -n trinity-libarts-xine
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/videothumbnail.la
-%{tde_tdelibdir}/videothumbnail.so
-%{tde_libdir}/libarts_xine.so.*
-%{tde_libdir}/libarts_xine.la
-%{tde_libdir}/mcop/xineAudioPlayObject.mcopclass
-%{tde_libdir}/mcop/xineVideoPlayObject.mcopclass
-%{tde_datadir}/apps/videothumbnail/sprocket-large.png
-%{tde_datadir}/apps/videothumbnail/sprocket-medium.png
-%{tde_datadir}/apps/videothumbnail/sprocket-small.png
-%{tde_datadir}/services/videothumbnail.desktop
-
-%post -n trinity-libarts-xine
-/sbin/ldconfig
-
-%postun -n trinity-libarts-xine
-/sbin/ldconfig
-%endif
-
-##########
-
-%package -n trinity-libkcddb
-Summary:	CDDB library for Trinity
-Group:		Environment/Libraries
-
-%description -n trinity-libkcddb
-The Trinity native CDDB (CD Data Base) library, providing easy access to Audio
-CD meta-information (track titles, artist information, etc.) from on-line
-databases, for TDE applications.
-
-%files -n trinity-libkcddb
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kcm_cddb.la
-%{tde_tdelibdir}/kcm_cddb.so
-%{tde_libdir}/libkcddb.so.*
-%{tde_tdeappdir}/libkcddb.desktop
-%{tde_datadir}/apps/kconf_update/kcmcddb-emailsettings.upd
-%{tde_datadir}/config.kcfg/libkcddb.kcfg
-
-%post -n trinity-libkcddb
-/sbin/ldconfig
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-libkcddb
-/sbin/ldconfig
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-mpeglib
-Summary:	MP3 and MPEG-1 audio and video library
-Group:		Environment/Libraries
-Requires:	trinity-libarts-mpeglib = %{version}-%{release}
-
-%description -n trinity-mpeglib
-mpeglib is a MPEG-1 and MP3 audio and video library. It supports
-MPEG-1 audio (layers 1, 2, 3), MPEG-1 video, MPEG-1 system layer,
-and WAV playback
-
-%files -n trinity-mpeglib
-%defattr(-,root,root,-)
-%{tde_bindir}/yaf-cdda
-%{tde_bindir}/yaf-mpgplay
-%{tde_bindir}/yaf-splay
-%{tde_bindir}/yaf-tplay
-%{tde_bindir}/yaf-vorbis
-%{tde_bindir}/yaf-yuv
-%{tde_libdir}/libmpeg-0.3.0.so
-%{tde_libdir}/libyafcore.so
-%{tde_libdir}/libyafxplayer.so
-
-%post -n trinity-mpeglib
-/sbin/ldconfig
-
-%postun -n trinity-mpeglib
-/sbin/ldconfig
-
-##########
-
-%package -n trinity-noatun
-Summary:	Media player for Trinity
-Group:		Applications/Multimedia
-
-# 20120802: Hack to avoir dependency issue on MGA2 and MDV2011
-%if 0%{?mgaversion} || 0%{?mdkversion}
-Provides:	devel(libnoatunarts)
-Provides:	devel(libnoatunarts(64bit))
-%endif
-
-%description -n trinity-noatun
-Noatun is an aRts-based audio and video player for Trinity. It supports all
-formats supported by your installation of aRts (including aRts plugins).
-
-%files -n trinity-noatun
-%defattr(-,root,root,-)
-%{tde_bindir}/noatun
-%{tde_libdir}/kconf_update_bin/noatun20update
-%{tde_tdelibdir}/noatun.la
-%{tde_tdelibdir}/noatun.so
-%{tde_tdelibdir}/noatun_dcopiface.la
-%{tde_tdelibdir}/noatun_dcopiface.so
-%{tde_tdelibdir}/noatun_excellent.la
-%{tde_tdelibdir}/noatun_excellent.so
-%{tde_tdelibdir}/noatun_htmlexport.la
-%{tde_tdelibdir}/noatun_htmlexport.so
-%{tde_tdelibdir}/noatun_infrared.la
-%{tde_tdelibdir}/noatun_infrared.so
-%{tde_tdelibdir}/noatun_kaiman.la
-%{tde_tdelibdir}/noatun_kaiman.so
-%{tde_tdelibdir}/noatun_keyz.la
-%{tde_tdelibdir}/noatun_keyz.so
-%{tde_tdelibdir}/noatun_kjofol.la
-%{tde_tdelibdir}/noatun_kjofol.so
-%{tde_tdelibdir}/noatun_marquis.la
-%{tde_tdelibdir}/noatun_marquis.so
-%{tde_tdelibdir}/noatun_metatag.la
-%{tde_tdelibdir}/noatun_metatag.so
-%{tde_tdelibdir}/noatun_monoscope.la
-%{tde_tdelibdir}/noatun_monoscope.so
-%{tde_tdelibdir}/noatun_net.la
-%{tde_tdelibdir}/noatun_net.so
-%{tde_tdelibdir}/noatun_splitplaylist.la
-%{tde_tdelibdir}/noatun_splitplaylist.so
-%{tde_tdelibdir}/noatun_systray.la
-%{tde_tdelibdir}/noatun_systray.so
-%{tde_tdelibdir}/noatun_ui.la
-%{tde_tdelibdir}/noatun_ui.so
-%{tde_tdelibdir}/noatun_voiceprint.la
-%{tde_tdelibdir}/noatun_voiceprint.so
-%{tde_tdelibdir}/noatun_winskin.la
-%{tde_tdelibdir}/noatun_winskin.so
-%{tde_tdelibdir}/noatunsimple.la
-%{tde_tdelibdir}/noatunsimple.so
-%{tde_libdir}/libartseffects.la
-%{tde_libdir}/libartseffects.so
-%{tde_libdir}/lib[kt]deinit_noatun.so
-%{tde_libdir}/libnoatun.so.*
-%{tde_libdir}/libnoatunarts.la
-%{tde_libdir}/libnoatunarts.so
-%{tde_libdir}/libnoatuncontrols.so.*
-%{tde_libdir}/libnoatuntags.so.*
-%{tde_libdir}/libwinskinvis.la
-%{tde_libdir}/libwinskinvis.so
-%{tde_libdir}/mcop/ExtraStereo.mcopclass
-%{tde_libdir}/mcop/ExtraStereoGuiFactory.mcopclass
-%{tde_libdir}/mcop/Noatun/
-%{tde_libdir}/mcop/RawWriter.mcopclass
-%{tde_libdir}/mcop/VoiceRemoval.mcopclass
-%{tde_libdir}/mcop/artseffects.mcopclass
-%{tde_libdir}/mcop/artseffects.mcoptype
-%{tde_libdir}/mcop/noatunarts.mcopclass
-%{tde_libdir}/mcop/noatunarts.mcoptype
-%{tde_libdir}/mcop/winskinvis.mcopclass
-%{tde_libdir}/mcop/winskinvis.mcoptype
-%{tde_tdeappdir}/noatun.desktop
-%{tde_datadir}/apps/kconf_update/noatun.upd
-%{tde_datadir}/apps/noatun/
-%{tde_datadir}/icons/hicolor/*/apps/noatun.png
-%{tde_datadir}/mimelnk/interface/x-winamp-skin.desktop
-%{tde_tdedocdir}/HTML/en/noatun/
-
-%post -n trinity-noatun
-/sbin/ldconfig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-noatun
-/sbin/ldconfig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package devel
-Summary:	Development files for %{name}, aRts and noatun plugins
-Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	trinity-tdelibs-devel >= 3.5.13
-
-Obsoletes:	trinity-kdemultimedia-devel < %{version}-%{release}
-Provides:	trinity-kdemultimedia-devel = %{version}-%{release}
-
-%description devel
-{summary}.
-
-Install %{name}-devel if you wish to develop or compile any
-applications using aRtsbuilder, aRtsmidi, aRtskde, aRts modules or
-noatun plugins.
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_includedir}/*
-%{tde_libdir}/libarts_akode.so
-%{tde_libdir}/libarts_audiofile.so
-%{tde_libdir}/libarts_mpeglib.so
-%{tde_libdir}/libarts_splay.so
-%{?with_xine:%{tde_libdir}/libarts_xine.so}
-%{tde_libdir}/libartsbuilder.so
-%{tde_libdir}/libartscontrolapplet.so
-%{tde_libdir}/libartscontrolsupport.so
-%{tde_libdir}/libartsgui.so
-%{tde_libdir}/libartsgui_idl.so
-%{tde_libdir}/libartsgui_kde.so
-%{tde_libdir}/libartsmidi.so
-%{tde_libdir}/libartsmidi_idl.so
-%{tde_libdir}/libartsmodules.so
-%{tde_libdir}/libartsmodulescommon.so
-%{tde_libdir}/libartsmoduleseffects.so
-%{tde_libdir}/libartsmodulesmixers.so
-%{tde_libdir}/libartsmodulessynth.so
-%{tde_libdir}/libaudiocdplugins.la
-%{tde_libdir}/libaudiocdplugins.so
-%{tde_libdir}/libkcddb.la
-%{tde_libdir}/libkcddb.so
-%{tde_libdir}/lib[kt]deinit_kmix.la
-%{tde_libdir}/lib[kt]deinit_kmixctrl.la
-%{tde_libdir}/lib[kt]deinit_krec.la
-%{tde_libdir}/lib[kt]deinit_noatun.la
-%{tde_libdir}/libkmidlib.la
-%{tde_libdir}/libkmidlib.so
-%{tde_libdir}/libmpeg.la
-%{tde_libdir}/libmpeg.so
-%{tde_libdir}/libnoatun.la
-%{tde_libdir}/libnoatun.so
-%{tde_libdir}/libnoatuncontrols.la
-%{tde_libdir}/libnoatuncontrols.so
-%{tde_libdir}/libnoatuntags.la
-%{tde_libdir}/libnoatuntags.so
-%{tde_libdir}/libyafcore.la
-%{tde_libdir}/libyafxplayer.la
-
-%post devel
-/sbin/ldconfig
-
-%postun devel
-/sbin/ldconfig
-
-##########
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-##########
-
-
-%prep
-%setup -q -n kdemultimedia-3.5.13.1
-%patch3 -p1 -b .xdg
-%patch5 -p1 -b .pthread
-
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i "admin/acinclude.m4.in" \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-
-# Required for some distro
-export KDEDIRS=%{tde_prefix}
-
-# Specific path for RHEL4
-if [ -d /usr/X11R6 ]; then
-  export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
-%configure  \
-   --prefix=%{tde_prefix} \
-   --exec-prefix=%{tde_prefix} \
-   --bindir=%{tde_bindir} \
-   --libdir=%{tde_libdir} \
-   --includedir=%{tde_tdeincludedir} \
-   --datadir=%{tde_datadir} \
-   --enable-new-ldflags \
-   --disable-dependency-tracking \
-   --with-cdparanoia \
-   --with-flac \
-   --with-theora \
-   --with-vorbis \
-   --with-alsa \
-   --with-gstreamer \
-   --without-lame \
-   --disable-debug \
-   --disable-warnings \
-   --enable-final \
-   --disable-rpath \
-  %{?_with_akode} %{!?_with_akode:--without-akode} \
-  %{?_with_musicbrainz} %{!?_with_musicbrainz:--without-musicbrainz} \
-  %{?_with_taglib} %{!?_with_taglib:--without-taglib} \
-  %{?with_xine:--with-xine} %{!?with_xine:--without-xine} \
-   --with-extra-includes="%{_includedir}/cdda:%{_includedir}/cddb:%{tde_includedir}/tqt:%{tde_tdeincludedir}/arts:%{tde_includedir}/artsc" \
-   --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{?buildroot} 
-%__make install DESTDIR=%{buildroot}
-
-# don't make these world-writeable
-chmod go-w %{buildroot}%{tde_datadir}/apps/kscd/*
-
-# locale's
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}$HTML_DIR ]; then
-for lang_dir in %{buildroot}$HTML_DIR/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-    # replace absolute symlinks with relative ones
-    pushd $lang_dir
-      for i in *; do
-        [ -d $i -a -L $i/common ] && ln -nsf ../common $i/common
-      done
-    popd
-  fi
-done
-fi
-
-# Moves the XDG configuration files to TDE directory
-%__install -p -D -m644 \
-	"%{?buildroot}%{_sysconfdir}/xdg/menus/applications-merged/kde-multimedia-music.menu" \
-	"%{?buildroot}%{tde_prefix}/etc/xdg/menus/applications-merged/trinity-multimedia-music.menu"
-%__rm -rf "%{?buildroot}%{_sysconfdir}/xdg"
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
-* Sat Sep 29 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Initial release for TDE 3.5.13.1
diff --git a/redhat/tdemultimedia/kdemultimedia-3.5.13.2-fix_gstreamer_1.0.patch b/redhat/tdemultimedia/kdemultimedia-3.5.13.2-fix_gstreamer_1.0.patch
deleted file mode 100644
index acaa24101..000000000
--- a/redhat/tdemultimedia/kdemultimedia-3.5.13.2-fix_gstreamer_1.0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- trinity-tdemultimedia-3.5.13.2/juk/configure.in.in.ORI	2013-02-13 21:30:12.230539642 +0100
-+++ trinity-tdemultimedia-3.5.13.2/juk/configure.in.in	2013-02-13 22:00:07.584173123 +0100
-@@ -50,7 +50,7 @@
-   	PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
- 	export PKG_CONFIG_ALLOW_SYSTEM_LIBS
- 
--	GST_MAJORMINOR=0.10
-+	GST_MAJORMINOR=1.0
- 	GST_REQ=0.10.0
- 	GST_VERSION=10
- 
diff --git a/redhat/tdemultimedia/kdemultimedia-3.5.13.spec b/redhat/tdemultimedia/kdemultimedia-3.5.13.spec
deleted file mode 100644
index 388a81727..000000000
--- a/redhat/tdemultimedia/kdemultimedia-3.5.13.spec
+++ /dev/null
@@ -1,1204 +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 _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-# former extras bits
-%define _with_akode --with-akode
-## not currently compatible with libtunepimp-0.5 (only libtunepimp-0.4)
-#define _with_musicbrainz --with-musicbrainz
-%define _with_taglib --with-taglib
-
-#%if 0%{?fedora}
-%define _with_xine --with-xine
-#%endif
-
-Name:		trinity-tdemultimedia
-Summary:	Multimedia applications for the Trinity Desktop Environment (TDE)
-Version:	3.5.13
-Release:	9%{?dist}%{?_variant}
-
-License:	GPLv2
-Group:		Applications/Multimedia
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	kdemultimedia-%{version}.tar.gz
-
-
-# RedHat Legacy patches (from Fedora 8)
-Patch3:		kdemultimedia-3.4.0-xdg.patch
-Patch5:		kdemultimedia-3.5.7-pthread.patch
-
-# Missing LDFLAGS on Mageia cause FTBFS
-Patch1:		kdemultimedia-3.5.13-missing_ldflags.patch
-
-# [kdemultimedia] Fix MMX detection [Bug #800]
-Patch10:	kdemultimedia-3.5.13-fix_mmx_detection.patch
-# [tdemultimedia] Remove "More Applications" from TDE menu. [Commit #31e44a7b]
-Patch21:	kdemultimedia-3.5.13-remove_more_applications.patch
-# [tdemultimedia] Fix linear alphabet string errors [Commit #fd6afacf]
-Patch22:	kdemultimedia-3.5.13-fix_linear_alphabet.patch
-# [tdemultimedia] Fix kmix autostart. This resolves Bug 503, and re-applies commit 2cc2e3a2 as part of the fix. [Commit #7da06e55]
-Patch23:	kdemultimedia-3.5.13-fix_kmix_autostart.patch
-
-
-Obsoletes:	trinity-kdemultimedia < %{version}-%{release}
-Provides:	trinity-kdemultimedia = %{version}-%{release}
-Obsoletes:	trinity-kdemultimedia-libs < %{version}-%{release}
-Provides:	trinity-kdemultimedia-libs = %{version}-%{release}
-Obsoletes:	trinity-kdemultimedia-extras < %{version}-%{release}
-Provides:	trinity-kdemultimedia-extras = %{version}-%{release}
-Obsoletes:	trinity-kdemultimedia-extras-libs < %{version}-%{release}
-Provides:	trinity-kdemultimedia-extras-libs = %{version}-%{release}
-
-
-BuildRequires: cmake >= 2.8
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-arts-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: qt3-devel >= 3.3.8.d
-
-BuildRequires: zlib-devel
-BuildRequires: libvorbis-devel
-BuildRequires: audiofile-devel
-BuildRequires: desktop-file-utils
-BuildRequires: libtheora-devel
-BuildRequires: alsa-lib-devel 
-BuildRequires: automake libtool
-%{?_with_akode:BuildRequires: trinity-akode-devel}
-%{?_with_musicbrainz:BuildRequires: libmusicbrainz-devel libtunepimp-devel}
-%{?_with_taglib:BuildRequires: taglib-devel}
-BuildRequires:	cdparanoia
-BuildRequires:	trinity-akode-devel
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}gstreamer0.10-devel
-BuildRequires:	%{_lib}flac-devel
-BuildRequires:	libcdda-devel
-%{?_with_xine:BuildRequires: %{_lib}xine-devel}
-BuildRequires:	%{_lib}xxf86dga-devel
-BuildRequires:	%{_lib}xxf86vm-devel
-BuildRequires:	%{_lib}xtst-devel
-%else
-BuildRequires: gstreamer-devel
-BuildRequires: flac-devel
-BuildRequires: cdparanoia-devel
-%{?_with_xine:BuildRequires: xine-lib-devel}
-BuildRequires:	libXxf86dga-devel
-BuildRequires:	libXxf86vm-devel
-BuildRequires:	libXt-devel
-%endif
-
-Requires: trinity-artsbuilder = %{version}-%{release}
-Requires: trinity-juk = %{version}-%{release}
-Requires: trinity-kaboodle = %{version}-%{release}
-Requires: trinity-kaudiocreator = %{version}-%{release}
-Requires: %{name}-kfile-plugins = %{version}-%{release}
-Requires: %{name}-kappfinder-data = %{version}-%{release}
-Requires: %{name}-kio-plugins = %{version}-%{release}
-Requires: trinity-kmid = %{version}-%{release}
-Requires: trinity-kmix = %{version}-%{release}
-Requires: trinity-krec = %{version}-%{release}
-Requires: trinity-kscd = %{version}-%{release}
-Requires: trinity-libarts-akode = %{version}-%{release}
-Requires: trinity-libarts-audiofile = %{version}-%{release}
-Requires: trinity-libarts-mpeglib = %{version}-%{release}
-Requires: trinity-libarts-xine = %{version}-%{release}
-Requires: trinity-libkcddb = %{version}-%{release}
-Requires: trinity-mpeglib = %{version}-%{release}
-Requires: trinity-noatun = %{version}-%{release}
-
-
-%description
-The Trinity Desktop Environment (TDE) is a GUI desktop for the X Window
-System. The %{name} package contains multimedia applications for
-TDE, including:
-  artsbuilder, Synthesizer designer for aRts
-  juk, a media player
-  kmid, a midi player
-  kmix, an audio mixer
-  arts, additional functionality for the aRts sound system
-  krec, a recording tool
-  kscd, an Audio-CD player
-  kaudiocreator, a graphical frontend for audio file creation 
-  kaboodle, a media player
-  noatun, a media player
-
-%files
-
-##########
-
-%package -n trinity-artsbuilder
-Summary:	Synthesizer designer for aRts
-Group:		Applications/Multimedia
-
-%description -n trinity-artsbuilder
-This is the analog Realtime synthesizer's graphical design tool.
-
-%files -n trinity-artsbuilder
-%defattr(-,root,root,-)
-%{tde_bindir}/artsbuilder
-%{tde_bindir}/artscontrol
-%{tde_bindir}/midisend
-%{tde_libdir}/libartsbuilder.la
-%{tde_libdir}/libartsbuilder.so.*
-%{tde_libdir}/libartscontrolapplet.la
-%{tde_libdir}/libartscontrolapplet.so.*
-%{tde_libdir}/libartscontrolsupport.la
-%{tde_libdir}/libartscontrolsupport.so.*
-%{tde_libdir}/libartsgui_idl.la
-%{tde_libdir}/libartsgui_idl.so.*
-%{tde_libdir}/libartsgui_kde.la
-%{tde_libdir}/libartsgui_kde.so.*
-%{tde_libdir}/libartsgui.la
-%{tde_libdir}/libartsgui.so.*
-%{tde_libdir}/libartsmidi_idl.la
-%{tde_libdir}/libartsmidi_idl.so.*
-%{tde_libdir}/libartsmidi.la
-%{tde_libdir}/libartsmidi.so.*
-%{tde_libdir}/libartsmodulescommon.la
-%{tde_libdir}/libartsmodulescommon.so.*
-%{tde_libdir}/libartsmoduleseffects.la
-%{tde_libdir}/libartsmoduleseffects.so.*
-%{tde_libdir}/libartsmodulesmixers.la
-%{tde_libdir}/libartsmodulesmixers.so.*
-%{tde_libdir}/libartsmodules.la
-%{tde_libdir}/libartsmodules.so.*
-%{tde_libdir}/libartsmodulessynth.la
-%{tde_libdir}/libartsmodulessynth.so.*
-%{tde_libdir}/mcop/Arts/ArtsBuilderLoader.mcopclass
-%{tde_libdir}/mcop/artsbuilder.mcopclass
-%{tde_libdir}/mcop/artsbuilder.mcoptype
-%{tde_libdir}/mcop/Arts/Button.mcopclass
-%{tde_libdir}/mcop/Arts/EffectRackGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/Effect_WAVECAPTURE.mcopclass
-%{tde_libdir}/mcop/Arts/Environment/Container.mcopclass
-%{tde_libdir}/mcop/Arts/Environment/EffectRackItem.mcopclass
-%{tde_libdir}/mcop/Arts/Environment/InstrumentItemGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/Environment/InstrumentItem.mcopclass
-%{tde_libdir}/mcop/Arts/Environment/MixerItem.mcopclass
-%{tde_libdir}/mcop/Arts/Fader.mcopclass
-%{tde_libdir}/mcop/Arts/FiveBandMonoComplexEQGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/FiveBandMonoComplexEQ.mcopclass
-%{tde_libdir}/mcop/Arts/FreeverbGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/GenericGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/GraphLine.mcopclass
-%{tde_libdir}/mcop/artsgui.mcopclass
-%{tde_libdir}/mcop/artsgui.mcoptype
-%{tde_libdir}/mcop/Arts/HBox.mcopclass
-%{tde_libdir}/mcop/Arts/Label.mcopclass
-%{tde_libdir}/mcop/Arts/LayoutBox.mcopclass
-%{tde_libdir}/mcop/Arts/LevelMeter.mcopclass
-%{tde_libdir}/mcop/Arts/LineEdit.mcopclass
-%{tde_libdir}/mcop/Arts/LittleStereoMixerChannelGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/LittleStereoMixerChannel.mcopclass
-%{tde_libdir}/mcop/Arts/LocalFactory.mcopclass
-%{tde_libdir}/mcop/Arts/MidiManager.mcopclass
-%{tde_libdir}/mcop/artsmidi.mcopclass
-%{tde_libdir}/mcop/artsmidi.mcoptype
-%{tde_libdir}/mcop/Arts/MixerGuiFactory.mcopclass
-%{tde_libdir}/mcop/artsmodulescommon.mcopclass
-%{tde_libdir}/mcop/artsmodulescommon.mcoptype
-%{tde_libdir}/mcop/artsmoduleseffects.mcopclass
-%{tde_libdir}/mcop/artsmoduleseffects.mcoptype
-%{tde_libdir}/mcop/artsmodules.mcopclass
-%{tde_libdir}/mcop/artsmodules.mcoptype
-%{tde_libdir}/mcop/artsmodulesmixers.mcopclass
-%{tde_libdir}/mcop/artsmodulesmixers.mcoptype
-%{tde_libdir}/mcop/artsmodulessynth.mcopclass
-%{tde_libdir}/mcop/artsmodulessynth.mcoptype
-%{tde_libdir}/mcop/Arts/MonoSimpleMixerChannelGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/MonoSimpleMixerChannel.mcopclass
-%{tde_libdir}/mcop/Arts/MonoToStereo.mcopclass
-%{tde_libdir}/mcop/Arts/PopupBox.mcopclass
-%{tde_libdir}/mcop/Arts/Poti.mcopclass
-%{tde_libdir}/mcop/Arts/SimpleMixerChannelGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/SimpleMixerChannel.mcopclass
-%{tde_libdir}/mcop/Arts/SpinBox.mcopclass
-%{tde_libdir}/mcop/Arts/StereoBalanceGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/StereoBalance.mcopclass
-%{tde_libdir}/mcop/Arts/StereoCompressorGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/StereoFirEqualizerGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/StereoToMono.mcopclass
-%{tde_libdir}/mcop/Arts/StereoVolumeControlGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/StereoVolumeControlGui.mcopclass
-%{tde_libdir}/mcop/Arts/StructureBuilder.mcopclass
-%{tde_libdir}/mcop/Arts/StructureDesc.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_ATAN_SATURATE.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_AUTOPANNER.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_BRICKWALL_LIMITER.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_CAPTURE_WAV.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_CDELAY.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_COMPRESSOR.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_DATA.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_DEBUG.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_DELAY.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_DIV.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_ENVELOPE_ADSR.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_FM_SOURCE.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_FREEVERB.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_FX_CFLANGER.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_MIDI_DEBUG.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_MIDI_TEST.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_MOOG_VCF.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_NIL.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_NOISE.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_OSC.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_PITCH_SHIFT_FFT.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_PITCH_SHIFT.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_PLAY_PAT.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_PSCALE.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_RC.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_SEQUENCE_FREQ.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_SEQUENCE.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_SHELVE_CUTOFF.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_STD_EQUALIZER.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_STEREO_COMPRESSOR.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_STEREO_FIR_EQUALIZER.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_STEREO_PITCH_SHIFT_FFT.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_STEREO_PITCH_SHIFT.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_TREMOLO.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_VOICE_REMOVAL.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_WAVE_PULSE.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_WAVE_SOFTSAW.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_WAVE_SQUARE.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_WAVE_TRI.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_XFADE.mcopclass
-%{tde_libdir}/mcop/Arts/VBox.mcopclass
-%{tde_libdir}/mcop/Arts/VoiceRemovalGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/Widget.mcopclass
-%{tde_tdeappdir}/artsbuilder.desktop
-%{tde_tdeappdir}/artscontrol.desktop
-%{tde_datadir}/apps/artsbuilder/
-%{tde_datadir}/apps/artscontrol/
-%{tde_datadir}/apps/kicker/applets/artscontrolapplet.desktop
-%{tde_datadir}/icons/crystalsvg/*/actions/artsaudiomanager.png
-%{tde_datadir}/icons/crystalsvg/*/actions/artsbuilderexecute.png
-%{tde_datadir}/icons/crystalsvg/*/actions/artsenvironment.png
-%{tde_datadir}/icons/crystalsvg/*/actions/artsfftscope.png
-%{tde_datadir}/icons/crystalsvg/*/actions/artsmediatypes.png
-%{tde_datadir}/icons/crystalsvg/*/actions/artsmidimanager.png
-%{tde_datadir}/icons/crystalsvg/scalable/actions/artsaudiomanager.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/actions/artsenvironment.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/actions/artsfftscope.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/actions/artsmediatypes.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/actions/artsmidimanager.svgz
-%{tde_datadir}/icons/hicolor/*/apps/artsbuilder.png
-%{tde_datadir}/icons/hicolor/*/apps/artscontrol.png
-%{tde_datadir}/icons/hicolor/scalable/apps/artsbuilder.svgz
-%{tde_datadir}/icons/hicolor/scalable/apps/artscontrol.svgz
-%{tde_datadir}/mimelnk/application/x-artsbuilder.desktop
-%{tde_tdedocdir}/HTML/en/artsbuilder/
-
-%post -n trinity-artsbuilder
-/sbin/ldconfig
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-artsbuilder
-/sbin/ldconfig
-for f in crystalsvg hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-juk
-Summary:	Music organizer and player for Trinity
-Group:		Applications/Multimedia
-
-%description -n trinity-juk
-JuK (pronounced "jook") is a jukebox and music manager for the TDE
-desktop similar to jukebox software on other platforms such as
-iTunes or RealOne.
-
-Some of JuK's features include:
-* Support for Ogg Vorbis and MP3 formats
-* Tag editing support for both formats, including ID3v2 for MP3 files.
-  Multitagging or editing a selection of multiple files at once is also
-  supported
-* Output to either the aRts, default KDE sound system, or GStreamer
-* Management of your "collection" and multiple playlists
-* Import and export to m3u playlists
-* Binary caching of audio meta-data and playlist information for faster
-  load times (starting with the second time you run JuK)
-* Integration into TDE that allows drag-and-drop and clipboard usage
-  with other TDE and X apps
-
-%files -n trinity-juk
-%defattr(-,root,root,-)
-%{tde_bindir}/juk
-%{tde_tdeappdir}/juk.desktop
-%{tde_datadir}/apps/juk/
-%{tde_datadir}/apps/konqueror/servicemenus/jukservicemenu.desktop
-%{tde_datadir}/icons/crystalsvg/*/actions/juk_dock.png
-%{tde_datadir}/icons/hicolor/*/apps/juk.png
-%{tde_tdedocdir}/HTML/en/juk/
-
-%post -n trinity-juk
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-juk
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kaboodle
-Summary:	light, embedded media player for Trinity
-Group:		Applications/Multimedia
-
-Requires:	trinity-libarts-xine = %{version}-%{release}
-
-%description -n trinity-kaboodle
-Kaboodle is a light, embedded media player, supporting both video and audio,
-for TDE. It uses the aRts framework for playing media files.
-
-%files -n trinity-kaboodle
-%defattr(-,root,root,-)
-%{tde_bindir}/kaboodle
-%{tde_tdelibdir}/libkaboodlepart.la
-%{tde_tdelibdir}/libkaboodlepart.so
-%{tde_tdeappdir}/kaboodle.desktop
-%{tde_datadir}/apps/kaboodle/
-%{tde_datadir}/icons/hicolor/*/apps/kaboodle.png
-%{tde_datadir}/services/kaboodle_component.desktop
-%{tde_datadir}/services/kaboodleengine.desktop
-%{tde_tdedocdir}/HTML/en/kaboodle/
-
-%post -n trinity-kaboodle
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kaboodle
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kaudiocreator
-Summary:	CD ripper and audio encoder frontend for Trinity
-Group:		Applications/Multimedia
-
-Requires:	%{name}-kio-plugins = %{version}-%{release}
-Requires:	vorbis-tools
-Requires:	flac
-
-%description -n trinity-kaudiocreator
-KAudioCreator is a tool for audio extraction (ripping) and encoding. It can
-keep your WAV files, or convert them to Ogg/Vorbis, MP3, or FLAC. It also
-searches CDDB to retrieve the information of the disk.
-
-%files -n trinity-kaudiocreator
-%defattr(-,root,root,-)
-%{tde_bindir}/kaudiocreator
-%{tde_tdeappdir}/kaudiocreator.desktop
-%{tde_datadir}/apps/kaudiocreator/
-%{tde_datadir}/apps/kconf_update/kaudiocreator-libkcddb.upd
-%{tde_datadir}/apps/kconf_update/kaudiocreator-meta.upd
-%{tde_datadir}/apps/kconf_update/upgrade-kaudiocreator-metadata.sh
-%{tde_datadir}/apps/konqueror/servicemenus/audiocd_extract.desktop
-%{tde_datadir}/config.kcfg/kaudiocreator.kcfg
-%{tde_datadir}/config.kcfg/kaudiocreator_encoders.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kaudiocreator.png
-%{tde_datadir}/icons/locolor/*/apps/kaudiocreator.png
-%{tde_tdedocdir}/HTML/en/kaudiocreator/
-
-%post -n trinity-kaudiocreator
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kaudiocreator
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package kfile-plugins
-Summary:	au/avi/m3u/mp3/ogg/wav plugins for kfile
-Group:		Applications/Multimedia
-
-%description kfile-plugins
-au/avi/m3u/mp3/ogg/wav file metainformation plugins for Trinity.
-
-%files kfile-plugins
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kfile_au.la
-%{tde_tdelibdir}/kfile_au.so
-%{tde_tdelibdir}/kfile_avi.la
-%{tde_tdelibdir}/kfile_avi.so
-%{tde_tdelibdir}/kfile_flac.la
-%{tde_tdelibdir}/kfile_flac.so
-%{tde_tdelibdir}/kfile_m3u.la
-%{tde_tdelibdir}/kfile_m3u.so
-%{tde_tdelibdir}/kfile_mp3.la
-%{tde_tdelibdir}/kfile_mp3.so
-%{tde_tdelibdir}/kfile_mpc.la
-%{tde_tdelibdir}/kfile_mpc.so
-%{tde_tdelibdir}/kfile_mpeg.la
-%{tde_tdelibdir}/kfile_mpeg.so
-%{tde_tdelibdir}/kfile_ogg.la
-%{tde_tdelibdir}/kfile_ogg.so
-%{tde_tdelibdir}/kfile_sid.la
-%{tde_tdelibdir}/kfile_sid.so
-%{tde_tdelibdir}/kfile_theora.la
-%{tde_tdelibdir}/kfile_theora.so
-%{tde_tdelibdir}/kfile_wav.la
-%{tde_tdelibdir}/kfile_wav.so
-%{tde_datadir}/services/kfile_au.desktop
-%{tde_datadir}/services/kfile_avi.desktop
-%{tde_datadir}/services/kfile_flac.desktop
-%{tde_datadir}/services/kfile_m3u.desktop
-%{tde_datadir}/services/kfile_mp3.desktop
-%{tde_datadir}/services/kfile_mpc.desktop
-%{tde_datadir}/services/kfile_mpeg.desktop
-%{tde_datadir}/services/kfile_ogg.desktop
-%{tde_datadir}/services/kfile_sid.desktop
-%{tde_datadir}/services/kfile_theora.desktop
-%{tde_datadir}/services/kfile_wav.desktop
-
-##########
-
-%package kappfinder-data
-Summary:	multimedia data for kappfinder-trinity
-Group:		Applications/Multimedia
-
-Requires: 	trinity-kappfinder
-
-%description kappfinder-data
-This package provides data on multimedia applications for kappfinder.
-
-%files kappfinder-data
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/kappfinder/*
-%{tde_datadir}/desktop-directories/[kt]de-multimedia-music.directory
-%{tde_prefix}/etc/xdg/menus/applications-merged/trinity-multimedia-music.menu
-
-##########
-
-%package kio-plugins
-Summary:	Enables the browsing of audio CDs under Konqueror
-Group:		Applications/Multimedia
-
-%description kio-plugins
-This package allow audio CDs to be browsed like a file system using
-Konqueror and the audiocd:/ URL.
-
-%files kio-plugins
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kcm_audiocd.la
-%{tde_tdelibdir}/kcm_audiocd.so
-%{tde_tdelibdir}/kio_audiocd.la
-%{tde_tdelibdir}/kio_audiocd.so
-%{tde_tdelibdir}/libaudiocd_encoder_flac.la
-%{tde_tdelibdir}/libaudiocd_encoder_flac.so
-%{tde_tdelibdir}/libaudiocd_encoder_lame.la
-%{tde_tdelibdir}/libaudiocd_encoder_lame.so
-%{tde_tdelibdir}/libaudiocd_encoder_vorbis.la
-%{tde_tdelibdir}/libaudiocd_encoder_vorbis.so
-%{tde_tdelibdir}/libaudiocd_encoder_wav.la
-%{tde_tdelibdir}/libaudiocd_encoder_wav.so
-%{tde_libdir}/libaudiocdplugins.so.*
-%{tde_tdeappdir}/audiocd.desktop
-%{tde_datadir}/apps/kconf_update/audiocd.upd
-%{tde_datadir}/apps/kconf_update/upgrade-metadata.sh
-%{tde_datadir}/config.kcfg/audiocd_lame_encoder.kcfg
-%{tde_datadir}/config.kcfg/audiocd_vorbis_encoder.kcfg
-%{tde_datadir}/services/audiocd.protocol
-%{tde_tdedocdir}/HTML/en/kioslave/audiocd.docbook
-
-%post kio-plugins
-/sbin/ldconfig
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun kio-plugins
-/sbin/ldconfig
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kmid
-Summary:	MIDI/karaoke player for Trinity
-Group:		Applications/Multimedia
-
-%description -n trinity-kmid
-This package provides a MIDI and karaoke player for TDE.
-
-%files -n trinity-kmid
-%defattr(-,root,root,-)
-%{tde_bindir}/kmid
-%{tde_tdelibdir}/libkmidpart.la
-%{tde_tdelibdir}/libkmidpart.so
-%{tde_libdir}/libkmidlib.so.*
-%{tde_tdeappdir}/kmid.desktop
-%{tde_datadir}/apps/kmid/
-%{tde_datadir}/icons/hicolor/*/apps/kmid.png
-%{tde_datadir}/mimelnk/audio/x-karaoke.desktop
-%{tde_datadir}/servicetypes/audiomidi.desktop
-%{tde_tdedocdir}/HTML/en/kmid/
-
-%post -n trinity-kmid
-/sbin/ldconfig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kmid
-/sbin/ldconfig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kmix
-Summary:	Sound mixer applet for Trinity
-Group:		Applications/Multimedia
-
-%description -n trinity-kmix
-This package includes TDE's dockable sound mixer applet.
-
-%files -n trinity-kmix
-%defattr(-,root,root,-)
-%{tde_bindir}/kmix
-%{tde_bindir}/kmixctrl
-%{tde_tdelibdir}/kmix.la
-%{tde_tdelibdir}/kmix.so
-%{tde_tdelibdir}/kmix_panelapplet.la
-%{tde_tdelibdir}/kmix_panelapplet.so
-%{tde_tdelibdir}/kmixctrl.la
-%{tde_tdelibdir}/kmixctrl.so
-%{tde_libdir}/lib[kt]deinit_kmix.so
-%{tde_libdir}/lib[kt]deinit_kmixctrl.so
-%{tde_tdeappdir}/kmix.desktop
-%{tde_datadir}/apps/kicker/applets/kmixapplet.desktop
-%{tde_datadir}/apps/kmix/
-%{tde_datadir}/autostart/kmix.desktop
-%{tde_datadir}/autostart/restore_kmix_volumes.desktop
-%{tde_datadir}/icons/hicolor/*/apps/kmix.png
-%{tde_datadir}/services/kmixctrl_restore.desktop
-%{tde_tdedocdir}/HTML/en/kmix/
-
-%post -n trinity-kmix
-/sbin/ldconfig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kmix
-/sbin/ldconfig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-krec
-Summary:	Sound recorder utility for Trinity
-Group:		Applications/Multimedia
-
-%description -n trinity-krec
-This is a sound recording utility for Trinity.
-
-%files -n trinity-krec
-%defattr(-,root,root,-)
-%{tde_bindir}/krec
-%{tde_tdelibdir}/kcm_krec.la
-%{tde_tdelibdir}/kcm_krec.so
-%{tde_tdelibdir}/kcm_krec_files.la
-%{tde_tdelibdir}/kcm_krec_files.so
-%{tde_tdelibdir}/krec.la
-%{tde_tdelibdir}/krec.so
-%{tde_tdelibdir}/libkrecexport_ogg.la
-%{tde_tdelibdir}/libkrecexport_ogg.so
-%{tde_tdelibdir}/libkrecexport_wave.la
-%{tde_tdelibdir}/libkrecexport_wave.so
-%{tde_libdir}/lib[kt]deinit_krec.so
-%{tde_tdeappdir}/krec.desktop
-%{tde_datadir}/apps/krec/
-%{tde_datadir}/icons/hicolor/*/apps/krec.png
-%{tde_datadir}/services/kcm_krec.desktop
-%{tde_datadir}/services/kcm_krec_files.desktop
-%{tde_datadir}/services/krec_exportogg.desktop
-%{tde_datadir}/services/krec_exportwave.desktop
-%{tde_datadir}/servicetypes/krec_exportitem.desktop
-%{tde_tdedocdir}/HTML/en/krec/
-
-%post -n trinity-krec
-/sbin/ldconfig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-krec
-/sbin/ldconfig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kscd
-Summary:	Audio CD player for Trinity
-Group:		Applications/Multimedia
-
-%description -n trinity-kscd
-This is Trinity's audio CD player.
-
-%files -n trinity-kscd
-%defattr(-,root,root,-)
-%{tde_bindir}/kscd
-%{tde_bindir}/workman2cddb.pl
-%{tde_tdeappdir}/kscd.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/audiocd_play.desktop
-%{tde_datadir}/apps/kscd/
-%{tde_datadir}/apps/profiles/kscd.profile.xml
-%{tde_datadir}/config.kcfg/kscd.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kscd.png
-%{tde_datadir}/mimelnk/text/xmcd.desktop
-%{tde_tdedocdir}/HTML/en/kscd/
-
-%post -n trinity-kscd
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kscd
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-libarts-akode
-Summary:	Akode plugin for aRts
-Group:		Environment/Libraries
-
-%description -n trinity-libarts-akode
-This package contains akode plugins for aRts.
-
-%files -n trinity-libarts-akode
-%defattr(-,root,root,-)
-%{tde_libdir}/libarts_akode.so.*
-%{tde_libdir}/libarts_akode.la
-%{tde_libdir}/mcop/akodearts.mcoptype
-%{tde_libdir}/mcop/akodearts.mcopclass
-%{tde_libdir}/mcop/akodeMPCPlayObject.mcopclass
-%{tde_libdir}/mcop/akodePlayObject.mcopclass
-%{tde_libdir}/mcop/akodeSpeexStreamPlayObject.mcopclass
-%{tde_libdir}/mcop/akodeVorbisStreamPlayObject.mcopclass
-%{tde_libdir}/mcop/akodeXiphPlayObject.mcopclass
-
-# -devel
-
-%post -n trinity-libarts-akode
-/sbin/ldconfig
-
-%postun -n trinity-libarts-akode
-/sbin/ldconfig
-
-##########
-
-%package -n trinity-libarts-audiofile
-Summary:	Audiofile plugin for aRts
-Group:		Environment/Libraries
-
-%description -n trinity-libarts-audiofile
-This package contains audiofile plugins for aRts.
-
-%files -n trinity-libarts-audiofile
-%defattr(-,root,root,-)
-%{tde_libdir}/libarts_audiofile.so.*
-%{tde_libdir}/libarts_audiofile.la
-%{tde_libdir}/mcop/Arts/audiofilePlayObject.mcopclass
-%{tde_libdir}/mcop/audiofilearts.mcopclass
-%{tde_libdir}/mcop/audiofilearts.mcoptype
-
-%post -n trinity-libarts-audiofile
-/sbin/ldconfig
-
-%postun -n trinity-libarts-audiofile
-/sbin/ldconfig
-
-##########
-
-%package -n trinity-libarts-mpeglib
-Summary:	Mpeglib plugin for aRts, supporting mp3 and mpeg audio/video
-Group:		Environment/Libraries
-
-%description -n trinity-libarts-mpeglib
-This package contains the mpeglib aRts plugin, supporting mp3 and mpeg
-audio and video.
-
-This is the arts (TDE Sound daemon) plugin.
-
-%files -n trinity-libarts-mpeglib
-%defattr(-,root,root,-)
-%{tde_bindir}/mpeglibartsplay
-%{tde_libdir}/libarts_mpeglib-0.3.0.so.*
-%{tde_libdir}/libarts_mpeglib.la
-%{tde_libdir}/libarts_splay.so.*
-%{tde_libdir}/libarts_splay.la
-%{tde_libdir}/mcop/CDDAPlayObject.mcopclass
-%{tde_libdir}/mcop/MP3PlayObject.mcopclass
-%{tde_libdir}/mcop/NULLPlayObject.mcopclass
-%{tde_libdir}/mcop/OGGPlayObject.mcopclass
-%{tde_libdir}/mcop/SplayPlayObject.mcopclass
-%{tde_libdir}/mcop/WAVPlayObject.mcopclass
-
-%post -n trinity-libarts-mpeglib
-/sbin/ldconfig
-
-%postun -n trinity-libarts-mpeglib
-/sbin/ldconfig
-
-##########
-
-%package -n trinity-libarts-xine
-Summary:	aRts plugin enabling xine support
-Group:		Environment/Libraries
-
-%description -n trinity-libarts-xine
-This package contains aRts' xine plugin, allowing the use of the xine
-multimedia engine though aRts.
-
-%files -n trinity-libarts-xine
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/videothumbnail.la
-%{tde_tdelibdir}/videothumbnail.so
-%{tde_libdir}/libarts_xine.so.*
-%{tde_libdir}/libarts_xine.la
-%{tde_libdir}/mcop/xineAudioPlayObject.mcopclass
-%{tde_libdir}/mcop/xineVideoPlayObject.mcopclass
-%{tde_datadir}/apps/videothumbnail/sprocket-large.png
-%{tde_datadir}/apps/videothumbnail/sprocket-medium.png
-%{tde_datadir}/apps/videothumbnail/sprocket-small.png
-%{tde_datadir}/services/videothumbnail.desktop
-
-%post -n trinity-libarts-xine
-/sbin/ldconfig
-
-%postun -n trinity-libarts-xine
-/sbin/ldconfig
-
-##########
-
-%package -n trinity-libkcddb
-Summary:	CDDB library for Trinity
-Group:		Environment/Libraries
-
-%description -n trinity-libkcddb
-The Trinity native CDDB (CD Data Base) library, providing easy access to Audio
-CD meta-information (track titles, artist information, etc.) from on-line
-databases, for TDE applications.
-
-%files -n trinity-libkcddb
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kcm_cddb.la
-%{tde_tdelibdir}/kcm_cddb.so
-%{tde_libdir}/libkcddb.so.*
-%{tde_tdeappdir}/libkcddb.desktop
-%{tde_datadir}/apps/kconf_update/kcmcddb-emailsettings.upd
-%{tde_datadir}/config.kcfg/libkcddb.kcfg
-
-%post -n trinity-libkcddb
-/sbin/ldconfig
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-libkcddb
-/sbin/ldconfig
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-mpeglib
-Summary:	MP3 and MPEG-1 audio and video library
-Group:		Environment/Libraries
-Requires:	trinity-libarts-mpeglib = %{version}-%{release}
-
-%description -n trinity-mpeglib
-mpeglib is a MPEG-1 and MP3 audio and video library. It supports
-MPEG-1 audio (layers 1, 2, 3), MPEG-1 video, MPEG-1 system layer,
-and WAV playback
-
-%files -n trinity-mpeglib
-%defattr(-,root,root,-)
-%{tde_bindir}/yaf-cdda
-%{tde_bindir}/yaf-mpgplay
-%{tde_bindir}/yaf-splay
-%{tde_bindir}/yaf-tplay
-%{tde_bindir}/yaf-vorbis
-%{tde_bindir}/yaf-yuv
-%{tde_libdir}/libmpeg-0.3.0.so
-%{tde_libdir}/libyafcore.so
-%{tde_libdir}/libyafxplayer.so
-
-%post -n trinity-mpeglib
-/sbin/ldconfig
-
-%postun -n trinity-mpeglib
-/sbin/ldconfig
-
-##########
-
-%package -n trinity-noatun
-Summary:	Media player for Trinity
-Group:		Applications/Multimedia
-
-# 20120802: Hack to avoir dependency issue on MGA2 and MDV2011
-%if 0%{?mgaversion} || 0%{?mdkversion}
-Provides:	devel(libnoatunarts)
-Provides:	devel(libnoatunarts(64bit))
-%endif
-
-%description -n trinity-noatun
-Noatun is an aRts-based audio and video player for Trinity. It supports all
-formats supported by your installation of aRts (including aRts plugins).
-
-%files -n trinity-noatun
-%defattr(-,root,root,-)
-%{tde_bindir}/noatun
-%{tde_libdir}/kconf_update_bin/noatun20update
-%{tde_tdelibdir}/noatun.la
-%{tde_tdelibdir}/noatun.so
-%{tde_tdelibdir}/noatun_dcopiface.la
-%{tde_tdelibdir}/noatun_dcopiface.so
-%{tde_tdelibdir}/noatun_excellent.la
-%{tde_tdelibdir}/noatun_excellent.so
-%{tde_tdelibdir}/noatun_htmlexport.la
-%{tde_tdelibdir}/noatun_htmlexport.so
-%{tde_tdelibdir}/noatun_infrared.la
-%{tde_tdelibdir}/noatun_infrared.so
-%{tde_tdelibdir}/noatun_kaiman.la
-%{tde_tdelibdir}/noatun_kaiman.so
-%{tde_tdelibdir}/noatun_keyz.la
-%{tde_tdelibdir}/noatun_keyz.so
-%{tde_tdelibdir}/noatun_kjofol.la
-%{tde_tdelibdir}/noatun_kjofol.so
-%{tde_tdelibdir}/noatun_marquis.la
-%{tde_tdelibdir}/noatun_marquis.so
-%{tde_tdelibdir}/noatun_metatag.la
-%{tde_tdelibdir}/noatun_metatag.so
-%{tde_tdelibdir}/noatun_monoscope.la
-%{tde_tdelibdir}/noatun_monoscope.so
-%{tde_tdelibdir}/noatun_net.la
-%{tde_tdelibdir}/noatun_net.so
-%{tde_tdelibdir}/noatun_splitplaylist.la
-%{tde_tdelibdir}/noatun_splitplaylist.so
-%{tde_tdelibdir}/noatun_systray.la
-%{tde_tdelibdir}/noatun_systray.so
-%{tde_tdelibdir}/noatun_ui.la
-%{tde_tdelibdir}/noatun_ui.so
-%{tde_tdelibdir}/noatun_voiceprint.la
-%{tde_tdelibdir}/noatun_voiceprint.so
-%{tde_tdelibdir}/noatun_winskin.la
-%{tde_tdelibdir}/noatun_winskin.so
-%{tde_tdelibdir}/noatunsimple.la
-%{tde_tdelibdir}/noatunsimple.so
-%{tde_libdir}/libartseffects.la
-%{tde_libdir}/libartseffects.so
-%{tde_libdir}/lib[kt]deinit_noatun.so
-%{tde_libdir}/libnoatun.so.*
-%{tde_libdir}/libnoatunarts.la
-%{tde_libdir}/libnoatunarts.so
-%{tde_libdir}/libnoatuncontrols.so.*
-%{tde_libdir}/libnoatuntags.so.*
-%{tde_libdir}/libwinskinvis.la
-%{tde_libdir}/libwinskinvis.so
-%{tde_libdir}/mcop/ExtraStereo.mcopclass
-%{tde_libdir}/mcop/ExtraStereoGuiFactory.mcopclass
-%{tde_libdir}/mcop/Noatun/
-%{tde_libdir}/mcop/RawWriter.mcopclass
-%{tde_libdir}/mcop/VoiceRemoval.mcopclass
-%{tde_libdir}/mcop/artseffects.mcopclass
-%{tde_libdir}/mcop/artseffects.mcoptype
-%{tde_libdir}/mcop/noatunarts.mcopclass
-%{tde_libdir}/mcop/noatunarts.mcoptype
-%{tde_libdir}/mcop/winskinvis.mcopclass
-%{tde_libdir}/mcop/winskinvis.mcoptype
-%{tde_tdeappdir}/noatun.desktop
-%{tde_datadir}/apps/kconf_update/noatun.upd
-%{tde_datadir}/apps/noatun/
-%{tde_datadir}/icons/hicolor/*/apps/noatun.png
-%{tde_datadir}/mimelnk/interface/x-winamp-skin.desktop
-%{tde_tdedocdir}/HTML/en/noatun/
-
-%post -n trinity-noatun
-/sbin/ldconfig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-noatun
-/sbin/ldconfig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package devel
-Summary:	Development files for %{name}, aRts and noatun plugins
-Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	trinity-tdelibs-devel >= 3.5.13
-
-Obsoletes:	trinity-kdemultimedia-devel < %{version}-%{release}
-Provides:	trinity-kdemultimedia-devel = %{version}-%{release}
-
-%description devel
-{summary}.
-
-Install %{name}-devel if you wish to develop or compile any
-applications using aRtsbuilder, aRtsmidi, aRtskde, aRts modules or
-noatun plugins.
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_includedir}/*
-%{tde_libdir}/libarts_akode.so
-%{tde_libdir}/libarts_audiofile.so
-%{tde_libdir}/libarts_mpeglib.so
-%{tde_libdir}/libarts_splay.so
-%{tde_libdir}/libarts_xine.so
-%{tde_libdir}/libartsbuilder.so
-%{tde_libdir}/libartscontrolapplet.so
-%{tde_libdir}/libartscontrolsupport.so
-%{tde_libdir}/libartsgui.so
-%{tde_libdir}/libartsgui_idl.so
-%{tde_libdir}/libartsgui_kde.so
-%{tde_libdir}/libartsmidi.so
-%{tde_libdir}/libartsmidi_idl.so
-%{tde_libdir}/libartsmodules.so
-%{tde_libdir}/libartsmodulescommon.so
-%{tde_libdir}/libartsmoduleseffects.so
-%{tde_libdir}/libartsmodulesmixers.so
-%{tde_libdir}/libartsmodulessynth.so
-%{tde_libdir}/libaudiocdplugins.la
-%{tde_libdir}/libaudiocdplugins.so
-%{tde_libdir}/libkcddb.la
-%{tde_libdir}/libkcddb.so
-%{tde_libdir}/lib[kt]deinit_kmix.la
-%{tde_libdir}/lib[kt]deinit_kmixctrl.la
-%{tde_libdir}/lib[kt]deinit_krec.la
-%{tde_libdir}/lib[kt]deinit_noatun.la
-%{tde_libdir}/libkmidlib.la
-%{tde_libdir}/libkmidlib.so
-%{tde_libdir}/libmpeg.la
-%{tde_libdir}/libmpeg.so
-%{tde_libdir}/libnoatun.la
-%{tde_libdir}/libnoatun.so
-%{tde_libdir}/libnoatuncontrols.la
-%{tde_libdir}/libnoatuncontrols.so
-%{tde_libdir}/libnoatuntags.la
-%{tde_libdir}/libnoatuntags.so
-%{tde_libdir}/libyafcore.la
-%{tde_libdir}/libyafxplayer.la
-
-%post devel
-/sbin/ldconfig
-
-%postun devel
-/sbin/ldconfig
-
-##########
-
-
-%prep
-%setup -q -n kdemultimedia
-%patch1 -p1 -b .ftbfs
-%patch3 -p1 -b .xdg
-%patch5 -p1 -b .pthread
-%patch10 -p1
-%patch21 -p1 -b .moreapplications
-%patch22 -p1
-%patch23 -p1 -b .kmixautostart
-
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i "admin/acinclude.m4.in" \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-
-# Required for some distro
-export KDEDIRS=%{tde_prefix}
-
-%configure  \
-   --exec-prefix=%{tde_prefix} \
-   --bindir=%{tde_bindir} \
-   --libdir=%{tde_libdir} \
-   --includedir=%{tde_tdeincludedir} \
-   --datadir=%{tde_datadir} \
-   --enable-new-ldflags \
-   --disable-dependency-tracking \
-   --with-cdparanoia \
-   --with-flac \
-   --with-theora \
-   --with-vorbis \
-   --with-alsa \
-   --with-gstreamer \
-   --without-lame \
-   --disable-debug \
-   --disable-warnings \
-   --enable-final \
-   --disable-rpath \
-  %{?_with_akode} %{!?_with_akode:--without-akode} \
-  %{?_with_musicbrainz} %{!?_with_musicbrainz:--without-musicbrainz} \
-  %{?_with_taglib} %{!?_with_taglib:--without-taglib} \
-  %{?_with_xine} %{!?_with_xine:--without-xine} \
-   --with-extra-includes="%{_includedir}/cdda:%{_includedir}/cddb:%{tde_includedir}/tqt:%{tde_tdeincludedir}/arts:%{tde_includedir}/artsc" \
-   --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{?buildroot} 
-%__make install DESTDIR=%{buildroot}
-
-# don't make these world-writeable
-chmod go-w %{buildroot}%{tde_datadir}/apps/kscd/*
-
-# locale's
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}$HTML_DIR ]; then
-for lang_dir in %{buildroot}$HTML_DIR/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-    # replace absolute symlinks with relative ones
-    pushd $lang_dir
-      for i in *; do
-        [ -d $i -a -L $i/common ] && ln -nsf ../common $i/common
-      done
-    popd
-  fi
-done
-fi
-
-# Moves the XDG configuration files to TDE directory
-%__install -p -D -m644 \
-	"%{?buildroot}%{_sysconfdir}/xdg/menus/applications-merged/kde-multimedia-music.menu" \
-	"%{?buildroot}%{tde_prefix}/etc/xdg/menus/applications-merged/trinity-multimedia-music.menu"
-%__rm -rf "%{?buildroot}%{_sysconfdir}/xdg"
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
-* Sat Aug 18 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-9
-- Rebuild for tdelibs-3.5.13-12
-- Fix kmix autostart. This resolves Bug 503, and re-applies commit 2cc2e3a2 as part of the fix. [Commit #7da06e55]
-
-* Sun Jul 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-8
-- Split in several packages
-- Enables Xine support on RHEL/CentOS
-- Removes previous patch. [Bug #503]
-
-* Wed May 09 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-7
-- Fix kmix not autostarting in the user's session. [Bug #503]
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-6
-- Updates BuildRequires
-- Remove "More Applications" from TDE menu. [Commit #31e44a7b]
-- Fix linear alphabet string errors [Commit #fd6afacf]
- 
-* Mon Jan 16 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5
-- Enables 'akode' support
-- Fix MMX support [Bug #800]
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
-- Fix HTML directory location
-
-* Sat Nov 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
-- Moves XDG files in TDE prefix to avoid conflict with distro-provided KDE
-
-* Fri Nov 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
-- Updates BuildRequires
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
-- Initial release for RHEL 6, RHEL 5 and Fedora 15
-
-* Sat Sep 09 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
-- Import to GIT
-- Spec file based on Fedora 8 "kdemultimedia-6:3.5.10-2"
-
diff --git a/redhat/tdemultimedia/kdemultimedia-3.5.7-pthread.patch b/redhat/tdemultimedia/kdemultimedia-3.5.7-pthread.patch
deleted file mode 100644
index 70e2fe9c8..000000000
--- a/redhat/tdemultimedia/kdemultimedia-3.5.7-pthread.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdemultimedia-3.5.7-patched/xine_artsplugin/Makefile.am.pthread	2006-07-22 03:10:54.000000000 -0500
-+++ kdemultimedia-3.5.7-patched/xine_artsplugin/Makefile.am	2007-06-28 06:50:53.000000000 -0500
-@@ -8,7 +8,7 @@
- 			  xinePlayObject_impl.cpp \
- 			  audio_fifo_out.c
- libarts_xine_la_LDFLAGS = $(all_libraries) -module -no-undefined -pthread
--libarts_xine_la_LIBADD = $(XINE_LIBS) $(LIB_X11) $(LIB_XEXT) \
-+libarts_xine_la_LIBADD = $(XINE_LIBS) $(LIBPTHREAD) $(LIB_X11) $(LIB_XEXT) \
- 			 -lkmedia2_idl -lsoundserver_idl -lartsflow
- 
- libarts_xine_la_METASOURCES = AUTO
diff --git a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
index b8f25cd91..73983a076 100644
--- a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
+++ b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package tdemultimedia
+# spec file for package tdemultimedia (version R14.0.0)
 #
 # Copyright (c) 2014 Trinity Desktop Environment
 #
@@ -1170,12 +1170,6 @@ noatun plugins.
 
 ##########
 
-# FIXME 2014/03/15: FTBFS on PCLINUXOS ... Need to remove -fstack-protector
-%if 0%{?pclinuxos}
-%define _ssp_cflags -fno-stack-protector --param=ssp-buffer-size=4%{?_serverbuild_flags: %_serverbuild_flags}
-%endif
-
-
 %prep
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
 
@@ -1228,13 +1222,10 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{?buildroot} 
 %__make install DESTDIR=%{buildroot}
 
-# don't make these world-writeable
-chmod go-w %{buildroot}%{tde_datadir}/apps/kscd/*
-
 # Updates applications categories for openSUSE
 %if 0%{?suse_version}
 %suse_update_desktop_file krec           AudioVideo Recorder
-%suse_update_desktop_file tdemid           AudioVideo Midi
+%suse_update_desktop_file tdemid         AudioVideo Midi
 %suse_update_desktop_file artsbuilder    AudioVideo AudioVideoEditing
 %suse_update_desktop_file artscontrol    AudioVideo AudioVideoEditing
 %suse_update_desktop_file kmix           AudioVideo Mixer
diff --git a/redhat/tdemultimedia/tdemultimedia-3.5.13.2-fix_pulseaudio_mixer.patch b/redhat/tdemultimedia/tdemultimedia-3.5.13.2-fix_pulseaudio_mixer.patch
deleted file mode 100644
index 66a796a03..000000000
--- a/redhat/tdemultimedia/tdemultimedia-3.5.13.2-fix_pulseaudio_mixer.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- trinity-tdemultimedia-3.5.13.2~pre21+6e6307c6/kmix/kmixdockwidget.cpp.ORI	2013-05-21 23:07:46.511834317 +0200
-+++ trinity-tdemultimedia-3.5.13.2~pre21+6e6307c6/kmix/kmixdockwidget.cpp	2013-05-21 23:07:04.202716141 +0200
-@@ -109,6 +109,7 @@
-      _oldToolTipValue = -1;
-      _oldPixmapType   = '-';
- 
-+/*
-     if (m_mixer == 0) {
-         // In case that there is no mixer installed, there will be no newVolumeLevels() signal's
-         // Thus we prepare the dock areas manually
-@@ -116,6 +117,7 @@
-         updatePixmap(false);
-         return;
-     }
-+*/
-     // create devices
- 
-     _dockAreaPopup = new ViewDockAreaPopup(0, "dockArea", m_mixer, 0, this);
-@@ -376,7 +378,6 @@
- 		if ( md != 0 ) {
-         		md->setMuted( !md->isMuted() );
-         		m_mixer->commitVolumeChange( md );
--        		updatePixmap(false);
- 		}
- 	}
- }
diff --git a/redhat/tdemultimedia/tdemultimedia-3.5.13.2-fix_xdg_menu.patch b/redhat/tdemultimedia/tdemultimedia-3.5.13.2-fix_xdg_menu.patch
deleted file mode 100644
index c8a4e4d96..000000000
--- a/redhat/tdemultimedia/tdemultimedia-3.5.13.2-fix_xdg_menu.patch
+++ /dev/null
@@ -1,250 +0,0 @@
-diff -Nuar trinity-tdemultimedia-3.5.13.2/kappfinder-data.ORI/kde-multimedia-music.directory trinity-tdemultimedia-3.5.13.2/kappfinder-data/kde-multimedia-music.directory
---- trinity-tdemultimedia-3.5.13.2/kappfinder-data.ORI/kde-multimedia-music.directory	2013-07-28 16:37:31.827222470 +0200
-+++ trinity-tdemultimedia-3.5.13.2/kappfinder-data/kde-multimedia-music.directory	1970-01-01 01:00:00.000000000 +0100
-@@ -1,89 +0,0 @@
--[Desktop Entry]
--Encoding=UTF-8
--Name=Music
--Name[br]=Sonerezh
--Name[bs]=Muzika
--Name[ca]=Música
--Name[da]=Musik
--Name[el]=Μουσική
--Name[eo]=Muziko
--Name[es]=Musica
--Name[et]=Muusika
--Name[eu]=Musika
--Name[fa]=موسیقی
--Name[fi]=Musiikki
--Name[fr]=Musique
--Name[ga]=Ceol
--Name[gl]=Música
--Name[he]=מוזיקה
--Name[hu]=Zene
--Name[is]=Tónlist
--Name[it]=Musica
--Name[ja]=音楽
--Name[km]=តន្ត្រី
--Name[lt]=Muzika
--Name[nb]=Musikk
--Name[ne]=सङ्गित
--Name[nl]=Muziek
--Name[nn]=Musikk
--Name[pa]=ਸੰਗੀਤ
--Name[pl]=Muzyka
--Name[pt]=Música
--Name[pt_BR]=Música
--Name[sk]=Hudba
--Name[sl]=Glasba
--Name[sr]=Музика
--Name[sr@Latn]=Muzika
--Name[sv]=Musik
--Name[tr]=Müzik
--Name[uk]=Музика
--Name[zh_CN]=音乐
--Name[zh_HK]=音樂
--GenericName=Professional Audio
--GenericName[bg]=Професионално аудио
--GenericName[bs]=Profesionalni audio
--GenericName[ca]=Àudio professional
--GenericName[cs]=Profesionální zvuk
--GenericName[da]=Professionel lyd
--GenericName[el]=Επαγγελματικός ήχος
--GenericName[es]=Audio profesional
--GenericName[et]=Professionaalne audio
--GenericName[eu]=Audio profesionala
--GenericName[fa]=صوتی حرفه‌ای
--GenericName[fi]=Ammattilaisääni
--GenericName[fr]=Audio professionnel
--GenericName[ga]=Fuaim Phroifisiúnta
--GenericName[gl]=Son Profesional
--GenericName[he]=שמע מקצועי
--GenericName[hu]=Professzinonális minőségű hanganyag
--GenericName[is]=Atvinnumannahljóð
--GenericName[it]=Audio professionale
--GenericName[ja]=プロフェッショナルオーディオ
--GenericName[kk]=Кәсіпқой Аудио
--GenericName[km]=អូឌីយ៉ូឯកទេស
--GenericName[ko]=전문가 오디오
--GenericName[lt]=Profesionalus audio
--GenericName[mk]=Професионално аудио
--GenericName[nb]=Profesjonell lyd
--GenericName[nds]=Profeschonell Klang
--GenericName[ne]=पेशागत अडियो
--GenericName[nl]=Professionele audio
--GenericName[nn]=Profesjonell lydhandsaming
--GenericName[pa]=ਵਪਾਰਕ ਆਡੀਓ
--GenericName[pl]=Profesjonalne audio
--GenericName[pt]=Áudio Profissional
--GenericName[pt_BR]=Áudio Profissional
--GenericName[ru]=Профессиональное аудио
--GenericName[sk]=Profesionálne audio
--GenericName[sl]=Profesionalni zvok
--GenericName[sr]=Професионални звук
--GenericName[sr@Latn]=Profesionalni zvuk
--GenericName[sv]=Professionellt ljud
--GenericName[th]=โปรแกรมจัดการเสียงสำหรับมืออาชีพ
--GenericName[tr]=Profesyonel Ses
--GenericName[uk]=Професійне аудіо
--GenericName[zh_CN]=专业音频
--GenericName[zh_HK]=專業音效
--GenericName[zh_TW]=專業音效
--Icon=package
--
-diff -Nuar trinity-tdemultimedia-3.5.13.2/kappfinder-data.ORI/kde-multimedia-music.menu trinity-tdemultimedia-3.5.13.2/kappfinder-data/kde-multimedia-music.menu
---- trinity-tdemultimedia-3.5.13.2/kappfinder-data.ORI/kde-multimedia-music.menu	2013-07-28 16:37:31.827222470 +0200
-+++ trinity-tdemultimedia-3.5.13.2/kappfinder-data/kde-multimedia-music.menu	1970-01-01 01:00:00.000000000 +0100
-@@ -1,21 +0,0 @@
-- <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
--  "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
--
--<Menu>
--<Name>Applications</Name>
--<Menu>
--	<Name>Multimedia</Name>
--	<Exclude>
--		<Category>Music</Category>
--	</Exclude>
--	<Menu>
--		<Name>Jack and More</Name>
--		<Directory>kde-multimedia-music.directory</Directory>
--		<Include>
--			<And>
--				<Category>Music</Category>
--			</And>
--		</Include>
--	</Menu>
--</Menu>
--</Menu>
-diff -Nuar trinity-tdemultimedia-3.5.13.2/kappfinder-data.ORI/Makefile.am trinity-tdemultimedia-3.5.13.2/kappfinder-data/Makefile.am
---- trinity-tdemultimedia-3.5.13.2/kappfinder-data.ORI/Makefile.am	2013-07-28 16:37:31.827222470 +0200
-+++ trinity-tdemultimedia-3.5.13.2/kappfinder-data/Makefile.am	2013-07-28 16:38:07.202464444 +0200
-@@ -22,8 +22,8 @@
- 
- EXTRA_DIST = $(kappfinder_multimedia_data_DATA)
- 
--xdg_directory_DATA = kde-multimedia-music.directory
-+xdg_directory_DATA = tde-multimedia-music.directory
- 
--xdg_mergedmenu_DATA = kde-multimedia-music.menu
-+xdg_mergedmenu_DATA = tde-multimedia-music.menu
- xdg_mergedmenudir = $(xdg_menudir)/applications-merged
- 
-diff -Nuar trinity-tdemultimedia-3.5.13.2/kappfinder-data.ORI/tde-multimedia-music.directory trinity-tdemultimedia-3.5.13.2/kappfinder-data/tde-multimedia-music.directory
---- trinity-tdemultimedia-3.5.13.2/kappfinder-data.ORI/tde-multimedia-music.directory	1970-01-01 01:00:00.000000000 +0100
-+++ trinity-tdemultimedia-3.5.13.2/kappfinder-data/tde-multimedia-music.directory	2013-06-07 19:26:15.000000000 +0200
-@@ -0,0 +1,89 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+Name=Music
-+Name[br]=Sonerezh
-+Name[bs]=Muzika
-+Name[ca]=Música
-+Name[da]=Musik
-+Name[el]=Μουσική
-+Name[eo]=Muziko
-+Name[es]=Musica
-+Name[et]=Muusika
-+Name[eu]=Musika
-+Name[fa]=موسیقی
-+Name[fi]=Musiikki
-+Name[fr]=Musique
-+Name[ga]=Ceol
-+Name[gl]=Música
-+Name[he]=מוזיקה
-+Name[hu]=Zene
-+Name[is]=Tónlist
-+Name[it]=Musica
-+Name[ja]=音楽
-+Name[km]=តន្ត្រី
-+Name[lt]=Muzika
-+Name[nb]=Musikk
-+Name[ne]=सङ्गित
-+Name[nl]=Muziek
-+Name[nn]=Musikk
-+Name[pa]=ਸੰਗੀਤ
-+Name[pl]=Muzyka
-+Name[pt]=Música
-+Name[pt_BR]=Música
-+Name[sk]=Hudba
-+Name[sl]=Glasba
-+Name[sr]=Музика
-+Name[sr@Latn]=Muzika
-+Name[sv]=Musik
-+Name[tr]=Müzik
-+Name[uk]=Музика
-+Name[zh_CN]=音乐
-+Name[zh_HK]=音樂
-+GenericName=Professional Audio
-+GenericName[bg]=Професионално аудио
-+GenericName[bs]=Profesionalni audio
-+GenericName[ca]=Àudio professional
-+GenericName[cs]=Profesionální zvuk
-+GenericName[da]=Professionel lyd
-+GenericName[el]=Επαγγελματικός ήχος
-+GenericName[es]=Audio profesional
-+GenericName[et]=Professionaalne audio
-+GenericName[eu]=Audio profesionala
-+GenericName[fa]=صوتی حرفه‌ای
-+GenericName[fi]=Ammattilaisääni
-+GenericName[fr]=Audio professionnel
-+GenericName[ga]=Fuaim Phroifisiúnta
-+GenericName[gl]=Son Profesional
-+GenericName[he]=שמע מקצועי
-+GenericName[hu]=Professzinonális minőségű hanganyag
-+GenericName[is]=Atvinnumannahljóð
-+GenericName[it]=Audio professionale
-+GenericName[ja]=プロフェッショナルオーディオ
-+GenericName[kk]=Кәсіпқой Аудио
-+GenericName[km]=អូឌីយ៉ូឯកទេស
-+GenericName[ko]=전문가 오디오
-+GenericName[lt]=Profesionalus audio
-+GenericName[mk]=Професионално аудио
-+GenericName[nb]=Profesjonell lyd
-+GenericName[nds]=Profeschonell Klang
-+GenericName[ne]=पेशागत अडियो
-+GenericName[nl]=Professionele audio
-+GenericName[nn]=Profesjonell lydhandsaming
-+GenericName[pa]=ਵਪਾਰਕ ਆਡੀਓ
-+GenericName[pl]=Profesjonalne audio
-+GenericName[pt]=Áudio Profissional
-+GenericName[pt_BR]=Áudio Profissional
-+GenericName[ru]=Профессиональное аудио
-+GenericName[sk]=Profesionálne audio
-+GenericName[sl]=Profesionalni zvok
-+GenericName[sr]=Професионални звук
-+GenericName[sr@Latn]=Profesionalni zvuk
-+GenericName[sv]=Professionellt ljud
-+GenericName[th]=โปรแกรมจัดการเสียงสำหรับมืออาชีพ
-+GenericName[tr]=Profesyonel Ses
-+GenericName[uk]=Професійне аудіо
-+GenericName[zh_CN]=专业音频
-+GenericName[zh_HK]=專業音效
-+GenericName[zh_TW]=專業音效
-+Icon=package
-+
-diff -Nuar trinity-tdemultimedia-3.5.13.2/kappfinder-data.ORI/tde-multimedia-music.menu trinity-tdemultimedia-3.5.13.2/kappfinder-data/tde-multimedia-music.menu
---- trinity-tdemultimedia-3.5.13.2/kappfinder-data.ORI/tde-multimedia-music.menu	1970-01-01 01:00:00.000000000 +0100
-+++ trinity-tdemultimedia-3.5.13.2/kappfinder-data/tde-multimedia-music.menu	2013-07-28 16:38:14.396310283 +0200
-@@ -0,0 +1,21 @@
-+ <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
-+  "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
-+
-+<Menu>
-+<Name>Applications</Name>
-+<Menu>
-+	<Name>Multimedia</Name>
-+	<Exclude>
-+		<Category>Music</Category>
-+	</Exclude>
-+	<Menu>
-+		<Name>Jack and More</Name>
-+		<Directory>tde-multimedia-music.directory</Directory>
-+		<Include>
-+			<And>
-+				<Category>Music</Category>
-+			</And>
-+		</Include>
-+	</Menu>
-+</Menu>
-+</Menu>
diff --git a/redhat/tdemultimedia/tdemultimedia-3.5.13.2-ftbfs.patch b/redhat/tdemultimedia/tdemultimedia-3.5.13.2-ftbfs.patch
deleted file mode 100644
index 719313722..000000000
--- a/redhat/tdemultimedia/tdemultimedia-3.5.13.2-ftbfs.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- trinity-tdemultimedia-3.5.13.2~pre17+a4c1404c/arts/modules/common/Makefile.am.ORI	2013-05-09 10:51:39.994294437 +0200
-+++ trinity-tdemultimedia-3.5.13.2~pre17+a4c1404c/arts/modules/common/Makefile.am	2013-05-09 10:52:23.837409361 +0200
-@@ -25,7 +25,7 @@
- 	$(top_builddir)/arts/gui/common/libartsgui_idl.la \
- 	$(top_builddir)/arts/midi/libartsmidi_idl.la \
- 	$(top_builddir)/arts/modules/synth/libartsmodulessynth.la \
--	-lartsflow -lartsflow_idl -lmcop $(LIB_KDECORE) $(LIB_QT) $(VORBISFILE_LIBS) -lgthread-2.0
-+	-lartsflow -lartsflow_idl -lmcop $(LIB_KDECORE) $(LIB_QT) -lgthread-2.0 $(ARTS_LIBS)
- 
- libartsmodulescommon_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) -no-undefined
- 
---- trinity-tdemultimedia-14.0.0~pre178+601a5c5f/arts/modules/synth/Makefile.am.ORI	2013-08-04 19:15:24.030530158 +0200
-+++ trinity-tdemultimedia-14.0.0~pre178+601a5c5f/arts/modules/synth/Makefile.am	2013-08-04 19:15:32.878625492 +0200
-@@ -31,7 +31,7 @@
- libartsmodulessynth_la_LIBADD = \
- 	$(top_builddir)/arts/runtime/libartsbuilder.la \
- 	$(top_builddir)/arts/midi/libartsmidi_idl.la \
--	-lartsflow -lartsgsl -lartsflow_idl -lmcop -lglib-2.0
-+	-lartsflow -lartsgsl -lartsflow_idl -lmcop -lglib-2.0 $(ARTS_LIBS)
- 
- #libartsmodulessynth_la_LIBADD = $(top_builddir)/arts/gui/common/libartsgui_idl.la $(top_builddir)/arts/midi/libartsmidi_idl.la -lartsflow -lartsflow_idl -lmcop $(LIBDL) $(LIB_KDEUI) $(LIB_KDECORE)
- libartsmodulessynth_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) -lartsflow -lartsgsl -no-undefined
---- trinity-tdemultimedia-14.0.0~pre183+1859432c/configure.in.in.ORI	2013-09-08 17:50:11.453897325 +0200
-+++ trinity-tdemultimedia-14.0.0~pre183+1859432c/configure.in.in	2013-09-08 17:54:24.503460785 +0200
-@@ -544,15 +544,18 @@
- 	LIB_ARTS="-lartskde"
- 	ARTS_PREFIX=[`$ARTSCCONFIG --arts-prefix`]
- 	ARTS_CFLAGS="-I$ARTS_PREFIX/include/arts"
-+	ARTS_LIBS=[`$PKG_CONFIG --libs-only-l arts`]
- 	AC_DEFINE(HAVE_ARTS, 1, [have arts support in juk])
- else
- 	build_arts="no"
- 	LIB_ARTS=""
- 	ARTS_CFLAGS=""
-+	ARTS_LIBS=""
- 	AC_DEFINE(HAVE_ARTS, 0, [no arts support in juk])
- fi
- 
- AC_SUBST(LIB_ARTS)
- AC_SUBST(ARTS_CFLAGS)
-+AC_SUBST(ARTS_LIBS)
- 
- KDE_CHECK_MPEGLIB_ARTS
diff --git a/redhat/tdemultimedia/tdemultimedia-3.5.13.2-kmix_pulseaudio.patch b/redhat/tdemultimedia/tdemultimedia-3.5.13.2-kmix_pulseaudio.patch
deleted file mode 100644
index 0759d6ebb..000000000
--- a/redhat/tdemultimedia/tdemultimedia-3.5.13.2-kmix_pulseaudio.patch
+++ /dev/null
@@ -1,1519 +0,0 @@
-diff -Nuar ./kmix-tde-ori/kmix-platforms.cpp ./kmix/kmix-platforms.cpp
---- ./kmix-tde-ori/kmix-platforms.cpp	2013-05-09 17:10:41.010638051 +0200
-+++ ./kmix/kmix-platforms.cpp	2013-05-09 17:18:23.202075902 +0200
-@@ -46,8 +46,10 @@
- #define ALSA_MIXER
- #endif
- 
-+#define PULSE_MIXER
-+
- #define OSS_MIXER
--#endif
-+#endif // __linux__
- 
- #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(_UNIXWARE) || defined(__DragonFly__)
- #define OSS_MIXER
-@@ -79,6 +81,10 @@
- #include "mixer_alsa9.cpp"
- #endif
- 
-+#if defined(PULSE_MIXER)
-+#include "mixer_pulse.cpp"
-+#endif
-+
- #if defined(OSS_MIXER)
- #include "mixer_oss.cpp"
- 
-@@ -91,7 +97,7 @@
- #define OSS4_MIXER
- #endif
- 
--#endif
-+#endif // OSS_MIXER
- 
- #if defined(OSS4_MIXER)
- #include "mixer_oss4.cpp"
-@@ -137,6 +143,10 @@
-     { ALSA_getMixer, ALSA_getDriverName, ALSA_getDevIterator },
- #endif
- 
-+#if defined(PULSE_MIXER)
-+    { PULSE_getMixer, PULSE_getDriverName, NULL },
-+#endif
-+
- #if defined(OSS4_MIXER)
-     { OSS4_getMixer, OSS4_getDriverName, NULL },
- #endif
-diff -Nuar ./kmix-tde-ori/Makefile.am ./kmix/Makefile.am
---- ./kmix-tde-ori/Makefile.am	2013-05-09 17:10:41.010638051 +0200
-+++ ./kmix/Makefile.am	2013-05-21 23:47:47.607546135 +0200
-@@ -41,7 +41,7 @@
- 	verticaltext.cpp mixerIface.skel colorwidget.ui dialogviewconfiguration.cpp \
- 	kmixtoolbox.cpp mixertoolbox.cpp dialogselectmaster.cpp
- 
--kmix_panelapplet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-+kmix_panelapplet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -I/usr/include/glib-2.0 -module
- kmix_panelapplet_la_LIBADD = $(LIB_KDEUI) $(LIB_KUTILS) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND)
- 
- xdg_apps_DATA = kmix.desktop
-diff -Nuar ./kmix-tde-ori/mixer_pulse.cpp ./kmix/mixer_pulse.cpp
---- ./kmix-tde-ori/mixer_pulse.cpp	1970-01-01 01:00:00.000000000 +0100
-+++ ./kmix/mixer_pulse.cpp	2013-05-21 23:37:43.565178347 +0200
-@@ -0,0 +1,1368 @@
-+/*
-+ *              KMix -- KDE's full featured mini mixer
-+ *
-+ *
-+ *              Copyright (C) 2008 Helio Chissini de Castro <helio@kde.org>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Library General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2 of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Library General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Library General Public
-+ * License along with this program; if not, write to the Free
-+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-+ */
-+
-+#include "mixer_pulse.h"
-+
-+#include <cstdlib>
-+//#include <QtCore/QAbstractEventDispatcher>
-+#include <tqtimer.h>
-+
-+#include <klocale.h>
-+
-+#include "mixer.h"
-+//#include "core/ControlManager.h"
-+//#include "core/GlobalConfig.h"
-+
-+#include <pulse/glib-mainloop.h>
-+#include <pulse/ext-stream-restore.h>
-+#if defined(HAVE_CANBERRA)
-+#  include <canberra.h>
-+#endif
-+
-+// PA_VOLUME_UI_MAX landed in pulseaudio-0.9.23, so this can be removed when/if
-+// minimum requirement is ever bumped up (from 0.9.12 currently)
-+#ifndef PA_VOLUME_UI_MAX
-+#define PA_VOLUME_UI_MAX (pa_sw_volume_from_dB(+11.0))
-+#endif
-+
-+#define HAVE_SOURCE_OUTPUT_VOLUMES PA_CHECK_VERSION(1,0,0)
-+
-+#define KMIXPA_PLAYBACK     0
-+#define KMIXPA_CAPTURE      1
-+#define KMIXPA_APP_PLAYBACK 2
-+#define KMIXPA_APP_CAPTURE  3
-+#define KMIXPA_WIDGET_MAX KMIXPA_APP_CAPTURE
-+
-+#define KMIXPA_EVENT_KEY "sink-input-by-media-role:event"
-+
-+static unsigned int refcount = 0;
-+static pa_glib_mainloop *s_mainloop = NULL;
-+static pa_context *s_context = NULL;
-+static enum { UNKNOWN, ACTIVE, INACTIVE } s_pulseActive = UNKNOWN;
-+static int s_outstandingRequests = 0;
-+
-+#if defined(HAVE_CANBERRA)
-+static ca_context *s_ccontext = NULL;
-+#endif
-+
-+TQMap<int,Mixer_PULSE*> s_mixers;
-+
-+typedef TQMap<int,devinfo> devmap;
-+static devmap outputDevices;
-+static devmap captureDevices;
-+static TQMap<int,TQString> clients;
-+static devmap outputStreams;
-+static devmap captureStreams;
-+static devmap outputRoles;
-+
-+typedef struct {
-+    pa_channel_map channel_map;
-+    pa_cvolume volume;
-+    bool mute;
-+    TQString device;
-+} restoreRule;
-+static TQMap<TQString,restoreRule> s_RestoreRules;
-+
-+static void dec_outstanding(pa_context *c) {
-+    if (s_outstandingRequests <= 0)
-+        return;
-+
-+    if (--s_outstandingRequests == 0)
-+    {
-+        s_pulseActive = ACTIVE;
-+
-+        // If this is our probe phase, exit our context immediately
-+        if (s_context != c) {
-+            pa_context_disconnect(c);
-+        } else
-+          kDebug(67100) <<  "Reconnected to PulseAudio";
-+    }
-+}
-+
-+static void translateMasksAndMaps(devinfo& dev)
-+{
-+    dev.chanMask = Volume::MNONE;
-+    dev.chanIDs.clear();
-+
-+    if (dev.channel_map.channels != dev.volume.channels) {
-+        kError() << "Hiddeous Channel mixup map says " << dev.channel_map.channels << ", volume says: " << dev.volume.channels;
-+        return;
-+    }
-+    if (1 == dev.channel_map.channels && PA_CHANNEL_POSITION_MONO == dev.channel_map.map[0]) {
-+        // We just use the left channel to represent this.
-+        dev.chanMask = (Volume::ChannelMask)( dev.chanMask | Volume::MLEFT);
-+        dev.chanIDs[0] = Volume::LEFT;
-+    } else {
-+        for (uint8_t i = 0; i < dev.channel_map.channels; ++i) {
-+            switch (dev.channel_map.map[i]) {
-+                case PA_CHANNEL_POSITION_MONO:
-+                    kWarning(67100) << "Channel Map contains a MONO element but has >1 channel - we can't handle this.";
-+                    return;
-+
-+                case PA_CHANNEL_POSITION_FRONT_LEFT:
-+                    dev.chanMask = (Volume::ChannelMask)( dev.chanMask | Volume::MLEFT);
-+                    dev.chanIDs[i] = Volume::LEFT;
-+                    break;
-+                case PA_CHANNEL_POSITION_FRONT_RIGHT:
-+                    dev.chanMask = (Volume::ChannelMask)( dev.chanMask | Volume::MRIGHT);
-+                    dev.chanIDs[i] = Volume::RIGHT;
-+                    break;
-+                case PA_CHANNEL_POSITION_FRONT_CENTER:
-+                    dev.chanMask = (Volume::ChannelMask)( dev.chanMask | Volume::MCENTER);
-+                    dev.chanIDs[i] = Volume::CENTER;
-+                    break;
-+                case PA_CHANNEL_POSITION_REAR_CENTER:
-+                    dev.chanMask = (Volume::ChannelMask)( dev.chanMask | Volume::MREARCENTER);
-+                    dev.chanIDs[i] = Volume::REARCENTER;
-+                    break;
-+                case PA_CHANNEL_POSITION_REAR_LEFT:
-+                    dev.chanMask = (Volume::ChannelMask)( dev.chanMask | Volume::MSURROUNDLEFT);
-+                    dev.chanIDs[i] = Volume::SURROUNDLEFT;
-+                    break;
-+                case PA_CHANNEL_POSITION_REAR_RIGHT:
-+                    dev.chanMask = (Volume::ChannelMask)( dev.chanMask | Volume::MSURROUNDRIGHT);
-+                    dev.chanIDs[i] = Volume::SURROUNDRIGHT;
-+                    break;
-+                case PA_CHANNEL_POSITION_LFE:
-+                    dev.chanMask = (Volume::ChannelMask)( dev.chanMask | Volume::MWOOFER);
-+                    dev.chanIDs[i] = Volume::WOOFER;
-+                    break;
-+                case PA_CHANNEL_POSITION_SIDE_LEFT:
-+                    dev.chanMask = (Volume::ChannelMask)( dev.chanMask | Volume::MREARSIDELEFT);
-+                    dev.chanIDs[i] = Volume::REARSIDELEFT;
-+                    break;
-+                case PA_CHANNEL_POSITION_SIDE_RIGHT:
-+                    dev.chanMask = (Volume::ChannelMask)( dev.chanMask | Volume::MREARSIDERIGHT);
-+                    dev.chanIDs[i] = Volume::REARSIDERIGHT;
-+                    break;
-+                default:
-+                    kWarning(67100) << "Channel Map contains a pa_channel_position we cannot handle " << dev.channel_map.map[i];
-+                    break;
-+            }
-+        }
-+    }
-+}
-+
-+static TQString getIconNameFromProplist(pa_proplist *l) {
-+    const char *t;
-+
-+    if ((t = pa_proplist_gets(l, PA_PROP_MEDIA_ICON_NAME)))
-+        return TQString::fromUtf8(t);
-+
-+    if ((t = pa_proplist_gets(l, PA_PROP_WINDOW_ICON_NAME)))
-+        return TQString::fromUtf8(t);
-+
-+    if ((t = pa_proplist_gets(l, PA_PROP_APPLICATION_ICON_NAME)))
-+        return TQString::fromUtf8(t);
-+
-+    if ((t = pa_proplist_gets(l, PA_PROP_MEDIA_ROLE))) {
-+
-+        if (strcmp(t, "video") == 0 || strcmp(t, "phone") == 0)
-+            return TQString::fromUtf8(t);
-+
-+        if (strcmp(t, "music") == 0)
-+            return "audio";
-+
-+        if (strcmp(t, "game") == 0)
-+            return "applications-games";
-+
-+        if (strcmp(t, "event") == 0)
-+            return "dialog-information";
-+    }
-+
-+    return "";
-+}
-+
-+static void sink_cb(pa_context *c, const pa_sink_info *i, int eol, void *) {
-+
-+    if (eol < 0) {
-+        if (pa_context_errno(c) == PA_ERR_NOENTITY)
-+            return;
-+
-+        kWarning(67100) << "Sink callback failure";
-+        return;
-+    }
-+
-+    if (eol > 0) {
-+        dec_outstanding(c);
-+        if (s_mixers.contains(KMIXPA_PLAYBACK))
-+            s_mixers[KMIXPA_PLAYBACK]->triggerUpdate();
-+        return;
-+    }
-+
-+    devinfo s;
-+    s.index = s.device_index = i->index;
-+    s.name = TQString::fromUtf8(i->name).replace(' ', '_');
-+    s.description = TQString::fromUtf8(i->description);
-+    s.icon_name = TQString::fromUtf8(pa_proplist_gets(i->proplist, PA_PROP_DEVICE_ICON_NAME));
-+    s.volume = i->volume;
-+    s.channel_map = i->channel_map;
-+    s.mute = !!i->mute;
-+    s.stream_restore_rule = "";
-+
-+    translateMasksAndMaps(s);
-+
-+    bool is_new = !outputDevices.contains(s.index);
-+    outputDevices[s.index] = s;
-+//     kDebug(67100) << "Got some info about sink: " << s.description;
-+
-+    if (s_mixers.contains(KMIXPA_PLAYBACK)) {
-+        if (is_new)
-+            s_mixers[KMIXPA_PLAYBACK]->addWidget(s.index);
-+        else {
-+            int mid = s_mixers[KMIXPA_PLAYBACK]->id2num(s.name);
-+            if (mid >= 0) {
-+                MixSet *ms = s_mixers[KMIXPA_PLAYBACK]->getMixSet();
-+                (*ms)[mid]->setReadableName(s.description);
-+            }
-+        }
-+    }
-+}
-+
-+static void source_cb(pa_context *c, const pa_source_info *i, int eol, void *) {
-+
-+    if (eol < 0) {
-+        if (pa_context_errno(c) == PA_ERR_NOENTITY)
-+            return;
-+
-+        kWarning(67100) << "Source callback failure";
-+        return;
-+    }
-+
-+    if (eol > 0) {
-+        dec_outstanding(c);
-+        if (s_mixers.contains(KMIXPA_CAPTURE))
-+            s_mixers[KMIXPA_CAPTURE]->triggerUpdate();
-+        return;
-+    }
-+
-+    // Do something....
-+    if (PA_INVALID_INDEX != i->monitor_of_sink)
-+    {
-+        kDebug(67100) << "Ignoring Monitor Source: " << i->description;
-+        return;
-+    }
-+
-+    devinfo s;
-+    s.index = s.device_index = i->index;
-+    s.name = TQString::fromUtf8(i->name).replace(' ', '_');
-+    s.description = TQString::fromUtf8(i->description);
-+    s.icon_name = TQString::fromUtf8(pa_proplist_gets(i->proplist, PA_PROP_DEVICE_ICON_NAME));
-+    s.volume = i->volume;
-+    s.channel_map = i->channel_map;
-+    s.mute = !!i->mute;
-+    s.stream_restore_rule = "";
-+
-+    translateMasksAndMaps(s);
-+
-+    bool is_new = !captureDevices.contains(s.index);
-+    captureDevices[s.index] = s;
-+//     kDebug(67100) << "Got some info about source: " << s.description;
-+
-+    if (s_mixers.contains(KMIXPA_CAPTURE)) {
-+        if (is_new)
-+            s_mixers[KMIXPA_CAPTURE]->addWidget(s.index);
-+        else {
-+            int mid = s_mixers[KMIXPA_CAPTURE]->id2num(s.name);
-+            if (mid >= 0) {
-+                MixSet *ms = s_mixers[KMIXPA_CAPTURE]->getMixSet();
-+                (*ms)[mid]->setReadableName(s.description);
-+            }
-+        }
-+    }
-+}
-+
-+static void client_cb(pa_context *c, const pa_client_info *i, int eol, void *) {
-+
-+    if (eol < 0) {
-+        if (pa_context_errno(c) == PA_ERR_NOENTITY)
-+            return;
-+
-+        kWarning(67100) << "Client callback failure";
-+        return;
-+    }
-+
-+    if (eol > 0) {
-+        dec_outstanding(c);
-+        return;
-+    }
-+
-+    clients[i->index] = TQString::fromUtf8(i->name);
-+    //kDebug(67100) << "Got some info about client: " << clients[i->index];
-+}
-+
-+static void sink_input_cb(pa_context *c, const pa_sink_input_info *i, int eol, void *) {
-+
-+    if (eol < 0) {
-+        if (pa_context_errno(c) == PA_ERR_NOENTITY)
-+            return;
-+
-+        kWarning(67100) << "Sink Input callback failure";
-+        return;
-+    }
-+
-+    if (eol > 0) {
-+        dec_outstanding(c);
-+        if (s_mixers.contains(KMIXPA_APP_PLAYBACK))
-+            s_mixers[KMIXPA_APP_PLAYBACK]->triggerUpdate();
-+        return;
-+    }
-+
-+    const char *t;
-+    if ((t = pa_proplist_gets(i->proplist, "module-stream-restore.id"))) {
-+        if (strcmp(t, KMIXPA_EVENT_KEY) == 0) {
-+            kWarning(67100) << "Ignoring sink-input due to it being designated as an event and thus handled by the Event slider";
-+            return;
-+        }
-+    }
-+
-+    TQString appname = i18n("Unknown Application");
-+    if (clients.contains(i->client))
-+        appname = clients[i->client];
-+
-+    TQString prefix = TQString("%1: ").arg(appname);
-+
-+    devinfo s;
-+    s.index = i->index;
-+    s.device_index = i->sink;
-+    s.description = prefix + TQString::fromUtf8(i->name);
-+    s.name = TQString("stream:") + TQString::number(i->index); //appname.replace(' ', '_').toLower();
-+    s.icon_name = getIconNameFromProplist(i->proplist);
-+    s.channel_map = i->channel_map;
-+    s.volume = i->volume;
-+    s.mute = !!i->mute;
-+    s.stream_restore_rule = TQString::fromUtf8(t);
-+
-+    translateMasksAndMaps(s);
-+
-+    bool is_new = !outputStreams.contains(s.index);
-+    outputStreams[s.index] = s;
-+//     kDebug(67100) << "Got some info about sink input (playback stream): " << s.description;
-+
-+    if (s_mixers.contains(KMIXPA_APP_PLAYBACK)) {
-+        if (is_new)
-+            s_mixers[KMIXPA_APP_PLAYBACK]->addWidget(s.index, true);
-+        else {
-+            int mid = s_mixers[KMIXPA_APP_PLAYBACK]->id2num(s.name);
-+            if (mid >= 0) {
-+                MixSet *ms = s_mixers[KMIXPA_APP_PLAYBACK]->getMixSet();
-+                (*ms)[mid]->setReadableName(s.description);
-+            }
-+        }
-+    }
-+}
-+
-+static void source_output_cb(pa_context *c, const pa_source_output_info *i, int eol, void *) {
-+
-+    if (eol < 0) {
-+        if (pa_context_errno(c) == PA_ERR_NOENTITY)
-+            return;
-+
-+        kWarning(67100) << "Source Output callback failure";
-+        return;
-+    }
-+
-+    if (eol > 0) {
-+        dec_outstanding(c);
-+        if (s_mixers.contains(KMIXPA_APP_CAPTURE))
-+            s_mixers[KMIXPA_APP_CAPTURE]->triggerUpdate();
-+        return;
-+    }
-+
-+    /* NB Until Source Outputs support volumes, we just use the volume of the source itself */
-+    if (!captureDevices.contains(i->source)) {
-+        kDebug(67100) << "Source Output refers to a Source we don't have any info for (probably just a peak meter or similar)";
-+        return;
-+    }
-+
-+    TQString appname = i18n("Unknown Application");
-+    if (clients.contains(i->client))
-+        appname = clients[i->client];
-+
-+    TQString prefix = TQString("%1: ").arg(appname);
-+
-+    devinfo s;
-+    s.index = i->index;
-+    s.device_index = i->source;
-+    s.description = prefix + TQString::fromUtf8(i->name);
-+    s.name = TQString("stream:") + TQString::number(i->index); //appname.replace(' ', '_').toLower();
-+    s.icon_name = getIconNameFromProplist(i->proplist);
-+    s.channel_map = i->channel_map;
-+#if HAVE_SOURCE_OUTPUT_VOLUMES
-+    s.volume = i->volume;
-+    s.mute = !!i->mute;
-+#else
-+    s.volume = captureDevices[i->source].volume;
-+    s.mute = captureDevices[i->source].mute;
-+#endif
-+    s.stream_restore_rule = TQString::fromUtf8(pa_proplist_gets(i->proplist, "module-stream-restore.id"));
-+
-+    translateMasksAndMaps(s);
-+
-+    bool is_new = !captureStreams.contains(s.index);
-+    captureStreams[s.index] = s;
-+//     kDebug(67100) << "Got some info about source output (capture stream): " << s.description;
-+
-+    if (s_mixers.contains(KMIXPA_APP_CAPTURE)) {
-+        if (is_new)
-+            s_mixers[KMIXPA_APP_CAPTURE]->addWidget(s.index, true);
-+        else {
-+            int mid = s_mixers[KMIXPA_APP_CAPTURE]->id2num(s.name);
-+            if (mid >= 0) {
-+                MixSet *ms = s_mixers[KMIXPA_APP_CAPTURE]->getMixSet();
-+                (*ms)[mid]->setReadableName(s.description);
-+            }
-+        }
-+    }
-+}
-+
-+
-+static devinfo create_role_devinfo(TQString name) {
-+
-+    TQ_ASSERT(s_RestoreRules.contains(name));
-+
-+    devinfo s;
-+    s.index = s.device_index = PA_INVALID_INDEX;
-+    s.description = i18n("Event Sounds");
-+    s.name = TQString("restore:") + name;
-+    s.icon_name = "dialog-information";
-+    s.channel_map = s_RestoreRules[name].channel_map;
-+    s.volume = s_RestoreRules[name].volume;
-+    s.mute = s_RestoreRules[name].mute;
-+    s.stream_restore_rule = name;
-+
-+    translateMasksAndMaps(s);
-+    return s;
-+}
-+
-+
-+void ext_stream_restore_read_cb(pa_context *c, const pa_ext_stream_restore_info *i, int eol, void *) {
-+
-+    if (eol < 0) {
-+        dec_outstanding(c);
-+        kWarning(67100) << "Failed to initialize stream_restore extension: " << pa_strerror(pa_context_errno(s_context));
-+        return;
-+    }
-+
-+    if (eol > 0) {
-+        dec_outstanding(c);
-+
-+        // Special case: ensure that our media events exists.
-+        // On first login by a new users, this wont be in our database so we should create it.
-+        if (!s_RestoreRules.contains(KMIXPA_EVENT_KEY)) {
-+            // Create a fake rule
-+            restoreRule rule;
-+            rule.channel_map.channels = 1;
-+            rule.channel_map.map[0] = PA_CHANNEL_POSITION_MONO;
-+            rule.volume.channels = 1;
-+            rule.volume.values[0] = PA_VOLUME_NORM;
-+            rule.mute = false;
-+            rule.device = "";
-+            s_RestoreRules[KMIXPA_EVENT_KEY] = rule;
-+            kDebug(67100) << "Initialising restore rule for new user: " << i18n("Event Sounds");
-+        }
-+
-+        if (s_mixers.contains(KMIXPA_APP_PLAYBACK)) {
-+            // If we have rules, it will be created below... but if no rules
-+            // then we add it here.
-+            if (!outputRoles.contains(PA_INVALID_INDEX)) {
-+                devinfo s = create_role_devinfo(KMIXPA_EVENT_KEY);
-+                outputRoles[s.index] = s;
-+
-+                s_mixers[KMIXPA_APP_PLAYBACK]->addWidget(s.index);
-+            }
-+
-+            s_mixers[KMIXPA_APP_PLAYBACK]->triggerUpdate();
-+        }
-+
-+        return;
-+    }
-+
-+
-+    TQString name = TQString::fromUtf8(i->name);
-+//     kDebug(67100) << TQString("Got some info about restore rule: '%1' (Device: %2)").arg(name).arg(i->device ? i->device : "None");
-+    restoreRule rule;
-+    rule.channel_map = i->channel_map;
-+    rule.volume = i->volume;
-+    rule.mute = !!i->mute;
-+    rule.device = i->device;
-+
-+    if (rule.channel_map.channels < 1 && name == KMIXPA_EVENT_KEY) {
-+        // Stream restore rules may not have valid volumes/channel maps (as these are optional)
-+        // but we need a valid volume+channelmap for our events sounds so fix it up.
-+        rule.channel_map.channels = 1;
-+        rule.channel_map.map[0] = PA_CHANNEL_POSITION_MONO;
-+        rule.volume.channels = 1;
-+        rule.volume.values[0] = PA_VOLUME_NORM;
-+    }
-+
-+    s_RestoreRules[name] = rule;
-+
-+    if (s_mixers.contains(KMIXPA_APP_PLAYBACK)) {
-+        // We only want to know about Sound Events for now...
-+        if (name == KMIXPA_EVENT_KEY) {
-+            devinfo s = create_role_devinfo(name);
-+            bool is_new = !outputRoles.contains(s.index);
-+            outputRoles[s.index] = s;
-+
-+            if (is_new)
-+                s_mixers[KMIXPA_APP_PLAYBACK]->addWidget(s.index, true);
-+        }
-+    }
-+}
-+
-+static void ext_stream_restore_subscribe_cb(pa_context *c, void *) {
-+
-+    TQ_ASSERT(c == s_context);
-+
-+    pa_operation *o;
-+    if (!(o = pa_ext_stream_restore_read(c, ext_stream_restore_read_cb, NULL))) {
-+        kWarning(67100) << "pa_ext_stream_restore_read() failed";
-+        return;
-+    }
-+
-+    pa_operation_unref(o);
-+}
-+
-+
-+static void subscribe_cb(pa_context *c, pa_subscription_event_type_t t, uint32_t index, void *) {
-+
-+    TQ_ASSERT(c == s_context);
-+
-+    switch (t & PA_SUBSCRIPTION_EVENT_FACILITY_MASK) {
-+        case PA_SUBSCRIPTION_EVENT_SINK:
-+            if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) {
-+                if (s_mixers.contains(KMIXPA_PLAYBACK))
-+                    s_mixers[KMIXPA_PLAYBACK]->removeWidget(index);
-+            } else {
-+                pa_operation *o;
-+                if (!(o = pa_context_get_sink_info_by_index(c, index, sink_cb, NULL))) {
-+                    kWarning(67100) << "pa_context_get_sink_info_by_index() failed";
-+                    return;
-+                }
-+                pa_operation_unref(o);
-+            }
-+            break;
-+
-+        case PA_SUBSCRIPTION_EVENT_SOURCE:
-+            if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) {
-+                if (s_mixers.contains(KMIXPA_CAPTURE))
-+                    s_mixers[KMIXPA_CAPTURE]->removeWidget(index);
-+            } else {
-+                pa_operation *o;
-+                if (!(o = pa_context_get_source_info_by_index(c, index, source_cb, NULL))) {
-+                    kWarning(67100) << "pa_context_get_source_info_by_index() failed";
-+                    return;
-+                }
-+                pa_operation_unref(o);
-+            }
-+            break;
-+
-+        case PA_SUBSCRIPTION_EVENT_SINK_INPUT:
-+            if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) {
-+                if (s_mixers.contains(KMIXPA_APP_PLAYBACK))
-+                    s_mixers[KMIXPA_APP_PLAYBACK]->removeWidget(index);
-+            } else {
-+                pa_operation *o;
-+                if (!(o = pa_context_get_sink_input_info(c, index, sink_input_cb, NULL))) {
-+                    kWarning(67100) << "pa_context_get_sink_input_info() failed";
-+                    return;
-+                }
-+                pa_operation_unref(o);
-+            }
-+            break;
-+
-+        case PA_SUBSCRIPTION_EVENT_SOURCE_OUTPUT:
-+            if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) {
-+                if (s_mixers.contains(KMIXPA_APP_CAPTURE))
-+                    s_mixers[KMIXPA_APP_CAPTURE]->removeWidget(index);
-+            } else {
-+                pa_operation *o;
-+                if (!(o = pa_context_get_source_output_info(c, index, source_output_cb, NULL))) {
-+                    kWarning(67100) << "pa_context_get_sink_input_info() failed";
-+                    return;
-+                }
-+                pa_operation_unref(o);
-+            }
-+            break;
-+
-+        case PA_SUBSCRIPTION_EVENT_CLIENT:
-+            if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) {
-+                clients.remove(index);
-+            } else {
-+                pa_operation *o;
-+                if (!(o = pa_context_get_client_info(c, index, client_cb, NULL))) {
-+                    kWarning(67100) << "pa_context_get_client_info() failed";
-+                    return;
-+                }
-+                pa_operation_unref(o);
-+            }
-+            break;
-+
-+    }
-+}
-+
-+
-+static void context_state_callback(pa_context *c, void *)
-+{
-+    pa_context_state_t state = pa_context_get_state(c);
-+    if (state == PA_CONTEXT_READY) {
-+        // Attempt to load things up
-+        pa_operation *o;
-+
-+        // 1. Register for the stream changes (except during probe)
-+        if (s_context == c) {
-+            pa_context_set_subscribe_callback(c, subscribe_cb, NULL);
-+
-+            if (!(o = pa_context_subscribe(c, (pa_subscription_mask_t)
-+                                           (PA_SUBSCRIPTION_MASK_SINK|
-+                                            PA_SUBSCRIPTION_MASK_SOURCE|
-+                                            PA_SUBSCRIPTION_MASK_CLIENT|
-+                                            PA_SUBSCRIPTION_MASK_SINK_INPUT|
-+                                            PA_SUBSCRIPTION_MASK_SOURCE_OUTPUT), NULL, NULL))) {
-+                kWarning(67100) << "pa_context_subscribe() failed";
-+                return;
-+            }
-+            pa_operation_unref(o);
-+        }
-+
-+        if (!(o = pa_context_get_sink_info_list(c, sink_cb, NULL))) {
-+            kWarning(67100) << "pa_context_get_sink_info_list() failed";
-+            return;
-+        }
-+        pa_operation_unref(o);
-+        s_outstandingRequests++;
-+
-+        if (!(o = pa_context_get_source_info_list(c, source_cb, NULL))) {
-+            kWarning(67100) << "pa_context_get_source_info_list() failed";
-+            return;
-+        }
-+        pa_operation_unref(o);
-+        s_outstandingRequests++;
-+
-+
-+        if (!(o = pa_context_get_client_info_list(c, client_cb, NULL))) {
-+            kWarning(67100) << "pa_context_client_info_list() failed";
-+            return;
-+        }
-+        pa_operation_unref(o);
-+        s_outstandingRequests++;
-+
-+        if (!(o = pa_context_get_sink_input_info_list(c, sink_input_cb, NULL))) {
-+            kWarning(67100) << "pa_context_get_sink_input_info_list() failed";
-+            return;
-+        }
-+        pa_operation_unref(o);
-+        s_outstandingRequests++;
-+
-+        if (!(o = pa_context_get_source_output_info_list(c, source_output_cb, NULL))) {
-+            kWarning(67100) << "pa_context_get_source_output_info_list() failed";
-+            return;
-+        }
-+        pa_operation_unref(o);
-+        s_outstandingRequests++;
-+
-+        /* These calls are not always supported */
-+        if ((o = pa_ext_stream_restore_read(c, ext_stream_restore_read_cb, NULL))) {
-+            pa_operation_unref(o);
-+            s_outstandingRequests++;
-+
-+            pa_ext_stream_restore_set_subscribe_cb(c, ext_stream_restore_subscribe_cb, NULL);
-+
-+            if ((o = pa_ext_stream_restore_subscribe(c, 1, NULL, NULL)))
-+                pa_operation_unref(o);
-+        } else {
-+            kWarning(67100) << "Failed to initialize stream_restore extension: " << pa_strerror(pa_context_errno(s_context));
-+        }
-+    } else if (!PA_CONTEXT_IS_GOOD(state)) {
-+        // If this is our probe phase, exit our context immediately
-+        if (s_context != c) {
-+            pa_context_disconnect(c);
-+        } else {
-+            // If we're not probing, it means we've been disconnected from our
-+            // glib context
-+            pa_context_unref(s_context);
-+            s_context = NULL;
-+
-+            // Remove all GUI elements
-+            TQMap<int,Mixer_PULSE*>::iterator it;
-+            for (it = s_mixers.begin(); it != s_mixers.end(); ++it) {
-+                (*it)->removeAllWidgets();
-+            }
-+            // This one is not handled above.
-+            clients.clear();
-+
-+            if (s_mixers.contains(KMIXPA_PLAYBACK)) {
-+                kWarning(67100) << "Connection to PulseAudio daemon closed. Attempting reconnection.";
-+                s_pulseActive = UNKNOWN;
-+                TQTimer::singleShot(50, s_mixers[KMIXPA_PLAYBACK], SLOT(reinit()));
-+            }
-+        }
-+    }
-+}
-+
-+static void setVolumeFromPulse(Volume& volume, const devinfo& dev)
-+{
-+    chanIDMap::const_iterator iter;
-+    for (iter = dev.chanIDs.begin(); iter != dev.chanIDs.end(); ++iter)
-+    {
-+        //kDebug(67100) <<  "Setting volume for channel " << iter.value() << " to " << (long)dev.volume.values[iter.key()] << " (" << ((100*(long)dev.volume.values[iter.key()]) / PA_VOLUME_NORM) << "%)";
-+        volume.setVolume(iter.value(), (long)dev.volume.values[iter.key()]);
-+    }
-+}
-+
-+static pa_cvolume genVolumeForPulse(const devinfo& dev, Volume& volume)
-+{
-+    pa_cvolume cvol = dev.volume;
-+
-+    chanIDMap::const_iterator iter;
-+    for (iter = dev.chanIDs.begin(); iter != dev.chanIDs.end(); ++iter)
-+    {
-+        cvol.values[iter.key()] = (uint32_t)volume.getVolume(iter.value());
-+        //kDebug(67100) <<  "Setting volume for channel " << iter.value() << " to " << cvol.values[iter.key()] << " (" << ((100*cvol.values[iter.key()]) / PA_VOLUME_NORM) << "%)";
-+    }
-+    return cvol;
-+}
-+
-+static devmap* get_widget_map(int type, TQString id = "")
-+{
-+    TQ_ASSERT(type >= 0 && type <= KMIXPA_WIDGET_MAX);
-+
-+    if (KMIXPA_PLAYBACK == type)
-+        return &outputDevices;
-+    else if (KMIXPA_CAPTURE == type)
-+        return &captureDevices;
-+    else if (KMIXPA_APP_PLAYBACK == type) {
-+        if (id.startsWith("restore:"))
-+            return &outputRoles;
-+        return &outputStreams;
-+    } else if (KMIXPA_APP_CAPTURE == type)
-+        return &captureStreams;
-+
-+    TQ_ASSERT(0);
-+    return NULL;
-+}
-+static devmap* get_widget_map(int type, int index)
-+{
-+    if (PA_INVALID_INDEX == (uint32_t)index)
-+        return get_widget_map(type, "restore:");
-+    return get_widget_map(type);
-+}
-+
-+void Mixer_PULSE::emitControlsReconfigured()
-+{
-+    ControlManager::instance().announce(_mixer->id(), ControlChangeType::ControlList, getDriverName());
-+}
-+
-+void Mixer_PULSE::addWidget(int index, bool isAppStream)
-+{
-+    devmap* map = get_widget_map(m_devnum, index);
-+
-+    if (!map->contains(index)) {
-+        kWarning(67100) <<  "New " << m_devnum << " widget notified for index " << index << " but I cannot find it in my list :s";
-+        return;
-+    }
-+    addDevice((*map)[index], isAppStream);
-+    emitControlsReconfigured();
-+}
-+
-+void Mixer_PULSE::removeWidget(int index)
-+{
-+    devmap* map = get_widget_map(m_devnum);
-+
-+    if (!map->contains(index)) {
-+        //kWarning(67100) <<  "Removing " << m_devnum << " widget notified for index " << index << " but I cannot find it in my list :s";
-+        // Sometimes we ignore things (e.g. event sounds) so don't be too noisy here.
-+        return;
-+    }
-+
-+    TQString id = (*map)[index].name;
-+    map->remove(index);
-+
-+    // We need to find the MixDevice that goes with this widget and remove it.
-+    MixSet::iterator iter;
-+    for (iter = m_mixDevices.begin(); iter != m_mixDevices.end(); ++iter)
-+    {
-+        if ((*iter)->id() == id)
-+        {
-+			shared_ptr<MixDevice> md = m_mixDevices.get(id);
-+			kDebug() << "MixDevice 1 useCount=" << md.use_count();
-+			md->close();
-+			kDebug() << "MixDevice 2 useCount=" << md.use_count();
-+
-+            m_mixDevices.erase(iter);
-+			kDebug() << "MixDevice 3 useCount=" << md.use_count();
-+            emitControlsReconfigured();
-+			kDebug() << "MixDevice 4 useCount=" << md.use_count();
-+            return;
-+        }
-+    }
-+}
-+
-+void Mixer_PULSE::removeAllWidgets()
-+{
-+    devmap* map = get_widget_map(m_devnum);
-+    map->clear();
-+
-+    // Special case
-+    if (KMIXPA_APP_PLAYBACK == m_devnum)
-+        outputRoles.clear();
-+
-+    freeMixDevices();
-+    emitControlsReconfigured();
-+}
-+
-+void Mixer_PULSE::addDevice(devinfo& dev, bool isAppStream)
-+{
-+    if (dev.chanMask != Volume::MNONE) {
-+        MixSet *ms = 0;
-+        if (m_devnum == KMIXPA_APP_PLAYBACK && s_mixers.contains(KMIXPA_PLAYBACK))
-+            ms = s_mixers[KMIXPA_PLAYBACK]->getMixSet();
-+        else if (m_devnum == KMIXPA_APP_CAPTURE && s_mixers.contains(KMIXPA_CAPTURE))
-+            ms = s_mixers[KMIXPA_CAPTURE]->getMixSet();
-+
-+        int maxVol = GlobalConfig::instance().volumeOverdrive ? PA_VOLUME_UI_MAX : PA_VOLUME_NORM;
-+        Volume v(maxVol, PA_VOLUME_MUTED, true, false);
-+        v.addVolumeChannels(dev.chanMask);
-+        setVolumeFromPulse(v, dev);
-+        MixDevice* md = new MixDevice( _mixer, dev.name, dev.description, dev.icon_name, ms);
-+        if (isAppStream)
-+            md->setApplicationStream(true);
-+
-+        kDebug() << "Adding Pulse volume " << dev.name << ", isCapture= " << (m_devnum == KMIXPA_CAPTURE || m_devnum == KMIXPA_APP_CAPTURE) << ", isAppStream= " << isAppStream << "=" << md->isApplicationStream() << ", devnum=" << m_devnum;
-+        md->addPlaybackVolume(v);
-+        md->setMuted(dev.mute);
-+        m_mixDevices.append(md->addToPool());
-+    }
-+}
-+
-+Mixer_Backend* PULSE_getMixer( Mixer *mixer, int devnum )
-+{
-+   Mixer_Backend *l_mixer;
-+   l_mixer = new Mixer_PULSE( mixer, devnum );
-+   return l_mixer;
-+}
-+
-+bool Mixer_PULSE::connectToDaemon()
-+{
-+    TQ_ASSERT(NULL == s_context);
-+
-+    kDebug(67100) <<  "Attempting connection to PulseAudio sound daemon";
-+    pa_mainloop_api *api = pa_glib_mainloop_get_api(s_mainloop);
-+    TQ_ASSERT(api);
-+
-+    s_context = pa_context_new(api, "KMix");
-+    TQ_ASSERT(s_context);
-+
-+    if (pa_context_connect(s_context, NULL, PA_CONTEXT_NOFAIL, 0) < 0) {
-+        pa_context_unref(s_context);
-+        s_context = NULL;
-+        return false;
-+    }
-+    pa_context_set_state_callback(s_context, &context_state_callback, NULL);
-+    return true;
-+}
-+
-+
-+Mixer_PULSE::Mixer_PULSE(Mixer *mixer, int devnum) : Mixer_Backend(mixer, devnum)
-+{
-+    if ( devnum == -1 )
-+        m_devnum = 0;
-+
-+    TQString pulseenv = qgetenv("KMIX_PULSEAUDIO_DISABLE");
-+    if (pulseenv.toInt())
-+        s_pulseActive = INACTIVE;
-+
-+    // We require a glib event loop
-+    if (!QByteArray(QAbstractEventDispatcher::instance()->metaObject()->className()).contains("EventDispatcherGlib")) {
-+        kDebug(67100) << "Disabling PulseAudio integration for lack of GLib event loop";
-+        s_pulseActive = INACTIVE;
-+    }
-+
-+
-+    ++refcount;
-+    if (INACTIVE != s_pulseActive && 1 == refcount)
-+    {
-+        // First of all conenct to PA via simple/blocking means and if that succeeds,
-+        // use a fully async integrated mainloop method to connect and get proper support.
-+        pa_mainloop *p_test_mainloop;
-+        if (!(p_test_mainloop = pa_mainloop_new())) {
-+            kDebug(67100) << "PulseAudio support disabled: Unable to create mainloop";
-+            s_pulseActive = INACTIVE;
-+            goto endconstruct;
-+        }
-+
-+        pa_context *p_test_context;
-+        if (!(p_test_context = pa_context_new(pa_mainloop_get_api(p_test_mainloop), "kmix-probe"))) {
-+            kDebug(67100) << "PulseAudio support disabled: Unable to create context";
-+            pa_mainloop_free(p_test_mainloop);
-+            s_pulseActive = INACTIVE;
-+            goto endconstruct;
-+        }
-+
-+        kDebug(67100) << "Probing for PulseAudio...";
-+        // (cg) Convert to PA_CONTEXT_NOFLAGS when PulseAudio 0.9.19 is required
-+        if (pa_context_connect(p_test_context, NULL, static_cast<pa_context_flags_t>(0), NULL) < 0) {
-+            kDebug(67100) << TQString("PulseAudio support disabled: %1").arg(pa_strerror(pa_context_errno(p_test_context)));
-+            pa_context_disconnect(p_test_context);
-+            pa_context_unref(p_test_context);
-+            pa_mainloop_free(p_test_mainloop);
-+            s_pulseActive = INACTIVE;
-+            goto endconstruct;
-+        }
-+
-+        // Assume we are inactive, it will be set to active if appropriate
-+        s_pulseActive = INACTIVE;
-+        pa_context_set_state_callback(p_test_context, &context_state_callback, NULL);
-+        for (;;) {
-+          pa_mainloop_iterate(p_test_mainloop, 1, NULL);
-+
-+          if (!PA_CONTEXT_IS_GOOD(pa_context_get_state(p_test_context))) {
-+            kDebug(67100) << "PulseAudio probe complete.";
-+            break;
-+          }
-+        }
-+        pa_context_disconnect(p_test_context);
-+        pa_context_unref(p_test_context);
-+        pa_mainloop_free(p_test_mainloop);
-+
-+
-+        if (INACTIVE != s_pulseActive)
-+        {
-+            // Reconnect via integrated mainloop
-+            s_mainloop = pa_glib_mainloop_new(NULL);
-+            TQ_ASSERT(s_mainloop);
-+
-+            connectToDaemon();
-+
-+#if defined(HAVE_CANBERRA)
-+            int ret = ca_context_create(&s_ccontext);
-+            if (ret < 0) {
-+                kDebug(67100) << "Disabling Sound Feedback. Canberra context failed.";
-+                s_ccontext = NULL;
-+            } else
-+                ca_context_set_driver(s_ccontext, "pulse");
-+#endif
-+        }
-+
-+        kDebug(67100) <<  "PulseAudio status: " << (s_pulseActive==UNKNOWN ? "Unknown (bug)" : (s_pulseActive==ACTIVE ? "Active" : "Inactive"));
-+    }
-+
-+endconstruct:
-+    s_mixers[m_devnum] = this;
-+}
-+
-+Mixer_PULSE::~Mixer_PULSE()
-+{
-+    s_mixers.remove(m_devnum);
-+
-+    if (refcount > 0)
-+    {
-+        --refcount;
-+        if (0 == refcount)
-+        {
-+#if defined(HAVE_CANBERRA)
-+            if (s_ccontext) {
-+                ca_context_destroy(s_ccontext);
-+                s_ccontext = NULL;
-+            }
-+#endif
-+
-+            if (s_context) {
-+                pa_context_unref(s_context);
-+                s_context = NULL;
-+            }
-+
-+            if (s_mainloop) {
-+                pa_glib_mainloop_free(s_mainloop);
-+                s_mainloop = NULL;
-+            }
-+        }
-+    }
-+
-+    closeCommon();
-+}
-+
-+int Mixer_PULSE::open()
-+{
-+    //kDebug(67100) <<  "Trying Pulse sink";
-+
-+    if (ACTIVE == s_pulseActive && m_devnum <= KMIXPA_APP_CAPTURE)
-+    {
-+        // Make sure the GUI layers know we are dynamic so as to always paint us
-+        _mixer->setDynamic();
-+
-+        devmap::iterator iter;
-+        if (KMIXPA_PLAYBACK == m_devnum)
-+        {
-+        	_id = "Playback Devices";
-+            m_mixerName = i18n("Playback Devices");
-+            for (iter = outputDevices.begin(); iter != outputDevices.end(); ++iter)
-+                addDevice(*iter);
-+        }
-+        else if (KMIXPA_CAPTURE == m_devnum)
-+        {
-+        	_id = "Capture Devices";
-+            m_mixerName = i18n("Capture Devices");
-+            for (iter = captureDevices.begin(); iter != captureDevices.end(); ++iter)
-+                addDevice(*iter);
-+        }
-+        else if (KMIXPA_APP_PLAYBACK == m_devnum)
-+        {
-+        	_id = "Playback Streams";
-+            m_mixerName = i18n("Playback Streams");
-+            for (iter = outputRoles.begin(); iter != outputRoles.end(); ++iter)
-+                addDevice(*iter, true);
-+            for (iter = outputStreams.begin(); iter != outputStreams.end(); ++iter)
-+                addDevice(*iter, true);
-+        }
-+        else if (KMIXPA_APP_CAPTURE == m_devnum)
-+        {
-+        	_id = "Capture Streams";
-+            m_mixerName = i18n("Capture Streams");
-+            for (iter = captureStreams.begin(); iter != captureStreams.end(); ++iter)
-+                addDevice(*iter);
-+        }
-+
-+        kDebug(67100) <<  "Using PulseAudio for mixer: " << m_mixerName;
-+        m_isOpen = true;
-+    }
-+
-+    return 0;
-+}
-+
-+int Mixer_PULSE::close()
-+{
-+	closeCommon();
-+    return 1;
-+}
-+
-+int Mixer_PULSE::id2num(const TQString& id) {
-+    //kDebug(67100) << "id2num() id=" << id;
-+    int num = -1;
-+    // todo: Store this in a hash or similar
-+    int i;
-+    for (i = 0; i < m_mixDevices.size(); ++i) {
-+        if (m_mixDevices[i]->id() == id) {
-+            num = i;
-+            break;
-+        }
-+    }
-+    //kDebug(67100) << "id2num() num=" << num;
-+    return num;
-+}
-+
-+int Mixer_PULSE::readVolumeFromHW( const TQString& id, shared_ptr<MixDevice> md )
-+{
-+    devmap *map = get_widget_map(m_devnum, id);
-+
-+    devmap::iterator iter;
-+    for (iter = map->begin(); iter != map->end(); ++iter)
-+    {
-+        if (iter->name == id)
-+        {
-+            setVolumeFromPulse(md->playbackVolume(), *iter);
-+            md->setMuted(iter->mute);
-+            break;
-+        }
-+    }
-+
-+    return 0;
-+}
-+
-+int Mixer_PULSE::writeVolumeToHW( const TQString& id, shared_ptr<MixDevice> md )
-+{
-+    devmap::iterator iter;
-+    if (KMIXPA_PLAYBACK == m_devnum)
-+    {
-+        for (iter = outputDevices.begin(); iter != outputDevices.end(); ++iter)
-+        {
-+            if (iter->name == id)
-+            {
-+                pa_operation *o;
-+
-+                pa_cvolume volume = genVolumeForPulse(*iter, md->playbackVolume());
-+                if (!(o = pa_context_set_sink_volume_by_index(s_context, iter->index, &volume, NULL, NULL))) {
-+                    kWarning(67100) <<  "pa_context_set_sink_volume_by_index() failed";
-+                    return Mixer::ERR_READ;
-+                }
-+                pa_operation_unref(o);
-+
-+                if (!(o = pa_context_set_sink_mute_by_index(s_context, iter->index, (md->isMuted() ? 1 : 0), NULL, NULL))) {
-+                    kWarning(67100) <<  "pa_context_set_sink_mute_by_index() failed";
-+                    return Mixer::ERR_READ;
-+                }
-+                pa_operation_unref(o);
-+
-+#if defined(HAVE_CANBERRA)
-+                if (s_ccontext && Mixer::getBeepOnVolumeChange() ) {
-+                    int playing = 0;
-+                    int cindex = 2; // Note "2" is simply the index we've picked. It's somewhat irrelevant.
-+
-+                    
-+                    ca_context_playing(s_ccontext, cindex, &playing);
-+
-+                    // NB Depending on how this is desired to work, we may want to simply
-+                    // skip playing, or cancel the currently playing sound and play our
-+                    // new one... for now, let's do the latter.
-+                    if (playing) {
-+                        ca_context_cancel(s_ccontext, cindex);
-+                        playing = 0;
-+                    }
-+                    
-+                    if (!playing) {
-+                        char dev[64];
-+
-+                        snprintf(dev, sizeof(dev), "%lu", (unsigned long) iter->index);
-+                        ca_context_change_device(s_ccontext, dev);
-+
-+                        // Ideally we'd use something like ca_gtk_play_for_widget()...
-+                        ca_context_play(
-+                            s_ccontext,
-+                            cindex,
-+                            CA_PROP_EVENT_DESCRIPTION, i18n("Volume Control Feedback Sound").toUtf8().constData(),
-+                            CA_PROP_EVENT_ID, "audio-volume-change",
-+                            CA_PROP_CANBERRA_CACHE_CONTROL, "permanent",
-+                            CA_PROP_CANBERRA_ENABLE, "1",
-+                            NULL
-+                        );
-+
-+                        ca_context_change_device(s_ccontext, NULL);
-+                    }
-+                }
-+#endif
-+
-+                return 0;
-+            }
-+        }
-+    }
-+    else if (KMIXPA_CAPTURE == m_devnum)
-+    {
-+        for (iter = captureDevices.begin(); iter != captureDevices.end(); ++iter)
-+        {
-+            if (iter->name == id)
-+            {
-+                pa_operation *o;
-+
-+                pa_cvolume volume = genVolumeForPulse(*iter, md->playbackVolume());
-+                if (!(o = pa_context_set_source_volume_by_index(s_context, iter->index, &volume, NULL, NULL))) {
-+                    kWarning(67100) <<  "pa_context_set_source_volume_by_index() failed";
-+                    return Mixer::ERR_READ;
-+                }
-+                pa_operation_unref(o);
-+
-+                if (!(o = pa_context_set_source_mute_by_index(s_context, iter->index, (md->isMuted() ? 1 : 0), NULL, NULL))) {
-+                    kWarning(67100) <<  "pa_context_set_source_mute_by_index() failed";
-+                    return Mixer::ERR_READ;
-+                }
-+                pa_operation_unref(o);
-+
-+                return 0;
-+            }
-+        }
-+    }
-+    else if (KMIXPA_APP_PLAYBACK == m_devnum)
-+    {
-+        if (id.startsWith("stream:"))
-+        {
-+            for (iter = outputStreams.begin(); iter != outputStreams.end(); ++iter)
-+            {
-+                if (iter->name == id)
-+                {
-+                    pa_operation *o;
-+
-+                    pa_cvolume volume = genVolumeForPulse(*iter, md->playbackVolume());
-+                    if (!(o = pa_context_set_sink_input_volume(s_context, iter->index, &volume, NULL, NULL))) {
-+                        kWarning(67100) <<  "pa_context_set_sink_input_volume() failed";
-+                        return Mixer::ERR_READ;
-+                    }
-+                    pa_operation_unref(o);
-+
-+                    if (!(o = pa_context_set_sink_input_mute(s_context, iter->index, (md->isMuted() ? 1 : 0), NULL, NULL))) {
-+                        kWarning(67100) <<  "pa_context_set_sink_input_mute() failed";
-+                        return Mixer::ERR_READ;
-+                    }
-+                    pa_operation_unref(o);
-+
-+                    return 0;
-+                }
-+            }
-+        }
-+        else if (id.startsWith("restore:"))
-+        {
-+            for (iter = outputRoles.begin(); iter != outputRoles.end(); ++iter)
-+            {
-+                if (iter->name == id)
-+                {
-+                    restoreRule &rule = s_RestoreRules[iter->stream_restore_rule];
-+                    pa_ext_stream_restore_info info;
-+                    info.name = iter->stream_restore_rule.toUtf8().constData();
-+                    info.channel_map = rule.channel_map;
-+                    info.volume = genVolumeForPulse(*iter, md->playbackVolume());
-+                    info.device = rule.device.isEmpty() ? NULL : rule.device.toUtf8().constData();
-+                    info.mute = (md->isMuted() ? 1 : 0);
-+
-+                    pa_operation* o;
-+                    if (!(o = pa_ext_stream_restore_write(s_context, PA_UPDATE_REPLACE, &info, 1, true, NULL, NULL))) {
-+                        kWarning(67100) <<  "pa_ext_stream_restore_write() failed" << info.channel_map.channels << info.volume.channels << info.name;
-+                        return Mixer::ERR_READ;
-+                    }
-+                    pa_operation_unref(o);
-+
-+                    return 0;
-+                }
-+            }
-+        }
-+    }
-+    else if (KMIXPA_APP_CAPTURE == m_devnum)
-+    {
-+        for (iter = captureStreams.begin(); iter != captureStreams.end(); ++iter)
-+        {
-+            if (iter->name == id)
-+            {
-+                pa_operation *o;
-+
-+#if HAVE_SOURCE_OUTPUT_VOLUMES
-+                pa_cvolume volume = genVolumeForPulse(*iter, md->playbackVolume());
-+                if (!(o = pa_context_set_source_output_volume(s_context, iter->index, &volume, NULL, NULL))) {
-+                    kWarning(67100) <<  "pa_context_set_source_output_volume_by_index() failed";
-+                    return Mixer::ERR_READ;
-+                }
-+                pa_operation_unref(o);
-+
-+                if (!(o = pa_context_set_source_output_mute(s_context, iter->index, (md->isMuted() ? 1 : 0), NULL, NULL))) {
-+                    kWarning(67100) <<  "pa_context_set_source_output_mute_by_index() failed";
-+                    return Mixer::ERR_READ;
-+                }
-+                pa_operation_unref(o);
-+#else                
-+                // NB Note that this is different from APP_PLAYBACK in that we set the volume on the source itself.
-+                pa_cvolume volume = genVolumeForPulse(*iter, md->playbackVolume());
-+                if (!(o = pa_context_set_source_volume_by_index(s_context, iter->device_index, &volume, NULL, NULL))) {
-+                    kWarning(67100) <<  "pa_context_set_source_volume_by_index() failed";
-+                    return Mixer::ERR_READ;
-+                }
-+                pa_operation_unref(o);
-+
-+                if (!(o = pa_context_set_source_mute_by_index(s_context, iter->device_index, (md->isMuted() ? 1 : 0), NULL, NULL))) {
-+                    kWarning(67100) <<  "pa_context_set_source_mute_by_index() failed";
-+                    return Mixer::ERR_READ;
-+                }
-+                pa_operation_unref(o);
-+#endif
-+
-+                return 0;
-+            }
-+        }
-+    }
-+
-+    return 0;
-+}
-+
-+/**
-+* Move the stream to a new destination
-+*/
-+bool Mixer_PULSE::moveStream( const TQString& id, const TQString& destId ) {
-+    TQ_ASSERT(KMIXPA_APP_PLAYBACK == m_devnum || KMIXPA_APP_CAPTURE == m_devnum);
-+
-+    kDebug(67100) <<  "Mixer_PULSE::moveStream(): Move Stream Requested - Stream: " << id << ", Destination: " << destId;
-+
-+    // Lookup the stream index.
-+    uint32_t stream_index = PA_INVALID_INDEX;
-+    TQString stream_restore_rule = "";
-+    devmap::iterator iter;
-+    devmap *map = get_widget_map(m_devnum);
-+    for (iter = map->begin(); iter != map->end(); ++iter) {
-+        if (iter->name == id) {
-+            stream_index = iter->index;
-+            stream_restore_rule = iter->stream_restore_rule;
-+            break;
-+        }
-+    }
-+
-+    if (PA_INVALID_INDEX == stream_index) {
-+        kError(67100) <<  "Mixer_PULSE::moveStream(): Cannot find stream index";
-+        return false;
-+    }
-+
-+    if (destId.isEmpty()) {
-+        // We want to remove any specific device in the stream restore rule.
-+        if (stream_restore_rule.isEmpty() || !s_RestoreRules.contains(stream_restore_rule)) {
-+            kWarning(67100) <<  "Mixer_PULSE::moveStream(): Trying to set Automatic on a stream with no rule";
-+        } else {
-+            restoreRule &rule = s_RestoreRules[stream_restore_rule];
-+            pa_ext_stream_restore_info info;
-+            info.name = stream_restore_rule.toUtf8().constData();
-+            info.channel_map = rule.channel_map;
-+            info.volume = rule.volume;
-+            info.device = NULL;
-+            info.mute = rule.mute ? 1 : 0;
-+
-+            pa_operation* o;
-+            if (!(o = pa_ext_stream_restore_write(s_context, PA_UPDATE_REPLACE, &info, 1, true, NULL, NULL))) {
-+                kWarning(67100) <<  "pa_ext_stream_restore_write() failed" << info.channel_map.channels << info.volume.channels << info.name;
-+                return Mixer::ERR_READ;
-+            }
-+            pa_operation_unref(o);
-+        }
-+    } else {
-+        pa_operation* o;
-+        if (KMIXPA_APP_PLAYBACK == m_devnum) {
-+            if (!(o = pa_context_move_sink_input_by_name(s_context, stream_index, destId.toUtf8().constData(), NULL, NULL))) {
-+                kWarning(67100) <<  "pa_context_move_sink_input_by_name() failed";
-+                return false;
-+            }
-+        } else {
-+            if (!(o = pa_context_move_source_output_by_name(s_context, stream_index, destId.toUtf8().constData(), NULL, NULL))) {
-+                kWarning(67100) <<  "pa_context_move_source_output_by_name() failed";
-+                return false;
-+            }
-+        }
-+        pa_operation_unref(o);
-+    }
-+
-+    return true;
-+}
-+
-+void Mixer_PULSE::reinit()
-+{
-+    // We only support reinit on our primary mixer.
-+    TQ_ASSERT(KMIXPA_PLAYBACK == m_devnum);
-+    connectToDaemon();
-+}
-+
-+void Mixer_PULSE::triggerUpdate()
-+{
-+    readSetFromHWforceUpdate();
-+    readSetFromHW();
-+}
-+
-+// Please see KMixWindow::initActionsAfterInitMixer(), it uses the driverName
-+
-+TQString PULSE_getDriverName() {
-+        return "PulseAudio";
-+}
-+
-+TQString Mixer_PULSE::getDriverName()
-+{
-+        return "PulseAudio";
-+}
-+
-diff -Nuar ./kmix-tde-ori/mixer_pulse.h ./kmix/mixer_pulse.h
---- ./kmix-tde-ori/mixer_pulse.h	1970-01-01 01:00:00.000000000 +0100
-+++ ./kmix/mixer_pulse.h	2013-05-21 23:27:28.960083350 +0200
-@@ -0,0 +1,85 @@
-+/*
-+ *              KMix -- KDE's full featured mini mixer
-+ *
-+ *
-+ *              Copyright (C) 2008 Helio Chissini de Castro <helio@kde.org>
-+ *                       
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Library General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2 of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Library General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Library General Public
-+ * License along with this program; if not, write to the Free
-+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-+ */
-+
-+#ifndef MIXER_PULSE_H
-+#define MIXER_PULSE_H
-+
-+#include <tqstring.h>
-+
-+#include "mixer_backend.h"
-+#include <pulse/pulseaudio.h>
-+
-+typedef TQMap<uint8_t,Volume::ChannelID> chanIDMap;
-+typedef struct {
-+    int index;
-+    int device_index;
-+    TQString name;
-+    TQString description;
-+    TQString icon_name;
-+    pa_cvolume volume;
-+    pa_channel_map channel_map;
-+    bool mute;
-+    TQString stream_restore_rule;
-+
-+    Volume::ChannelMask chanMask;
-+    chanIDMap chanIDs;
-+} devinfo;
-+
-+class Mixer_PULSE : public Mixer_Backend
-+{
-+    public:
-+        Mixer_PULSE(Mixer *mixer, int devnum);
-+        virtual ~Mixer_PULSE();
-+
-+        virtual int readVolumeFromHW( const TQString& id, shared_ptr<MixDevice> );
-+        virtual int writeVolumeToHW ( const TQString& id, shared_ptr<MixDevice> );
-+
-+        virtual bool moveStream( const TQString& id, const TQString& destId );
-+
-+        virtual TQString getDriverName();
-+        virtual TQString getId() const { return _id; };
-+
-+        virtual bool needsPolling() { return false; }
-+
-+        void triggerUpdate();
-+        void addWidget(int index, bool = false);
-+        void removeWidget(int index);
-+        void removeAllWidgets();
-+        MixSet *getMixSet() { return &m_mixDevices; }
-+        int id2num(const TQString& id);
-+
-+    protected:
-+        virtual int open();
-+        virtual int close();
-+
-+        int fd;
-+        TQString _id;
-+
-+    private:
-+        void addDevice(devinfo& dev, bool = false);
-+        bool connectToDaemon();
-+        void emitControlsReconfigured();
-+public:
-+        void reinit();
-+
-+};
-+
-+#endif
diff --git a/redhat/tdemultimedia/tdemultimedia-3.5.13.2.spec b/redhat/tdemultimedia/tdemultimedia-3.5.13.2.spec
index 9451923d3..eedd4955e 100644
--- a/redhat/tdemultimedia/tdemultimedia-3.5.13.2.spec
+++ b/redhat/tdemultimedia/tdemultimedia-3.5.13.2.spec
@@ -1,48 +1,64 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
+#
+# spec file for package tdemultimedia (version 3.5.13.2)
+#
+# 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/
+#
+
+# BUILD WARNING:
+#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
+#  Having KDE libraries may cause FTBFS here !
+
+# TDE variables
+%define tde_epoch 1
 %define tde_version 3.5.13.2
-
-# TDE specific building variables
+%define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
-
 %define tde_tdeappdir %{tde_datadir}/applications/kde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
-%define _docdir %{tde_docdir}
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?tde_prefix}" != "/usr"
+%define _variant .opt
+%endif
 
-# former extras bits
-%define _with_akode --with-akode
-## not currently compatible with libtunepimp-0.5 (only libtunepimp-0.4)
-#define _with_musicbrainz --with-musicbrainz
-%define _with_taglib --with-taglib
 
 Name:		trinity-tdemultimedia
 Summary:	Multimedia applications for the Trinity Desktop Environment (TDE)
 Version:	%{tde_version}
 Release:	%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
-
-License:	GPLv2
 Group:		Applications/Multimedia
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.trinitydesktop.org/
 
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Project
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
 Prefix:		%{tde_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-Patch0:		tdemultimedia-3.5.13.2-ftbfs.patch
-Patch1:		tdemultimedia-3.5.13.2-fix_xdg_menu.patch
 
 Obsoletes:	trinity-kdemultimedia < %{version}-%{release}
 Provides:	trinity-kdemultimedia = %{version}-%{release}
@@ -54,27 +70,33 @@ Obsoletes:	trinity-kdemultimedia-extras-libs < %{version}-%{release}
 Provides:	trinity-kdemultimedia-extras-libs = %{version}-%{release}
 
 
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	qt3-devel >= 3.3.8.d
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
 BuildRequires:	trinity-arts-devel >= 1:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 
-%if "%{?_with_akode}" != ""
+BuildRequires:	autoconf automake libtool m4
+
+# TAGLIB support
+%define _with_taglib --with-taglib
+BuildRequires: taglib-devel
+
+# AKODE support
+%define _with_akode --with-akode
 BuildRequires: trinity-akode-devel
 BuildRequires: trinity-akode-libmad
-%endif
 
 BuildRequires:	desktop-file-utils
 BuildRequires:	zlib-devel
 
+# MUSICBRAINZ support
+## not currently compatible with libtunepimp-0.5 (only libtunepimp-0.4)
+#define _with_musicbrainz --with-musicbrainz
+#BuildRequires: libmusicbrainz-devel libtunepimp-devel
+
 # Audio libraries
 BuildRequires:	libvorbis-devel
 BuildRequires:	audiofile-devel
 BuildRequires:	libtheora-devel
 BuildRequires:	alsa-lib-devel 
-%{?_with_musicbrainz:BuildRequires: libmusicbrainz-devel libtunepimp-devel}
-%{?_with_taglib:BuildRequires: taglib-devel}
 BuildRequires:	cdparanoia
 
 # CDDA support
@@ -132,7 +154,7 @@ BuildRequires:	libXt-devel
 %endif
 
 # XINE support
-%if 0%{?fedora} || 0%{?rhel} == 4 || 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?fedora} || 0%{?rhel} >= 4 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_xine 1
 %if 0%{?mgaversion} || 0%{?mdkversion}
 %if 0%{?pclinuxos}
@@ -1141,7 +1163,7 @@ noatun plugins.
 
 ##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos}
 %debug_package
 %endif
 
@@ -1156,8 +1178,6 @@ noatun plugins.
 
 %prep
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-%patch0 -p1 -b .ftbfs
-%patch1 -p1 -b .xdgmenu
 
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
 %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@@ -1215,8 +1235,20 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{?buildroot} 
 %__make install DESTDIR=%{buildroot}
 
-# don't make these world-writeable
-chmod go-w %{buildroot}%{tde_datadir}/apps/kscd/*
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file krec           AudioVideo Recorder
+%suse_update_desktop_file tdemid         AudioVideo Midi
+%suse_update_desktop_file artsbuilder    AudioVideo AudioVideoEditing
+%suse_update_desktop_file artscontrol    AudioVideo AudioVideoEditing
+%suse_update_desktop_file kmix           AudioVideo Mixer
+%suse_update_desktop_file kaboodle       AudioVideo Player
+%suse_update_desktop_file kaudiocreator  AudioVideo CD
+%suse_update_desktop_file kscd           AudioVideo Player CD
+%suse_update_desktop_file noatun         AudioVideo Player Video
+%suse_update_desktop_file juk            AudioVideo Player Jukebox
+%suse_update_desktop_file audiocd
+%endif
 
 
 %clean
author	Michele Calgaro <michele.calgaro@yahoo.it>	2014-10-12 18:24:41 +0900
committer	Michele Calgaro <michele.calgaro@yahoo.it>	2014-10-12 18:24:41 +0900
commit	b72b2f09d3239813de7f3e4cf44310ca25561e64 (patch)
tree	02502370332e8fbb612ef4d1290998499a7e6ca1 /redhat
parent	9d54bb35b5fb67dd052757e3a22cb83acbba9c50 (diff)
parent	9806eb7f9c92362ca0d03e7410d1ecee9b61a38f (diff)
download	tde-packaging-b72b2f09d3239813de7f3e4cf44310ca25561e64.tar.gz tde-packaging-b72b2f09d3239813de7f3e4cf44310ca25561e64.zip