RPM packaging: update for R14

50 files changed, 2192 insertions, 165 deletions

diff --git a/redhat/.gitignore b/redhat/.gitignore
index e69de29bb..af26df847 100644
--- a/redhat/.gitignore
+++ b/redhat/.gitignore
@@ -0,0 +1 @@
+*/*/patches
diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14
index cf00b4eb3..30501a3e1 100644
--- a/redhat/Makefile.r14
+++ b/redhat/Makefile.r14
@@ -269,7 +269,7 @@ libkexiv2:	tqtinterface
 libkipi:	tqtinterface
 	$(call buildpkg,libraries/libkipi)
 
-libksquirrel:	tqtinterface
+libksquirrel:	tdelibs
 	$(call buildpkg,libraries/libksquirrel)
 
 libtdeldap:	tqtinterface
diff --git a/redhat/applications/kaffeine/kaffeine-14.0.0.spec b/redhat/applications/kaffeine/kaffeine-14.0.0.spec
index fd64b2898..081bc1235 100644
--- a/redhat/applications/kaffeine/kaffeine-14.0.0.spec
+++ b/redhat/applications/kaffeine/kaffeine-14.0.0.spec
@@ -108,7 +108,7 @@ BuildRequires:	libgstreamer-plugins-base-devel >= 0.10
 %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}
+%if 0%{?pclinuxos}
 BuildRequires: %{_lib}xine-devel
 %else
 BuildRequires: %{_lib}xine1.2-devel
diff --git a/redhat/applications/kpilot/kpilot-14.0.0.spec b/redhat/applications/kpilot/kpilot-14.0.0.spec
index dfdca669f..c21e6f726 100644
--- a/redhat/applications/kpilot/kpilot-14.0.0.spec
+++ b/redhat/applications/kpilot/kpilot-14.0.0.spec
@@ -66,7 +66,7 @@ software does for Windows.  KPilot can back-up and restore your Palm Pilot
 and synchronize the built-in applications with their TDE counterparts.
 
 
-%if 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
@@ -112,6 +112,11 @@ export PATH="%{tde_bindir}:${PATH}"
 # Unwanted files
 %__rm -f %{?buildroot}%{tde_libdir}/libkpilot.so
 
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -r    %{?buildroot}%{tde_tdeappdir}/kpilot.desktop          Utility  PDA SyncUtility X-KDE-Utilities-Peripherals
+%suse_update_desktop_file -u -r %{?buildroot}%{tde_tdeappdir}/kpalmdoc.desktop        Utility  PDA X-TDE-Utilities-File
+%endif
 
 
 %clean
diff --git a/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec b/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec
index a19ade93c..31a80d8be 100644
--- a/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec
+++ b/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec
@@ -111,6 +111,8 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -f %{buildroot}%{tde_datadir}/desktop-directories/tde-settings-power.directory
 %__rm -f %{buildroot}%{tde_datadir}/desktop-directories/tde-settings-system.directory
 
+%__rm -f %{buildroot}%{tde_datadir}/applications/tde/laptop.desktop
+
 %clean
 %__rm -rf %{buildroot}
 
@@ -134,7 +136,7 @@ update-desktop-database %{tde_tdeappdir} -q &> /dev/null
 %{tde_datadir}/applications/tde/audioencoding.desktop
 %{tde_datadir}/applications/tde/defaultapplication.desktop
 %{tde_datadir}/applications/tde/kcm_knetworkconfmodule_ss.desktop
-%{tde_datadir}/applications/tde/laptop.desktop
+#%{tde_datadir}/applications/tde/laptop.desktop
 %{tde_datadir}/applications/tde/medianotifications.desktop
 %{tde_datadir}/applications/tde/systemsettings.desktop
 %{tde_datadir}/apps/systemsettings/systemsettingsui.rc
diff --git a/redhat/applications/tdesvn/tdesvn-14.0.0.spec b/redhat/applications/tdesvn/tdesvn-14.0.0.spec
index bff026e15..f22b66404 100644
--- a/redhat/applications/tdesvn/tdesvn-14.0.0.spec
+++ b/redhat/applications/tdesvn/tdesvn-14.0.0.spec
@@ -112,15 +112,14 @@ This package is part of tdesvn-trinity.
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-# Moves HTML files to the correect location
-find . -name "*.cmake" -exec %__sed -i {} \
-  -e "s,/doc/HTML,/doc/tde/HTML,g" \
-  \;
+rm -f src/svnqt/CMakeLists.txt.orig
+rm -fr src/svnqt/cache/sqlite3/
+
 
 
 %build
 unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${QTDIR}/bin:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 export CMAKE_INCLUDE_PATH="%{tde_tdeincludedir}"
 
 if ! rpm -E %%cmake|grep -q "cd build"; then
@@ -142,7 +141,6 @@ fi
   -DINCLUDE_INSTALL_DIR=%{tde_includedir} \
   -DLIB_INSTALL_DIR=%{tde_libdir} \
   -DMAN_INSTALL_DIR=%{tde_mandir}/man1 \
-  -DDATA_INSTALL_DIR=%{tde_datadir} \
   -DPKGCONFIG_INSTALL_DIR=%{tde_tdelibdir}/pkgconfig \
   -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
   \
@@ -217,11 +215,11 @@ fi
 %{tde_tdelibdir}/tdesvnpart.la
 %{tde_tdelibdir}/tdesvnpart.so
 %{tde_datadir}/applications/tde/tdesvn.desktop
-%{tde_datadir}/tdeconf_update/tdesvn-use-external-update.sh
-%{tde_datadir}/tdeconf_update/tdesvnpartrc-use-external.upd
-%{tde_datadir}/tdesvn/tdesvnui.rc
-%{tde_datadir}/tdesvnpart/tdesvn_part.rc
-%{tde_datadir}/konqueror/servicemenus/tdesvn_subversion.desktop
+%{tde_datadir}/apps/tdeconf_update/tdesvn-use-external-update.sh
+%{tde_datadir}/apps/tdeconf_update/tdesvnpartrc-use-external.upd
+%{tde_datadir}/apps/tdesvn/tdesvnui.rc
+%{tde_datadir}/apps/tdesvnpart/tdesvn_part.rc
+%{tde_datadir}/apps/konqueror/servicemenus/tdesvn_subversion.desktop
 %{tde_datadir}/config.kcfg/tdesvn_part.kcfg
 %{tde_datadir}/icons/hicolor/*/*/*.png
 %{tde_datadir}/icons/hicolor/*/*/*.svgz
@@ -239,8 +237,6 @@ fi
 %{tde_libdir}/libtdesvnevents.so
 %{tde_libdir}/libtdesvnhelpers.la
 %{tde_libdir}/libtdesvnhelpers.so
-#%{tde_datadir}/tdesvn/icons/hicolor/*/apps/tdesvn.png
-#%{tde_datadir}/tdesvn/icons/hicolor/scalable/apps/tdesvn.svgz
 
 %files -n trinity-libsvnqt
 %defattr(-,root,root,-)
diff --git a/redhat/build/build_rpm_package.sh b/redhat/build/build_rpm_package.sh
index d36f44299..77a547b18 100755
--- a/redhat/build/build_rpm_package.sh
+++ b/redhat/build/build_rpm_package.sh
@@ -21,9 +21,18 @@ LOGFILE=/tmp/log.${COMP##*/}
 TEMPDIR="$(mktemp -d)"
 cp -f ${SPECFILE} ${SOURCES} ${TARBALL} "${TEMPDIR}"
 
-# Check if there are local patches
+### Check for patches
+
+# 1. Check if there is a big, monolithic patch
+PATCHDIR="${SPECFILE%/*}/patches"
+BIGPATCH="${PATCHDIR}/${PKGNAME}-${TDE_VERSION}.patch"
+if [ -r "${BIGPATCH}" ]; then
+  cp -f "${BIGPATCH}" "${TEMPDIR}/one.patch"
+fi
+
+# 2. Check if there are small, local patches
 PATCHDIR="${SPECFILE%/*}/patches/${TDE_VERSION}"
-PATCHLIST="${PATCHDIR}/patches"
+PATCHLIST="${PATCHDIR}/patches.list"
 if [ -r "${PATCHLIST}" ]; then
   while read l; do
     APPLY=""
@@ -69,6 +78,7 @@ rpmbuild -ba \
   --define "tde_version ${TDE_VERSION}" \
   --define "tde_prefix /opt/trinity" \
   --define "preversion ${PREVERSION:-}" \
+  --define "tde_patch 1" \
   --define "with_akode 1" \
   --define "with_jack 1" \
   --define "with_lame 1" \
diff --git a/redhat/build/get_installed_package_version.sh b/redhat/build/get_installed_package_version.sh
index 5a8e282b8..ae2e726c1 100755
--- a/redhat/build/get_installed_package_version.sh
+++ b/redhat/build/get_installed_package_version.sh
@@ -14,7 +14,7 @@ if [ -z "${VERSION}" ] || [[ "${VERSION}" =~ "not installed" ]]; then
 fi
 
 VERSION=${VERSION/-*_/\~}
-VERSION=${VERSION%-[0-9]}
+#VERSION=${VERSION%-[0-9]}
 VERSION=${VERSION%.opt}
 VERSION=${VERSION%.[a-z]*}
 
diff --git a/redhat/build/get_latest_tarball_filename.sh b/redhat/build/get_latest_tarball_filename.sh
index 3cdeb904d..0e1d6ebdc 100755
--- a/redhat/build/get_latest_tarball_filename.sh
+++ b/redhat/build/get_latest_tarball_filename.sh
@@ -6,22 +6,37 @@ TDE_VERSION="${2:-14.0.0}"
 [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1
 [ -d "${TARBALLS_DIR}" ] || TARBALLS_DIR=~/tde/tde-tarballs/${TDE_VERSION}/
 [ -d "${TDE_PACKAGING_DIR}" ] || TDE_PACKAGING_DIR=~/tde/tde-packaging
-[ -d "${DIST_PACKAGING_DIR}" ] || DIST_PACKAGING_DIR=${PACKAGING_DIR}/redhat/
+[ -d "${DIST_PACKAGING_DIR}" ] || DIST_PACKAGING_DIR=${TDE_PACKAGING_DIR}/redhat/
+
+EXTRA_DIR="$(cd ${TARBALLS_DIR}/../extras/; pwd)"
+
+RET=$(find "${TARBALLS_DIR}" -name "trinity-${PKGNAME}-${TDE_VERSION}*.tar.gz" | sort -n | tail -n 1)
+[ -r "${RET}" ] && echo "${RET}" && exit 0
+
+RET=$(find "${TARBALLS_DIR}" "${EXTRA_DIR}" -name "${PKGNAME}-${TDE_VERSION}*.tar.gz" | sort -n | tail -n 1)
+[ -r "${RET}" ] && echo "${RET}" && exit 0
 
 RET=$(find "${TARBALLS_DIR}" -name "trinity-${PKGNAME}-[0-9]*.tar.gz" | sort -n | tail -n 1)
-if [ -z "${RET}" ]; then
-  RET=$(find "${TARBALLS_DIR}/../extras/" -name "${PKGNAME}[-_][0-9]*.tar.*" | sort -n | tail -n 1)
-fi
-if [ ! -r "${RET}" ]; then
-	# Retry without 'trinity-*', and allow any TAR extension.
-	RET=$(find "${DIST_PACKAGING_DIR}" -name "${PKGNAME}-[0-9]*.tar*" | sort -n | tail -n 1)
-	if [ ! -r "${RET}" ]; then
-		# Retry by removing numbers in package name, e.g "imlib1" => "imlib"
-		RET=$(find "${DIST_PACKAGING_DIR}" -name "$(tr -d "[0-9]" <<< ${PKGNAME})-[0-9]*.tar*" | sort -n | tail -n 1)
-	fi
-fi
-
-[ -z "${RET}" ] && exit 2
-
-echo "${RET}"
+[ -r "${RET}" ] && echo "${RET}" && exit 0
+
+RET=$(find "${EXTRA_DIR}" -name "${PKGNAME}[-_][0-9]*.tar.*" | sort -n | tail -n 1)
+[ -r "${RET}" ] && echo "${RET}" && exit 0
+
+# Now look in the 'tde-packaging' directory
+RET=$(find "${DIST_PACKAGING_DIR}" -name "${PKGNAME}-[0-9]*.tar*" | sort -n | tail -n 1)
+[ -r "${RET}" ] && echo "${RET}" && exit 0
+
+# Retry without 'trinity-*', and allow any TAR extension.
+RET=$(find "${DIST_PACKAGING_DIR}" -name "${PKGNAME}-[0-9]*.tar*" | sort -n | tail -n 1)
+[ -r "${RET}" ] && echo "${RET}" && exit 0
+
+# Retry without 'trinity-*', and allow any TAR extension.
+RET=$(find "${DIST_PACKAGING_DIR}" -name "${PKGNAME}-[0-9]*.tar*" | sort -n | tail -n 1)
+[ -r "${RET}" ] && echo "${RET}" && exit 0
+
+# Retry by removing numbers in package name, e.g "imlib1" => "imlib"
+RET=$(find "${DIST_PACKAGING_DIR}" -name "$(tr -d "[0-9]" <<< ${PKGNAME})-[0-9]*.tar*" | sort -n | tail -n 1)
+[ -r "${RET}" ] && echo "${RET}" && exit 0
+
+
 exit 0
diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh
index 520da9e6a..2c891fdba 100755
--- a/redhat/build/get_rpm_package_name.sh
+++ b/redhat/build/get_rpm_package_name.sh
@@ -20,7 +20,9 @@ case "${PKGNAME}" in
   # In case prefix is already there, don't add it again.
   "trinity-"*) PREFIX="";;
   # Most TDE dependencies have no prefix
-  "avahi-tqt"|"dbus-tqt"|"dbus-1-tqt"|"libart-lgpl"|"libcarddav"|"libcaldav"|"python-tqt"|"sip4-tqt"|"qt3"|"tqscintilla"|"tqt3"|"tqtinterface"|"tqca"|"tqca-tls") PREFIX="";;
+  "avahi-tqt"|"dbus-tqt"|"dbus-1-tqt"|"libart-lgpl"|"libcaldav"|"libcarddav"|"python-tqt"|"sip4-tqt"|"qt3"|"tqscintilla"|"tqt3"|"tqtinterface"|"tqca"|"tqca-tls") PREFIX="";;
+  # Most TDE libraries have no prefix
+  #"libkdcraw") PREFIX="";;
   # 3rd party dependencies
   "esound"|"fileshareset"|"hk_classes"|"python-qt3") PREFIX="";;
   # Extra build stuff
@@ -40,23 +42,27 @@ fi
 
 case "${PKGNAME}" in
   # Some packages have different runtime name than source package.
-  "avahi-tqt") PKGRUNTIME="${lib}avahi-tqt1";;
-  "dbus-tqt") PKGRUNTIME="${lib}dbus-tqt-1-0";;
-  "dbus-1-tqt") PKGRUNTIME="${lib}dbus-1-tqt0";;
-  "esound") PKGRUNTIME="esound-libs";;
-  "koffice") PKGRUNTIME="koffice-suite";;
-  "libart-lgpl") PKGRUNTIME="${lib}art_lgpl_2-2";;
-  "libcaldav") PKGRUNTIME="${lib}caldav0";;
-  "libcarddav") PKGRUNTIME="${lib}carddav0";;
-  "tqscintilla") PKGRUNTIME="${lib}tqscintilla7";;
-  "tqca") PKGRUNTIME="${lib}tqca1";;
-  "tqca-tls") PKGRUNTIME="${lib}tqt3-mt-tqca-tls";;
-  "tqt3") PKGRUNTIME="${lib}tqt3-mt";;
+  "avahi-tqt")    PKGRUNTIME="${lib}avahi-tqt1";;
+  "dbus-tqt")     PKGRUNTIME="${lib}dbus-tqt-1-0";;
+  "dbus-1-tqt")   PKGRUNTIME="${lib}dbus-1-tqt0";;
+  "esound")       PKGRUNTIME="esound-libs";;
+  "koffice")      PKGRUNTIME="koffice-suite";;
+  "libart-lgpl")  PKGRUNTIME="${lib}art_lgpl_2-2";;
+  "libcaldav")    PKGRUNTIME="${lib}caldav0";;
+  "libcarddav")   PKGRUNTIME="${lib}carddav0";;
+  "libkdcraw")    PKGRUNTIME="${lib}kdcraw4";;
+  "libkexiv2")    PKGRUNTIME="${lib}kexiv2-5";;
+  "libkipi")      PKGRUNTIME="${lib}kipi0";;
+  "tqscintilla")  PKGRUNTIME="${lib}tqscintilla7";;
+  "tqca")         PKGRUNTIME="${lib}tqca1";;
+  "tqca-tls")     PKGRUNTIME="${lib}tqt3-mt-tqca-tls";;
+  "tqt3")         PKGRUNTIME="${lib}tqt3-mt";;
   "tqtinterface") PKGRUNTIME="${lib}tqt4";;
   # Language package: install only French language package
-  "k3b-i18n"|"koffice-i18n"|"tde-i18n") PKGRUNTIME="${PKGNAME}-French";;
+  "k3b-i18n"|"koffice-i18n"|"tde-i18n")
+                  PKGRUNTIME="${PKGNAME}-French";;
   # Default case: runtime package has same name as source package
-  *) PKGRUNTIME="${PKGNAME}";;
+  *)              PKGRUNTIME="${PKGNAME}";;
 esac
 
 # Finally, display the runtime package name.
@@ -80,19 +86,22 @@ if [ -n "${DEVEL}" ]; then
 
   # Some package have specific development package.
   case "${PKGNAME}" in
-    "avahi-tqt") PKGDEVEL="libavahi-tqt-devel";;
-    "dbus-tqt") PKGDEVEL="libdbus-tqt-1-devel";;
-    "dbus-1-tqt") PKGDEVEL="libdbus-1-tqt-devel";;
-    "esound") PKGDEVEL="esound-devel";;
-    "pan") PKGDEVEL="uulib-devel";;
+    "avahi-tqt")   PKGDEVEL="libavahi-tqt-devel";;
+    "dbus-tqt")    PKGDEVEL="libdbus-tqt-1-devel";;
+    "dbus-1-tqt")  PKGDEVEL="libdbus-1-tqt-devel";;
+    "esound")      PKGDEVEL="esound-devel";;
+    "pan")         PKGDEVEL="uulib-devel";;
     "libart-lgpl") PKGDEVEL="libart_lgpl-devel";;
-    "libcaldav") PKGDEVEL="${lib}caldav-devel";;
-    "libcarddav") PKGDEVEL="${lib}carddav-devel";;
-    "tqca") PKGDEVEL="${lib}tqca-devel";;
+    "libcaldav")   PKGDEVEL="${lib}caldav-devel";;
+    "libcarddav")  PKGDEVEL="${lib}carddav-devel";;
+    "libkdcraw")   PKGDEVEL="${lib}kdcraw-devel";;
+    "libkexiv2")   PKGDEVEL="${lib}kexiv2-devel";;
+    "libkipi")     PKGDEVEL="${lib}kipi-devel";;
+    "tqca")        PKGDEVEL="${lib}tqca-devel";;
     "tqscintilla") PKGDEVEL="${lib}tqscintilla-devel";;
-    "tqt3") PKGDEVEL="tqt3-dev-tools tqt3-apps-devel tqt3-compat-headers";;
+    "tqt3")        PKGDEVEL="tqt3-dev-tools tqt3-apps-devel tqt3-compat-headers";;
     # Default case: development package has same name as runtime package, plus '-devel' suffix.
-    *) PKGDEVEL="${PKGRUNTIME}-devel";;
+    *)             PKGDEVEL="${PKGRUNTIME}-devel";;
   esac
 
   # Finally, other packages do have a '-devel'
diff --git a/redhat/build/get_source_files.sh b/redhat/build/get_source_files.sh
index b52c023e8..03a3598a0 100755
--- a/redhat/build/get_source_files.sh
+++ b/redhat/build/get_source_files.sh
@@ -11,10 +11,13 @@ SPECDIR="${SPECFILE%/*}"
 
 while read var val; do
   case "${var}" in
+    Version:*) VERSION="${val}";;
     Source[0-9]*:|Source:|Patch[0-9]*:)
-      FILE=$(rpm -E "${SPECDIR}/${val##*/}")
+      FILE=$(rpm --define "tde_pkg ${PKGNAME}" --define "tde_version ${TDE_VERSION}" --define "name ${PKGNAME}" --define "version ${VERSION}" -E "${SPECDIR}/${val##*/}")
       if [ -r "${FILE}" ]; then
         echo "${FILE}"
+      else
+        echo "Warning: cannot find '${FILE}'" >&2
       fi
     ;;
   esac
diff --git a/redhat/build/get_specfile.sh b/redhat/build/get_specfile.sh
index 70ff8d144..54094064b 100755
--- a/redhat/build/get_specfile.sh
+++ b/redhat/build/get_specfile.sh
@@ -6,7 +6,7 @@ TDE_VERSION="${2:-14.0.0}"
 [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1
 
 [ -d "${TDE_PACKAGING_DIR}" ] || TDE_PACKAGING_DIR=~/tde/tde-packaging
-[ -d "${DIST_PACKAGING_DIR}" ] || DIST_PACKAGING_DIR=${PACKAGING_DIR}/redhat
+[ -d "${DIST_PACKAGING_DIR}" ] || DIST_PACKAGING_DIR=${TDE_PACKAGING_DIR}/redhat
 
 # Special case for QT3
 if [ "${PKGNAME}" = "qt3" ]; then
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 41d6c5f7f..7b14e5da9 100644
--- a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
+++ b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
@@ -54,9 +54,26 @@ BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
 
+# GLIB2 support
+BuildRequires:	glib2-devel
+
 # GETTEXT support
 BuildRequires:	gettext-devel
 
+# Xi support
+%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
+
 # DBUS support
 %if 0%{?suse_version}
 BuildRequires:	dbus-1-devel
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index 893e10952..924b2ab72 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -1291,6 +1291,7 @@ for d in \
 	%{_includedir}/Xft2/X11/Xft \
 	%{_includedir}/mysql \
 	%{_includedir}/libpng15 \
+	%{_includedir}/libpng16 \
 ; do
 	if [ -d "${d}" ]; then
 		INCDIRS="${INCDIRS} -I${d}"
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
index 8b71f3508..af6aea293 100755
--- a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
@@ -69,6 +69,16 @@ BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
+# UUID support
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} || 0%{?rhel} >= 6
+%define uuid_devel libuuid-devel
+%endif
+%if 0%{?rhel} == 5
+%define uuid_devel e2fsprogs-devel
+%endif
+%{?uuid_devel:BuildRequires: %{uuid_devel}}
+
+
 # PTHREAD support
 %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
 BuildRequires:	pth-devel
@@ -92,7 +102,7 @@ BuildRequires: Mesa-libGLU-devel
 BuildRequires:	xorg-x11-devel
 %endif
 %if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}xi-devel
+BuildRequires:	libxi-devel
 %endif
 %if 0%{?suse_version} >= 1220 || 0%{?rhel} >= 5 || 0%{?fedora}
 BuildRequires:	libXi-devel
diff --git a/redhat/extras/akode/akode-14.0.0.spec b/redhat/extras/akode/akode-14.0.0.spec
index 18c1cfa60..47a7557d4 100644
--- a/redhat/extras/akode/akode-14.0.0.spec
+++ b/redhat/extras/akode/akode-14.0.0.spec
@@ -1,34 +1,56 @@
-# 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
+#
+# spec file for package akode (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/
+#
+
+# 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 2
+%define tde_version 14.0.0
+%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_mandir %{tde_datadir}/man
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
+%define tde_tdeappdir %{tde_datadir}/applications/tde
 %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
 
-Summary: 	Audio-decoding framework 
 Name:		trinity-akode 
+Summary: 	Audio-decoding framework 
+Group: 		System Environment/Libraries
+Epoch:		%{tde_epoch}
 Version:	2.0.2
-Release:	6%{?dist}%{?_variant}
+Release:	1%{?dist}%{?_variant}
+URL:		http://www.kde-apps.org/content/show.php?content=30375
 
 License:	LGPLv2+
-Group: 		System Environment/Libraries
 #URL:		http://carewolf.com/akode/  
-URL:		http://www.kde-apps.org/content/show.php?content=30375
 
-Source0:	akode-14.0.0.tar.gz
+Source0:	akode-%{tde_version}.tar.gz
 
 Prefix:		%{tde_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -135,15 +157,15 @@ aKode also has the following audio outputs:
 %package devel
 Summary: Headers for developing programs that will use %{name} 
 Group:   Development/Libraries
-Requires: %{name} = %{version}-%{release}
-%{?_with_jack:Requires: %{name}-jack = %{version}-%{release}}
-%{?_with_pulseaudio:Requires: %{name}-pulseaudio = %{version}-%{release}}
-%{?_with_libsamplerate:Requires: %{name}-libsamplerate = %{version}-%{release}}
-%{?_with_libmad:Requires: %{name}-libmad = %{version}-%{release}}
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+%{?_with_jack:Requires: %{name}-jack = %{?epoch:%{epoch}:}%{version}-%{release}}
+%{?_with_pulseaudio:Requires: %{name}-pulseaudio = %{?epoch:%{epoch}:}%{version}-%{release}}
+%{?_with_libsamplerate:Requires: %{name}-libsamplerate = %{?epoch:%{epoch}:}%{version}-%{release}}
+%{?_with_libmad:Requires: %{name}-libmad = %{?epoch:%{epoch}:}%{version}-%{release}}
 Requires: pkgconfig
 
 %description devel
-%{summary}.
+This package contains the development files for Akode.
 
 %files devel
 %defattr(-,root,root,-)
@@ -166,10 +188,10 @@ Requires: pkgconfig
 %package jack 
 Summary: Jack audio output backend for %{name}
 Group:   Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description jack 
-%{summary}.
+This package contains the Jack audio output backend for Akode.
 
 %files jack 
 %defattr(-,root,root,-)
@@ -191,10 +213,10 @@ Requires: %{name} = %{version}-%{release}
 %package pulseaudio
 Summary: Pulseaudio output backend for %{name}
 Group:   Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description pulseaudio
-%{summary}.
+This package contains the pulseaudio backend for Akode.
 Recommended for network transparent audio.
 
 %files pulseaudio
@@ -219,10 +241,10 @@ Recommended for network transparent audio.
 Summary: Resampler based on libsamplerate for %{name}
 Group:   Development/Libraries
 License: GPLv2+
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description libsamplerate 
-%{summary}.
+This package contains the samplerate decoder for Akode.
 
 # License: GPLv2+
 %files libsamplerate
@@ -245,10 +267,10 @@ Requires: %{name} = %{version}-%{release}
 %package libmad
 Summary: Decoder based on libmad for %{name}
 Group:   Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description libmad 
-%{summary}.
+This package contains the mad decoder for Akode.
 
 %files libmad
 %{tde_libdir}/libakode_mpeg_decoder.la
@@ -264,7 +286,7 @@ Requires: %{name} = %{version}-%{release}
 
 ##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
@@ -279,9 +301,6 @@ Requires: %{name} = %{version}-%{release}
 
 
 %build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
 export CXXFLAGS="${RPM_OPT_FLAGS} -DHAVE_STDINT_H"
 
 %configure \
@@ -331,5 +350,5 @@ done
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2.0.2-6
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:2.0.2-1
 - Initial release for TDE 14.0.0
diff --git a/redhat/extras/icons-nuvola/icons-nuvola-14.0.0.spec b/redhat/extras/icons-nuvola/icons-nuvola-14.0.0.spec
new file mode 100644
index 000000000..a898a7202
--- /dev/null
+++ b/redhat/extras/icons-nuvola/icons-nuvola-14.0.0.spec
@@ -0,0 +1,101 @@
+# Default version for this component
+%define tde_pkg icons-nuvola
+%define tde_version 14.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 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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_docdir}
+
+
+Name:			trinity-%{tde_pkg}
+Summary:		Nuvola icons for TDE Desktop
+Version:		1.0
+Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+
+License:		GPLv2+
+Group:			Applications/Utilities
+
+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:		icons-nuvola-14.0.0.tar.bz2
+
+BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires:	trinity-arts-devel >= 1:1.5.10
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	gettext
+
+
+%description
+Nuvola SVG evolution of SKY icon theme.
+ 
+ NUVOLA is an SVG based icon theme.
+ This mean that all icons where designed with a vector graphics software and 
+ then exported to SVG.
+ Icons of the TDE version of Nuvola are PNG images (unscalable).
+ SVG files are available (not always updated) on my web site in the "svg"
+ section.
+
+
+%if 0%{?suse_version} || 0%{?pclinuxos}
+%debug_package
+%endif
+
+
+%prep
+%setup -q -n nuvola
+
+
+%build
+
+
+%install
+install -d -m 755 %{buildroot}%{tde_datadir}/icons/nuvola
+install -d -m 755 %{buildroot}%{tde_datadir}/icons/nuvola/16x16
+install -d -m 755 %{buildroot}%{tde_datadir}/icons/nuvola/32x32
+install -d -m 755 %{buildroot}%{tde_datadir}/icons/nuvola/48x48
+install -d -m 755 %{buildroot}%{tde_datadir}/icons/nuvola/64x64
+install -d -m 755 %{buildroot}%{tde_datadir}/icons/nuvola/128x128
+rm -f thanks.to~
+cp -fr * %{buildroot}%{tde_datadir}/icons/nuvola/
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+
+
+%files
+%defattr(-,root,root,-)
+%doc author license.txt readme.txt 
+%{tde_datadir}/icons/nuvola/
+
+
+%changelog
+* Sat Sep 20 2014 Francois Andriot <francois.andriot@free.fr> - 1.0-1
+- Initial release for TDE 14.0.0
diff --git a/redhat/extras/kdevmon/kdevmon-14.0.0.spec b/redhat/extras/kdevmon/kdevmon-14.0.0.spec
new file mode 100644
index 000000000..dc327e256
--- /dev/null
+++ b/redhat/extras/kdevmon/kdevmon-14.0.0.spec
@@ -0,0 +1,138 @@
+# Default version for this component
+%define tde_pkg kdevmon
+%define tde_version 14.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 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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_docdir}
+
+
+Name:			trinity-%{tde_pkg}
+Summary:		A utility for monitoring the throughput of one network device
+Version:		0.4.6
+Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+
+License:		GPLv2+
+Group:			Applications/Utilities
+
+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:		%{tde_pkg}-%{tde_version}.tar.gz
+
+BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires:	trinity-arts-devel >= 1:1.5.10
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	gettext
+
+
+%description
+Kdevmon is a utility for TDE that monitors the throughput of a network device.
+It docks in Kicker (the panel of TDE)  and shows the current network traffic
+as a diagram. There also is a resizable main window that provides a larger
+traffic diagram and displays the current net speed in bits per second.
+Middle-clicking on the dock window or on the main window offers
+you an overview of the amount of incoming/outgoing bits and the current and
+the maximum bit rate.
+
+%if 0%{?suse_version} || 0%{?pclinuxos}
+%debug_package
+%endif
+
+
+%prep
+%setup -q -n %{tde_pkg}-%{version}
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+
+%configure \
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --docdir=%{tde_tdedocdir} \
+  --includedir=%{tde_tdeincludedir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  \
+  --disable-dependency-tracking \
+  --disable-debug \
+  --enable-new-ldflags \
+  --enable-final \
+  --enable-closure \
+  --enable-rpath \
+  --disable-gcc-hidden-visibility
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+for f in locolor ; do
+  touch --no-create %{tde_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
+done
+/sbin/ldconfig
+
+
+%postun
+for f in locolor ; do
+  touch --no-create %{tde_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
+done
+/sbin/ldconfig
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{tde_bindir}/kdevmon
+%{tde_datadir}/applnk/Internet/kdevmon.desktop
+%{tde_tdedocdir}/HTML/en/kdevmon/
+%{tde_datadir}/icons/locolor/16x16/apps/kdevmon.png
+%{tde_datadir}/icons/locolor/32x32/apps/kdevmon.png
+
+
+%changelog
+* Sat Sep 20 2014 Francois Andriot <francois.andriot@free.fr> - 0.4.6-1
+- Initial release for TDE 14.0.0
diff --git a/redhat/extras/kdissert/kdissert-14.0.0.spec b/redhat/extras/kdissert/kdissert-14.0.0.spec
new file mode 100644
index 000000000..ab6af9f24
--- /dev/null
+++ b/redhat/extras/kdissert/kdissert-14.0.0.spec
@@ -0,0 +1,175 @@
+# Default version for this component
+%define tde_pkg kdissert
+%define tde_version 14.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 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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_docdir}
+
+
+Name:			trinity-%{tde_pkg}
+Summary:        Mindmapping Tool
+Version:		1.0.6c
+Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+
+License:		GPLv2+
+Group:			Applications/Utilities
+
+Vendor:			Trinity Project
+Packager:		Francois Andriot <francois.andriot@free.fr>
+#URL:			http://www.trinitydesktop.org/
+URL:            http://freehackers.org/~tnagy/kdissert/
+
+Prefix:			%{_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{tde_pkg}-%{tde_version}.tar.gz
+Source1:		TDE.py
+
+BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires:	trinity-arts-devel >= 1:1.5.10
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	gettext
+
+
+%description
+KDissert is a mindmapping tool dedicated to the creation of complex
+documents: dissertations, thesis, presentations, and reports. It
+features several document generators: latex reports, latex slides
+(based on Prosper and Beamer), OpenOffice.org writer and impress, html,
+and plain text.
+
+%if 0%{?suse_version} || 0%{?pclinuxos}
+%debug_package
+%endif
+
+
+%prep
+%setup -q -n %{tde_pkg}-%{version}
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+
+%__rm -rf "$HOME/.waf*" 
+./waf || :
+%__install -D "%{SOURCE1}" "$HOME/.waf-0.9.0/wafadmin/Tools/KDE3.py"
+
+export CPPFLAGS="${CPPFLAGS} -I%{tde_tdeincludedir} -I%{_includedir}/tqt -I%{_includedir}/tqt3"
+
+./waf configure --libsuffix=64 \
+%ifarch x86_64 ppc64 s390x
+	--libsuffix=64 \
+%endif
+	--prefix=%{tde_prefix} \
+	--qtdir=/usr \
+	--qtincludes=/usr/include/tqt3 \
+	--kdeincludes=%{tde_tdeincludedir}
+
+./waf
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+./waf --destdir=%{buildroot} install
+
+%find_lang %{tde_pkg}
+
+
+%clean
+%__rm -rf %{buildroot}
+%__rm -rf "$HOME/.waf*" 
+
+
+%post
+for f in hicolor ; do
+  touch --no-create %{tde_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
+done
+/sbin/ldconfig
+
+
+%postun
+for f in hicolor ; do
+  touch --no-create %{tde_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
+done
+/sbin/ldconfig
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%{tde_bindir}/kdissert
+%{tde_tdelibdir}/libkdissOOOdoc.la
+%{tde_tdelibdir}/libkdissOOOdoc.so
+%{tde_tdelibdir}/libkdissOOOimpress.la
+%{tde_tdelibdir}/libkdissOOOimpress.so
+%{tde_tdelibdir}/libkdissapplet.la
+%{tde_tdelibdir}/libkdissapplet.so
+%{tde_tdelibdir}/libkdissasciidoc.la
+%{tde_tdelibdir}/libkdissasciidoc.so
+%{tde_tdelibdir}/libkdissbeamerslides.la
+%{tde_tdelibdir}/libkdissbeamerslides.so
+%{tde_tdelibdir}/libkdissdocbook.la
+%{tde_tdelibdir}/libkdissdocbook.so
+%{tde_tdelibdir}/libkdisshtmldoc.la
+%{tde_tdelibdir}/libkdisshtmldoc.so
+%{tde_tdelibdir}/libkdisspdflatexarticle.la
+%{tde_tdelibdir}/libkdisspdflatexarticle.so
+%{tde_tdelibdir}/libkdisspdflatexbook.la
+%{tde_tdelibdir}/libkdisspdflatexbook.so
+%{tde_tdelibdir}/libkdissprosperslides.la
+%{tde_tdelibdir}/libkdissprosperslides.so
+%{tde_tdelibdir}/libkdissstx.la
+%{tde_tdelibdir}/libkdissstx.so
+%{tde_tdeappdir}/kdissert.desktop
+%{tde_datadir}/apps/kdissert/
+%{tde_datadir}/apps/kdissertpart/kdissertpart.rc
+%{tde_datadir}/config.kcfg/kdissert.kcfg
+%{tde_datadir}/doc/tde/HTML/en/kdissert/
+%lang(fr) %{tde_datadir}/doc/tde/HTML/fr/kdissert/
+%{tde_datadir}/icons/hicolor/128x128/actions/kdissert_sort.png
+%{tde_datadir}/icons/hicolor/128x128/apps/kdissert.png
+%{tde_datadir}/icons/hicolor/16x16/actions/kdissert_link.png
+%{tde_datadir}/icons/hicolor/16x16/actions/kdissert_point.png
+%{tde_datadir}/icons/hicolor/16x16/actions/kdissert_sort.png
+%{tde_datadir}/icons/hicolor/16x16/apps/kdissert.png
+%{tde_datadir}/icons/hicolor/22x22/actions/kdissert_link.png
+%{tde_datadir}/icons/hicolor/22x22/actions/kdissert_point.png
+%{tde_datadir}/icons/hicolor/22x22/actions/kdissert_sort.png
+%{tde_datadir}/icons/hicolor/22x22/apps/kdissert.png
+%{tde_datadir}/icons/hicolor/32x32/actions/kdissert_link.png
+%{tde_datadir}/icons/hicolor/32x32/actions/kdissert_point.png
+%{tde_datadir}/icons/hicolor/32x32/actions/kdissert_sort.png
+%{tde_datadir}/icons/hicolor/32x32/apps/kdissert.png
+%{tde_datadir}/icons/hicolor/64x64/actions/kdissert_sort.png
+%{tde_datadir}/icons/hicolor/64x64/apps/kdissert.png
+%{tde_datadir}/mimelnk/application/x-kdissert.desktop
+%{tde_datadir}/services/kdissertpart.desktop
+
+
+%changelog
+* Sat Sep 20 2014 Francois Andriot <francois.andriot@free.fr> - 1.0.6c-1
+- Initial release for TDE 14.0.0
diff --git a/redhat/extras/kitty/kitty-14.0.0.spec b/redhat/extras/kitty/kitty-14.0.0.spec
new file mode 100644
index 000000000..538cdcafd
--- /dev/null
+++ b/redhat/extras/kitty/kitty-14.0.0.spec
@@ -0,0 +1,135 @@
+# 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 tde_version 14.0.0
+
+# TDE 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_mandir %{tde_datadir}/man
+
+%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}
+
+Summary: 		a TQt/TDE based RSS podcast and video aggregator
+Name:			trinity-kitty 
+Version:		0.9.2
+Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+
+License:		GPL
+Group:			Applications/Network
+
+Vendor:			Trinity Project
+Packager:		Francois Andriot <francois.andriot@free.fr>
+URL:			http://www.trinitydesktop.org
+
+Source:			kitty_0.9.2.orig.tar.gz
+Patch1:			kitty_0.9.2-2.1.diff.gz
+Patch2:			kitty-14.0.0-ftbfs.patch
+
+Prefix:			%{tde_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+
+BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	automake
+BuildRequires:	libtool
+
+
+%description
+Kitty is a simple graphical podcast and video podcast client which allows
+you to tune in, watch, download and bookmark podcasts and video podcasts.
+
+%files
+%defattr(-,root,root,-)
+%{tde_bindir}/kitty
+%{tde_datadir}/applnk/Utilities/kitty.desktop
+%{tde_datadir}/apps/kitty/
+%{tde_tdedocdir}/HTML/en/kitty/
+%{tde_datadir}/icons/hicolor/*/apps/kitty.png
+
+%post
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
+
+%postun 
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
+
+##########
+
+%if 0%{?suse_version} || 0%{?pclinuxos}
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n kitty-0.9.2.orig
+%patch1 -p1
+patch -p1 < debian/patches/00_am_edit.patch
+patch -p1 < debian/patches/01_qsizepolicy.patch
+
+rm -rf admin
+~/tde/tde_r14/experimental/qt3-tqt3/convert_existing_qt3_app_to_tqt3
+~/tde/tde_r14/experimental/kde-tde/convert_existing_kde3_app_to_tde
+cp -rf ~/tde/tde_r14/main/common/admin/ .
+
+mv src/khtml_kget_cancel.png src/tdehtml_kget_cancel.png
+mv src/khtml_kget.png src/tdehtml_kget.png
+
+%patch2 -p1
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__make -f admin/Makefile.common
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+
+%configure \
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --libdir=%{tde_libdir} \
+  --includedir=%{tde_includedir} \
+  --datadir=%{tde_datadir} \
+  \
+  --disable-dependency-tracking \
+  --disable-debug \
+  --enable-new-ldflags \
+  --disable-final \
+  --enable-closure \
+  --enable-rpath \
+  --disable-gcc-hidden-visibility
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+%__rm -rf %{buildroot} 
+%__make install DESTDIR=%{buildroot}
+
+
+
+%clean
+%__rm -rf %{buildroot} 
+
+
+%changelog
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.2-1
+- Initial release for TDE 14.0.0
diff --git a/redhat/extras/klamav/klamav-14.0.0.spec b/redhat/extras/klamav/klamav-14.0.0.spec
new file mode 100644
index 000000000..0aab55baf
--- /dev/null
+++ b/redhat/extras/klamav/klamav-14.0.0.spec
@@ -0,0 +1,163 @@
+# Default version for this component
+%define tde_pkg klamav
+%define tde_version 14.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 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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_docdir}
+
+
+Name:			trinity-%{tde_pkg}
+Summary:        Frontend for clamav
+Version:		0.46
+Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+
+License:		GPLv2+
+Group:			Applications/Utilities
+
+Vendor:			Trinity Project
+Packager:		Francois Andriot <francois.andriot@free.fr>
+#URL:			http://www.trinitydesktop.org/
+Url:            http://klamav.sourceforge.net/
+
+Prefix:			%{_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{tde_pkg}-%{tde_version}.tar.gz
+
+BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires:	trinity-arts-devel >= 1:1.5.10
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	gettext
+BuildRequires:	curl-devel
+BuildRequires:	gmp-devel
+BuildRequires:	sqlite-devel
+#BuildRequires:	unsermake
+BuildRequires:  fdupes
+
+BuildRequires:  clamav
+Requires:		clamav
+
+%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:  clamav-devel
+%endif
+
+
+%description
+A TDE front-end for the Clam AntiVirus antivirus toolkit.
+
+%if 0%{?suse_version} || 0%{?pclinuxos}
+%debug_package
+%endif
+
+
+%prep
+%setup -q -n %{tde_pkg}-%{version}
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+
+# Warning: --enable-final causes FTBFS
+%configure \
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --docdir=%{tde_tdedocdir} \
+  --includedir=%{tde_tdeincludedir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  \
+  --disable-dependency-tracking \
+  --disable-debug \
+  --enable-new-ldflags \
+  --enable-final \
+  --enable-closure \
+  --enable-rpath \
+  --disable-gcc-hidden-visibility \
+  \
+  --without-included-sqlite \
+  --with-extra-includes=%{_includedir}/tqt
+
+find . -name "*.cpp" | while read f; do
+  mf="${f%.cpp}.moc"
+  if grep -qw "${mf##*/}" "${f}" && [ ! -f "${mf}" ]; then
+    tqmoc "${f%.cpp}.h" -o "${mf}"
+  fi
+done
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+%find_lang %{tde_pkg}
+
+
+%clean
+%__rm -rf %{buildroot}
+	
+
+%post
+for f in hicolor ; do
+  touch --no-create %{tde_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
+done
+/sbin/ldconfig
+
+
+%postun
+for f in hicolor ; do
+  touch --no-create %{tde_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
+done
+/sbin/ldconfig
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%{tde_bindir}/ScanWithKlamAV
+%{tde_bindir}/klamarkollon
+%{tde_bindir}/klamav
+%{tde_bindir}/klammail
+%{tde_tdeappdir}/klamav.desktop
+%{tde_datadir}/apps/klamav/
+%{tde_datadir}/apps/konqueror/servicemenus/klamav-dropdown.desktop
+%{tde_datadir}/config.kcfg/klamavconfig.kcfg
+%{tde_tdedocdir}/HTML/en/klamav02/
+%{tde_datadir}/icons/hicolor/32x32/apps/klamav.png
+%{tde_datadir}/icons/hicolor/48x48/apps/klamav.png
+
+
+%changelog
+* Sat Sep 20 2014 Francois Andriot <francois.andriot@free.fr> - 0.46-1
+- Initial release for TDE 14.0.0
diff --git a/redhat/extras/klibido/klibido-14.0.0.spec b/redhat/extras/klibido/klibido-14.0.0.spec
new file mode 100644
index 000000000..4c98f3e9b
--- /dev/null
+++ b/redhat/extras/klibido/klibido-14.0.0.spec
@@ -0,0 +1,126 @@
+# Default version for this component
+%define tde_pkg klibido
+%define tde_version 14.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 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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_docdir}
+
+Name:			trinity-%{tde_pkg}
+Summary:		A TDE usenet news grabber for Linux.
+Version:		0.2.5
+Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+
+License:		GPL
+Group:			Applications/Network
+
+Vendor:			Trinity Project
+Packager:		Francois Andriot <francois.andriot@free.fr>
+URL:			http://klibido.sourceforge.net/
+
+Prefix:			%{tde_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{tde_pkg}-%{version}.tar.gz
+
+BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires:	trinity-arts-devel >= 1:1.5.10
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	uulib-devel
+
+
+%description
+KLibido is a TDE program to download encoded articles from the usenet news
+service, using the nntp protocol. It supports multiple servers, multiple
+download threads per server, automatic joining and decoding of articles.
+
+KLibido is not a NewsReader. It doesn't let you easily display the articles -
+only their subject, and it discards all non-binary posts. If you want a nice
+newsreader for TDE, try KNode.
+
+%files
+%defattr(-,root,root)
+%doc AUTHORS ChangeLog COPYING INSTALL NEWS README RELEASE TODO
+%{tde_bindir}/klibido
+%{tde_datadir}/applnk/Utilities/klibido.desktop
+%{tde_datadir}/apps/klibido/
+%{tde_datadir}/doc/tde/HTML/en/klibido/
+%{tde_datadir}/icons/hicolor/*/apps/klibido.png
+%lang(fr) %{tde_datadir}/locale/fr/LC_MESSAGES/klibido.mo
+
+##########
+
+%if 0%{?suse_version} || 0%{?pclinuxos}
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{tde_pkg}-%{version}
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+
+if [ -r /usr/include/db53/db_cxx.h ]; then
+  EXTRA_INCLUDES="/usr/include/db53"
+fi
+
+%configure \
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --includedir=%{tde_tdeincludedir} \
+  \
+  --disable-dependency-tracking \
+  --disable-debug \
+  --enable-final \
+  --enable-new-ldflags \
+  --enable-closure \
+  --enable-rpath \
+  --disable-gcc-hidden-visibility \
+  \
+  --with-extra-includes=%{_includedir}/uulib:${EXTRA_INCLUDES}
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+%__rm -rf $RPM_BUILD_ROOT
+%__make install DESTDIR=$RPM_BUILD_ROOT
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%changelog
+* Mon Dec 30 2013 François Andriot <francois.andriot@free.fr> - 0.25-1
+- Initial release
diff --git a/redhat/extras/kompose/kompose-14.0.0.spec b/redhat/extras/kompose/kompose-14.0.0.spec
new file mode 100644
index 000000000..82b63bf0d
--- /dev/null
+++ b/redhat/extras/kompose/kompose-14.0.0.spec
@@ -0,0 +1,139 @@
+# Default version for this component
+%define tde_pkg kompose
+%define tde_version 14.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 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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_docdir}
+
+
+Name:			trinity-%{tde_pkg}
+Summary:		Full-Screen Task Manager for TDE
+Version:		0.5.3
+Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+
+License:		GPLv2+
+Group:			Applications/Utilities
+
+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:		%{tde_pkg}-%{tde_version}.tar.gz
+
+BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires:	trinity-arts-devel >= 1:1.5.10
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	gettext
+BuildRequires:	imlib2-devel
+
+
+%description
+Kompose creates a full-screen view in which every window is represented
+by a scaled screen shot of it. It appears as a panel applet.
+
+
+%if 0%{?suse_version} || 0%{?pclinuxos}
+%debug_package
+%endif
+
+
+%prep
+%setup -q -n %{tde_pkg}-%{version}
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+
+# Warning: --enable-final causes FTBFS
+%configure \
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --docdir=%{tde_tdedocdir} \
+  --includedir=%{tde_tdeincludedir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  \
+  --disable-dependency-tracking \
+  --disable-debug \
+  --enable-new-ldflags \
+  --disable-final \
+  --enable-closure \
+  --enable-rpath \
+  --disable-gcc-hidden-visibility
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+%find_lang %{tde_pkg}
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+for f in hicolor ; do
+  touch --no-create %{tde_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
+done
+/sbin/ldconfig
+
+
+%postun
+for f in hicolor ; do
+  touch --no-create %{tde_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
+done
+/sbin/ldconfig
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc TODO README AUTHORS ChangeLog COPYING
+%{tde_bindir}/kompose
+%{tde_datadir}/applnk/Utilities/kompose.desktop
+%{tde_datadir}/apps/kompose/
+%{tde_tdedocdir}/HTML/en/kompose/
+%{tde_datadir}/icons/hicolor/16x16/apps/kompose.png
+%{tde_datadir}/icons/hicolor/32x32/apps/kompose.png
+
+
+%changelog
+* Sat Sep 20 2014 Francois Andriot <francois.andriot@free.fr> - 0.5.3-1
+- Initial release for TDE 14.0.0
diff --git a/redhat/extras/koverartist/koverartist-14.0.0.spec b/redhat/extras/koverartist/koverartist-14.0.0.spec
new file mode 100644
index 000000000..cef1aead3
--- /dev/null
+++ b/redhat/extras/koverartist/koverartist-14.0.0.spec
@@ -0,0 +1,142 @@
+# Default version for this component
+%define tde_pkg koverartist
+%define tde_version 14.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 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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_docdir}
+
+
+Name:			trinity-%{tde_pkg}
+Summary:		Fast Creation of CD/DVD Covers
+Version:		0.5
+Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+
+License:		GPLv2+
+Group:			Applications/Utilities
+
+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:		%{tde_pkg}-%{tde_version}.tar.gz
+
+BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires:	trinity-arts-devel >= 1:1.5.10
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	gettext
+
+
+%description
+KoverArtist is a program for the fast creation of covers for
+cd/dvd cases and boxes. The main idea behind it is to be able
+to create decent looking covers with some mouseclicks.
+
+
+%if 0%{?suse_version} || 0%{?pclinuxos}
+%debug_package
+%endif
+
+
+%prep
+%setup -q -n %{tde_pkg}-%{version}
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+
+%configure \
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --docdir=%{tde_tdedocdir} \
+  --includedir=%{tde_tdeincludedir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  \
+  --disable-dependency-tracking \
+  --disable-debug \
+  --enable-new-ldflags \
+  --enable-final \
+  --enable-closure \
+  --enable-rpath \
+  --disable-gcc-hidden-visibility
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+%find_lang %{tde_pkg}
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+for f in hicolor ; do
+  touch --no-create %{tde_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
+done
+/sbin/ldconfig
+
+
+%postun
+for f in hicolor ; do
+  touch --no-create %{tde_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
+done
+/sbin/ldconfig
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%{tde_bindir}/koverartist
+%{tde_datadir}/applnk/Multimedia/koverartist.desktop
+%{tde_datadir}/apps/koverartist/   
+%{tde_tdedocdir}/HTML/en/koverartist/
+%{tde_datadir}/icons/hicolor/128x128/apps/koverartist.png
+%{tde_datadir}/icons/hicolor/16x16/apps/koverartist.png
+%{tde_datadir}/icons/hicolor/22x22/apps/koverartist.png
+%{tde_datadir}/icons/hicolor/32x32/apps/koverartist.png
+%{tde_datadir}/icons/hicolor/48x48/apps/koverartist.png
+%{tde_datadir}/icons/hicolor/64x64/apps/koverartist.png
+%{tde_datadir}/mimelnk/application/x-koverartist.desktop
+
+
+%changelog
+* Sat Sep 20 2014 Francois Andriot <francois.andriot@free.fr> - 0.5-1
+- Initial release for TDE 14.0.0
diff --git a/redhat/extras/kpacman/kpacman-14.0.0.spec b/redhat/extras/kpacman/kpacman-14.0.0.spec
new file mode 100644
index 000000000..121b39d47
--- /dev/null
+++ b/redhat/extras/kpacman/kpacman-14.0.0.spec
@@ -0,0 +1,142 @@
+# Default version for this component
+%define tde_pkg kpacman
+%define tde_version 14.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 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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_docdir}
+
+
+Name:			trinity-%{tde_pkg}
+Summary:		A pacman game for the Trinity Desktop.
+Version:		0.3.2
+Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+
+License:		GPLv2+
+Group:			Applications/Utilities
+
+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:		%{tde_pkg}-14.0.0.tar.gz
+
+BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires:	trinity-arts-devel >= 1:1.5.10
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	gettext
+
+
+%description
+Pacman is a legendary game with an enthusiastic following from around 
+the world. Since its introduction in 1980, Pacman's image has been 
+splashed across magazine covers, television screens, T-shirts, and 
+bumper stickers. Created by Japan's Namco, and distributed in the 
+United States by Bally, Pacman is an icon of 1980's popular culture
+
+%if 0%{?suse_version} || 0%{?pclinuxos}
+%debug_package
+%endif
+
+
+%prep
+%setup -q -n %{tde_pkg}-%{version}
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+
+%configure \
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --docdir=%{tde_tdedocdir} \
+  --includedir=%{tde_tdeincludedir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  \
+  --disable-dependency-tracking \
+  --disable-debug \
+  --enable-new-ldflags \
+  --enable-final \
+  --enable-closure \
+  --enable-rpath \
+  --disable-gcc-hidden-visibility
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+%find_lang %{tde_pkg}
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+for f in hicolor locolor ; do
+  touch --no-create %{tde_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
+done
+/sbin/ldconfig
+
+
+%postun
+for f in hicolor locolor ; do
+  touch --no-create %{tde_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
+done
+/sbin/ldconfig
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING README TODO
+%{tde_bindir}/kpacman
+%{tde_datadir}/applnk/Games/kpacman.desktop
+%{tde_datadir}/apps/kpacman/   
+%{tde_datadir}/config/kpacmanrc
+%lang(de) %{tde_tdedocdir}/HTML/de/kpacman/
+%{tde_tdedocdir}/HTML/en/kpacman/
+%{tde_datadir}/icons/hicolor/16x16/apps/kpacman.png
+%{tde_datadir}/icons/hicolor/32x32/apps/kpacman.png
+%{tde_datadir}/icons/locolor/16x16/apps/kpacman.png
+%{tde_datadir}/icons/locolor/32x32/apps/kpacman.png
+
+
+%changelog
+* Sat Sep 20 2014 Francois Andriot <francois.andriot@free.fr> - 0.3.2-1
+- Initial release for TDE 14.0.0
diff --git a/redhat/main/tdeaccessibility/tdeaccessibility-14.0.0.spec b/redhat/main/tdeaccessibility/tdeaccessibility-14.0.0.spec
index e77a423c1..a698c4f0c 100644
--- a/redhat/main/tdeaccessibility/tdeaccessibility-14.0.0.spec
+++ b/redhat/main/tdeaccessibility/tdeaccessibility-14.0.0.spec
@@ -541,10 +541,6 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
-# Avoid conflict with tdelibs
-%__rm -f %{?buildroot}%{tde_datadir}/icons/crystalsvg/*/apps/kttsd.png
-%__rm -f %{?buildroot}%{tde_datadir}/icons/crystalsvg/scalable/apps/kttsd.svgz
-
 # Move desktop files to correct XDG location
 %__mv -f "%{?buildroot}%{tde_datadir}/applnk/Applications/kmag.desktop" "%{?buildroot}%{tde_tdeappdir}"
 %__mv -f "%{?buildroot}%{tde_datadir}/applnk/Applications/kmousetool.desktop" "%{?buildroot}%{tde_tdeappdir}"
@@ -558,6 +554,10 @@ for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i
 for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/kttsd.png  hicolor/"$i"x"$i"/apps/kcmkttsd.png ;done
 popd
 
+# Avoid conflict with tdelibs
+%__rm -f %{?buildroot}%{tde_datadir}/icons/crystalsvg/*/apps/kttsd.png
+%__rm -f %{?buildroot}%{tde_datadir}/icons/crystalsvg/scalable/apps/kttsd.svgz
+
 # Updates applications categories for openSUSE
 %if 0%{?suse_version}
 %suse_update_desktop_file -r kmag         Utility Accessibility
diff --git a/redhat/main/tdeaddons/tdeaddons-14.0.0.spec b/redhat/main/tdeaddons/tdeaddons-14.0.0.spec
index 2758ba766..4f350cc53 100644
--- a/redhat/main/tdeaddons/tdeaddons-14.0.0.spec
+++ b/redhat/main/tdeaddons/tdeaddons-14.0.0.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package tdeaddons
+# spec file for package tdeaddons (version R14.0.0)
 #
 # Copyright (c) 2014 Trinity Desktop Environment
 #
diff --git a/redhat/main/tdeadmin/tdeadmin-14.0.0.spec b/redhat/main/tdeadmin/tdeadmin-14.0.0.spec
index 0b1312a57..a88cd5e22 100644
--- a/redhat/main/tdeadmin/tdeadmin-14.0.0.spec
+++ b/redhat/main/tdeadmin/tdeadmin-14.0.0.spec
@@ -25,6 +25,7 @@
 %define tde_pkg tdeadmin
 %define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
+%define tde_sbindir %{tde_prefix}/sbin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
@@ -99,7 +100,6 @@ BuildRequires: pam-devel
 BuildRequires:	lilo
 %endif
 
-Requires: trinity-tdeadmin = %{version}-%{release}
 Requires: trinity-kcron = %{version}-%{release}
 Requires: trinity-kdat = %{version}-%{release}
 Requires: %{name}-kfile-plugins = %{version}-%{release}
diff --git a/redhat/main/tdeartwork/tdeartwork-14.0.0.spec b/redhat/main/tdeartwork/tdeartwork-14.0.0.spec
index 78ebaffcd..4eb0da555 100644
--- a/redhat/main/tdeartwork/tdeartwork-14.0.0.spec
+++ b/redhat/main/tdeartwork/tdeartwork-14.0.0.spec
@@ -106,7 +106,7 @@ BuildRequires:	libXScrnSaver-devel
 BuildRequires:	xscreensaver
 BuildRequires:	xscreensaver-base
 BuildRequires:	xscreensaver-extras
-%if 0%{?fedora} || 0%{?rhel} >= 6
+%if 0%{?fedora}
 BuildRequires:	xscreensaver-extras-base
 %endif
 BuildRequires:	xscreensaver-gl-base
@@ -716,6 +716,9 @@ This package is part of Trinity, and a component of the TDE artwork module.
 
 %if 0%{?fedora} >= 20
 %{tde_datadir}/applnk/System/ScreenSavers/winduprobot.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/binaryring.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/cityflow.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/geodesicgears.desktop
 %endif
 
 %endif
@@ -798,6 +801,9 @@ chmod +x "%{?buildroot}%{tde_bindir}/xscreensaver-getimage-file"
 
 # Fix missing screensavers on Fedora 20
 %if 0%{?with_xscreensaver} &&  0%{?fedora} >= 20
+touch "%{?buildroot}%{tde_datadir}/applnk/System/ScreenSavers/binaryring.desktop"
+touch "%{?buildroot}%{tde_datadir}/applnk/System/ScreenSavers/cityflow.desktop"
+touch "%{?buildroot}%{tde_datadir}/applnk/System/ScreenSavers/geodesicgears.desktop"
 touch "%{?buildroot}%{tde_datadir}/applnk/System/ScreenSavers/projectiveplane.desktop"
 touch "%{?buildroot}%{tde_datadir}/applnk/System/ScreenSavers/tessellimage.desktop"
 touch "%{?buildroot}%{tde_datadir}/applnk/System/ScreenSavers/winduprobot.desktop"
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc21 b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc21
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc21
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth       include	system-auth
+account    include	system-auth
+password   include	system-auth
+session    include	system-auth
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc21 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc21
new file mode 100644
index 000000000..0616e66f6
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity-np.fc21
@@ -0,0 +1,16 @@
+ #%PAM-1.0
+auth       required    pam_env.so
+auth       required    pam_permit.so
+auth       include     postlogin
+account    required    pam_nologin.so
+account    include     system-auth
+password   include     system-auth
+session    required    pam_selinux.so close
+session    required    pam_loginuid.so
+session    optional    pam_console.so
+-session    optional    pam_ck_connector.so
+session    required    pam_selinux.so open
+session    optional    pam_keyinit.so force revoke
+session    required    pam_namespace.so
+session    include     system-auth
+session    include     postlogin
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc21 b/redhat/main/tdebase/pamd.kdm-trinity.fc21
new file mode 100644
index 000000000..686433fce
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity.fc21
@@ -0,0 +1,19 @@
+#%PAM-1.0
+auth     [success=done ignore=ignore default=bad] pam_selinux_permit.so
+auth       required    pam_env.so
+auth       substack    system-auth
+-auth       optional    pam_gnome_keyring.so
+auth       include     postlogin
+account    required    pam_nologin.so
+account    include     system-auth
+password   include     system-auth
+session    required    pam_selinux.so close
+session    required    pam_loginuid.so
+session    optional    pam_console.so
+-session    optional    pam_ck_connector.so
+session    required    pam_selinux.so open
+session    optional    pam_keyinit.so force revoke
+session    required    pam_namespace.so
+session    include     system-auth
+-session    optional    pam_gnome_keyring.so auto_start
+session    include     postlogin
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc21 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc21
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc21
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth       include	system-auth
+account    include	system-auth
+password   include	system-auth
+session    include	system-auth
diff --git a/redhat/main/tdebase/tdebase-14.0.0.spec b/redhat/main/tdebase/tdebase-14.0.0.spec
index 0844117f2..a7a8b3579 100644
--- a/redhat/main/tdebase/tdebase-14.0.0.spec
+++ b/redhat/main/tdebase/tdebase-14.0.0.spec
@@ -170,6 +170,14 @@ Requires:	fedora-logos
 %define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
 %endif
 
+# Fedora 21 Theme
+%if 0%{?fedora} == 21
+Requires:	f21-backgrounds-base
+%define tde_bg /usr/share/backgrounds/f21/default/standard/f21.png
+Requires:	fedora-logos
+%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
+%endif
+
 # RHEL 4 Theme
 %if 0%{?rhel} == 4
 Requires:	desktop-backgrounds-basic
@@ -235,7 +243,7 @@ Requires:	desktop-common-data
 
 # OpenSuse 11.4 Theme
 %if "%{?suse_version}" == "1140"
-Requires:	hicolor-icon-theme-branding = 11.4
+Requires:	hicolor-icon-theme-branding
 %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
 %endif
 
@@ -243,7 +251,7 @@ Requires:	hicolor-icon-theme-branding = 11.4
 %if "%{?suse_version}" == "1220"
 Requires:	wallpaper-branding = 12.2
 %define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
-Requires:	hicolor-icon-theme-branding = 12.2
+Requires:	hicolor-icon-theme-branding
 %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
 %endif
 
@@ -251,7 +259,7 @@ Requires:	hicolor-icon-theme-branding = 12.2
 %if "%{?suse_version}" == "1230"
 Requires:	wallpaper-branding = 12.3
 %define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
-Requires:	hicolor-icon-theme-branding = 12.3
+Requires:	hicolor-icon-theme-branding
 %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
 %endif
 
@@ -259,7 +267,7 @@ Requires:	hicolor-icon-theme-branding = 12.3
 %if "%{?suse_version}" == "1310"
 Requires:	wallpaper-branding = 13.1
 %define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
-Requires:	hicolor-icon-theme-branding = 13.1
+Requires:	hicolor-icon-theme-branding
 %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
 %endif
 
@@ -267,7 +275,7 @@ Requires:	hicolor-icon-theme-branding = 13.1
 %if "%{?suse_version}" == "1320"
 Requires:	wallpaper-branding = 13.2
 %define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
-Requires:	hicolor-icon-theme-branding = 13.2
+Requires:	hicolor-icon-theme-branding
 %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
 %endif
 
@@ -533,7 +541,20 @@ BuildRequires:	drakconf
 
 # LIBCONFIG support
 # Needed for "compton" stuff
+%if 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora}
+%define with_compton 1
 BuildRequires:	libconfig-devel
+%endif
+
+# KBDLEDSYNC support
+%if 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora}
+%define with_kbdledsync 1
+%endif
+
+# TDERANDR support
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
+%define with_tderandrtray 1
+%endif
 
 # tdebase is a metapackage that installs all sub-packages
 Requires: %{name}-runtime-data-common = %{version}-%{release}
@@ -758,7 +779,7 @@ Summary:	Common libraries used by kwrite and kate
 Group:		System/GUI/Other
 
 %description -n trinity-libkateinterfaces
-%{summary}.
+This package contains the kateinterface library.
 
 %files -n trinity-libkateinterfaces
 %defattr(-,root,root,-)
@@ -961,8 +982,10 @@ plugdev group.
 %{tde_tdelibdir}/kcm_fontinst.so
 %{tde_tdelibdir}/kcm_fonts.la
 %{tde_tdelibdir}/kcm_fonts.so
+%if 0%{?with_tdehwlib}
 %{tde_tdelibdir}/kcm_hwmanager.la
 %{tde_tdelibdir}/kcm_hwmanager.so
+%endif
 %{tde_tdelibdir}/kcm_icons.la
 %{tde_tdelibdir}/kcm_icons.so
 %{tde_tdelibdir}/kcm_info.la
@@ -1062,7 +1085,9 @@ plugdev group.
 %{tde_tdeappdir}/filebrowser.desktop
 %{tde_tdeappdir}/filetypes.desktop
 %{tde_tdeappdir}/fonts.desktop
+%if 0%{?with_tdehwlib}
 %{tde_tdeappdir}/hwmanager.desktop
+%endif
 %{tde_tdeappdir}/icons.desktop
 %{tde_tdeappdir}/installktheme.desktop
 %{tde_tdeappdir}/interrupts.desktop
@@ -1169,7 +1194,7 @@ plugdev group.
 %{tde_tdedocdir}/HTML/en/tdefontview/
 
 # 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}
+%if 0%{?with_tderandrtray}
 %{tde_bindir}/tderandrtray
 %{tde_tdelibdir}/kcm_displayconfig.la
 %{tde_tdelibdir}/kcm_displayconfig.so
@@ -1221,6 +1246,11 @@ Summary:	Core binaries for the TDE base module
 Group:		System/GUI/Other
 Requires:	%{name}-data = %{version}-%{release}
 Requires:	pam
+%if 0%{?rhel} >= 7
+Requires:	xorg-x11-server-Xorg
+Requires:	xorg-x11-drv-evdev
+Requires:	dejavu-sans-fonts
+%endif
 
 Provides:	tdebase-bin = %{version}-%{release}
 Obsoletes:	tdebase-bin < %{version}-%{release}
@@ -1235,7 +1265,9 @@ TDE applications, particularly those in the TDE base module.
 %if 0%{?with_tsak}
 %{tde_bindir}/tsak
 %endif
+%if 0%{?with_compton}
 %{tde_bindir}/compton-tde
+%endif
 %{tde_bindir}/tdedebugdialog
 %{tde_bindir}/kreadconfig
 %{tde_bindir}/kwriteconfig
@@ -1315,21 +1347,17 @@ TDE applications, particularly those in the TDE base module.
 # SETUID binaries
 # Some setuid binaries need special care
 %if 0%{?suse_version}
-%if 0%{?with_tsak}
-%verify(not mode) %{tde_bindir}/%{tdm}tsak
-%endif
+%{?with_tsak:%verify(not mode) %{tde_bindir}/%{tdm}tsak}
 %verify(not mode) %{tde_bindir}/kcheckpass
-%verify(not mode) %{tde_bindir}/tdekbdledsync
+%{?with_kbdledsync:%verify(not mode) %{tde_bindir}/tdekbdledsync}
 %else
-%if 0%{?with_tsak}
-%attr(4511,root,root) %{tde_bindir}/%{tdm}tsak
-%endif
+%{?with_tsak:%attr(4511,root,root) %{tde_bindir}/%{tdm}tsak}
 %attr(4755,root,root) %{tde_bindir}/kcheckpass
-%attr(4755,root,root) %{tde_bindir}/tdekbdledsync
+%{?with_kbdledsync:%attr(4755,root,root) %{tde_bindir}/tdekbdledsync}
 %endif
 
 # SUSE's runupdater utility
-%if 0%{?opensuse_bs} == 0 && 0%{?suse_version}
+%if 0
 %{tde_bindir}/runupdater
 %{tde_libdir}/libtdeinit_runupdater.la
 %{tde_libdir}/libtdeinit_runupdater.so
@@ -1343,11 +1371,9 @@ TDE applications, particularly those in the TDE base module.
 update-desktop-database %{tde_appdir} 2> /dev/null || : 
 # Sets permissions on setuid files (openSUSE specific)
 %if 0%{?suse_version}
-%if 0%{?with_tsak}
-%set_permissions %{tde_bindir}/%{tdm}tsak
-%endif
+%{?with_tsak:%set_permissions %{tde_bindir}/%{tdm}tsak}
 %set_permissions %{tde_bindir}/kcheckpass
-%set_permissions %{tde_bindir}/tdekbdledsync
+%{?with_kbdledsync:%set_permissions %{tde_bindir}/tdekbdledsync}
 %endif
 
 %postun bin
@@ -1366,7 +1392,8 @@ Obsoletes:	tdebase-bin-devel < %{version}-%{release}
 Provides:	tdebase-bin-devel = %{version}-%{release}
 
 %description bin-devel
-%{summary}.
+This package contains the development files for core binaries for 
+the TDE base module
 
 %files bin-devel
 %defattr(-,root,root,-)
@@ -1651,6 +1678,7 @@ needed for a basic TDE desktop installation.
 %{tde_datadir}/wallpapers/*
 
 # XDG directories information
+%dir %{_sysconfdir}/xdg/menus/applications-merged
 %config(noreplace) %{_sysconfdir}/xdg/menus/applications-merged/tde-essential.menu
 %config(noreplace) %{_sysconfdir}/xdg/menus/tde-information.menu
 %config(noreplace) %{_sysconfdir}/xdg/menus/tde-screensavers.menu
@@ -2056,7 +2084,7 @@ Group:		Development/Libraries/Other
 Requires:	trinity-kdesktop = %{version}-%{release}
 
 %description -n trinity-kdesktop-devel
-%{summary}.
+This package contains the development files for kdesktop.
 
 %files -n trinity-kdesktop-devel
 %defattr(-,root,root,-)
@@ -2212,6 +2240,14 @@ fi
 /usr/sbin/semodule -i "%{?_sysconfdir}/trinity/%{tdm}/tdm.pp"
 %endif
 
+# SELINUX context for tdm
+%if 0%{?fedora} == 21
+if ! grep -q "%{tde_bindir}/tdm" "/etc/selinux/targeted/contexts/files/file_contexts.local" ; then
+  echo "%{tde_bindir}/tdm	--	system_u:object_r:xdm_exec_t" >>"/etc/selinux/targeted/contexts/files/file_contexts.local"
+  restorecon "%{tde_bindir}/tdm"
+fi
+%endif
+
 # Sets default user icon in TDM
 if [ ! -r "%{tdm_datadir}/faces/.default.face.icon" ]; then
   [ -d "%{tdm_datadir}/faces" ] || mkdir -p "%{tdm_datadir}/faces"
@@ -2252,7 +2288,7 @@ Requires:	trinity-tdm = %{version}-%{release}
 %{?xtst_devel:Requires: %{xtst_devel}}
 
 %description -n trinity-tdm-devel
-%{summary}.
+This package contains the development files for TDM.
 
 %files -n trinity-tdm-devel
 %defattr(-,root,root,-)
@@ -2486,7 +2522,7 @@ Requires:	trinity-kicker = %{version}-%{release}
 %{?xtst_devel:Requires: %{xtst_devel}}
 
 %description -n trinity-kicker-devel
-%{summary}.
+This package contains the development files for kicker.
 
 %files -n trinity-kicker-devel
 %defattr(-,root,root,-)
@@ -2766,7 +2802,7 @@ Group:		Development/Libraries/Other
 Requires:	trinity-konqueror = %{version}-%{release}
 
 %description -n trinity-konqueror-devel
-%{summary}.
+This package contains the development files for konqueror.
 
 %files -n trinity-konqueror-devel
 %defattr(-,root,root,-)
@@ -3045,7 +3081,7 @@ Group:		Development/Libraries/Other
 Requires:	trinity-ksplash = %{version}-%{release}
 
 %description -n trinity-ksplash-devel
-%{summary}.
+This package contains the development files for ksplash.
 
 %files -n trinity-ksplash-devel
 %defattr(-,root,root,-)
@@ -3109,7 +3145,7 @@ Group:		Development/Libraries/Other
 Requires:	trinity-ksysguard = %{version}-%{release}
 
 %description -n trinity-ksysguard-devel
-%{summary}.
+This package contains the development files for ksysguard.
 
 %files -n trinity-ksysguard-devel
 %defattr(-,root,root,-)
@@ -3185,7 +3221,6 @@ This package contains the default X window manager for TDE.
 
 %files -n trinity-twin
 %defattr(-,root,root,-)
-%{tde_bindir}/kompmgr
 %{tde_bindir}/twin
 %{tde_bindir}/twin_killer_helper
 %{tde_bindir}/twin_resumer_helper
@@ -3251,7 +3286,7 @@ Group:		Development/Libraries/Other
 Requires:	trinity-twin = %{version}-%{release}
 
 %description -n trinity-twin-devel
-%{summary}.
+This package contains the development files for twin.
 
 %files -n trinity-twin-devel
 %defattr(-,root,root,-)
@@ -3401,8 +3436,8 @@ Windows and Samba shares.
 %__sed -i "kpersonalizer/keyecandypage.cpp" \
 	-e 's|#define DEFAULT_WALLPAPER "isadora.png"|#define DEFAULT_WALLPAPER "%{tde_bg}"|'
 %__sed -i "%{starttde}" \
-	-e 's|/usr/share/wallpapers/isadora.png.desktop|%{tde_bg}|' \
-	-e 's|Wallpaper=isadora.png|Wallpaper=%{tde_bg}|'
+	-e 's|$TDEDIR/share/wallpapers/Trinity-lineart.svg.desktop|%{tde_bg}|' \
+	-e 's|Wallpaper=Trinity-lineart.svg|Wallpaper=%{tde_bg}|'
 %endif
 
 # TDE default directory and icon in startup script
@@ -3460,6 +3495,11 @@ fi
 %__sed -i "tdeioslave/cgi/kcmcgi/kcmcgi.desktop"                      -e "s|^Icon=.*|Icon=kcmcgi|"
 %__sed -i "tdeioslave/media/tdecmodule/media.desktop"                 -e "s|^Icon=.*|Icon=kcmmedia|" 
 
+# RHEL 5 does not support 'compton'
+%if 0%{?with_compton} == 0
+%__sed -i "twin/CMakeLists.txt" -e "/compton-tde/ s/^/#/"
+%endif
+
 
 %build
 unset QTDIR QTINC QTLIB
@@ -3536,6 +3576,7 @@ fi
   -DTDM_PAM_SERVICE="tdm-trinity" \
   -DTDESCREENSAVER_PAM_SERVICE="tdescreensaver-trinity" \
 %endif
+  %{!?with_kbdledsync:-DBUILD_TDEKBDLEDSYNC=OFF} \
   %{!?with_tsak:-DBUILD_TSAK=OFF} \
   ..
 
@@ -3727,7 +3768,7 @@ popd
 %suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kwrite.desktop                     TextEditor
 %suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/tdeprintfax.desktop                PrintingUtility
 %suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/tdefontview.desktop                Graphics Viewer
-%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/tderandrtray.desktop               Applet X-TDE-settings-desktop
+%{?with_tderandrtray:%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/tderandrtray.desktop               Applet X-TDE-settings-desktop}
 %suse_update_desktop_file    %{?buildroot}%{tde_datadir}/applnk/.hidden/konqfilemgr.desktop   System FileManager
 %endif
 
@@ -3746,16 +3787,19 @@ for i in ksysguard tde-kcontrol tdefontview showdesktop; do
 done
 
 # Remove setuid bit on some binaries.
-%if 0%{?with_tsak}
-chmod 0511 "%{?buildroot}%{tde_bindir}/%{tdm}tsak"
-%endif
+%{?with_tsak:chmod 0511 "%{?buildroot}%{tde_bindir}/%{tdm}tsak"}
 chmod 0755 "%{?buildroot}%{tde_bindir}/kcheckpass"
-chmod 0755 "%{?buildroot}%{tde_bindir}/tdekbdledsync"
+%{?with_kbdledsync:chmod 0755 "%{?buildroot}%{tde_bindir}/tdekbdledsync"}
 
 # Fix permissions on shell scripts
 chmod 0755 "%{?buildroot}%{tde_datadir}/apps/tdeconf_update/move_session_config.sh"
 chmod 0755 "%{?buildroot}%{tde_tdedocdir}/HTML/en/khelpcenter/glossary/checkxrefs"
 
+# Removes tderandrtray documentation, if not built.
+%if 0%{?with_tderandrtray} == 0
+%__rm -rf "%{?buildroot}%{tde_tdedocdir}/HTML/en/tderandrtray"
+%endif
+
 # Links duplicate files
 %fdupes "%{?buildroot}%{tde_datadir}"
 
@@ -3767,11 +3811,9 @@ chmod 0755 "%{?buildroot}%{tde_tdedocdir}/HTML/en/khelpcenter/glossary/checkxref
 %if 0%{?suse_version}
 # Check permissions on setuid files (openSUSE specific)
 %verifyscript
-%if 0%{?with_tsak}
-%verify_permissions -e %{tde_bindir}/%{tdm}tsak
-%endif
+%{?with_tsak:%verify_permissions -e %{tde_bindir}/%{tdm}tsak}
 %verify_permissions -e %{tde_bindir}/kcheckpass
-%verify_permissions -e %{tde_bindir}/tdekbdledsync
+%{?with_kbdledsync:%verify_permissions -e %{tde_bindir}/tdekbdledsync}
 %endif
 
 
diff --git a/redhat/main/tdebase/tdm.fc21.pp b/redhat/main/tdebase/tdm.fc21.pp
new file mode 100644
index 000000000..d0c0d4be8
--- /dev/null
+++ b/redhat/main/tdebase/tdm.fc21.pp
diff --git a/redhat/main/tdebase/tdm.service.fc21 b/redhat/main/tdebase/tdm.service.fc21
new file mode 100644
index 000000000..4c6136d94
--- /dev/null
+++ b/redhat/main/tdebase/tdm.service.fc21
@@ -0,0 +1,12 @@
+[Unit]
+Description=The Trinity login manager
+Conflicts=getty@tty1.service
+After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service
+
+[Service]
+ExecStart=/opt/trinity/bin/kdm
+Restart=always
+IgnoreSIGPIPE=no
+
+[Install]
+Alias=display-manager.service
diff --git a/redhat/main/tdebindings/tdebindings-14.0.0.spec b/redhat/main/tdebindings/tdebindings-14.0.0.spec
index 9060e0f44..529978c08 100644
--- a/redhat/main/tdebindings/tdebindings-14.0.0.spec
+++ b/redhat/main/tdebindings/tdebindings-14.0.0.spec
@@ -124,7 +124,7 @@ BuildRequires:	openssl-devel
 BuildRequires: glib-devel
 BuildRequires: gtk+-devel
 %endif
-%if 0%{?rhel} == 5
+%if 0%{?rhel} == 5 || 0%{?rhel} == 6
 %define with_gtk1 1
 BuildRequires: glib-devel
 BuildRequires: gtk+-devel
@@ -207,9 +207,16 @@ BuildRequires:	java-1.6.0-sun-devel
 # Others use OpenJDK
 BuildRequires: java-openjdk
 BuildRequires: java-devel >= 1.4.2
-%if 0%{?fedora} >= 17 || 0%{?suse_version} >= 1220 || 0%{?mgaversion} >= 3 || 0%{?rhel} >= 7
+%if 0%{?suse_version} >= 1320
+BuildRequires:	java-1_8_0-openjdk-devel
+%endif
+%if 0%{?fedora} >= 21
+BuildRequires: java-1.8.0-openjdk-devel
+%endif
+%if 0%{?fedora} == 17 ||  0%{?fedora} == 18 ||  0%{?fedora} == 19 ||  0%{?fedora} == 20 || 0%{?suse_version} == 1230 || 0%{?suse_version} == 1310 || 0%{?mgaversion} >= 3 || 0%{?rhel} >= 7
 BuildRequires: java-1.7.0-openjdk-devel
-%else
+%endif
+%if 0%{?rhel} == 5 || 0%{?rhel} == 6
 BuildRequires: java-1.6.0-openjdk-devel
 %endif
 
@@ -246,7 +253,7 @@ Requires: trinity-tdebindings-java = %{version}-%{release}
 Requires: trinity-libsmoketqt = %{version}-%{release}
 Requires: trinity-libsmoketde = %{version}-%{release}
 Requires: perl-dcop = %{version}-%{release}
-Requires: trinity-python-dcop = %{version}-%{release}
+Requires: python-dcop = %{version}-%{release}
 Requires: trinity-libkjsembed1 = %{version}-%{release}
 Requires: trinity-kjscmd = %{version}-%{release}
 Requires: trinity-juic = %{version}-%{release}
@@ -616,12 +623,15 @@ Perl bindings to the DCOP interprocess communication protocol used by TDE
 
 ##########
 
-%package -n trinity-python-dcop
+%package -n python-dcop
 Summary:	DCOP bindings for Python
 Group:		System/Libraries
 Requires:	python
 
-%description -n trinity-python-dcop
+Obsoletes:	trinity-python-dcop < %{version}-%{release}
+Provides:	trinity-python-dcop = %{version}-%{release}
+
+%description -n python-dcop
 This package contains the shared libraries necessary to run and
 develop Python programs using the Python DCOP bindings
 libraries. DCOP is the TDE Desktop COmmunications Protocol, used for
@@ -629,7 +639,7 @@ communicating with running TDE applications.
 
 This package is part of the official TDE bindings module.
 
-%files -n trinity-python-dcop
+%files -n python-dcop
 %defattr(-,root,root,-)
 %{python_sitearch}/pcop.la
 %{python_sitearch}/pcop.so
@@ -1042,7 +1052,7 @@ Requires:	trinity-libqt3-jni-devel = %{version}-%{release}
 Requires:	trinity-libtrinity-jni-devel = %{version}-%{release}
 
 %description devel
-Development files for the TDE bindings.
+This package contains the development files for the TDE bindings.
 
 %files devel
 %defattr(-,root,root,-)
@@ -1079,6 +1089,7 @@ exit 1
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
+export TDEDIR=%{tde_prefix}
 
 unset JAVA_HOME ||:
 %{?java_home:JAVA_HOME=%{java_home}; export JAVA_HOME}
@@ -1105,7 +1116,7 @@ fi
 EXTRA_INCLUDES="/usr/include/ruby-%{rb20_ver}:/usr/include/ruby-%{rb20_ver}/%{_target}"
 %endif
 
-# Warning: GCC visibility causes FTBFS [Bug #1285]
+# Warning: GCC visibility causes FTBFS [Bug #1285]
 %configure \
   --prefix=%{tde_prefix} \
   --exec-prefix=%{tde_prefix} \
diff --git a/redhat/main/tdegames/tdegames-14.0.0.spec b/redhat/main/tdegames/tdegames-14.0.0.spec
index 3f721ce66..42d0eb79c 100644
--- a/redhat/main/tdegames/tdegames-14.0.0.spec
+++ b/redhat/main/tdegames/tdegames-14.0.0.spec
@@ -40,7 +40,7 @@
 %endif
 
 
-Name:			trinity-tdegames
+Name:			trinity-%{tde_pkg}
 Summary:		Trinity Desktop Environment - Games
 Version:		%{tde_version}
 Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
diff --git a/redhat/main/tdelibs/tdelibs-14.0.0.spec b/redhat/main/tdelibs/tdelibs-14.0.0.spec
index 4071cb33c..8d413d3ed 100644
--- a/redhat/main/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/main/tdelibs/tdelibs-14.0.0.spec
@@ -171,13 +171,13 @@ BuildRequires:	utempter-devel
 %endif
 
 # HSPELL support
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_hspell 1
 BuildRequires:	hspell-devel
 %endif
 
 # JASPER support
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
 %define with_jasper 1
 %if 0%{?suse_version}
 BuildRequires:	libjasper-devel
@@ -205,7 +205,7 @@ Requires:		avahi
 %endif
 
 # OPENEXR support
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
 %define with_openexr 1
 BuildRequires:	OpenEXR-devel
 %endif
@@ -253,12 +253,17 @@ BuildRequires:	xz-devel
 %endif
 
 # Certificates support
-%if 0%{?fedora} == 18 || 0%{?fedora} == 19
-%define	cacert	%{_sysconfdir}/ssl/certs/ca-certificates.crt
+%if 0%{?fedora}
 BuildRequires:	ca-certificates
 Requires:		ca-certificates
+%if 0%{?fedora} == 20
+%define	cacert	%{_sysconfdir}/pki/tls/certs/ca-bundle.crt
+%endif
+%if 0%{?fedora} == 18 || 0%{?fedora} == 19
+%define	cacert	%{_sysconfdir}/ssl/certs/ca-certificates.crt
+%endif
 %endif
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?fedora} >= 20
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6
 %define	cacert	%{_sysconfdir}/ssl/certs/ca-bundle.crt
 Requires:		openssl
 %endif
diff --git a/redhat/main/tdemultimedia/tdemultimedia-14.0.0.spec b/redhat/main/tdemultimedia/tdemultimedia-14.0.0.spec
index c27d6ce15..dfb629771 100644
--- a/redhat/main/tdemultimedia/tdemultimedia-14.0.0.spec
+++ b/redhat/main/tdemultimedia/tdemultimedia-14.0.0.spec
@@ -153,6 +153,11 @@ BuildRequires:	gstreamer-0_10-devel
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	%{_lib}xxf86dga-devel
 BuildRequires:	%{_lib}xxf86vm-devel
+%if 0%{?mgaversion} >= 4
+BuildRequires:	%{_lib}xtst-devel
+%else
+BuildRequires:	%{_lib}xtst%{?mgaversion:6}-devel
+%endif
 %endif
 %if 0%{?rhel} == 4
 BuildRequires:	xorg-x11-devel
@@ -1246,7 +1251,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
   --enable-rpath \
   --disable-gcc-hidden-visibility \
   \
-  --with-extra-includes="%{_includedir}/cdda:%{_includedir}/cddb:%{tde_includedir}/artsc:%{tde_tdeincludedir}/arts" \
+  --with-extra-includes="%{_includedir}/cdda:%{_includedir}/cddb:%{tde_tdeincludedir}/arts:%{tde_includedir}/artsc" \
   \
   --with-vorbis \
   --without-ossaudio \
diff --git a/redhat/main/tdepim/tdepim-14.0.0.spec b/redhat/main/tdepim/tdepim-14.0.0.spec
index 6f8a7642c..075951afd 100644
--- a/redhat/main/tdepim/tdepim-14.0.0.spec
+++ b/redhat/main/tdepim/tdepim-14.0.0.spec
@@ -207,6 +207,7 @@ This metapackage includes a collection of Personal Information Management
 (PIM) applications provided with the official release of Trinity.
 
 %files
+%defattr(-,root,root,-)
 
 ##########
 
@@ -1482,6 +1483,7 @@ installed.
 %{tde_datadir}/autostart/korgac.desktop
 %{tde_datadir}/config.kcfg/korganizer.kcfg
 %{tde_datadir}/icons/hicolor/*/apps/korganizer.png
+%dir %{tde_datadir}/services/kontact
 %{tde_datadir}/services/kontact/korganizerplugin.desktop
 %{tde_datadir}/services/kontact/journalplugin.desktop
 %{tde_datadir}/services/kontact/todoplugin.desktop
@@ -1697,7 +1699,8 @@ This is the runtime package for programs that use the libkcal-trinity library.
 %{tde_libdir}/libkcal.so.*
 %{tde_libdir}/libkcal_resourceremote.so.*
 %{tde_libdir}/libkholidays.so.*
-%{tde_datadir}/apps/libkholidays
+%{tde_datadir}/apps/libkholidays/
+%dir %{tde_datadir}/services/tderesources/kcal
 %{tde_datadir}/services/tderesources/kcal/imap.desktop
 %{tde_datadir}/services/tderesources/kcal/tdeabc.desktop
 %{tde_datadir}/services/tderesources/kcal/local.desktop
diff --git a/redhat/main/tdesdk/tdesdk-14.0.0.spec b/redhat/main/tdesdk/tdesdk-14.0.0.spec
index 341241738..12bc13215 100644
--- a/redhat/main/tdesdk/tdesdk-14.0.0.spec
+++ b/redhat/main/tdesdk/tdesdk-14.0.0.spec
@@ -63,7 +63,7 @@ BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
 
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-perl-dcop >= {tde_version}
+BuildRequires:	trinity-perl-dcop >= %{tde_version}
 BuildRequires:	trinity-tdepim-devel >= %{tde_version}
 
 BuildRequires:	cmake >= 2.8
diff --git a/redhat/main/tdeutils/tdeutils-14.0.0.spec b/redhat/main/tdeutils/tdeutils-14.0.0.spec
index 8186daa2f..5607cab08 100644
--- a/redhat/main/tdeutils/tdeutils-14.0.0.spec
+++ b/redhat/main/tdeutils/tdeutils-14.0.0.spec
@@ -1003,7 +1003,7 @@ Obsoletes:	tdeutils-devel < %{version}-%{release}
 Provides:	tdeutils-devel = %{version}-%{release}
 
 %description devel
-Development files for %{name}.
+Development files for tdeutils.
 
 %files devel
 %defattr(-,root,root,-)
diff --git a/redhat/main/tdevelop/tdevelop-14.0.0.spec b/redhat/main/tdevelop/tdevelop-14.0.0.spec
index 820d5af36..c810089ac 100644
--- a/redhat/main/tdevelop/tdevelop-14.0.0.spec
+++ b/redhat/main/tdevelop/tdevelop-14.0.0.spec
@@ -126,8 +126,10 @@ BuildRequires:	openldap2-devel
 BuildRequires:	openldap-devel
 %endif
 
-# ACL support
+# LIBACL support
+%if 0%{?suse_version} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	libacl-devel
+%endif
 
 %description
 The TDevelop Integrated Development Environment provides many features
diff --git a/redhat/packages.el5 b/redhat/packages.el5
index bf44b661b..e6110b3c0 100644
--- a/redhat/packages.el5
+++ b/redhat/packages.el5
@@ -180,3 +180,5 @@ dejagnu
 expect
 python-docutils
 texinfo-tex
+fdupes
+htdig
diff --git a/redhat/packages.f20 b/redhat/packages.f20
index ca953e0b6..b0ef5aa2b 100644
--- a/redhat/packages.f20
+++ b/redhat/packages.f20
@@ -199,3 +199,5 @@ fontpackages-devel
 libudisks2-devel
 htdig
 libconfig-devel
+gtk3-devel
+gtk3-devel sudo yum install -y libtqt3-mt-sqlite3
diff --git a/redhat/packages.f21 b/redhat/packages.f21
new file mode 100644
index 000000000..9b42808bb
--- /dev/null
+++ b/redhat/packages.f21
@@ -0,0 +1,202 @@
+alsa-lib-devel
+aspell
+aspell-devel
+audiofile-devel
+autotrace
+avahi-devel
+bind-devel
+binutils-devel
+bison
+boost-devel
+bzip2-devel
+ccache
+ccrtp-devel
+cdparanoia
+cdparanoia-devel
+chrpath
+clucene-core-devel
+cmake
+commoncpp2-devel
+cpp
+cppunit-devel
+createrepo
+cups-devel
+db4-devel
+dbus-glib-devel
+djvulibre
+djvulibre-devel
+doxygen
+dssi-devel
+esound-devel
+exiv2-devel
+fdupes
+ffmpeg-devel
+fftw-devel
+file-devel
+flac-devel
+flex-static
+fribidi-devel
+gamin-devel
+gcc
+gcc-c++
+gcc-java
+gettext-devel
+glib-devel
+gmp-devel
+gnokii-devel
+gperf
+gpgme-devel
+gphoto2-devel
+GraphicsMagick-devel
+gsl-devel
+gstreamer-devel
+gstreamer-plugins-base-devel
+gtk2-devel
+gtk+-devel
+gtk-doc
+guile-devel
+hspell-devel
+html2ps
+icu
+ImageMagick-devel
+imake
+imlib-devel
+jack-audio-connection-kit-devel
+jasper-devel
+java-1.4.2-gcj-compat-devel
+java-1.8.0-openjdk-devel
+java-devel
+java-openjdk
+lame-devel
+lcms-devel
+libacl-devel
+libart_lgpl-devel
+libblkid-devel
+libcap-devel
+libcdio-devel
+libcdio-paranoia-devel
+libcurl-devel
+libdb-cxx-devel
+libdb-devel
+libdvdread-devel
+libfontenc-devel
+libgadu-devel
+libgcj-devel
+libgpod-devel
+libgsf-devel
+libical-devel
+libidn-devel
+libifp-devel
+liblo-devel
+liblrdf-devel
+libmad-devel
+libmng-devel
+libmp4v2-devel
+libmpcdec-devel
+libmtp-devel
+libmusicbrainz-devel
+libnjb-devel
+libofx-devel
+libogg-devel
+libotr-devel
+libpaper-devel
+libpqxx-devel
+libraw1394-devel
+librsvg2
+librsvg2-tools
+libsamplerate-devel
+libsmbclient-devel
+libsndfile-devel
+libssh2-devel
+libtheora-devel
+libtiff-devel
+libtool
+libtool-ltdl-devel
+libtunepimp-devel
+libudev-devel
+libutempter-devel
+libv4l-devel
+libvisual-devel
+libvorbis-devel
+libwmf-devel
+libwpd-devel
+libXaw-devel
+libXcomposite-devel
+libXdamage-devel
+libXdmcp-devel
+libxkbfile-devel
+libXScrnSaver-devel
+libxslt-devel
+libXtst-devel
+libXv-devel
+libXxf86dga-devel
+libXxf86vm-devel
+libzrtpcpp-devel
+lirc-devel
+lm_sensors-devel
+meanwhile-devel
+mftrace
+mysql-devel
+nas-devel
+neon-devel
+netpbm-progs
+net-snmp-devel
+net-tools
+NetworkManager-glib-devel
+ocaml
+ocaml(compiler)
+OpenEXR-devel
+openldap-devel
+openslp-devel
+opensp-devel
+ortp-devel
+pam-devel
+pciutils-devel
+pcre-devel
+pcsc-lite-devel
+perl
+perl-devel
+perl(ExtUtils::MakeMaker)
+perl(XML::Parser)
+pilot-link-devel
+poppler-devel
+postgresql-devel
+pth-devel
+pulseaudio-libs-devel
+recode
+redhat-rpm-config
+rpm-build
+ruby
+ruby-devel
+sane-backends-devel
+scons
+SDL-devel
+sip-devel
+speex-devel
+sqlite-devel
+subversion-devel
+sword-devel
+t1lib-devel
+t1utils
+taglib-devel
+tar
+transfig
+udisks-devel
+unixODBC-devel
+valgrind
+wireless-tools-devel
+xine-lib-devel
+xmedcon
+xmedcon-devel
+xmlto
+xorg-x11-font-utils
+xscreensaver
+xscreensaver-extras
+xulrunner-devel
+xz-devel
+texinfo
+fontpackages-devel
+libudisks2-devel
+htdig
+libconfig-devel
+gtk3-devel
diff --git a/redhat/packages.mga4 b/redhat/packages.mga4
index 3684984f7..e8700a238 100644
--- a/redhat/packages.mga4
+++ b/redhat/packages.mga4
@@ -205,3 +205,5 @@ xscreensaver-extrusion
 xscreensaver-gl
 yaz
 zlib-devel
+fdupes
+firebird-devel
diff --git a/redhat/packages.oss123 b/redhat/packages.oss123
new file mode 100644
index 000000000..9126b044a
--- /dev/null
+++ b/redhat/packages.oss123
@@ -0,0 +1,173 @@
+aspell
+aspell-devel
+audiofile-devel
+automake
+avahi-devel
+bind-devel
+binutils-devel
+bison
+boost-devel
+ccache
+c++_compiler
+cdparanoia
+cdparanoia-devel
+chrpath
+clucene-core-devel
+cmake
+commoncpp2-devel
+createrepo
+cups-devel
+cyrus-sasl-devel
+dbus-1-devel
+dbus-1-glib-devel
+dbus-devel
+djvulibre
+docbook-xsl-stylesheets
+doxygen GraphicsMagick
+dssi-devel
+esound-devel
+fdupes
+ffmpeg1-devel
+ffmpeg-devel
+fftw3-devel
+fftw-devel
+file-devel
+flac-devel
+flex
+fribidi-devel
+gettext-devel
+giflib-devel
+gmp-devel
+gnokii-devel
+gnutls-devel
+gperf xmlto
+gpgme-devel
+GraphicsMagick-devel
+gsl-devel
+gstreamer-0_10-devel
+gstreamer-0_10-plugins-base-devel 
+gstreamer-devel
+gtk2-devel
+gtk-doc
+hal-devel
+html2ps
+hunspell-devel
+ImageMagick-devel
+imlib1-devel
+java-1.6.0-openjdk-devel
+java-1.7.0-openjdk-devel
+java-devel
+libacl-devel
+libart_lgpl-devel
+libblkid-devel
+libbz2-devel
+libcap-devel
+libccrtp-devel
+libcdio-devel
+libcdio-paranoia-devel
+libconfig-devel
+libcurl-devel
+libdb-4_8-devel
+libdvdread-devel
+libexiv2-devel
+libgadu-devel
+libgphoto2-devel
+libgpod-devel
+libhd-devel
+libical-devel
+libidn-devel
+libiw-devel
+libjasper-devel
+liblo-devel
+liblrdf-devel
+libmad-devel
+libmng-devel
+libmp3lame-devel
+libmp4v2-devel
+libmpcdec-devel
+libmtp-devel
+libmusicbrainz-devel 
+libnjb-devel
+libofx-devel
+libotr2-devel
+libotr-devel
+libpng15-compat-devel
+libpng-devel
+libpqxx-devel
+librsvg-devel
+libsamplerate-devel
+libsmbclient-devel
+libsndfile-devel
+libtheora-devel
+libtiff-devel
+libtool
+libtunepimp-devel
+libtwolame-devel
+libudev-devel
+libungif-devel
+libv4l-devel
+libvisual-devel
+libwmf-devel
+libwpd-devel
+libxine-devel
+libxslt-devel
+libzrtpcpp-devel
+lilo
+lirc-devel
+make
+meanwhile-devel
+Mesa-devel
+mesa-libGL-devel
+mesa-libGLU-devel
+mozilla-xulrunner20-devel
+mysql-devel
+neon-devel
+NetworkManager-devel
+ocaml
+OpenEXR-devel
+openslp-devel
+opensp-devel
+pam-devel
+patch
+pciutils-devel
+pcre-devel
+pcsc-lite-devel
+pilot-link-devel
+poppler-devel
+postgresql
+postgresql-devel
+pth-devel
+pulseaudio-devel
+python-devel
+python-sip-devel
+recode
+rsvg-view
+ruby
+ruby-devel
+sane-backends-devel
+scons
+SDL-devel
+sqlite-devel
+subversion-devel
+sword-devel
+t1lib-devel
+taglib-devel
+transfig
+trinity-PyQt-devel
+udev-devel
+unixODBC-devel
+update-desktop-files
+utempter-devel
+valgrind
+wv2-devel
+xscreensaver
+xscreensaver-data
+xscreensaver-data-extra
+xulrunner-devel
+xz-devel
+libaudio-devel
+fdupes
+NetworkManager-devel
+udisks-devel
+udisks2-devel
+libconfig-devel
diff --git a/redhat/packages.oss132 b/redhat/packages.oss132
new file mode 100644
index 000000000..a87c83b61
--- /dev/null
+++ b/redhat/packages.oss132
@@ -0,0 +1,166 @@
+aspell
+aspell-devel
+audiofile-devel
+automake
+libavahi-devel
+bind-devel
+binutils-devel
+bison
+boost-devel
+ccache
+cdparanoia
+cdparanoia-devel
+chrpath
+clucene-core-devel
+cmake
+commoncpp2-devel
+createrepo
+cups-devel
+cyrus-sasl-devel
+dbus-1-devel
+dbus-1-glib-devel
+djvulibre
+docbook-xsl-stylesheets
+doxygen GraphicsMagick
+dssi-devel
+fdupes
+ffmpeg-devel
+fftw3-devel
+file-devel
+flac-devel
+flex
+freetype-devel
+fribidi-devel
+gcc-c++
+giflib-devel
+glu-devel
+gmp-devel
+gnokii-devel
+gperf xmlto
+GraphicsMagick-devel
+gsl-devel
+gstreamer-0_10-devel
+gstreamer-0_10-plugins-base-devel 
+gstreamer-devel
+gtk2-devel
+gtk-doc
+html2ps
+hunspell-devel
+ImageMagick-devel
+java-1_8_0-openjdk-devel
+libacl-devel
+libart_lgpl-devel
+libavahi-devel
+libblkid-devel
+libbz2-devel
+libcap-devel
+libcdio-devel
+libcdio-paranoia-devel
+libconfig-devel
+libcurl-devel
+libdb-4_8-devel
+libdvdread-devel
+libexiv2-devel
+libgadu-devel
+libgphoto2-devel
+libgpod-devel
+libical-devel
+libidn-devel
+libiw-devel
+libjasper-devel
+liblo-devel
+liblrdf-devel
+libmad-devel
+libmng-devel
+libmp3lame-devel
+libmp4v2-devel
+libmpcdec-devel
+libmtp-devel
+libmusicbrainz-devel 
+libnjb-devel
+libofx-devel
+libotr-devel
+libpng16-devel
+libpqxx-devel
+libraw1394-devel
+librsvg-devel
+libsamplerate-devel
+libsmbclient-devel
+libsndfile-devel
+libtheora-devel
+libtiff-devel
+libtool
+libtunepimp-devel
+libtwolame-devel
+libudev-devel
+libv4l-devel
+libvisual-devel
+libwmf-devel
+libwpd-devel
+libxine-devel
+libxslt-devel
+libzrtpcpp-devel
+lilo
+lirc-devel
+make
+meanwhile-devel
+Mesa-devel
+Mesa-libGL-devel
+NetworkManager-devel
+ocaml
+openexr-devel
+openslp-devel
+opensp-devel
+pam-devel
+patch
+pciutils-devel
+pcre-devel
+pcsc-lite-devel
+postgresql
+postgresql-devel
+python-devel
+python-sip-devel
+recode
+rsvg-view
+ruby
+ruby-devel
+sane-backends-devel
+scons
+speex-devel
+sqlite3-devel
+subversion-devel
+sword-devel
+transfig
+udisks-devel
+udisks2-devel
+unixODBC-devel
+update-desktop-files
+utempter-devel
+valgrind
+wireless-tools
+wv2-devel
+xcb-proto-devel
+xscreensaver
+xscreensaver-data
+xscreensaver-data-extra
+xz-devel
+libaudio-devel
+mysql-devel
+libpth-devel
+alsa-lib-devel
+libvorbis-devel
+esound-devel
+libjack-devel
+libpulse-devel
+htdig
+libtag-devel
+libgpgme-devel
+libneon-devel
+libSDL-devel
+libmysqld-devel
+gamin-devel
+libpoppler-devel
+liblcms-devel
+gtk3-devel
+libffmpeg-devel
+mozilla-nspr-devel