470 files changed, 9169 insertions, 3428 deletions

diff --git a/redhat/Makefile b/redhat/Makefile
index 1b6b6f0bd..a7f4aeae0 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -1,6 +1,6 @@
 SHELL := /bin/bash
 PATH := $(PATH):$(shell pwd)/build
-TDE_VERSION := $(shell echo $${TDE_VERSION:-14.1.0})
+TDE_VERSION := $(shell echo $${TDE_VERSION:-14.0.13})
 TDE_GIT_DIR := $(shell cd ../../tde; pwd)
 TDE_PACKAGING_DIR := $(shell [ -n "$${TDE_PACKAGING_DIR}" ] && cd "$${TDE_PACKAGING_DIR}" || cd ..; pwd)
 RPMDIR := "$(shell rpm -E %{_rpmdir}.tde-$(TDE_VERSION))"
@@ -23,129 +23,139 @@ buildpkg = \
   echo
 
 
-all:	dependencies main libraries applications i18n meta
-dependencies:	tqt3 tqtinterface akode arts libart_lgpl libcaldav libcarddav sip4-tqt tqca tqca-tls tqscintilla avahi-tqt dbus-tqt dbus-1-tqt
-main:	tdelibs tdebase tdeaccessibility tdeadmin tdegames tdemultimedia tdepim tdetoys tdevelop tdeaddons tdeartwork tdebindings tdeedu tdegraphics tdenetwork tdesdk tdeutils tdewebdev
-libraries:	kipi-plugins libkdcraw libkexiv2 libkipi libksquirrel libtdeldap libtqt-perl pytdeextensions python-trinity
-applications:	abakus amarok basket bibletime codeine digikam dolphin filelight gtk3-tqt-engine gtk-qt-engine gwenview k3b k9copy kaffeine kaffeine-mozilla kasablanca katapult kbarcode kbfx kbibtex kbiff kbookreader kchmviewer kcmautostart kcmldap kcmldapcontroller kcmldapmanager kcpuload kdbg kdbusnotification kdiff3 kdirstat keep kerberostray keximdb kftpgrabber kile kima kiosktool kkbswitch klcddimmer kmplayer kmyfirewall kmymoney knemo knetload knetstats knetworkmanager8 knights knmap knowit knutclient koffice konversation kooldock kopete-otr kpicosim kpilot krecipes krename krusader kscope ksensors kshowmail kshutdown ksplash-engine-moodin ksquirrel kstreamripper ksystemlog ktechlab ktorrent kvirc kvkbd kvpnc kxmleditor mathemagics mplayerthumbs piklab potracegui qalculate-tde qt4-tqt-theme-engine rosegarden smartcardauth smb4k soundkonverter tde-guidance tdeio-apt tdeio-ftps tastymenu tdedocker tdeio-locate tdeio-sword tdeio-umountwrapper tdenetworkmanager tdepacman tdepowersave tderadio tde-style-baghira tde-style-domino tde-style-ia-ora tde-style-lipstik tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico tork twin-style-crystal wlassistant yakuake
-i18n:	gwenview-i18n k3b-i18n koffice-i18n tde-i18n
-extras:	icons-crystalsvg-updated icons-kfaenza icons-nuvola icons-oxygen kdevmon kdissert klibido kmpose koverartist kpacman png2qrgb
+all: common dependencies main libraries applications i18n meta external
+common: cmake
+dependencies: tqt3 tqtinterface akode arts libart_lgpl libcaldav libcarddav polkit-tqt sip4-tqt tqca tqscintilla avahi-tqt dbus-tqt dbus-1-tqt
+main: tdelibs tdebase tdeaccessibility tdeadmin tdegames tdemultimedia tdepim tdetoys tdevelop tdeaddons tdeartwork tdebindings tdeedu tdegraphics tdenetwork tdesdk tdeutils tdewebdev
+libraries: kipi-plugins libkdcraw libkexiv2 libkipi libksquirrel libtdeldap libtqt-perl pytdeextensions pytde
+applications: abakus amarok basket bibletime codeine digikam dolphin filelight gtk3-tqt-engine gtk-qt-engine gwenview k3b k9copy kaffeine kaffeine-mozilla kasablanca katapult kbarcode kbfx kbibtex kbiff kbookreader kchmviewer kcmautostart kcmldap kcmldapcontroller kcmldapmanager kcpuload kdbg kdbusnotification kdiff3 kdirstat keep kerberostray keximdb kftpgrabber kile kima kiosktool kkbswitch klamav klcddimmer kmplayer kmyfirewall kmymoney knemo knetload knetstats knetworkmanager8 knights knmap knowit knutclient koffice kompose konversation kooldock kopete-otr kpicosim kpilot krecipes krename krusader kscope ksensors kshowmail kshutdown ksplash-engine-moodin ksquirrel kstreamripper ksystemlog ktechlab ktorrent kvirc kvkbd kvpnc kxmleditor mathemagics mplayerthumbs piklab polkit-agent-tde potracegui qalculate-tde qt4-tqt-theme-engine rosegarden smartcardauth smb4k soundkonverter tde-guidance tdeio-appinfo tdeio-apt tdeio-ftps tdeio-gopher tastymenu tdedocker tdeio-locate tdeio-sword tdeio-umountwrapper tdenetworkmanager tdepacman tdepowersave tderadio tdesshaskpass tde-style-baghira tde-style-domino tde-style-ia-ora tde-style-lipstik tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico tork twin-style-crystal twin-style-dekorator twin-style-machbunt twin-style-suse2 wlassistant yakuake
+i18n: gwenview-i18n k3b-i18n koffice-i18n tde-i18n
 
+### Trinity Common
+
+cmake:
+	$(call buildpkg,common/cmake)
 
 ### Trinity Dependencies
-akode:	tqtinterface trinity-filesystem
+akode: tqtinterface trinity-filesystem
 	$(call buildpkg,dependencies/akode)
 
-arts:	tqtinterface trinity-filesystem esound
+arts: tqtinterface trinity-filesystem esound
 	$(call buildpkg,dependencies/arts)
 
-avahi-tqt:	tqtinterface
+avahi-tqt: tqtinterface
 	$(call buildpkg,dependencies/avahi-tqt)
 
-dbus-1-tqt:	tqtinterface
+dbus-1-tqt: tqtinterface
 	$(call buildpkg,dependencies/dbus-1-tqt)
 
 dbus-tqt: tqtinterface
 	$(call buildpkg,dependencies/dbus-tqt)
 
-libart_lgpl:	tqtinterface
+libart_lgpl: tqtinterface
 	$(call buildpkg,dependencies/libart-lgpl)
 
 libcaldav: tqtinterface
 	$(call buildpkg,dependencies/libcaldav)
 
-libcarddav:	tqtinterface
+libcarddav: tqtinterface
 	$(call buildpkg,dependencies/libcarddav)
 
-python-tqt: sip4-tqt tdelibs tqscintilla
-	$(call buildpkg,dependencies/python-tqt)
+polkit-tqt: tqtinterface dbus-1-tqt
+ifeq (,$(filter $(DIST), .el5 .el6 ))
+	$(call buildpkg,dependencies/polkit-tqt)
+endif
+
+pytqt: sip4-tqt tdelibs tqscintilla
+ifeq (,$(filter $(DIST), .el9 .oss154 ))
+	$(call buildpkg,dependencies/pytqt)
+endif
 
 sip4-tqt:
+ifeq (,$(filter $(DIST), .el9 ))
 	$(call buildpkg,dependencies/sip4-tqt)
+endif
 
-tqca:	tqtinterface
+tqca: tqtinterface
 	$(call buildpkg,dependencies/tqca)
 
-tqca-tls: tqtinterface tqca
-	$(call buildpkg,dependencies/tqca-tls)
-
-tqscintilla: tqca-tls tdelibs
+tqscintilla: tqca tdelibs
 	$(call buildpkg,dependencies/tqscintilla)
 
 tqt3:
 	$(call buildpkg,dependencies/tqt3)
 
-tqtinterface:	tqt3
+tqtinterface: tqt3
 	$(call buildpkg,dependencies/tqtinterface)
 
 # Main packages
-tdeaccessibility:	tdebase tdemultimedia
-	$(call buildpkg,main/tdeaccessibility)
+tdeaccessibility: tdebase tdemultimedia
+	$(call buildpkg,core/tdeaccessibility)
 
-tdeaddons:	tdebase tdegames tdemultimedia tdenetwork tdepim
-	$(call buildpkg,main/tdeaddons)
+tdeaddons: tdebase tdegames tdemultimedia tdenetwork tdepim
+	$(call buildpkg,core/tdeaddons)
 
-tdeadmin:	tdebase
-	$(call buildpkg,main/tdeadmin)
+tdeadmin: tdebase
+	$(call buildpkg,core/tdeadmin)
 
-tdeartwork:	tdebase
-	$(call buildpkg,main/tdeartwork)
+tdeartwork: tdebase
+	$(call buildpkg,core/tdeartwork)
 
-tdebase:	tdelibs htdig fileshareset
-	$(call buildpkg,main/tdebase)
+tdebase: tdelibs htdig fileshareset pinentry-tqt
+	$(call buildpkg,core/tdebase)
 
-tdebindings:	tdebase tqscintilla
-	$(call buildpkg,main/tdebindings)
+tdebindings: tdebase tqscintilla
+	$(call buildpkg,core/tdebindings)
 
-tdeedu:	tdebase
-	$(call buildpkg,main/tdeedu)
+tdeedu: tdebase
+	$(call buildpkg,core/tdeedu)
 
-tdegames:	tdebase tdemultimedia
-	$(call buildpkg,main/tdegames)
+tdegames: tdebase tdemultimedia
+	$(call buildpkg,core/tdegames)
 
-tdegraphics:	tdebase lcms
-	$(call buildpkg,main/tdegraphics)
+tdegraphics: tdebase lcms
+	$(call buildpkg,core/tdegraphics)
 
-tdelibs:	brp-check-trinity tqt3 tqtinterface arts dbus-tqt dbus-1-tqt avahi-tqt fileshareset trinity-filesystem libart_lgpl
-	$(call buildpkg,main/tdelibs)
+tdelibs: brp-check-trinity tqt3 tqtinterface arts dbus-tqt dbus-1-tqt avahi-tqt fileshareset trinity-filesystem libart_lgpl
+	$(call buildpkg,core/tdelibs)
 
-tdemultimedia:	tdebase akode
-	$(call buildpkg,main/tdemultimedia)
+tdemultimedia: tdebase akode
+	$(call buildpkg,core/tdemultimedia)
 
-tdenetwork:	tdebase rdesktop
-	$(call buildpkg,main/tdenetwork)
+tdenetwork: tdebase rdesktop
+	$(call buildpkg,core/tdenetwork)
 
-tdepim:	tdebase libcaldav libcarddav
-	$(call buildpkg,main/tdepim)
+tdepim: tdebase libcaldav libcarddav
+	$(call buildpkg,core/tdepim)
 
-tdesdk:		tdebase tdebindings
-	$(call buildpkg,main/tdesdk)
+tdesdk: tdebase tdebindings tdepim
+	$(call buildpkg,core/tdesdk)
 
-tdetoys:	tdebase
-	$(call buildpkg,main/tdetoys)
+tdetoys: tdebase
+	$(call buildpkg,core/tdetoys)
 
-tdeutils:	tdebase
-	$(call buildpkg,main/tdeutils)
+tdeutils: tdebase
+	$(call buildpkg,core/tdeutils)
 
-tdevelop:	tdebase tdesdk
-	$(call buildpkg,main/tdevelop)
+tdevelop: tdebase tdesdk
+	$(call buildpkg,core/tdevelop)
 
-tdewebdev:	tdebase tdesdk
-	$(call buildpkg,main/tdewebdev)
+tdewebdev: tdebase tdesdk
+	$(call buildpkg,core/tdewebdev)
 
 ### 3rd party libraries and tools
 brp-check-trinity:
-ifneq (,$(filter $(DIST), .oss151 .oss152 .osstw ))
+ifneq (,$(filter $(DIST), .oss151 .oss152 .oss153 .oss154 .osstw ))
 	$(call buildpkg,3rdparty/brp-check-trinity)
 endif
 
 esound:
-ifneq (,$(filter $(DIST), .el8 .mga6 .mga7 .mga8 .oss151 .oss152 .osstw ))
+ifneq (,$(filter $(DIST), .mga6 .mga7 .mga8 .oss151 .oss152 .oss153 .oss154 .osstw ))
 	$(call buildpkg,3rdparty/esound)
 endif
 
 htdig:
-ifneq (,$(filter $(DIST), .el7 .el8 .mga6 .mga7 .mga8 ))
+ifneq (,$(filter $(DIST), .el7 .el8 .el9 .mga6 .mga7 .mga8 ))
 	$(call buildpkg,extras/htdig)
 endif
 
@@ -155,7 +165,7 @@ ifneq (,$(filter $(DIST), .mga6 .mga7 .oss151 .osstw ))
 endif
 
 lcms:
-ifneq (,$(filter $(DIST), .el7 .el8 .mga7 .mga8 .oss151 .oss152 .osstw ))
+ifneq (,$(filter $(DIST), .el7 .el8 .el9 .mga7 .mga8 .oss151 .oss152 .oss153 .oss154 .osstw ))
 	$(call buildpkg,3rdparty/lcms)
 endif
 
@@ -163,7 +173,7 @@ libbeagle:
 	$(call buildpkg,3rdparty/libbeagle)
 
 mp4v2:
-ifneq (,$(filter $(DIST), .oss151 .oss152 .osstw ))
+ifneq (,$(filter $(DIST), .el9 .oss151 .oss152 .oss153 .oss154 .osstw ))
 	$(call buildpkg,3rdparty/mp4v2)
 endif
 
@@ -185,425 +195,471 @@ ifneq (,$(filter $(DIST),.oss150 .oss151))
 endif
 
 wv2:
-ifneq (,$(filter $(DIST), .el5 .el6 .el7 .el8 .fc30 .fc31 .fc32 .fc33 ))
+ifneq (,$(filter $(DIST), .el5 .el6 .el7 .el8 .el9 .fc30 .fc31 .fc32 .fc33 .fc34 .fc35 .fc36 .fc37))
 	$(call buildpkg,3rdparty/wv2)
 endif
 
 
 ### Trinity Libraries
-kipi-plugins:	tqtinterface tdelibs tdepim libkdcraw libkexiv2 libkipi
+kipi-plugins: tqtinterface tdelibs tdepim libkdcraw libkexiv2 libkipi
 	$(call buildpkg,libraries/kipi-plugins)
 
-libkdcraw:	tqtinterface lcms
+libkdcraw: tqtinterface lcms
 	$(call buildpkg,libraries/libkdcraw)
 
-libkexiv2:	tqtinterface tdelibs
+libkexiv2: tqtinterface tdelibs
 	$(call buildpkg,libraries/libkexiv2)
 
-libkipi:	tqtinterface
+libkipi: tqtinterface
 	$(call buildpkg,libraries/libkipi)
 
-libksquirrel:	tdelibs
+libksquirrel: tdelibs
 	$(call buildpkg,libraries/libksquirrel)
 
-libtdeldap:	tqtinterface
+libtdeldap: tqtinterface
 	$(call buildpkg,libraries/libtdeldap)
 
-libtqt-perl:	tqtinterface
+libtqt-perl: tqtinterface
 	$(call buildpkg,libraries/libtqt-perl)
 
-mlt:	tqtinterface
+mlt: tqtinterface
 	$(call buildpkg,libraries/mlt)
 
-pytdeextensions:	tqtinterface python-trinity
+pytdeextensions: tqtinterface pytde
+ifeq (,$(filter $(DIST), .el9 .oss154 ))
 	$(call buildpkg,libraries/pytdeextensions)
+endif
 
-python-trinity:	tqtinterface python-tqt
-	$(call buildpkg,libraries/python-trinity)
+pytde: tqtinterface pytqt
+ifeq (,$(filter $(DIST), .el9 .oss154 ))
+	$(call buildpkg,libraries/pytde)
+endif
 
 ### Trinity Applications
-abakus:	tdebase
-	$(call buildpkg,applications/abakus)
+abakus: tdebase
+	$(call buildpkg,applications/utilities/abakus)
 
-adept:	tdebase
-	$(call buildpkg,applications/adept)
+adept: tdebase
+	$(call buildpkg,applications/system/adept)
 
-amarok:	tdebase mp4v2
-	$(call buildpkg,applications/amarok)
+amarok: tdebase mp4v2
+	$(call buildpkg,applications/multimedia/amarok)
 
-basket:	tdebase tdepim
-	$(call buildpkg,applications/basket)
+basket: tdebase tdepim
+	$(call buildpkg,applications/office/basket)
 
-bibletime:	tdebase
-	$(call buildpkg,applications/bibletime)
+bibletime: tdebase
+	$(call buildpkg,applications/misc/bibletime)
 
-codeine:	tdebase
-	$(call buildpkg,applications/codeine)
+codeine: tdebase
+	$(call buildpkg,applications/multimedia/codeine)
 
-compizconfig-backend-kconfig:	tdebase
-	$(call buildpkg,applications/compizconfig-backend-kconfig)
+compizconfig-backend-kconfig: tdebase
+	$(call buildpkg,applications/misc/compizconfig-backend-kconfig)
 
-desktop-effects-tde:	tdebase
-	$(call buildpkg,applications/desktop-effects-tde)
+desktop-effects-tde: tdebase
+	$(call buildpkg,applications/misc/desktop-effects-tde)
 
-digikam:	tdebase libkdcraw libkexiv2 libkipi libksquirrel
-	$(call buildpkg,applications/digikam)
+digikam: tdebase libkdcraw libkexiv2 libkipi libksquirrel
+	$(call buildpkg,applications/graphics/digikam)
 
-dolphin:	tdebase
-	$(call buildpkg,applications/dolphin)
+dolphin: tdebase
+	$(call buildpkg,applications/system/dolphin)
 
-filelight:	tdebase
-	$(call buildpkg,applications/filelight)
+filelight: tdebase
+	$(call buildpkg,applications/utilities/filelight)
 
-filelight-l10n:	tdebase
+filelight-l10n: tdebase
 	$(call buildpkg,applications/filelight-l10n)
 
-fusion-icon:	tdebase
-	$(call buildpkg,applications/fusion-icon)
+fusion-icon: tdebase
+	$(call buildpkg,applications/misc/fusion-icon)
 
-gtk3-tqt-engine:	tdebase
+gtk3-tqt-engine: tdebase
 ifeq (,$(filter $(DIST),.el5 .el6))
-	$(call buildpkg,applications/gtk3-tqt-engine)
+	$(call buildpkg,applications/themes/gtk3-tqt-engine)
 endif
 
-gtk-qt-engine:	tdebase
+gtk-qt-engine: tdebase
 ifeq (,$(filter $(DIST),.el5))
-	$(call buildpkg,applications/gtk-qt-engine)
+	$(call buildpkg,applications/themes/gtk-qt-engine)
 endif
 
-gwenview:	tdebase
-	$(call buildpkg,applications/gwenview)
+gwenview: tdebase
+	$(call buildpkg,applications/graphics/gwenview)
+
+k3b: tdebase
+	$(call buildpkg,applications/multimedia/k3b)
 
-k3b:	tdebase
-	$(call buildpkg,applications/k3b)
+k9copy: tdebase k3b
+	$(call buildpkg,applications/multimedia/k9copy)
 
-k9copy:	tdebase k3b
-	$(call buildpkg,applications/k9copy)
+kaffeine: tdebase
+	$(call buildpkg,applications/multimedia/kaffeine)
 
-kaffeine:	tdebase
-	$(call buildpkg,applications/kaffeine)
+kaffeine-mozilla: tdebase kaffeine
+	$(call buildpkg,applications/multimedia/kaffeine-mozilla)
 
-kaffeine-mozilla:	tdebase kaffeine
-	$(call buildpkg,applications/kaffeine-mozilla)
+kasablanca: tdebase
+	$(call buildpkg,applications/internet/kasablanca)
 
-kasablanca:	tdebase
-	$(call buildpkg,applications/kasablanca)
+katapult: tdebase
+	$(call buildpkg,applications/system/katapult)
 
-katapult:	tdebase
-	$(call buildpkg,applications/katapult)
+kbarcode: tdebase
+	$(call buildpkg,applications/utilities/kbarcode)
 
-kbarcode:	tdebase
-	$(call buildpkg,applications/kbarcode)
+kbfx: tdebase
+	$(call buildpkg,applications/system/kbfx)
 
-kbfx:	tdebase
-	$(call buildpkg,applications/kbfx)
+kbibtex: tdebase
+	$(call buildpkg,applications/office/kbibtex)
 
-kbibtex:	tdebase
-	$(call buildpkg,applications/kbibtex)
+kbiff: tdebase
+	$(call buildpkg,applications/internet/kbiff)
 
-kbiff:	tdebase
-	$(call buildpkg,applications/kbiff)
+kbookreader: tdebase
+	$(call buildpkg,applications/office/kbookreader)
 
-kbookreader:	tdebase
-	$(call buildpkg,applications/kbookreader)
+kchmviewer: tdebase
+	$(call buildpkg,applications/utilities/kchmviewer)
 
-kchmviewer:	tdebase
-	$(call buildpkg,applications/kchmviewer)
+kcmautostart: tdebase
+	$(call buildpkg,applications/system/kcmautostart)
 
-kcmautostart:	tdebase
-	$(call buildpkg,applications/kcmautostart)
+kcmldap: tdebase libtdeldap
+	$(call buildpkg,applications/misc/kcmldap)
 
-kcmldap:	tdebase libtdeldap
-	$(call buildpkg,applications/kcmldap)
+kcmldapcontroller: tdebase kcmldap
+	$(call buildpkg,applications/misc/kcmldapcontroller)
 
-kcmldapcontroller:	tdebase kcmldap
-	$(call buildpkg,applications/kcmldapcontroller)
+kcmldapmanager: tdebase kcmldap
+	$(call buildpkg,applications/misc/kcmldapmanager)
 
-kcmldapmanager:	tdebase kcmldap
-	$(call buildpkg,applications/kcmldapmanager)
+kcpuload: tdebase
+	$(call buildpkg,applications/utilities/kcpuload)
 
-kcpuload:	tdebase
-	$(call buildpkg,applications/kcpuload)
+kdbg: tdebase
+	$(call buildpkg,applications/development/kdbg)
 
-kdbg:	tdebase
-	$(call buildpkg,applications/kdbg)
+kdbusnotification: tdebase
+	$(call buildpkg,applications/system/kdbusnotification)
 
-kdbusnotification:	tdebase
-	$(call buildpkg,applications/kdbusnotification)
+kdiff3: tdebase
+	$(call buildpkg,applications/development/kdiff3)
 
-kdiff3:	tdebase
-	$(call buildpkg,applications/kdiff3)
+kdirstat: tdebase
+	$(call buildpkg,applications/utilities/kdirstat)
 
-kdirstat:	tdebase
-	$(call buildpkg,applications/kdirstat)
+kdpkg: tdebase
+	$(call buildpkg,applications/settings/kdpkg)
 
-kdpkg:	tdebase
-	$(call buildpkg,applications/kdpkg)
+keep: tdebase rdiff-backup
+	$(call buildpkg,applications/utilities/keep)
 
-keep:	tdebase rdiff-backup
-	$(call buildpkg,applications/keep)
+kerberostray: tdebase
+	$(call buildpkg,applications/misc/kerberostray)
 
-kerberostray:	tdebase
-	$(call buildpkg,applications/kerberostray)
+keximdb: tdebase koffice
+	$(call buildpkg,applications/office/keximdb)
 
-keximdb:	tdebase koffice
-	$(call buildpkg,applications/keximdb)
+kftpgrabber: tdebase
+	$(call buildpkg,applications/internet/kftpgrabber)
 
-kftpgrabber:	tdebase
-	$(call buildpkg,applications/kftpgrabber)
+kgtk-qt3: tdebase
+	$(call buildpkg,applications/themes/kgtk-qt3)
 
-kgtk-qt3:	tdebase
-	$(call buildpkg,applications/kgtk-qt3)
+kile: tdebase
+	$(call buildpkg,applications/office/kile)
 
-kile:	tdebase
-	$(call buildpkg,applications/kile)
+kima: tdebase
+	$(call buildpkg,applications/settings/kima)
 
-kima:	tdebase
-	$(call buildpkg,applications/kima)
+kiosktool: tdebase
+	$(call buildpkg,applications/settings/kiosktool)
 
-kiosktool:	tdebase
-	$(call buildpkg,applications/kiosktool)
+kkbswitch: tdebase
+	$(call buildpkg,applications/settings/kkbswitch)
 
-kkbswitch:	tdebase
-	$(call buildpkg,applications/kkbswitch)
+klamav: tdebase
+# Requires clamav >= 0.101.0
+ifeq (,$(filter $(DIST), .el5 .el6 .mga6))
+	$(call buildpkg,applications/system/klamav)
+endif
 
-klcddimmer:	tdebase
-	$(call buildpkg,applications/klcddimmer)
+klcddimmer: tdebase
+	$(call buildpkg,applications/settings/klcddimmer)
 
-kmplayer:	tdebase
-	$(call buildpkg,applications/kmplayer)
+kmplayer: tdebase
+	$(call buildpkg,applications/multimedia/kmplayer)
 
-kmyfirewall:	tdebase
-	$(call buildpkg,applications/kmyfirewall)
+kmyfirewall: tdebase
+	$(call buildpkg,applications/settings/kmyfirewall)
 
-kmymoney:	tdebase recode
-	$(call buildpkg,applications/kmymoney)
+kmymoney: tdebase recode
+	$(call buildpkg,applications/office/kmymoney)
 
-knemo:	tdebase
-	$(call buildpkg,applications/knemo)
+knemo: tdebase
+	$(call buildpkg,applications/system/knemo)
 
-knetload:	tdebase
-	$(call buildpkg,applications/knetload)
+knetload: tdebase
+	$(call buildpkg,applications/system/knetload)
 
-knetstats:	tdebase
-	$(call buildpkg,applications/knetstats)
+knetstats: tdebase
+	$(call buildpkg,applications/system/knetstats)
 
-knetworkmanager8:	tdebase
+knetworkmanager8: tdebase
 ifneq (,$(filter $(DIST),.el6))
-	$(call buildpkg,applications/knetworkmanager8)
+	$(call buildpkg,applications/settings/knetworkmanager8)
 endif
 
-knights:	tdebase
-	$(call buildpkg,applications/knights)
+knights: tdebase
+	$(call buildpkg,applications/games/knights)
 
-knmap:	tdebase
-	$(call buildpkg,applications/knmap)
+knmap: tdebase
+	$(call buildpkg,applications/internet/knmap)
 
-knowit:	tdebase
-	$(call buildpkg,applications/knowit)
+knowit: tdebase
+	$(call buildpkg,applications/office/knowit)
 
-knutclient:	tdebase
-	$(call buildpkg,applications/knutclient)
+knutclient: tdebase
+	$(call buildpkg,applications/utilities/knutclient)
 
-koffice:	tdebase tdegraphics wv2
-	$(call buildpkg,applications/koffice)
+koffice: tdebase tdegraphics wv2
+	$(call buildpkg,applications/office/koffice)
 
-konversation:	tdebase
-	$(call buildpkg,applications/konversation)
+kompose: tdebase
+	$(call buildpkg,applications/utilities/kompose)
 
-kooldock:	tdebase
-	$(call buildpkg,applications/kooldock)
+konversation: tdebase
+	$(call buildpkg,applications/internet/konversation)
 
-kopete-otr:	tdebase tdenetwork
-	$(call buildpkg,applications/kopete-otr)
+kooldock: tdebase
+	$(call buildpkg,applications/system/kooldock)
 
-kpicosim:	tdebase
-	$(call buildpkg,applications/kpicosim)
+kopete-otr: tdebase tdenetwork
+	$(call buildpkg,applications/internet/kopete-otr)
 
-kpilot:	tdebase tdepim
-	$(call buildpkg,applications/kpilot)
+kpicosim: tdebase
+	$(call buildpkg,applications/development/kpicosim)
 
-kpowersave:	tdebase
-	$(call buildpkg,applications/kpowersave)
+kpilot: tdebase tdepim
+ifeq (,$(filter $(DIST),.el5 .oss154 .osstw))
+	$(call buildpkg,applications/office/kpilot)
+endif
+
+kpowersave: tdebase
+	$(call buildpkg,applications/system/kpowersave)
 
-krecipes:	tdebase
-	$(call buildpkg,applications/krecipes)
+krecipes: tdebase
+	$(call buildpkg,applications/misc/krecipes)
 
-krename:	tdebase
-	$(call buildpkg,applications/krename)
+krename: tdebase
+	$(call buildpkg,applications/utilities/krename)
 
-krusader:	tdebase tdebindings
-	$(call buildpkg,applications/krusader)
+krusader: tdebase tdebindings
+	$(call buildpkg,applications/system/krusader)
 
-kscope:	tdebase
-	$(call buildpkg,applications/kscope)
+kscope: tdebase
+	$(call buildpkg,applications/development/kscope)
 
-ksensors:	tdebase
-	$(call buildpkg,applications/ksensors)
+ksensors: tdebase
+	$(call buildpkg,applications/utilities/ksensors)
 
-kshowmail:	tdebase tdepim
-	$(call buildpkg,applications/kshowmail)
+kshowmail: tdebase tdepim
+	$(call buildpkg,applications/internet/kshowmail)
 
-kshutdown:	tdebase
-	$(call buildpkg,applications/kshutdown)
+kshutdown: tdebase
+	$(call buildpkg,applications/system/kshutdown)
 
-ksplash-engine-moodin:	tdebase
-	$(call buildpkg,applications/ksplash-engine-moodin)
+ksplash-engine-moodin: tdebase
+	$(call buildpkg,applications/themes/ksplash-engine-moodin)
 
-ksquirrel:	tdebase libkipi libksquirrel
-	$(call buildpkg,applications/ksquirrel)
+ksquirrel: tdebase libkipi libksquirrel
+	$(call buildpkg,applications/graphics/ksquirrel)
 
-kstreamripper:	tdebase
-	$(call buildpkg,applications/kstreamripper)
+kstreamripper: tdebase
+	$(call buildpkg,applications/internet/kstreamripper)
 
-ksystemlog:	tdebase
-	$(call buildpkg,applications/ksystemlog)
+ksystemlog: tdebase
+	$(call buildpkg,applications/system/ksystemlog)
 
-ktechlab:	tdebase
-	$(call buildpkg,applications/ktechlab)
+ktechlab: tdebase
+	$(call buildpkg,applications/development/ktechlab)
 
-ktorrent:	tdebase
-	$(call buildpkg,applications/ktorrent)
+ktorrent: tdebase
+	$(call buildpkg,applications/internet/ktorrent)
 
-kvirc:	tdebase
-	$(call buildpkg,applications/kvirc)
+kvirc: tdebase
+	$(call buildpkg,applications/internet/kvirc)
 
-kvkbd:	tdebase
-	$(call buildpkg,applications/kvkbd)
+kvkbd: tdebase
+	$(call buildpkg,applications/system/kvkbd)
 
-kvpnc:	tdebase
-	$(call buildpkg,applications/kvpnc)
+kvpnc: tdebase
+	$(call buildpkg,applications/internet/kvpnc)
 
-kxmleditor:	tdebase
-	$(call buildpkg,applications/kxmleditor)
+kxmleditor: tdebase
+	$(call buildpkg,applications/development/kxmleditor)
 
 mathemagics: tdebase
-	$(call buildpkg,applications/mathemagics)
+	$(call buildpkg,applications/utilities/mathemagics)
+
+mplayerthumbs: tdebase
+ifeq (,$(filter $(DIST),.el9))
+	$(call buildpkg,applications/multimedia/mplayerthumbs)
+endif
 
-mplayerthumbs:	tdebase
-	$(call buildpkg,applications/mplayerthumbs)
+piklab: tdebase
+	$(call buildpkg,applications/development/piklab)
 
-piklab:	tdebase
-	$(call buildpkg,applications/piklab)
+polkit-agent-tde: tdebase
+ifeq (,$(filter $(DIST), .el5 .el6 ))
+	$(call buildpkg,applications/system/polkit-agent-tde)
+endif
 
-potracegui:	tdebase
-	$(call buildpkg,applications/potracegui)
+potracegui: tdebase
+	$(call buildpkg,applications/graphics/potracegui)
 
 qalculate-tde:
-	$(call buildpkg,applications/qalculate-tde)
+	$(call buildpkg,applications/utilities/qalculate-tde)
 
-qt4-tqt-theme-engine:	tdebase
-ifeq (,$(filter $(DIST),.el5 .el6 .el8 .osstw))
-	$(call buildpkg,applications/qt4-tqt-theme-engine)
+qt4-tqt-theme-engine: tdebase
+ifeq (,$(filter $(DIST),.el5 .el6 .el8 .el9 .oss153 .oss154 .osstw))
+	$(call buildpkg,applications/themes/qt4-tqt-theme-engine)
 endif
 
-rosegarden:	tdebase
-ifeq (,$(filter $(DIST),.el5 .el6 .el7 .el8))
-	$(call buildpkg,applications/rosegarden)
+rosegarden: tdebase
+ifeq (,$(filter $(DIST),.el5 .el6 .el7 .el8 .el9))
+	$(call buildpkg,applications/multimedia/rosegarden)
 endif
 
-smartcardauth:	tdebase
-	$(call buildpkg,applications/smartcardauth)
+smartcardauth: tdebase
+	$(call buildpkg,applications/system/smartcardauth)
 
-smb4k:	tdebase
-	$(call buildpkg,applications/smb4k)
+smb4k: tdebase
+	$(call buildpkg,applications/internet/smb4k)
 
-soundkonverter:	tdebase
-	$(call buildpkg,applications/soundkonverter)
+soundkonverter: tdebase
+	$(call buildpkg,applications/multimedia/soundkonverter)
 
 tastymenu:
-	$(call buildpkg,applications/tastymenu)
+	$(call buildpkg,applications/system/tastymenu)
 
-tdedocker:	tdebase
-	$(call buildpkg,applications/tdedocker)
+tdedocker: tdebase
+	$(call buildpkg,applications/system/tdedocker)
 
-tde-guidance:	tdebase pytdeextensions
-	$(call buildpkg,applications/tde-guidance)
+tde-guidance: tdebase pytdeextensions
+ifeq (,$(filter $(DIST), .el9 .oss154 ))
+	$(call buildpkg,applications/settings/tde-guidance)
+endif
 
-tdeio-apt:	tdebase
-	$(call buildpkg,applications/tdeio-apt)
+tdeio-appinfo: tdebase
+ifeq (,$(filter $(DIST), .el5 .el6 ))
+	$(call buildpkg,applications/tdeio/tdeio-appinfo)
+endif
 
-tdeio-ftps:	tdebase
-	$(call buildpkg,applications/tdeio-ftps)
+tdeio-apt: tdebase
+	$(call buildpkg,applications/tdeio/tdeio-apt)
 
-tdeio-locate:	tdebase
-	$(call buildpkg,applications/tdeio-locate)
+tdeio-ftps: tdebase
+	$(call buildpkg,applications/tdeio/tdeio-ftps)
 
-tdeio-sword:	tdebase
-	$(call buildpkg,applications/tdeio-sword)
+tdeio-gopher: tdebase
+	$(call buildpkg,applications/tdeio/tdeio-gopher)
 
-tdeio-umountwrapper:	tdebase
-	$(call buildpkg,applications/tdeio-umountwrapper)
+tdeio-locate: tdebase
+	$(call buildpkg,applications/tdeio/tdeio-locate)
 
-tdenetworkmanager:	tdebase
+tdeio-sword: tdebase
+	$(call buildpkg,applications/tdeio/tdeio-sword)
+
+tdeio-umountwrapper: tdebase
+	$(call buildpkg,applications/tdeio/tdeio-umountwrapper)
+
+tdenetworkmanager: tdebase
 ifeq (,$(filter $(DIST),.el5 .el6))
-	$(call buildpkg,applications/tdenetworkmanager)
+	$(call buildpkg,applications/settings/tdenetworkmanager)
 endif
 
-tdepacman:	tdebase
-	$(call buildpkg,applications/tdepacman)
+tdepacman: tdebase
+	$(call buildpkg,applications/games/tdepacman)
 
-tdepowersave:	tdebase
+tdepowersave: tdebase
 ifeq (,$(filter $(DIST),.el5))
-	$(call buildpkg,applications/tdepowersave)
+	$(call buildpkg,applications/system/tdepowersave)
 endif
 
-tderadio:	tdebase
-	$(call buildpkg,applications/tderadio)
+tderadio: tdebase
+	$(call buildpkg,applications/multimedia/tderadio)
 
-tde-style-baghira:	tdebase
-	$(call buildpkg,applications/tde-style-baghira)
+tdesshaskpass: tdebase
+	$(call buildpkg,applications/system/tdesshaskpass)
 
-tde-style-domino:	tdebase
-	$(call buildpkg,applications/tde-style-domino)
+tde-style-baghira: tdebase
+	$(call buildpkg,applications/themes/tde-style-baghira)
 
-tde-style-ia-ora:	tdebase
-	$(call buildpkg,applications/tde-style-ia-ora)
+tde-style-domino: tdebase
+	$(call buildpkg,applications/themes/tde-style-domino)
 
-tde-style-lipstik:	tdebase
-	$(call buildpkg,applications/tde-style-lipstik)
+tde-style-ia-ora: tdebase
+	$(call buildpkg,applications/themes/tde-style-ia-ora)
 
-tde-style-qtcurve:	tdebase
-	$(call buildpkg,applications/tde-style-qtcurve)
+tde-style-lipstik: tdebase
+	$(call buildpkg,applications/themes/tde-style-lipstik)
 
-tdesudo:	tdebase
-	$(call buildpkg,applications/tdesudo)
+tde-style-qtcurve: tdebase
+	$(call buildpkg,applications/themes/tde-style-qtcurve)
 
-tdesvn:	tdebase
-	$(call buildpkg,applications/tdesvn)
+tdesudo: tdebase
+	$(call buildpkg,applications/settings/tdesudo)
 
-tde-systemsettings:	tdebase
-	$(call buildpkg,applications/tde-systemsettings)
+tdesvn: tdebase
+	$(call buildpkg,applications/development/tdesvn)
 
-tdmtheme:	tdebase
+tde-systemsettings: tdebase
+ifeq (,$(filter $(DIST), .el9 .oss154 ))
+	$(call buildpkg,applications/settings/tde-systemsettings)
+endif
+
+tdmtheme: tdebase
 	$(call buildpkg,applications/tdmtheme)
 
-tellico:	tdebase tdegraphics tdemultimedia tdepim
-	$(call buildpkg,applications/tellico)
+tellico: tdebase tdegraphics tdemultimedia tdepim
+	$(call buildpkg,applications/office/tellico)
+
+tork: tdebase
+	$(call buildpkg,applications/internet/tork)
+
+twin-style-crystal: tdebase
+	$(call buildpkg,applications/themes/twin-style-crystal)
 
-tork:	tdebase
-	$(call buildpkg,applications/tork)
+twin-style-dekorator: tdebase
+	$(call buildpkg,applications/themes/twin-style-dekorator)
 
-twin-style-crystal:	tdebase
-	$(call buildpkg,applications/twin-style-crystal)
+twin-style-machbunt: tdebase
+	$(call buildpkg,applications/themes/twin-style-machbunt)
 
-wlassistant:	tdebase
-	$(call buildpkg,applications/wlassistant)
+twin-style-suse2: tdebase
+	$(call buildpkg,applications/themes/twin-style-suse2)
 
-yakuake:	tdebase
-	$(call buildpkg,applications/yakuake)
+wlassistant: tdebase
+	$(call buildpkg,applications/settings/wlassistant)
+
+yakuake: tdebase
+	$(call buildpkg,applications/system/yakuake)
 
 ### Trinity Translations
-gwenview-i18n:	tdebase
-	$(call buildpkg,applications/gwenview-i18n)
+gwenview-i18n: tdebase
+	$(call buildpkg,applications/graphics/gwenview-i18n)
 
-k3b-i18n:	tdebase
-	$(call buildpkg,applications/k3b-i18n)
+k3b-i18n: tdebase
+	$(call buildpkg,applications/multimedia/k3b-i18n)
 
-koffice-i18n:	tdebase
-	$(call buildpkg,applications/koffice-i18n)
+koffice-i18n: tdebase
+	$(call buildpkg,applications/office/koffice-i18n)
 
-tde-i18n:	tdebase
+tde-i18n: tdebase
 	$(call buildpkg,tde-i18n)
 
 ### Meta packages
@@ -614,6 +670,11 @@ meta:
 fileshareset:
 	$(call buildpkg,extras/fileshareset)
 
+pinentry-tqt: tqtinterface
+ifeq (,$(filter $(DIST), .el5 .el6 .el7 ))
+	$(call buildpkg,extras/pinentry-tqt)
+endif
+
 trinity-filesystem:
 	$(call buildpkg,extras/trinity-filesystem)
 
@@ -623,9 +684,9 @@ git:
 	cd "$(TDE_GIT_DIR)" && ./scripts/switch_all_submodules_to_head_and_clean anonymous
 
 tarballs:
-	cd "$(TDE_GIT_DIR)" && COMPRESS=pigz SUFFIX=0 ./scripts/create_all_tarballs
+	cd "$(TDE_GIT_DIR)" && COMPRESS=pigz SUFFIX=0 TARBALLS_BASE="${HOME}/tde/tarballs/${TDE_VERSION}" ./scripts/create_all_tarballs
 
 
 # External packages
 external:
-	[ -d "${HOME}/rpmbuild/RPMS" ] && cp -rfv "${HOME}/rpmbuild/RPMS/"* "$(RPMDIR)"
+	if [ -d "${HOME}/rpmbuild/RPMS" ]; then cp -rfv "${HOME}/rpmbuild/RPMS/"* "$(RPMDIR)"; fi
diff --git a/redhat/applications/kdbg/kdbg.spec b/redhat/applications/development/kdbg/kdbg.spec
index 33fe3e918..f15f9e9d5 100644
--- a/redhat/applications/kdbg/kdbg.spec
+++ b/redhat/applications/development/kdbg/kdbg.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kdbg
 %define tde_prefix /opt/trinity
@@ -63,7 +63,8 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires: libtool m4
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -113,33 +114,38 @@ Features include the following:
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/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}"
-export kde_confdir="%{tde_confdir}"
-
-# Warning: --enable-final causes FTBFS
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --docdir=%{tde_tdedocdir} \
-  --libdir=%{tde_libdir} \
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+  -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GCC_VISIBILITY=ON \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --disable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
+  -DBUILD_ALL=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_TRANSLATIONS=ON \
+  ..
 
 %__make %{?_smp_mflags} || %__make
 
@@ -147,7 +153,7 @@ export kde_confdir="%{tde_confdir}"
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
 
 %find_lang %{tde_pkg}
 
@@ -167,6 +173,7 @@ export PATH="%{tde_bindir}:${PATH}"
 %lang(ru) %{tde_tdedocdir}/HTML/ru/kdbg/
 %{tde_datadir}/icons/hicolor/*/apps/kdbg.png
 %{tde_datadir}/icons/locolor/*/apps/kdbg.png
+%{tde_mandir}/man1/kdbg.*
 
 
 %changelog
diff --git a/redhat/applications/kdiff3/kdiff3.spec b/redhat/applications/development/kdiff3/kdiff3.spec
index f3cbd4f95..7b901eb50 100644
--- a/redhat/applications/kdiff3/kdiff3.spec
+++ b/redhat/applications/development/kdiff3/kdiff3.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kdiff3
 %define tde_prefix /opt/trinity
@@ -60,7 +60,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -116,6 +116,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/kpicosim/kpicosim.spec b/redhat/applications/development/kpicosim/kpicosim.spec
index 680a59420..be5aabf54 100644
--- a/redhat/applications/kpicosim/kpicosim.spec
+++ b/redhat/applications/development/kpicosim/kpicosim.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kpicosim
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	cmake
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -120,6 +120,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -159,7 +160,7 @@ fi
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README
+%doc AUTHORS ChangeLog COPYING README.md
 %{tde_bindir}/kpicosim
 %{tde_tdeappdir}/kpicosim.desktop
 %{tde_datadir}/apps/katepart/syntax/psm.xml
diff --git a/redhat/applications/kscope/kscope.spec b/redhat/applications/development/kscope/kscope.spec
index 0d125e093..ff4a09b2c 100644
--- a/redhat/applications/kscope/kscope.spec
+++ b/redhat/applications/development/kscope/kscope.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kscope
 %define tde_prefix /opt/trinity
@@ -63,7 +63,7 @@ BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 Requires:		cscope
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -123,45 +123,48 @@ Main Features:
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/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} \
-  --mandir=%{tde_mandir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+# Warning: GCC visibility causes FTBFS [Bug #1285]
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
-  
-%__make %{?_smp_mflags}
+  -DWITH_ALL_OPTIONS=ON \
+  -DBUILD_ALL=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
 
 
 %install
 %__rm -rf $RPM_BUILD_ROOT
-%__make install DESTDIR=$RPM_BUILD_ROOT
+%__make install DESTDIR=$RPM_BUILD_ROOT -C build
 
 %find_lang %{tde_pkg}
 
-# Move desktop icon to correct location
-%__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
-%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}"
-
 # Updates applications categories for openSUSE
 %if 0%{?suse_version}
 %suse_update_desktop_file %{tde_pkg} Development IDE
@@ -174,13 +177,14 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README ChangeLog
+%doc AUTHORS COPYING README.md ChangeLog
 %{tde_bindir}/kscope
 %{tde_tdeappdir}/kscope.desktop
 %{tde_datadir}/apps/kscope/
 %{tde_tdedocdir}/HTML/en/kscope/
 %{tde_datadir}/icons/hicolor/*/apps/kscope.png
 %{tde_datadir}/icons/locolor/*/apps/kscope.png
+%{tde_mandir}/man1/kscope.1*
 
 
 %changelog
diff --git a/redhat/applications/ktechlab/ktechlab.spec b/redhat/applications/development/ktechlab/ktechlab.spec
index 94c5348a9..2e4c66048 100644
--- a/redhat/applications/ktechlab/ktechlab.spec
+++ b/redhat/applications/development/ktechlab/ktechlab.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg ktechlab
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -101,47 +101,45 @@ Homepage: http://ktechlab.org/
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/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} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --disable-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
+  -DBUILD_ALL=ON \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GPSIM=OFF \
+  ..
 
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
 
 
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
 
 %find_lang %{tde_pkg}
 
-%__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
-%__mv -f "%{?buildroot}%{tde_datadir}/applnk/Development/ktechlab.desktop" "%{?buildroot}%{tde_tdeappdir}"
-%__rm -rf "%{?buildroot}%{tde_datadir}/applnk"
-
 # Updates applications categories for openSUSE
 %if 0%{?suse_version}
 %suse_update_desktop_file -r -n ktechlab Science Math
@@ -166,6 +164,8 @@ export PATH="%{tde_bindir}:${PATH}"
 %{tde_datadir}/mimelnk/application/x-flowcode.desktop
 %{tde_datadir}/mimelnk/application/x-ktechlab.desktop
 %{tde_datadir}/mimelnk/application/x-microbe.desktop
+%{tde_mandir}/man1/ktechlab.1*
+%{tde_mandir}/man1/microbe.1*
 
 
 %changelog
diff --git a/redhat/applications/kxmleditor/kxmleditor.spec b/redhat/applications/development/kxmleditor/kxmleditor.spec
index 229e674ec..4635ee43f 100644
--- a/redhat/applications/kxmleditor/kxmleditor.spec
+++ b/redhat/applications/development/kxmleditor/kxmleditor.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kxmleditor
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -76,8 +76,6 @@ BuildRequires:	update-desktop-files
 BuildRequires:	brp-check-trinity
 %endif
 
-Requires:		mplayer
-
 
 %description
 KXML Editor is a simple program, that displays and edits the contents of an
@@ -110,6 +108,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -131,10 +130,6 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %find_lang %{tde_pkg}
 
-# Move desktop icon to correct location
-%__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
-%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}"
-
 # Updates applications categories for openSUSE
 %if 0%{?suse_version}
 %suse_update_desktop_file -G "XML Editor" -r "%{tde_pkg}" Utility Editor
diff --git a/redhat/applications/piklab/piklab.spec b/redhat/applications/development/piklab/piklab.spec
index 7dae16d60..86906fb80 100644
--- a/redhat/applications/piklab/piklab.spec
+++ b/redhat/applications/development/piklab/piklab.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg piklab
 %define tde_prefix /opt/trinity
@@ -84,7 +84,12 @@ BuildRequires:	readline-devel
 BuildRequires:  %{_lib}usb1.0-devel
 BuildRequires:  %{_lib}usb-compat0.1-devel
 %else
-BuildRequires:  libusb-devel
+%if 0%{?fedora} >= 37
+BuildRequires:	libusb1-devel
+BuildRequires:	libusb-compat-0.1-devel
+%else
+BuildRequires:	libusb-devel
+%endif
 %endif
 
 
diff --git a/redhat/applications/tdesvn/tdesvn.spec b/redhat/applications/development/tdesvn/tdesvn.spec
index a816cfdb1..6813b17ad 100644
--- a/redhat/applications/tdesvn/tdesvn.spec
+++ b/redhat/applications/development/tdesvn/tdesvn.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tdesvn
 %define tde_prefix /opt/trinity
@@ -60,7 +60,8 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake libtool
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires: libtool
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -90,7 +91,7 @@ BuildRequires:	libidn-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gamin 1
 BuildRequires:	gamin-devel
 %endif
@@ -266,6 +267,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/knights/knights.spec b/redhat/applications/games/knights/knights.spec
index f2ffb27af..d5177c358 100644
--- a/redhat/applications/knights/knights.spec
+++ b/redhat/applications/games/knights/knights.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg knights
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -131,6 +131,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/tdepacman/tdepacman.spec b/redhat/applications/games/tdepacman/tdepacman.spec
index 53be48778..59269b25a 100644
--- a/redhat/applications/tdepacman/tdepacman.spec
+++ b/redhat/applications/games/tdepacman/tdepacman.spec
@@ -18,7 +18,7 @@
 # Default version for this component
 %define tde_pkg tdepacman
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 
 # TDE specific building variables
@@ -66,7 +66,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	cmake
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -103,6 +103,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -131,7 +132,7 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
+%doc AUTHORS ChangeLog COPYING README.md TODO
 %{tde_bindir}/tdepacman
 %{tde_tdeappdir}/tdepacman.desktop
 %{tde_datadir}/apps/tdepacman/
diff --git a/redhat/applications/digikam/digikam-open_in_digikam.desktop b/redhat/applications/graphics/digikam/digikam-open_in_digikam.desktop
index ddf7f93b4..ddf7f93b4 100644
--- a/redhat/applications/digikam/digikam-open_in_digikam.desktop
+++ b/redhat/applications/graphics/digikam/digikam-open_in_digikam.desktop
diff --git a/redhat/applications/digikam/digikam.spec b/redhat/applications/graphics/digikam/digikam.spec
index 9e318e179..d24f6e1af 100644
--- a/redhat/applications/digikam/digikam.spec
+++ b/redhat/applications/graphics/digikam/digikam.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg digikam
 %define tde_prefix /opt/trinity
@@ -308,9 +308,7 @@ Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %lang(nl) %{tde_tdedocdir}/HTML/nl/digikam/
 %lang(nl) %{tde_tdedocdir}/HTML/nl/showfoto/
 %lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/digikam/
-#lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/showfoto/
 %lang(ru) %{tde_tdedocdir}/HTML/ru/digikam/
-#lang(ru) %{tde_tdedocdir}/HTML/ru/showfoto/
 %lang(sv) %{tde_tdedocdir}/HTML/sv/digikam/
 %lang(sv) %{tde_tdedocdir}/HTML/sv/showfoto/
 
diff --git a/redhat/applications/gwenview-i18n/gwenview-i18n.spec b/redhat/applications/graphics/gwenview-i18n/gwenview-i18n.spec
index 08f95f29c..a44800bfe 100644
--- a/redhat/applications/gwenview-i18n/gwenview-i18n.spec
+++ b/redhat/applications/graphics/gwenview-i18n/gwenview-i18n.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg gwenview-i18n
 %define tde_prefix /opt/trinity
@@ -66,7 +66,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	cmake
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
diff --git a/redhat/applications/gwenview/gwenview.spec b/redhat/applications/graphics/gwenview/gwenview.spec
index 1003d3d49..d821cf0ae 100644
--- a/redhat/applications/gwenview/gwenview.spec
+++ b/redhat/applications/graphics/gwenview/gwenview.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg gwenview
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/ksquirrel/ksquirrel.spec b/redhat/applications/graphics/ksquirrel/ksquirrel.spec
index be4dd8f8a..858682933 100644
--- a/redhat/applications/ksquirrel/ksquirrel.spec
+++ b/redhat/applications/graphics/ksquirrel/ksquirrel.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg ksquirrel
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/kuickshow/kuickshow.spec b/redhat/applications/graphics/kuickshow/kuickshow.spec
index 7a6409f6e..ec3d708ab 100644
--- a/redhat/applications/kuickshow/kuickshow.spec
+++ b/redhat/applications/graphics/kuickshow/kuickshow.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kuickshow
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/potracegui/potracegui.spec b/redhat/applications/graphics/potracegui/potracegui.spec
index 40628271b..6350a6d5e 100644
--- a/redhat/applications/potracegui/potracegui.spec
+++ b/redhat/applications/graphics/potracegui/potracegui.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg potracegui
 %define tde_prefix /opt/trinity
@@ -60,7 +60,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -120,6 +120,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -158,7 +159,7 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README
+%doc AUTHORS ChangeLog COPYING README.md
 %{tde_bindir}/potracegui
 %{tde_tdeappdir}/potracegui.desktop
 %{tde_datadir}/apps/potracegui/
diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh b/redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh
deleted file mode 120000
index 0c82b8b5f..000000000
--- a/redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../ubuntu/xenial/applications/gtk-qt-engine/debian/gtk-qt-engine.rc.sh
\ No newline at end of file
diff --git a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde4 b/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde4
deleted file mode 120000
index f71a6795b..000000000
--- a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde4
+++ /dev/null
@@ -1 +0,0 @@
-../../../ubuntu/xenial/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4
\ No newline at end of file
diff --git a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4 b/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4
deleted file mode 120000
index 8e006a46b..000000000
--- a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4
+++ /dev/null
@@ -1 +0,0 @@
-../../../ubuntu/xenial/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde4
\ No newline at end of file
diff --git a/redhat/applications/kasablanca/kasablanca.spec b/redhat/applications/internet/kasablanca/kasablanca.spec
index 8d1c35d58..bd2eeef62 100644
--- a/redhat/applications/kasablanca/kasablanca.spec
+++ b/redhat/applications/internet/kasablanca/kasablanca.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kasablanca
 %define tde_prefix /opt/trinity
@@ -63,7 +63,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext 
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -139,6 +139,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -177,7 +178,7 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README
+%doc AUTHORS ChangeLog COPYING README.md
 %{tde_bindir}/kasablanca
 %{tde_datadir}/apps/kasablanca/
 %{tde_datadir}/config.kcfg/kbconfig.kcfg
diff --git a/redhat/applications/kbiff/kbiff.spec b/redhat/applications/internet/kbiff/kbiff.spec
index 4df376b6c..2e858f385 100644
--- a/redhat/applications/kbiff/kbiff.spec
+++ b/redhat/applications/internet/kbiff/kbiff.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kbiff
 %define tde_prefix /opt/trinity
@@ -64,7 +64,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -122,6 +122,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -160,7 +161,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kbiff.desktop"
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README ChangeLog
+%doc AUTHORS COPYING README.md ChangeLog
 %{tde_bindir}/kbiff
 %{tde_libdir}/libtdeinit_kbiff.la
 %{tde_libdir}/libtdeinit_kbiff.so
diff --git a/redhat/applications/kftpgrabber/kftpgrabber.spec b/redhat/applications/internet/kftpgrabber/kftpgrabber.spec
index 256ea066f..c3bd78a21 100644
--- a/redhat/applications/kftpgrabber/kftpgrabber.spec
+++ b/redhat/applications/internet/kftpgrabber/kftpgrabber.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kftpgrabber
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -124,38 +124,41 @@ Requires: 	%{name} = %{version}-%{release}
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
 
 %build
 unset QTDIR QTINC QTDIR
 export PATH="%{tde_bindir}:${PATH}"
 
-# Warning: --enable-final causes FTBFS
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --disable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
-  
-%__make %{?_smp_mflags}
+  -DWITH_ALL_OPTIONS=ON \
+  -DBUILD_ALL=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
 
 
 %install
 %__rm -rf $RPM_BUILD_ROOT
-%__make install DESTDIR=$RPM_BUILD_ROOT
+%__make install DESTDIR=$RPM_BUILD_ROOT -C build
 
 %find_lang %{tde_pkg}
 
@@ -166,7 +169,7 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README ChangeLog
+%doc AUTHORS COPYING README.md ChangeLog
 %{tde_bindir}/kftpgrabber
 %{tde_libdir}/libkftpinterfaces.so.0
 %{tde_libdir}/libkftpinterfaces.so.0.0.0
@@ -188,6 +191,7 @@ export PATH="%{tde_bindir}:${PATH}"
 %{tde_datadir}/services/kftpimportplugin_ncftp.desktop
 %{tde_datadir}/servicetypes/kftpbookmarkimportplugin.desktop
 %{tde_tdedocdir}/HTML/en/kftpgrabber/
+%{tde_mandir}/man1/kftpgrabber.1*
 
 
 %files devel
diff --git a/redhat/applications/knmap/knmap.spec b/redhat/applications/internet/knmap/knmap.spec
index 411f29a30..b8ae3d2ec 100644
--- a/redhat/applications/knmap/knmap.spec
+++ b/redhat/applications/internet/knmap/knmap.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg knmap
 %define tde_prefix /opt/trinity
@@ -62,7 +62,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -133,6 +133,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -177,7 +178,7 @@ fi
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README ChangeLog
+%doc AUTHORS COPYING README.md ChangeLog
 %{tde_bindir}/knmap
 %{tde_tdeappdir}/knmap.desktop
 %{tde_datadir}/apps/knmap/
diff --git a/redhat/applications/konversation/konversation.spec b/redhat/applications/internet/konversation/konversation.spec
index cb80acee6..c5ba96312 100644
--- a/redhat/applications/konversation/konversation.spec
+++ b/redhat/applications/internet/konversation/konversation.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg konversation
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -74,6 +74,23 @@ BuildRequires:	libidn-devel
 # OPENSSL support
 BuildRequires:	openssl-devel
 
+# PYTHON support
+%if 0%{?sle_version} >= 150400 || 0%{?rhel} >= 9
+%define with_python 0
+%global __python %__python3
+%else
+%define with_python 1
+%if 0%{?rhel} == 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 8
+%global python python2
+%global __python %__python2
+%global python_sitearch %{python2_sitearch}
+%else
+%global python python
+%endif
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+BuildRequires:	%{python}
+BuildRequires:	%{python}-devel
+%endif
 
 # SUSE desktop files utility
 %if 0%{?suse_version}
@@ -109,7 +126,8 @@ BuildRequires:	libXi6-devel
 #  RHEL 5: available in centos-extras
 #  RHEL 6: available in EPEL
 #  RHEL 7: available in NUX
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?suse_version}
+#  RHEL 8: available in EPEL
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || ( 0%{?rhel} >= 5 && 0%{?rhel} <= 8 ) || 0%{?suse_version}
 %define with_xscreensaver 1
 
 %if 0%{?fedora} || 0%{?rhel} >= 5
@@ -139,7 +157,9 @@ BuildRequires:	%{_lib}xscrnsaver%{?mgaversion:1}-devel
 %endif
 BuildRequires:	xscreensaver
 BuildRequires:	xscreensaver-base
+%if 0%{?pclinuxos} == 0
 BuildRequires:	xscreensaver-extrusion
+%endif
 BuildRequires:	xscreensaver-gl
 %endif
 %endif
@@ -179,7 +199,7 @@ and experienced users alike will appreciate its many features:
 %if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?mgaversion} >= 8
 %__sed -i "konversation/scripts/media" \
           "konversation/scripts/weather" \
-  -e "s|/usr/bin/env python|/usr/bin/env python2|"
+  -e "s|/usr/bin/env python|/usr/bin/env %{python}|"
 %endif
 
 
@@ -198,6 +218,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/kopete-otr/kopete-otr.spec b/redhat/applications/internet/kopete-otr/kopete-otr.spec
index bcfdb4487..aa019adc3 100644
--- a/redhat/applications/kopete-otr/kopete-otr.spec
+++ b/redhat/applications/internet/kopete-otr/kopete-otr.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kopete-otr
 %define tde_prefix /opt/trinity
@@ -68,7 +68,7 @@ BuildRequires:	trinity-tdenetwork-devel >= %{tde_version}
 # Kopete is provided by tdenetwork
 Requires:		trinity-kopete >= %{tde_version}
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -104,39 +104,47 @@ users with IM-Cients supporting the OTR encryption method.
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/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} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DCMAKE_LIBRARY_PATH=%{tde_libdir} \
+  -DKOPETE_INCLUDE_DIR=%{tde_tdeincludedir}/kopete \
+  \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
+  -DBUILD_ALL=ON \
+  -DWITH_ALL_OPTIONS=ON \
+  ..
 
-%__make %{_smp_mflags} || %__make
+%__make %{?_smp_mflags} || %__make
 
 
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
 
 # Unwanted files
 %__rm -f %{?buildroot}%{tde_libdir}/libkotr.so
@@ -150,7 +158,7 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %files -f kopete_otr.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
+%doc AUTHORS COPYING README.md
 %{tde_libdir}/libkotr.la
 %{tde_libdir}/libkotr.so.0
 %{tde_libdir}/libkotr.so.0.0.0
diff --git a/redhat/applications/kshowmail/kshowmail.spec b/redhat/applications/internet/kshowmail/kshowmail.spec
index 5dae2bc42..3f22687a7 100644
--- a/redhat/applications/kshowmail/kshowmail.spec
+++ b/redhat/applications/internet/kshowmail/kshowmail.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kshowmail
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	trinity-tdepim-devel >= %{tde_version}
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -118,6 +118,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -160,7 +161,7 @@ install -D -m 644 "pics/kshowmail.png"          "$RPM_BUILD_ROOT%{tde_datadir}/i
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README ChangeLog
+%doc AUTHORS COPYING README.md ChangeLog
 %{tde_bindir}/kshowmail
 %{tde_tdelibdir}/kcm_kshowmailconfigaccounts.la
 %{tde_tdelibdir}/kcm_kshowmailconfigaccounts.so
diff --git a/redhat/applications/kstreamripper/kstreamripper.spec b/redhat/applications/internet/kstreamripper/kstreamripper.spec
index b4eda9a91..e56b828b7 100644
--- a/redhat/applications/kstreamripper/kstreamripper.spec
+++ b/redhat/applications/internet/kstreamripper/kstreamripper.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kstreamripper
 %define tde_prefix /opt/trinity
@@ -75,7 +75,7 @@ BuildRequires:	update-desktop-files
 BuildRequires:	brp-check-trinity
 %endif
 
-BuildRequires:	cmake
+BuildRequires:	trinity-cmake >= %{tde_version}
 
 
 %description
@@ -113,6 +113,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/ktorrent/ktorrent.spec b/redhat/applications/internet/ktorrent/ktorrent.spec
index 9a2b241b7..c48835a15 100644
--- a/redhat/applications/ktorrent/ktorrent.spec
+++ b/redhat/applications/internet/ktorrent/ktorrent.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg ktorrent
 %define tde_prefix /opt/trinity
@@ -214,6 +214,7 @@ export PATH="%{tde_bindir}:${PATH}"
 %{tde_tdelibdir}/ktzeroconfplugin.la
 %{tde_tdelibdir}/ktzeroconfplugin.so
 %endif
+%{tde_mandir}/man1/ktorrent.1*
 
 
 %changelog
diff --git a/redhat/applications/kvirc/kvirc.spec b/redhat/applications/internet/kvirc/kvirc.spec
index 8761a4a6f..3df715e34 100644
--- a/redhat/applications/kvirc/kvirc.spec
+++ b/redhat/applications/internet/kvirc/kvirc.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kvirc
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/kvpnc/kvpnc.spec b/redhat/applications/internet/kvpnc/kvpnc.spec
index 94bb3de8b..e38a97b74 100644
--- a/redhat/applications/kvpnc/kvpnc.spec
+++ b/redhat/applications/internet/kvpnc/kvpnc.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kvpnc
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -126,6 +126,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -159,7 +160,7 @@ export PATH="%{_bindir}:${PATH}"
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
+%doc AUTHORS ChangeLog COPYING README.md TODO
 %{tde_bindir}/kvpnc
 %{tde_tdeappdir}/kvpnc.desktop
 %{tde_datadir}/apps/kvpnc/
@@ -169,6 +170,7 @@ export PATH="%{_bindir}:${PATH}"
 %lang(sv) %{tde_datadir}/doc/tde/HTML/sv/kvpnc/
 %{tde_datadir}/icons/hicolor/*/apps/kvpnc.png
 %{tde_datadir}/icons/locolor/*/apps/kvpnc.png
+%{tde_docdir}/kvpnc/
 %{tde_tdedocdir}/HTML/en/tdeioslave/pcf/
 %{tde_datadir}/services/pcf.protocol
 %{tde_mandir}/man1/*.1*
diff --git a/redhat/applications/smb4k/smb4k.spec b/redhat/applications/internet/smb4k/smb4k.spec
index 83f5c4f20..449801a12 100644
--- a/redhat/applications/smb4k/smb4k.spec
+++ b/redhat/applications/internet/smb4k/smb4k.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg smb4k
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/tork/tork.spec b/redhat/applications/internet/tork/tork.spec
index 034726821..04207d15a 100644
--- a/redhat/applications/tork/tork.spec
+++ b/redhat/applications/internet/tork/tork.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tork
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	trinity-tdepim-devel >= %{tde_version}
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -82,6 +82,15 @@ BuildRequires:	torsocks
 # OPENSSL support
 BuildRequires:	openssl-devel
 
+# GEOIP
+%if 0%{?suse_version}
+%if 0%{?suse_version} < 1550
+BuildRequires:	libGeoIP-devel
+%endif
+%else
+BuildRequires:	geoip-devel
+%endif
+
 
 %description
 TorK is an Anonymity Manager for the TDE Desktop. Browse anonymously on 
@@ -100,39 +109,41 @@ on the Tor network.
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/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}"
 
-# NOTICE: --enable-final causes FTBFS !
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --mandir=%{tde_mandir} \
-  --program-prefix="" \
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --disable-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
-  
+  -DBUILD_ALL=ON \
+  -DWITH_ALL_OPTIONS=ON \
+  \
+  ..
+
 %__make %{?_smp_mflags}
 
 
 %install
 %__rm -rf $RPM_BUILD_ROOT
-%__make install DESTDIR=$RPM_BUILD_ROOT
+%__make install DESTDIR=$RPM_BUILD_ROOT -C build
 
 %find_lang %{tde_pkg}
 
@@ -143,10 +154,20 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README TODO ChangeLog USINGTORK
+%doc AUTHORS ChangeLog COPYING README.md TODO USINGTORK
 %{tde_bindir}/tork
 %{tde_bindir}/torkarkollon
 %{tde_bindir}/usewithtor
+%{tde_tdelibdir}/kickermenu_tork.la
+%{tde_tdelibdir}/kickermenu_tork.so
+%{tde_tdelibdir}/tdehtml_tork.la
+%{tde_tdelibdir}/tdehtml_tork.so
+%{tde_tdelibdir}/tdeio_torioslave.la
+%{tde_tdelibdir}/tdeio_torioslave.so
+%{tde_tdeappdir}/tork_plug_in.desktop
+%{tde_datadir}/apps/kicker/menuext/torkmenu.desktop
+%{tde_datadir}/apps/tdehtml/kpartplugins/tork_plug_in.rc
+%{tde_datadir}/services/torioslave.protocol
 %{tde_tdeappdir}/tork.desktop
 %{tde_datadir}/apps/konqueror/servicemenus/tork_downloadwithfirefox.desktop
 %{tde_datadir}/apps/konqueror/servicemenus/tork_downloadwithkonqueror.desktop
@@ -154,7 +175,6 @@ export PATH="%{tde_bindir}:${PATH}"
 %{tde_datadir}/apps/tork/
 %{tde_datadir}/config.kcfg/torkconfig.kcfg
 %{tde_tdedocdir}/HTML/en/tork/
-%{tde_datadir}/icons/hicolor/*/actions/tork.png
 %{tde_datadir}/icons/hicolor/*/apps/tork.png
 %dir %{tde_datadir}/menu
 %{tde_datadir}/menu/tork
diff --git a/redhat/applications/kstreamripper/scons-local-2.5.1.tar.gz b/redhat/applications/kstreamripper/scons-local-2.5.1.tar.gz
deleted file mode 100644
index ef63468b1..000000000
--- a/redhat/applications/kstreamripper/scons-local-2.5.1.tar.gz
+++ /dev/null
diff --git a/redhat/applications/bibletime/bibletime.spec b/redhat/applications/misc/bibletime/bibletime.spec
index c33a47113..56d940aa8 100644
--- a/redhat/applications/bibletime/bibletime.spec
+++ b/redhat/applications/misc/bibletime/bibletime.spec
@@ -23,7 +23,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg bibletime
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/fusion-icon/fusion-icon.spec b/redhat/applications/misc/fusion-icon/fusion-icon.spec
index 7c36c1773..41d2e2184 100644
--- a/redhat/applications/fusion-icon/fusion-icon.spec
+++ b/redhat/applications/misc/fusion-icon/fusion-icon.spec
@@ -1,6 +1,6 @@
 # Default version for this component
 %define tde_pkg fusion-icon
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 
 %if "%{?python2_sitelib}" == ""
 %define python2_sitelib    %(python2 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
diff --git a/redhat/applications/kcmldap/kcmldap.spec b/redhat/applications/misc/kcmldap/kcmldap.spec
index ae639e2a7..387e42e98 100644
--- a/redhat/applications/kcmldap/kcmldap.spec
+++ b/redhat/applications/misc/kcmldap/kcmldap.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kcmldap
 %define tde_prefix /opt/trinity
@@ -67,7 +67,7 @@ BuildRequires:	trinity-libtdeldap-devel >= 0.5
 Requires:		trinity-tde-ldap-cert-updater = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:		trinity-kcontrol-ldap-bonding = %{?epoch:%{epoch}:}%{version}-%{release}
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -104,14 +104,6 @@ BuildRequires:	openldap24-libs-devel
 # KRB5 support
 BuildRequires:	krb5-devel
 
-# HEIMDAL support
-#%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
-#BuildRequires:	heimdal-devel
-#%endif
-#%if 0%{?suse_version}
-#BuildRequires:	libheimdal-devel
-#%endif
-
 # UDEV support
 %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
 %define with_tdehwlib 1
@@ -196,6 +188,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/kcmldapcontroller/kcmldapcontroller.spec b/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec
index 36cd9d3c5..c5bca20d0 100644
--- a/redhat/applications/kcmldapcontroller/kcmldapcontroller.spec
+++ b/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kcmldapcontroller
 %define tde_prefix /opt/trinity
@@ -63,7 +63,7 @@ BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 BuildRequires:	trinity-libtdeldap-devel >= 0.5
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -94,14 +94,6 @@ BuildRequires:	openldap24-libs-devel
 # KRB5 support
 BuildRequires:	krb5-devel
 
-# HEIMDAL support
-#%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
-#BuildRequires:	heimdal-devel
-#%endif
-#%if 0%{?suse_version}
-#BuildRequires:	libheimdal-devel
-#%endif
-
 # UDEV support
 %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
 %define with_tdehwlib 1
@@ -190,6 +182,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/kcmldapmanager/kcmldapmanager.spec b/redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec
index 4187c7b77..542a3ce3c 100644
--- a/redhat/applications/kcmldapmanager/kcmldapmanager.spec
+++ b/redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kcmldapmanager
 %define tde_prefix /opt/trinity
@@ -63,7 +63,7 @@ BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 BuildRequires:	trinity-libtdeldap-devel >= 0.5
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -91,14 +91,6 @@ BuildRequires:	openldap24-libs-devel
 # KRB5 support
 BuildRequires:	krb5-devel
 
-# HEIMDAL support
-#%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
-#BuildRequires:	heimdal-devel
-#%endif
-#%if 0%{?suse_version}
-#BuildRequires:	libheimdal-devel
-#%endif
-
 # UDEV support
 %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
 %define with_tdehwlib 1
@@ -174,6 +166,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/kerberostray/kerberostray.spec b/redhat/applications/misc/kerberostray/kerberostray.spec
index fa8def28d..be49ed367 100644
--- a/redhat/applications/kerberostray/kerberostray.spec
+++ b/redhat/applications/misc/kerberostray/kerberostray.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kerberostray
 %define tde_prefix /opt/trinity
@@ -63,7 +63,7 @@ BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 BuildRequires:	trinity-libtdeldap-devel >= 0.5
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -91,14 +91,6 @@ BuildRequires:	openldap24-libs-devel
 # KRB5 support
 BuildRequires:	krb5-devel
 
-# HEIMDAL support
-#%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
-#BuildRequires:	heimdal-devel
-#%endif
-#%if 0%{?suse_version}
-#BuildRequires:	libheimdal-devel
-#%endif
-
 # UDEV support
 %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
 %define with_tdehwlib 1
@@ -153,6 +145,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/krecipes/krecipes.spec b/redhat/applications/misc/krecipes/krecipes.spec
index d84afa5fc..f7112b8fe 100644
--- a/redhat/applications/krecipes/krecipes.spec
+++ b/redhat/applications/misc/krecipes/krecipes.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg krecipes
 %define tde_prefix /opt/trinity
@@ -79,7 +79,17 @@ BuildRequires:	brp-check-trinity
 BuildRequires:	mysql-devel
 
 # POSTGRESQL support
-BuildRequires:	postgresql-devel
+%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200
+BuildRequires:	postgresql10
+BuildRequires:	postgresql10-devel
+%else
+BuildRequires: postgresql
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8
+BuildRequires: postgresql-server-devel
+%else
+BuildRequires: postgresql-devel
+%endif
+%endif
 
 # SQLITE support
 BuildRequires:	sqlite-devel
@@ -120,6 +130,7 @@ export PATH="%{tde_bindir}:${PATH}"
   --includedir=%{tde_tdeincludedir} \
   --docdir=%{tde_tdedocdir} \
   --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
   \
   --disable-dependency-tracking \
   --disable-debug \
@@ -175,6 +186,6 @@ export PATH="%{tde_bindir}:${PATH}"
 %lang(et) %{tde_tdedocdir}/HTML/et/
 %lang(pt) %{tde_tdedocdir}/HTML/pt/
 %lang(sv) %{tde_tdedocdir}/HTML/sv/
-
+%{tde_mandir}/man1/krecipes.1*
 
 %changelog
diff --git a/redhat/applications/amarok/amarok.spec b/redhat/applications/multimedia/amarok/amarok.spec
index 99e8e731d..9de59f8ad 100644
--- a/redhat/applications/amarok/amarok.spec
+++ b/redhat/applications/multimedia/amarok/amarok.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg amarok
 %define tde_prefix /opt/trinity
@@ -66,7 +66,7 @@ BuildRequires:	trinity-filesystem >= %{tde_version}
 Requires:		trinity-filesystem >= %{tde_version}
 
 BuildRequires:	desktop-file-utils
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	gettext
@@ -99,13 +99,30 @@ BuildRequires:	libtool
 BuildRequires:	libtool-ltdl-devel
 %endif
 
+%if 0%{?fedora} >= 37
+BuildRequires:	libusb1-devel
+BuildRequires:	libusb-compat-0.1-devel
+%else
 BuildRequires:	libusb-devel
+%endif
 BuildRequires:	mysql-devel
-BuildRequires:	postgresql-devel
 BuildRequires:	SDL-devel
 BuildRequires:	taglib-devel
 BuildRequires:	sqlite-devel
 
+# POSTGRESQL support
+%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200
+BuildRequires:	postgresql10
+BuildRequires:	postgresql10-devel
+%else
+BuildRequires: postgresql
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8
+BuildRequires: postgresql-server-devel
+%else
+BuildRequires: postgresql-devel
+%endif
+%endif
+
 # not used anymore, in favor of libvisual ? -- Rex
 #{?fedora:BuildRequires:  xmms-devel}
 
@@ -114,7 +131,7 @@ BuildRequires:	libidn-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gamin 1
 BuildRequires:	gamin-devel
 %endif
@@ -155,7 +172,7 @@ BuildRequires:	karma-sharp
 %endif
 
 # GPOD (ipod) support
-%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
+%if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?rhel} == 8 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
 %define with_gpod 1
 BuildRequires:	libgpod-devel >= 0.4.2
 %endif
@@ -252,13 +269,18 @@ BuildRequires:	rubypick
 %endif
 
 # PYTHON support
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
+%if 0%{?sle_version} >= 150400 || 0%{?rhel} >= 8
+%define python python3
+%define __python %__python3
+%else
+%if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
 %global python python2
 %global __python %__python2
 %global python_sitearch %{python2_sitearch}
 %else
 %global python python
 %endif
+%endif
 %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 BuildRequires:	%{python}
 BuildRequires:	%{python}-devel
@@ -279,7 +301,7 @@ Amarok is a multimedia player with:
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc COPYING AUTHORS ChangeLog README
+%doc COPYING AUTHORS ChangeLog README.md
 %{tde_bindir}/amarok
 %{tde_bindir}/amarokapp
 %{tde_bindir}/amarokcollectionscanner
@@ -396,7 +418,7 @@ Requires:		trinity-konqueror
 %defattr(-,root,root,-)
 %{tde_datadir}/apps/konqueror/servicemenus/*.desktop
 %{tde_tdelibdir}/konqsidebar_universalamarok.*
-%{tde_datadir}/apps/konqsidebartng/*/amarok.desktop
+%{tde_datadir}/apps/konqsidebartng/*/amarok_konquisidebar.desktop
 
 
 ##########
@@ -449,7 +471,7 @@ fi
           "amarok/src/scripts/webcontrol/Playlist.py" \
           "amarok/src/scripts/webcontrol/RequestHandler.py" \
           "amarok/src/scripts/webcontrol/WebControl.py" \
-  -e "s|/usr/bin/env python|/usr/bin/env python2|"
+  -e "s|/usr/bin/env python|/usr/bin/env %{python}|"
 %endif
 
 
@@ -474,6 +496,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_NO_BUILTIN_CHRPATH=ON \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
diff --git a/redhat/applications/codeine/codeine.spec b/redhat/applications/multimedia/codeine/codeine.spec
index a03422bde..c1bd4b0d3 100644
--- a/redhat/applications/codeine/codeine.spec
+++ b/redhat/applications/multimedia/codeine/codeine.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg codeine
 %define tde_prefix /opt/trinity
@@ -63,7 +63,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	cmake
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -124,6 +124,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -131,7 +132,10 @@ fi
   -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
   -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
   -DLIB_INSTALL_DIR=%{tde_libdir} \
+  \
   -DBUILD_ALL=ON \
+  -DWITH_ALL_OPTIONS=ON \
+  \
   ..
 
 %__make %{?_smp_mflags}
@@ -149,7 +153,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING FAQ README TODO
+%doc COPYING FAQ README.md TODO
 %{tde_bindir}/codeine
 %{tde_tdeappdir}/codeine.desktop
 %{tde_datadir}/apps/codeine/
diff --git a/redhat/applications/k3b-i18n/k3b-i18n.spec b/redhat/applications/multimedia/k3b-i18n/k3b-i18n.spec
index f5076abb7..70bb9c4ce 100644
--- a/redhat/applications/k3b-i18n/k3b-i18n.spec
+++ b/redhat/applications/multimedia/k3b-i18n/k3b-i18n.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg k3b-i18n
 %define tde_prefix /opt/trinity
@@ -70,7 +70,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	cmake
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -94,8 +94,8 @@ Group:			Applications/Archiving
 Requires:		trinity-k3b
 Summary:		Danish (da) translations for K3B [Trinity]
 
-Obsoletes:		trinity-k3b-i18n-da < %{version}-%{release}
-Provides:		trinity-k3b-i18n-da = %{version}-%{release}
+Obsoletes:		trinity-k3b-i18n-da < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-k3b-i18n-da = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Danish
 This package contains the Danish translations for K3B.
@@ -112,8 +112,8 @@ Group:			Applications/Archiving
 Requires:		trinity-k3b
 Summary:		German (de) translations for K3B [Trinity]
 
-Obsoletes:		trinity-k3b-i18n-de < %{version}-%{release}
-Provides:		trinity-k3b-i18n-de = %{version}-%{release}
+Obsoletes:		trinity-k3b-i18n-de < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-k3b-i18n-de = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description German
 This package contains the German translations for K3B.
@@ -130,8 +130,8 @@ Group:			Applications/Archiving
 Requires:		trinity-k3b >= %{version}
 Summary:		Greek (el) translations for K3B [Trinity]
 
-Obsoletes:		trinity-k3b-i18n-el < %{version}-%{release}
-Provides:		trinity-k3b-i18n-el = %{version}-%{release}
+Obsoletes:		trinity-k3b-i18n-el < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-k3b-i18n-el = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Greek
 This package contains the greek translations for K3B.
@@ -148,8 +148,8 @@ Group:			Applications/Archiving
 Requires:		trinity-k3b
 Summary:		Spanish (es) translations for K3B [Trinity]
 
-Obsoletes:		trinity-k3b-i18n-es < %{version}-%{release}
-Provides:		trinity-k3b-i18n-es = %{version}-%{release}
+Obsoletes:		trinity-k3b-i18n-es < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-k3b-i18n-es = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Spanish
 This package contains the Spanish translations for K3B.
@@ -166,8 +166,8 @@ Group:			Applications/Archiving
 Requires:		trinity-k3b
 Summary:		Estonian (et) translations for K3B [Trinity]
 
-Obsoletes:		trinity-k3b-i18n-et < %{version}-%{release}
-Provides:		trinity-k3b-i18n-et = %{version}-%{release}
+Obsoletes:		trinity-k3b-i18n-et < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-k3b-i18n-et = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Estonian
 This package contains the Estonian translations for K3B.
@@ -184,8 +184,8 @@ Group:			Applications/Archiving
 Requires:		trinity-k3b
 Summary:		French (fr) translations for K3B [Trinity]
 
-Obsoletes:		trinity-k3b-i18n-fr < %{version}-%{release}
-Provides:		trinity-k3b-i18n-fr = %{version}-%{release}
+Obsoletes:		trinity-k3b-i18n-fr < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-k3b-i18n-fr = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description French
 This package contains the French translations for K3B.
@@ -202,8 +202,8 @@ Group:			Applications/Archiving
 Requires:		trinity-k3b
 Summary:		Italian (it) translations for K3B [Trinity]
 
-Obsoletes:		trinity-k3b-i18n-it < %{version}-%{release}
-Provides:		trinity-k3b-i18n-it = %{version}-%{release}
+Obsoletes:		trinity-k3b-i18n-it < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-k3b-i18n-it = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Italian
 This package contains the Italian translations for K3B.
@@ -220,8 +220,8 @@ Group:			Applications/Archiving
 Requires:		trinity-k3b
 Summary:		Dutch (nl) translations for K3B [Trinity]
 
-Obsoletes:		trinity-k3b-i18n-nl < %{version}-%{release}
-Provides:		trinity-k3b-i18n-nl = %{version}-%{release}
+Obsoletes:		trinity-k3b-i18n-nl < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-k3b-i18n-nl = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Dutch
 This package contains the Dutch translations for K3B.
@@ -238,8 +238,8 @@ Group:			Applications/Archiving
 Requires:		trinity-k3b
 Summary:		Polish (pl) translations for K3B [Trinity]
 
-Obsoletes:		trinity-k3b-i18n-pl < %{version}-%{release}
-Provides:		trinity-k3b-i18n-pl = %{version}-%{release}
+Obsoletes:		trinity-k3b-i18n-pl < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-k3b-i18n-pl = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Polish
 This package contains the Polish translations for K3B.
@@ -256,8 +256,8 @@ Group:			Applications/Archiving
 Requires:		trinity-k3b
 Summary:		Portuguese (pt) translations for K3B [Trinity]
 
-Obsoletes:		trinity-k3b-i18n-pt < %{version}-%{release}
-Provides:		trinity-k3b-i18n-pt = %{version}-%{release}
+Obsoletes:		trinity-k3b-i18n-pt < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-k3b-i18n-pt = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Portuguese
 This package contains the Portuguese translations for K3B.
@@ -274,10 +274,10 @@ Group:			Applications/Archiving
 Requires:		trinity-k3b
 Summary:		Brazilian Portuguese (pt_BR) translations for K3B [Trinity]
 
-Obsoletes:		trinity-k3b-i18n-pt_BR < %{version}-%{release}
-Provides:		trinity-k3b-i18n-pt_BR = %{version}-%{release}
-Obsoletes:		trinity-k3b-i18n-ptbr < %{version}-%{release}
-Provides:		trinity-k3b-i18n-ptbr = %{version}-%{release}
+Obsoletes:		trinity-k3b-i18n-pt_BR < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-k3b-i18n-pt_BR = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-k3b-i18n-ptbr < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-k3b-i18n-ptbr = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Brazil
 This package contains the Brazilian Portuguese translations for K3B.
@@ -294,8 +294,8 @@ Group:			Applications/Archiving
 Requires:		trinity-k3b
 Summary:		Russian (ru) translations for K3B [Trinity]
 
-Obsoletes:		trinity-k3b-i18n-ru < %{version}-%{release}
-Provides:		trinity-k3b-i18n-ru = %{version}-%{release}
+Obsoletes:		trinity-k3b-i18n-ru < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-k3b-i18n-ru = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Russian
 This package contains the Russian translations for K3B.
@@ -312,8 +312,8 @@ Group:			Applications/Archiving
 Requires:		trinity-k3b
 Summary:		Swedish (sv) translations for K3B [Trinity]
 
-Obsoletes:		trinity-k3b-i18n-sv < %{version}-%{release}
-Provides:		trinity-k3b-i18n-sv = %{version}-%{release}
+Obsoletes:		trinity-k3b-i18n-sv < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-k3b-i18n-sv = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Swedish
 This package contains the Swedish translations for K3B.
@@ -330,8 +330,8 @@ Group:			Applications/Archiving
 Requires:		trinity-k3b
 Summary:		Ukrainian (uk) translations for K3B [Trinity]
 
-Obsoletes:		trinity-k3b-i18n-uk < %{version}-%{release}
-Provides:		trinity-k3b-i18n-uk = %{version}-%{release}
+Obsoletes:		trinity-k3b-i18n-uk < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-k3b-i18n-uk = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Ukrainian
 This package contains the Ukrainian translations for K3B.
@@ -361,6 +361,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_NO_BUILTIN_CHRPATH=ON \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
diff --git a/redhat/applications/k3b/k3b.spec b/redhat/applications/multimedia/k3b/k3b.spec
index 2670a3355..7500a19ca 100644
--- a/redhat/applications/k3b/k3b.spec
+++ b/redhat/applications/multimedia/k3b/k3b.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg k3b
 %define tde_prefix /opt/trinity
@@ -63,7 +63,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -90,7 +90,7 @@ BuildRequires:	libidn-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gamin 1
 BuildRequires:	gamin-devel
 %endif
@@ -271,7 +271,7 @@ start.
 %{tde_tdelibdir}/libk3bwavedecoder.la
 %{tde_tdelibdir}/libk3bwavedecoder.so
 %lang(en) %{tde_tdedocdir}/HTML/en/k3b/
-
+%{tde_mandir}/man1/k3b.1*
 
 ##########
 
@@ -422,6 +422,10 @@ unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
 
+%if 0%{?rhel} == 7
+RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -std=c++11"
+%endif
+
 if ! rpm -E %%cmake|grep -q "cd build"; then
   %__mkdir_p build
   cd build
@@ -432,6 +436,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_NO_BUILTIN_CHRPATH=ON \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
diff --git a/redhat/applications/k3b/k3brc b/redhat/applications/multimedia/k3b/k3brc
index 5d967f599..5d967f599 100644
--- a/redhat/applications/k3b/k3brc
+++ b/redhat/applications/multimedia/k3b/k3brc
diff --git a/redhat/applications/k3b/trinity-k3b-rpmlintrc b/redhat/applications/multimedia/k3b/trinity-k3b-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/applications/k3b/trinity-k3b-rpmlintrc
+++ b/redhat/applications/multimedia/k3b/trinity-k3b-rpmlintrc
diff --git a/redhat/applications/k9copy/k9copy.spec b/redhat/applications/multimedia/k9copy/k9copy.spec
index c87edd850..20a351632 100644
--- a/redhat/applications/k9copy/k9copy.spec
+++ b/redhat/applications/multimedia/k9copy/k9copy.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg k9copy
 %define tde_prefix /opt/trinity
@@ -150,6 +150,7 @@ fi
   --bindir=%{tde_bindir} \
   --datadir=%{tde_datadir} \
   --includedir=%{tde_tdeincludedir} \
+  --mandir=%{tde_mandir} \
   \
   --disable-dependency-tracking \
   --disable-debug \
@@ -185,6 +186,7 @@ export PATH="%{tde_bindir}:${PATH}"
 %{tde_datadir}/apps/konqueror/servicemenus/k9copy_open.desktop
 %lang(en) %{tde_tdedocdir}/HTML/en/k9copy/
 %{tde_datadir}/icons/hicolor/*/apps/k9copy.png
+%{tde_mandir}/man1/k9copy.1*
 
 
 %changelog
diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla.spec b/redhat/applications/multimedia/kaffeine-mozilla/kaffeine-mozilla.spec
index 027cbd16e..f17d087bb 100644
--- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla.spec
+++ b/redhat/applications/multimedia/kaffeine-mozilla/kaffeine-mozilla.spec
@@ -19,7 +19,7 @@
 %define tde_pkg kaffeine-mozilla
 %define tde_prefix /opt/trinity
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 
 # TDE specific building variables
@@ -59,7 +59,7 @@ BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -98,33 +98,47 @@ when a page containing a supported media format is loaded.
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "ltmain.sh"
-%__make -f "admin/Makefile.common"
-
 
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 
-%configure \
-  --prefix=%{_libdir}/mozilla \
+if [ -d "%{_includedir}/nspr4" ]; then
+  RPM_OPT_FLAGS="-I%{_includedir}/nspr4 ${RPM_OPT_FLAGS}"
+fi
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DCMAKE_PROGRAM_PATH="%{tde_bindir}" \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
+  ..
 
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
 
 
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
 
 # Remove useless filess
 %__rm -f %{?buildroot}%{_libdir}/mozilla/plugins/kaffeineplugin.a
@@ -136,7 +150,7 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README
+%doc AUTHORS ChangeLog COPYING
 # These files are installed outside TDE prefix
 %dir %{_libdir}/mozilla
 %dir %{_libdir}/mozilla/plugins
diff --git a/redhat/applications/kaffeine/kaffeine.spec b/redhat/applications/multimedia/kaffeine/kaffeine.spec
index 1ca4e10a3..51d127d5a 100644
--- a/redhat/applications/kaffeine/kaffeine.spec
+++ b/redhat/applications/multimedia/kaffeine/kaffeine.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kaffeine
 %define tde_prefix /opt/trinity
@@ -64,7 +64,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -114,8 +114,20 @@ BuildRequires:	libXext-devel
 BuildRequires:	libXtst-devel
 BuildRequires:	libXinerama-devel
 %endif
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
-BuildRequires: libxcb-devel
+
+# XCB support
+%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?pclinuxos} || 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?pclinuxos} == 0
+%define with_xcb 1
+%endif
+%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?pclinuxos}
+BuildRequires:	libxcb-devel
+%endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?pclinuxos} == 0
+BuildRequires:	%{_lib}xcb-devel
+%endif
+%endif
 %endif
 
 # GSTREAMER support
@@ -178,6 +190,11 @@ BuildRequires:	lame-devel
 %endif
 %endif
 
+# DVB support
+%if 0%{?rhel} != 5
+%define with_dvb 1
+%endif
+
 # WTF support
 %if 0%{?mgaversion} || 0%{?mdkversion}
 %if 0%{?pclinuxos} == 0
@@ -200,7 +217,7 @@ Konqueror plugin, OSD and much more.
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
+%doc AUTHORS ChangeLog COPYING README.md TODO
 %{tde_bindir}/kaffeine
 %{tde_libdir}/libkaffeinepart.so
 %{tde_tdelibdir}/lib*.*
@@ -215,6 +232,7 @@ Konqueror plugin, OSD and much more.
 %{tde_datadir}/mimelnk/*/*.desktop
 %{tde_datadir}/service*/*.desktop
 %{tde_tdedocdir}/HTML/en/kaffeine/
+%{tde_mandir}/man1/kaffeine.1*
 
 ##########
 
@@ -260,47 +278,45 @@ Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/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} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --mandir=%{tde_mandir} \
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
   \
-  --with-xinerama \
-  --with-gstreamer \
-  --with-lame \
-%if 0%{?rhel} > 0 && 0%{?rhel} <= 5
-  --without-dvb \
-%endif
-  
+  -DWITH_ALL_OPTIONS=ON \
+  %{?!with_dvb:-DWITH_DVB=OFF} \
+  %{?!with_lame:-DWITH_LAME=OFF} \
+  %{?!with_xcb:-DWITH_XCB=OFF} \
+  -DBUILD_ALL=ON \
+  ..
 
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
 
 
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf $RPM_BUILD_ROOT
-%__make install DESTDIR=$RPM_BUILD_ROOT
+%__make install DESTDIR=%{buildroot} -C build
 
 ## File lists
 # locale's
diff --git a/redhat/applications/kaffeine/trinity-kaffeine-rpmlintrc b/redhat/applications/multimedia/kaffeine/trinity-kaffeine-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/applications/kaffeine/trinity-kaffeine-rpmlintrc
+++ b/redhat/applications/multimedia/kaffeine/trinity-kaffeine-rpmlintrc
diff --git a/redhat/applications/kmplayer/kmplayer.spec b/redhat/applications/multimedia/kmplayer/kmplayer.spec
index a86ad59de..bf956c1de 100644
--- a/redhat/applications/kmplayer/kmplayer.spec
+++ b/redhat/applications/multimedia/kmplayer/kmplayer.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kmplayer
 %define tde_prefix /opt/trinity
@@ -62,7 +62,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -139,6 +139,16 @@ BuildRequires:	dbus-1-glib-devel
 BuildRequires:	dbus-glib-devel
 %endif
 
+# NSPR support
+%if 0%{?suse_version}
+BuildRequires:	mozilla-nspr-devel
+%else
+BuildRequires:	nspr-devel
+%endif
+
+# Koffice support
+BuildRequires:	trinity-koffice-devel
+
 Requires:		%{name}-base = %{?epoch:%{epoch}:}%{version}-%{release}
 
 
@@ -160,15 +170,21 @@ KMPlayer can:
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog INSTALL README TODO
+%doc AUTHORS COPYING ChangeLog INSTALL README.md TODO
 %{tde_bindir}/kmplayer
 %{tde_bindir}/knpplayer
 %{tde_bindir}/kxvplayer
+%{tde_datadir}/services/kmplayer_koffice.desktop
+%{tde_libdir}/libkmplayercommon.so.1
+%{tde_libdir}/libkmplayercommon.so.1.0.0
 %{tde_libdir}/libtdeinit_kmplayer.la
 %{tde_libdir}/libtdeinit_kmplayer.so
 %{tde_tdelibdir}/kmplayer.la
 %{tde_tdelibdir}/kmplayer.so
+%{tde_tdelibdir}/libkmplayerkofficepart.la
+%{tde_tdelibdir}/libkmplayerkofficepart.so
 %{tde_tdeappdir}/kmplayer.desktop
+
 %exclude %{tde_datadir}/apps/kmplayer/bookmarks.xml
 %exclude %{tde_datadir}/apps/kmplayer/kmplayerpartui.rc
 %exclude %{tde_datadir}/apps/kmplayer/noise.gif
@@ -190,13 +206,15 @@ Core files needed for KMPlayer.
 %{tde_libdir}/libkmplayercommon.so
 %{tde_bindir}/kgstplayer
 %{tde_bindir}/kxineplayer
-%config(noreplace) %{tde_confdir}/kmplayerrc
+%dir %{tde_datadir}/config
+%config(noreplace) %{tde_datadir}/config/kmplayerrc
 %{tde_datadir}/apps/kmplayer/bookmarks.xml
 %{tde_datadir}/apps/kmplayer/noise.gif
 %{tde_datadir}/icons/hicolor/*/apps/kmplayer.png
 %{tde_datadir}/icons/hicolor/*/apps/kmplayer.svgz
 %{tde_datadir}/mimelnk/application/x-kmplayer.desktop
 %{tde_datadir}/mimelnk/video/x-ms-wmp.desktop
+%{tde_mandir}/man1/kmplayer.1*
 
 ##########
 
@@ -245,33 +263,35 @@ Documention for KMPlayer, a basic audio/video viewer application for TDE.
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
 
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-export kde_confdir="%{tde_confdir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
+  -DWITH_ALL_OPTIONS=ON \
+  -DBUILD_ALL=ON \
+  ..
 
 %__make %{?_smp_mflags} || %__make
 
@@ -279,7 +299,7 @@ export kde_confdir="%{tde_confdir}"
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
 
 %find_lang %{tde_pkg}
 
diff --git a/redhat/applications/kplayer/kplayer.spec b/redhat/applications/multimedia/kplayer/kplayer.spec
index a7ce8f31e..8d6c4ff50 100644
--- a/redhat/applications/kplayer/kplayer.spec
+++ b/redhat/applications/multimedia/kplayer/kplayer.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kplayer
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -131,6 +131,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/mplayerthumbs/mplayerthumbs.spec b/redhat/applications/multimedia/mplayerthumbs/mplayerthumbs.spec
index c736f4d49..a613b826b 100644
--- a/redhat/applications/mplayerthumbs/mplayerthumbs.spec
+++ b/redhat/applications/multimedia/mplayerthumbs/mplayerthumbs.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg mplayerthumbs
 %define tde_prefix /opt/trinity
@@ -60,7 +60,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -124,6 +124,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -147,23 +148,23 @@ fi
 %__rm -rf $RPM_BUILD_ROOT
 %__make install DESTDIR=%{buildroot} -C build
 
-%find_lang %{tde_pkg}
-
 
 %clean
 %__rm -rf $RPM_BUILD_ROOT
 
 
-%files -f %{tde_pkg}.lang
+%files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README
-%{tde_bindir}/mplayerthumbsconfig
-%{tde_tdelibdir}/videopreview.la
-%{tde_tdelibdir}/videopreview.so
-%{tde_datadir}/apps/videopreview/
-%{tde_datadir}/config.kcfg/mplayerthumbs.kcfg
-%{tde_datadir}/services/videopreview.desktop
-%{tde_tdedocdir}/HTML/en/videopreview/
+%doc AUTHORS ChangeLog COPYING README.md
+%{tde_bindir}/mplayer-thumbnailer-config
+%{tde_tdelibdir}/mplayer-thumbnailer.la
+%{tde_tdelibdir}/mplayer-thumbnailer.so
+%{tde_datadir}/apps/mplayer-thumbnailer/
+%{tde_datadir}/apps/tdeconf_update/mplayer-thumbnailer-cfg-rename.upd
+%{tde_datadir}/config.kcfg/mplayer-thumbnailer.kcfg
+%{tde_datadir}/services/mplayer-thumbnailer.desktop
+%{tde_tdedocdir}/HTML/en/mplayer-thumbnailer/
+%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/mplayer-thumbnailer.mo
 
 
 %changelog
diff --git a/redhat/applications/rosegarden/rosegarden.spec b/redhat/applications/multimedia/rosegarden/rosegarden.spec
index cb13479d0..b8cae72de 100644
--- a/redhat/applications/rosegarden/rosegarden.spec
+++ b/redhat/applications/multimedia/rosegarden/rosegarden.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg rosegarden
 %define tde_prefix /opt/trinity
@@ -64,7 +64,8 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	cmake libtool
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires: libtool
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -114,7 +115,7 @@ BuildRequires:  libidn-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gamin 1
 BuildRequires:  gamin-devel
 %endif
@@ -186,6 +187,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -232,6 +234,10 @@ export PATH="%{tde_bindir}:${PATH}"
 %{tde_bindir}/rosegarden-lilypondview
 %{tde_bindir}/rosegarden-project-package
 %{tde_bindir}/rosegardensequencer
+%{tde_mandir}/man1/rosegarden-audiofile-importer.1*
+%{tde_mandir}/man1/rosegarden-lilypondview.1*
+%{tde_mandir}/man1/rosegarden-project-package.1*
+%{tde_mandir}/man1/rosegarden.1*
 
 %files data -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
diff --git a/redhat/applications/soundkonverter/soundkonverter.spec b/redhat/applications/multimedia/soundkonverter/soundkonverter.spec
index bda7d2780..ee2c4eec2 100644
--- a/redhat/applications/soundkonverter/soundkonverter.spec
+++ b/redhat/applications/multimedia/soundkonverter/soundkonverter.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg soundkonverter
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/tderadio/tderadio.spec b/redhat/applications/multimedia/tderadio/tderadio.spec
index 27d4ef6b2..048f24c87 100644
--- a/redhat/applications/tderadio/tderadio.spec
+++ b/redhat/applications/multimedia/tderadio/tderadio.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tderadio
 %define tde_prefix /opt/trinity
@@ -65,7 +65,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	cmake
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -108,8 +108,8 @@ BuildRequires:	lame-devel
 %endif
 %endif
 
-Obsoletes:		trinity-kradio < %{version}-%{release}
-Provides:		trinity-kradio = %{version}-%{release}
+Obsoletes:		trinity-kradio < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kradio = %{?epoch:%{epoch}:}%{version}-%{release}
 
 
 %description
@@ -147,45 +147,36 @@ of new plugins (e.g. Internet Radio Streams, new cool GUIs) are welcome.
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/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-visibility causes applications fails to start !
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --program-prefix="" \
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
   \
-  %{?with_lirc:--enable-lirc} %{?!with_lirc:--disable-lirc} \
-  --enable-v4l2 \
-  --enable-lame \
-  --enable-ogg \
-  --enable-alsa \
-  --enable-oss
-
-%if 0%{?mgaversion} >= 6 || 0%{?pclinuxos} >= 2018
-%__sed -i "tderadio3/plugins/"*"/Makefile" -e "s|-Wl,--no-undefined||"
-%endif
+  -DBUILD_ALL=ON \
+  ..
 
 %__make %{?_smp_mflags}
 
@@ -193,7 +184,7 @@ export PATH="%{tde_bindir}:${PATH}"
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
 
 %find_lang %{tde_pkg}
 
@@ -202,6 +193,13 @@ export PATH="%{tde_bindir}:${PATH}"
 %suse_update_desktop_file -G "Radio Tuner" %{tde_pkg} AudioVideo Tuner
 %endif
 
+# Remove devel files
+%__rm -f %{?buildroot}%{tde_libdir}/libtderadio.la
+%__rm -f %{?buildroot}%{tde_libdir}/libtderadio.so
+
+# Remove pixmas
+%__rm -fr %{?buildroot}%{tde_datadir}/pixmaps/
+
 
 %clean
 %__rm -rf %{buildroot}
@@ -211,6 +209,8 @@ export PATH="%{tde_bindir}:${PATH}"
 %defattr(-,root,root,-)
 %{tde_bindir}/convert-presets
 %{tde_bindir}/tderadio
+%{tde_libdir}/libtderadio.so.0
+%{tde_libdir}/libtderadio.so.0.0.0
 %dir %{tde_libdir}/tderadio
 %dir %{tde_libdir}/tderadio/plugins
 %{tde_libdir}/tderadio/plugins/*.la
@@ -226,5 +226,8 @@ export PATH="%{tde_bindir}:${PATH}"
 %lang(pt) %{tde_datadir}/locale/pt/LC_MESSAGES/*.mo
 %lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/*.mo
 %{tde_tdedocdir}/HTML/en/tderadio/
+%{tde_mandir}/man1/convert-presets.1*
+%{tde_mandir}/man1/tderadio.1*
+
 
 %changelog
diff --git a/redhat/applications/basket/basket.spec b/redhat/applications/office/basket/basket.spec
index d4a9b33d4..42e1df681 100644
--- a/redhat/applications/basket/basket.spec
+++ b/redhat/applications/office/basket/basket.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg basket
 %define tde_prefix /opt/trinity
@@ -65,7 +65,7 @@ BuildRequires:	trinity-kontact-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gpgme-devel
 
-BuildRequires:	cmake
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -117,6 +117,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INCLUDE_PATH="%{tde_tdeincludedir}" \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
diff --git a/redhat/applications/kbibtex/kbibtex.spec b/redhat/applications/office/kbibtex/kbibtex.spec
index 475d33ded..901569d1a 100644
--- a/redhat/applications/kbibtex/kbibtex.spec
+++ b/redhat/applications/office/kbibtex/kbibtex.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kbibtex
 %define tde_prefix /opt/trinity
@@ -63,7 +63,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -125,6 +125,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -162,7 +163,7 @@ fi
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING NEWS README TODO ChangeLog
+%doc AUTHORS COPYING NEWS README.md TODO ChangeLog
 %{tde_bindir}/kbibtex
 %{tde_tdelibdir}/libkbibtexpart.la
 %{tde_tdelibdir}/libkbibtexpart.so
diff --git a/redhat/applications/kbookreader/kbookreader.spec b/redhat/applications/office/kbookreader/kbookreader.spec
index 83b10e451..2861cf231 100644
--- a/redhat/applications/kbookreader/kbookreader.spec
+++ b/redhat/applications/office/kbookreader/kbookreader.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kbookreader
 %define tde_prefix /opt/trinity
@@ -62,7 +62,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -119,6 +119,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -144,7 +145,7 @@ export PATH="%{tde_bindir}:${PATH}"
 
 # Updates applications categories for openSUSE
 %if 0%{?suse_version}
-%suse_update_desktop_file "%{?buildroot}%{tde_tdeappdir}/bookreader.desktop" Office Viewer
+%suse_update_desktop_file "%{?buildroot}%{tde_tdeappdir}/kbookreader.desktop" Office Viewer
 %endif
 
 %find_lang %{tde_pkg} || touch %{tde_pkg}.lang
@@ -157,13 +158,13 @@ export PATH="%{tde_bindir}:${PATH}"
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
-%{tde_bindir}/bookreader
-%{tde_bindir}/bookreader_client
-%{tde_tdeappdir}/bookreader.desktop
-%{tde_datadir}/apps/bookreader/
-%{tde_datadir}/config.kcfg/bookreader.kcfg
-%{tde_tdedocdir}/HTML/en/bookreader/
-%{tde_datadir}/icons/hicolor/*/apps/bookreader.png
+%{tde_bindir}/kbookreader
+%{tde_bindir}/kbookreader_client
+%{tde_tdeappdir}/kbookreader.desktop
+%{tde_datadir}/apps/kbookreader/
+%{tde_datadir}/config.kcfg/kbookreader.kcfg
+%{tde_tdedocdir}/HTML/en/kbookreader/
+%{tde_datadir}/icons/hicolor/*/apps/kbookreader.png
 
 
 %changelog
diff --git a/redhat/applications/keximdb/keximdb.spec b/redhat/applications/office/keximdb/keximdb.spec
index a873b6a8a..af8b3c0df 100644
--- a/redhat/applications/keximdb/keximdb.spec
+++ b/redhat/applications/office/keximdb/keximdb.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg keximdb
 %define tde_prefix /opt/trinity
@@ -64,7 +64,7 @@ BuildRequires:	desktop-file-utils
 BuildRequires:	trinity-koffice-devel
 BuildRequires:	trinity-koffice-kexi
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -125,6 +125,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/kile/kile.spec b/redhat/applications/office/kile/kile.spec
index 9e1f5bf38..8fc9a86ae 100644
--- a/redhat/applications/kile/kile.spec
+++ b/redhat/applications/office/kile/kile.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kile
 %define tde_prefix /opt/trinity
@@ -62,7 +62,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	cmake
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -76,51 +76,51 @@ BuildRequires:	update-desktop-files
 BuildRequires:	brp-check-trinity
 %endif
 
-Obsoletes: %{name}-i18n-ar
-Obsoletes: %{name}-i18n-bg
-Obsoletes: %{name}-i18n-br
-Obsoletes: %{name}-i18n-ca
-Obsoletes: %{name}-i18n-cs
-Obsoletes: %{name}-i18n-cy
-Obsoletes: %{name}-i18n-da
-Obsoletes: %{name}-i18n-de
-Obsoletes: %{name}-i18n-el
-Obsoletes: %{name}-i18n-engb
-Obsoletes: %{name}-i18n-es
-Obsoletes: %{name}-i18n-et
-Obsoletes: %{name}-i18n-eu
-Obsoletes: %{name}-i18n-fi
-Obsoletes: %{name}-i18n-fr
-Obsoletes: %{name}-i18n-ga
-Obsoletes: %{name}-i18n-gl
-Obsoletes: %{name}-i18n-hi
-Obsoletes: %{name}-i18n-hu
-Obsoletes: %{name}-i18n-is
-Obsoletes: %{name}-i18n-it
-Obsoletes: %{name}-i18n-ja
-Obsoletes: %{name}-i18n-lt
-Obsoletes: %{name}-i18n-ms
-Obsoletes: %{name}-i18n-mt
-Obsoletes: %{name}-i18n-nb
-Obsoletes: %{name}-i18n-nds
-Obsoletes: %{name}-i18n-nl
-Obsoletes: %{name}-i18n-nn
-Obsoletes: %{name}-i18n-pa
-Obsoletes: %{name}-i18n-pl
-Obsoletes: %{name}-i18n-pt
-Obsoletes: %{name}-i18n-ptbr
-Obsoletes: %{name}-i18n-ro
-Obsoletes: %{name}-i18n-ru
-Obsoletes: %{name}-i18n-rw
-Obsoletes: %{name}-i18n-sk
-Obsoletes: %{name}-i18n-sr
-Obsoletes: %{name}-i18n-srlatin
-Obsoletes: %{name}-i18n-sv
-Obsoletes: %{name}-i18n-ta
-Obsoletes: %{name}-i18n-th
-Obsoletes: %{name}-i18n-tr
-Obsoletes: %{name}-i18n-uk
-Obsoletes: %{name}-i18n-zhcn
+Obsoletes: %{name}-i18n-ar < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-bg < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-br < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-ca < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-cs < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-cy < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-da < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-de < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-el < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-engb < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-es < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-et < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-eu < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-fi < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-fr < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-ga < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-gl < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-hi < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-hu < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-is < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-it < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-ja < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-lt < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-ms < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-mt < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-nb < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-nds < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-nl < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-nn < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-pa < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-pl < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-pt < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-ptbr < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-ro < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-ru < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-rw < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-sk < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-sr < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-srlatin < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-sv < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-ta < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-th < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-tr < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-uk < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-zhcn < %{?epoch:%{epoch}:}%{version}-%{release}
 
 
 %description
@@ -149,45 +149,42 @@ Kile can support large projects consisting of several smaller files.
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/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} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+# Warning: GCC visibility causes the KCM not to work at all !
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DDATA_INSTALL_DIR=%{tde_datadir}/apps \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  ..
 
 %__make %{?_smp_mflags}
 
 
+
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%__chmod +x %{buildroot}%{tde_datadir}/apps/kile/test/runTests.sh
-
-# Unwanted files ...
-%__rm -f %{?buildroot}%{tde_datadir}/apps/katepart/syntax/bibtex.xml
-%__rm -f %{?buildroot}%{tde_datadir}/apps/katepart/syntax/latex.xml
+%__make install DESTDIR=%{buildroot} -C build
 
 %find_lang %{tde_pkg}
 
@@ -221,6 +218,7 @@ export PATH="%{tde_bindir}:${PATH}"
 %lang(pt) %{tde_tdedocdir}/HTML/pt/kile/
 %lang(sv) %{tde_tdedocdir}/HTML/sv/kile/
 
+%{tde_mandir}/man1/kile.1*
 
 
 %changelog
diff --git a/redhat/applications/kmymoney/kmymoney.spec b/redhat/applications/office/kmymoney/kmymoney.spec
index ee5f52e8d..ed8d04fb8 100644
--- a/redhat/applications/kmymoney/kmymoney.spec
+++ b/redhat/applications/office/kmymoney/kmymoney.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kmymoney
 %define tde_prefix /opt/trinity
@@ -68,7 +68,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	cmake
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -84,6 +84,7 @@ BuildRequires:	update-desktop-files
 BuildRequires:	brp-check-trinity
 %endif
 
+BuildRequires:	html2ps
 BuildRequires:	recode
 BuildRequires:	libofx-devel
 
@@ -148,17 +149,17 @@ have '%{name}' package installed, you will hardly find this package useful.
 %{tde_datadir}/apps/kmymoney2/
 %{tde_datadir}/config.kcfg/kmymoney2.kcfg
 %{tde_datadir}/icons/hicolor/*/*/*.png
-%dir %{tde_datadir}/icons/Tango/
-%dir %{tde_datadir}/icons/Tango/*/
-%dir %{tde_datadir}/icons/Tango/*/*/
-%{tde_datadir}/icons/Tango/*/*/*.png
-%{tde_datadir}/icons/Tango/scalable/*.svgz
+#%dir %{tde_datadir}/icons/Tango/
+#%dir %{tde_datadir}/icons/Tango/*/
+#%dir %{tde_datadir}/icons/Tango/*/*/
+#%{tde_datadir}/icons/Tango/*/*/*.png
+#%{tde_datadir}/icons/Tango/scalable/*.svgz
 %{tde_datadir}/icons/locolor/*/*/*.png
-%dir %{tde_datadir}/icons/oxygen/
-%dir %{tde_datadir}/icons/oxygen/*/
-%dir %{tde_datadir}/icons/oxygen/*/*/
-%{tde_datadir}/icons/oxygen/*/*/*.png
-%{tde_datadir}/icons/oxygen/scalable/*.svgz
+#%dir %{tde_datadir}/icons/oxygen/
+#%dir %{tde_datadir}/icons/oxygen/*/
+#%dir %{tde_datadir}/icons/oxygen/*/*/
+#%{tde_datadir}/icons/oxygen/*/*/*.png
+#%{tde_datadir}/icons/oxygen/scalable/*.svgz
 %{tde_tdedocdir}/HTML/en/kmymoney2/
 %{tde_mandir}/man1/kmymoney2.*
 %{tde_datadir}/apps/kmm_ofximport/
@@ -181,6 +182,7 @@ This package contains development files needed for KMyMoney plugins.
 %{tde_libdir}/libkmm_mymoney.la
 %{tde_libdir}/libkmm_plugin.la
 %{tde_libdir}/*.so
+%{_libdir}/tqt3/plugins/designer/libkmymoney.la
 %{_libdir}/tqt3/plugins/designer/libkmymoney.so
 
 ##########
@@ -197,54 +199,48 @@ This package contains development files needed for KMyMoney plugins.
 
 %__install -m644 %{SOURCE1} kmymoney2/widgets/
 
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
 
 %build
-unset QTDIR QTINC QTLIB
+unset QTDIR QTLIB QTINC
 export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-
-%if 0%{?fedora} >= 29 || 0%{?rhel} >= 8
-LDFLAGS="-Wl,--allow-shlib-undefined"
-%endif
 
-# Warning: --enable-final causes FTBFS
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+  -DBIN_INSTALL_DIR="%{tde_bindir}" \
+  -DDOC_INSTALL_DIR="%{tde_docdir}" \
+  -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
+  -DLIB_INSTALL_DIR="%{tde_libdir}" \
+  -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
+  -DSYSCONF_INSTALL_DIR="%{_sysconfdir}/trinity" \
+  -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --disable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility \
+  -DWITH_ALL_OPTIONS=ON \
   \
-  --with-qmake=%{_bindir}/tqmake \
-  --with-qt-dir=%{_libdir}/tqt3 \
+  -DBUILD_ALL=ON \
   \
-  --disable-pdf-docs \
-  --enable-ofxplugin \
-  --enable-ofxbanking \
-  --enable-qtdesigner \
-  --disable-sqlite3
+  ..
 
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
 
 
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
 
 %find_lang kmymoney2
 
diff --git a/redhat/applications/kmymoney/kmymoneytitlelabel.png b/redhat/applications/office/kmymoney/kmymoneytitlelabel.png
index 70d72ac98..70d72ac98 100644
--- a/redhat/applications/kmymoney/kmymoneytitlelabel.png
+++ b/redhat/applications/office/kmymoney/kmymoneytitlelabel.png
diff --git a/redhat/applications/kmymoney/trinity-kmymoney-rpmlintrc b/redhat/applications/office/kmymoney/trinity-kmymoney-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/applications/kmymoney/trinity-kmymoney-rpmlintrc
+++ b/redhat/applications/office/kmymoney/trinity-kmymoney-rpmlintrc
diff --git a/redhat/applications/knowit/knowit.spec b/redhat/applications/office/knowit/knowit.spec
index 397257722..9cb76c32d 100644
--- a/redhat/applications/knowit/knowit.spec
+++ b/redhat/applications/office/knowit/knowit.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg knowit
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	cmake
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -119,6 +119,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/koffice-i18n/koffice-i18n.spec b/redhat/applications/office/koffice-i18n/koffice-i18n.spec
index c63a62f6f..e28ae5757 100644
--- a/redhat/applications/koffice-i18n/koffice-i18n.spec
+++ b/redhat/applications/office/koffice-i18n/koffice-i18n.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg koffice-i18n
 %define tde_prefix /opt/trinity
@@ -74,7 +74,7 @@ BuildRequires:	desktop-file-utils
 BuildRequires:	findutils
 BuildRequires:	gettext
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	cmake
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -95,49 +95,49 @@ BuildRequires:	brp-check-trinity
 %package Bulgarian
 Summary:		Bulgarian(bg) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-bg = %{version}-%{release}
+Provides: %{name}-bg = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Bulgarian
 %{summary}.
 
 %package Bengali
 Summary:		Bengali(bn) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-bn = %{version}-%{release}
+Provides: %{name}-bn = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Bengali
 %{summary}.
 
 %package Tibetan
 Summary:		Tibetan(bo) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-bo = %{version}-%{release}
+Provides: %{name}-bo = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Tibetan
 %{summary}.
 
 %package Breton
 Summary:		Breton(br) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-br = %{version}-%{release}
+Provides: %{name}-br = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Breton
 %{summary}.
 
 %package Bosnian
 Summary:		Bosnian(bs) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-bs = %{version}-%{release}
+Provides: %{name}-bs = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Bosnian
 %{summary}.
 
 %package Catalan
 Summary:		Catalan(ca) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-ca = %{version}-%{release}
+Provides: %{name}-ca = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Catalan
 %{summary}.
 
 %package Czech
 Summary:		Czech(cs) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-cs = %{version}-%{release}
+Provides: %{name}-cs = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Czech
 %{summary}.
 
@@ -150,421 +150,421 @@ Group:			User Interface/Desktops
 %package Welsh
 Summary:		Welsh(cy) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-cy = %{version}-%{release}
+Provides: %{name}-cy = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Welsh
 %{summary}.
 
 %package Danish
 Summary:		Danish(da) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-da = %{version}-%{release}
+Provides: %{name}-da = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Danish
 %{summary}.
 
 %package German
 Summary:		German(de) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-de = %{version}-%{release}
+Provides: %{name}-de = %{?epoch:%{epoch}:}%{version}-%{release}
 %description German
 %{summary}.
 
 %package Greek
 Summary:		Greek(el) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-el = %{version}-%{release}
+Provides: %{name}-el = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Greek
 %{summary}.
 
 %package British
 Summary:		British(en_GB) English support for TDE
 Group:			User Interface/Desktops
-Provides: %{name}-en_GB = %{version}-%{release}
+Provides: %{name}-en_GB = %{?epoch:%{epoch}:}%{version}-%{release}
 %description British
 %{summary}.
 
 %package Esperanto
 Summary:		Esperanto(eo) support for TDE
 Group:			User Interface/Desktops
-Provides: %{name}-eo = %{version}-%{release}
+Provides: %{name}-eo = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Esperanto
 %{summary}.
 
 %package Spanish
 Summary:		Spanish(es) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-es = %{version}-%{release}
+Provides: %{name}-es = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Spanish
 %{summary}.
 
 %package Estonian
 Summary:		Estonian(et) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-et = %{version}-%{release}
+Provides: %{name}-et = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Estonian
 %{summary}.
 
 %package Basque
 Summary:		Basque(eu) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-eu = %{version}-%{release}
+Provides: %{name}-eu = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Basque
 %{summary}.
 
 %package Finnish
 Summary:		Finnish(fi) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-fi = %{version}-%{release}
+Provides: %{name}-fi = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Finnish
 %{summary}.
 
 %package Faroese
 Summary:		Faroese(fo) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-fo = %{version}-%{release}
+Provides: %{name}-fo = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Faroese
 %{summary}.
 
 %package French
 Summary:		French(fr) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-fr = %{version}-%{release}
+Provides: %{name}-fr = %{?epoch:%{epoch}:}%{version}-%{release}
 %description French
 %{summary}.
 
 %package Frisian
 Summary:		Frisian(fy) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-fy = %{version}-%{release}
+Provides: %{name}-fy = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Frisian
 %{summary}.
 
 %package Irish
 Summary:		Irish(ga) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Obsoletes: kde-i18n-Gaeilge < %{version}
-Provides: %{name}-ga = %{version}-%{release}
+Obsoletes: kde-i18n-Gaeilge < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: %{name}-ga = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Irish
 %{summary}.
 
 %package Galician
 Summary:		Galician(gl) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-gl = %{version}-%{release}
+Provides: %{name}-gl = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Galician
 %{summary}.
 
 %package Hebrew
 Summary:		Hebrew(he) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-he = %{version}-%{release}
+Provides: %{name}-he = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Hebrew
 %{summary}.
 
 %package Hindi
 Summary:		Hindi(hi) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-hi = %{version}-%{release}
+Provides: %{name}-hi = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Hindi
 %{summary}.
 
 %package Croatian
 Summary:		Croatian(hr) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-hr = %{version}-%{release}
+Provides: %{name}-hr = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Croatian
 %{summary}.
 
 %package Hungarian
 Summary:		Hungarian(hu) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-hu = %{version}-%{release}
+Provides: %{name}-hu = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Hungarian
 %{summary}.
 
 %package Indonesian
 Summary:		Indonesian(id) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-id = %{version}-%{release}
+Provides: %{name}-id = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Indonesian
 %{summary}.
 
 %package Icelandic
 Summary:		Icelandic(is) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-is = %{version}-%{release}
+Provides: %{name}-is = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Icelandic
 %{summary}.
 
 %package Italian
 Summary:		Italian(it) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-it = %{version}-%{release}
+Provides: %{name}-it = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Italian
 %{summary}.
 
 %package Japanese
 Summary:		Japanese(ja) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-ja = %{version}-%{release}
+Provides: %{name}-ja = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Japanese
 %{summary}.
 
 %package Khmer
 Summary:		Khmer(km) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-km = %{version}-%{release}
+Provides: %{name}-km = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Khmer
 %{summary}.
 
 %package Korean
 Summary:		Korean(ko) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-ko = %{version}-%{release}
+Provides: %{name}-ko = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Korean
 %{summary}.
 
 %package Kurdish
 Summary:		Kurdish(ku) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-ku = %{version}-%{release}
+Provides: %{name}-ku = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Kurdish
 %{summary}.
 
 %package Lao
 Summary:		Lao(lo) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-lo = %{version}-%{release}
+Provides: %{name}-lo = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Lao
 %{summary}.
 
 %package Lithuanian
 Summary:		Lithuanian(lt) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-lt = %{version}-%{release}
+Provides: %{name}-lt = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Lithuanian
 %{summary}.
 
 %package Latvian
 Summary:		Latvian(lv) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-lv = %{version}-%{release}
+Provides: %{name}-lv = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Latvian
 %{summary}.
 
 %package Maori
 Summary:		Maori(mi) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-mi = %{version}-%{release}
+Provides: %{name}-mi = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Maori
 %{summary}.
 
 %package Macedonian
 Summary:		Macedonian(mk) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-mk = %{version}-%{release}
+Provides: %{name}-mk = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Macedonian
 %{summary}.
 
 %package Malay
 Summary:		Malay(ms) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-ms = %{version}-%{release}
+Provides: %{name}-ms = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Malay
 %{summary}.
 
 %package Maltese
 Summary:		Maltese(mt) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-mt = %{version}-%{release}
+Provides: %{name}-mt = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Maltese
 %{summary}.
 
 %package LowSaxon
 Summary:		Low Saxon (nds) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-nds = %{version}-%{release}
+Provides: %{name}-nds = %{?epoch:%{epoch}:}%{version}-%{release}
 %description LowSaxon
 %{summary}.
 
 %package Nepali
 Summary:		Nepali(ne) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-ne = %{version}-%{release}
+Provides: %{name}-ne = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Nepali
 %{summary}.
 
 %package Dutch
 Summary:		Dutch(nl) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-nl = %{version}-%{release}
+Provides: %{name}-nl = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Dutch
 %{summary}.
 
 %package Norwegian
 Summary:		Norwegian(no) (Bokmaal) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-no = %{version}-%{release}
+Provides: %{name}-no = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Norwegian
 %{summary}.
 
 %package Norwegian-Nynorsk
 Summary:		Norwegian(nn) (Nynorsk) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-nn = %{version}-%{release}
+Provides: %{name}-nn = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Norwegian-Nynorsk
 %{summary}.
 
 %package Occitan
 Summary:		Occitan(oc) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-oc = %{version}-%{release}
+Provides: %{name}-oc = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Occitan
 %{summary}.
 
 %package Polish
 Summary:		Polish(pl) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-pl = %{version}-%{release}
+Provides: %{name}-pl = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Polish
 %{summary}.
 
 %package Portuguese
 Summary:		Portuguese(pt) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-pt = %{version}-%{release}
+Provides: %{name}-pt = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Portuguese
 %{summary}.
 
 %package Punjabi
 Summary:		Punjabi(pa) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-pa = %{version}-%{release}
+Provides: %{name}-pa = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Punjabi
 %{summary}.
 
 %package Brazil
 Summary:		Brazil(pt_BR) Portuguese language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-pt_BR = %{version}-%{release}
+Provides: %{name}-pt_BR = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Brazil
 %{summary}.
 
 %package Romanian
 Summary:		Romanian(ro) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-ro = %{version}-%{release}
+Provides: %{name}-ro = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Romanian
 %{summary}.
 
 %package Russian
 Summary:		Russian(ru) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-ru = %{version}-%{release}
+Provides: %{name}-ru = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Russian
 %{summary}.
 
 %package Slovak
 Summary:		Slovak(sk) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-sk = %{version}-%{release}
+Provides: %{name}-sk = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Slovak
 %{summary}.
 
 %package Slovenian
 Summary:		Slovenian(sl) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-sl = %{version}-%{release}
+Provides: %{name}-sl = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Slovenian
 %{summary}.
 
 %package Serbian
 Summary:		Serbian(sr) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-sr = %{version}-%{release}
+Provides: %{name}-sr = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Serbian
 %{summary}.
 
 %package Swedish
 Summary:		Swedish(sv) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-sv = %{version}-%{release}
+Provides: %{name}-sv = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Swedish
 %{summary}.
 
 %package Tamil
 Summary:		Tamil(ta) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-ta = %{version}-%{release}
+Provides: %{name}-ta = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Tamil
 %{summary}.
 
 %package Tajik
 Summary:		Tajik(tg) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-tg = %{version}-%{release}
+Provides: %{name}-tg = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Tajik
 %{summary}.
 
 %package Thai
 Summary:		Thai(th) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-th = %{version}-%{release}
+Provides: %{name}-th = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Thai
 %{summary}.
 
 %package Turkish
 Summary:		Turkish(tr) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-tr = %{version}-%{release}
+Provides: %{name}-tr = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Turkish
 %{summary}.
 
 %package Ukrainian
 Summary:		Ukrainian(uk) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-uk = %{version}-%{release}
+Provides: %{name}-uk = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Ukrainian
 %{summary}.
 
 %package Venda
 Summary:		Venda(ven) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-ven = %{version}-%{release}
+Provides: %{name}-ven = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Venda
 %{summary}.
 
 %package Vietnamese
 Summary:		Vietnamese(vi) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-vi = %{version}-%{release}
+Provides: %{name}-vi = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Vietnamese
 %{summary}.
 
 %package Walloon
 Summary:		Walloon(wa) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-wa = %{version}-%{release}
+Provides: %{name}-wa = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Walloon
 %{summary}.
 
 %package Xhosa
 Summary:		Xhosa(xh) (a Bantu language) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-xh = %{version}-%{release}
+Provides: %{name}-xh = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Xhosa
 %{summary}.
 
 %package Chinese
 Summary:		Chinese(zh_CN) (Simplified Chinese) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-zh_CN = %{version}-%{release}
+Provides: %{name}-zh_CN = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Chinese
 %{summary}.
 
 %package Chinese-Big5
 Summary:		Chinese(zh_TW) (Big5) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-tz_TW = %{version}-%{release}
+Provides: %{name}-tz_TW = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Chinese-Big5
 %{summary}.
 
@@ -573,45 +573,66 @@ Provides: %{name}-tz_TW = %{version}-%{release}
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-
 
 %build
+unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
+
+(
+for l in . %{TDE_LANGS}; do
+  if [ $l != '.' ]; then
+    pushd "%{tde_pkg}-${l}"
+  else
+    pushd ${l}
+  fi
+
+  if ! rpm -E %%cmake|grep -q "cd build"; then
+    %__mkdir_p build
+    cd build
+  fi
+
+  %cmake \
+    -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+    -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+    -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+    -DCMAKE_SKIP_RPATH=OFF \
+    -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+    -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DWITH_GCC_VISIBILITY=OFF \
+    \
+    -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+    -DDATA_INSTALL_DIR=%{tde_datadir}/apps \
+    -DLIB_INSTALL_DIR=%{tde_libdir} \
+    -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+    \
+    -DBUILD_ALL=ON \
+    \
+    ..
+
+  %__make %{?_smp_mflags}
+
+  popd
+done
+) 2>&1 | tee /tmp/rpmbuild.$$
 
-export kde_htmldir="%{tde_tdedocdir}/HTML"
+if grep -qw TDE_Error /tmp/rpmbuild.$$; then
+  echo "Error while building. See '/tmp/rpmbuild.$$'"
+  exit 1
+fi
 
-for l in %{TDE_LANGS}; do
-  for f in koffice-i18n-${l}/; do
-    if [ -d "${f}" ]; then 
-      pushd ${f}
-      %__sed -i "configure.in" -e "s|AM_CONFIG_HEADER|AC_CONFIG_HEADER|"
-      %__make -f "admin/Makefile.common"
-      %configure \
-        --prefix=%{tde_prefix} \
-        --datadir=%{tde_datadir} \
-        --docdir=%{tde_tdedocdir}
-      %__make %{?_smp_mflags}
-      popd
-    fi
-  done
-done
+wait
+rm -f /tmp/rpmbuild.$$
 
 %install
-%__rm -rf %{?buildroot}
 export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
 
 for l in %{TDE_LANGS}; do
-  for f in koffice-i18n-${l}/; do
-    if [ -d "${f}" ] && [ -r "${f}/Makefile" ] ; then 
-      %__make install DESTDIR="%{?buildroot}" -C "${f}"
-    fi
-  done
+  %__make DESTDIR=%{buildroot} -C build install-${l}
 done
 
-# remove zero-length file
-find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \;
 
 %clean
 %__rm -rf %{buildroot}
diff --git a/redhat/applications/koffice/koffice.spec b/redhat/applications/office/koffice/koffice.spec
index a9d246641..8d5a12144 100644
--- a/redhat/applications/koffice/koffice.spec
+++ b/redhat/applications/office/koffice/koffice.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg koffice
 %define tde_prefix /opt/trinity
@@ -113,7 +113,12 @@ BuildRequires:	libexif-devel
 BuildRequires:	readline-devel
 
 # PYTHON support
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
+%if 0%{?sle_version} >= 150400 || 0%{?rhel} >= 9
+%define with_python 0
+%global __python %__python3
+%else
+%define with_python 1
+%if 0%{?rhel} == 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 8
 %global python python2
 %global __python %__python2
 %global python_sitearch %{python2_sitearch}
@@ -123,6 +128,7 @@ BuildRequires:	readline-devel
 %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 BuildRequires:	%{python}
 BuildRequires:	%{python}-devel
+%endif
 
 # LCMS support
 %if 0%{?suse_version} || 0%{?rhel} >= 7
@@ -216,18 +222,22 @@ BuildRequires:	trinity-poppler-devel >= 0.12
 # POSTGRESQL support
 #  Requires 'libpqxx', for kexi-driver-pgqsl
 %if 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version}
-%if 0%{?suse_version} != 1500 && 0%{?suse_version} != 1550
+%if 0%{?suse_version} != 1500 && 0%{?suse_version} != 1550 && 0%{?pclinuxos} == 0
 %define with_postgresql 1
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8
+BuildRequires:	postgresql-server-devel
+%else
 BuildRequires:	postgresql-devel
 BuildRequires:	libpqxx-devel
 %endif
 %endif
-Obsoletes:		trinity-libpqxx
+%endif
+Obsoletes:		trinity-libpqxx < %{?epoch:%{epoch}:}%{version}-%{release}
 
 # WPD support
 #  For chalk and filters
 BuildRequires:	libwpd-devel
-Obsoletes:		trinity-libwpd
+Obsoletes:		trinity-libwpd < %{?epoch:%{epoch}:}%{version}-%{release}
 
 # WV2 support
 %if 0%{?mgaversion} || 0%{?mdkversion}
@@ -239,7 +249,11 @@ BuildRequires:	wv2-devel
 
 # MESA support
 %if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} >= 8
+BuildRequires:	%{_lib}mesagl-devel
+%else
 BuildRequires:	%{_lib}mesagl1-devel
+%endif
 BuildRequires:	%{_lib}mesaglu1-devel
 %endif
 %if 0%{?fedora} || 0%{?rhel}
@@ -377,12 +391,18 @@ Requires:		perl
 %{tde_tdeappdir}/*koshell.desktop
 %{tde_datadir}/apps/kofficewidgets/
 %if 0%{?with_kross}
+%if 0%{?with_python}
 %{tde_datadir}/apps/kross/
 %{tde_tdelibdir}/krosspython.*
+%endif
 %if 0%{?with_ruby}
 %{tde_tdelibdir}/krossruby.*
 %endif
 %endif
+%{tde_mandir}/man1/koconverter.1*
+%{tde_mandir}/man1/koscript.1*
+%{tde_mandir}/man1/koshell.1*
+%{tde_mandir}/man1/kthesaurus.1*
 
 ##########
 
@@ -419,6 +439,7 @@ License:		LGPLv2+
 %{tde_libdir}/libkrossapi.so.*
 %{tde_libdir}/libkrossmain.so.*
 %endif
+%{tde_mandir}/man1/kspread.1*
 
 ##########
 
@@ -464,6 +485,7 @@ Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
 %{tde_datadir}/templates/TextDocument.desktop
 %{tde_datadir}/templates/.source/TextDocument.kwt
 %{tde_tdeappdir}/*kword.desktop
+%{tde_mandir}/man1/kword.1*
 
 ##########
 
@@ -526,6 +548,8 @@ Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
 %{tde_datadir}/templates/Presentation.desktop
 %{tde_datadir}/templates/.source/Presentation.kpt
 %{tde_tdeappdir}/*kpresenter.desktop
+%{tde_mandir}/man1/kprconverter.pl.1*
+%{tde_mandir}/man1/kpresenter.1*
 
 ##########
 
@@ -533,7 +557,7 @@ Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
 Summary:		A flowcharting application
 Group:			Applications/Productivity
 Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      kivio < %{version}-%{release}
+Obsoletes:      kivio < %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description kivio
 %{summary}.
@@ -550,6 +574,7 @@ Obsoletes:      kivio < %{version}-%{release}
 %{tde_datadir}/config.kcfg/kivio.kcfg
 %{tde_datadir}/services/kivio*.desktop
 %{tde_tdeappdir}/*kivio.desktop
+%{tde_mandir}/man1/kivio.1*
 
 ##########
 
@@ -576,6 +601,7 @@ Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
 %{tde_datadir}/templates/Illustration.desktop
 %{tde_datadir}/templates/.source/Illustration.karbon
 %{tde_tdeappdir}/*karbon.desktop
+%{tde_mandir}/man1/karbon.1*
 
 ##########
 
@@ -605,6 +631,8 @@ Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
 %{tde_datadir}/services/kugar*.desktop
 %{tde_tdeappdir}/*kugar.desktop
 %{tde_tdeappdir}/*kudesigner.desktop
+%{tde_mandir}/man1/kudesigner.1*
+%{tde_mandir}/man1/kugar.1*
 
 ##########
 
@@ -614,7 +642,7 @@ Group:			Applications/Productivity
 Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %if 0%{?with_postgresql} == 0
-Obsoletes:		%{name}-kexi-driver-pgsql
+Obsoletes:		%{name}-kexi-driver-pgsql < %{?epoch:%{epoch}:}%{version}-%{release}
 %endif
 
 %description kexi
@@ -710,6 +738,7 @@ Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
 %{tde_datadir}/apps/kchart/
 %{tde_datadir}/services/kchart*.desktop
 %{tde_tdeappdir}/*kchart.desktop
+%{tde_mandir}/man1/kchart.1*
 
 ##########
 
@@ -750,6 +779,7 @@ Requires:		dejavu
 %{tde_datadir}/apps/kformula/
 %{tde_datadir}/services/kformula*.desktop
 %{tde_tdeappdir}/*kformula.desktop
+%{tde_mandir}/man1/kformula.1*
 
 ##########
 
diff --git a/redhat/applications/koffice/koshell.png b/redhat/applications/office/koffice/koshell.png
index c66ef99e8..c66ef99e8 100644
--- a/redhat/applications/koffice/koshell.png
+++ b/redhat/applications/office/koffice/koshell.png
diff --git a/redhat/applications/koffice/trinity-koffice-rpmlintrc b/redhat/applications/office/koffice/trinity-koffice-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/applications/koffice/trinity-koffice-rpmlintrc
+++ b/redhat/applications/office/koffice/trinity-koffice-rpmlintrc
diff --git a/redhat/applications/kpilot/kpilot.spec b/redhat/applications/office/kpilot/kpilot.spec
index 3fb166849..3b5a2320c 100644
--- a/redhat/applications/kpilot/kpilot.spec
+++ b/redhat/applications/office/kpilot/kpilot.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kpilot
 %define tde_prefix /opt/trinity
@@ -63,7 +63,7 @@ BuildRequires:	desktop-file-utils
 BuildRequires:	trinity-tdepim-devel >= %{tde_version}
 BuildRequires:	gettext
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -140,6 +140,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/kpilot/trinity-kpilot-rpmlintrc b/redhat/applications/office/kpilot/trinity-kpilot-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/applications/kpilot/trinity-kpilot-rpmlintrc
+++ b/redhat/applications/office/kpilot/trinity-kpilot-rpmlintrc
diff --git a/redhat/applications/tellico/tellico.spec b/redhat/applications/office/tellico/tellico.spec
index 894a74be8..1645a3e61 100644
--- a/redhat/applications/tellico/tellico.spec
+++ b/redhat/applications/office/tellico/tellico.spec
@@ -1,4 +1,4 @@
-%if 0%{?fedora} >= 23
+%if 0%{?fedora} >= 23 || 0%{?rhel} >= 9
 %define _hardened_ldflags %nil
 %endif
 
@@ -13,7 +13,7 @@
 # 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)
+# license that confolrms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 #
 # Please submit bugfixes or comments via http://www.trinitydesktop.org/
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tellico
 %define tde_prefix /opt/trinity
@@ -69,7 +69,7 @@ BuildRequires:	trinity-libpoppler-tqt-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -139,7 +139,7 @@ BuildRequires:	libidn-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gamin 1
 BuildRequires:	gamin-devel
 %endif
@@ -154,17 +154,25 @@ BuildRequires:	libacl-devel
 BuildRequires:	libattr-devel
 
 # PYTHON support
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
+%if 0%{?sle_version} >= 150400 || 0%{?rhel} >= 9
+%define python python3
+%define __python %__python3
+%else
+%if 0%{?rhel} == 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
 %global python python2
 %global __python %__python2
 %global python_sitearch %{python2_sitearch}
 %else
 %global python python
 %endif
+%endif
 %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 BuildRequires:	%{python}
 BuildRequires:	%{python}-devel
 
+# Readline support
+BuildRequires:	readline-devel
+
 
 Requires:		%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:		%{name}-scripts = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -189,6 +197,7 @@ It also makes it easy for other softwares to use the Tellico data.
 %{tde_bindir}/tellico
 %{tde_datadir}/applications
 %config(noreplace) %{tde_confdir}/tellicorc
+%{tde_mandir}/man1/tellico.1*
 
 ##########
 
@@ -289,7 +298,7 @@ fi
           "src/fetch/scripts/ministerio_de_cultura.py" \
           "src/fetch/scripts/fr.allocine.py" \
           "src/translators/griffith2tellico.py" \
-  -e "s|/usr/bin/env python|/usr/bin/env python2|"
+  -e "s|/usr/bin/env python|/usr/bin/env %{python}|"
 %endif
 
 
@@ -309,6 +318,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_NO_BUILTIN_CHRPATH=ON \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
diff --git a/redhat/applications/kima/kima.spec b/redhat/applications/settings/kima/kima.spec
index 9df373a5b..bde20158a 100644
--- a/redhat/applications/kima/kima.spec
+++ b/redhat/applications/settings/kima/kima.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kima
 %define tde_prefix /opt/trinity
@@ -63,7 +63,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -124,6 +124,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -162,7 +163,7 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
+%doc AUTHORS ChangeLog COPYING README.md TODO
 %{tde_tdelibdir}/libkima.la
 %{tde_tdelibdir}/libkima.so
 %{tde_datadir}/apps/kicker/applets/kima.desktop
diff --git a/redhat/applications/kiosktool/kiosktool.spec b/redhat/applications/settings/kiosktool/kiosktool.spec
index ada3aa3d5..6bd1357a2 100644
--- a/redhat/applications/kiosktool/kiosktool.spec
+++ b/redhat/applications/settings/kiosktool/kiosktool.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kiosktool
 %define tde_prefix /opt/trinity
@@ -64,7 +64,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -122,6 +122,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -167,7 +168,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc ChangeLog COPYING README TODO
+%doc ChangeLog COPYING README.md TODO
 %{tde_bindir}/kiosktool
 %{tde_bindir}/kiosktool-tdedirs
 %{tde_tdeappdir}/kiosktool.desktop
diff --git a/redhat/applications/kkbswitch/kkbswitch.spec b/redhat/applications/settings/kkbswitch/kkbswitch.spec
index 85ef51ca5..b9113b344 100644
--- a/redhat/applications/kkbswitch/kkbswitch.spec
+++ b/redhat/applications/settings/kkbswitch/kkbswitch.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kkbswitch
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -129,6 +129,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -174,7 +175,7 @@ fi
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog README TODO
+%doc AUTHORS ChangeLog README.md TODO
 %{tde_bindir}/kkbswitch
 %{tde_tdeappdir}/kkbswitch.desktop
 %{tde_datadir}/apps/kkbswitch/
diff --git a/redhat/applications/klcddimmer/klcddimmer.spec b/redhat/applications/settings/klcddimmer/klcddimmer.spec
index c892a3b08..bdd52f204 100644
--- a/redhat/applications/klcddimmer/klcddimmer.spec
+++ b/redhat/applications/settings/klcddimmer/klcddimmer.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg klcddimmer
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -114,6 +114,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -147,7 +148,7 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING LICENSE NEWS README
+%doc AUTHORS COPYING LICENSE NEWS README.md
 %{tde_libdir}/klcddimmer_panelapplet.la
 %{tde_libdir}/klcddimmer_panelapplet.so
 %{tde_datadir}/apps/kicker/applets/klcddimmer.desktop
diff --git a/redhat/applications/kmyfirewall/kmyfirewall.spec b/redhat/applications/settings/kmyfirewall/kmyfirewall.spec
index 62580f261..857fa4f82 100644
--- a/redhat/applications/kmyfirewall/kmyfirewall.spec
+++ b/redhat/applications/settings/kmyfirewall/kmyfirewall.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kmyfirewall
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/kmyfirewall/trinity-kmyfirewall-rpmlintrc b/redhat/applications/settings/kmyfirewall/trinity-kmyfirewall-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/applications/kmyfirewall/trinity-kmyfirewall-rpmlintrc
+++ b/redhat/applications/settings/kmyfirewall/trinity-kmyfirewall-rpmlintrc
diff --git a/redhat/applications/knetworkmanager8/knetworkmanager8.spec b/redhat/applications/settings/knetworkmanager8/knetworkmanager8.spec
index 35e4bb1c7..10be14d90 100644
--- a/redhat/applications/knetworkmanager8/knetworkmanager8.spec
+++ b/redhat/applications/settings/knetworkmanager8/knetworkmanager8.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg knetworkmanager
 %define tde_prefix /opt/trinity
@@ -89,8 +89,8 @@ BuildRequires:	NetworkManager-glib-devel
 # HAL support
 BuildRequires:	hal-devel
 
-Obsoletes:		trinity-knetworkmanager < %{version}-%{release}
-Provides:		trinity-knetworkmanager = %{version}-%{release}
+Obsoletes:		trinity-knetworkmanager < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description
 KNetworkManager is a system tray applet for controlling network
@@ -119,10 +119,10 @@ connections on systems that use the NetworkManager daemon.
 %package devel
 Summary:		Common data shared among the MySQL GUI Suites
 Group:			Development/Libraries
-Requires:		%{name} = %{version}-%{release}
+Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
-Obsoletes:		trinity-knetworkmanager-devel < %{version}-%{release}
-Provides:		trinity-knetworkmanager-devel = %{version}-%{release}
+Obsoletes:		trinity-knetworkmanager-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-knetworkmanager-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description devel
 Development headers for knetworkmanager
diff --git a/redhat/applications/tde-guidance/tde-guidance.spec b/redhat/applications/settings/tde-guidance/tde-guidance.spec
index 8a27e3bd4..4d9b1bf9c 100644
--- a/redhat/applications/tde-guidance/tde-guidance.spec
+++ b/redhat/applications/settings/tde-guidance/tde-guidance.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tde-guidance
 %define tde_prefix /opt/trinity
@@ -65,7 +65,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	trinity-pytdeextensions
 BuildRequires:	trinity-libpythonize0-devel
-BuildRequires:	trinity-python-trinity
+BuildRequires:	trinity-pytde
 BuildRequires:	chrpath
 
 BuildRequires:	autoconf automake libtool m4
@@ -88,8 +88,8 @@ BuildRequires:	sip4-tqt-devel >= 4.10.5
 Requires:		sip4-tqt >= 4.10.5
 
 # PYTHON-QT support
-BuildRequires:	python-tqt-devel
-BuildRequires:	trinity-python-trinity-devel
+BuildRequires:	pytqt-devel
+BuildRequires:	trinity-pytde-devel
 BuildRequires:	trinity-pytqt-tools
 
 # LIBXXF86VM support
@@ -104,7 +104,8 @@ BuildRequires:	libXxf86vm-devel
 #  RHEL 4: disabled
 #  RHEL 6: available in EPEL
 #  RHEL 7: available in NUX
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?suse_version}
+#  RHEL 8: available in EPEL
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
 %define with_xscreensaver 1
 
 %if 0%{?fedora} || 0%{?rhel} >= 5
@@ -134,7 +135,9 @@ BuildRequires:	%{_lib}xscrnsaver%{?mgaversion:1}-devel
 %endif
 BuildRequires:	xscreensaver
 BuildRequires:	xscreensaver-base
+%if 0%{?pclinuxos} == 0
 BuildRequires:	xscreensaver-extrusion
+%endif
 BuildRequires:	xscreensaver-gl
 %endif
 %endif
@@ -151,8 +154,8 @@ BuildRequires:	xscreensaver-gl
 BuildRequires:	%{python}
 BuildRequires:	%{python}-devel
 
-Requires:		python-tqt
-Requires:		trinity-python-trinity
+Requires:		pytqt
+Requires:		trinity-pytde
 Requires:		trinity-pytdeextensions
 %if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
 Requires:		hwdata
@@ -162,7 +165,7 @@ Requires:		%{name}-backends = %{?epoch:%{epoch}:}%{version}-%{release}
 
 # POWERMANAGER support (requires HAL)
 #define with_powermanager 1
-Obsoletes:	trinity-tde-guidance-powermanager
+Obsoletes:	trinity-tde-guidance-powermanager < %{?epoch:%{epoch}:}%{version}-%{release}
 
 Obsoletes:		trinity-guidance < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:		trinity-guidance = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -191,7 +194,6 @@ or can be run as standalone applications.
 %{tde_datadir}/apps/guidance/
 %{tde_tdeappdir}/*.desktop
 %{tde_datadir}/icons/crystalsvg/*/*/*.png
-%{tde_datadir}/icons/crystalsvg/*/*/*.svg
 %{python_sitearch}/%{name}/SMBShareSelectDialog.py*
 %{python_sitearch}/%{name}/SimpleCommandRunner.py*
 %{python_sitearch}/%{name}/fuser.py*
@@ -303,7 +305,7 @@ suspend using HAL.
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
-#export PYTHONPATH=%{python_sitearch}/python-tqt
+#export PYTHONPATH=%{python_sitearch}/pytqt
 
 # Avoids 'error: byte-compiling is disabled.' on Mandriva/Mageia
 export PYTHONDONTWRITEBYTECODE=
@@ -325,7 +327,7 @@ unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 export EXTRA_MODULE_DIR="%{python_sitearch}/%{name}"
 export SIPTQT_DIR="%{python_sitearch}/sip4_tqt"
-export PYTHONPATH="%{python_sitearch}/python-tqt"
+export PYTHONPATH="%{python_sitearch}/pytqt"
 
 # Support for 'sip4-tqt'
 export PYTHONPATH="%{python_sitearch}/sip4_tqt:${PYTHONPATH}"
diff --git a/redhat/applications/tde-guidance/trinity-tde-guidance-rpmlintrc b/redhat/applications/settings/tde-guidance/trinity-tde-guidance-rpmlintrc
index bd7a50a17..bd7a50a17 100644
--- a/redhat/applications/tde-guidance/trinity-tde-guidance-rpmlintrc
+++ b/redhat/applications/settings/tde-guidance/trinity-tde-guidance-rpmlintrc
diff --git a/redhat/applications/tde-systemsettings/tde-settings-laptops.directory b/redhat/applications/settings/tde-systemsettings/tde-settings-laptops.directory
index d37d9ba13..d37d9ba13 100644
--- a/redhat/applications/tde-systemsettings/tde-settings-laptops.directory
+++ b/redhat/applications/settings/tde-systemsettings/tde-settings-laptops.directory
diff --git a/redhat/applications/tde-systemsettings/tde-systemsettings.spec b/redhat/applications/settings/tde-systemsettings/tde-systemsettings.spec
index c34b5db25..4156d4ee7 100644
--- a/redhat/applications/tde-systemsettings/tde-systemsettings.spec
+++ b/redhat/applications/settings/tde-systemsettings/tde-systemsettings.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tde-systemsettings
 %define tde_prefix /opt/trinity
@@ -69,7 +69,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -84,7 +84,9 @@ BuildRequires:	update-desktop-files
 BuildRequires:	brp-check-trinity
 %endif
 
+%if 0%{?suse_version} == 0 || 0%{?sle_version} <= 150300
 Requires:		trinity-guidance
+%endif
 
 
 %description
@@ -102,42 +104,47 @@ Control Centre with an improved user interface.
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/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}"
-export kde_confdir="%{tde_confdir}"
-
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --sysconfdir=%{tde_sysconfdir} \
-  --mandir=%{tde_mandir} \
-  --program-prefix="" \
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+# Warning: GCC visibility causes FTBFS [Bug #1285]
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  -DSYSCONF_INSTALL_DIR="/etc/trinity" \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
+  -DWITH_ALL_OPTIONS=ON \
+  -DBUILD_ALL=ON \
+  ..
 
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
 
 
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
 
 %__install -D -m 644 %{SOURCE1} %{buildroot}%{tde_datadir}/desktop-directories/tde-settings-laptops.directory
 
@@ -168,7 +175,7 @@ done
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc README TODO
+%doc README.md TODO
 %dir %{tde_sysconfdir}/xdg
 %dir %{tde_sysconfdir}/xdg/menus
 %dir %{tde_sysconfdir}/xdg/menus/applications-merged
@@ -184,7 +191,7 @@ done
 %config(noreplace) %{tde_confdir}/systemsettingsrc
 %{tde_datadir}/desktop-directories/*.directory
 %{tde_datadir}/icons/crystalsvg/*/apps/systemsettings.png
-%{tde_tdedocdir}/HTML/en/systemsettings/
+%{tde_tdedocdir}/HTML/en/tde-systemsettings/
 %{tde_mandir}/man1/systemsettings.1*
 
 %changelog
diff --git a/redhat/applications/tdenetworkmanager/tdenetworkmanager.spec b/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec
index ec951f116..78979984e 100644
--- a/redhat/applications/tdenetworkmanager/tdenetworkmanager.spec
+++ b/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tdenetworkmanager
 %define tde_prefix /opt/trinity
@@ -62,7 +62,8 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	cmake libtool
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires: libtool
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -77,8 +78,8 @@ BuildRequires:	update-desktop-files
 BuildRequires:	brp-check-trinity
 %endif
 
-Obsoletes:		trinity-knetworkmanager < %{version}-%{release}
-Provides:		trinity-knetworkmanager = %{version}-%{release}
+Obsoletes:		trinity-knetworkmanager < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release}
 
 # NETWORKMANAGER support
 %if 0%{?rhel} || 0%{?fedora}
@@ -135,7 +136,7 @@ BuildRequires:	libidn-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gamin 1
 BuildRequires:	gamin-devel
 %endif
@@ -179,7 +180,7 @@ fi
 %package devel
 Summary:		Common data shared among the MySQL GUI Suites
 Group:			Development/Libraries
-Requires:		%{name} = %{version}-%{release}
+Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description devel
 Development headers for tdenetworkmanager
@@ -218,6 +219,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/tdenetworkmanager/trinity-tdenetworkmanager-rpmlintrc b/redhat/applications/settings/tdenetworkmanager/trinity-tdenetworkmanager-rpmlintrc
index 8668d5e81..8668d5e81 100644
--- a/redhat/applications/tdenetworkmanager/trinity-tdenetworkmanager-rpmlintrc
+++ b/redhat/applications/settings/tdenetworkmanager/trinity-tdenetworkmanager-rpmlintrc
diff --git a/redhat/applications/tdesudo/tdesudo.spec b/redhat/applications/settings/tdesudo/tdesudo.spec
index 2ead68733..0b68294f0 100644
--- a/redhat/applications/tdesudo/tdesudo.spec
+++ b/redhat/applications/settings/tdesudo/tdesudo.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tdesudo
 %define tde_prefix /opt/trinity
@@ -60,7 +60,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -84,8 +84,8 @@ BuildRequires:	update-desktop-files
 BuildRequires:	brp-check-trinity
 %endif
 
-Obsoletes:	trinity-kdesudo < %{version}-%{release}
-Provides:	trinity-kdesudo = %{version}-%{release}
+Obsoletes:	trinity-kdesudo < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdesudo = %{?epoch:%{epoch}:}%{version}-%{release}
 
 Requires:		sudo
 
@@ -123,6 +123,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/wlassistant/wlassistant.spec b/redhat/applications/settings/wlassistant/wlassistant.spec
index 9aeca6cf9..3ea4d2209 100644
--- a/redhat/applications/wlassistant/wlassistant.spec
+++ b/redhat/applications/settings/wlassistant/wlassistant.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg wlassistant
 %define tde_prefix /opt/trinity
@@ -61,7 +61,8 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	cmake libtool
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires: libtool
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -95,19 +96,24 @@ BuildRequires:	libidn-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gamin 1
 BuildRequires:	gamin-devel
 %endif
 
 # PYTHON support
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
+%if 0%{?sle_version} >= 150400 || 0%{?rhel} >= 9
+%define python python3
+%define __python %__python3
+%else
+%if 0%{?rhel} == 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
 %global python python2
 %global __python %__python2
 %global python_sitearch %{python2_sitearch}
 %else
 %global python python
 %endif
+%endif
 %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 BuildRequires:	%{python}
 BuildRequires:	%{python}-devel
@@ -156,6 +162,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -165,7 +172,7 @@ fi
   -DLIB_INSTALL_DIR=%{tde_libdir} \
   -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
   \
-  -DBUILD_ALL=on \
+  -DBUILD_ALL=ON \
   ..
 
 %__make %{?_smp_mflags}
diff --git a/redhat/applications/adept/adept.spec b/redhat/applications/system/adept/adept.spec
index 89d0a117c..ca5c2f430 100644
--- a/redhat/applications/adept/adept.spec
+++ b/redhat/applications/system/adept/adept.spec
@@ -18,7 +18,7 @@
 # Default version for this component
 %define tde_pkg adept
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 
 # TDE specific building variables
diff --git a/redhat/applications/dolphin/dolphin.spec b/redhat/applications/system/dolphin/dolphin.spec
index 91bfe0907..bfa6d1910 100644
--- a/redhat/applications/dolphin/dolphin.spec
+++ b/redhat/applications/system/dolphin/dolphin.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg dolphin
 %define tde_prefix /opt/trinity
@@ -62,7 +62,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -119,6 +119,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/katapult/katapult.spec b/redhat/applications/system/katapult/katapult.spec
index 286141d4a..c1c1f2019 100644
--- a/redhat/applications/katapult/katapult.spec
+++ b/redhat/applications/system/katapult/katapult.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg katapult
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -120,6 +120,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/kbfx/kbfx.spec b/redhat/applications/system/kbfx/kbfx.spec
index f813a56e9..909a33b8f 100644
--- a/redhat/applications/kbfx/kbfx.spec
+++ b/redhat/applications/system/kbfx/kbfx.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kbfx
 %define tde_prefix /opt/trinity
@@ -62,7 +62,8 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake libtool
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires: libtool
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -81,7 +82,7 @@ BuildRequires:	libidn-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gamin 1
 BuildRequires:	gamin-devel
 %endif
@@ -146,6 +147,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/kcmautostart/kcmautostart.spec b/redhat/applications/system/kcmautostart/kcmautostart.spec
index 94dcd89fe..15702bf19 100644
--- a/redhat/applications/kcmautostart/kcmautostart.spec
+++ b/redhat/applications/system/kcmautostart/kcmautostart.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kcmautostart
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -119,6 +119,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -152,7 +153,7 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %files -f autostart.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING INSTALL README
+%doc AUTHORS ChangeLog COPYING INSTALL README.md
 %{tde_tdelibdir}/kcm_autostart.la
 %{tde_tdelibdir}/kcm_autostart.so
 %{tde_tdeappdir}/autostart.desktop
diff --git a/redhat/applications/kdbusnotification/kdbusnotification.spec b/redhat/applications/system/kdbusnotification/kdbusnotification.spec
index de2de11db..a919a36aa 100644
--- a/redhat/applications/kdbusnotification/kdbusnotification.spec
+++ b/redhat/applications/system/kdbusnotification/kdbusnotification.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kdbusnotification
 %define tde_prefix /opt/trinity
@@ -59,7 +59,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -133,6 +133,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/system/klamav/klamav.spec b/redhat/applications/system/klamav/klamav.spec
new file mode 100644
index 000000000..98c891c6a
--- /dev/null
+++ b/redhat/applications/system/klamav/klamav.spec
@@ -0,0 +1,151 @@
+#
+# spec file for package klamav (version R14)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg klamav
+%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_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
+
+
+Name:			trinity-%{tde_pkg}
+Summary:        Frontend for clamav
+Version:		0.46
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+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:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+
+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
+
+# CLAMAV support
+BuildRequires:  clamav
+BuildRequires:  clamav-devel
+Requires:		clamav
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+
+%description
+A TDE front-end for the Clam AntiVirus antivirus toolkit.
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DBUILD_ALL=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+chmod u+r %{buildroot}%{tde_bindir}/ScanWithKlamAV
+
+%find_lang %{tde_pkg}
+
+
+%clean
+%__rm -rf %{buildroot}
+	
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%attr(111,root,root) %{tde_bindir}/ScanWithKlamAV
+%{tde_bindir}/klamav
+%{tde_bindir}/klammail
+%{tde_tdeappdir}/klamav.desktop
+%{tde_datadir}/apps/klamav/
+%{tde_datadir}/apps/konqueror/servicemenus/klamav-dropdown.desktop
+%{tde_tdedocdir}/HTML/en/klamav/
+%{tde_datadir}/icons/hicolor/32x32/apps/klamav.png
+%{tde_datadir}/icons/hicolor/48x48/apps/klamav.png
+
+
+%changelog
diff --git a/redhat/applications/knemo/knemo.spec b/redhat/applications/system/knemo/knemo.spec
index a46492eaa..b8c152a97 100644
--- a/redhat/applications/knemo/knemo.spec
+++ b/redhat/applications/system/knemo/knemo.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg knemo
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -98,6 +98,7 @@ BuildRequires:	libidn-devel
 BuildRequires:	openssl-devel
 
 # Wireless support
+%define with_wifi 1
 %if 0%{?fedora} >= 6 || 0%{?rhel} >= 5
 BuildRequires: wireless-tools-devel
 %endif
@@ -150,6 +151,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -159,6 +161,7 @@ fi
   -DLIB_INSTALL_DIR="%{tde_libdir}" \
   \
   -DWITH_ALL_OPTIONS=ON \
+  %{!?with_wifi:-DWITH_LIBIW=OFF} \
   -DWITH_GCC_VISIBILITY=ON \
   \
   -DBUILD_ALL=ON \
diff --git a/redhat/applications/knetload/knetload.spec b/redhat/applications/system/knetload/knetload.spec
index 27842130e..cba84df2b 100644
--- a/redhat/applications/knetload/knetload.spec
+++ b/redhat/applications/system/knetload/knetload.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg knetload
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -124,6 +124,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/knetstats/knetstats.spec b/redhat/applications/system/knetstats/knetstats.spec
index a87b7ba2c..6d873bc4c 100644
--- a/redhat/applications/knetstats/knetstats.spec
+++ b/redhat/applications/system/knetstats/knetstats.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg knetstats
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -119,6 +119,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/kooldock/kooldock.spec b/redhat/applications/system/kooldock/kooldock.spec
index 99e783355..679eb263b 100644
--- a/redhat/applications/kooldock/kooldock.spec
+++ b/redhat/applications/system/kooldock/kooldock.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kooldock
 %define tde_prefix /opt/trinity
@@ -62,7 +62,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -128,6 +128,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/kpowersave/kpowersave.spec b/redhat/applications/system/kpowersave/kpowersave.spec
index e14bc569f..b5aec8ecc 100644
--- a/redhat/applications/kpowersave/kpowersave.spec
+++ b/redhat/applications/system/kpowersave/kpowersave.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kpowersave
 %define tde_prefix /opt/trinity
@@ -63,7 +63,8 @@ BuildRequires:	desktop-file-utils
 BuildRequires:	hal-devel
 BuildRequires:	trinity-dbus-tqt-devel >= 1:0.63
 
-BuildRequires:	cmake libtool
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires: libtool
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -82,7 +83,8 @@ BuildRequires:	brp-check-trinity
 #  RHEL 4: disabled
 #  RHEL 6: available in EPEL
 #  RHEL 7: available in NUX
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?suse_version}
+#  RHEL 8: available in EPEL
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
 %define with_xscreensaver 1
 
 %if 0%{?fedora} || 0%{?rhel} >= 5
@@ -165,6 +167,7 @@ cd build
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -192,7 +195,7 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%doc AUTHORS ChangeLog COPYING NEWS README.md TODO
 %{tde_bindir}/kpowersave
 %{tde_libdir}/libtdeinit_kpowersave.la
 %{tde_libdir}/libtdeinit_kpowersave.so
diff --git a/redhat/applications/krusader/krusader.spec b/redhat/applications/system/krusader/krusader.spec
index 1bcf8ce5b..25c9ff32e 100644
--- a/redhat/applications/krusader/krusader.spec
+++ b/redhat/applications/system/krusader/krusader.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg krusader
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/kshutdown/kshutdown.spec b/redhat/applications/system/kshutdown/kshutdown.spec
index 8d34aed67..c7c463346 100644
--- a/redhat/applications/kshutdown/kshutdown.spec
+++ b/redhat/applications/system/kshutdown/kshutdown.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kshutdown
 %define tde_prefix /opt/trinity
@@ -60,7 +60,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -125,6 +125,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -163,7 +164,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kshutdown.desktop"
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README
+%doc AUTHORS ChangeLog COPYING README.md
 %{tde_bindir}/kshutdown
 %{tde_tdelibdir}/kshutdownlockout_panelapplet.la
 %{tde_tdelibdir}/kshutdownlockout_panelapplet.so
diff --git a/redhat/applications/ksystemlog/ksystemlog.spec b/redhat/applications/system/ksystemlog/ksystemlog.spec
index 52b4b5b27..e7d443300 100644
--- a/redhat/applications/ksystemlog/ksystemlog.spec
+++ b/redhat/applications/system/ksystemlog/ksystemlog.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg ksystemlog
 %define tde_prefix /opt/trinity
@@ -60,7 +60,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -97,39 +97,46 @@ quickly see problems occuring on their server.
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/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} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+# Warning: GCC visibility causes FTBFS [Bug #1285]
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DBUILD_ALL=ON \
+  ..
 
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
 
 
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
 
 # Missing category will make this fail.
 echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
@@ -143,7 +150,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README
+%doc AUTHORS COPYING README.md
 %{tde_bindir}/ksystemlog
 %{tde_tdeappdir}/ksystemlog.desktop
 %{tde_datadir}/apps/ksystemlog/
@@ -151,5 +158,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
 %{tde_datadir}/icons/hicolor/*/apps/ksystemlog.png
 %{tde_datadir}/icons/hicolor/*/apps/ksystemlog.svgz
 %{tde_tdedocdir}/HTML/en/ksystemlog/
+%{tde_mandir}/man1/ksystemlog.1*
+
 
 %changelog
diff --git a/redhat/applications/kvkbd/kvkbd.spec b/redhat/applications/system/kvkbd/kvkbd.spec
index 26d803011..c5f3283ff 100644
--- a/redhat/applications/kvkbd/kvkbd.spec
+++ b/redhat/applications/system/kvkbd/kvkbd.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kvkbd
 %define tde_prefix /opt/trinity
@@ -60,7 +60,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -118,6 +118,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -157,7 +158,7 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README
+%doc AUTHORS COPYING README.md
 %{tde_bindir}/kvkbd
 %{tde_tdeappdir}/kvkbd.desktop
 %{tde_datadir}/apps/kvkbd/
diff --git a/redhat/applications/system/polkit-agent-tde/polkit-agent-tde.spec b/redhat/applications/system/polkit-agent-tde/polkit-agent-tde.spec
new file mode 100644
index 000000000..a2b1220c7
--- /dev/null
+++ b/redhat/applications/system/polkit-agent-tde/polkit-agent-tde.spec
@@ -0,0 +1,132 @@
+#
+# spec file for package polkit-agent-tde (version R14)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# TDE variables
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg polkit-agent-tde
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
+%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/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Version:	0.99.1
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	TDE dialogs for PolicyKit
+Group:		Environment/Desktop
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	libpolkit-tqt-devel
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	libtool
+
+%description
+PolicyKit is an application-level toolkit for defining and handling the policy
+that allows unprivileged processes to speak to privileged processes.
+
+It is a framework for centralizing the decision making process with respect to
+granting access to privileged operations for unprivileged (desktop) applications.
+
+PolicyKit-agent-tde provides a D-Bus session bus service that is used to
+bring up authentication dialogs used for obtaining privileges.
+
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DBUILD_ALL=ON \
+  -DWITH_ALL_OPTIONS=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+%find_lang %{tde_pkg}
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%{_bindir}/polkit-agent-tde
+%dir %{_datadir}/autostart
+%{_datadir}/autostart/polkit-agent-tde.desktop
+
+
+%changelog
diff --git a/redhat/applications/smartcardauth/smartcardauth.spec b/redhat/applications/system/smartcardauth/smartcardauth.spec
index 6f440a1d9..e001dfcd3 100644
--- a/redhat/applications/smartcardauth/smartcardauth.spec
+++ b/redhat/applications/system/smartcardauth/smartcardauth.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg smartcardauth
 %define tde_prefix /opt/trinity
@@ -66,7 +66,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -173,6 +173,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
   \
diff --git a/redhat/applications/smartcardauth/trinity-smartcardauth-rpmlintrc b/redhat/applications/system/smartcardauth/trinity-smartcardauth-rpmlintrc
index 7dc0bac20..7dc0bac20 100644
--- a/redhat/applications/smartcardauth/trinity-smartcardauth-rpmlintrc
+++ b/redhat/applications/system/smartcardauth/trinity-smartcardauth-rpmlintrc
diff --git a/redhat/applications/tastymenu/tastymenu.spec b/redhat/applications/system/tastymenu/tastymenu.spec
index 4ed1ff0c7..5e5c75ba8 100644
--- a/redhat/applications/tastymenu/tastymenu.spec
+++ b/redhat/applications/system/tastymenu/tastymenu.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tastymenu
 %define tde_prefix /opt/trinity
@@ -62,7 +62,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -117,6 +117,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/tdedocker/tdedocker.spec b/redhat/applications/system/tdedocker/tdedocker.spec
index 61697f190..5812749bf 100644
--- a/redhat/applications/tdedocker/tdedocker.spec
+++ b/redhat/applications/system/tdedocker/tdedocker.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tdedocker
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -146,6 +146,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/tdepowersave/tdepowersave.spec b/redhat/applications/system/tdepowersave/tdepowersave.spec
index 436090fee..296de3b4c 100644
--- a/redhat/applications/tdepowersave/tdepowersave.spec
+++ b/redhat/applications/system/tdepowersave/tdepowersave.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tdepowersave
 %define tde_prefix /opt/trinity
@@ -63,7 +63,8 @@ BuildRequires:	desktop-file-utils
 BuildRequires:	libdbus-tqt-1-devel >= %{tde_epoch}:0.63
 BuildRequires:	libdbus-1-tqt-devel >= %{tde_epoch}:0.9
 
-BuildRequires:	cmake libtool
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires: libtool
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -86,7 +87,8 @@ BuildRequires:	libudev-devel
 
 # XSCREENSAVER support
 #  Disabled on RHEL4
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?suse_version}
+#  RHEL 8: available in EPEL
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
 %define with_xscreensaver 1
 %if 0%{?rhel} == 5
 BuildRequires:	xorg-x11-proto-devel
@@ -115,7 +117,7 @@ BuildRequires:	libidn-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gamin 1
 BuildRequires:	gamin-devel
 %endif
@@ -124,8 +126,8 @@ BuildRequires:	gamin-devel
 BuildRequires:	openssl-devel
 
 
-Obsoletes:		trinity-kpowersave < %{version}-%{release}
-Provides:		trinity-kpowersave = %{version}-%{release}
+Obsoletes:		trinity-kpowersave < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kpowersave = %{?epoch:%{epoch}:}%{version}-%{release}
 
 
 %description
@@ -186,6 +188,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -230,7 +233,7 @@ fi
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%doc AUTHORS ChangeLog COPYING TODO
 %{tde_bindir}/tdepowersave
 %{tde_libdir}/libtdeinit_tdepowersave.la
 %{tde_libdir}/libtdeinit_tdepowersave.so
diff --git a/redhat/applications/system/tdesshaskpass/tdesshaskpass.spec b/redhat/applications/system/tdesshaskpass/tdesshaskpass.spec
new file mode 100644
index 000000000..93c72ba6f
--- /dev/null
+++ b/redhat/applications/system/tdesshaskpass/tdesshaskpass.spec
@@ -0,0 +1,160 @@
+#
+# spec file for package tdesshaskpass (version R14)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg tdesshaskpass
+%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/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.4.1
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	interactively prompt users for a passphrase for ssh-add
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+%if 0%{?sle_version} >= 150200
+Requires:		openssh
+%else
+Requires:		openssh-clients
+%endif
+
+%description
+A TDE version of ssh-askpass with TDEWallet support.
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+  -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
+  -DLIB_INSTALL_DIR="%{tde_libdir}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DBUILD_ALL=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_TRANSLATIONS=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%doc ChangeLog COPYING README.md
+%{tde_bindir}/*
+%{tde_mandir}/man1/*.1*
+
+
+%changelog
diff --git a/redhat/applications/yakuake/yakuake.spec b/redhat/applications/system/yakuake/yakuake.spec
index c52be4cde..849b49201 100644
--- a/redhat/applications/yakuake/yakuake.spec
+++ b/redhat/applications/system/yakuake/yakuake.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg yakuake
 %define tde_prefix /opt/trinity
@@ -60,7 +60,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -115,6 +115,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/tdeio/tdeio-appinfo/tdeio-appinfo.spec b/redhat/applications/tdeio/tdeio-appinfo/tdeio-appinfo.spec
new file mode 100644
index 000000000..1fecbfec7
--- /dev/null
+++ b/redhat/applications/tdeio/tdeio-appinfo/tdeio-appinfo.spec
@@ -0,0 +1,160 @@
+#
+# spec file for package tdeio-appinfo (version R14)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg tdeio-appinfo
+%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/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.3
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	TDEIO slave for the appinfo protocol
+Group:		Productivity/Networking/Ftp/Clients
+URL:		http://lukeplant.me.uk/kio-appinfo/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
+%description
+Adds support for the "appinfo:" protocol
+to Konqueror and other TDE applications.
+.
+This enables you to perform appinfo: searches in TDE.
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+  -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
+  -DLIB_INSTALL_DIR="%{tde_libdir}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DBUILD_ALL=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_TRANSLATIONS=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+%__rm -rf %{?buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+
+%clean
+%__rm -rf %{?buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING README.md
+%{tde_tdelibdir}/tdeio_appinfo.la
+%{tde_tdelibdir}/tdeio_appinfo.so
+%{tde_datadir}/services/appinfo.protocol
+
+
+%changelog
diff --git a/redhat/applications/tdeio-apt/tdeio-apt.spec b/redhat/applications/tdeio/tdeio-apt/tdeio-apt.spec
index 547abe0ab..21e330cf7 100644
--- a/redhat/applications/tdeio-apt/tdeio-apt.spec
+++ b/redhat/applications/tdeio/tdeio-apt/tdeio-apt.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tdeio-apt
 %define tde_prefix /opt/trinity
@@ -60,7 +60,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -118,6 +118,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -141,14 +142,14 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot} -C build
 
-%find_lang %{tde_pkg}
+%find_lang tdeio_apt
 
 
 %clean
 %__rm -rf %{buildroot}
 
 
-%files -f %{tde_pkg}.lang
+%files -f tdeio_apt.lang
 %defattr(-,root,root,-)
 %doc AUTHORS CHANGELOG ChangeLog COPYING
 %{tde_tdelibdir}/tdeio_apt.la
diff --git a/redhat/applications/tdeio-ftps/tdeio-ftps.spec b/redhat/applications/tdeio/tdeio-ftps/tdeio-ftps.spec
index 6a1b7e55e..c8e84f7e9 100644
--- a/redhat/applications/tdeio-ftps/tdeio-ftps.spec
+++ b/redhat/applications/tdeio/tdeio-ftps/tdeio-ftps.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tdeio-ftps
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -85,8 +85,8 @@ BuildRequires:	update-desktop-files
 BuildRequires:	brp-check-trinity
 %endif
 
-Obsoletes:		trinity-kio-ftps < %{version}-%{release}
-Provides:		trinity-kio-ftps < %{version}-%{release}
+Obsoletes:		trinity-kio-ftps < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kio-ftps = %{?epoch:%{epoch}:}%{version}-%{release}
 
 
 %description
@@ -121,6 +121,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -144,17 +145,17 @@ fi
 %__rm -rf %{?buildroot}
 %__make install DESTDIR=%{buildroot} -C build
 
-%find_lang %{tde_pkg}
+%find_lang tdeio_ftps
 
 
 %clean
 %__rm -rf %{?buildroot}
 
 
-%files -f %{tde_pkg}.lang
+%files -f tdeio_ftps.lang
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
-%doc README Changelog COPYING AUTHORS
+%doc README.md Changelog COPYING AUTHORS
 %{tde_tdelibdir}/tdeio_ftps.la
 %{tde_tdelibdir}/tdeio_ftps.so
 %{tde_datadir}/services/ftps.protocol
diff --git a/redhat/applications/tdeio-gopher/tdeio-gopher.spec b/redhat/applications/tdeio/tdeio-gopher/tdeio-gopher.spec
index 24a4c6847..dbef03ad3 100644
--- a/redhat/applications/tdeio-gopher/tdeio-gopher.spec
+++ b/redhat/applications/tdeio/tdeio-gopher/tdeio-gopher.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tdeio-gopher
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -72,9 +72,6 @@ BuildRequires:	libacl-devel
 # IDN support
 BuildRequires:	libidn-devel
 
-# OPENSSL support
-BuildRequires:	openssl-devel
-
 # SUSE desktop files utility
 %if 0%{?suse_version}
 BuildRequires:	update-desktop-files
@@ -85,9 +82,6 @@ BuildRequires:	update-desktop-files
 BuildRequires:	brp-check-trinity
 %endif
 
-Obsoletes:		trinity-kio-gopher < %{version}-%{release}
-Provides:		trinity-kio-gopher < %{version}-%{release}
-
 
 %description
 Adds support for the "gopher:" protocol
@@ -123,6 +117,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -146,40 +141,41 @@ fi
 %__rm -rf %{?buildroot}
 %__make install DESTDIR=%{buildroot} -C build
 
-%find_lang %{tde_pkg}
+%find_lang tdeio_gopher
 
 
 %clean
 %__rm -rf %{?buildroot}
 
 
-%files -f %{tde_pkg}.lang
+%files -f tdeio_gopher.lang
 %defattr(-,root,root,-)
 %doc ChangeLog COPYING FAQ README VERSION
 %{tde_tdelibdir}/tdeio_gopher.la
 %{tde_tdelibdir}/tdeio_gopher.so
 %{tde_datadir}/services/gopher.protocol
-%lang(ca) %{tde_tdedocdir}/HTML/ca/tdeio-gopher/
-%lang(da) %{tde_tdedocdir}/HTML/da/tdeio-gopher/
-%lang(de) %{tde_tdedocdir}/HTML/de/tdeio-gopher/
-%lang(en) %{tde_tdedocdir}/HTML/en/tdeioslave/gopher/
-%lang(en_GB) %{tde_tdedocdir}/HTML/en_GB/tdeio-gopher/
-%lang(es) %{tde_tdedocdir}/HTML/es/tdeio-gopher/
-%lang(et) %{tde_tdedocdir}/HTML/et/tdeio-gopher/
-%lang(fr) %{tde_tdedocdir}/HTML/fr/tdeio-gopher/
-%lang(gl) %{tde_tdedocdir}/HTML/gl/tdeio-gopher/
-%lang(hu) %{tde_tdedocdir}/HTML/hu/tdeio-gopher/
-%lang(it) %{tde_tdedocdir}/HTML/it/tdeio-gopher/
-%lang(nl) %{tde_tdedocdir}/HTML/nl/tdeio-gopher/
-%lang(pl) %{tde_tdedocdir}/HTML/pl/tdeio-gopher/
-%lang(pt) %{tde_tdedocdir}/HTML/pt/tdeio-gopher/
-%lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/tdeio-gopher/
-%lang(ro) %{tde_tdedocdir}/HTML/ro/tdeio-gopher/
-%lang(ru) %{tde_tdedocdir}/HTML/ru/tdeio-gopher/
-%lang(sr) %{tde_tdedocdir}/HTML/sr/tdeio-gopher/
-%lang(sr@Latn) %{tde_tdedocdir}/HTML/sr@Latn/tdeio-gopher/
-%lang(sv) %{tde_tdedocdir}/HTML/sv/tdeio-gopher/
-%lang(uk) %{tde_tdedocdir}/HTML/uk/tdeio-gopher/
+%lang(ca) %{tde_tdedocdir}/HTML/ca/tdeioslave/
+%lang(da) %{tde_tdedocdir}/HTML/da/tdeioslave/
+%lang(de) %{tde_tdedocdir}/HTML/de/tdeioslave/
+%lang(en) %{tde_tdedocdir}/HTML/en/tdeioslave/
+%lang(en_GB) %{tde_tdedocdir}/HTML/en_GB/tdeioslave/
+%lang(es) %{tde_tdedocdir}/HTML/es/tdeioslave/
+%lang(et) %{tde_tdedocdir}/HTML/et/tdeioslave/
+%lang(fr) %{tde_tdedocdir}/HTML/fr/tdeioslave/
+%lang(gl) %{tde_tdedocdir}/HTML/gl/tdeioslave/
+%lang(hu) %{tde_tdedocdir}/HTML/hu/tdeioslave/
+%lang(it) %{tde_tdedocdir}/HTML/it/tdeioslave/
+%lang(nl) %{tde_tdedocdir}/HTML/nl/tdeioslave/
+%lang(pl) %{tde_tdedocdir}/HTML/pl/tdeioslave/
+%lang(pt) %{tde_tdedocdir}/HTML/pt/tdeioslave/
+%lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/tdeioslave/
+%lang(ro) %{tde_tdedocdir}/HTML/ro/tdeioslave/
+%lang(ru) %{tde_tdedocdir}/HTML/ru/tdeioslave/
+%lang(sk) %{tde_tdedocdir}/HTML/sk/tdeioslave/
+%lang(sr) %{tde_tdedocdir}/HTML/sr/tdeioslave/
+%lang(sr@Latn) %{tde_tdedocdir}/HTML/sr@Latn/tdeioslave/
+%lang(sv) %{tde_tdedocdir}/HTML/sv/tdeioslave/
+%lang(uk) %{tde_tdedocdir}/HTML/uk/tdeioslave/
 
 
 %changelog
diff --git a/redhat/applications/tdeio-locate/tdeio-locate.spec b/redhat/applications/tdeio/tdeio-locate/tdeio-locate.spec
index 7b95bc677..5d3339de7 100644
--- a/redhat/applications/tdeio-locate/tdeio-locate.spec
+++ b/redhat/applications/tdeio/tdeio-locate/tdeio-locate.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tdeio-locate
 %define tde_prefix /opt/trinity
@@ -60,7 +60,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	libtool
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
@@ -84,7 +84,7 @@ BuildRequires:	libidn-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gamin 1
 BuildRequires:	gamin-devel
 %endif
@@ -92,8 +92,8 @@ BuildRequires:	gamin-devel
 # OPENSSL support
 BuildRequires:	openssl-devel
 
-Obsoletes:		trinity-kio-locate < %{version}-%{release}
-Provides:		trinity-kio-locate = %{version}-%{release}
+Obsoletes:		trinity-kio-locate < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kio-locate = %{?epoch:%{epoch}:}%{version}-%{release}
 
 
 %description
@@ -133,6 +133,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -155,19 +156,20 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot} -C build
 
-%find_lang %{tde_pkg}
+%find_lang tdeio_locate
+
 
 %clean
 %__rm -rf %{buildroot}
 
 
 
-%files -f %{tde_pkg}.lang
+%files -f tdeio_locate.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING TODO
 %{tde_tdelibdir}/tdeio_locate.la
 %{tde_tdelibdir}/tdeio_locate.so
-%{tde_tdedocdir}/HTML/en/tdeio-locate/
+%{tde_tdedocdir}/HTML/en/tdeioslave/locate/
 %{tde_datadir}/services/locate.protocol
 %{tde_datadir}/services/locater.protocol
 %{tde_datadir}/services/rlocate.protocol
diff --git a/redhat/applications/tdeio-sword/tdeio-sword.spec b/redhat/applications/tdeio/tdeio-sword/tdeio-sword.spec
index 3986a87ce..6d0ca5158 100644
--- a/redhat/applications/tdeio-sword/tdeio-sword.spec
+++ b/redhat/applications/tdeio/tdeio-sword/tdeio-sword.spec
@@ -23,7 +23,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tdeio-sword
 %define tde_prefix /opt/trinity
@@ -66,7 +66,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -131,6 +131,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -154,20 +155,20 @@ fi
 %__rm -rf %{?buildroot}
 %__make install DESTDIR=%{buildroot} -C build
 
-%find_lang %{tde_pkg}
+%find_lang tdeio_sword
 
 
 %clean
 %__rm -rf %{?buildroot}
 
 
-%files -f %{tde_pkg}.lang
+%files -f tdeio_sword.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
+%doc AUTHORS ChangeLog COPYING README.md TODO
 %{tde_tdelibdir}/tdeio_sword.la
 %{tde_tdelibdir}/tdeio_sword.so
 %{tde_datadir}/apps/tdeio_sword/
-%{tde_tdedocdir}/HTML/en/tdeio_sword/
+%{tde_tdedocdir}/HTML/en/tdeioslave/sword/
 %{tde_datadir}/icons/hicolor/*/apps/tdeio_sword.png
 %{tde_datadir}/icons/hicolor/scalable/apps/tdeio_sword.svgz
 %{tde_datadir}/services/sword.protocol
diff --git a/redhat/applications/tdeio-umountwrapper/media_safelyremove.desktop b/redhat/applications/tdeio/tdeio-umountwrapper/media_safelyremove.desktop
index 22b716ad5..22b716ad5 100644
--- a/redhat/applications/tdeio-umountwrapper/media_safelyremove.desktop
+++ b/redhat/applications/tdeio/tdeio-umountwrapper/media_safelyremove.desktop
diff --git a/redhat/applications/tdeio-umountwrapper/media_safelyremove.desktop_tdeio b/redhat/applications/tdeio/tdeio-umountwrapper/media_safelyremove.desktop_tdeio
index 38fa25d92..38fa25d92 100644
--- a/redhat/applications/tdeio-umountwrapper/media_safelyremove.desktop_tdeio
+++ b/redhat/applications/tdeio/tdeio-umountwrapper/media_safelyremove.desktop_tdeio
diff --git a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper.spec b/redhat/applications/tdeio/tdeio-umountwrapper/tdeio-umountwrapper.spec
index 146dbd2c9..cfd75c0a6 100644
--- a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper.spec
+++ b/redhat/applications/tdeio/tdeio-umountwrapper/tdeio-umountwrapper.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tdeio-umountwrapper
 %define tde_prefix /opt/trinity
@@ -62,10 +62,10 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-Obsoletes:		trinity-kio-umountwrapper < %{version}-%{release}
-Provides:		trinity-kio-umountwrapper = %{version}-%{release}
+Obsoletes:		trinity-kio-umountwrapper < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kio-umountwrapper = %{?epoch:%{epoch}:}%{version}-%{release}
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -123,6 +123,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -179,7 +180,7 @@ fi
 
 %files -f tdeio_umountwrapper.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README
+%doc AUTHORS COPYING README.md
 %{tde_bindir}/tdeio_umountwrapper
 %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdeio-umountwrapper
 %dir %{tde_datadir}/apps/d3lphin
diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine.spec b/redhat/applications/themes/gtk-qt-engine/gtk-qt-engine.spec
index 64d3d96a2..8c42846fb 100644
--- a/redhat/applications/gtk-qt-engine/gtk-qt-engine.spec
+++ b/redhat/applications/themes/gtk-qt-engine/gtk-qt-engine.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg gtk-qt-engine
 %define tde_prefix /opt/trinity
@@ -56,9 +56,6 @@ Prefix:			%{_prefix}
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Source1:		gtk-qt-engine.rc.sh
-Source2:		gtkrc-2.0-kde4
-Source3:		gtkrc-2.0-kde-kde4
 
 
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
@@ -66,7 +63,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
-BuildRequires:	cmake
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -136,6 +133,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -154,29 +152,20 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot} -C build
 
-%find_lang gtkqtengine
-
-# Adds TDE's specific GTKRC
-%__install -D -m 644 "%{SOURCE1}" "%{buildroot}%{tde_datadir}/apps/kgtk/gtk-qt-engine.rc.sh"
-%__install -D -m 644 "%{SOURCE2}" "%{buildroot}%{tde_datadir}/apps/kgtk/.gtkrc-2.0-kde4"
-%__install -D -m 644 "%{SOURCE3}" "%{buildroot}%{tde_datadir}/apps/kgtk/.gtkrc-2.0-kde-kde4"
+%find_lang %{tde_pkg}
 
 
 %clean
 %__rm -rf %{buildroot}
 
 
-%files -f gtkqtengine.lang
+%files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%doc AUTHORS ChangeLog COPYING TODO
 %{tde_tdelibdir}/kcm_kcmgtk.la
 %{tde_tdelibdir}/kcm_kcmgtk.so
-%{tde_appdir}/kcmgtk.desktop
-%dir %{tde_datadir}/apps/kgtk
-%{tde_datadir}/apps/kgtk/gtk-qt-engine.rc.sh
-%{tde_datadir}/apps/kgtk/.gtkrc-2.0-kde4
-%{tde_datadir}/apps/kgtk/.gtkrc-2.0-kde-kde4
-%{tde_tdedocdir}/HTML/en/kcmgtk/
+%{tde_tdeappdir}/kcmgtk.desktop
+%{tde_tdedocdir}/HTML/en/kcontrol/gtk/
 
 # The following files are outside TDE's directory
 %dir %{_libdir}/gtk-2.0
diff --git a/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine.spec b/redhat/applications/themes/gtk3-tqt-engine/gtk3-tqt-engine.spec
index 7ddacc4fc..320480e0d 100644
--- a/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine.spec
+++ b/redhat/applications/themes/gtk3-tqt-engine/gtk3-tqt-engine.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg gtk3-tqt-engine
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/kgtk-qt3/kgtk-qt3.spec b/redhat/applications/themes/kgtk-qt3/kgtk-qt3.spec
index e86166a02..ec3311356 100644
--- a/redhat/applications/kgtk-qt3/kgtk-qt3.spec
+++ b/redhat/applications/themes/kgtk-qt3/kgtk-qt3.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kgtk-qt3
 %define tde_prefix /opt/trinity
@@ -62,7 +62,8 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	cmake libtool
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires: libtool
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -88,7 +89,7 @@ BuildRequires:	gtk+2.0-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gamin 1
 BuildRequires:	gamin-devel
 %endif
@@ -138,6 +139,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin.spec b/redhat/applications/themes/ksplash-engine-moodin/ksplash-engine-moodin.spec
index fecce0c55..be7398d7d 100644
--- a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin.spec
+++ b/redhat/applications/themes/ksplash-engine-moodin/ksplash-engine-moodin.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg ksplash-engine-moodin
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -129,6 +129,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine.spec b/redhat/applications/themes/qt4-tqt-theme-engine/qt4-tqt-theme-engine.spec
index 7c0b6df57..9fdca0ed1 100644
--- a/redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine.spec
+++ b/redhat/applications/themes/qt4-tqt-theme-engine/qt4-tqt-theme-engine.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg qt4-tqt-theme-engine
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/tde-style-baghira/tde-style-baghira.spec b/redhat/applications/themes/tde-style-baghira/tde-style-baghira.spec
index 60742bff6..e9ab3d09a 100644
--- a/redhat/applications/tde-style-baghira/tde-style-baghira.spec
+++ b/redhat/applications/themes/tde-style-baghira/tde-style-baghira.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tde-style-baghira
 %define tde_prefix /opt/trinity
@@ -62,7 +62,7 @@ Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 BuildRequires:          trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:          trinity-tdebase-devel >= %{tde_version}
 
-BuildRequires:	cmake
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -102,6 +102,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -143,6 +144,7 @@ export PATH="%{tde_bindir}:${PATH}"
 %{tde_tdelibdir}/twin_baghira_config.so
 %{tde_libdir}/usermanager_panelapplet.la
 %{tde_libdir}/usermanager_panelapplet.so
+%{tde_tdeappdir}/bab.desktop
 %{tde_datadir}/apps/baghira/
 %{tde_datadir}/apps/kicker/applets/baghira-starter.desktop
 %{tde_datadir}/apps/kicker/applets/baghira-usermanager.desktop
diff --git a/redhat/applications/tde-style-domino/tde-style-domino.spec b/redhat/applications/themes/tde-style-domino/tde-style-domino.spec
index 4578ccad2..ce45f8729 100644
--- a/redhat/applications/tde-style-domino/tde-style-domino.spec
+++ b/redhat/applications/themes/tde-style-domino/tde-style-domino.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tde-style-domino
 %define tde_prefix /opt/trinity
@@ -62,7 +62,7 @@ Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 BuildRequires:          trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:          trinity-tdebase-devel >= %{tde_version}
 
-BuildRequires:	cmake
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -98,6 +98,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/tde-style-ia-ora/tde-style-ia-ora.spec b/redhat/applications/themes/tde-style-ia-ora/tde-style-ia-ora.spec
index 9c564b2af..a93f4b5d6 100644
--- a/redhat/applications/tde-style-ia-ora/tde-style-ia-ora.spec
+++ b/redhat/applications/themes/tde-style-ia-ora/tde-style-ia-ora.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tde-style-ia-ora
 %define tde_prefix /opt/trinity
@@ -60,7 +60,7 @@ Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -76,8 +76,8 @@ BuildRequires:	openssl-devel
 
 Requires:	trinity-twin
 
-Obsoletes:	trinity-style-ia-ora < %{version}-%{release}
-Provides:	trinity-style-ia-ora = %{version}-%{release}
+Obsoletes:	trinity-style-ia-ora < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-style-ia-ora = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description
 Mandriva theme for Trinity
@@ -106,6 +106,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/tde-style-lipstik/tde-style-lipstik.spec b/redhat/applications/themes/tde-style-lipstik/tde-style-lipstik.spec
index f7d335b2e..a51a4451e 100644
--- a/redhat/applications/tde-style-lipstik/tde-style-lipstik.spec
+++ b/redhat/applications/themes/tde-style-lipstik/tde-style-lipstik.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tde-style-lipstik
 %define tde_prefix /opt/trinity
@@ -56,16 +56,16 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-Obsoletes:		trinity-kde-style-lipstik < %{version}-%{release}
-Provides:		trinity-kde-style-lipstik = %{version}-%{release}
-Obsoletes:		trinity-style-lipstik < %{version}-%{release}
-Provides:		trinity-style-lipstik = %{version}-%{release}
+Obsoletes:		trinity-kde-style-lipstik < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-style-lipstik = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-style-lipstik < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-style-lipstik = %{?epoch:%{epoch}:}%{version}-%{release}
 
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -121,6 +121,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
   \
diff --git a/redhat/applications/tde-style-qtcurve/tde-style-qtcurve.spec b/redhat/applications/themes/tde-style-qtcurve/tde-style-qtcurve.spec
index 3d8e85270..bbda03969 100644
--- a/redhat/applications/tde-style-qtcurve/tde-style-qtcurve.spec
+++ b/redhat/applications/themes/tde-style-qtcurve/tde-style-qtcurve.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tde-style-qtcurve
 %define tde_prefix /opt/trinity
@@ -61,7 +61,8 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	cmake libtool
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires: libtool
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -84,7 +85,7 @@ BuildRequires:	libacl-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gamin 1
 BuildRequires:	gamin-devel
 %endif
@@ -93,10 +94,10 @@ BuildRequires:	gamin-devel
 BuildRequires:	openssl-devel
 
 
-Obsoletes:		trinity-kde-style-qtcurve < %{version}-%{release}
-Provides:		trinity-kde-style-qtcurve = %{version}-%{release}
-Obsoletes:		trinity-style-qtcurve < %{version}-%{release}
-Provides:		trinity-style-qtcurve = %{version}-%{release}
+Obsoletes:		trinity-kde-style-qtcurve < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-style-qtcurve = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-style-qtcurve < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-style-qtcurve = %{?epoch:%{epoch}:}%{version}-%{release}
 
 
 %description
@@ -146,6 +147,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/tdmtheme/tdmtheme.spec b/redhat/applications/themes/tdmtheme/tdmtheme.spec
index 81cdf3fe7..4a257ea81 100644
--- a/redhat/applications/tdmtheme/tdmtheme.spec
+++ b/redhat/applications/themes/tdmtheme/tdmtheme.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tdmtheme
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -85,8 +85,8 @@ BuildRequires:	update-desktop-files
 BuildRequires:	brp-check-trinity
 %endif
 
-Obsoletes:		trinity-kdmtheme < %{version}-%{release}
-Provides:		trinity-kdmtheme = %{version}-%{release}
+Obsoletes:		trinity-kdmtheme < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kdmtheme = %{?epoch:%{epoch}:}%{version}-%{release}
 
 
 %description
@@ -120,6 +120,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/twin-style-crystal/twin-style-crystal.spec b/redhat/applications/themes/twin-style-crystal/twin-style-crystal.spec
index 83ded3f57..7993d0589 100644
--- a/redhat/applications/twin-style-crystal/twin-style-crystal.spec
+++ b/redhat/applications/themes/twin-style-crystal/twin-style-crystal.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg twin-style-crystal
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -76,8 +76,8 @@ BuildRequires:	update-desktop-files
 BuildRequires:	brp-check-trinity
 %endif
 
-Obsoletes:	trinity-kwin-style-crystal < %{version}-%{release}
-Provides:	trinity-kwin-style-crystal = %{version}-%{release}
+Obsoletes:	trinity-kwin-style-crystal < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kwin-style-crystal = %{?epoch:%{epoch}:}%{version}-%{release}
 
 
 %description
@@ -100,40 +100,41 @@ And it is of course nice to look at. Upstream says:
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/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-gcc-visibility makes decoration unusable.
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
+  -DBUILD_ALL=ON \
+  -DWITH_ALL_OPTIONS=ON \
+  ..
 
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
 
 
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
 
 
 %clean
diff --git a/redhat/applications/themes/twin-style-dekorator/twin-style-dekorator.spec b/redhat/applications/themes/twin-style-dekorator/twin-style-dekorator.spec
new file mode 100644
index 000000000..342a881ba
--- /dev/null
+++ b/redhat/applications/themes/twin-style-dekorator/twin-style-dekorator.spec
@@ -0,0 +1,159 @@
+#
+# spec file for package twin-style-dekorator (version R14)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg twin-style-dekorator
+%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/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	1.0.5
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Semi transparant window decoration for Trinity
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
+%description
+Crystal offers you pseudo transparent titlebar, buttons and borders
+transparent, so you can see more of your lovely background image
+Transparancy and buttons can be costumized to match your wishes.
+Offers rounded corners as well
+
+And it is of course nice to look at. Upstream says:
+"- Don't forget to breathe, while drooling."
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+# Warning: GCC visibility causes FTBFS [Bug #1285]
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DBUILD_ALL=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{tde_tdelibdir}/twin3_deKorator.la
+%{tde_tdelibdir}/twin3_deKorator.so
+%{tde_tdelibdir}/twin_deKorator_config.la
+%{tde_tdelibdir}/twin_deKorator_config.so
+%{tde_datadir}/apps/deKorator/
+%{tde_datadir}/apps/twin/deKorator.desktop
+
+
+%changelog
diff --git a/redhat/applications/themes/twin-style-machbunt/twin-style-machbunt.spec b/redhat/applications/themes/twin-style-machbunt/twin-style-machbunt.spec
new file mode 100644
index 000000000..5d17ee631
--- /dev/null
+++ b/redhat/applications/themes/twin-style-machbunt/twin-style-machbunt.spec
@@ -0,0 +1,153 @@
+#
+# spec file for package twin-style-machbunt (version R14)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg twin-style-machbunt
+%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/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.1
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	TDE window decoration from SUSE 9.1/9.2
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
+%description
+This is a port of the KDE Window decoration extracted from SUSE 9.1/9.2.
+
+An example color scheme is provided too.
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+# Warning: GCC visibility causes FTBFS [Bug #1285]
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DBUILD_ALL=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{tde_tdelibdir}/twin3_MachBunt.la
+%{tde_tdelibdir}/twin3_MachBunt.so
+%{tde_datadir}/apps/tdedisplay/color-schemes/MachBunt.kcsrc
+%{tde_datadir}/apps/twin/MachBunt.desktop
+
+
+%changelog
diff --git a/redhat/applications/themes/twin-style-suse2/twin-style-suse2.spec b/redhat/applications/themes/twin-style-suse2/twin-style-suse2.spec
new file mode 100644
index 000000000..a7cb50bf4
--- /dev/null
+++ b/redhat/applications/themes/twin-style-suse2/twin-style-suse2.spec
@@ -0,0 +1,158 @@
+#
+# spec file for package twin-style-suse2 (version R14)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg twin-style-suse2
+%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/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	1.0.5
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	TDE window decoration from SUSE 9.3
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
+%description
+This is a port of the SUSE 9.3 KDE Window decoration extracted from SUSE.
+
+It features in additon to the original theme several new button
+styles and a changeable titlebar image.
+
+A color scheme for TDE is provided too.
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+  -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
+  -DLIB_INSTALL_DIR="%{tde_libdir}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  \
+  -DBUILD_ALL=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_TRANSLATIONS=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+%find_lang %{tde_pkg}
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING README TODO
+%{tde_tdelibdir}/twin3_SUSE2.la
+%{tde_tdelibdir}/twin3_SUSE2.so
+%{tde_tdelibdir}/twin_SUSE2_config.la
+%{tde_tdelibdir}/twin_SUSE2_config.so
+%{tde_datadir}/apps/tdedisplay/color-schemes/SUSE2.kcsrc
+%{tde_datadir}/apps/twin/SUSE2.desktop
+%{tde_datadir}/apps/twin/pics/SUSE2/
+
+
+%changelog
diff --git a/redhat/applications/abakus/abakus.spec b/redhat/applications/utilities/abakus/abakus.spec
index b913bc253..04c4b1aad 100644
--- a/redhat/applications/abakus/abakus.spec
+++ b/redhat/applications/utilities/abakus/abakus.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg abakus
 %define tde_prefix /opt/trinity
@@ -60,7 +60,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -75,7 +75,7 @@ BuildRequires:	libidn-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gamin 1
 BuildRequires:	gamin-devel
 %endif
@@ -131,6 +131,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -168,6 +169,7 @@ export PATH="%{tde_bindir}:${PATH}"
 %{tde_datadir}/icons/hicolor/*/apps/abakus.png
 %{tde_tdedocdir}/HTML/en/abakus/
 %{tde_tdeappdir}/abakus.desktop
+%{tde_mandir}/man1/abakus.1*
 
 
 %changelog
diff --git a/redhat/applications/filelight-l10n/filelight-l10n.spec b/redhat/applications/utilities/filelight-l10n/filelight-l10n.spec
index 1525e5eb3..1525e5eb3 100644
--- a/redhat/applications/filelight-l10n/filelight-l10n.spec
+++ b/redhat/applications/utilities/filelight-l10n/filelight-l10n.spec
diff --git a/redhat/applications/filelight/filelight.spec b/redhat/applications/utilities/filelight/filelight.spec
index 8b1766f3a..c89c62e87 100644
--- a/redhat/applications/filelight/filelight.spec
+++ b/redhat/applications/utilities/filelight/filelight.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg filelight
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -70,7 +70,7 @@ BuildRequires:	libidn-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gamin 1
 BuildRequires:	gamin-devel
 %endif
@@ -94,8 +94,8 @@ BuildRequires:	update-desktop-files
 BuildRequires:	brp-check-trinity
 %endif
 
-Obsoletes:	filelight-l10n < %{version}-%{release}
-Provides:	filelight-l10n = %{version}-%{release}
+Obsoletes:	filelight-l10n < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	filelight-l10n = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description
 Filelight creates a complex, but data-rich graphical representation of the files and
@@ -127,6 +127,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_NO_BUILTIN_CHRPATH=ON \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
diff --git a/redhat/applications/kbarcode/kbarcode.spec b/redhat/applications/utilities/kbarcode/kbarcode.spec
index fdff819b0..1fed32a1f 100644
--- a/redhat/applications/kbarcode/kbarcode.spec
+++ b/redhat/applications/utilities/kbarcode/kbarcode.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kbarcode
 %define tde_prefix /opt/trinity
@@ -64,7 +64,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -173,6 +173,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/kchmviewer/kchmviewer.spec b/redhat/applications/utilities/kchmviewer/kchmviewer.spec
index 8aa0a7c5d..148d5ec8a 100644
--- a/redhat/applications/kchmviewer/kchmviewer.spec
+++ b/redhat/applications/utilities/kchmviewer/kchmviewer.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kchmviewer
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -141,6 +141,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -192,7 +193,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kchmviewer.desktop"
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc ChangeLog COPYING FAQ README
+%doc ChangeLog COPYING FAQ README.md
 %{tde_bindir}/kchmviewer
 %{tde_tdelibdir}/tdeio_msits.la
 %{tde_tdelibdir}/tdeio_msits.so
diff --git a/redhat/applications/kcpuload/kcpuload.spec b/redhat/applications/utilities/kcpuload/kcpuload.spec
index 0f833a3d6..4b2a2340c 100644
--- a/redhat/applications/kcpuload/kcpuload.spec
+++ b/redhat/applications/utilities/kcpuload/kcpuload.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kcpuload
 %define tde_prefix /opt/trinity
@@ -62,7 +62,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -120,6 +120,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/kdirstat/kdirstat.spec b/redhat/applications/utilities/kdirstat/kdirstat.spec
index 3094078c1..dcd7f2598 100644
--- a/redhat/applications/kdirstat/kdirstat.spec
+++ b/redhat/applications/utilities/kdirstat/kdirstat.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kdirstat
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -125,6 +125,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/keep/keep.spec b/redhat/applications/utilities/keep/keep.spec
index d2714ab1a..c480e868b 100644
--- a/redhat/applications/keep/keep.spec
+++ b/redhat/applications/utilities/keep/keep.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg keep
 %define tde_prefix /opt/trinity
@@ -62,7 +62,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -124,6 +124,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/knutclient/knutclient.spec b/redhat/applications/utilities/knutclient/knutclient.spec
index 3cf793b58..d2b7c8399 100644
--- a/redhat/applications/knutclient/knutclient.spec
+++ b/redhat/applications/utilities/knutclient/knutclient.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg knutclient
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -106,7 +106,7 @@ stations using an UPS.
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
 # Fix permissions
-chmod 644 AUTHORS README COPYING ChangeLog
+chmod 644 AUTHORS README.md COPYING ChangeLog
 
 
 %build
@@ -124,6 +124,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -167,7 +168,7 @@ fi
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README
+%doc AUTHORS ChangeLog COPYING README.md
 %{tde_bindir}/knutclient
 %{tde_tdeappdir}/knutclient.desktop
 %{tde_datadir}/apps/knutclient/knutclientui.rc
diff --git a/redhat/applications/utilities/kompose/kompose.spec b/redhat/applications/utilities/kompose/kompose.spec
new file mode 100644
index 000000000..6e5f55137
--- /dev/null
+++ b/redhat/applications/utilities/kompose/kompose.spec
@@ -0,0 +1,157 @@
+#
+# spec file for package kompose (version R14)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg kompose
+%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_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
+
+
+Name:			trinity-%{tde_pkg}
+Summary:		Full-Screen Task Manager for TDE
+Version:		0.5.3
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+
+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:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	gettext
+
+# IMLIB2 support
+BuildRequires:	imlib2-devel
+
+# XCOMPOSITE support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} >= 4
+%define xcomposite_devel %{_lib}xcomposite-devel
+%else
+%define xcomposite_devel %{_lib}xcomposite%{?mgaversion:1}-devel
+%endif
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
+%define xcomposite_devel libXcomposite-devel
+%endif
+%{?xcomposite_devel:BuildRequires: %{xcomposite_devel}}
+
+# XDAMAGE support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}xdamage-devel
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
+BuildRequires:	libXdamage-devel
+%endif
+
+
+%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%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DBUILD_ALL=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+%find_lang %{tde_pkg}
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc README AUTHORS ChangeLog COPYING
+%{tde_bindir}/kompose
+%{tde_tdeappdir}/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
diff --git a/redhat/applications/krename/krename.spec b/redhat/applications/utilities/krename/krename.spec
index ed55a1b94..29f70adc8 100644
--- a/redhat/applications/krename/krename.spec
+++ b/redhat/applications/utilities/krename/krename.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg krename
 %define tde_prefix /opt/trinity
@@ -60,7 +60,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -118,6 +118,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_NO_BUILTIN_CHRPATH=ON \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
diff --git a/redhat/applications/ksensors/ksensors.spec b/redhat/applications/utilities/ksensors/ksensors.spec
index 3ac9a261a..9786d45b2 100644
--- a/redhat/applications/ksensors/ksensors.spec
+++ b/redhat/applications/utilities/ksensors/ksensors.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg ksensors
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -126,6 +126,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -163,7 +164,7 @@ fi
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING FAQ README TODO
+%doc AUTHORS ChangeLog COPYING FAQ README.md TODO
 %{tde_bindir}/ksensors
 %{tde_tdeappdir}/ksensors.desktop
 %{tde_datadir}/apps/ksensors/
diff --git a/redhat/applications/mathemagics/mathemagics.spec b/redhat/applications/utilities/mathemagics/mathemagics.spec
index c968c721b..61421491f 100644
--- a/redhat/applications/mathemagics/mathemagics.spec
+++ b/redhat/applications/utilities/mathemagics/mathemagics.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg mathemagics
 %define tde_prefix /opt/trinity
@@ -59,7 +59,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -88,6 +88,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -107,17 +108,19 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot} -C build
 
+%find_lang %{tde_pkg}
+
 
 %clean
 %__rm -rf $RPM_BUILD_ROOT
 
 
-%files
+%files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README
+%doc AUTHORS COPYING README.md
 %{tde_bindir}/mathemagics
 %{tde_tdeappdir}/mathemagics.desktop
-%{tde_datadir}/apps/mathemagics/mathemagicsui.rc
+%{tde_datadir}/apps/mathemagics/
 %{tde_datadir}/icons/hicolor/22x22/apps/mathemagics.png
 %{tde_datadir}/icons/hicolor/32x32/apps/mathemagics.png
 %{tde_datadir}/icons/hicolor/48x48/apps/mathemagics.png
diff --git a/redhat/applications/qalculate-tde/qalculate-tde.spec b/redhat/applications/utilities/qalculate-tde/qalculate-tde.spec
index 21c581105..5e690b485 100644
--- a/redhat/applications/qalculate-tde/qalculate-tde.spec
+++ b/redhat/applications/utilities/qalculate-tde/qalculate-tde.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg qalculate-tde
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -109,32 +109,33 @@ This package contains the TDE user interface of qalculate.
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
 
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
+  -DBUILD_ALL=ON \
+  -DWITH_ALL_OPTIONS=ON \
+  ..
 
 %__make %{?_smp_mflags} || %__make
 
@@ -142,7 +143,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
 
 %find_lang qalculate_tde
 
@@ -158,13 +159,13 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %files -f qalculate_tde.lang
 %defattr(-,root,root,-)
-%{tde_bindir}/qalculate
 %{tde_bindir}/qalculate-tde
 %{tde_datadir}/apps/qalculate_tde/
 %{tde_tdeappdir}/qalculate_tde.desktop
 %{tde_tdedocdir}/HTML/en/qalculate_tde/
 %{tde_datadir}/icons/hicolor/*/apps/qalculate_tde.png
 %{tde_datadir}/icons/hicolor/*/actions/qalculate_convert.png
+%{tde_mandir}/man1/qalculate-tde.1*
 
 
 %changelog
diff --git a/redhat/build/build_rpm_package.sh b/redhat/build/build_rpm_package.sh
index cb24fa6f2..4642a7298 100755
--- a/redhat/build/build_rpm_package.sh
+++ b/redhat/build/build_rpm_package.sh
@@ -1,12 +1,12 @@
 #!/bin/bash -ex
 
 # Usage: build_rpm_package.sh <TDE_PACKAGE> [TDE_VERSION]
-# Example: build_rpm_package.sh tdebase 14.0.9
+# Example: build_rpm_package.sh tdebase 14.0.13
 
 
 PKGNAME="${1%/}"
 PKGNAME="${PKGNAME##*/}"
-TDE_VERSION="${2:-${TDE_VERSION:-14.0.9}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.13}}"
 PATH="$(cd $(dirname $0); pwd):${PATH}"
 
 SPECFILE=$(get_specfile.sh ${PKGNAME} ${TDE_VERSION})
diff --git a/redhat/build/configure_repository.sh b/redhat/build/configure_repository.sh
index 6168948af..4dc708a6a 100755
--- a/redhat/build/configure_repository.sh
+++ b/redhat/build/configure_repository.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -x
 
-TDE_VERSION="${1:-${TDE_VERSION:-14.0.9}}"
+TDE_VERSION="${1:-${TDE_VERSION:-14.0.13}}"
 ARCH=$(rpm -E %_target_cpu)
 RPMDIR=$(rpm -E %{_rpmdir}.tde-${TDE_VERSION})
 
diff --git a/redhat/build/gather_rpm_sources.sh b/redhat/build/gather_rpm_sources.sh
index 4b4cf0c77..ee1d1ca6e 100755
--- a/redhat/build/gather_rpm_sources.sh
+++ b/redhat/build/gather_rpm_sources.sh
@@ -1,11 +1,11 @@
 #!/bin/bash
 
 # Usage: gather_rpm_sources.sh <TDE_PACKAGE> <TDE_VERSION> <DESTINATION>
-# Example: gather_rpm_sources.sh tdebase 14.0.9 /tmp/tdebase
+# Example: gather_rpm_sources.sh tdebase 14.0.13 /tmp/tdebase
 
 PKGNAME="${1%/}"
 PKGNAME="${PKGNAME##*/}"
-TDE_VERSION="${2:-${TDE_VERSION:-14.0.9}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.13}}"
 TARGETDIR="${3:-/tmp/${PKGNAME}-${TDE_VERSION}}"
 DIST="$4"
 
@@ -32,10 +32,14 @@ cp -f ${SPECFILE} ${SOURCES} ${TARBALL} "${TARGETDIR}"
 
 PATCHDIR="${HOME}/tde/patches/${TDE_VERSION}/$1"
 if [ -d "${PATCHDIR}" ]; then
-  cat "${PATCHDIR}/"*".patch" >>"${TARGETDIR}/one.patch"
-  sed -i "${TARGETDIR}/"*".spec" \
-      -e "/^Source0:/ s/$/\nPatch389: one.patch/" \
-      -e "/%setup/ s/$/\n%patch389 -p1/"
+  cat "${PATCHDIR}/"*".patch" "${PATCHDIR}/"*".patch${DIST}" >>"${TARGETDIR}/one.patch" 2>/dev/null
+  if [ "$(cat "${TARGETDIR}/one.patch" | wc -c)" = 0 ]; then
+    rm -f "${TARGETDIR}/one.patch"
+  else
+    sed -i "${TARGETDIR}/"*".spec" \
+        -e "/^Source0:/ s/$/\nPatch389: one.patch/" \
+        -e "/%setup/ s/$/\n%patch389 -p1/"
+  fi
 fi
 
 exit $RET
diff --git a/redhat/build/get_installed_package_version.sh b/redhat/build/get_installed_package_version.sh
index 0bd5c6b22..c97c38b13 100755
--- a/redhat/build/get_installed_package_version.sh
+++ b/redhat/build/get_installed_package_version.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Sample package name: trinity-tdelibs-14.0.9-0_pre727+6be06b3d.mga3.opt
+# Sample package name: trinity-tdelibs-14.0.13-0_pre727+6be06b3d.mga3.opt
 
 PKGNAME="${1##*/}"
 [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1
diff --git a/redhat/build/get_latest_built_package_filename.sh b/redhat/build/get_latest_built_package_filename.sh
index 412017a92..9431fa519 100755
--- a/redhat/build/get_latest_built_package_filename.sh
+++ b/redhat/build/get_latest_built_package_filename.sh
@@ -2,7 +2,7 @@
 
 PKGNAME="$1"
 [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1
-TDE_VERSION="${2:-${TDE_VERSION:-14.0.9}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.13}}"
 
 RPMDIR="$(rpm -E %{_rpmdir}.tde-${TDE_VERSION})"
 RPMDIR_ARCH="${RPMDIR}/$(rpm -E %_target_cpu)"
diff --git a/redhat/build/get_latest_built_package_version.sh b/redhat/build/get_latest_built_package_version.sh
index c25c48a88..fad941a9e 100755
--- a/redhat/build/get_latest_built_package_version.sh
+++ b/redhat/build/get_latest_built_package_version.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 PKGNAME="$1"
-TDE_VERSION="${2:-${TDE_VERSION:-14.0.9}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.13}}"
 
 [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1
 
@@ -13,11 +13,25 @@ pkg_version="$(rpm -qp --qf "%{version}" "${RPM}")"
 pkg_release="$(rpm -qp --qf "%{release}" "${RPM}")"
 
 # Application packages: version does not match TDE version
-if [[ "${pkg_release}" =~ _0_ ]] || [[ "${pkg_release}" =~ ${TDE_VERSION}_ ]] ; then
-  eval VERSION="${pkg_release/_0_/\~}"
+if [[ "${pkg_release}" =~ ^0_ ]] || [[ "${pkg_release}" =~ _0_ ]]; then
+  # Preversion
+  if [[ "${pkg_release}" =~ ${TDE_VERSION}_ ]] ; then
+     # Likely application package
+    eval VERSION="${pkg_release/0_/\~}"
+  else
+    # Likely core package
+    eval VERSION="${pkg_version}${pkg_release/0_/\~}"
+  fi
+  VERSION="${VERSION/_~/\~}"
 else
-  # Base package (tdelibs ...)
-  eval VERSION="${pkg_version}_${pkg_release/0_/\~}"
+  # Stable version
+  if [[ "${pkg_release}" =~ ${TDE_VERSION}_ ]] ; then
+     # Likely application package
+    eval VERSION="${pkg_release/_*/}"
+  else
+    # Likely core package
+    eval VERSION="${pkg_version}"
+  fi
 fi
 
 VERSION="${VERSION%.opt}" # Remove '.opt' suffix
diff --git a/redhat/build/get_latest_tarball_filename.sh b/redhat/build/get_latest_tarball_filename.sh
index 1f9193ee0..275fb2e27 100755
--- a/redhat/build/get_latest_tarball_filename.sh
+++ b/redhat/build/get_latest_tarball_filename.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 PKGNAME="${1##*/}"
-TDE_VERSION="${2:-${TDE_VERSION:-14.0.9}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.13}}"
 
 [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1
 [ -d "${TARBALLS_DIR}" ] || TARBALLS_DIR=~/tde/tarballs/${TDE_VERSION}/
diff --git a/redhat/build/get_latest_tarball_version.sh b/redhat/build/get_latest_tarball_version.sh
index 30d1f9da4..e30e89794 100755
--- a/redhat/build/get_latest_tarball_version.sh
+++ b/redhat/build/get_latest_tarball_version.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 PKGNAME="${1##*/}"
-TDE_VERSION="${2:-${TDE_VERSION:-14.0.9}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.13}}"
 
 [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1
 
diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh
index be2852414..ea121d4a1 100755
--- a/redhat/build/get_rpm_package_name.sh
+++ b/redhat/build/get_rpm_package_name.sh
@@ -20,12 +20,11 @@ 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"|"libcaldav"|"libcarddav"|"python-tqt"|"sip4-tqt"|"qt3"|"tqscintilla"|"tqt3"|"tqtinterface"|"tqca"|"tqca-tls") PREFIX="";;
+  "avahi-tqt"|"dbus-tqt"|"dbus-1-tqt"|"libart-lgpl"|"libcaldav"|"libcarddav"|"polkit-tqt"|"pytqt"|"sip4-tqt"|"qt3"|"tqscintilla"|"tqt3"|"tqtinterface"|"tqca"|"tqca-tls") PREFIX="";;
   # 3rd party dependencies
-  "cscope"|"dirmngr"|"esound"|"exempi"|"exiv2"|"file"|"fileshareset"|"gmime"|"hk_classes"|"intltool"|"lcms"|"libbeagle"|"mp4v2"|"python-qt3"|"rdesktop"|"recode"|"rdiff-backup"|"sword"|"tar") PREFIX="";;
+  "cscope"|"dirmngr"|"esound"|"exempi"|"exiv2"|"file"|"fileshareset"|"gmime"|"hk_classes"|"intltool"|"lcms"|"libbeagle"|"mp4v2"|"pinentry-tqt"|"python-qt3"|"rdesktop"|"recode"|"rdiff-backup"|"sword"|"tar") PREFIX="";;
   # Extra build stuff
-  "autoconf"|"automake"|"brp-check-trinity"|"cmake"|"gnuchess"|"htdig"|"imlib1"|"libconfig"|"libotr3"|"libr"|"libtool2"|"lilypond"|"m4"|"mftrace"|"pan"|"pcsc-perl"|"torsocks"|"wv2"|"yaz") PREFIX="";;
-  # Other
+  "autoconf"|"automake"|"brp-check-trinity"|"gnuchess"|"htdig"|"imlib1"|"libconfig"|"libotr3"|"libr"|"libtool2"|"lilypond"|"m4"|"mftrace"|"pan"|"pcsc-perl"|"torsocks"|"wv2"|"yaz") PREFIX="";;  # Other
   "curl") PREFIX="trinity-lib";;
   # Default case: add prefix
   *) PREFIX="trinity-";;
@@ -59,11 +58,13 @@ case "${PKGNAME}" in
   "libkipi")          PKGRUNTIME="${lib}kipi0";;
   "libr")             PKGRUNTIME="${lib}r";;
   "mp4v2")            PKGRUNTIME="mp4v2";;
+  "polkit-tqt")       PKGRUNTIME="${lib}polkit-tqt0";;
   "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";;
+  "trinity-desktop")  PKGRUNTIME="${PKGNAME}-all";;
   "yaz")              PKGRUNTIME="${lib}yaz";;
   # Language package: install only French language package
   "k3b-i18n"|"koffice-i18n"|"tde-i18n")
@@ -111,6 +112,7 @@ if [ -n "${DEVEL}" ]; then
     "libr")        PKGDEVEL="${lib}r-devel";;
     "mp4v2")       PKGDEVEL="${lib}mp4v2-devel";;
     "pan")         PKGDEVEL="uulib-devel";;
+    "polkit-tqt")  PKGDEVEL="${lib}polkit-tqt-devel";;
     "tqca")        PKGDEVEL="${lib}tqca-devel";;
     "tqscintilla") PKGDEVEL="${lib}tqscintilla-devel";;
     "tqt3")        PKGDEVEL="tqt3-dev-tools tqt3-apps-devel tqt3-compat-headers ${lib}tqt3-mt-sqlite3";;
diff --git a/redhat/build/get_source_files.sh b/redhat/build/get_source_files.sh
index 6b39789e6..1817b58ba 100755
--- a/redhat/build/get_source_files.sh
+++ b/redhat/build/get_source_files.sh
@@ -1,21 +1,24 @@
 #!/bin/bash
 
 PKGNAME="${1##*/}"
-TDE_VERSION="${2:-${TDE_VERSION:-14.0.9}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.13}}"
 DIST="$3"
 
 [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1
 SPECFILE=$(get_specfile.sh ${PKGNAME} ${TDE_VERSION})
 SPECDIR="${SPECFILE%/*}"
 RPMPKGNAME="$(get_rpm_package_name.sh ${PKGNAME})"
-
 [ ! -r "${SPECFILE}" ] && exit 2
 
 while read var val; do
   case "${var}" in
     Version:*) VERSION="${val}";;
-    Source[0-9]*:|Source:|Patch[0-9]*:)
-      FILE="${SPECDIR}/${val##*/}"
+    Source*:|Source:|Patch[0-9]*:)
+      if [ "${val:0:7}" = "http://" ] || [ "${val:0:8}" = "https://" ]; then
+        FILE="${SPECDIR}/${val##*/}"
+      else
+        FILE="${SPECDIR}/${val}"
+      fi
       if [ "${DIST}" = "any" ] && [ "${var//%\{?dist\}/}" = "${var}" ]; then
         FILES="${FILE//%\{?dist\}/.}"*
       else
@@ -23,12 +26,15 @@ while read var val; do
       fi
 
       for FILE in $FILES; do
-        file=$(rpm --define "tde_pkg ${PKGNAME}" \
-                   --define "tde_version ${TDE_VERSION}" \
-                   --define "name ${RPMPKGNAME}" \
-                   --define "version ${VERSION}" \
-                   --define "dist ${DIST:-$(rpm -E %dist)}" \
-                   -E "${FILE}")
+        for name in ${RPMPKGNAME} ${PKGNAME} trinity-${PKGNAME}; do
+          file=$(rpm --define "tde_pkg ${PKGNAME}" \
+                     --define "tde_version ${TDE_VERSION}" \
+                     --define "name ${name}" \
+                     --define "version ${VERSION}" \
+                     --define "dist ${DIST:-$(rpm -E %dist)}" \
+                     -E "${FILE}")
+          [ -r "${file}" ] && break
+        done
         [ -r "${file}" ] && echo "${file}"
       done
     ;;
diff --git a/redhat/build/get_spec_version.sh b/redhat/build/get_spec_version.sh
index b136a6b2d..b6911bff6 100755
--- a/redhat/build/get_spec_version.sh
+++ b/redhat/build/get_spec_version.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 PKGNAME="${1##*/}"
-TDE_VERSION="${2:-${TDE_VERSION:-14.0.9}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.13}}"
 
 [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1
 
diff --git a/redhat/build/get_specfile.sh b/redhat/build/get_specfile.sh
index a38256188..f203660e2 100755
--- a/redhat/build/get_specfile.sh
+++ b/redhat/build/get_specfile.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 PKGNAME="${1##*/}"
-TDE_VERSION="${2:-${TDE_VERSION:-14.0.9}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.13}}"
 
 [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1
 
diff --git a/redhat/build/install_rpm_package.sh b/redhat/build/install_rpm_package.sh
index 156d02aec..d70bcc5c0 100755
--- a/redhat/build/install_rpm_package.sh
+++ b/redhat/build/install_rpm_package.sh
@@ -13,7 +13,7 @@ if [ -x /usr/sbin/urpmi ]; then
 elif [ -x /usr/bin/dnf ]; then
   PKGINST="sudo dnf install -y --nogpgcheck"
 elif [ -x /usr/bin/zypper ]; then
-  PKGINST="sudo zypper install -y"
+  PKGINST="sudo zypper install -y --allow-vendor-change"
 elif [ -x /usr/bin/yum ]; then
   PKGINST='sudo yum install -y'
 elif [ -x /usr/bin/apt-get ]; then
diff --git a/redhat/build/is_latest_package_built.sh b/redhat/build/is_latest_package_built.sh
index 27b8b8dd4..c6e0a85a6 100755
--- a/redhat/build/is_latest_package_built.sh
+++ b/redhat/build/is_latest_package_built.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 PKGNAME="${1##*/}"
-TDE_VERSION="${2:-${TDE_VERSION:-14.0.9}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.13}}"
 
 BUILT="$(get_latest_built_package_version.sh ${PKGNAME} ${TDE_VERSION})"
 TARBALL="$(get_latest_tarball_version.sh ${PKGNAME} ${TDE_VERSION})"
diff --git a/redhat/build/is_latest_package_installed.sh b/redhat/build/is_latest_package_installed.sh
index 567be234a..01c3d93e7 100755
--- a/redhat/build/is_latest_package_installed.sh
+++ b/redhat/build/is_latest_package_installed.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 PKGNAME="${1##*/}"
-TDE_VERSION="${2:-${TDE_VERSION:-14.0.9}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.13}}"
 
 INSTALLED=$(get_installed_package_version.sh ${PKGNAME} ${TDE_VERSION})
 TARBALL=$(get_latest_tarball_version.sh ${PKGNAME} ${TDE_VERSION})
diff --git a/redhat/build/rpmdist.sh b/redhat/build/rpmdist.sh
index f890bfb2e..7f06af83e 100755
--- a/redhat/build/rpmdist.sh
+++ b/redhat/build/rpmdist.sh
@@ -24,7 +24,7 @@ case $a in
   ;;
   # CentOS release 5.7 (Final)
   # CentOS Linux release 6.0 (Final)
-  CentOS*)
+  CentOS*|Rocky*)
     if [ $c = "release" ]; then
       RHEL="${d%%.*}"; DIST=".el${RHEL}"
     else
diff --git a/redhat/build/update_repository.sh b/redhat/build/update_repository.sh
index 70fb800ab..2a80f02d8 100755
--- a/redhat/build/update_repository.sh
+++ b/redhat/build/update_repository.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 WORKERS=$(getconf _NPROCESSORS_ONLN)
-TDE_VERSION="${2:-${TDE_VERSION:-14.0.9}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.13}}"
 
 LOCKFILE="/tmp/lock.${0##*/}"
 while [ -e "${LOCKFILE}" ]; do
diff --git a/redhat/common/cmake/cmake.spec b/redhat/common/cmake/cmake.spec
new file mode 100644
index 000000000..1303fcb24
--- /dev/null
+++ b/redhat/common/cmake/cmake.spec
@@ -0,0 +1,119 @@
+#
+# spec file for package cmake-trinity (version R14)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# TDE variables
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg cmake
+
+%if 0%{?rhel} == 6 || 0%{?rhel} == 7
+%define cmake_datadir %{_datadir}/cmake3
+%else
+%define cmake_datadir %{_datadir}/cmake
+%endif
+
+
+Name:		trinity-%{tde_pkg}
+Version:	%{tde_version}
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	TDE CMake modules
+Group:		Development/Libraries/C and C++
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:	noarch
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	cmake
+BuildRequires:	desktop-file-utils
+
+Requires:		cmake
+
+
+%description
+TDE uses its own set of modules and macros to simplify CMake rules.
+
+This also includes the TDEL10n module that is used to generate and
+update templates for translations and the modified version of
+intltool-merge used to merge translations into desktop files.
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DBUILD_ALL="ON" \
+  -DWITH_ALL_OPTIONS="ON" \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+%__rm -rf %{?buildroot}
+%__make install -C build DESTDIR=%{?buildroot}
+
+
+%clean
+%__rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root,-)
+%{cmake_datadir}/Modules/FindTDE.cmake
+%{cmake_datadir}/Modules/FindTQt.cmake
+%{cmake_datadir}/Modules/FindTQtQUI.cmake
+%{cmake_datadir}/Modules/TDEL10n.cmake
+%{cmake_datadir}/Modules/TDEMacros.cmake
+%{cmake_datadir}/Modules/TDESetupPaths.cmake
+%{cmake_datadir}/Modules/TDEVersion.cmake
+%{cmake_datadir}/Modules/tde_automoc.cmake
+%{cmake_datadir}/Modules/tde_l10n_merge.pl
+%{cmake_datadir}/Modules/tde_uic.cmake
+%{cmake_datadir}/Templates/tde_dummy_cpp.cmake
+%{cmake_datadir}/Templates/tde_export_library.cmake
+%{cmake_datadir}/Templates/tde_libtool_file.cmake
+%{cmake_datadir}/Templates/tde_tdeinit_executable.cmake
+%{cmake_datadir}/Templates/tde_tdeinit_module.cmake
+
+
+%changelog
diff --git a/redhat/main/tde-i18n/tde-i18n.spec b/redhat/core/tde-i18n/tde-i18n.spec
index 3cc11e654..7f39132a7 100644
--- a/redhat/main/tde-i18n/tde-i18n.spec
+++ b/redhat/core/tde-i18n/tde-i18n.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tde-i18n
 %define tde_prefix /opt/trinity
@@ -70,7 +70,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 
 BuildRequires:	findutils
 BuildRequires:	gettext
-BuildRequires:	cmake
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 
 %description
@@ -81,9 +81,9 @@ This package contains %{summary}.
 %package Afrikaans
 Summary:		Afrikaans(af) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-af = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Afrikaans < %{version}-%{release}
-Provides:		trinity-kde-i18n-Afrikaans = %{version}-%{release}
+Provides:		%{name}-af = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Afrikaans < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Afrikaans = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Afrikaans
 This package contains %{summary}.
@@ -97,9 +97,9 @@ This package contains %{summary}.
 %package Arabic 
 Summary:		Arabic(ar) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-ar = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Arabic < %{version}-%{release}
-Provides:		trinity-kde-i18n-Arabic = %{version}-%{release}
+Provides:		%{name}-ar = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Arabic < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Arabic = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Arabic
 This package contains %{summary}.
@@ -113,9 +113,9 @@ This package contains %{summary}.
 %package Azerbaijani
 Summary:		Azerbaijani(az) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-az = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Arabic < %{version}-%{release}
-Provides:		trinity-kde-i18n-Arabic = %{version}-%{release}
+Provides:		%{name}-az = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Arabic < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Arabic = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Azerbaijani
 This package contains %{summary}.
@@ -129,9 +129,9 @@ This package contains %{summary}.
 %package Belarusian
 Summary:		Belarusian(be) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-be = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Belarusian < %{version}-%{release}
-Provides:		trinity-kde-i18n-Belarusian = %{version}-%{release}
+Provides:		%{name}-be = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Belarusian < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Belarusian = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Belarusian
 This package contains %{summary}.
@@ -145,9 +145,9 @@ This package contains %{summary}.
 %package Bulgarian
 Summary:		Bulgarian(bg) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-bg = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Bulgarian < %{version}-%{release}
-Provides:		trinity-kde-i18n-Bulgarian = %{version}-%{release}
+Provides:		%{name}-bg = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Bulgarian < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Bulgarian = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Bulgarian
 This package contains %{summary}.
@@ -161,9 +161,9 @@ This package contains %{summary}.
 %package Bengali
 Summary:		Bengali(bn) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-bn = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Bengali < %{version}-%{release}
-Provides:		trinity-kde-i18n-Bengali = %{version}-%{release}
+Provides:		%{name}-bn = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Bengali < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Bengali = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Bengali
 This package contains %{summary}.
@@ -177,9 +177,9 @@ This package contains %{summary}.
 %package Tibetan
 Summary:		Tibetan(bo) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-bo = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Tibetan < %{version}-%{release}
-Provides:		trinity-kde-i18n-Tibetan = %{version}-%{release}
+Provides:		%{name}-bo = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Tibetan < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Tibetan = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Tibetan
 This package contains %{summary}.
@@ -193,9 +193,9 @@ This package contains %{summary}.
 %package Breton
 Summary:		Breton(br) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-br = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Breton < %{version}-%{release}
-Provides:		trinity-kde-i18n-Breton = %{version}-%{release}
+Provides:		%{name}-br = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Breton < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Breton = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Breton
 This package contains %{summary}.
@@ -209,9 +209,9 @@ This package contains %{summary}.
 %package Bosnian
 Summary:		Bosnian(bs) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-bs = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Bosnian < %{version}-%{release}
-Provides:		trinity-kde-i18n-Bosnian = %{version}-%{release}
+Provides:		%{name}-bs = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Bosnian < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Bosnian = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Bosnian
 This package contains %{summary}.
@@ -225,9 +225,9 @@ This package contains %{summary}.
 %package Catalan
 Summary:		Catalan(ca) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-ca = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Catalan < %{version}-%{release}
-Provides:		trinity-kde-i18n-Catalan = %{version}-%{release}
+Provides:		%{name}-ca = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Catalan < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Catalan = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Catalan
 This package contains %{summary}.
@@ -242,9 +242,9 @@ This package contains %{summary}.
 %package Czech
 Summary:		Czech(cs) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-cs = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Czech < %{version}-%{release}
-Provides:		trinity-kde-i18n-Czech = %{version}-%{release}
+Provides:		%{name}-cs = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Czech < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Czech = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Czech
 This package contains %{summary}.
@@ -259,9 +259,9 @@ This package contains %{summary}.
 %package Kashubian
 Summary:		Kashubian(csb) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-csb = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Kashubian < %{version}-%{release}
-Provides:		trinity-kde-i18n-Kashubian = %{version}-%{release}
+Provides:		%{name}-csb = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Kashubian < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Kashubian = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Kashubian
 This package contains %{summary}.
@@ -275,8 +275,8 @@ This package contains %{summary}.
 %package Cymraeg
 Summary:		Cymraeg language support for TDE
 Group:			User Interface/Desktops
-Obsoletes:		trinity-kde-i18n-Cymraeg < %{version}-%{release}
-Provides:		trinity-kde-i18n-Cymraeg = %{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Cymraeg < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Cymraeg = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Cymraeg
 This package contains %{summary}.
@@ -286,9 +286,9 @@ This package contains %{summary}.
 %package Welsh
 Summary:		Welsh(cy) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-cy = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Welsh < %{version}-%{release}
-Provides:		trinity-kde-i18n-Welsh = %{version}-%{release}
+Provides:		%{name}-cy = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Welsh < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Welsh = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Welsh
 This package contains %{summary}.
@@ -302,9 +302,9 @@ This package contains %{summary}.
 %package Danish
 Summary:		Danish(da) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-da = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Danish < %{version}-%{release}
-Provides:		trinity-kde-i18n-Danish = %{version}-%{release}
+Provides:		%{name}-da = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Danish < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Danish = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Danish
 This package contains %{summary}.
@@ -319,9 +319,9 @@ This package contains %{summary}.
 %package German
 Summary:		German(de) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-de = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-German < %{version}-%{release}
-Provides:		trinity-kde-i18n-German = %{version}-%{release}
+Provides:		%{name}-de = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-German < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-German = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description German
 This package contains %{summary}.
@@ -336,9 +336,9 @@ This package contains %{summary}.
 %package Greek
 Summary:		Greek(el) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-el = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Greek < %{version}-%{release}
-Provides:		trinity-kde-i18n-Greek = %{version}-%{release}
+Provides:		%{name}-el = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Greek < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Greek = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Greek
 This package contains %{summary}.
@@ -352,9 +352,9 @@ This package contains %{summary}.
 %package British
 Summary:		British(en_GB) English support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-en_GB = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-British < %{version}-%{release}
-Provides:		trinity-kde-i18n-British = %{version}-%{release}
+Provides:		%{name}-en_GB = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-British < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-British = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description British
 This package contains %{summary}.
@@ -369,9 +369,9 @@ This package contains %{summary}.
 %package Esperanto
 Summary:		Esperanto(eo) support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-eo = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Esperanto < %{version}-%{release}
-Provides:		trinity-kde-i18n-Esperanto = %{version}-%{release}
+Provides:		%{name}-eo = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Esperanto < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Esperanto = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Esperanto
 This package contains %{summary}.
@@ -385,9 +385,9 @@ This package contains %{summary}.
 %package Spanish
 Summary:		Spanish(es) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-es = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Spanish < %{version}-%{release}
-Provides:		trinity-kde-i18n-Spanish = %{version}-%{release}
+Provides:		%{name}-es = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Spanish < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Spanish = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Spanish
 This package contains %{summary}.
@@ -402,9 +402,9 @@ This package contains %{summary}.
 %package Estonian
 Summary:		Estonian(et) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-et = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Estonian < %{version}-%{release}
-Provides:		trinity-kde-i18n-Estonian = %{version}-%{release}
+Provides:		%{name}-et = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Estonian < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Estonian = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Estonian
 This package contains %{summary}.
@@ -419,9 +419,9 @@ This package contains %{summary}.
 %package Basque
 Summary:		Basque(eu) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-eu = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Basque < %{version}-%{release}
-Provides:		trinity-kde-i18n-Basque = %{version}-%{release}
+Provides:		%{name}-eu = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Basque < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Basque = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Basque
 This package contains %{summary}.
@@ -436,9 +436,9 @@ This package contains %{summary}.
 %package Farsi
 Summary:		Farsi(fa) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-fa = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Farsi < %{version}-%{release}
-Provides:		trinity-kde-i18n-Farsi = %{version}-%{release}
+Provides:		%{name}-fa = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Farsi < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Farsi = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Farsi
 This package contains %{summary}.
@@ -452,9 +452,9 @@ This package contains %{summary}.
 %package Finnish
 Summary:		Finnish(fi) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-fi = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Finnish < %{version}-%{release}
-Provides:		trinity-kde-i18n-Finnish = %{version}-%{release}
+Provides:		%{name}-fi = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Finnish < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Finnish = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Finnish
 This package contains %{summary}.
@@ -469,9 +469,9 @@ This package contains %{summary}.
 %package Faroese
 Summary:		Faroese(fo) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-fo = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Faroese < %{version}-%{release}
-Provides:		trinity-kde-i18n-Faroese = %{version}-%{release}
+Provides:		%{name}-fo = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Faroese < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Faroese = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Faroese
 This package contains %{summary}.
@@ -485,9 +485,9 @@ This package contains %{summary}.
 %package French
 Summary:		French(fr) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-fr = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-French < %{version}-%{release}
-Provides:		trinity-kde-i18n-French = %{version}-%{release}
+Provides:		%{name}-fr = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-French < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-French = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description French
 This package contains %{summary}.
@@ -502,9 +502,9 @@ This package contains %{summary}.
 %package Frisian
 Summary:		Frisian(fy) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-fy = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Frisian < %{version}-%{release}
-Provides:		trinity-kde-i18n-Frisian = %{version}-%{release}
+Provides:		%{name}-fy = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Frisian < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Frisian = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Frisian
 This package contains %{summary}.
@@ -518,9 +518,9 @@ This package contains %{summary}.
 %package Irish
 Summary:		Irish(ga) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-ga = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Irish < %{version}-%{release}
-Provides:		trinity-kde-i18n-Irish = %{version}-%{release}
+Provides:		%{name}-ga = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Irish < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Irish = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Irish
 This package contains %{summary}.
@@ -534,9 +534,9 @@ This package contains %{summary}.
 %package Galician
 Summary:		Galician(gl) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-gl = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Galician < %{version}-%{release}
-Provides:		trinity-kde-i18n-Galician = %{version}-%{release}
+Provides:		%{name}-gl = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Galician < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Galician = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Galician
 This package contains %{summary}.
@@ -550,9 +550,9 @@ This package contains %{summary}.
 %package Hebrew
 Summary:		Hebrew(he) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-he = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Hebrew < %{version}-%{release}
-Provides:		trinity-kde-i18n-Hebrew = %{version}-%{release}
+Provides:		%{name}-he = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Hebrew < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Hebrew = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Hebrew
 This package contains %{summary}.
@@ -567,9 +567,9 @@ This package contains %{summary}.
 %package Hindi
 Summary:		Hindi(hi) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-hi = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Hindi < %{version}-%{release}
-Provides:		trinity-kde-i18n-Hindi = %{version}-%{release}
+Provides:		%{name}-hi = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Hindi < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Hindi = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Hindi
 This package contains %{summary}.
@@ -583,9 +583,9 @@ This package contains %{summary}.
 %package Croatian
 Summary:		Croatian(hr) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-hr = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Croatian < %{version}-%{release}
-Provides:		trinity-kde-i18n-Croatian = %{version}-%{release}
+Provides:		%{name}-hr = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Croatian < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Croatian = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Croatian
 This package contains %{summary}.
@@ -600,9 +600,9 @@ This package contains %{summary}.
 %package Hungarian
 Summary:		Hungarian(hu) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-hu = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Hungarian < %{version}-%{release}
-Provides:		trinity-kde-i18n-Hungarian = %{version}-%{release}
+Provides:		%{name}-hu = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Hungarian < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Hungarian = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Hungarian
 This package contains %{summary}.
@@ -617,9 +617,9 @@ This package contains %{summary}.
 %package Indonesian
 Summary:		Indonesian(id) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-id = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Indonesian < %{version}-%{release}
-Provides:		trinity-kde-i18n-Indonesian = %{version}-%{release}
+Provides:		%{name}-id = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Indonesian < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Indonesian = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Indonesian
 This package contains %{summary}.
@@ -633,9 +633,9 @@ This package contains %{summary}.
 %package Icelandic
 Summary:		Icelandic(is) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-is = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Icelandic < %{version}-%{release}
-Provides:		trinity-kde-i18n-Icelandic = %{version}-%{release}
+Provides:		%{name}-is = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Icelandic < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Icelandic = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Icelandic
 This package contains %{summary}.
@@ -649,9 +649,9 @@ This package contains %{summary}.
 %package Italian
 Summary:		Italian(it) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-it = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Italian < %{version}-%{release}
-Provides:		trinity-kde-i18n-Italian = %{version}-%{release}
+Provides:		%{name}-it = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Italian < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Italian = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Italian
 This package contains %{summary}.
@@ -666,9 +666,9 @@ This package contains %{summary}.
 %package Japanese
 Summary:		Japanese(ja) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-ja = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Japanese < %{version}-%{release}
-Provides:		trinity-kde-i18n-Japanese = %{version}-%{release}
+Provides:		%{name}-ja = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Japanese < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Japanese = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Japanese
 This package contains %{summary}.
@@ -683,9 +683,9 @@ This package contains %{summary}.
 %package Kazakh
 Summary:		Kazakh(kk) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-kk = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Kazakh < %{version}-%{release}
-Provides:		trinity-kde-i18n-Kazakh = %{version}-%{release}
+Provides:		%{name}-kk = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Kazakh < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Kazakh = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Kazakh
 This package contains %{summary}.
@@ -699,9 +699,9 @@ This package contains %{summary}.
 %package Khmer
 Summary:		Khmer(km) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-ko = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Khmer < %{version}-%{release}
-Provides:		trinity-kde-i18n-Khmer = %{version}-%{release}
+Provides:		%{name}-ko = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Khmer < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Khmer = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Khmer
 This package contains %{summary}.
@@ -715,9 +715,9 @@ This package contains %{summary}.
 %package Korean
 Summary:		Korean(ko) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-ko = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Korean < %{version}-%{release}
-Provides:		trinity-kde-i18n-Korean = %{version}-%{release}
+Provides:		%{name}-ko = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Korean < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Korean = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Korean
 This package contains %{summary}.
@@ -732,9 +732,9 @@ This package contains %{summary}.
 %package Kurdish
 Summary:		Kurdish(ku) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-ku = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Kurdish < %{version}-%{release}
-Provides:		trinity-kde-i18n-Kurdish = %{version}-%{release}
+Provides:		%{name}-ku = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Kurdish < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Kurdish = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Kurdish
 This package contains %{summary}.
@@ -748,9 +748,9 @@ This package contains %{summary}.
 %package Lao
 Summary:		Lao(lo) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-lo = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Lao < %{version}-%{release}
-Provides:		trinity-kde-i18n-Lao = %{version}-%{release}
+Provides:		%{name}-lo = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Lao < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Lao = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Lao
 This package contains %{summary}.
@@ -764,9 +764,9 @@ This package contains %{summary}.
 %package Lithuanian
 Summary:		Lithuanian(lt) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-lt = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Lithuanian < %{version}-%{release}
-Provides:		trinity-kde-i18n-Lithuanian = %{version}-%{release}
+Provides:		%{name}-lt = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Lithuanian < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Lithuanian = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Lithuanian
 This package contains %{summary}.
@@ -780,9 +780,9 @@ This package contains %{summary}.
 %package Latvian
 Summary:		Latvian(lv) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-lv = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Latvian < %{version}-%{release}
-Provides:		trinity-kde-i18n-Latvian = %{version}-%{release}
+Provides:		%{name}-lv = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Latvian < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Latvian = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Latvian
 This package contains %{summary}.
@@ -796,9 +796,9 @@ This package contains %{summary}.
 %package Maori
 Summary:		Maori(mi) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-mi = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Maori < %{version}-%{release}
-Provides:		trinity-kde-i18n-Maori = %{version}-%{release}
+Provides:		%{name}-mi = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Maori < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Maori = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Maori
 This package contains %{summary}.
@@ -812,9 +812,9 @@ This package contains %{summary}.
 %package Macedonian
 Summary:		Macedonian(mk) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-mk = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Macedonian < %{version}-%{release}
-Provides:		trinity-kde-i18n-Macedonian = %{version}-%{release}
+Provides:		%{name}-mk = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Macedonian < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Macedonian = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Macedonian
 This package contains %{summary}.
@@ -828,9 +828,9 @@ This package contains %{summary}.
 %package Mongolian
 Summary:		Mongolian(mn) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-mn = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Mongolian < %{version}-%{release}
-Provides:		trinity-kde-i18n-Mongolian = %{version}-%{release}
+Provides:		%{name}-mn = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Mongolian < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Mongolian = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Mongolian
 This package contains %{summary}.
@@ -844,9 +844,9 @@ This package contains %{summary}.
 %package Malay
 Summary:		Malay(ms) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-ms = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Malay < %{version}-%{release}
-Provides:		trinity-kde-i18n-Malay = %{version}-%{release}
+Provides:		%{name}-ms = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Malay < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Malay = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Malay
 This package contains %{summary}.
@@ -860,9 +860,9 @@ This package contains %{summary}.
 %package Maltese
 Summary:		Maltese(mt) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-mt = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Maltese < %{version}-%{release}
-Provides:		trinity-kde-i18n-Maltese = %{version}-%{release}
+Provides:		%{name}-mt = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Maltese < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Maltese = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Maltese
 This package contains %{summary}.
@@ -876,9 +876,9 @@ This package contains %{summary}.
 %package Low-Saxon
 Summary:		Low Saxon(nds) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-nds = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Low-Saxon < %{version}-%{release}
-Provides:		trinity-kde-i18n-Low-Saxon = %{version}-%{release}
+Provides:		%{name}-nds = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Low-Saxon < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Low-Saxon = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Low-Saxon
 This package contains %{summary}.
@@ -892,9 +892,9 @@ This package contains %{summary}.
 %package Dutch
 Summary:		Dutch(nl) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-nl = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Dutch < %{version}-%{release}
-Provides:		trinity-kde-i18n-Dutch = %{version}-%{release}
+Provides:		%{name}-nl = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Dutch < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Dutch = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Dutch
 This package contains %{summary}.
@@ -909,9 +909,9 @@ This package contains %{summary}.
 %package Norwegian
 Summary:		Norwegian(no) (Bokmaal) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-no = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Norwegian < %{version}-%{release}
-Provides:		trinity-kde-i18n-Norwegian = %{version}-%{release}
+Provides:		%{name}-no = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Norwegian < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Norwegian = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Norwegian
 This package contains %{summary}.
@@ -925,9 +925,9 @@ This package contains %{summary}.
 %package Norwegian-Nynorsk
 Summary:		Norwegian(nn) (Nynorsk) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-nn = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Norwegian-Nynorsk < %{version}-%{release}
-Provides:		trinity-kde-i18n-Norwegian-Nynorsk = %{version}-%{release}
+Provides:		%{name}-nn = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Norwegian-Nynorsk < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Norwegian-Nynorsk = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Norwegian-Nynorsk
 This package contains %{summary}.
@@ -941,9 +941,9 @@ This package contains %{summary}.
 %package Occitan
 Summary:		Occitan(oc) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-oc = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Occitan < %{version}-%{release}
-Provides:		trinity-kde-i18n-Occitan = %{version}-%{release}
+Provides:		%{name}-oc = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Occitan < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Occitan = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Occitan
 This package contains %{summary}.
@@ -957,9 +957,9 @@ This package contains %{summary}.
 %package Polish
 Summary:		Polish(pl) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-pl = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Polish < %{version}-%{release}
-Provides:		trinity-kde-i18n-Polish = %{version}-%{release}
+Provides:		%{name}-pl = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Polish < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Polish = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Polish
 This package contains %{summary}.
@@ -974,9 +974,9 @@ This package contains %{summary}.
 %package Portuguese
 Summary:		Portuguese(pt) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-pt = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Portuguese < %{version}-%{release}
-Provides:		trinity-kde-i18n-Portuguese = %{version}-%{release}
+Provides:		%{name}-pt = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Portuguese < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Portuguese = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Portuguese
 This package contains %{summary}.
@@ -991,9 +991,9 @@ This package contains %{summary}.
 %package Punjabi
 Summary:		Punjabi(pa) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-pa = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Punjabi < %{version}-%{release}
-Provides:		trinity-kde-i18n-Punjabi = %{version}-%{release}
+Provides:		%{name}-pa = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Punjabi < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Punjabi = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Punjabi
 This package contains %{summary}.
@@ -1007,9 +1007,9 @@ This package contains %{summary}.
 %package Brazil
 Summary:		Brazil(pt_BR) Portuguese language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-pt_BR = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Brazil < %{version}-%{release}
-Provides:		trinity-kde-i18n-Brazil = %{version}-%{release}
+Provides:		%{name}-pt_BR = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Brazil < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Brazil = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Brazil
 This package contains %{summary}.
@@ -1024,9 +1024,9 @@ This package contains %{summary}.
 %package Romanian
 Summary:		Romanian(ro) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-ro = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Romanian < %{version}-%{release}
-Provides:		trinity-kde-i18n-Romanian = %{version}-%{release}
+Provides:		%{name}-ro = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Romanian < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Romanian = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Romanian
 This package contains %{summary}.
@@ -1041,9 +1041,9 @@ This package contains %{summary}.
 %package Russian
 Summary:		Russian(ru) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-ru = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Russian < %{version}-%{release}
-Provides:		trinity-kde-i18n-Russian = %{version}-%{release}
+Provides:		%{name}-ru = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Russian < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Russian = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Russian
 This package contains %{summary}.
@@ -1058,9 +1058,9 @@ This package contains %{summary}.
 %package Kinyarwanda
 Summary:		Kinyarwanda(rw) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-rw = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Kinyarwanda < %{version}-%{release}
-Provides:		trinity-kde-i18n-Kinyarwanda = %{version}-%{release}
+Provides:		%{name}-rw = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Kinyarwanda < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Kinyarwanda = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Kinyarwanda
 This package contains %{summary}.
@@ -1074,9 +1074,9 @@ This package contains %{summary}.
 %package Northern-Sami
 Summary:		Northern-Sami(se) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-se = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Northern-Sami < %{version}-%{release}
-Provides:		trinity-kde-i18n-Northern-Sami = %{version}-%{release}
+Provides:		%{name}-se = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Northern-Sami < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Northern-Sami = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Northern-Sami
 This package contains %{summary}.
@@ -1090,9 +1090,9 @@ This package contains %{summary}.
 %package Slovak
 Summary:		Slovak(sk) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-sk = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Slovak < %{version}-%{release}
-Provides:		trinity-kde-i18n-Slovak = %{version}-%{release}
+Provides:		%{name}-sk = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Slovak < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Slovak = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Slovak
 This package contains %{summary}.
@@ -1107,9 +1107,9 @@ This package contains %{summary}.
 %package Slovenian
 Summary:		Slovenian(sl) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-sl = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Slovenian < %{version}-%{release}
-Provides:		trinity-kde-i18n-Slovenian = %{version}-%{release}
+Provides:		%{name}-sl = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Slovenian < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Slovenian = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Slovenian
 This package contains %{summary}.
@@ -1124,9 +1124,9 @@ This package contains %{summary}.
 %package Serbian
 Summary:		Serbian(sr) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-sr = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Serbian < %{version}-%{release}
-Provides:		trinity-kde-i18n-Serbian = %{version}-%{release}
+Provides:		%{name}-sr = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Serbian < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Serbian = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Serbian
 This package contains %{summary}.
@@ -1141,8 +1141,8 @@ This package contains %{summary}.
 %package Serbian-Latin
 Summary:		Serbian-Latin(sr@Latn) language support for TDE
 Group:			User Interface/Desktops
-Obsoletes:		trinity-kde-i18n-Serbian-Latin < %{version}-%{release}
-Provides:		trinity-kde-i18n-Serbian-Latin = %{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Serbian-Latin < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Serbian-Latin = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Serbian-Latin
 This package contains %{summary}.
@@ -1156,9 +1156,9 @@ This package contains %{summary}.
 %package South-Sudan
 Summary:		South-Sudan(ss) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-ss = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-South-Sudan < %{version}-%{release}
-Provides:		trinity-kde-i18n-South-Sudan = %{version}-%{release}
+Provides:		%{name}-ss = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-South-Sudan < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-South-Sudan = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description South-Sudan
 This package contains %{summary}.
@@ -1172,9 +1172,9 @@ This package contains %{summary}.
 %package Swedish
 Summary:		Swedish(sv) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-sv = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Swedish < %{version}-%{release}
-Provides:		trinity-kde-i18n-Swedish = %{version}-%{release}
+Provides:		%{name}-sv = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Swedish < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Swedish = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Swedish
 This package contains %{summary}.
@@ -1189,9 +1189,9 @@ This package contains %{summary}.
 %package Tamil
 Summary:		Tamil(ta) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-ta = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Tamil < %{version}-%{release}
-Provides:		trinity-kde-i18n-Tamil = %{version}-%{release}
+Provides:		%{name}-ta = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Tamil < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Tamil = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Tamil
 This package contains %{summary}.
@@ -1205,9 +1205,9 @@ This package contains %{summary}.
 %package Telugu
 Summary:		Telugu(te) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-te = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Telugu < %{version}-%{release}
-Provides:		trinity-kde-i18n-Telugu = %{version}-%{release}
+Provides:		%{name}-te = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Telugu < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Telugu = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Telugu
 This package contains %{summary}.
@@ -1221,9 +1221,9 @@ This package contains %{summary}.
 %package Tajik
 Summary:		Tajik(tg) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-tg = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Tajik < %{version}-%{release}
-Provides:		trinity-kde-i18n-Tajik = %{version}-%{release}
+Provides:		%{name}-tg = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Tajik < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Tajik = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Tajik
 This package contains %{summary}.
@@ -1237,9 +1237,9 @@ This package contains %{summary}.
 %package Thai
 Summary:		Thai(th) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-th = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Thai < %{version}-%{release}
-Provides:		trinity-kde-i18n-Thai = %{version}-%{release}
+Provides:		%{name}-th = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Thai < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Thai = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Thai
 This package contains %{summary}.
@@ -1253,9 +1253,9 @@ This package contains %{summary}.
 %package Turkish
 Summary:		Turkish(tr) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-tr = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Turkish < %{version}-%{release}
-Provides:		trinity-kde-i18n-Turkish = %{version}-%{release}
+Provides:		%{name}-tr = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Turkish < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Turkish = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Turkish
 This package contains %{summary}.
@@ -1270,9 +1270,9 @@ This package contains %{summary}.
 %package Ukrainian
 Summary:		Ukrainian(uk) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-uk = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Ukrainian < %{version}-%{release}
-Provides:		trinity-kde-i18n-Ukrainian = %{version}-%{release}
+Provides:		%{name}-uk = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Ukrainian < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Ukrainian = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Ukrainian
 This package contains %{summary}.
@@ -1287,9 +1287,9 @@ This package contains %{summary}.
 %package Uzbek
 Summary:		Uzbek(uz) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-uz = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Uzbek < %{version}-%{release}
-Provides:		trinity-kde-i18n-Uzbek = %{version}-%{release}
+Provides:		%{name}-uz = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Uzbek < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Uzbek = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Uzbek
 This package contains %{summary}.
@@ -1303,9 +1303,9 @@ This package contains %{summary}.
 %package Uzbek-Cyrillic
 Summary:		Uzbek(uz@cyrillic) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-uz@cyrillic = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Uzbek-Cyrillic < %{version}-%{release}
-Provides:		trinity-kde-i18n-Uzbek-Cyrillic = %{version}-%{release}
+Provides:		%{name}-uz@cyrillic = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Uzbek-Cyrillic < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Uzbek-Cyrillic = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Uzbek-Cyrillic
 This package contains %{summary}.
@@ -1319,9 +1319,9 @@ This package contains %{summary}.
 %package Venda
 Summary:		Venda(ven) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-ven = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Venda < %{version}-%{release}
-Provides:		trinity-kde-i18n-Venda = %{version}-%{release}
+Provides:		%{name}-ven = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Venda < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Venda = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Venda
 This package contains %{summary}.
@@ -1335,9 +1335,9 @@ This package contains %{summary}.
 %package Vietnamese
 Summary:		Vietnamese(vi) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-vi = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Vietnamese < %{version}-%{release}
-Provides:		trinity-kde-i18n-Vietnamese = %{version}-%{release}
+Provides:		%{name}-vi = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Vietnamese < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Vietnamese = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Vietnamese
 This package contains %{summary}.
@@ -1351,9 +1351,9 @@ This package contains %{summary}.
 %package Walloon
 Summary:		Walloon(wa) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-wa = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Walloon < %{version}-%{release}
-Provides:		trinity-kde-i18n-Walloon = %{version}-%{release}
+Provides:		%{name}-wa = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Walloon < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Walloon = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Walloon
 This package contains %{summary}.
@@ -1367,9 +1367,9 @@ This package contains %{summary}.
 %package Xhosa
 Summary:		Xhosa(xh) (a Bantu language) support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-xh = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Xhosa < %{version}-%{release}
-Provides:		trinity-kde-i18n-Xhosa = %{version}-%{release}
+Provides:		%{name}-xh = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Xhosa < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Xhosa = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Xhosa
 This package contains %{summary}.
@@ -1383,9 +1383,9 @@ This package contains %{summary}.
 %package Chinese
 Summary:		Chinese(zh_CN) (Simplified Chinese) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-zh_CN = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Chinese < %{version}-%{release}
-Provides:		trinity-kde-i18n-Chinese = %{version}-%{release}
+Provides:		%{name}-zh_CN = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Chinese < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Chinese = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Chinese
 This package contains %{summary}.
@@ -1400,9 +1400,9 @@ This package contains %{summary}.
 %package Chinese-Big5
 Summary:		Chinese(zh_TW) (Big5) language support for TDE
 Group:			User Interface/Desktops
-Provides:		%{name}-tz_TW = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Chinese-Big5 < %{version}-%{release}
-Provides:		trinity-kde-i18n-Chinese-Big5 = %{version}-%{release}
+Provides:		%{name}-tz_TW = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Chinese-Big5 < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Chinese-Big5 = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Chinese-Big5
 This package contains %{summary}.
@@ -1427,6 +1427,11 @@ for l in %{TDE_LANGS}; do
   for f in tde-i18n-${l}/; do
     if [ -d "${f}" ]; then 
       pushd ${f}
+
+      if [ ! -d cmake ]; then
+        ln -s ../cmake cmake
+      fi
+
       if ! rpm -E %%cmake|grep -q "cd build"; then
         %__mkdir_p build
         cd build
diff --git a/redhat/main/tdeaccessibility/tdeaccessibility.spec b/redhat/core/tdeaccessibility/tdeaccessibility.spec
index b91ec2dba..38d70957e 100644
--- a/redhat/main/tdeaccessibility/tdeaccessibility.spec
+++ b/redhat/core/tdeaccessibility/tdeaccessibility.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tdeaccessibility
 %define tde_prefix /opt/trinity
@@ -32,6 +32,7 @@
 %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/tde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
@@ -65,7 +66,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	trinity-tdemultimedia-devel >= %{tde_version}
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	cmake
 BuildRequires:	gcc-c++
 BuildRequires:	desktop-file-utils
 BuildRequires:	fdupes
@@ -121,19 +122,19 @@ BuildRequires:	%{_lib}xau%{?mgaversion:6}-devel
 BuildRequires:	libXau-devel
 %endif
 
-Obsoletes:		trinity-kdeaccessibility < %{version}-%{release}
-Provides:		trinity-kdeaccessibility = %{version}-%{release}
-Obsoletes:		trinity-kdeaccessibility-libs < %{version}-%{release}
-Provides:		trinity-kdeaccessibility-libs = %{version}-%{release}
+Obsoletes:		trinity-kdeaccessibility < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kdeaccessibility = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kdeaccessibility-libs < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kdeaccessibility-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 
-Requires: trinity-tde-icons-mono = %{version}-%{release}
-Requires: trinity-kbstate = %{version}-%{release}
-Requires: trinity-kmag = %{version}-%{release}
-Requires: trinity-kmousetool = %{version}-%{release}
-Requires: trinity-kmouth = %{version}-%{release}
-Requires: trinity-ksayit = %{version}-%{release}
-Requires: trinity-kttsd = %{version}-%{release}
-Requires: trinity-kttsd-contrib-plugins = %{version}-%{release}
+Requires: trinity-tde-icons-mono = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kbstate = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kmag = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kmousetool = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kmouth = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ksayit = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kttsd = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kttsd-contrib-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description
 Included with this package are:
@@ -150,8 +151,8 @@ Included with this package are:
 Summary:	A monochromatic icons theme for TDE
 Group:		System/GUI/Other
 
-Obsoletes:	trinity-kde-icons-mono < %{version}-%{release}
-Provides:	trinity-kde-icons-mono = %{version}-%{release}
+Obsoletes:	trinity-kde-icons-mono < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kde-icons-mono = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-tde-icons-mono
 A monochromatic icon theme for TDE, designed for accessibility purposes.
@@ -160,15 +161,7 @@ This package is part of Trinity, as a component of the TDE accessibility module.
 
 %files -n trinity-tde-icons-mono
 %defattr(-,root,root,-)
-%dir %{tde_datadir}/icons/mono
-%dir %{tde_datadir}/icons/mono/scalable
-%dir %{tde_datadir}/icons/mono/scalable/actions
-%dir %{tde_datadir}/icons/mono/scalable/apps
-%dir %{tde_datadir}/icons/mono/scalable/devices
-%dir %{tde_datadir}/icons/mono/scalable/mimetypes
-%dir %{tde_datadir}/icons/mono/scalable/places
-%{tde_datadir}/icons/mono/index.theme
-%{tde_datadir}/icons/mono/scalable/*/*.svgz
+%{tde_datadir}/icons/mono/
 
 ##########
 
@@ -212,6 +205,7 @@ This package is part of Trinity, as a component of the TDE accessibility module.
 %{tde_datadir}/icons/hicolor/*/apps/kmag.png
 %{tde_datadir}/icons/locolor/*/apps/kmag.png
 %{tde_tdedocdir}/HTML/en/kmag/
+%{tde_mandir}/man1/kmag.1*
 
 ##########
 
@@ -233,6 +227,7 @@ This package is part of Trinity, as a component of the TDE accessibility module.
 %{tde_datadir}/apps/kmousetool/
 %{tde_datadir}/icons/hicolor/*/apps/kmousetool.png
 %{tde_tdedocdir}/HTML/en/kmousetool/
+%{tde_mandir}/man1/kmousetool.1*
 
 ##########
 
@@ -260,6 +255,7 @@ This package is part of Trinity, as a component of the TDE accessibility module.
 %{tde_datadir}/icons/locolor/*/actions/speak.png
 %{tde_datadir}/icons/locolor/*/apps/kmouth.png
 %{tde_tdedocdir}/HTML/en/kmouth/
+%{tde_mandir}/man1/kmouth.1*
 
 ##########
 
@@ -286,6 +282,7 @@ This package is part of Trinity, as a component of the TDE accessibility module.
 %{tde_datadir}/services/ksayit_libFreeverb.desktop
 %{tde_datadir}/servicetypes/ksayit_libFreeverb_service.desktop
 %{tde_tdedocdir}/HTML/en/ksayit/
+%{tde_mandir}/man1/ksayit.1*
 
 ##########
 
@@ -368,13 +365,15 @@ Homepage: http://accessibility.kde.org/developer/kttsd
 %{tde_datadir}/servicetypes/kttsd_filterplugin.desktop
 %{tde_datadir}/servicetypes/kttsd_synthplugin.desktop
 %{tde_tdedocdir}/HTML/en/kttsd/
+%{tde_mandir}/man1/kttsd.1*
+%{tde_mandir}/man1/kttsmgr.1*
 
 ##########
 
 %package -n trinity-kttsd-contrib-plugins
 Summary:	The TDE Text-to-Speech system
 Group:		System/GUI/Other
-Requires:	trinity-kttsd = %{version}-%{release}
+Requires:	trinity-kttsd = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kttsd-contrib-plugins
 kttsd synthetizer plugins that depends on non-free software :
@@ -400,13 +399,13 @@ This package is part of Trinity, as a component of the TDE accessibility module.
 %package devel
 Summary:	Development files for tdeaccessibility
 Group:		Development/Libraries/X11
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	trinity-tdelibs-devel >= %{version}
 Requires:	libjpeg-devel
 Requires:	libpng-devel
 
-Obsoletes:		trinity-kdeaccessibility-devel < %{version}-%{release}
-Provides:		trinity-kdeaccessibility-devel = %{version}-%{release}
+Obsoletes:		trinity-kdeaccessibility-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kdeaccessibility-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description devel
 This package contains the development file for TDE accessibility 
@@ -434,43 +433,51 @@ programs.
 # Update icons for some control center modules
 %__sed -i "kttsd/kcmkttsmgr/kcmkttsd.desktop" -e "s|^Icon=.*|Icon=kcmkttsd|"
 
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/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
+unset QTDIR QTLIB QTINC
 export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-export kde_confdir="%{tde_confdir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INCLUDE_PATH="%{tde_tdeincludedir}" \
+  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+  -DBIN_INSTALL_DIR="%{tde_bindir}" \
+  -DDOC_INSTALL_DIR="%{tde_docdir}" \
+  -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
+  -DLIB_INSTALL_DIR="%{tde_libdir}" \
+  -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
+  -DSYSCONF_INSTALL_DIR="%{_sysconfdir}/trinity" \
+  -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility \
+  -DWITH_ALL_OPTIONS=ON \
   \
-  --enable-ksayit-audio-plugins \
-  %{?with_akode:--with-akode} %{?!with_akode:--without-akode}
-  
-%__make %{?_smp_mflags}
+  -DBUILD_ALL=ON \
+  \
+  ..
+
+%__make %{?_smp_mflags} || %__make
 
 
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
 
 # Adds missing icons in 'hicolor' theme
 # These icons are copied from 'crystalsvg' theme, provided by 'tdelibs'.
diff --git a/redhat/main/tdeaccessibility/trinity-tdeaccessibility-rpmlintrc b/redhat/core/tdeaccessibility/trinity-tdeaccessibility-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/main/tdeaccessibility/trinity-tdeaccessibility-rpmlintrc
+++ b/redhat/core/tdeaccessibility/trinity-tdeaccessibility-rpmlintrc
diff --git a/redhat/main/tdeaddons/tdeaddons.spec b/redhat/core/tdeaddons/tdeaddons.spec
index 60086f993..87e0df3f9 100644
--- a/redhat/main/tdeaddons/tdeaddons.spec
+++ b/redhat/core/tdeaddons/tdeaddons.spec
@@ -21,7 +21,7 @@
 
 # TDE variables
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tdeaddons
 %define tde_prefix /opt/trinity
@@ -30,6 +30,7 @@
 %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/tde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
@@ -52,10 +53,10 @@ License:	GPLv2+
 #Vendor:		Trinity Project
 #Packager:	Francois Andriot <francois.andriot@free.fr>
 
-Obsoletes:	trinity-kdeaddons < %{version}-%{release}
-Provides:	trinity-kdeaddons = %{version}-%{release}
-Obsoletes:	trinity-kdeaddons-extras < %{version}-%{release}
-Provides:	trinity-kdeaddons-extras = %{version}-%{release}
+Obsoletes:	trinity-kdeaddons < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdeaddons = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-kdeaddons-extras < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdeaddons-extras = %{?epoch:%{epoch}:}%{version}-%{release}
 
 Prefix:    %{tde_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -70,7 +71,7 @@ BuildRequires: trinity-tdegames-devel >= %{tde_version}
 BuildRequires: trinity-tdemultimedia-devel >= %{tde_version}
 BuildRequires: trinity-tdepim-devel >= %{tde_version}
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -99,7 +100,7 @@ BuildRequires:	libidn-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gamin 1
 BuildRequires:	gamin-devel
 %endif
@@ -138,20 +139,28 @@ BuildRequires:	db4-devel
 #%endif
 
 # PYTHON2 support
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30 || 0%{?mgaversion} >= 8
-%global python %python2
+%if 0%{?sle_version} >= 150400 || 0%{?rhel} >= 9
+%define with_python 0
+%global __python %__python3
+%else
+%define with_python 1
+%if 0%{?rhel} >= 7 || 0%{?fedora} >= 30 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 7
+%global python python2
 %global __python %__python2
+%else
+%global python python
+%endif
 %endif
 
-Requires: trinity-atlantikdesigner = %{version}-%{release}
-Requires: trinity-kaddressbook-plugins = %{version}-%{release}
-Requires: trinity-kate-plugins = %{version}-%{release}
-Requires: trinity-tdeaddons-tdefile-plugins = %{version}-%{release}
-Requires: trinity-kicker-applets = %{version}-%{release}
-Requires: trinity-knewsticker-scripts = %{version}-%{release}
-Requires: trinity-konq-plugins = %{version}-%{release}
-Requires: trinity-ksig = %{version}-%{release}
-Requires: trinity-noatun-plugins = %{version}-%{release}
+Requires: trinity-atlantikdesigner = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kaddressbook-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kate-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-tdeaddons-tdefile-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kicker-applets = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-knewsticker-scripts = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-konq-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ksig = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-noatun-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
 
 
 %description
@@ -191,6 +200,7 @@ America and Europe.
 %{tde_tdeappdir}/atlantikdesigner.desktop
 %{tde_datadir}/icons/hicolor/*/apps/atlantikdesigner.png
 %{tde_tdedocdir}/HTML/en/atlantikdesigner/
+%{tde_mandir}/man1/atlantikdesigner.1*
 
 ##########
 
@@ -301,8 +311,8 @@ a tab bar, a Python browser and even more.
 Summary:	Trinity file dialog plugins for text files and folders
 Group:		Applications/Utilities
 
-Obsoletes:	trinity-tdeaddons-kfile-plugins < %{version}-%{release}
-Provides:	trinity-tdeaddons-kfile-plugins = %{version}-%{release}
+Obsoletes:	trinity-tdeaddons-kfile-plugins < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-tdeaddons-kfile-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description tdefile-plugins
 This is a collection of plugins for the TDE file dialog.  These plugins
@@ -348,6 +358,7 @@ provided for audio and image files.
 %{tde_datadir}/services/tdefile_txt.desktop
 %{tde_datadir}/services/renaudiodlg.desktop
 %{tde_datadir}/services/renimagedlg.desktop
+%{tde_mandir}/man1/lnkforward.1*
 
 ##########
 
@@ -393,7 +404,9 @@ controls XMMS, install the xmms-kde-trinity package.
 Summary: scripts for KNewsTicker, the Trinity news ticker
 Group:		Applications/Utilities
 Requires:	perl
+%if 0%{with_python}
 Requires:	%{python}
+%endif
 #Requires:	libfinance-quote-perl
 #Requires:	libmime-perl
 #Requires:	libnews-nntpclient-perl
@@ -434,7 +447,9 @@ Requires:	%{_lib}jpeg62
 %if 0%{?suse_version} == 1230
 Requires:	libjpeg8
 %endif
+%if 0%{with_python}
 Requires:	%{python}
+%endif
 Requires:	rsync
 #Requires:	unison
 Requires:	trinity-konqueror
@@ -572,6 +587,10 @@ graphical disk usage viewer and image conversions and transformations.
 %{tde_tdelibdir}/libadblock.la
 %{tde_tdelibdir}/libadblock.so
 %{tde_tdedocdir}/HTML/en/konq-plugins/
+%{tde_mandir}/man1/exif.py.1*
+%{tde_mandir}/man1/fsview.1*
+%{tde_mandir}/man1/jpegorient.1*
+%{tde_mandir}/man1/orient.py.1*
 
 ##########
 
@@ -597,6 +616,7 @@ signatures in external mail clients such as KMail.
 %{tde_datadir}/apps/ksig/
 %{tde_datadir}/icons/hicolor/*/apps/ksig.png
 %{tde_tdedocdir}/HTML/en/ksig/
+%{tde_mandir}/man1/ksig.1*
 
 ##########
 
@@ -654,6 +674,9 @@ of user interfaces, playlists and visualisation plugins.
 %{tde_tdelibdir}/noatunwavecapture.so
 %{tde_datadir}/apps/noatun/*
 %{tde_datadir}/icons/crystalsvg/16x16/apps/synaescope.png
+%{tde_mandir}/man1/noatunsynaescope.bin.1*
+%{tde_mandir}/man1/noatuntippecanoe.bin.1*
+%{tde_mandir}/man1/noatuntyler.bin.1*
 
 ##########
 
@@ -674,7 +697,6 @@ sed -i "knewsticker-scripts/sportscores.py" \
     -e "s|env python|env %{python}|"
 %endif
 
-
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
@@ -699,6 +721,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/main/tdeadmin/kpackagerc b/redhat/core/tdeadmin/kpackagerc
index 72be06d46..72be06d46 100644
--- a/redhat/main/tdeadmin/kpackagerc
+++ b/redhat/core/tdeadmin/kpackagerc
diff --git a/redhat/main/tdeadmin/ksysvrc b/redhat/core/tdeadmin/ksysvrc
index 48754643d..48754643d 100644
--- a/redhat/main/tdeadmin/ksysvrc
+++ b/redhat/core/tdeadmin/ksysvrc
diff --git a/redhat/main/tdeadmin/kuser.pam b/redhat/core/tdeadmin/kuser.pam
index 30492636a..30492636a 100644
--- a/redhat/main/tdeadmin/kuser.pam
+++ b/redhat/core/tdeadmin/kuser.pam
diff --git a/redhat/main/tdeadmin/kuser.pamd b/redhat/core/tdeadmin/kuser.pamd
index c7d67e332..c7d67e332 100644
--- a/redhat/main/tdeadmin/kuser.pamd
+++ b/redhat/core/tdeadmin/kuser.pamd
diff --git a/redhat/main/tdeadmin/kuserrc b/redhat/core/tdeadmin/kuserrc
index baeb5a53b..baeb5a53b 100644
--- a/redhat/main/tdeadmin/kuserrc
+++ b/redhat/core/tdeadmin/kuserrc
diff --git a/redhat/main/tdeadmin/tdeadmin.spec b/redhat/core/tdeadmin/tdeadmin.spec
index 0a871b732..cd5669db0 100644
--- a/redhat/main/tdeadmin/tdeadmin.spec
+++ b/redhat/core/tdeadmin/tdeadmin.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tdeadmin
 %define tde_prefix /opt/trinity
@@ -66,13 +66,13 @@ Source5:		kpackagerc
 Source6:		ksysvrc
 Source7:		kuserrc
 
-Obsoletes:		trinity-kdeadmin < %{version}-%{release}
-Provides:		trinity-kdeadmin = %{version}-%{release}
+Obsoletes:		trinity-kdeadmin < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kdeadmin = %{?epoch:%{epoch}:}%{version}-%{release}
 
 BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	libtool
 BuildRequires:	fdupes
 BuildRequires:	gcc-c++
@@ -110,17 +110,17 @@ BuildRequires: pam-devel
 BuildRequires:	lilo
 %endif
 
-Requires: trinity-kcron = %{version}-%{release}
-Requires: trinity-kdat = %{version}-%{release}
-Requires: %{name}-kfile-plugins = %{version}-%{release}
-Requires: trinity-knetworkconf = %{version}-%{release}
-Requires: trinity-kpackage = %{version}-%{release}
-Requires: trinity-ksysv = %{version}-%{release}
-Requires: trinity-kuser = %{version}-%{release}
+Requires: trinity-kcron = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kdat = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-kfile-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-knetworkconf = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kpackage = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ksysv = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kuser = %{?epoch:%{epoch}:}%{version}-%{release}
 %if 0%{?with_lilo}
-Requires: trinity-lilo-config = %{version}-%{release}
+Requires: trinity-lilo-config = %{?epoch:%{epoch}:}%{version}-%{release}
 %else
-Obsoletes: trinity-lilo-config
+Obsoletes: trinity-lilo-config < %{?epoch:%{epoch}:}%{version}-%{release}
 %endif
 
 # CONSOLEHELPER (usermode) support
@@ -361,6 +361,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/main/tdeartwork/tdeartwork.spec b/redhat/core/tdeartwork/tdeartwork.spec
index 2c26c45d6..84be28d21 100644
--- a/redhat/main/tdeartwork/tdeartwork.spec
+++ b/redhat/core/tdeartwork/tdeartwork.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tdeartwork
 %define tde_prefix /opt/trinity
@@ -31,6 +31,7 @@
 %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_sbindir %{tde_prefix}/sbin
 %define tde_tdeappdir %{tde_datadir}/applications/tde
 %define tde_tdedocdir %{tde_docdir}/tde
@@ -59,14 +60,14 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
 
-Obsoletes:	trinity-kdeartwork < %{version}-%{release}
-Provides:	trinity-kdeartwork = %{version}-%{release}
+Obsoletes:	trinity-kdeartwork < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdeartwork = %{?epoch:%{epoch}:}%{version}-%{release}
 
 BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	fdupes
 
@@ -103,7 +104,8 @@ BuildRequires:	libart_lgpl-devel
 #  RHEL 4: disabled
 #  RHEL 6: available in EPEL
 #  RHEL 7: available in NUX
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?suse_version}
+#  RHEL 8: available in EPEL
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || ( 0%{?rhel} >= 5 && 0%{?rhel} <= 8 ) || 0%{?suse_version}
 %define with_xscreensaver 1
 
 %if 0%{?fedora} || 0%{?rhel} >= 5
@@ -133,7 +135,9 @@ BuildRequires:	%{_lib}xscrnsaver%{?mgaversion:1}-devel
 %endif
 BuildRequires:	xscreensaver
 BuildRequires:	xscreensaver-base
+%if 0%{?pclinuxos} == 0
 BuildRequires:	xscreensaver-extrusion
+%endif
 BuildRequires:	xscreensaver-gl
 %endif
 
@@ -161,7 +165,7 @@ BuildRequires:	%{jack_devel}
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gamin 1
 BuildRequires:	gamin-devel
 %endif
@@ -171,19 +175,19 @@ BuildRequires:	openssl-devel
 
 
 # Metapackage
-Requires: %{name}-emoticons = %{version}-%{release}
-Requires: %{name}-misc = %{version}-%{release}
-Requires: %{name}-style = %{version}-%{release}
-Requires: %{name}-theme-icon = %{version}-%{release}
-Requires: %{name}-theme-window = %{version}-%{release}
-Requires: trinity-tdewallpapers = %{version}-%{release}
-Requires: trinity-tdescreensaver = %{version}-%{release}
+Requires: %{name}-emoticons = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-misc = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-style = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-theme-icon = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-theme-window = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-tdewallpapers = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-tdescreensaver = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %if 0%{?with_xscreensaver}
-Requires: trinity-tdescreensaver-xsavers = %{version}-%{release}
-Requires: trinity-tdescreensaver-xsavers-extra = %{version}-%{release}
+Requires: trinity-tdescreensaver-xsavers = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-tdescreensaver-xsavers-extra = %{?epoch:%{epoch}:}%{version}-%{release}
 %if 0%{?with_webcollage}
-Requires: trinity-tdescreensaver-xsavers-webcollage = %{version}-%{release}
+Requires: trinity-tdescreensaver-xsavers-webcollage = %{?epoch:%{epoch}:}%{version}-%{release}
 %endif
 %endif
 
@@ -262,8 +266,8 @@ This package is part of Trinity, and a component of the TDE artwork module.
 Summary:	Icon themes released with Trinity
 Group:		System/GUI/Other
 
-Obsoletes:	trinity-kdeartwork-icons < %{version}-%{release}
-Provides:	trinity-kdeartwork-icons = %{version}-%{release}
+Obsoletes:	trinity-kdeartwork-icons < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdeartwork-icons = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description theme-icon
 This package contains additional icon themes for Trinity. Icon themes can be
@@ -305,8 +309,8 @@ This package is part of Trinity, and a component of the TDE artwork module.
 %package -n trinity-tdewallpapers
 Summary:	Wallpapers released with Trinity
 Group:		System/GUI/Other
-Obsoletes:	trinity-kdewallpapers < %{version}-%{release}
-Provides:	trinity-kdewallpapers = %{version}-%{release}
+Obsoletes:	trinity-kdewallpapers < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdewallpapers = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-tdewallpapers
 This package contains additional wallpapers for Trinity. Wallpapers can be
@@ -324,8 +328,8 @@ This package is part of Trinity, and a component of the TDE artwork module.
 Summary:	Additional screen savers released with Trinity
 Group:		System/GUI/Other
 
-Obsoletes:	trinity-kscreensaver < %{version}-%{release}
-Provides:	trinity-kscreensaver = %{version}-%{release}
+Obsoletes:	trinity-kscreensaver < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kscreensaver = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-tdescreensaver
 This package contains the screen savers for Trinity. They can be tested and
@@ -359,6 +363,7 @@ This package is part of Trinity, and a component of the TDE artwork module.
 %{tde_bindir}/kblob.kss
 %{tde_bindir}/klines.kss
 %{tde_bindir}/kwave.kss
+%{tde_bindir}/tdeasciiquarium.kss
 %{tde_datadir}/applnk/System/ScreenSavers/KBanner.desktop
 %{tde_datadir}/applnk/System/ScreenSavers/KBlob.desktop
 %{tde_datadir}/applnk/System/ScreenSavers/KClock.desktop
@@ -380,12 +385,34 @@ This package is part of Trinity, and a component of the TDE artwork module.
 %{tde_datadir}/applnk/System/ScreenSavers/tdepartsaver.desktop
 %{tde_datadir}/apps/kfiresaver/
 %{tde_datadir}/apps/tdescreensaver/
+%{tde_mandir}/man1/kbanner.kss.1*
+%{tde_mandir}/man1/kblob.kss.1*
+%{tde_mandir}/man1/kclock.kss.1*
+%{tde_mandir}/man1/keuphoria.kss.1
+%{tde_mandir}/man1/kfiresaver.kss.1
+%{tde_mandir}/man1/kflux.kss.1
+%{tde_mandir}/man1/kfountain.kss.1
+%{tde_mandir}/man1/kgravity.kss.1
+%{tde_mandir}/man1/klines.kss.1
+%{tde_mandir}/man1/klorenz.kss.1
+%{tde_mandir}/man1/kpendulum.kss.1
+%{tde_mandir}/man1/kpolygon.kss.1
+%{tde_mandir}/man1/krotation.kss.1
+%{tde_mandir}/man1/kscience.kss.1
+%{tde_mandir}/man1/kslideshow.kss.1
+%{tde_mandir}/man1/ksolarwinds.kss.1
+%{tde_mandir}/man1/kvm.kss.1
+%{tde_mandir}/man1/kwave.kss.1
+%{tde_mandir}/man1/tdeasciiquarium.kss.1
+%{tde_mandir}/man1/tdepartsaver.kss.1
 
 %if 0%{?with_xscreensaver}
 %{tde_bindir}/kspace.kss
 %{tde_bindir}/kswarm.kss
 %{tde_datadir}/applnk/System/ScreenSavers/KSpace.desktop
 %{tde_datadir}/applnk/System/ScreenSavers/KSwarm.desktop
+%{tde_mandir}/man1/kspace.kss.1
+%{tde_mandir}/man1/kswarm.kss.1
 %endif
 
 ##########
@@ -398,8 +425,8 @@ Group:		System/GUI/Other
 Requires:	trinity-tdebase-bin >= %{tde_version}
 Requires:	xscreensaver
 
-Obsoletes:	trinity-kscreensaver-xsavers < %{version}-%{release}
-Provides:	trinity-kscreensaver-xsavers = %{version}-%{release}
+Obsoletes:	trinity-kscreensaver-xsavers < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kscreensaver-xsavers = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-tdescreensaver-xsavers
 This package allows a smooth integration of the standard xscreensavers
@@ -511,6 +538,8 @@ This package is part of Trinity, and a component of the TDE artwork module.
 %{tde_datadir}/applnk/System/ScreenSavers/whirlygig.desktop
 %{tde_datadir}/applnk/System/ScreenSavers/worm.desktop
 %endif
+%{tde_mandir}/man1/kxsconfig.1
+%{tde_mandir}/man1/kxsrun.1
 
 %endif
 
@@ -521,11 +550,11 @@ This package is part of Trinity, and a component of the TDE artwork module.
 %package -n trinity-tdescreensaver-xsavers-webcollage
 Summary:	Webcollage screensaver Trinity hook
 Group:		System/GUI/Other
-Requires:	trinity-tdescreensaver-xsavers-extra = %{version}-%{release}
+Requires:	trinity-tdescreensaver-xsavers-extra = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	netpbm
 
-Obsoletes:	trinity-kscreensaver-xsavers-webcollage < %{version}-%{release}
-Provides:	trinity-kscreensaver-xsavers-webcollage = %{version}-%{release}
+Obsoletes:	trinity-kscreensaver-xsavers-webcollage < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kscreensaver-xsavers-webcollage = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-tdescreensaver-xsavers-webcollage
 This package give access to the webcollage screensaver through the Trinity
@@ -552,10 +581,10 @@ This package is part of Trinity, and a component of the TDE artwork module.
 %package -n trinity-tdescreensaver-xsavers-extra
 Summary:	Trinity hooks for standard xscreensavers
 Group:		System/GUI/Other
-Requires:	trinity-tdescreensaver-xsavers = %{version}-%{release}
+Requires:	trinity-tdescreensaver-xsavers = %{?epoch:%{epoch}:}%{version}-%{release}
 
-Obsoletes:	trinity-kscreensaver-xsavers-extra < %{version}-%{release}
-Provides:	trinity-kscreensaver-xsavers-extra = %{version}-%{release}
+Obsoletes:	trinity-kscreensaver-xsavers-extra < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kscreensaver-xsavers-extra = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-tdescreensaver-xsavers-extra
 This package allows a smooth integration of the universe xscreensavers
@@ -720,6 +749,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -732,8 +762,10 @@ fi
   \
   %{!?with_xscreensaver:-DWITH_XSCREENSAVER=OFF} \
   %{!?with_libart}:-DWITH_LIBART=OFF} \
-  -DWITH_OPENGL=ON \
+  -DWITH_ALL_OPTIONS=ON \
   -DWITH_ARTS=ON \
+  -DWITH_LIBART=ON \
+  -DWITH_OPENGL=ON \
   -DBUILD_ALL=ON \
   ..
 
diff --git a/redhat/main/tdebase/mgabutton.svg b/redhat/core/tdebase/mgabutton.svg
index 5897323c5..5897323c5 100644
--- a/redhat/main/tdebase/mgabutton.svg
+++ b/redhat/core/tdebase/mgabutton.svg
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.el5 b/redhat/core/tdebase/pamd.kcheckpass-trinity.el5
index 56939d5a9..56939d5a9 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.el5
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.el5
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.el6 b/redhat/core/tdebase/pamd.kcheckpass-trinity.el6
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.el6
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.el6
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.el7 b/redhat/core/tdebase/pamd.kcheckpass-trinity.el7
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.el7
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.el7
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.el8 b/redhat/core/tdebase/pamd.kcheckpass-trinity.el8
index dab729b22..dab729b22 120000
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.el8
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.el8
diff --git a/redhat/core/tdebase/pamd.kcheckpass-trinity.el9 b/redhat/core/tdebase/pamd.kcheckpass-trinity.el9
new file mode 120000
index 000000000..dab729b22
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.el9
@@ -0,0 +1 @@
+pamd.kcheckpass-trinity.el7
\ No newline at end of file
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc30 b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc34
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc30
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc34
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc31 b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc35
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc31
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc35
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc32 b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc36
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc32
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc36
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc33 b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc37
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc33
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc37
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.mdv2011.0 b/redhat/core/tdebase/pamd.kcheckpass-trinity.mdv2011.0
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.mdv2011.0
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.mdv2011.0
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.mga8 b/redhat/core/tdebase/pamd.kcheckpass-trinity.mga8
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.mga8
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.mga8
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.opensuse1220 b/redhat/core/tdebase/pamd.kcheckpass-trinity.opensuse1220
index c6a7c9c90..c6a7c9c90 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.opensuse1220
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.opensuse1220
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos
index ad0fc6da6..ad0fc6da6 120000
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2012 b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2012
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2012
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2012
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2013 b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2013
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2013
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2013
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2014 b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2014
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2014
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2014
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2015 b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2015
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2015
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2015
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2016 b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2016
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2016
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2016
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2017 b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2017
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2017
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2017
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2018 b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2018
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2018
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2018
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.el5 b/redhat/core/tdebase/pamd.kdm-trinity-np.el5
index 8dc8ef34d..8dc8ef34d 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.el5
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.el5
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.el6 b/redhat/core/tdebase/pamd.kdm-trinity-np.el6
index c3f7172de..c3f7172de 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.el6
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.el6
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.el7 b/redhat/core/tdebase/pamd.kdm-trinity-np.el7
index c3f7172de..c3f7172de 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.el7
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.el7
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.el8 b/redhat/core/tdebase/pamd.kdm-trinity-np.el8
index 3415e7d55..3415e7d55 120000
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.el8
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.el8
diff --git a/redhat/core/tdebase/pamd.kdm-trinity-np.el9 b/redhat/core/tdebase/pamd.kdm-trinity-np.el9
new file mode 120000
index 000000000..3415e7d55
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.el9
@@ -0,0 +1 @@
+pamd.kdm-trinity-np.el7
\ No newline at end of file
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc30 b/redhat/core/tdebase/pamd.kdm-trinity-np.fc34
index 0616e66f6..0616e66f6 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.fc30
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.fc34
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc31 b/redhat/core/tdebase/pamd.kdm-trinity-np.fc35
index 0616e66f6..0616e66f6 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.fc31
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.fc35
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc32 b/redhat/core/tdebase/pamd.kdm-trinity-np.fc36
index 0616e66f6..0616e66f6 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.fc32
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.fc36
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc33 b/redhat/core/tdebase/pamd.kdm-trinity-np.fc37
index 0616e66f6..0616e66f6 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.fc33
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.fc37
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.mdv2011.0 b/redhat/core/tdebase/pamd.kdm-trinity-np.mdv2011.0
index 690b4df08..690b4df08 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.mdv2011.0
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.mdv2011.0
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.mga8 b/redhat/core/tdebase/pamd.kdm-trinity-np.mga8
index f884c1de6..f884c1de6 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.mga8
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.mga8
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos
index 5cde6e2c5..5cde6e2c5 120000
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2012 b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2012
index 690b4df08..690b4df08 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2012
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2012
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2013 b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2013
index 690b4df08..690b4df08 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2013
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2013
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2014 b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2014
index 690b4df08..690b4df08 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2014
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2014
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2015 b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2015
index 690b4df08..690b4df08 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2015
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2015
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2016 b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2016
index 690b4df08..690b4df08 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2016
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2016
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2017 b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2017
index 690b4df08..690b4df08 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2017
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2017
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2018 b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2018
index 690b4df08..690b4df08 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2018
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2018
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.el5 b/redhat/core/tdebase/pamd.kdm-trinity.el5
index 30a26ae99..30a26ae99 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity.el5
+++ b/redhat/core/tdebase/pamd.kdm-trinity.el5
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.el6 b/redhat/core/tdebase/pamd.kdm-trinity.el6
index 14f4aa748..14f4aa748 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity.el6
+++ b/redhat/core/tdebase/pamd.kdm-trinity.el6
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.el7 b/redhat/core/tdebase/pamd.kdm-trinity.el7
index 14f4aa748..14f4aa748 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity.el7
+++ b/redhat/core/tdebase/pamd.kdm-trinity.el7
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.el8 b/redhat/core/tdebase/pamd.kdm-trinity.el8
index f85413ec6..f85413ec6 120000
--- a/redhat/main/tdebase/pamd.kdm-trinity.el8
+++ b/redhat/core/tdebase/pamd.kdm-trinity.el8
diff --git a/redhat/core/tdebase/pamd.kdm-trinity.el9 b/redhat/core/tdebase/pamd.kdm-trinity.el9
new file mode 120000
index 000000000..f85413ec6
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kdm-trinity.el9
@@ -0,0 +1 @@
+pamd.kdm-trinity.el7
\ No newline at end of file
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc30 b/redhat/core/tdebase/pamd.kdm-trinity.fc34
index 4e760760f..4e760760f 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity.fc30
+++ b/redhat/core/tdebase/pamd.kdm-trinity.fc34
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc31 b/redhat/core/tdebase/pamd.kdm-trinity.fc35
index 4e760760f..4e760760f 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity.fc31
+++ b/redhat/core/tdebase/pamd.kdm-trinity.fc35
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc32 b/redhat/core/tdebase/pamd.kdm-trinity.fc36
index 4e760760f..4e760760f 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity.fc32
+++ b/redhat/core/tdebase/pamd.kdm-trinity.fc36
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc33 b/redhat/core/tdebase/pamd.kdm-trinity.fc37
index 4e760760f..4e760760f 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity.fc33
+++ b/redhat/core/tdebase/pamd.kdm-trinity.fc37
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.mdv2011.0 b/redhat/core/tdebase/pamd.kdm-trinity.mdv2011.0
index 87d080f58..87d080f58 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity.mdv2011.0
+++ b/redhat/core/tdebase/pamd.kdm-trinity.mdv2011.0
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.mga8 b/redhat/core/tdebase/pamd.kdm-trinity.mga8
index cb0982c9a..cb0982c9a 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity.mga8
+++ b/redhat/core/tdebase/pamd.kdm-trinity.mga8
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.pclos b/redhat/core/tdebase/pamd.kdm-trinity.pclos
index fcc6957f7..fcc6957f7 120000
--- a/redhat/main/tdebase/pamd.kdm-trinity.pclos
+++ b/redhat/core/tdebase/pamd.kdm-trinity.pclos
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.pclos2012 b/redhat/core/tdebase/pamd.kdm-trinity.pclos2012
index 87d080f58..87d080f58 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity.pclos2012
+++ b/redhat/core/tdebase/pamd.kdm-trinity.pclos2012
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.pclos2013 b/redhat/core/tdebase/pamd.kdm-trinity.pclos2013
index 87d080f58..87d080f58 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity.pclos2013
+++ b/redhat/core/tdebase/pamd.kdm-trinity.pclos2013
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.pclos2014 b/redhat/core/tdebase/pamd.kdm-trinity.pclos2014
index 87d080f58..87d080f58 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity.pclos2014
+++ b/redhat/core/tdebase/pamd.kdm-trinity.pclos2014
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.pclos2015 b/redhat/core/tdebase/pamd.kdm-trinity.pclos2015
index 87d080f58..87d080f58 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity.pclos2015
+++ b/redhat/core/tdebase/pamd.kdm-trinity.pclos2015
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.pclos2016 b/redhat/core/tdebase/pamd.kdm-trinity.pclos2016
index 87d080f58..87d080f58 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity.pclos2016
+++ b/redhat/core/tdebase/pamd.kdm-trinity.pclos2016
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.pclos2017 b/redhat/core/tdebase/pamd.kdm-trinity.pclos2017
index 87d080f58..87d080f58 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity.pclos2017
+++ b/redhat/core/tdebase/pamd.kdm-trinity.pclos2017
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.pclos2018 b/redhat/core/tdebase/pamd.kdm-trinity.pclos2018
index 87d080f58..87d080f58 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity.pclos2018
+++ b/redhat/core/tdebase/pamd.kdm-trinity.pclos2018
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.el5 b/redhat/core/tdebase/pamd.kscreensaver-trinity.el5
index 56939d5a9..56939d5a9 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.el5
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.el5
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.el6 b/redhat/core/tdebase/pamd.kscreensaver-trinity.el6
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.el6
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.el6
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.el7 b/redhat/core/tdebase/pamd.kscreensaver-trinity.el7
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.el7
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.el7
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.el8 b/redhat/core/tdebase/pamd.kscreensaver-trinity.el8
index a5fab9e3e..a5fab9e3e 120000
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.el8
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.el8
diff --git a/redhat/core/tdebase/pamd.kscreensaver-trinity.el9 b/redhat/core/tdebase/pamd.kscreensaver-trinity.el9
new file mode 120000
index 000000000..a5fab9e3e
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.el9
@@ -0,0 +1 @@
+pamd.kscreensaver-trinity.el7
\ No newline at end of file
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.mga5 b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc34
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.mga5
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc34
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.mga6 b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc35
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.mga6
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc35
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.mga7 b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc36
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.mga7
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc36
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc30 b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc37
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc30
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc37
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.mdv2011.0 b/redhat/core/tdebase/pamd.kscreensaver-trinity.mdv2011.0
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.mdv2011.0
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.mdv2011.0
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.mga8 b/redhat/core/tdebase/pamd.kscreensaver-trinity.mga8
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.mga8
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.mga8
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos
index 31d43e302..31d43e302 120000
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2012 b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2012
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2012
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2012
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2013 b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2013
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2013
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2013
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2014 b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2014
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2014
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2014
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2015 b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2015
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2015
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2015
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2016 b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2016
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2016
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2016
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2017 b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2017
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2017
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2017
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2018 b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2018
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2018
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2018
diff --git a/redhat/main/tdebase/suse-displaymanagers-tdm b/redhat/core/tdebase/suse-displaymanagers-tdm
index 5bf0eb4ef..5bf0eb4ef 100644
--- a/redhat/main/tdebase/suse-displaymanagers-tdm
+++ b/redhat/core/tdebase/suse-displaymanagers-tdm
diff --git a/redhat/main/tdebase/tdebase.spec b/redhat/core/tdebase/tdebase.spec
index 67d78d852..20d2c036d 100644
--- a/redhat/main/tdebase/tdebase.spec
+++ b/redhat/core/tdebase/tdebase.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tdebase
 %define tde_prefix /opt/trinity
@@ -28,6 +28,7 @@
 %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/tde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
@@ -99,14 +100,14 @@ Source8:	tdm%{?dist}.te
 Source9:	mgabutton.svg
 %endif
 
-Obsoletes:	trinity-kdebase < %{version}-%{release}
-Provides:	trinity-kdebase = %{version}-%{release}
-Obsoletes:	trinity-kdebase-libs < %{version}-%{release}
-Provides:	trinity-kdebase-libs = %{version}-%{release}
-Obsoletes:	trinity-kdebase-extras < %{version}-%{release}
-Provides:	trinity-kdebase-extras = %{version}-%{release}
-Obsoletes:	tdebase < %{version}-%{release}
-Provides:	tdebase = %{version}-%{release}
+Obsoletes:	trinity-kdebase < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdebase = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-kdebase-libs < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdebase-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-kdebase-extras < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdebase-extras = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	tdebase < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	tdebase = %{?epoch:%{epoch}:}%{version}-%{release}
 
 # for set_permissions macro
 %if 0%{?suse_version}
@@ -125,151 +126,10 @@ BuildRequires:	brp-check-trinity
 
 ### Distribution-specific settings ###
 
-# Fedora 15 Theme: "Lovelock"
-%if 0%{?fedora} == 15
-Requires:	lovelock-backgrounds-single
-%define tde_bg /usr/share/backgrounds/lovelock/default/standard/lovelock.png
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-%endif
-
-# Fedora 16 Theme: "Verne"
-%if 0%{?fedora} == 16
-Requires:	verne-backgrounds-single
-%define tde_bg /usr/share/backgrounds/verne/default/standard/verne.png
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-%endif
-
-# Fedora 17 Theme: "Beefy Miracle"
-%if 0%{?fedora} == 17
-Requires:	beefy-miracle-backgrounds-single
-%define tde_bg /usr/share/backgrounds/beefy-miracle/default/standard/beefy-miracle.png
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-%endif
-
-# Fedora 18 Theme: "Spherical Cow"
-%if 0%{?fedora} == 18
-Requires:	spherical-cow-backgrounds-single
-%define tde_bg /usr/share/backgrounds/spherical-cow/default/standard/spherical-cow.png
-Requires:	fedora-logos
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-%endif
-
-# Fedora 19 Theme: "Schroedinger's cat"
-%if 0%{?fedora} == 19
-Requires:	schroedinger-cat-backgrounds-base
-%define tde_bg /usr/share/backgrounds/schroedinger-cat/default/standard/schroedinger-cat.jpg
-Requires:	fedora-logos
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-%endif
-
-# Fedora 20 Theme: "Heisenbug"
-%if 0%{?fedora} == 20
-Requires:	heisenbug-backgrounds-base
-%define tde_bg /usr/share/backgrounds/heisenbug/default/standard/heisenbug.png
-Requires:	fedora-logos
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-%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
-
-# Fedora 22 Theme
-%if 0%{?fedora} == 22
-Requires:	f22-backgrounds-base
-%define tde_bg /usr/share/backgrounds/f22/default/standard/f22.png
-Requires:	fedora-logos
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-%endif
-
-# Fedora 23 Theme
-%if 0%{?fedora} == 23
-Requires:	f23-backgrounds-base
-%define tde_bg /usr/share/backgrounds/f23/default/standard/f23.png
-Requires:	fedora-logos
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-%endif
-
-# Fedora 24 Theme
-%if 0%{?fedora} == 24
-Requires:	f24-backgrounds-base
-%define tde_bg /usr/share/backgrounds/f24/default/standard/f24.png
-Requires:	fedora-logos
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-%endif
-
-# Fedora 25 Theme
-%if 0%{?fedora} == 25
-Requires:	f25-backgrounds-base
-%define tde_bg /usr/share/backgrounds/f25/default/standard/f25.png
-Requires:	fedora-logos
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-%endif
-
-# Fedora 26 Theme
-%if 0%{?fedora} == 26
-Requires:	f26-backgrounds-base
-%define tde_bg /usr/share/backgrounds/f26/default/standard/f26.png
-Requires:	fedora-logos
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-%endif
-
-# Fedora 27 Theme
-%if 0%{?fedora} == 27
-Requires:	f27-backgrounds-base
-%define tde_bg /usr/share/backgrounds/f27/default/standard/f27.png
-Requires:	fedora-logos
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-%endif
-
-# Fedora 28 Theme
-%if 0%{?fedora} == 28
-Requires:	f28-backgrounds-base
-%define tde_bg /usr/share/backgrounds/f28/default/standard/f28.png
-Requires:	fedora-logos
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-%endif
-
-# Fedora 29 Theme
-%if 0%{?fedora} == 29
-Requires:	f29-backgrounds-base
-%define tde_bg /usr/share/backgrounds/f29/default/standard/f29.png
-Requires:	fedora-logos
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-%endif
-
-# Fedora 30 Theme
-%if 0%{?fedora} == 30
-Requires:	f30-backgrounds-base
-%define tde_bg /usr/share/backgrounds/f30/default/standard/f30.png
-Requires:	fedora-logos
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-%endif
-
-# Fedora 31 Theme
-%if 0%{?fedora} == 31
-Requires:	f31-backgrounds-base
-%define tde_bg /usr/share/backgrounds/f31/default/standard/f31.png
-Requires:	fedora-logos
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-%endif
-
-# Fedora 32 Theme
-%if 0%{?fedora} == 32
-Requires:	f32-backgrounds-base
-%define tde_bg /usr/share/backgrounds/f32/default/standard/f32.png
-Requires:	fedora-logos
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-%endif
-
-# Fedora 33 Theme
-%if 0%{?fedora} == 33
-Requires:	f33-backgrounds-base
-%define tde_bg /usr/share/backgrounds/f33/default/standard/f33.png
+# Fedora Theme
+%if 0%{?fedora}
+Requires:	f%{?fedora}-backgrounds-base
+%define tde_bg /usr/share/backgrounds/f%{?fedora}/default/standard/%{?fedora}.png
 Requires:	fedora-logos
 %define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
 %endif
@@ -310,46 +170,19 @@ Requires:	redhat-logos
 %define tde_starticon /usr/share/icons/hicolor/96x96/apps/system-logo-icon.png
 %endif
 
-# Mageia 2 Theme
-%if 0%{?mgaversion} == 2
-Requires:	mageia-theme-Default
-%define tde_bg /usr/share/mga/backgrounds/default.jpg
-%define tde_starticon /usr/share/icons/hicolor/scalable/apps/mageia-menu.svg
-%endif
-
-# Mageia 3 Theme
-%if 0%{?mgaversion} == 3
-Requires:	mageia-theme-Default
-%define tde_bg /usr/share/mga/backgrounds/default.jpg
-%define tde_starticon %{tde_datadir}/oxygen/scalable/mgabutton.svg
-%endif
-
-# Mageia 4 Theme
-%if 0%{?mgaversion} == 4
-Requires:	mageia-theme-Default
-%define tde_bg /usr/share/mga/backgrounds/default.jpg
-%define tde_starticon %{tde_datadir}/oxygen/scalable/mgabutton.svg
-%endif
-
-# Mageia 5 Theme
-%if 0%{?mgaversion} == 5
-Requires:	mageia-theme-Default
-%define tde_bg /usr/share/mga/backgrounds/default.jpg
-%define tde_starticon %{tde_datadir}/oxygen/scalable/mgabutton.svg
-%endif
-
-# Mageia 6 Theme
-%if 0%{?mgaversion} == 6
-Requires:	mageia-theme-Default
-%define tde_bg /usr/share/mga/backgrounds/default.jpg
-%define tde_starticon %{tde_datadir}/oxygen/scalable/mgabutton.svg
+# RHEL 9 Theme
+%if 0%{?rhel} == 9
+#Requires:	redhat-backgrounds
+Requires:	redhat-logos
+%define tde_bg /usr/share/backgrounds/rocky-default-9-abstract-1-day.png
+%define tde_starticon /usr/share/icons/hicolor/96x96/apps/system-logo-icon.png
 %endif
 
-# Mageia 7 Theme
-%if 0%{?mgaversion} == 7
+# Mageia Theme
+%if 0%{?mgaversion}
 Requires:	mageia-theme-Default
 %define tde_bg /usr/share/mga/backgrounds/default.jpg
-%define tde_starticon %{tde_datadir}/oxygen/scalable/mgabutton.svg
+%define tde_starticon %{tde_datadir}/icons/oxygen/scalable/mgabutton.svg
 %endif
 
 # Mandriva 2011 Theme: "rosa"
@@ -365,69 +198,7 @@ Requires:	desktop-common-data
 %define tde_starticon /usr/share/icons/pclinuxos.png
 %endif
 
-# OpenSuse 11.4 Theme
-%if "%{?suse_version}" == "1140"
-Requires:	hicolor-icon-theme-branding
-%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
-%endif
-
-# OpenSuse 12.2 Theme
-%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
-%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
-%endif
-
-# OpenSuse 12.3 Theme
-%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
-%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
-%endif
-
-# OpenSuse 13.1 Theme
-%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
-%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
-%endif
-
-# OpenSuse 13.2 Theme
-%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
-%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
-%endif
-
-# OpenSuse 42.1 Theme
-%if "%{?sle_version}" == "120100"
-Requires:	wallpaper-branding = 42.1
-%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
-Requires:	hicolor-icon-theme-branding
-%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
-%endif
-
-# OpenSuse 42.2 Theme
-%if "%{?sle_version}" == "120200"
-Requires:	wallpaper-branding
-%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
-Requires:	hicolor-icon-theme-branding
-%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
-%endif
-
-# OpenSuse 42.3 Theme
-%if "%{?sle_version}" == "120300"
-Requires:	wallpaper-branding
-%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
-Requires:	hicolor-icon-theme-branding
-%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
-%endif
-
-# OpenSuse 15.0 Theme
+# OpenSuse 15.x Theme
 %if "%{?suse_version}" == "1500"
 Requires:	wallpaper-branding
 %define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
@@ -435,22 +206,6 @@ Requires:	hicolor-icon-theme-branding
 %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
 %endif
 
-# OpenSuse 15.1 Theme
-%if "%{?suse_version}" == "1510"
-Requires:	wallpaper-branding
-%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
-Requires:	hicolor-icon-theme-branding
-%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
-%endif
-
-# OpenSuse 15.2 Theme
-%if "%{?suse_version}" == "1520"
-Requires:	wallpaper-branding
-%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
-Requires:	hicolor-icon-theme-branding
-%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
-%endif
-
 # OpenSuse TW Theme
 %if "%{?suse_version}" == "1550"
 Requires:	wallpaper-branding
@@ -462,7 +217,7 @@ Requires:	hicolor-icon-theme-branding
 BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	make
 BuildRequires:	fdupes
@@ -507,8 +262,13 @@ BuildRequires:	pam-devel
 BuildRequires:	%{_lib}usb1.0-devel
 BuildRequires:	%{_lib}usb-compat0.1-devel
 %else
+%if 0%{?fedora} >= 37
+BuildRequires:	libusb1-devel
+BuildRequires:	libusb-compat-0.1-devel
+%else
 BuildRequires:	libusb-devel
 %endif
+%endif
 
 # ESOUND support
 %if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
@@ -521,7 +281,7 @@ BuildRequires:	libidn-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?rhel} && 0%{?rhel} <= 8 || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gamin 1
 BuildRequires:	gamin-devel
 %endif
@@ -590,7 +350,8 @@ BuildRequires:	OpenEXR-devel
 #  RHEL 5: available in centos-extras
 #  RHEL 6: available in EPEL
 #  RHEL 7: available in NUX
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?suse_version}
+#  RHEL 8: available in EPEL
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || ( 0%{?rhel} >= 5 && 0%{?rhel} <= 8 ) || 0%{?suse_version}
 %define with_xscreensaver 1
 
 %if 0%{?fedora} || 0%{?rhel} >= 5
@@ -620,7 +381,9 @@ BuildRequires:	%{_lib}xscrnsaver%{?mgaversion:1}-devel
 %endif
 BuildRequires:	xscreensaver
 BuildRequires:	xscreensaver-base
+%if 0%{?pclinuxos} == 0
 BuildRequires:	xscreensaver-extrusion
+%endif
 BuildRequires:	xscreensaver-gl
 %endif
 %endif
@@ -743,12 +506,15 @@ BuildRequires:	x11-proto-devel
 BuildRequires:	xorg-x11-proto-devel
 %endif
 
-%if 0%{?rhel} >= 5 || 0%{?fedora}
+%if ( 0%{?rhel} >= 5 && 0%{?rhel} <= 8 ) || 0%{?fedora}
 BuildRequires:	xorg-x11-font-utils
 %endif
 
-%if 0%{?suse_version} >= 1220
+%if 0%{?suse_version} >= 1220 || 0%{?fedora} >= 34
 BuildRequires:	font-util
+%endif
+
+%if 0%{?suse_version} >= 1220 || 0%{?fedora} >= 34 || 0%{?rhel} >= 9
 BuildRequires:	bdftopcf
 %endif
 
@@ -780,7 +546,7 @@ BuildRequires:		libr-devel >= 0.6.0
 %endif
 
 # RPC support
-%if 0%{?fedora} >= 28 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 8
+%if 0%{?fedora} >= 28 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 8 || 0%{?pclinuxos}
 BuildRequires:		libtirpc-devel
 BuildRequires:		rpcgen
 %if 0%{?fedora}
@@ -799,39 +565,49 @@ BuildRequires:	checkpolicy
 BuildRequires:	selinux-policy-devel
 %endif
 
+# LIBSSH support
+%if 0%{?rhel} == 6
+%define with_libssh 0
+%else
+%define with_libssh 1
+%endif
+%if 0%{?with_libssh}
+BuildRequires:	libssh-devel
+%endif
+
 # tdebase is a metapackage that installs all sub-packages
-Requires: %{name}-runtime-data-common = %{version}-%{release}
-Requires: %{name}-data = %{version}-%{release}
-Requires: %{name}-bin = %{version}-%{release}
-Requires: %{name}-tdeio-plugins = %{version}-%{release}
-Requires: %{name}-tdeio-pim-plugins = %{version}-%{release}
-Requires: trinity-kappfinder = %{version}-%{release}
-Requires: trinity-kate = %{version}-%{release}
-Requires: trinity-kwrite = %{version}-%{release}
-Requires: trinity-kcontrol = %{version}-%{release}
-Requires: trinity-tdepasswd = %{version}-%{release}
-Requires: trinity-tdeprint = %{version}-%{release}
-Requires: trinity-kdesktop = %{version}-%{release}
-Requires: trinity-tdm = %{version}-%{release}
-Requires: trinity-kfind = %{version}-%{release}
-Requires: trinity-khelpcenter = %{version}-%{release}
-Requires: trinity-kicker = %{version}-%{release}
-Requires: trinity-klipper = %{version}-%{release}
-Requires: trinity-kmenuedit = %{version}-%{release}
-Requires: trinity-konqueror = %{version}-%{release}
-Requires: trinity-konqueror-nsplugins = %{version}-%{release}
-Requires: trinity-konsole = %{version}-%{release}
-Requires: trinity-kpager = %{version}-%{release}
-Requires: trinity-kpersonalizer = %{version}-%{release}
-Requires: trinity-ksmserver = %{version}-%{release}
-Requires: trinity-ksplash = %{version}-%{release}
-Requires: trinity-ksysguard = %{version}-%{release}
-Requires: trinity-ksysguardd = %{version}-%{release}
-Requires: trinity-ktip = %{version}-%{release}
-Requires: trinity-twin = %{version}-%{release}
-Requires: trinity-libkonq = %{version}-%{release}
-Requires: %{name}-libtqt3-integration = %{version}-%{release}
-Requires: %{name}-tdeio-smb-plugin = %{version}-%{release}
+Requires: %{name}-runtime-data-common = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-bin = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-tdeio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-tdeio-pim-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kappfinder = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kate = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kwrite = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kcontrol = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-tdepasswd = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-tdeprint = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kdesktop = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-tdm = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kfind = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-khelpcenter = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kicker = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-klipper = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kmenuedit = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-konqueror = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-konqueror-nsplugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-konsole = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kpager = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kpersonalizer = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ksmserver = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ksplash = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ksysguard = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ksysguardd = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ktip = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-twin = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-libkonq = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-libtqt3-integration = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-tdeio-smb-plugin = %{?epoch:%{epoch}:}%{version}-%{release}
  
 Requires:	trinity-arts >= %{tde_epoch}:1.5.10
 Requires:	trinity-tdelibs >= %{tde_version}
@@ -870,26 +646,26 @@ web browser, X terminal emulator, and many other programs and components.
 %package devel
 Summary:	%{summary} - Development files
 Group:		Development/Libraries/Other
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
 Requires:	trinity-tdelibs-devel >= %{tde_version}
 
-Requires:	%{name}-bin-devel = %{version}-%{release}
-Requires:	trinity-kate-devel = %{version}-%{release}
-Requires:	trinity-kcontrol-devel = %{version}-%{release}
-Requires:	trinity-kdesktop-devel = %{version}-%{release}
-Requires:	trinity-kicker-devel = %{version}-%{release}
-Requires:	trinity-konqueror-devel = %{version}-%{release}
-Requires:	trinity-ksplash-devel = %{version}-%{release}
-Requires:	trinity-ksysguard-devel = %{version}-%{release}
-Requires:	trinity-libkonq-devel = %{version}-%{release}
-Requires:	trinity-tdm-devel = %{version}-%{release}
-Requires:	trinity-twin-devel = %{version}-%{release}
-
-Provides:	trinity-kdebase-devel = %{version}-%{release}
-Obsoletes:	trinity-kdebase-devel < %{version}-%{release}
-Provides:	tdebase-devel = %{version}-%{release}
-Obsoletes:	tdebase-devel < %{version}-%{release}
+Requires:	%{name}-bin-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kate-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kcontrol-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kdesktop-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kicker-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-konqueror-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-ksplash-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-ksysguard-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkonq-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-tdm-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-twin-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Provides:	trinity-kdebase-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-kdebase-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	tdebase-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	tdebase-devel < %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description devel
 This is a meta-package that installs all tdebase development packages.
@@ -908,12 +684,12 @@ Kate plugins or TWin styles.
 Summary:	PIM TDEIOslaves from %{name}
 Group:		System/GUI/Other
 
-Provides:	trinity-kdebase-pim-ioslaves = %{version}-%{release}
-Obsoletes:	trinity-kdebase-pim-ioslaves < %{version}-%{release}
-Provides:	tdebase-kio-pim-plugins = %{version}-%{release}
-Obsoletes:	tdebase-kio-pim-plugins < %{version}-%{release}
-Provides:	trinity-tdebase-kio-pim-plugins = %{version}-%{release}
-Obsoletes:	trinity-tdebase-kio-pim-plugins < %{version}-%{release}
+Provides:	trinity-kdebase-pim-ioslaves = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-kdebase-pim-ioslaves < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	tdebase-kio-pim-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	tdebase-kio-pim-plugins < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-tdebase-kio-pim-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-tdebase-kio-pim-plugins < %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description tdeio-pim-plugins
 Protocol handlers (TDEIOslaves) for personal information management, including:
@@ -947,8 +723,8 @@ Protocol handlers (TDEIOslaves) for personal information management, including:
 Summary:	Shared common files for Trinity and KDE4
 Group:		System/GUI/Other
 
-Provides:	tdebase-runtime-data-common = %{version}-%{release}
-Obsoletes:	tdebase-runtime-data-common < %{version}-%{release}
+Provides:	tdebase-runtime-data-common = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	tdebase-runtime-data-common < %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description runtime-data-common
 Shared common files for both Trinity and KDE4
@@ -974,7 +750,7 @@ Such as the desktop right-click-"Create New" list
 %package -n trinity-kappfinder
 Summary:	Non-TDE application finder for TDE
 Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kappfinder
 kappfinder searches your workstation for many common applications and
@@ -987,6 +763,7 @@ creates menu entries for them.
 %{tde_datadir}/applnk/System/kappfinder.desktop
 %{tde_datadir}/apps/kappfinder
 %{tde_datadir}/icons/hicolor/*/apps/kappfinder.png
+%{tde_mandir}/man1/kappfinder.1*
 
 ##########
 
@@ -1006,9 +783,9 @@ This package contains the kateinterface library.
 %package -n trinity-kate
 Summary:	Advanced text editor for TDE
 Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	trinity-kwrite = %{version}-%{release}
-Requires:	trinity-libkateinterfaces = %{version}-%{release}
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kwrite = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkateinterfaces = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kate
 Kate is a multi document editor, based on a rewritten version of the kwrite
@@ -1045,13 +822,14 @@ Some random features:
 %{tde_datadir}/icons/hicolor/*/apps/kate2.svgz
 %{tde_datadir}/servicetypes/kateplugin.desktop
 %{tde_tdedocdir}/HTML/en/kate/
+%{tde_mandir}/man1/kate.1*
 
 ##########
 
 %package -n trinity-kate-devel
 Summary:	Development files for kate
 Group:		Development/Libraries/Other
-Requires:	trinity-kate = %{version}-%{release}
+Requires:	trinity-kate = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kate-devel
 This package contains the development files fare Kate.
@@ -1069,8 +847,8 @@ This package contains the development files fare Kate.
 %package -n trinity-kwrite
 Summary:	Advanced text editor for TDE
 Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	trinity-libkateinterfaces = %{version}-%{release}
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkateinterfaces = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kwrite
 Kwrite is an advanced text editor for TDE.
@@ -1087,14 +865,14 @@ Kwrite is an advanced text editor for TDE.
 %{tde_datadir}/icons/hicolor/*/apps/kwrite.png
 %{tde_datadir}/icons/hicolor/*/apps/kwrite2.svgz
 %{tde_tdedocdir}/HTML/en/kwrite/
-
+%{tde_mandir}/man1/kwrite.1*
 
 ##########
 
 %package -n trinity-kcontrol
 Summary:	Control center for TDE
 Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 # Requires 'usb.ids'
 Requires:		usbutils
@@ -1399,7 +1177,7 @@ plugdev group.
 %package -n trinity-kcontrol-devel
 Summary:	Development files for kcontrol
 Group:		Development/Libraries/Other
-Requires:	trinity-kcontrol = %{version}-%{release}
+Requires:	trinity-kcontrol = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kcontrol-devel
 %{summary}.
@@ -1414,7 +1192,7 @@ Requires:	trinity-kcontrol = %{version}-%{release}
 %package bin
 Summary:	Core binaries for the TDE base module
 Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	pam
 %if 0%{?rhel} >= 7
 Requires:	xorg-x11-server-Xorg
@@ -1422,8 +1200,8 @@ Requires:	xorg-x11-drv-evdev
 Requires:	dejavu-sans-fonts
 %endif
 
-Provides:	tdebase-bin = %{version}-%{release}
-Obsoletes:	tdebase-bin < %{version}-%{release}
+Provides:	tdebase-bin = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	tdebase-bin < %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description bin
 This package contains miscellaneous programs needed by other
@@ -1491,9 +1269,7 @@ TDE applications, particularly those in the TDE base module.
 %{tde_libdir}/libtdeinit_kxkb.la
 %{tde_libdir}/libtdeinit_kxkb.so
 %{tde_libdir}/libkhotkeys_shared.so.*
-%if "%{?tde_version}" != "14.0.9"
 %{tde_tdeappdir}/kdcop.desktop
-%endif
 %{tde_tdeappdir}/keyboard.desktop
 %{tde_tdeappdir}/keyboard_layout.desktop
 %{tde_tdeappdir}/khotkeys.desktop
@@ -1515,6 +1291,22 @@ TDE applications, particularly those in the TDE base module.
 %{tde_tdedocdir}/HTML/en/tdesu/
 %{tde_tdedocdir}/HTML/en/knetattach/
 %{tde_tdedocdir}/HTML/en/kxkb/
+%{tde_mandir}/man1/drkonqi.1*
+%{tde_mandir}/man1/kblankscrn.kss.1*
+%{tde_mandir}/man1/kcheckpass.1*
+%{tde_mandir}/man1/kcminit.1*
+%{tde_mandir}/man1/kdcop.1*
+%{tde_mandir}/man1/kdialog.1*
+%{tde_mandir}/man1/khotkeys.1*
+%{tde_mandir}/man1/knetattach.1*
+%{tde_mandir}/man1/krandom.kss.1*
+%{tde_mandir}/man1/kreadconfig.1*
+%{tde_mandir}/man1/kstart.1*
+%{tde_mandir}/man1/ksystraycmd.1*
+%{tde_mandir}/man1/kwriteconfig.1*
+%{tde_mandir}/man1/kxkb.1*
+%{tde_mandir}/man1/tdedebugdialog.1*
+%{tde_mandir}/man1/tdesu.1*
 
 # SETUID binaries
 # Some setuid binaries need special care
@@ -1551,11 +1343,11 @@ TDE applications, particularly those in the TDE base module.
 %package bin-devel
 Summary:	Development files for core binaries for the TDE base module
 Group:		Development/Libraries/Other
-Requires:	%{name}-bin = %{version}-%{release}
+Requires:	%{name}-bin = %{?epoch:%{epoch}:}%{version}-%{release}
 %{?xtst_devel:Requires: %{xtst_devel}}
 
-Obsoletes:	tdebase-bin-devel < %{version}-%{release}
-Provides:	tdebase-bin-devel = %{version}-%{release}
+Obsoletes:	tdebase-bin-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	tdebase-bin-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description bin-devel
 This package contains the development files for core binaries for 
@@ -1571,10 +1363,10 @@ the TDE base module
 %package data
 Summary:	Shared data files for the TDE base module
 Group:		System/GUI/Other
-Requires:	%{name}-runtime-data-common = %{version}-%{release}
+Requires:	%{name}-runtime-data-common = %{?epoch:%{epoch}:}%{version}-%{release}
 
-Obsoletes:	tdebase-data < %{version}-%{release}
-Provides:	tdebase-data = %{version}-%{release}
+Obsoletes:	tdebase-data < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	tdebase-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description data
 This package contains the architecture-independent shared data files
@@ -1869,22 +1661,22 @@ fi
 %package tdeio-plugins
 Summary:	Core I/O slaves for TDE
 Group:		System/GUI/Other
-Requires:	trinity-kdesktop = %{version}-%{release}
+Requires:	trinity-kdesktop = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	cyrus-sasl
 Requires:	psmisc
 %if 0%{?with_hal}
 Requires:	hal >= 0.5
 %endif
-%if 0%{?rhel} == 4 || 0%{?suse_version}
-Requires:	cryptsetup
-%else
-Requires:	cryptsetup-luks
-%endif
+#%if 0%{?rhel} == 4 || 0%{?suse_version} || 0%{?fedora} >= 35
+#Requires:	cryptsetup
+#%else
+#Requires:	cryptsetup-luks
+#%endif
 
-Obsoletes:	tdebase-kio-plugins < %{version}-%{release}
-Provides:	tdebase-kio-plugins = %{version}-%{release}
-Obsoletes:	trinity-tdebase-kio-plugins < %{version}-%{release}
-Provides:	trinity-tdebase-kio-plugins = %{version}-%{release}
+Obsoletes:	tdebase-kio-plugins < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	tdebase-kio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-tdebase-kio-plugins < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-tdebase-kio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description tdeio-plugins
 This package includes the base tdeioslaves. They include, amongst many
@@ -1954,8 +1746,10 @@ group.
 %{tde_tdelibdir}/tdeio_remote.so
 %{tde_tdelibdir}/tdeio_settings.la
 %{tde_tdelibdir}/tdeio_settings.so
+%if 0%{?with_libssh}
 %{tde_tdelibdir}/tdeio_sftp.la
 %{tde_tdelibdir}/tdeio_sftp.so
+%endif
 %{tde_tdelibdir}/tdeio_system.la
 %{tde_tdelibdir}/tdeio_system.so
 %{tde_tdelibdir}/tdeio_tar.la
@@ -2011,7 +1805,9 @@ group.
 %{tde_datadir}/services/programs.protocol
 %{tde_datadir}/services/remote.protocol
 %{tde_datadir}/services/settings.protocol
+%if 0%{?with_libssh}
 %{tde_datadir}/services/sftp.protocol
+%endif
 %{tde_datadir}/services/system.protocol
 %{tde_datadir}/services/tar.protocol
 %{tde_datadir}/services/textthumbnail.desktop
@@ -2022,6 +1818,9 @@ group.
 %{tde_datadir}/servicetypes/thumbcreator.desktop
 %{tde_datadir}/services/tdefile_trash.desktop
 %{tde_tdedocdir}/HTML/en/tdeioslave/
+%{tde_mandir}/man1/ktrash.1*
+%{tde_mandir}/man1/tdeio_media_mounthelper.1*
+%{tde_mandir}/man1/tdeio_system_documenthelper.1*
 
 %if 0%{?with_exr}
 %{tde_tdelibdir}/exrthumbnail.la
@@ -2046,8 +1845,8 @@ group.
 Summary:	Password changer for TDE
 Group:		System/GUI/Other
 
-Obsoletes:	trinity-kdepasswd < %{version}-%{release}
-Provides:	trinity-kdepasswd = %{version}-%{release}
+Obsoletes:	trinity-kdepasswd < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdepasswd = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-tdepasswd
 This is a simple application which allows users to change their
@@ -2091,13 +1890,14 @@ system passwords.
 %{_datadir}/faces/Star.png
 %{_datadir}/faces/Teddybear.png
 %{_datadir}/faces/Turtle.png
+%{tde_mandir}/man1/tdepasswd.1*
 
 ##########
 
 %package -n trinity-tdeprint
 Summary:	Print system for TDE
 Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	psutils
 
 %description -n trinity-tdeprint
@@ -2153,15 +1953,18 @@ Installation of smbclient will make you able to use smb shared printers.
 %{tde_tdedocdir}/HTML/en/tdeprint/
 %{tde_tdedocdir}/HTML/en/tdeprintfax/
 %{tde_tdedocdir}/HTML/en/kjobviewer/
+%{tde_mandir}/man1/kjobviewer.1*
+%{tde_mandir}/man1/kprinter.1*
+%{tde_mandir}/man1/tdeprintfax.1*
 
 ##########
 
 %package -n trinity-kdesktop
 Summary:	Miscellaneous binaries and files for the TDE desktop
 Group:		System/GUI/Other
-Requires:	%{name}-bin = %{version}-%{release}
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	trinity-libkonq = %{version}-%{release}
+Requires:	%{name}-bin = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkonq = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	eject
 %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
 Requires:	xdg-utils
@@ -2197,7 +2000,7 @@ the TDE desktop.
 %package -n trinity-kdesktop-devel
 Summary:	Development files for kdesktop
 Group:		Development/Libraries/Other
-Requires:	trinity-kdesktop = %{version}-%{release}
+Requires:	trinity-kdesktop = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kdesktop-devel
 This package contains the development files for kdesktop.
@@ -2213,8 +2016,8 @@ This package contains the development files for kdesktop.
 %package -n trinity-tdm
 Summary:	X Display manager for TDE
 Group:		System/GUI/Other
-Requires:	%{name}-bin = %{version}-%{release}
-Requires:	%{name}-data = %{version}-%{release}
+Requires:	%{name}-bin = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	pam
 Requires:	logrotate
 
@@ -2285,6 +2088,12 @@ already. Most users won't need this.
 %config(noreplace) %{_sysconfdir}/pam.d/tdm-trinity
 %config(noreplace) %{_sysconfdir}/pam.d/tdm-trinity-np
 %endif
+%{tde_mandir}/man1/gentdmconf.1*
+%{tde_mandir}/man1/krootimage.1*
+%{tde_mandir}/man1/tdm.1*
+%{tde_mandir}/man1/tdmctl.1*
+%{tde_mandir}/man1/tdm_config.1*
+%{tde_mandir}/man1/tdm_greet.1*
 
 %if "%{?tde_version}" == "14.1.0"
 %{tde_bindir}/tdecryptocardwatcher
@@ -2303,7 +2112,7 @@ already. Most users won't need this.
 %{_sysconfdir}/init.d/xdm.tde
 %endif
 %if 0%{?suse_version} >= 1210
-/usr/lib/X11/displaymanagers/tdm
+/usr/lib/X11/displaymanagers/
 %endif
 %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 6
 /usr/lib/systemd/system/tdm.service
@@ -2414,7 +2223,7 @@ fi
 %package -n trinity-tdm-devel
 Summary:	Development files for tdm
 Group:		Development/Libraries/Other
-Requires:	trinity-tdm = %{version}-%{release}
+Requires:	trinity-tdm = %{?epoch:%{epoch}:}%{version}-%{release}
 %{?xtst_devel:Requires: %{xtst_devel}}
 
 %description -n trinity-tdm-devel
@@ -2429,7 +2238,7 @@ This package contains the development files for TDM.
 %package -n trinity-kfind
 Summary:	File-find utility for TDE
 Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kfind
 kfind can be used to find files and directories on your
@@ -2446,13 +2255,14 @@ workstations.
 %{tde_datadir}/services/kfindpart.desktop
 %{tde_datadir}/servicetypes/findpart.desktop
 %{tde_tdedocdir}/HTML/en/kfind/
+%{tde_mandir}/man1/kfind.1*
 
 ##########
 
 %package -n trinity-khelpcenter
 Summary:	Help center for TDE
 Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	htdig
 
 %description -n trinity-khelpcenter
@@ -2485,7 +2295,7 @@ documentation.
 %package -n trinity-kicker
 Summary:	Desktop panel for TDE
 Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kicker
 Kicker provides the TDE panel on you desktop. It can be used as a
@@ -2588,21 +2398,24 @@ functionality.
 %{tde_datadir}/icons/crystalsvg/*/apps/kicker.png
 %{tde_datadir}/icons/crystalsvg/*/apps/panel.png
 %{tde_datadir}/icons/crystalsvg/*/apps/runprocesscatcher.png
-%{tde_datadir}/icons/crystalsvg/*/apps/window_list.png
 %{tde_datadir}/icons/crystalsvg/*/apps/kbinaryclock.svgz
 %{tde_datadir}/icons/crystalsvg/*/apps/systemtray.svgz
 %{tde_datadir}/servicetypes/kickoffsearchplugin.desktop
 %{tde_tdedocdir}/HTML/en/kicker/
 %if 0%{?mgaversion} >= 3
-%{tde_datadir}/oxygen/scalable/mgabutton.svg
+%{tde_datadir}/icons/oxygen/scalable/mgabutton.svg
 %endif
+%{tde_mandir}/man1/appletproxy.1*
+%{tde_mandir}/man1/extensionproxy.1*
+%{tde_mandir}/man1/kasbar.1*
+%{tde_mandir}/man1/kicker.1*
 
 ##########
 
 %package -n trinity-kicker-devel
 Summary:	Development files for kicker
 Group:		Development/Libraries/Other
-Requires:	trinity-kicker = %{version}-%{release}
+Requires:	trinity-kicker = %{?epoch:%{epoch}:}%{version}-%{release}
 %{?xtst_devel:Requires: %{xtst_devel}}
 
 %description -n trinity-kicker-devel
@@ -2628,7 +2441,7 @@ This package contains the development files for kicker.
 %package -n trinity-klipper
 Summary:	Clipboard utility for Trinity
 Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-klipper
 klipper provides standard clipboard functions (cut and paste, history
@@ -2661,7 +2474,7 @@ web browser if the clipboard contains a URL.
 %package -n trinity-kmenuedit
 Summary:	Menu editor for TDE
 Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kmenuedit
 The TDE menu editor allows you to make customisations to the TDE menu
@@ -2684,18 +2497,19 @@ structure.
 %{tde_datadir}/apps/kcontroledit/
 %{tde_datadir}/apps/kmenuedit/
 %{tde_tdedocdir}/HTML/en/kmenuedit/
+%{tde_mandir}/man1/kmenuedit.1*
 
 ##########
 
 %package -n trinity-konqueror
 Summary:	TDE's advanced file manager, web browser and document viewer
 Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	trinity-kcontrol = %{version}-%{release}
-Requires:	%{name}-tdeio-plugins = %{version}-%{release}
-Requires:	trinity-kdesktop = %{version}-%{release}
-Requires:	trinity-kfind = %{version}-%{release}
-Requires:	trinity-libkonq = %{version}-%{release}
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kcontrol = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	%{name}-tdeio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kdesktop = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kfind = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkonq = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-konqueror
 Konqueror is the file manager for the Trinity Desktop Environment.
@@ -2816,6 +2630,9 @@ ever launching another application.
 %{tde_datadir}/servicetypes/konqaboutpage.desktop
 %{tde_tdedocdir}/HTML/en/konqueror/
 %{tde_tdedocdir}/HTML/en/keditbookmarks/
+%{tde_mandir}/man1/keditbookmarks.1*
+%{tde_mandir}/man1/kfmclient.1*
+%{tde_mandir}/man1/konqueror.1*
 
 %post -n trinity-konqueror
 if [ $1 -eq 1 ]; then
@@ -2838,7 +2655,7 @@ fi
 %package -n trinity-konqueror-devel
 Summary:	Development files for konqueror
 Group:		Development/Libraries/Other
-Requires:	trinity-konqueror = %{version}-%{release}
+Requires:	trinity-konqueror = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-konqueror-devel
 This package contains the development files for konqueror.
@@ -2855,7 +2672,7 @@ This package contains the development files for konqueror.
 %package -n trinity-konqueror-nsplugins
 Summary:	Netscape plugin support for Konqueror
 Group:		System/GUI/Other
-Requires:	trinity-konqueror = %{version}-%{release}
+Requires:	trinity-konqueror = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-konqueror-nsplugins
 This package includes support for Netscape plugins in Konqueror.
@@ -2876,7 +2693,7 @@ This package includes support for Netscape plugins in Konqueror.
 %package -n trinity-konsole
 Summary:	X terminal emulator for TDE
 Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-konsole
 Konsole is an X terminal emulation which provides a command-line interface
@@ -2923,13 +2740,14 @@ Using Konsole, a user can open:
 %{tde_tdedocdir}/HTML/en/konsole/
 %{tde_tdedocdir}/HTML/en/kcontrol/kcmkonsole/
 %config %{_sysconfdir}/fonts/conf.d/99-konsole.conf
+%{tde_mandir}/man1/konsole.1*
 
 ##########
 
 %package -n trinity-kpager
 Summary:	Desktop pager for TDE
 Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kpager
 This package contains TDE's desktop pager, which displays your virtual
@@ -2943,13 +2761,14 @@ applications. It is used to switch between applications or desktops.
 %{tde_datadir}/applnk/Utilities/kpager.desktop
 %{tde_datadir}/icons/hicolor/*/apps/kpager.png
 %{tde_tdedocdir}/HTML/en/kpager/
+%{tde_mandir}/man1/kpager.1*
 
 ##########
 
 %package -n trinity-kpersonalizer
 Summary:	Installation personalizer for TDE
 Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kpersonalizer
 TDE Personalizer is the application that configures the TDE desktop for you.
@@ -2964,14 +2783,17 @@ automatically started. KPersonalizer can also be called later.
 %{tde_datadir}/applnk/System/kpersonalizer.desktop
 %{tde_datadir}/apps/kpersonalizer/
 %{tde_datadir}/icons/crystalsvg/*/apps/kpersonalizer.png
+%{tde_mandir}/man1/kpersonalizer.1*
 
 ##########
 
 %package -n trinity-ksmserver
 Summary:	Session manager for TDE
 Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	trinity-twin = %{version}-%{release}
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-twin = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	xmessage
+Requires:	xprop
 
 %description -n trinity-ksmserver
 This package contains the TDE session manager. It is responsible for
@@ -2999,6 +2821,7 @@ TDE will start, but many good defaults will not be set.
 %{tde_datadir}/apps/tdeconf_update/ksmserver.upd
 %{tde_datadir}/apps/tdeconf_update/move_session_config.sh
 %{tde_datadir}/apps/ksmserver/
+%{tde_mandir}/man1/starttde.1*
 
 %post -n trinity-ksmserver
 %if 0%{?mdkversion} || 0%{?mgaversion}
@@ -3025,7 +2848,7 @@ update-alternatives --remove default-xsession.desktop /usr/share/xsessions/tde.d
 %package -n trinity-ksplash
 Summary:	The TDE splash screen
 Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-ksplash
 This package includes the TDE Splash screen, which is seen when
@@ -3061,7 +2884,7 @@ a TDE session is launched.
 %package -n trinity-ksplash-devel
 Summary:	Development files for ksplash
 Group:		Development/Libraries/Other
-Requires:	trinity-ksplash = %{version}-%{release}
+Requires:	trinity-ksplash = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-ksplash-devel
 This package contains the development files for ksplash.
@@ -3077,8 +2900,8 @@ This package contains the development files for ksplash.
 %package -n trinity-ksysguard
 Summary:	System guard for TDE
 Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	trinity-ksysguardd = %{version}-%{release}
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-ksysguardd = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-ksysguard
 TDE System Guard allows you to monitor various statistics about your
@@ -3103,7 +2926,7 @@ computer.
 %package -n trinity-ksysguard-devel
 Summary:	Development files for ksysguard
 Group:		Development/Libraries/Other
-Requires:	trinity-ksysguard = %{version}-%{release}
+Requires:	trinity-ksysguard = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-ksysguard-devel
 This package contains the development files for ksysguard.
@@ -3119,7 +2942,7 @@ This package contains the development files for ksysguard.
 %package -n trinity-ksysguardd
 Summary:	System guard daemon for TDE
 Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-ksysguardd
 TDE System Guard Daemon is the daemon part of ksysguard. The daemon can
@@ -3136,7 +2959,7 @@ to monitor it through the daemon running there.
 %package -n trinity-ktip
 Summary:	Useful tips for TDE
 Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-ktip
 ktip provides many useful tips on using TDE when you log in.
@@ -3155,7 +2978,7 @@ ktip provides many useful tips on using TDE when you log in.
 %package -n trinity-twin
 Summary:	The TDE window manager
 Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-twin
 This package contains the default X window manager for TDE.
@@ -3208,7 +3031,7 @@ This package contains the default X window manager for TDE.
 %package -n trinity-twin-devel
 Summary:	Development files for twin
 Group:		Development/Libraries/Other
-Requires:	trinity-twin = %{version}-%{release}
+Requires:	trinity-twin = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-twin-devel
 This package contains the development files for twin.
@@ -3260,8 +3083,8 @@ Konqueror and the kdesktop package.
 Summary:	Integration library between TQt3 and TDE
 Group:		System/GUI/Other
 
-Obsoletes:	tdebase-libtqt3-integration < %{version}-%{release}
-Provides:	tdebase-libtqt3-integration = %{version}-%{release}
+Obsoletes:	tdebase-libtqt3-integration < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	tdebase-libtqt3-integration = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description libtqt3-integration
 These libraries allow you to use TDE dialogs in native TQt3 applications.
@@ -3278,7 +3101,7 @@ These libraries allow you to use TDE dialogs in native TQt3 applications.
 %package -n trinity-libkonq-devel
 Summary:	Development files for Konqueror's core libraries
 Group:		Development/Libraries/Other
-Requires:	trinity-libkonq = %{version}-%{release}
+Requires:	trinity-libkonq = %{?epoch:%{epoch}:}%{version}-%{release}
 %{?xtst_devel:Requires: %{xtst_devel}}
 
 %description -n trinity-libkonq-devel
@@ -3445,6 +3268,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_NO_BUILTIN_CHRPATH=ON \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
@@ -3611,7 +3435,7 @@ fi
 
 # Mageia icon for TDE menu
 %if 0%{?mgaversion} >= 3
-%__install -D -m 644 "%{SOURCE9}" "%{?buildroot}%{tde_datadir}/oxygen/scalable/mgabutton.svg"
+%__install -D -m 644 "%{SOURCE9}" "%{?buildroot}%{tde_datadir}/icons/oxygen/scalable/mgabutton.svg"
 %endif
 
 # openSUSE 11.4: tdm startup script
@@ -3700,9 +3524,7 @@ popd
 %suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/tdefontview.desktop                Graphics Viewer
 %{?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
-if [ -r %{?buildroot}%{tde_tdeappdir}/kdcop.desktop ]; then
 %suse_update_desktop_file -u %{?buildroot}%{tde_tdeappdir}/kdcop.desktop                      System Utility
-fi
 %endif
 
 # Icons from TDE Control Center should only be displayed in TDE
diff --git a/redhat/main/tdebase/tdm.el6.te b/redhat/core/tdebase/tdm.el6.te
index 60508ae0d..60508ae0d 100644
--- a/redhat/main/tdebase/tdm.el6.te
+++ b/redhat/core/tdebase/tdm.el6.te
diff --git a/redhat/main/tdebase/tdm.el7.te b/redhat/core/tdebase/tdm.el7.te
index 519ca0506..519ca0506 100644
--- a/redhat/main/tdebase/tdm.el7.te
+++ b/redhat/core/tdebase/tdm.el7.te
diff --git a/redhat/main/tdebase/tdm.el8.te b/redhat/core/tdebase/tdm.el8.te
index 519ca0506..519ca0506 100644
--- a/redhat/main/tdebase/tdm.el8.te
+++ b/redhat/core/tdebase/tdm.el8.te
diff --git a/redhat/core/tdebase/tdm.el9.te b/redhat/core/tdebase/tdm.el9.te
new file mode 120000
index 000000000..034e33247
--- /dev/null
+++ b/redhat/core/tdebase/tdm.el9.te
@@ -0,0 +1 @@
+tdm.el8.te
\ No newline at end of file
diff --git a/redhat/main/tdebase/tdm.fc30.te b/redhat/core/tdebase/tdm.fc34.te
index afe6de52a..afe6de52a 100644
--- a/redhat/main/tdebase/tdm.fc30.te
+++ b/redhat/core/tdebase/tdm.fc34.te
diff --git a/redhat/main/tdebase/tdm.fc31.te b/redhat/core/tdebase/tdm.fc35.te
index afe6de52a..afe6de52a 100644
--- a/redhat/main/tdebase/tdm.fc31.te
+++ b/redhat/core/tdebase/tdm.fc35.te
diff --git a/redhat/main/tdebase/tdm.fc32.te b/redhat/core/tdebase/tdm.fc36.te
index afe6de52a..afe6de52a 100644
--- a/redhat/main/tdebase/tdm.fc32.te
+++ b/redhat/core/tdebase/tdm.fc36.te
diff --git a/redhat/main/tdebase/tdm.fc33.te b/redhat/core/tdebase/tdm.fc37.te
index afe6de52a..afe6de52a 100644
--- a/redhat/main/tdebase/tdm.fc33.te
+++ b/redhat/core/tdebase/tdm.fc37.te
diff --git a/redhat/main/tdebase/tdm.service.el7 b/redhat/core/tdebase/tdm.service.el7
index 9ef7e07ff..9ef7e07ff 100644
--- a/redhat/main/tdebase/tdm.service.el7
+++ b/redhat/core/tdebase/tdm.service.el7
diff --git a/redhat/main/tdebase/tdm.service.el8 b/redhat/core/tdebase/tdm.service.el8
index 87f56ea08..87f56ea08 120000
--- a/redhat/main/tdebase/tdm.service.el8
+++ b/redhat/core/tdebase/tdm.service.el8
diff --git a/redhat/core/tdebase/tdm.service.el9 b/redhat/core/tdebase/tdm.service.el9
new file mode 120000
index 000000000..87f56ea08
--- /dev/null
+++ b/redhat/core/tdebase/tdm.service.el9
@@ -0,0 +1 @@
+tdm.service.el7
\ No newline at end of file
diff --git a/redhat/main/tdebase/tdm.service.fc30 b/redhat/core/tdebase/tdm.service.fc34
index 9ef7e07ff..9ef7e07ff 100644
--- a/redhat/main/tdebase/tdm.service.fc30
+++ b/redhat/core/tdebase/tdm.service.fc34
diff --git a/redhat/main/tdebase/tdm.service.fc31 b/redhat/core/tdebase/tdm.service.fc35
index 9ef7e07ff..9ef7e07ff 100644
--- a/redhat/main/tdebase/tdm.service.fc31
+++ b/redhat/core/tdebase/tdm.service.fc35
diff --git a/redhat/main/tdebase/tdm.service.fc32 b/redhat/core/tdebase/tdm.service.fc36
index 9ef7e07ff..9ef7e07ff 100644
--- a/redhat/main/tdebase/tdm.service.fc32
+++ b/redhat/core/tdebase/tdm.service.fc36
diff --git a/redhat/main/tdebase/tdm.service.fc33 b/redhat/core/tdebase/tdm.service.fc37
index 9ef7e07ff..9ef7e07ff 100644
--- a/redhat/main/tdebase/tdm.service.fc33
+++ b/redhat/core/tdebase/tdm.service.fc37
diff --git a/redhat/main/tdebase/tdm.service.mga8 b/redhat/core/tdebase/tdm.service.mga8
index eda2906e2..eda2906e2 100644
--- a/redhat/main/tdebase/tdm.service.mga8
+++ b/redhat/core/tdebase/tdm.service.mga8
diff --git a/redhat/main/tdebase/trinity-tdebase-rpmlintrc b/redhat/core/tdebase/trinity-tdebase-rpmlintrc
index 8d22f2fc6..8d22f2fc6 100644
--- a/redhat/main/tdebase/trinity-tdebase-rpmlintrc
+++ b/redhat/core/tdebase/trinity-tdebase-rpmlintrc
diff --git a/redhat/main/tdebase/xdm.oss114 b/redhat/core/tdebase/xdm.oss114
index aabe4afb3..aabe4afb3 100755
--- a/redhat/main/tdebase/xdm.oss114
+++ b/redhat/core/tdebase/xdm.oss114
diff --git a/redhat/main/tdebindings/filter-requires.sh b/redhat/core/tdebindings/filter-requires.sh
index da6c04566..da6c04566 100644
--- a/redhat/main/tdebindings/filter-requires.sh
+++ b/redhat/core/tdebindings/filter-requires.sh
diff --git a/redhat/main/tdebindings/tdebindings.spec b/redhat/core/tdebindings/tdebindings.spec
index f5d4b33c5..d0fe72ad7 100644
--- a/redhat/main/tdebindings/tdebindings.spec
+++ b/redhat/core/tdebindings/tdebindings.spec
@@ -27,7 +27,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tdebindings
 %define tde_prefix /opt/trinity
@@ -169,14 +169,22 @@ BuildRequires: Mesa-libGLU-devel
 %endif
 
 # PYTHON support
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
+%if 0%{?sle_version} >= 150400 || 0%{?rhel} >= 9
+%define with_python 0
+%global __python %__python3
+%else
+%define with_python 1
+%if 0%{?rhel} >= 7 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 7
 %global python python2
 %global __python %__python2
 %global python_sitearch %{python2_sitearch}
+%else
+%global python python
 %endif
 %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 BuildRequires:	%{python}
 BuildRequires:	%{python}-devel
+%endif
 
 ## ruby
 BuildRequires:	ruby-devel >= 1.8
@@ -262,7 +270,7 @@ BuildRequires: java-1.6.0-openjdk-devel
 %endif
 %endif
 %if 0%{?pclinuxos} == 0
-%define _with_java --with-java=%{java_home}
+%define with_java 1
 %endif
 
 ## Perl
@@ -274,26 +282,26 @@ BuildRequires:	perl-devel
 
 ## QScintilla
 BuildRequires:	libtqscintilla-devel >= %{?tde_epoch:%{tde_epoch}:}1.7.1
-%define _enable_qscintilla --enable-qscintilla
+%define with_qscintilla 1
 
-Obsoletes:	trinity-kdebindings < %{version}-%{release}
-Provides:	trinity-kdebindings = %{version}-%{release}
+Obsoletes:	trinity-kdebindings < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdebindings = %{?epoch:%{epoch}:}%{version}-%{release}
 
 # Metapackage requires
-%if "%{?_with_java}" != ""
-Requires: trinity-tdebindings-java = %{version}-%{release}
+%if 0%{?with_java}
+Requires: trinity-tdebindings-java = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-juic = %{?epoch:%{epoch}:}%{version}-%{release}
 %endif
-Requires: trinity-libsmoketqt = %{version}-%{release}
-Requires: trinity-libsmoketde = %{version}-%{release}
-Requires: perl-dcop = %{version}-%{release}
-Requires: python-dcop = %{version}-%{release}
-Requires: trinity-libkjsembed1 = %{version}-%{release}
-Requires: trinity-kjscmd = %{version}-%{release}
-%if "%{?_with_java}" != ""
-Requires: trinity-juic = %{version}-%{release}
+Requires: trinity-libsmoketqt = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-libsmoketde = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: perl-dcop = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{with_python}
+Requires: python-dcop = %{?epoch:%{epoch}:}%{version}-%{release}
 %endif
-Requires: trinity-libkorundum0-ruby = %{version}-%{release}
-Requires: trinity-libqt0-ruby = %{version}-%{release}
+Requires: trinity-libkjsembed1 = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kjscmd = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-libkorundum0-ruby = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-libqt0-ruby = %{?epoch:%{epoch}:}%{version}-%{release}
 
 
 %description
@@ -307,12 +315,12 @@ TDE/DCOP bindings to non-C++ languages
 %package java
 Summary:	TDE Java bindings metapackage [Trinity]
 Group:		System/Libraries
-Requires:	trinity-libdcop3-java = %{version}-%{release}
-Requires:	trinity-libdcop3-jni = %{version}-%{release}
-Requires:	trinity-libqt3-java = %{version}-%{release}
-Requires:	trinity-libtqt3-jni = %{version}-%{release}
-Requires:	trinity-libtrinity-java = %{version}-%{release}
-Requires:	trinity-libtrinity-jni = %{version}-%{release}
+Requires:	trinity-libdcop3-java = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libdcop3-jni = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libqt3-java = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libtqt3-jni = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libtrinity-java = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libtrinity-jni = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description java
 A metapackage depending on all TDE, Qt and DCOP bindings libraries
@@ -325,12 +333,13 @@ This package is part of the official TDE bindings module.
 
 ##########
 
-%if "%{?_with_java}" != ""
+%if 0%{?with_java}
+
 %package -n trinity-libdcop3-java
 Summary:	DCOP bindings for Java [Trinity]
 Group:		System/Libraries
 
-Requires:	trinity-libdcop3-jni = %{version}-%{release}
+Requires:	trinity-libdcop3-jni = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-libdcop3-java
 This package contains the Java classes necessary to run Java programs
@@ -342,15 +351,17 @@ This package is part of the official TDE bindings module.
 %files -n trinity-libdcop3-java
 %defattr(-,root,root,-)
 %{tde_libdir}/java/org/
+
 %endif
 
 ##########
 
-%if "%{?_with_java}" != ""
+%if 0%{?with_java}
+
 %package -n trinity-libdcop3-java-devel
 Summary:	DCOP bindings for Java (dcopidl2java program) [Trinity]
 Group:		Development/Languages/Java
-Requires:	trinity-libdcop3-java = %{version}-%{release}
+Requires:	trinity-libdcop3-java = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-libdcop3-java-devel
 This package contains the dcopidl2java program which generates Java 
@@ -363,11 +374,14 @@ This package is part of the official TDE bindings module.
 %files -n trinity-libdcop3-java-devel
 %defattr(-,root,root,-)
 %{tde_bindir}/dcopidl2java
+%{tde_mandir}/man1/dcopidl2java.1*
+
 %endif
 
 ##########
 
-%if "%{?_with_java}" != ""
+%if 0%{?with_java}
+
 %package -n trinity-libdcop3-jni
 Summary:	DCOP bindings for Java ( Native libraries ) [Trinity]
 Group:		System/Libraries
@@ -384,17 +398,19 @@ This package is part of the official TDE bindings module.
 %defattr(-,root,root,-)
 %{tde_libdir}/libjavadcop.la
 %{tde_libdir}/libjavadcop.so
+
 %endif
 
 ##########
 
-%if "%{?_with_java}" != ""
+%if 0%{?with_java}
+
 %package -n trinity-libqt3-java
 Summary:	Java bindings for Qt [Trinity]
 Group:		System/Libraries
-Requires:	trinity-libdcop3-jni = %{version}-%{release}
-Requires:	trinity-libtqt3-jni = %{version}-%{release}
-Requires:	trinity-juic = %{version}-%{release}
+Requires:	trinity-libdcop3-jni = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libtqt3-jni = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-juic = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-libqt3-java
 This package contains the Java classes necessary to run Java programs
@@ -410,17 +426,19 @@ This package is part of the official TDE bindings module.
 %defattr(-,root,root,-)
 %{tde_libdir}/java/qtjava*.jar
 %{tde_tdedocdir}/HTML/en/javalib/
+
 %endif
 
 ##########
 
-%if "%{?_with_java}" != ""
+%if 0%{?with_java}
+
 %package -n trinity-libtqt3-jni
 Summary:	Java bindings for TQt ( Native libraries ) [Trinity]
 Group:		System/Libraries
 
-Obsoletes:	trinity-libqt3-jni < %{version}-%{release}
-Provides:	trinity-libqt3-jni = %{version}-%{release}
+Obsoletes:	trinity-libqt3-jni < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-libqt3-jni = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-libtqt3-jni
 This package contains the shared libraries necessary to run Java
@@ -436,18 +454,20 @@ This package is part of the official TDE bindings module.
 %{tde_libdir}/jni/lib*qtjava.la
 %{tde_libdir}/jni/lib*qtjava.so.*
 %doc qtjava/ChangeLog
+
 %endif
 
 ##########
 
-%if "%{?_with_java}" != ""
+%if 0%{?with_java}
+
 %package -n trinity-libtqt3-jni-devel
 Summary:	Development files fo Java bindings for TQt ( Native libraries ) [Trinity]
 Group:		Development/Languages/Java
-Requires:	trinity-libtqt3-jni = %{version}-%{release}
+Requires:	trinity-libtqt3-jni = %{?epoch:%{epoch}:}%{version}-%{release}
 
-Obsoletes:	trinity-libqt3-jni-devel < %{version}-%{release}
-Provides:	trinity-libqt3-jni-devel = %{version}-%{release}
+Obsoletes:	trinity-libqt3-jni-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-libqt3-jni-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-libtqt3-jni-devel
 This package contains the development files for trinity-libtqt3-jni.
@@ -458,16 +478,18 @@ This package is part of the official TDE bindings module.
 %defattr(-,root,root,-)
 %{tde_libdir}/lib*qtjavasupport.so
 %{tde_libdir}/jni/lib*qtjava.so
+
 %endif
 
 ##########
 
-%if "%{?_with_java}" != ""
+%if 0%{?with_java}
+
 %package -n trinity-libtrinity-java
 Summary:	Tdelibs bindings for Java [Trinity]
 Group:		System/Libraries
 
-Requires:	trinity-libtrinity-jni = %{version}-%{release}
+Requires:	trinity-libtrinity-jni = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-libtrinity-java
 This package contains the Java classes necessary to run Java programs
@@ -482,11 +504,13 @@ This package is part of the official TDE bindings module.
 %files -n trinity-libtrinity-java
 %defattr(-,root,root,-)
 %{tde_libdir}/java/koala*.jar
+
 %endif
 
 ##########
 
-%if "%{?_with_java}" != ""
+%if 0%{?with_java}
+
 %package -n trinity-libtrinity-jni
 Summary:	Tdelibs bindings for java ( Native libraries ) [Trinity]
 Group:		System/Libraries
@@ -503,15 +527,17 @@ This package is part of the official TDE bindings module.
 %{tde_libdir}/jni/libtdejava.la
 %{tde_libdir}/jni/libtdejava.so.*
 %doc tdejava/ChangeLog
+
 %endif
 
 ##########
 
-%if "%{?_with_java}" != ""
+%if 0%{?with_java}
+
 %package -n trinity-libtrinity-jni-devel
 Summary:	Development files for tdelibs bindings for java ( Native libraries ) [Trinity]
 Group:		Development/Languages/Java
-Requires:	trinity-libtrinity-jni = %{version}-%{release}
+Requires:	trinity-libtrinity-jni = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-libtrinity-jni-devel
 This package contains the development files for trinity-libtrinity-jni.
@@ -521,6 +547,7 @@ This package is part of the official TDE bindings module.
 %files -n trinity-libtrinity-jni-devel
 %defattr(-,root,root,-)
 %{tde_libdir}/jni/libtdejava.so
+
 %endif
 
 ##########
@@ -529,8 +556,8 @@ This package is part of the official TDE bindings module.
 Summary:	SMOKE Binding Library to Qt
 Group:		System/Libraries
 
-Obsoletes:	trinity-libsmokeqt1 < %{version}-%{release}
-Provides:	trinity-libsmokeqt1 = %{version}-%{release}
+Obsoletes:	trinity-libsmokeqt1 < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-libsmokeqt1 = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-libsmoketqt
 The "Scripting Meta Object Kompiler Engine" library is used by
@@ -548,10 +575,10 @@ This package is part of the official TDE bindings module.
 %package -n trinity-libsmoketqt-devel
 Summary:	SMOKE Binding Library to TQt - Development Files
 Group:		Development/Languages/Other
-Requires:	trinity-libsmoketqt = %{version}-%{release}
+Requires:	trinity-libsmoketqt = %{?epoch:%{epoch}:}%{version}-%{release}
 
-Obsoletes:	trinity-libsmokeqt-devel < %{version}-%{release}
-Provides:	trinity-libsmokeqt-devel = %{version}-%{release}
+Obsoletes:	trinity-libsmokeqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-libsmokeqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-libsmoketqt-devel
 The "Scripting Meta Object Kompiler Engine" library is used by
@@ -576,8 +603,8 @@ This package is part of the official TDE bindings module.
 Summary:	SMOKE Binding Library to TDE
 Group:		System/Libraries
 
-Obsoletes:	trinity-libsmokekde1 < %{version}-%{release}
-Provides:	trinity-libsmokekde1 = %{version}-%{release}
+Obsoletes:	trinity-libsmokekde1 < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-libsmokekde1 = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-libsmoketde
 The "Scripting Meta Object Kompiler Engine" library is used by
@@ -595,10 +622,10 @@ This package is part of the official TDE bindings module.
 %package -n trinity-libsmoketde-devel
 Summary:	SMOKE Binding Library to TDE - Development Files
 Group:		Development/Languages/Other
-Requires:	trinity-libsmoketde = %{version}-%{release}
+Requires:	trinity-libsmoketde = %{?epoch:%{epoch}:}%{version}-%{release}
 
-Obsoletes:	trinity-libsmokekde-devel < %{version}-%{release}
-Provides:	trinity-libsmokekde-devel = %{version}-%{release}
+Obsoletes:	trinity-libsmokekde-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-libsmokekde-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-libsmoketde-devel
 The "Scripting Meta Object Kompiler Engine" library is used by
@@ -627,11 +654,11 @@ Requires:	perl-base
 Requires:	perl
 %endif
 
-Obsoletes:	trinity-kdebindings-dcopperl < %{version}-%{release}
-Provides:	trinity-kdebindings-dcopperl = %{version}-%{release}
+Obsoletes:	trinity-kdebindings-dcopperl < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdebindings-dcopperl = %{?epoch:%{epoch}:}%{version}-%{release}
 
-Obsoletes:	trinity-perl-dcop < %{version}-%{release}
-Provides:	trinity-perl-dcop = %{version}-%{release}
+Obsoletes:	trinity-perl-dcop < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-perl-dcop = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n perl-dcop
 Perl bindings to the DCOP interprocess communication protocol used by TDE
@@ -646,13 +673,15 @@ Perl bindings to the DCOP interprocess communication protocol used by TDE
 
 ##########
 
+%if 0%{with_python}
+
 %package -n python-dcop
 Summary:	DCOP bindings for Python
 Group:		System/Libraries
 Requires:	%{python}
 
-Obsoletes:	trinity-python-dcop < %{version}-%{release}
-Provides:	trinity-python-dcop = %{version}-%{release}
+Obsoletes:	trinity-python-dcop < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-python-dcop = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n python-dcop
 This package contains the shared libraries necessary to run and
@@ -668,6 +697,8 @@ This package is part of the official TDE bindings module.
 %{python_sitearch}/pcop.so
 %{python_sitearch}/pydcop.py*
 
+%endif
+
 ##########
 
 %package -n trinity-libkjsembed1
@@ -715,7 +746,7 @@ This package is part of the official TDE bindings module.
 %package -n trinity-libkjsembed-devel
 Summary:	Embedded JavaScript library (Development files)
 Group:		Development/Libraries/Other
-Requires:	trinity-libkjsembed1 = %{version}-%{release}
+Requires:	trinity-libkjsembed1 = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-libkjsembed-devel
 This package contains the header files and symbolic links necessary
@@ -758,11 +789,11 @@ This package is part of the official TDE bindings module.
 
 ##########
 
-%if "%{?_with_java}" != ""
+%if 0%{?with_java}
 %package -n trinity-juic
 Summary:	The Qt Java UI Compiler
 Group:		Development/Languages/Java
-Requires:	trinity-libqt3-java = %{version}-%{release}
+Requires:	trinity-libqt3-java = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-juic
 This package contains the juic program, which is used to convert
@@ -777,6 +808,7 @@ This package is part of the official TDE bindings module.
 %defattr(-,root,root,-)
 %{tde_bindir}/juic
 %{tde_datadir}/juic/
+%{tde_mandir}/man1/juic.1*
 %endif
 
 ##########
@@ -784,7 +816,7 @@ This package is part of the official TDE bindings module.
 %package -n trinity-libkorundum0-ruby
 Summary:	TDE bindings for Ruby [Trinity]
 Group:		System/Libraries
-Requires:	trinity-libqt0-ruby = %{version}-%{release}
+Requires:	trinity-libqt0-ruby = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-libkorundum0-ruby
 This package contains the files necessary for running and developing
@@ -807,6 +839,9 @@ This package is part of the official TDE bindings module.
 %{ruby_arch}/korundum.la
 %{ruby_arch}/korundum.so*
 %doc korundum/ChangeLog
+%{tde_mandir}/man1/krubyinit.1*
+%{tde_mandir}/man1/rbtdeapi.1*
+%{tde_mandir}/man1/rbtdesh.1*
 
 ##########
 
@@ -838,6 +873,10 @@ This package is part of the official TDE bindings module.
 %{ruby_arch}/tqui.so*
 %{ruby_arch}/tqui.la
 %doc qtruby/ChangeLog
+%{tde_mandir}/man1/qtrubyinit.1*
+%{tde_mandir}/man1/rbqtapi.1*
+%{tde_mandir}/man1/rbqtsh.1*
+%{tde_mandir}/man1/rbuic.1*
 
 ##########
 
@@ -900,8 +939,8 @@ This package contains the xparts library for GTK.
 Summary:	Xparts library for TDE
 Group:		Development/Languages/Other
 
-Obsoletes:	trinity-libkdexparts1 < %{version}-%{release}
-Provides:	trinity-libkdexparts1 = %{version}-%{release}
+Obsoletes:	trinity-libkdexparts1 < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-libkdexparts1 = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-libtdexparts
 This package contains the xparts library for TDE.
@@ -917,9 +956,9 @@ This package contains the xparts library for TDE.
 Summary:	Xparts development files
 Group:		Development/Languages/Other
 %if 0%{?with_gtk1}
-Requires:	trinity-libgtkxparts1 = %{version}-%{release}
+Requires:	trinity-libgtkxparts1 = %{?epoch:%{epoch}:}%{version}-%{release}
 %endif
-Requires:	trinity-libtdexparts = %{version}-%{release}
+Requires:	trinity-libtdexparts = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-libxparts-devel
 This package contains the development files for Xparts library.
@@ -939,12 +978,12 @@ Summary:	Extra xparts for TDE [Trinity]
 Group:		Development/Languages/Other
 
 # Metapckage requires
-Requires:	trinity-xpart-notepad = %{version}-%{release}
+Requires:	trinity-xpart-notepad = %{?epoch:%{epoch}:}%{version}-%{release}
 %if 0%{?with_gtk1}
-Requires:	trinity-libgtkxparts1 = %{version}-%{release}
+Requires:	trinity-libgtkxparts1 = %{?epoch:%{epoch}:}%{version}-%{release}
 %endif
-Requires:	trinity-libtdexparts = %{version}-%{release}
-Requires:	trinity-libdcop-c = %{version}-%{release}
+Requires:	trinity-libtdexparts = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libdcop-c = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description xparts-extras
 This package contains extra xparts-based modules for Trinity
@@ -973,7 +1012,7 @@ This package contains the DCOP bindings for C.
 %package -n trinity-libdcop-c-devel
 Summary:	DCOP bindings for C, development files [Trinity]
 Group:		Development/Languages/C and C++
-Requires:	trinity-libdcop-c = %{version}-%{release}
+Requires:	trinity-libdcop-c = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-libdcop-c-devel
 This package contains the development files for DCOP bindings for C.
@@ -991,23 +1030,23 @@ Summary:	Development files for %{name}
 Group:		Development/Languages/Other
 
 Requires:	trinity-tdelibs-devel >= %{tde_version}
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
-Obsoletes:	trinity-kdebindings-devel < %{version}-%{release}
-Provides:	trinity-kdebindings-devel = %{version}-%{release}
+Obsoletes:	trinity-kdebindings-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdebindings-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 # Metapackage
-Requires:	trinity-libsmoketqt-devel = %{version}-%{release}
-%if "%{?_with_java}" != ""
-Requires:	trinity-libdcop3-java-devel = %{version}-%{release}
+Requires:	trinity-libsmoketqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?with_java}
+Requires:	trinity-libdcop3-java-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 %endif
-Requires:	trinity-libsmoketde-devel = %{version}-%{release}
-Requires:	trinity-libkjsembed-devel = %{version}-%{release}
-Requires:	trinity-libxparts-devel = %{version}-%{release}
-Requires:	trinity-libdcop-c-devel = %{version}-%{release}
-%if "%{?_with_java}" != ""
-Requires:	trinity-libtqt3-jni-devel = %{version}-%{release}
-Requires:	trinity-libtrinity-jni-devel = %{version}-%{release}
+Requires:	trinity-libsmoketde-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkjsembed-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libxparts-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libdcop-c-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?with_java}
+Requires:	trinity-libtqt3-jni-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libtrinity-jni-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 %endif
 
 %description devel
@@ -1123,10 +1162,12 @@ EXTRA_INCLUDES="/usr/include/ruby-%{rb_ver}:/usr/include/ruby-%{rb_ver}/%{_targe
   \
   --with-extra-includes=%{_includedir}/tqscintilla:${EXTRA_INCLUDES} \
   --with-extra-libs=%{tde_libdir} \
+%if 0%{with_python}
   --with-pythondir=%{_usr} \
+%endif
   \
-  %{?_with_java} %{!?_with_java:--without-java} \
-  %{?_enable_qscintilla} %{!?_enable_qscintilla:--disable-qscintilla}
+  %{?with_java:--with-java=%{java_home}} %{!?with_java:--without-java} \
+  %{?with_qscintilla:--enable-qscintilla} %{!?with_qscintilla:--disable-qscintilla}
 
 # Build dcopperl with specific options
 pushd dcopperl
@@ -1152,7 +1193,7 @@ export PATH="%{tde_bindir}:${PATH}"
 find $RPM_BUILD_ROOT -type f -a \( -name perllocal.pod -o -name .packlist \
   -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
 
-%if "%{?_with_java}" != ""
+%if 0%{?with_java}
 # Installs juic
 %__install -D -m 755 qtjava/designer/juic/bin/juic	%{?buildroot}%{tde_bindir}/juic
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/juic/common
diff --git a/redhat/main/tdebindings/trinity-tdebindings-rpmlintrc b/redhat/core/tdebindings/trinity-tdebindings-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/main/tdebindings/trinity-tdebindings-rpmlintrc
+++ b/redhat/core/tdebindings/trinity-tdebindings-rpmlintrc
diff --git a/redhat/main/tdeedu/tdeedu.spec b/redhat/core/tdeedu/tdeedu.spec
index 735435573..33cbe2e9e 100644
--- a/redhat/main/tdeedu/tdeedu.spec
+++ b/redhat/core/tdeedu/tdeedu.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tdeedu
 %define tde_prefix /opt/trinity
@@ -63,7 +63,7 @@ Source1:		%{name}-rpmlintrc
 
 BuildRequires: trinity-tdelibs-devel >= %{tde_version}
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires: desktop-file-utils
 
 # SUSE desktop files utility
@@ -94,8 +94,13 @@ BuildRequires:	openssl-devel
 BuildRequires:	%{_lib}usb1.0-devel
 BuildRequires:	%{_lib}usb-compat0.1-devel
 %else
+%if 0%{?fedora} >= 37
+BuildRequires:	libusb1-devel
+BuildRequires:	libusb-compat-0.1-devel
+%else
 BuildRequires:	libusb-devel
 %endif
+%endif
 
 # PYTHON3 support
 %if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100 || 0%{?mgaversion} >= 8
@@ -140,41 +145,41 @@ BuildRequires: ocaml
 %define with_v4l 1
 %endif
 
-Obsoletes:		trinity-kdeedu < %{version}-%{release}
-Provides:		trinity-kdeedu = %{version}-%{release}
-Obsoletes:		trinity-kdeedu-libs < %{version}-%{release}
-Provides:		trinity-kdeedu-libs = %{version}-%{release}
+Obsoletes:		trinity-kdeedu < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kdeedu = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kdeedu-libs < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kdeedu-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 
 # Meta-package
-Requires: %{name}-data = %{version}-%{release}
-Requires: trinity-blinken = %{version}-%{release}
-Requires: trinity-kalzium = %{version}-%{release}
-Requires: trinity-kalzium-data = %{version}-%{release}
-Requires: trinity-kanagram = %{version}-%{release}
-Requires: trinity-kbruch = %{version}-%{release}
-Requires: trinity-keduca = %{version}-%{release}
-Requires: trinity-kgeography = %{version}-%{release}
-Requires: trinity-kgeography-data = %{version}-%{release}
-Requires: trinity-khangman = %{version}-%{release}
+Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-blinken = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kalzium = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kalzium-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kanagram = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kbruch = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-keduca = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kgeography = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kgeography-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-khangman = %{?epoch:%{epoch}:}%{version}-%{release}
 %if 0%{?with_kig}
-Requires: trinity-kig = %{version}-%{release}
+Requires: trinity-kig = %{?epoch:%{epoch}:}%{version}-%{release}
 %endif
-Requires: trinity-kiten = %{version}-%{release}
-Requires: trinity-klatin = %{version}-%{release}
-Requires: trinity-klettres = %{version}-%{release}
-Requires: trinity-klettres-data = %{version}-%{release}
-Requires: trinity-kmplot = %{version}-%{release}
-Requires: trinity-kpercentage = %{version}-%{release}
-Requires: trinity-kstars = %{version}-%{release}
-Requires: trinity-kstars-data = %{version}-%{release}
-Requires: trinity-ktouch = %{version}-%{release}
-Requires: trinity-kturtle = %{version}-%{release}
-Requires: trinity-kverbos = %{version}-%{release}
-Requires: trinity-kvoctrain = %{version}-%{release}
-Requires: trinity-kwordquiz = %{version}-%{release}
-Requires: trinity-libtdeedu3 = %{version}-%{release}
-Requires: trinity-libkiten1 = %{version}-%{release}
-Requires: trinity-indi = %{version}-%{release}
+Requires: trinity-kiten = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-klatin = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-klettres = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-klettres-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kmplot = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kpercentage = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kstars = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kstars-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ktouch = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kturtle = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kverbos = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kvoctrain = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kwordquiz = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-libtdeedu3 = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-libkiten1 = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-indi = %{?epoch:%{epoch}:}%{version}-%{release}
 
 
 %description
@@ -231,7 +236,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %package -n trinity-blinken
 Summary:	Trinity version of the Simon Says electronic memory game
 Group:		System/GUI/Other
-Requires:	trinity-tdeedu-data = %{version}-%{release}
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-blinken
 Blinken is based on an electronic game released in 1978, which
@@ -261,8 +266,8 @@ This package is part of Trinity, as a component of the TDE education module.
 %package -n trinity-kalzium
 Summary:	Chemistry teaching tool for Trinity
 Group:		System/GUI/Other
-Requires:	trinity-kalzium-data = %{version}-%{release}
-Requires:	trinity-tdeedu-data = %{version}-%{release}
+Requires:	trinity-kalzium-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kalzium
 Kalzium is a program which shows you the Periodic System of Elements
@@ -318,7 +323,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %package -n trinity-kanagram
 Summary:	Letter order game for Trinity
 Group:		System/GUI/Other
-Requires:	trinity-tdeedu-data = %{version}-%{release}
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kanagram
 KAnagram is a game that is based on the word/letter puzzles that the
@@ -351,7 +356,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %package -n trinity-kbruch
 Summary:	Fraction calculation teaching tool for Trinity
 Group:		System/GUI/Other
-Requires:	trinity-tdeedu-data = %{version}-%{release}
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kbruch
 KBruch is a small program to practice calculating with fractions.
@@ -377,7 +382,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %package -n trinity-keduca
 Summary:	Interactive form-based tests for Trinity
 Group:		System/GUI/Other
-Requires:	trinity-tdeedu-data = %{version}-%{release}
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-keduca
 KEduca is a flash-card application which allows you to make
@@ -408,8 +413,8 @@ This package is part of Trinity, as a component of the TDE education module.
 %package -n trinity-kgeography
 Summary:	Geography learning tool for Trinity
 Group:		System/GUI/Other
-Requires:	trinity-kgeography-data = %{version}-%{release}
-Requires:	trinity-tdeedu-data = %{version}-%{release}
+Requires:	trinity-kgeography-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kgeography
 KGeography contains maps allowing you to learn various countries or
@@ -456,7 +461,7 @@ This package is part of Trinity, as a component of the TDE education module.
 Summary:	The classical hangman game for Trinity
 Group:		System/GUI/Other
 #Requires:	dustin-dustismo-sans-fonts
-Requires:	trinity-tdeedu-data = %{version}-%{release}
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-khangman
 KHangMan is a game based on the well known hangman game.  It is aimed
@@ -488,7 +493,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %package -n trinity-kig
 Summary:	Interactive geometry program for TDE
 Group:		System/GUI/Other
-Requires:	trinity-tdeedu-data = %{version}-%{release}
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kig
 Kig is an application for interactive geometry.  It is intended to
@@ -550,7 +555,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %package -n trinity-kiten
 Summary:	Japanese reference/study tool for Trinity
 Group:		System/GUI/Other
-Requires:	trinity-tdeedu-data = %{version}-%{release}
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
 #Requires:	ttf-kochi-gothic | ttf-kochi-mincho
 
 %description -n trinity-kiten
@@ -577,7 +582,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %package -n trinity-klatin
 Summary:	Application to help revise/teach Latin
 Group:		System/GUI/Other
-Requires:	trinity-tdeedu-data = %{version}-%{release}
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-klatin
 KLatin is a program to help revise Latin.  There are three "sections"
@@ -612,8 +617,8 @@ This package is part of Trinity, as a component of the TDE education module.
 %package -n trinity-klettres
 Summary:	Foreign alphabet tutor for Trinity
 Group:		System/GUI/Other
-Requires:	trinity-klettres-data = %{version}-%{release}
-Requires:	trinity-tdeedu-data = %{version}-%{release}
+Requires:	trinity-klettres-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-klettres
 KLettres is an application specially designed to help the user to
@@ -661,7 +666,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %package -n trinity-kmplot
 Summary:	Mathematical function plotter for Trinity
 Group:		System/GUI/Other
-Requires:	trinity-tdeedu-data = %{version}-%{release}
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kmplot
 KmPlot is a mathematical function plotter for TDE.  It has a powerful
@@ -699,7 +704,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %package -n trinity-kpercentage
 Summary:	Percentage calculation teaching tool for Trinity
 Group:		System/GUI/Other
-Requires:	trinity-tdeedu-data = %{version}-%{release}
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kpercentage
 KPercentage is a small math application that will help pupils to
@@ -726,9 +731,9 @@ This package is part of Trinity, as a component of the TDE education module.
 %package -n trinity-kstars
 Summary:	Desktop planetarium for Trinity
 Group:		System/GUI/Other
-Requires:	trinity-tdeedu-data = %{version}-%{release}
-Requires:	trinity-kstars-data = %{version}-%{release}
-Requires:	trinity-indi = %{version}-%{release}
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kstars-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-indi = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kstars
 KStars is a graphical desktop planetarium for TDE.  It depicts an
@@ -780,7 +785,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %package -n trinity-ktouch
 Summary:	Touch typing tutor for Trinity
 Group:		System/GUI/Other
-Requires:	trinity-tdeedu-data = %{version}-%{release}
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-ktouch
 KTouch is a program for learning touch typing - it helps you learn to
@@ -810,7 +815,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %package -n trinity-kturtle
 Summary:	Educational Logo programming environment
 Group:		System/GUI/Other
-Requires:	trinity-tdeedu-data = %{version}-%{release}
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kturtle
 KTurtle is an educational programming environment using the Logo
@@ -848,7 +853,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %package -n trinity-kverbos
 Summary:	Spanish verb form study application for Trinity
 Group:		System/GUI/Other
-Requires:	trinity-tdeedu-data = %{version}-%{release}
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kverbos
 Kverbos allows the user to learn the forms of Spanish verbs.  The
@@ -880,7 +885,7 @@ Summary:	Vocabulary trainer for Trinity
 Group:		System/GUI/Other
 Requires:	perl
 Requires:	perl-libwww-perl
-Requires:	trinity-tdeedu-data = %{version}-%{release}
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kvoctrain
 KVocTrain is a little utility to help you train your vocabulary when
@@ -922,7 +927,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %package -n trinity-kwordquiz
 Summary:	Flashcard and vocabulary learning program for Trinity
 Group:		System/GUI/Other
-Requires:	trinity-tdeedu-data = %{version}-%{release}
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kwordquiz
 KWordQuiz is a flashcard-based tool that helps you to master new
@@ -976,7 +981,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %package -n trinity-libtdeedu-devel
 Summary:	Development files for Trinity educational library
 Group:		Development/Libraries/Other
-Requires:	trinity-libtdeedu3 = %{version}-%{release}
+Requires:	trinity-libtdeedu3 = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-libtdeedu-devel
 The TDE-based library libtdeedu is used with educational
@@ -1035,7 +1040,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %package -n trinity-libkiten-devel
 Summary:	Development files for Kiten library
 Group:		Development/Libraries/Other
-Requires:	trinity-libkiten1 = %{version}-%{release}
+Requires:	trinity-libkiten1 = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	trinity-tdelibs-devel >= %{version}
 
 %description -n trinity-libkiten-devel
@@ -1105,12 +1110,12 @@ This package is part of Trinity, as a component of the TDE education module.
 %package devel
 Summary:	Development files for %{name}
 Group:		Development/Libraries/Other
-Requires:	%{name} = %{version}-%{release}
-Requires:	trinity-libtdeedu-devel = %{version}-%{release}
-Requires:	trinity-libkiten-devel = %{version}-%{release}
+Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libtdeedu-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkiten-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
-Obsoletes:	trinity-kdeedu-devel < %{version}-%{release}
-Provides:	trinity-kdeedu-devel = %{version}-%{release}
+Obsoletes:	trinity-kdeedu-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdeedu-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description devel
 This package contains the development files for tdeedu.
@@ -1158,6 +1163,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_NO_BUILTIN_CHRPATH=ON \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
diff --git a/redhat/main/tdeedu/trinity-tdeedu-rpmlintrc b/redhat/core/tdeedu/trinity-tdeedu-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/main/tdeedu/trinity-tdeedu-rpmlintrc
+++ b/redhat/core/tdeedu/trinity-tdeedu-rpmlintrc
diff --git a/redhat/main/tdegames/tdegames.spec b/redhat/core/tdegames/tdegames.spec
index e16e57b8e..c8799b131 100644
--- a/redhat/main/tdegames/tdegames.spec
+++ b/redhat/core/tdegames/tdegames.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tdegames
 %define tde_prefix /opt/trinity
@@ -66,7 +66,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	trinity-tdemultimedia-devel >= %{tde_version}
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	desktop-file-utils
 BuildRequires:	fdupes
@@ -91,7 +91,7 @@ BuildRequires:	libidn-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gamin 1
 BuildRequires:	gamin-devel
 %endif
@@ -118,46 +118,46 @@ BuildRequires:	brp-check-trinity
 # GLIB2 support
 BuildRequires:	glib2-devel
 
-Obsoletes:		trinity-kdegames < %{version}-%{release}
-Provides:		trinity-kdegames = %{version}-%{release}
-Obsoletes:		trinity-kdegames-libs < %{version}-%{release}
-Provides:		trinity-kdegames-libs = %{version}-%{release}
-
-Requires: trinity-libtdegames1 = %{version}-%{release}
-Requires: trinity-tdegames-card-data = %{version}-%{release}
-Requires: trinity-atlantik = %{version}-%{release}
-Requires: trinity-kasteroids = %{version}-%{release}
-Requires: trinity-katomic = %{version}-%{release}
-Requires: trinity-kbackgammon = %{version}-%{release}
-Requires: trinity-kbattleship = %{version}-%{release}
-Requires: trinity-kblackbox = %{version}-%{release}
-Requires: trinity-kbounce = %{version}-%{release}
-Requires: trinity-kenolaba = %{version}-%{release}
-Requires: trinity-kfouleggs = %{version}-%{release}
-Requires: trinity-kgoldrunner = %{version}-%{release}
-Requires: trinity-kjumpingcube = %{version}-%{release}
-Requires: trinity-klickety = %{version}-%{release}
-Requires: trinity-klines = %{version}-%{release}
-Requires: trinity-kmahjongg = %{version}-%{release}
-Requires: trinity-kmines = %{version}-%{release}
-Requires: trinity-knetwalk = %{version}-%{release}
-Requires: trinity-kolf = %{version}-%{release}
-Requires: trinity-konquest = %{version}-%{release}
-Requires: trinity-kpat = %{version}-%{release}
-Requires: trinity-kpoker = %{version}-%{release}
-Requires: trinity-kreversi = %{version}-%{release}
-Requires: trinity-ksame = %{version}-%{release}
-Requires: trinity-kshisen = %{version}-%{release}
-Requires: trinity-ksirtet = %{version}-%{release}
-Requires: trinity-ksmiletris = %{version}-%{release}
-Requires: trinity-ksnake = %{version}-%{release}
-Requires: trinity-ksokoban = %{version}-%{release}
-Requires: trinity-kspaceduel = %{version}-%{release}
-Requires: trinity-ktron = %{version}-%{release}
-Requires: trinity-ktuberling = %{version}-%{release}
-Requires: trinity-twin4 = %{version}-%{release}
-Requires: trinity-lskat = %{version}-%{release}
-Requires: trinity-tdefifteen = %{version}-%{release}
+Obsoletes:		trinity-kdegames < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kdegames = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kdegames-libs < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kdegames-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Requires: trinity-libtdegames1 = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-tdegames-card-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-atlantik = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kasteroids = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-katomic = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kbackgammon = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kbattleship = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kblackbox = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kbounce = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kenolaba = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kfouleggs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kgoldrunner = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kjumpingcube = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-klickety = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-klines = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kmahjongg = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kmines = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-knetwalk = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kolf = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-konquest = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kpat = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kpoker = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kreversi = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ksame = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kshisen = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ksirtet = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ksmiletris = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ksnake = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ksokoban = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kspaceduel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ktron = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ktuberling = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-twin4 = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-lskat = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-tdefifteen = %{?epoch:%{epoch}:}%{version}-%{release}
 
 
 %description
@@ -174,14 +174,14 @@ ksnake, ksirtet, katomic, kjumpingcube, ktuberling.
 Summary:	Development files for %{name} 
 Group:		Amusements/Games/Other
 
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	trinity-tdelibs-devel >= %{tde_version}
-Requires:	trinity-libtdegames-devel = %{version}-%{release}
-Requires:	trinity-atlantik-devel = %{version}-%{release}
-Requires:	trinity-kolf-devel = %{version}-%{release}
+Requires:	trinity-libtdegames-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-atlantik-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kolf-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
-Obsoletes:		trinity-kdegames-devel < %{version}-%{release}
-Provides:		trinity-kdegames-devel = %{version}-%{release}
+Obsoletes:		trinity-kdegames-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kdegames-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description devel
 Install %{name}-devel if you wish to develop or compile games for the
@@ -220,7 +220,7 @@ This package is part of TDE, and a component of the TDE games module.
 %package -n trinity-libtdegames-devel
 Summary:	Trinity games library headers
 Group:		Development/Libraries/Other
-Requires:	trinity-libtdegames1 = %{version}-%{release}
+Requires:	trinity-libtdegames1 = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-libtdegames-devel
 This package is necessary if you want to develop your own games using
@@ -285,7 +285,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %package -n trinity-atlantik-devel
 Summary:	Development files for Atlantik
 Group:		Development/Libraries/Other
-Requires:	trinity-atlantik = %{version}-%{release}
+Requires:	trinity-atlantik = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-atlantik-devel
 This package contains header files for compiling programs against the
@@ -734,7 +734,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %package -n trinity-kolf-devel
 Summary:	Development files for Kolf
 Group:		Development/Libraries/Other
-Requires:	trinity-kolf = %{version}-%{release}
+Requires:	trinity-kolf = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kolf-devel
 This package contains headers and development libraries for compiling
@@ -1193,6 +1193,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_NO_BUILTIN_CHRPATH=ON \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
diff --git a/redhat/main/tdegames/trinity-tdegames-rpmlintrc b/redhat/core/tdegames/trinity-tdegames-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/main/tdegames/trinity-tdegames-rpmlintrc
+++ b/redhat/core/tdegames/trinity-tdegames-rpmlintrc
diff --git a/redhat/main/tdegraphics/tdegraphics.spec b/redhat/core/tdegraphics/tdegraphics.spec
index 7db346b2e..623855117 100644
--- a/redhat/main/tdegraphics/tdegraphics.spec
+++ b/redhat/core/tdegraphics/tdegraphics.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tdegraphics
 %define tde_prefix /opt/trinity
@@ -28,6 +28,7 @@
 %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/tde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
@@ -59,7 +60,7 @@ Source1:	%{name}-rpmlintrc
 BuildRequires: trinity-tdelibs-devel >= %{tde_version}
 BuildRequires: trinity-tdebase-devel >= %{tde_version}
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	gettext
 BuildRequires:	libtool
@@ -80,13 +81,18 @@ BuildRequires:	libidn-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} >= 1310
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gamin 1
 BuildRequires:	gamin-devel
 %endif
 
 # LIBUSB support
-BuildRequires: libusb-devel
+%if 0%{?fedora} >= 37
+BuildRequires:	libusb1-devel
+BuildRequires:	libusb-compat-0.1-devel
+%else
+BuildRequires:	libusb-devel
+%endif
 
 # MNG support
 BuildRequires: libmng-devel
@@ -237,39 +243,39 @@ BuildRequires:	openssl-devel
 %if 0%{?build_kmrml}
 #Requires:		gift
 %else
-Obsoletes:		trinity-kmrml < %{version}-%{release}
+Obsoletes:		trinity-kmrml < %{?epoch:%{epoch}:}%{version}-%{release}
 %endif
 
-Obsoletes:	trinity-kdegraphics < %{version}-%{release}
-Provides:	trinity-kdegraphics = %{version}-%{release}
-Obsoletes:	trinity-kdegraphics-libs < %{version}-%{release}
-Provides:	trinity-kdegraphics-libs = %{version}-%{release}
-Obsoletes:	trinity-kdegraphics-extras < %{version}-%{release}
-Provides:	trinity-kdegraphics-extras = %{version}-%{release}
-
-
-%{?build_kamera:Requires: trinity-kamera = %{version}-%{release}}
-Requires: trinity-kcoloredit = %{version}-%{release}
-Requires: %{name}-kfile-plugins = %{version}-%{release}
-Requires: trinity-kdvi = %{version}-%{release}
-Requires: trinity-kfax = %{version}-%{release}
-Requires: trinity-kfaxview = %{version}-%{release}
-Requires: trinity-kgamma = %{version}-%{release}
-Requires: trinity-kghostview = %{version}-%{release}
-Requires: trinity-kiconedit = %{version}-%{release}
-%{?build_kmrml:Requires: trinity-kmrml = %{version}-%{release}}
-Requires: trinity-kolourpaint = %{version}-%{release}
-Requires: trinity-kooka = %{version}-%{release}
-Requires: trinity-kpdf = %{version}-%{release}
-Requires: trinity-kpovmodeler = %{version}-%{release}
-Requires: trinity-kruler = %{version}-%{release}
-Requires: trinity-ksnapshot = %{version}-%{release}
-Requires: trinity-ksvg = %{version}-%{release}
-Requires: trinity-kview = %{version}-%{release}
-Requires: trinity-kviewshell = %{version}-%{release}
-Requires: trinity-libkscan = %{version}-%{release}
+Obsoletes:	trinity-kdegraphics < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdegraphics = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-kdegraphics-libs < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdegraphics-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-kdegraphics-extras < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdegraphics-extras = %{?epoch:%{epoch}:}%{version}-%{release}
+
+
+%{?build_kamera:Requires: trinity-kamera = %{?epoch:%{epoch}:}%{version}-%{release}}
+Requires: trinity-kcoloredit = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-kfile-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kdvi = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kfax = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kfaxview = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kgamma = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kghostview = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kiconedit = %{?epoch:%{epoch}:}%{version}-%{release}
+%{?build_kmrml:Requires: trinity-kmrml = %{?epoch:%{epoch}:}%{version}-%{release}}
+Requires: trinity-kolourpaint = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kooka = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kpdf = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kpovmodeler = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kruler = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ksnapshot = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ksvg = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kview = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kviewshell = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-libkscan = %{?epoch:%{epoch}:}%{version}-%{release}
 %if 0%{?with_pdf}
-Requires: trinity-libpoppler-tqt = %{version}-%{release}
+Requires: trinity-libpoppler-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
 %endif
 
 %description
@@ -339,6 +345,8 @@ picker.
 %{tde_datadir}/icons/hicolor/*/apps/kcolorchooser.png
 %{tde_datadir}/icons/hicolor/*/apps/kcoloredit.png
 %{tde_tdedocdir}/HTML/en/kcoloredit/
+%{tde_mandir}/man1/kcolorchooser.1*
+%{tde_mandir}/man1/kcoloredit.1*
 
 ##########
 
@@ -435,6 +443,7 @@ This program and KPart allow the user to display *.DVI files from TeX.
 %{tde_datadir}/icons/hicolor/scalable/apps/kdvi.svgz
 %{tde_datadir}/services/kdvimultipage.desktop
 %{tde_tdedocdir}/HTML/en/kdvi/
+%{tde_mandir}/man1/kdvi.1*
 
 ##########
 
@@ -454,6 +463,7 @@ A fax viewer for Trinity, supporting the display of raw and tiffed fax images
 %{tde_datadir}/icons/hicolor/??x??/apps/kfax.png
 %{tde_datadir}/icons/hicolor/scalable/apps/kfax.svgz
 %{tde_tdedocdir}/HTML/en/kfax/
+%{tde_mandir}/man1/kfax.1*
 
 ##########
 
@@ -480,6 +490,7 @@ kfax application once it reproduces all of kfax's features.
 %{tde_datadir}/services/kfaxmultipage.desktop
 %{tde_datadir}/services/kfaxmultipage_tiff.desktop
 %{tde_tdedocdir}/HTML/en/kfaxview/
+%{tde_mandir}/man1/kfaxview.1*
 
 ##########
 
@@ -533,6 +544,7 @@ online.
 %{tde_datadir}/icons/hicolor/*/apps/kghostview.png
 %{tde_datadir}/services/kghostview_part.desktop
 %{tde_tdedocdir}/HTML/en/kghostview/
+%{tde_mandir}/man1/kghostview.1*
 
 ##########
 
@@ -540,8 +552,8 @@ online.
 Summary:	An icon editor for Trinity
 Group:		Productivity/Graphics/Viewers
 
-Obsoletes:	trinity-kiconedit < %{version}-%{release}
-Provides:	trinity-kiconedit = %{version}-%{release}
+Obsoletes:	trinity-kiconedit < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kiconedit = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-tdeiconedit
 TDEIconedit allows you easily to create and edit icons.
@@ -553,6 +565,7 @@ TDEIconedit allows you easily to create and edit icons.
 %{tde_datadir}/apps/tdeiconedit/
 %{tde_datadir}/icons/hicolor/*/apps/tdeiconedit.png
 %{tde_tdedocdir}/HTML/en/tdeiconedit/
+%{tde_mandir}/man1/tdeiconedit.1*
 
 ##########
 
@@ -620,6 +633,7 @@ Homepage: http://kolourpaint.sourceforge.net
 %{tde_datadir}/icons/hicolor/*/apps/kolourpaint.png
 %{tde_datadir}/icons/hicolor/scalable/apps/kolourpaint.svgz
 %{tde_tdedocdir}/HTML/en/kolourpaint/
+%{tde_mandir}/man1/kolourpaint.1*
 
 ##########
 
@@ -650,6 +664,7 @@ Homepage: http://kooka.kde.org/
 %config(noreplace) %{tde_confdir}/kookarc
 %{tde_datadir}/icons/hicolor/*/apps/kooka.png
 %{tde_tdedocdir}/HTML/en/kooka/
+%{tde_mandir}/man1/kooka.1*
 
 ##########
 
@@ -675,6 +690,7 @@ application.
 %{tde_datadir}/icons/hicolor/*/apps/kpdf.png
 %{tde_datadir}/icons/hicolor/scalable/apps/kpdf.svgz
 %{tde_datadir}/services/kpdf_part.desktop
+%{tde_mandir}/man1/kpdf.1*
 
 ##########
 
@@ -708,6 +724,7 @@ Homepage: http://www.kpovmodeler.org
 %{tde_datadir}/icons/crystalsvg/*/mimetypes/kpovmodeler_doc.*
 %{tde_datadir}/icons/hicolor/*/apps/kpovmodeler.*
 %doc %{tde_tdedocdir}/HTML/en/kpovmodeler/
+%{tde_mandir}/man1/kpovmodeler.1*
 
 ##########
 
@@ -726,6 +743,7 @@ Kruler is a screen ruler (using pixels) and color measurement tool for KDE.
 %{tde_datadir}/apps/kruler/
 %{tde_datadir}/icons/hicolor/*/apps/kruler.png
 %{tde_tdedocdir}/HTML/en/kruler/
+%{tde_mandir}/man1/kruler.1*
 
 ##########
 
@@ -745,6 +763,7 @@ The images can then be saved in a variety of formats.
 %{tde_datadir}/icons/hicolor/*/apps/ksnapshot.png
 %{tde_datadir}/icons/hicolor/scalable/apps/ksnapshot.svgz
 %{tde_tdedocdir}/HTML/en/ksnapshot/
+%{tde_mandir}/man1/ksnapshot.1*
 
 ##########
 
@@ -832,6 +851,7 @@ as well.
 %{tde_datadir}/servicetypes/kimageviewer.desktop
 %{tde_datadir}/servicetypes/kimageviewercanvas.desktop
 %{tde_tdedocdir}/HTML/en/kview/
+%{tde_mandir}/man1/kview.1*
 
 ##########
 
@@ -868,6 +888,7 @@ DjVu images.
 %{tde_datadir}/services/emptymultipage.desktop
 %{tde_datadir}/services/djvumultipage.desktop
 %{tde_datadir}/servicetypes/tdemultipage.desktop
+%{tde_mandir}/man1/kviewshell.1*
 
 ##########
 
@@ -894,7 +915,7 @@ It provides an easy-to-use library, which allows you to access your scanner
 %package -n trinity-libkscan-devel
 Summary:	Development files for the Trinity scanner library
 Group:		Development/Libraries/Other
-Requires:	trinity-libkscan = %{version}-%{release}
+Requires:	trinity-libkscan = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-libkscan-devel
 This package contains development files for Trinity's scanner library.
@@ -910,10 +931,10 @@ This package contains development files for Trinity's scanner library.
 %package -n trinity-libpoppler-tqt
 Summary:	TQt support for Poppler
 Group:		Productivity/Graphics/Viewers
-Obsoletes:	poppler-tqt < %{version}-%{release}
-Provides:	poppler-tqt = %{version}-%{release}
-Obsoletes:	%{name}-libpoppler-tqt < %{version}-%{release}
-Provides:	%{name}-libpoppler-tqt = %{version}-%{release}
+Obsoletes:	poppler-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	poppler-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	%{name}-libpoppler-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	%{name}-libpoppler-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-libpoppler-tqt
 TQt support library for Poppler.
@@ -930,11 +951,11 @@ This library is used by the Trinity graphics file plugins for PDF support.
 %package -n trinity-libpoppler-tqt-devel
 Summary:	Development files for TQt support for Poppler
 Group:		Development/Libraries/Other
-Requires:	trinity-libpoppler-tqt = %{version}-%{release}
-Obsoletes:	poppler-tqt-devel < %{version}-%{release}
-Provides:	poppler-tqt-devel = %{version}-%{release}
-Obsoletes:	%{name}-libpoppler-tqt-devel < %{version}-%{release}
-Provides:	%{name}-libpoppler-tqt-devel = %{version}-%{release}
+Requires:	trinity-libpoppler-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	poppler-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	poppler-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	%{name}-libpoppler-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	%{name}-libpoppler-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-libpoppler-tqt-devel
 Development files of TQt support library for Poppler.
@@ -956,13 +977,13 @@ This package contains the development files needed to compile applications again
 Summary:	Development files for tdegraphics
 Group:		Development/Libraries/Other
 
-Obsoletes:	trinity-kdegraphics-devel < %{version}-%{release}
-Provides:	trinity-kdegraphics-devel = %{version}-%{release}
+Obsoletes:	trinity-kdegraphics-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdegraphics-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
-Requires: %{name} = %{version}-%{release}
-Requires: trinity-libkscan-devel = %{version}-%{release}
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-libkscan-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 %if 0%{?with_pdf}
-Requires: trinity-libpoppler-tqt-devel = %{version}-%{release}
+Requires: trinity-libpoppler-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 %endif
 
 %description devel
@@ -1048,6 +1069,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_NO_BUILTIN_CHRPATH=ON \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
diff --git a/redhat/main/tdegraphics/trinity-tdegraphics-rpmlintrc b/redhat/core/tdegraphics/trinity-tdegraphics-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/main/tdegraphics/trinity-tdegraphics-rpmlintrc
+++ b/redhat/core/tdegraphics/trinity-tdegraphics-rpmlintrc
diff --git a/redhat/main/tdelibs/tdelibs.spec b/redhat/core/tdelibs/tdelibs.spec
index a3614b501..501b7e9ae 100644
--- a/redhat/main/tdelibs/tdelibs.spec
+++ b/redhat/core/tdelibs/tdelibs.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tdelibs
 %define tde_prefix /opt/trinity
@@ -60,12 +60,12 @@ BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
 Source1:		%{name}-rpmlintrc
 
-Obsoletes:		tdelibs < %{version}-%{release}
-Provides:		tdelibs = %{version}-%{release}
-Obsoletes:		trinity-kdelibs < %{version}-%{release}
-Provides:		trinity-kdelibs = %{version}-%{release}
-Obsoletes:		trinity-kdelibs-apidocs < %{version}-%{release}
-Provides:		trinity-kdelibs-apidocs = %{version}-%{release}
+Obsoletes:		tdelibs < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		tdelibs = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kdelibs < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kdelibs = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kdelibs-apidocs < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kdelibs-apidocs = %{?epoch:%{epoch}:}%{version}-%{release}
 
 # for set_permissions macro
 %if 0%{?suse_version}
@@ -86,7 +86,7 @@ Requires:		trinity-filesystem >= %{tde_version}
 Requires:		fileshareset >= 2.0
 %endif
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -140,7 +140,7 @@ BuildRequires:	aspell-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gamin 1
 BuildRequires:	gamin-devel
 %endif
@@ -241,15 +241,15 @@ BuildRequires:	xorg-x11-devel
 %endif
 
 # ICEAUTH
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} >= 1220
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} >= 1220 || 0%{?fedora} >= 34
 Requires:		iceauth
 BuildRequires:	iceauth
 %endif
-%if 0%{?rhel} >= 5 || 0%{?fedora}
+%if 0%{?rhel} >= 5 || ( 0%{?fedora} && 0%{?fedora} <= 33 )
 Requires:		xorg-x11-server-utils
 BuildRequires:	xorg-x11-server-utils
 %endif
-%if 0%{?rhel} == 4 || 0%{?suse_version}
+%if 0%{?rhel} == 4
 Requires:		xorg-x11
 BuildRequires:	xorg-x11
 %endif
@@ -277,7 +277,7 @@ Requires:		ca-certificates
 %endif
 %endif
 %if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?mgaversion} >= 8
 Requires:		rootcerts
 %define	cacert	%{_sysconfdir}/pki/tls/certs/ca-bundle.crt
 %else
@@ -329,7 +329,9 @@ Requires:		%{cacert}
 ### New features in TDE R14
 
 # LIBMAGIC support
+%if 0%{?rhel} != 5
 BuildRequires:	file-devel
+%endif
 
 # NETWORKMANAGER support
 %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?suse_version}
@@ -377,7 +379,7 @@ Requires:		udisks
 %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
 BuildRequires:	libudisks2-devel
 %else
-%if 0%{?suse_version} >= 1550
+%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150300
 BuildRequires:	libudisks2-0-devel
 %else
 BuildRequires:	udisks2-devel
@@ -580,12 +582,12 @@ fi
 %package devel
 Summary:	TDE Libraries (Development files)
 Group:		Development/Libraries/X11
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
-Obsoletes:	tdelibs-devel < %{version}-%{release}
-Provides:	tdelibs-devel = %{version}-%{release}
-Obsoletes:	trinity-kdelibs-devel < %{version}-%{release}
-Provides:	trinity-kdelibs-devel = %{version}-%{release}
+Obsoletes:	tdelibs-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	tdelibs-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-kdelibs-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdelibs-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 Requires:	libtqt3-mt-devel >= 3.5.0
 Requires:	libtqt4-devel = %{tde_epoch}:4.2.0
@@ -655,6 +657,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_NO_BUILTIN_CHRPATH=ON \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
diff --git a/redhat/main/tdelibs/trinity-tdelibs-rpmlintrc b/redhat/core/tdelibs/trinity-tdelibs-rpmlintrc
index cd73a0285..c65feac8b 100644
--- a/redhat/main/tdelibs/trinity-tdelibs-rpmlintrc
+++ b/redhat/core/tdelibs/trinity-tdelibs-rpmlintrc
@@ -2,3 +2,4 @@ setBadness('suse-dbus-unauthorized-service', 0)
 setBadness('permissions-file-setuid-bit', 0)
 setBadness('non-position-independent-executable', 0)
 setBadness('library-without-ldconfig-postun', 0)
+setBadness('binary-or-shlib-defines-rpath', 0)
diff --git a/redhat/main/tdemultimedia/tdemultimedia.spec b/redhat/core/tdemultimedia/tdemultimedia.spec
index 98b44d42a..2f1f338fe 100644
--- a/redhat/main/tdemultimedia/tdemultimedia.spec
+++ b/redhat/core/tdemultimedia/tdemultimedia.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tdemultimedia
 %define tde_prefix /opt/trinity
@@ -31,6 +31,7 @@
 %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/tde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
@@ -59,20 +60,20 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
 Source1:	%{name}-rpmlintrc
 
-Obsoletes:	trinity-kdemultimedia < %{version}-%{release}
-Provides:	trinity-kdemultimedia = %{version}-%{release}
-Obsoletes:	trinity-kdemultimedia-libs < %{version}-%{release}
-Provides:	trinity-kdemultimedia-libs = %{version}-%{release}
-Obsoletes:	trinity-kdemultimedia-extras < %{version}-%{release}
-Provides:	trinity-kdemultimedia-extras = %{version}-%{release}
-Obsoletes:	trinity-kdemultimedia-extras-libs < %{version}-%{release}
-Provides:	trinity-kdemultimedia-extras-libs = %{version}-%{release}
+Obsoletes:	trinity-kdemultimedia < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdemultimedia = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-kdemultimedia-libs < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdemultimedia-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-kdemultimedia-extras < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdemultimedia-extras = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-kdemultimedia-extras-libs < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdemultimedia-extras-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 
 BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 
-BuildRequires:	cmake
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	fdupes
 BuildRequires:	desktop-file-utils
@@ -224,24 +225,24 @@ BuildRequires:		lame-devel
 %endif
 
 
-Requires: trinity-artsbuilder = %{version}-%{release}
-Requires: trinity-juk = %{version}-%{release}
-Requires: trinity-kaboodle = %{version}-%{release}
-Requires: trinity-kaudiocreator = %{version}-%{release}
-Requires: %{name}-kfile-plugins = %{version}-%{release}
-Requires: %{name}-kappfinder-data = %{version}-%{release}
-Requires: %{name}-tdeio-plugins = %{version}-%{release}
-Requires: trinity-tdemid = %{version}-%{release}
-Requires: trinity-kmix = %{version}-%{release}
-Requires: trinity-krec = %{version}-%{release}
-Requires: trinity-kscd = %{version}-%{release}
-%{?with_akode:Requires: trinity-libarts-akode = %{version}-%{release}}
-Requires: trinity-libarts-audiofile = %{version}-%{release}
-%{?with_mpeg:Requires: trinity-libarts-mpeglib = %{version}-%{release}}
-%{?with_xine:Requires: trinity-libarts-xine = %{version}-%{release}}
-Requires: trinity-libkcddb = %{version}-%{release}
-%{?with_mpeg:Requires: trinity-mpeglib = %{version}-%{release}}
-Requires: trinity-noatun = %{version}-%{release}
+Requires: trinity-artsbuilder = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-juk = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kaboodle = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kaudiocreator = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-kfile-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-kappfinder-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-tdeio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-tdemid = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kmix = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-krec = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kscd = %{?epoch:%{epoch}:}%{version}-%{release}
+%{?with_akode:Requires: trinity-libarts-akode = %{?epoch:%{epoch}:}%{version}-%{release}}
+Requires: trinity-libarts-audiofile = %{?epoch:%{epoch}:}%{version}-%{release}
+%{?with_mpeg:Requires: trinity-libarts-mpeglib = %{?epoch:%{epoch}:}%{version}-%{release}}
+%{?with_xine:Requires: trinity-libarts-xine = %{?epoch:%{epoch}:}%{version}-%{release}}
+Requires: trinity-libkcddb = %{?epoch:%{epoch}:}%{version}-%{release}
+%{?with_mpeg:Requires: trinity-mpeglib = %{?epoch:%{epoch}:}%{version}-%{release}}
+Requires: trinity-noatun = %{?epoch:%{epoch}:}%{version}-%{release}
 
 
 %description
@@ -459,6 +460,7 @@ Some of JuK's features include:
 %{tde_datadir}/icons/crystalsvg/*/actions/juk_dock.png
 %{tde_datadir}/icons/hicolor/*/apps/juk.png
 %{tde_tdedocdir}/HTML/en/juk/
+%{tde_mandir}/man1/juk.1*
 
 ##########
 
@@ -467,7 +469,7 @@ Summary:	Light, embedded media player for Trinity
 Group:		System/GUI/Other
 
 %if 0%{?with_xine}
-Requires:	trinity-libarts-xine = %{version}-%{release}
+Requires:	trinity-libarts-xine = %{?epoch:%{epoch}:}%{version}-%{release}
 %endif
 
 %description -n trinity-kaboodle
@@ -485,6 +487,7 @@ for TDE. It uses the aRts framework for playing media files.
 %{tde_datadir}/services/kaboodle_component.desktop
 %{tde_datadir}/services/kaboodleengine.desktop
 %{tde_tdedocdir}/HTML/en/kaboodle/
+%{tde_mandir}/man1/kaboodle.1*
 
 ##########
 
@@ -492,7 +495,7 @@ for TDE. It uses the aRts framework for playing media files.
 Summary:	CD ripper and audio encoder frontend for Trinity
 Group:		Productivity/Multimedia/CD/Grabbers
 
-Requires:	%{name}-tdeio-plugins = %{version}-%{release}
+Requires:	%{name}-tdeio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	vorbis-tools
 Requires:	flac
 
@@ -515,6 +518,7 @@ searches CDDB to retrieve the information of the disk.
 %{tde_datadir}/icons/hicolor/*/apps/kaudiocreator.png
 %{tde_datadir}/icons/locolor/*/apps/kaudiocreator.png
 %{tde_tdedocdir}/HTML/en/kaudiocreator/
+%{tde_mandir}/man1/kaudiocreator.1*
 
 ##########
 
@@ -586,8 +590,8 @@ Summary:	Enables the browsing of audio CDs under Konqueror
 Group:		Productivity/Multimedia/Sound/Utilities
 Requires:	trinity-tdebase-tdeio-plugins >= %{tde_version}
 
-Obsoletes:	trinity-tdemultimedia-kio-plugins < %{version}-%{release}
-Provides:	trinity-tdemultimedia-kio-plugins = %{version}-%{release}
+Obsoletes:	trinity-tdemultimedia-kio-plugins < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-tdemultimedia-kio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description tdeio-plugins
 This package allow audio CDs to be browsed like a file system using
@@ -623,8 +627,8 @@ Konqueror and the audiocd:/ URL.
 Summary:	MIDI/karaoke player for Trinity
 Group:		Productivity/Multimedia/Sound/Midi
 
-Obsoletes:	trinity-kmid < %{version}-%{release}
-Provides:	trinity-kmid = %{version}-%{release}
+Obsoletes:	trinity-kmid < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kmid = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-tdemid
 This package provides a MIDI and karaoke player for TDE.
@@ -672,6 +676,8 @@ This package includes TDE's dockable sound mixer applet.
 %{tde_datadir}/icons/hicolor/*/apps/kmix.png
 %{tde_datadir}/services/kmixctrl_restore.desktop
 %{tde_tdedocdir}/HTML/en/kmix/
+%{tde_mandir}/man1/kmix.1*
+%{tde_mandir}/man1/kmixctrl.1*
 
 ##########
 
@@ -710,6 +716,7 @@ This is a sound recording utility for Trinity.
 %{tde_datadir}/services/krec_exportwave.desktop
 %{tde_datadir}/servicetypes/krec_exportitem.desktop
 %{tde_tdedocdir}/HTML/en/krec/
+%{tde_mandir}/man1/krec.1*
 
 ##########
 
@@ -862,7 +869,7 @@ databases, for TDE applications.
 Summary:	MP3 and MPEG-1 audio and video library
 Group:		Productivity/Multimedia/Other
 %if 0%{?with_mpeg}
-Requires:	trinity-libarts-mpeglib = %{version}-%{release}
+Requires:	trinity-libarts-mpeglib = %{?epoch:%{epoch}:}%{version}-%{release}
 %endif
 
 %description -n trinity-mpeglib
@@ -968,17 +975,18 @@ formats supported by your installation of aRts (including aRts plugins).
 %{tde_datadir}/icons/hicolor/*/apps/noatun.png
 %{tde_datadir}/mimelnk/interface/x-winamp-skin.desktop
 %{tde_tdedocdir}/HTML/en/noatun/
+%{tde_mandir}/man1/noatun.1*
 
 ##########
 
 %package devel
 Summary:	Development files for %{name}, aRts and noatun plugins
 Group:		Development/Libraries/Other
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	trinity-tdelibs-devel >= %{tde_version}
 
-Obsoletes:	trinity-kdemultimedia-devel < %{version}-%{release}
-Provides:	trinity-kdemultimedia-devel = %{version}-%{release}
+Obsoletes:	trinity-kdemultimedia-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdemultimedia-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description devel
 {summary}.
@@ -1069,6 +1077,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_NO_BUILTIN_CHRPATH=ON \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
diff --git a/redhat/main/tdemultimedia/trinity-tdemultimedia-rpmlintrc b/redhat/core/tdemultimedia/trinity-tdemultimedia-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/main/tdemultimedia/trinity-tdemultimedia-rpmlintrc
+++ b/redhat/core/tdemultimedia/trinity-tdemultimedia-rpmlintrc
diff --git a/redhat/main/tdenetwork/kppp.pamd b/redhat/core/tdenetwork/kppp.pamd
index c7d67e332..c7d67e332 100644
--- a/redhat/main/tdenetwork/kppp.pamd
+++ b/redhat/core/tdenetwork/kppp.pamd
diff --git a/redhat/main/tdenetwork/ktalk b/redhat/core/tdenetwork/ktalk
index 4458a0964..4458a0964 100644
--- a/redhat/main/tdenetwork/ktalk
+++ b/redhat/core/tdenetwork/ktalk
diff --git a/redhat/main/tdenetwork/tdenetwork.spec b/redhat/core/tdenetwork/tdenetwork.spec
index eed8b5310..9a0c44a16 100644
--- a/redhat/main/tdenetwork/tdenetwork.spec
+++ b/redhat/core/tdenetwork/tdenetwork.spec
@@ -26,7 +26,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tdenetwork
 %define tde_prefix /opt/trinity
@@ -75,8 +75,9 @@ Source3:	trinity-tdenetwork-rpmlintrc
 
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	libtqca-devel >= %{tde_epoch}:1.0
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gettext
 BuildRequires:	coreutils 
 BuildRequires:	gcc-c++
@@ -136,7 +137,7 @@ BuildRequires:	pcre-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gamin 1
 BuildRequires:	gamin-devel
 %endif
@@ -174,12 +175,9 @@ BuildRequires:	libXxf86vm-devel
 ## Conditional build:
 # RHEL6: xmms is outdated !
 #define _with_xmms --with-xmms
-%ifnarch s390 s390x
-%define _with_wifi --with-wifi
-%endif
 
 # Wifi support
-%if "%{?_with_wifi:1}" == "1"
+%define with_wifi 1
 %if 0%{?fedora} >= 6 || 0%{?rhel} >= 5
 BuildRequires: wireless-tools-devel
 %endif
@@ -192,7 +190,6 @@ BuildRequires: wireless-tools
 %if 0%{?suse_version} || 0%{?mgaversion} >= 3
 BuildRequires:	libiw-devel
 %endif
-%endif
 
 # OpenSLP support
 %if 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
@@ -255,43 +252,51 @@ BuildRequires:	speex-devel
 %if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_consolehelper 1
 
+# XINETD support
+%if 0%{?fedora} >= 34 || 0%{?rhel} >= 9
+# No xinetd
+%else
+%define with_xinetd 1
+Requires:		xinetd
+%endif
+
 # Avoids relinking, which breaks consolehelper
 %define dont_relink 1
 %endif
 
 # Build kopete motionaway plugin
-%if 0%{?rhel} == 5
-%define build_kopete_motionaway 0
-%else
+%if 0%{?rhel} != 5
 %define build_kopete_motionaway 1
 %endif
 
-Obsoletes:	trinity-kdenetwork < %{version}-%{release}
-Provides:	trinity-kdenetwork = %{version}-%{release}
-Obsoletes:	trinity-kdenetwork-libs < %{version}-%{release}
-Provides:	trinity-kdenetwork-libs = %{version}-%{release}
-Obsoletes:	trinity-kdenetwork-extras < %{version}-%{release}
-Provides:	trinity-kdenetwork-extras = %{version}-%{release}
-Obsoletes:	tdenetwork < %{version}-%{release}
-Provides:	tdenetwork = %{version}-%{release}
-
-Requires: trinity-dcoprss = %{version}-%{release}
-Requires: %{name}-filesharing = %{version}-%{release}
-Requires: trinity-kdict = %{version}-%{release}
-Requires: %{name}-tdefile-plugins = %{version}-%{release}
-Requires: trinity-kget = %{version}-%{release}
-Requires: trinity-knewsticker = %{version}-%{release}
-Requires: trinity-kopete = %{version}-%{release}
-Requires: trinity-kopete-nowlistening = %{version}-%{release}
-Requires: trinity-kpf = %{version}-%{release}
-Requires: trinity-kppp = %{version}-%{release}
-Requires: trinity-krdc = %{version}-%{release}
-Requires: trinity-krfb = %{version}-%{release}
-Requires: trinity-ksirc = %{version}-%{release}
-Requires: trinity-ktalkd = %{version}-%{release}
-Requires: trinity-kwifimanager = %{version}-%{release}
-Requires: trinity-librss = %{version}-%{release}
-Requires: trinity-lisa = %{version}-%{release}
+Obsoletes:	trinity-kdenetwork < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdenetwork = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-kdenetwork-libs < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdenetwork-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-kdenetwork-extras < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdenetwork-extras = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	tdenetwork < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	tdenetwork = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Requires: trinity-dcoprss = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-filesharing = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kdict = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-tdefile-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kget = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-knewsticker = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kopete = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kopete-nowlistening = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kpf = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kppp = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-krdc = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-krfb = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ksirc = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ktalkd = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?with_wifi}
+Requires: trinity-kwifimanager = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+Requires: trinity-librss = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-lisa = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description
 This metapackage includes a collection of network and networking related
@@ -312,7 +317,9 @@ Networking applications, including:
 * krfb: Desktop Sharing server, allow others to access your desktop via VNC
 * ksirc: IRC client for Trinity
 * ktalkd: Talk daemon for Trinity
+%if 0%{?with_wifi}
 * kwifimanager: Wireless lan manager for Trinity
+%endif
 * librss: RSS library for Trinity
 * lisa: lan information server
 
@@ -346,17 +353,17 @@ DCOP is the TDE interprocess communication protocol.
 %package devel
 Summary:		Development files for the Trinity network module
 Group:			Development/Libraries/Other
-Requires:		%{name} = %{version}-%{release}
-Requires:		trinity-kdict = %{version}-%{release}
-Requires:		trinity-kopete = %{version}-%{release}
-Requires:		trinity-ksirc = %{version}-%{release}
-Requires:		trinity-librss = %{version}-%{release}
+Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:		trinity-kdict = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:		trinity-kopete = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:		trinity-ksirc = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:		trinity-librss = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:		trinity-tdelibs-devel >= %{tde_version}
 
-Obsoletes:	trinity-kdenetwork-devel < %{version}-%{release}
-Provides:	trinity-kdenetwork-devel = %{version}-%{release}
-Obsoletes:	tdenetwork-devel < %{version}-%{release}
-Provides:	tdenetwork-devel = %{version}-%{release}
+Obsoletes:	trinity-kdenetwork-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdenetwork-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	tdenetwork-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	tdenetwork-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description devel
 This is the development package which contains the headers for the TDE RSS
@@ -387,8 +394,8 @@ development-related files for the TDE network module.
 Summary:		Network filesharing configuration module for Trinity
 Group:   		Applications/Internet
 
-Obsoletes:		tdenetwork-filesharing < %{version}-%{release}
-Provides:		tdenetwork-filesharing = %{version}-%{release}
+Obsoletes:		tdenetwork-filesharing < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		tdenetwork-filesharing = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description filesharing
 This package provides a Trinity Control Center module to configure
@@ -434,6 +441,7 @@ basic as well as advanced queries.
 %{tde_datadir}/apps/kicker/applets/kdictapplet.desktop
 %{tde_datadir}/icons/hicolor/*/apps/kdict.*
 %{tde_tdedocdir}/HTML/en/kdict
+%{tde_mandir}/man1/kdict.1*
 
 ##########
 
@@ -441,10 +449,10 @@ basic as well as advanced queries.
 Summary:		Torrent metainfo plugin for Trinity
 Group:			Applications/Internet
 
-Obsoletes:		tdenetwork-kfile-plugins < %{version}-%{release}
-Provides:		tdenetwork-kfile-plugins = %{version}-%{release}
-Obsoletes:		trinity-tdenetwork-kfile-plugins < %{version}-%{release}
-Provides:		trinity-tdenetwork-kfile-plugins = %{version}-%{release}
+Obsoletes:		tdenetwork-kfile-plugins < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		tdenetwork-kfile-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-tdenetwork-kfile-plugins < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-tdenetwork-kfile-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description tdefile-plugins
 This package provides a metainformation plugin for bittorrent files.
@@ -493,6 +501,7 @@ applications and Netscape.
 %{tde_datadir}/sounds/KGet_Finished_All.ogg
 %{tde_datadir}/sounds/KGet_Started.ogg
 %{tde_tdedocdir}/HTML/en/kget
+%{tde_mandir}/man1/kget.1*
 
 ##########
 
@@ -597,7 +606,6 @@ Support for more IM protocols can be added through a plugin system.
 %{tde_datadir}/icons/crystalsvg/*/actions/jabber_na.png
 %{tde_datadir}/icons/crystalsvg/*/actions/jabber_offline.png
 %{tde_datadir}/icons/crystalsvg/*/actions/jabber_online.png
-%{tde_datadir}/icons/crystalsvg/*/actions/jabber_original.png
 %{tde_datadir}/icons/crystalsvg/*/actions/jabber_raw.png
 %{tde_datadir}/icons/crystalsvg/*/actions/jabber_serv_off.png
 %{tde_datadir}/icons/crystalsvg/*/actions/jabber_serv_on.png
@@ -642,7 +650,6 @@ Support for more IM protocols can be added through a plugin system.
 %{tde_datadir}/icons/hicolor/*/actions/jabber_na.png
 %{tde_datadir}/icons/hicolor/*/actions/jabber_offline.png
 %{tde_datadir}/icons/hicolor/*/actions/jabber_online.png
-%{tde_datadir}/icons/hicolor/*/actions/jabber_original.png
 %{tde_datadir}/icons/hicolor/*/actions/jabber_raw.png
 %{tde_datadir}/icons/hicolor/*/actions/jabber_serv_off.png
 %{tde_datadir}/icons/hicolor/*/actions/jabber_serv_on.png
@@ -724,13 +731,14 @@ Support for more IM protocols can be added through a plugin system.
 %{tde_libdir}/libkopete_msn_shared.so.0
 %{tde_libdir}/libkopete_msn_shared.so.0.0.0
 %endif
+%{tde_mandir}/man1/kopete.1*
 
 ##########
 
 %package -n trinity-kopete-nowlistening
 Summary:		Nowlistening (xmms) plugin for Kopete
 Group:			Applications/Internet
-Requires:		trinity-kopete = %{version}-%{release}
+Requires:		trinity-kopete = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:		trinity-filesystem >= %{tde_version}
 
 %description -n trinity-kopete-nowlistening
@@ -921,7 +929,9 @@ Summary:		Talk daemon for Trinity
 Group:			Applications/Internet
 Requires:		trinity-kcontrol >= %{tde_version}
 Requires:		trinity-tdebase-data >= %{tde_version}
+%if 0%{?with_xinetd}
 Requires:		xinetd
+%endif
 
 %description -n trinity-ktalkd
 KTalkd is an enhanced talk daemon - a program to handle incoming talk
@@ -939,16 +949,17 @@ and shouldn't be run on a multi-user machine.
 %{tde_datadir}/icons/crystalsvg/*/apps/ktalkd.png
 %{tde_datadir}/icons/hicolor/*/apps/ktalkd.png
 %{tde_datadir}/sounds/ktalkd.wav
-%if 0%{?fedora} == 0 || 0%{?fedora} <= 30
+%if 0%{?with_xinetd}
 %dir %{_sysconfdir}/xinetd.d
-%endif
 %config(noreplace) %{_sysconfdir}/xinetd.d/ktalk
+%endif
 %{tde_tdedocdir}/HTML/en/kcontrol/kcmtalkd
 %{tde_tdedocdir}/HTML/en/ktalkd
 
 ##########
 
-%if "%{?_with_wifi:1}" == "1"
+%if 0%{?with_wifi}
+
 %package -n trinity-kwifimanager
 Summary:		Wireless lan manager for Trinity
 Group:			Applications/Internet
@@ -974,6 +985,8 @@ wavelan card that uses the wireless extensions interface.
 %{tde_datadir}/icons/hicolor/*/apps/kwifimanager.svgz
 %{tde_tdedocdir}/HTML/en/kwifimanager/
 %{tde_tdedocdir}/HTML/en/kcontrol/kcmwifi/
+%{tde_mandir}/man1/kwifimanager.1*
+
 %endif
 
 ##########
@@ -1023,6 +1036,8 @@ but relying only on the TCP/IP protocol.
 %{tde_datadir}/services/rlan.protocol
 %{tde_bindir}/lisa
 %{tde_bindir}/reslisa
+%{tde_mandir}/man8/lisa.8*
+%{tde_mandir}/man8/reslisa.8*
 
 ##########
 
@@ -1065,8 +1080,10 @@ A tdeioslave and tded module that provide Zeroconf support. Try
 
 # Workaround libiw detection failure on opensuse
 %if 0%{?suse_version}
+%if 0%{?with_wifi}
 %__sed -i "wifi/ConfigureChecks.cmake" -e "s|^check_library_exists.*|set( HAVE_IW 1 )|"
 %endif
+%endif
 
 # Update icons for some control center modules
 %__sed -i "filesharing/simple/fileshare.desktop" -e "s|^Icon=.*|Icon=kcmfileshare|"
@@ -1092,6 +1109,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_NO_BUILTIN_CHRPATH=ON \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
@@ -1109,13 +1127,14 @@ fi
   -DWITH_GSM=OFF \
   -DWITH_XMMS=OFF \
   -DWITH_ARTS=ON \
-  %{?with_openslp:-DWITH_SLP=ON} \
+  %{!?with_openslp:-DWITH_SLP=OFF} \
   -DBUILD_ALL=ON \
   -DBUILD_KOPETE_PLUGIN_ALL=ON \
   -DBUILD_KOPETE_PROTOCOL_ALL=ON \
   %{!?build_kopete_motionaway:-DBUILD_KOPETE_PLUGIN_MOTIONAUTOAWAY=OFF} \
   %{!?with_gadu:-DBUILD_KOPETE_PROTOCOL_GADU=OFF} \
   %{!?with_meanwhile:-DBUILD_KOPETE_PROTOCOL_MEANWHILE=OFF} \
+  %{!?with_wifi:-DBUILD_WIFI=OFF} \
   ..
 
 # Tdenetwork is not smp safe !
@@ -1163,8 +1182,10 @@ if [ -r "%{?buildroot}%{tde_bindir}/kppp" ]; then
   chmod 0755 "%{?buildroot}%{tde_bindir}/kppp"
 fi
 
+%if 0%{?with_xinetd}
 # ktalk
 %__install -p -m 0644 -D  %{SOURCE2} %{buildroot}%{_sysconfdir}/xinetd.d/ktalk
+%endif
 
 # Avoids conflict with trinity-kvirc
 %__mv -f %{buildroot}%{tde_datadir}/services/irc.protocol %{buildroot}%{tde_datadir}/apps/kopete/
@@ -1178,6 +1199,12 @@ for i in %{?buildroot}%{tde_tdeappdir}/*.desktop ; do
   fi
 done
 
+# Remove unwanted doc
+%if 0%{?with_wifi} == 0
+%__rm -rf "%{buildroot}%{tde_tdedocdir}/HTML/en/kcontrol/kcmwifi/"
+%__rm -rf "%{buildroot}%{tde_tdedocdir}/HTML/en/kwifimanager/"
+%endif
+
 # Updates applications categories for openSUSE
 %if 0%{?suse_version}
 %suse_update_desktop_file    kcmkrfb
@@ -1190,8 +1217,10 @@ done
 %suse_update_desktop_file -r krdc          System   RemoteAccess
 %suse_update_desktop_file -r krfb          System   RemoteAccess
 %suse_update_desktop_file -r kget          System   TrayIcon
+%if 0%{?with_wifi}
 %suse_update_desktop_file -r kwifimanager  System   Network
 %suse_update_desktop_file    kcmwifi
+%endif
 %suse_update_desktop_file -u knewsticker-standalone Network  News
 %suse_update_desktop_file %{buildroot}%{tde_datadir}/apps/remoteview/zeroconf.desktop
 %endif
diff --git a/redhat/main/tdenetwork/trinity-tdenetwork-rpmlintrc b/redhat/core/tdenetwork/trinity-tdenetwork-rpmlintrc
index 8d22f2fc6..8d22f2fc6 100644
--- a/redhat/main/tdenetwork/trinity-tdenetwork-rpmlintrc
+++ b/redhat/core/tdenetwork/trinity-tdenetwork-rpmlintrc
diff --git a/redhat/main/tdepim/tdepim.spec b/redhat/core/tdepim/tdepim.spec
index 049f75e8d..683e79837 100644
--- a/redhat/main/tdepim/tdepim.spec
+++ b/redhat/core/tdepim/tdepim.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tdepim
 %define tde_prefix /opt/trinity
@@ -68,7 +68,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	libcaldav-devel >= %{tde_epoch}:0.6.5
 BuildRequires:	libcarddav-devel >= %{tde_epoch}:0.6.2
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	fdupes
 BuildRequires:	desktop-file-utils
@@ -97,7 +97,7 @@ BuildRequires:	brp-check-trinity
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gamin 1
 BuildRequires:	gamin-devel
 %endif
@@ -148,7 +148,8 @@ BuildRequires:	libXcomposite-devel
 #  RHEL 4: disabled
 #  RHEL 6: available in EPEL
 #  RHEL 7: available in NUX
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?suse_version}
+#  RHEL 8: available in EPEL
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || ( 0%{?rhel} >= 5 && 0%{?rhel} <= 8 ) || 0%{?suse_version}
 %define with_xscreensaver 1
 
 %if 0%{?fedora} || 0%{?rhel} >= 5
@@ -178,7 +179,9 @@ BuildRequires:	%{_lib}xscrnsaver%{?mgaversion:1}-devel
 %endif
 BuildRequires:	xscreensaver
 BuildRequires:	xscreensaver-base
+%if 0%{?pclinuxos} == 0
 BuildRequires:	xscreensaver-extrusion
+%endif
 BuildRequires:	xscreensaver-gl
 %endif
 %endif
@@ -187,43 +190,43 @@ BuildRequires:	xscreensaver-gl
 BuildRequires:	libacl-devel
 
 
-Requires:	trinity-libtdepim = %{version}-%{release}
-Requires:	%{name}-kfile-plugins = %{version}-%{release}
-Requires:	%{name}-tdeio-plugins = %{version}-%{release}
-Requires:	%{name}-tderesources = %{version}-%{release}
-Requires:	%{name}-wizards = %{version}-%{release}
-Requires:	trinity-akregator = %{version}-%{release}
-Requires:	trinity-kaddressbook = %{version}-%{release}
-Requires:	trinity-kalarm = %{version}-%{release}
-Requires:	trinity-kandy = %{version}-%{release}
-Requires:	trinity-karm = %{version}-%{release}
-Requires:	trinity-kleopatra = %{version}-%{release}
-Requires:	trinity-kmail = %{version}-%{release}
-Requires:	trinity-kmailcvt = %{version}-%{release}
-Requires:	trinity-kmobile = %{version}-%{release}
-Requires:	trinity-knode = %{version}-%{release}
-Requires:	trinity-knotes = %{version}-%{release}
-Requires:	trinity-kode = %{version}-%{release}
-Requires:	trinity-konsolekalendar = %{version}-%{release}
-Requires:	trinity-kontact = %{version}-%{release}
-Requires:	trinity-korganizer = %{version}-%{release}
-Requires:	trinity-korn = %{version}-%{release}
-Requires:	trinity-ktnef = %{version}-%{release}
-Requires:	trinity-libindex = %{version}-%{release}
-Requires:	trinity-libkcal = %{version}-%{release}
-Requires:	trinity-libkgantt = %{version}-%{release}
-Requires:	trinity-libkleopatra = %{version}-%{release}
-Requires:	trinity-libkmime = %{version}-%{release}
-Requires:	trinity-libkpimexchange = %{version}-%{release}
-Requires:	trinity-libkpimidentities = %{version}-%{release}
-Requires:	trinity-libksieve = %{version}-%{release}
-Requires:	trinity-libktnef = %{version}-%{release}
-Requires:	trinity-libmimelib = %{version}-%{release}
-
-Obsoletes:	trinity-kdepim < %{version}-%{release}
-Provides:	trinity-kdepim = %{version}-%{release}
-Obsoletes:	tdepim < %{version}-%{release}
-Provides:	tdepim = %{version}-%{release}
+Requires:	trinity-libtdepim = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	%{name}-kfile-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	%{name}-tdeio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	%{name}-tderesources = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	%{name}-wizards = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-akregator = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kaddressbook = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kalarm = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kandy = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-karm = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kleopatra = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kmail = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kmailcvt = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kmobile = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-knode = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-knotes = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kode = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-konsolekalendar = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kontact = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-korganizer = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-korn = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-ktnef = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libindex = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkcal = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkgantt = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkleopatra = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkmime = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkpimexchange = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkpimidentities = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libksieve = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libktnef = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libmimelib = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Obsoletes:	trinity-kdepim < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdepim = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	tdepim < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	tdepim = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description
 This metapackage includes a collection of Personal Information Management
@@ -238,35 +241,35 @@ This metapackage includes a collection of Personal Information Management
 Summary:	Development files for %{name}
 Group:		Development/Libraries/Other
 
-Obsoletes:	tdepim-cmake < %{version}-%{release}
-
-Obsoletes:	trinity-kdepim-devel < %{version}-%{release}
-Provides:	trinity-kdepim-devel = %{version}-%{release}
-Obsoletes:	tdepim-devel < %{version}-%{release}
-Provides:	tdepim-devel = %{version}-%{release}
-
-Requires:	%{name} = %{version}-%{release}
-Requires:	trinity-akregator-devel = %{version}-%{release}
-Requires:	trinity-libtdepim-devel = %{version}-%{release}
-Requires:	trinity-kaddressbook-devel = %{version}-%{release}
-Requires:	trinity-karm-devel = %{version}-%{release}
-Requires:	trinity-kmail-devel = %{version}-%{release}
-Requires:	trinity-knode-devel = %{version}-%{release}
-Requires:	trinity-knotes-devel = %{version}-%{release}
-Requires:	trinity-kode-devel = %{version}-%{release}
-Requires:	trinity-kontact-devel = %{version}-%{release}
-Requires:	trinity-korganizer-devel = %{version}-%{release}
-Requires:	trinity-libindex-devel = %{version}-%{release}
-Requires:	trinity-libkcal-devel = %{version}-%{release}
-Requires:	trinity-libkgantt-devel = %{version}-%{release}
-Requires:	trinity-libkleopatra-devel = %{version}-%{release}
-Requires:	trinity-libkmime-devel = %{version}-%{release}
-Requires:	trinity-libkpimexchange-devel = %{version}-%{release}
-Requires:	trinity-libkpimidentities-devel = %{version}-%{release}
-Requires:	trinity-libksieve-devel = %{version}-%{release}
-Requires:	trinity-libktnef-devel = %{version}-%{release}
-Requires:	trinity-libmimelib-devel = %{version}-%{release}
-Requires:	%{name}-tderesources-devel = %{version}-%{release}
+Obsoletes:	tdepim-cmake < %{?epoch:%{epoch}:}%{version}-%{release}
+
+Obsoletes:	trinity-kdepim-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdepim-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	tdepim-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	tdepim-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-akregator-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libtdepim-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kaddressbook-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-karm-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kmail-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-knode-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-knotes-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kode-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kontact-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-korganizer-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libindex-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkcal-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkgantt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkleopatra-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkmime-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkpimexchange-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkpimidentities-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libksieve-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libktnef-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libmimelib-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	%{name}-tderesources-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description devel
 This metapackage includes all development files for TDE PIM.
@@ -281,8 +284,8 @@ It also contains the CMAKE macros.
 %package -n trinity-akregator
 Summary:	RSS feed aggregator for TDE
 Group:		Applications/Internet
-Requires:	trinity-libtdepim = %{version}-%{release}
-Requires:	trinity-libkcal = %{version}-%{release}
+Requires:	trinity-libtdepim = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkcal = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-akregator
 aKregator is a fast, lightweight, and intuitive feed reader program
@@ -318,7 +321,7 @@ thousands of internet feeds in a quick, efficient, and familiar way.
 %package -n trinity-akregator-devel
 Summary:	Development files for trinity-akregator
 Group:		Development/Libraries/Other
-Requires:	trinity-akregator = %{version}-%{release}
+Requires:	trinity-akregator = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-akregator-devel
 %{summary}
@@ -335,7 +338,7 @@ Requires:	trinity-akregator = %{version}-%{release}
 Summary:	TDE addressbook application
 Group:		Applications/Communications
 Requires:	trinity-tdebase-tdeio-pim-plugins
-Requires:	%{name}-tderesources = %{version}-%{release}
+Requires:	%{name}-tderesources = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kaddressbook
 KAddressBook is the main address book application for TDE; it enables you
@@ -388,7 +391,7 @@ LDAP servers, and SQL databases.
 %package -n trinity-kaddressbook-devel
 Summary:	Development files for trinity-kaddressbook
 Group:		Development/Libraries/Other
-Requires:	trinity-kaddressbook = %{version}-%{release}
+Requires:	trinity-kaddressbook = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kaddressbook-devel
 %{summary}
@@ -405,7 +408,7 @@ Requires:	trinity-kaddressbook = %{version}-%{release}
 %package -n trinity-kalarm
 Summary:	Trinity alarm message, command and email scheduler
 Group:		Applications/Communications
-Requires:	trinity-libkpimidentities = %{version}-%{release}
+Requires:	trinity-libkpimidentities = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kalarm
 KAlarm provides a graphical interface to schedule personal timed events -
@@ -507,7 +510,7 @@ Group:		Development/Libraries/Other
 Summary:	TDE File dialog plugins for palm and vcf files
 Group:		Environment/Libraries
 
-Obsoletes:	tdepim-kfile-plugins < %{version}-%{release}
+Obsoletes:	tdepim-kfile-plugins < %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description kfile-plugins
 File dialog plugins for palm and vcf files.
@@ -527,9 +530,9 @@ File dialog plugins for palm and vcf files.
 Summary:	Trinity PIM I/O Slaves
 Group:		Environment/Libraries
 
-Obsoletes:	tdepim-kio-plugins < %{version}-%{release}
-Obsoletes:	trinity-tdepim-kio-plugins < %{version}-%{release}
-Provides:	trinity-tdepim-kio-plugins = %{version}-%{release}
+Obsoletes:	tdepim-kio-plugins < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-tdepim-kio-plugins < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-tdepim-kio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description tdeio-plugins
 This package includes the pim kioslaves. This includes imap4, sieve,
@@ -564,15 +567,15 @@ and mbox.
 %package tderesources
 Summary:	Trinity pim resource plugins
 Group:		Environment/Libraries
-#Requires:	trinity-kaddressbook = %{version}-%{release}
-#Requires:	trinity-korganizer = %{version}-%{release}
-#Requires:	trinity-knotes = %{version}-%{release}
+#Requires:	trinity-kaddressbook = %{?epoch:%{epoch}:}%{version}-%{release}
+#Requires:	trinity-korganizer = %{?epoch:%{epoch}:}%{version}-%{release}
+#Requires:	trinity-knotes = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	libcaldav
 Requires:	libcarddav
 
-Obsoletes:	tdepim-kresources < %{version}-%{release}
-Obsoletes:	trinity-tdepim-kresources < %{version}-%{release}
-Provides:	trinity-tdepim-kresources = %{version}-%{release}
+Obsoletes:	tdepim-kresources < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-tdepim-kresources < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-tdepim-kresources = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description tderesources
 This package includes several plugins needed to interface with groupware
@@ -682,13 +685,13 @@ tracking feature plans.
 %package tderesources-devel
 Summary:	Development files for tderesources
 Group:		Development/Libraries/Other
-Requires:	%{name}-tderesources = %{version}-%{release}
+Requires:	%{name}-tderesources = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	libcaldav
 Requires:	libcarddav
 
-Obsoletes:	tdepim-tderesources-devel < %{version}-%{release}
-Obsoletes:	trinity-tdepim-kresources-devel < %{version}-%{release}
-Provides:	trinity-tdepim-kresources-devel = %{version}-%{release}
+Obsoletes:	tdepim-tderesources-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-tdepim-kresources-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-tdepim-kresources-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description tderesources-devel
 %{summary}
@@ -751,7 +754,7 @@ Provides:	trinity-tdepim-kresources-devel = %{version}-%{release}
 Summary:	Trinity server configuration wizards
 Group:		Applications/Communications
 
-Obsoletes:	tdepim-wizards < %{version}-%{release}
+Obsoletes:	tdepim-wizards < %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description wizards
 This package contains TDE-based wizards for configuring eGroupware,
@@ -859,7 +862,7 @@ keybox and for retrieving certificates from LDAP servers.
 %package -n trinity-kmail
 Summary:	Trinity Email client
 Group:		Applications/Communications
-Requires:	%{name}-tdeio-plugins = %{version}-%{release}
+Requires:	%{name}-tdeio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	trinity-tdebase-tdeio-pim-plugins >= %{tde_version}
 
 # GPG support
@@ -879,8 +882,8 @@ Requires:	pinentry
 %endif
 
 Requires:	procmail
-Requires:	trinity-kaddressbook = %{version}-%{release}
-Requires:	trinity-kleopatra = %{version}-%{release}
+Requires:	trinity-kaddressbook = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kleopatra = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	trinity-tdebase-tdeio-pim-plugins >= %{tde_version}
 
 Provides: imap-client, mail-reader
@@ -972,7 +975,7 @@ Group:		Development/Libraries/Other
 %package -n trinity-kmailcvt
 Summary:	Trinity KMail mail folder converter
 Group:		Applications/Communications
-Requires:	trinity-kmail = %{version}-%{release}
+Requires:	trinity-kmail = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kmailcvt
 Converts mail folders to KMail format.  Formats supported for import
@@ -1019,7 +1022,7 @@ signatures.
 %package -n trinity-knode-devel
 Summary:	Development files for trinity-knode
 Group:		Development/Libraries/Other
-Requires:	trinity-knode = %{version}-%{release}
+Requires:	trinity-knode = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-knode-devel
 %{summary}
@@ -1034,7 +1037,7 @@ Requires:	trinity-knode = %{version}-%{release}
 %package -n trinity-knotes
 Summary:	Trinity sticky notes
 Group:		Applications/Utilities
-Requires:	trinity-tdepim-tderesources = %{version}-%{release}
+Requires:	trinity-tdepim-tderesources = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-knotes
 KNotes is a program that lets you write sticky notes. The notes are saved
@@ -1063,8 +1066,8 @@ program.  The program supports printing and mailing your notes.
 %package -n trinity-knotes-devel
 Summary:	Development files for knots
 Group:		Development/Libraries/Other
-Requires:	trinity-knotes = %{version}-%{release}
-Requires:	%{name}-tderesources-devel = %{version}-%{release}
+Requires:	trinity-knotes = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	%{name}-tderesources-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-knotes-devel
 %{summary}
@@ -1098,7 +1101,7 @@ described by RelaxNG schemes.
 %package -n trinity-kode-devel
 Summary:	Development files for trinity-kode
 Group:		Development/Libraries/Other
-Requires:	trinity-kode = %{version}-%{release}
+Requires:	trinity-kode = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kode-devel
 %{summary}
@@ -1131,12 +1134,12 @@ frontend to manage your calendars.
 %package -n trinity-kontact
 Summary:	Trinity pim application
 Group:		Applications/Communications
-Requires:	trinity-kmail = %{version}-%{release}
-Requires:	trinity-korganizer = %{version}-%{release}
-Requires:	trinity-kaddressbook = %{version}-%{release}
-Requires:	trinity-knode = %{version}-%{release}
-Requires:	trinity-knotes = %{version}-%{release}
-Requires:	trinity-akregator = %{version}-%{release}
+Requires:	trinity-kmail = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-korganizer = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kaddressbook = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-knode = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-knotes = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-akregator = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kontact
 Kontact is the integrated solution to your personal information management
@@ -1189,7 +1192,7 @@ scheduling, address book and other PIM functionality.
 %package -n trinity-kontact-devel
 Summary:	Development files for kontact
 Group:		Development/Libraries/Other
-Requires:	trinity-kontact = %{version}-%{release}
+Requires:	trinity-kontact = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kontact-devel
 %{summary}
@@ -1207,9 +1210,9 @@ Requires:	trinity-kontact = %{version}-%{release}
 %package -n trinity-korganizer
 Summary:	Trinity personal organizer
 Group:		Applications/Productivity
-Requires:	trinity-libkpimidentities = %{version}-%{release}
-Requires:	trinity-libkpimexchange = %{version}-%{release}
-Requires:	%{name}-tderesources = %{version}-%{release}
+Requires:	trinity-libkpimidentities = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkpimexchange = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	%{name}-tderesources = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	perl
 
 %description -n trinity-korganizer
@@ -1267,7 +1270,7 @@ installed.
 %package -n trinity-korganizer-devel
 Summary:	Development files for korganizer
 Group:		Development/Libraries/Other
-Requires:	trinity-korganizer = %{version}-%{release}
+Requires:	trinity-korganizer = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-korganizer-devel
 %{summary}
@@ -1292,7 +1295,7 @@ Requires:	trinity-korganizer = %{version}-%{release}
 %package -n trinity-korn
 Summary:	Trinity mail checker
 Group:		Applications/Communications
-Requires:	%{name}-tdeio-plugins = %{version}-%{release}
+Requires:	%{name}-tdeio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-korn
 Korn is a TDE mail checker that can display a small summary in the Kicker
@@ -1356,7 +1359,7 @@ This is the runtime package for programs that use the libindex library.
 %package -n trinity-libindex-devel
 Summary:	Trinity indexing library [development]
 Group:		Development/Libraries/Other
-Requires:	trinity-libindex = %{version}-%{release}
+Requires:	trinity-libindex = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-libindex-devel
 This library provides text indexing and is currently used by KMail
@@ -1377,8 +1380,8 @@ library.
 %package -n trinity-libkcal
 Summary:	Trinity calendaring library
 Group:		Environment/Libraries
-#Requires:	%{name}-tderesources = %{version}-%{release}
-Requires:	trinity-libkmime = %{version}-%{release}
+#Requires:	%{name}-tderesources = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkmime = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-libkcal
 This library provides a C++ API for handling the vCalendar and iCalendar
@@ -1413,9 +1416,9 @@ This is the runtime package for programs that use the libkcal-trinity library.
 %package -n trinity-libkcal-devel
 Summary:	Trinity calendaring library [development]
 Group:		Development/Libraries/Other
-Requires:	trinity-libkcal = %{version}-%{release}
-Requires:	trinity-libtdepim-devel = %{version}-%{release}
-Requires:	trinity-libktnef-devel = %{version}-%{release}
+Requires:	trinity-libkcal = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libtdepim-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libktnef-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-libkcal-devel
 This library provides a C++ API for handling the vCalendar and iCalendar
@@ -1440,11 +1443,11 @@ library.
 %package -n trinity-libtdepim
 Summary:	Trinity PIM library
 Group:		Environment/Libraries
-Requires:	trinity-libkcal = %{version}-%{release}
-Requires:	trinity-libktnef = %{version}-%{release}
+Requires:	trinity-libkcal = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libktnef = %{?epoch:%{epoch}:}%{version}-%{release}
 
-Obsoletes:	libtdepim < %{version}-%{release}
-Provides:	libtdepim = %{version}-%{release}
+Obsoletes:	libtdepim < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	libtdepim = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-libtdepim
 This is the runtime package for programs that use the trinity-libtdepim library.
@@ -1468,11 +1471,11 @@ This is the runtime package for programs that use the trinity-libtdepim library.
 %package -n trinity-libtdepim-devel
 Summary:	Trinity PIM library [development]
 Group:		Development/Libraries/Other
-Requires:	trinity-libtdepim = %{version}-%{release}
+Requires:	trinity-libtdepim = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	trinity-tdelibs-devel >= %{version}
 
-Obsoletes:	libtdepim-devel < %{version}-%{release}
-Provides:	libtdepim-devel = %{version}-%{release}
+Obsoletes:	libtdepim-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	libtdepim-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-libtdepim-devel
 This is the development package which contains the headers for the libtdepim-trinity
@@ -1480,7 +1483,6 @@ library.
 
 %files -n trinity-libtdepim-devel
 %defattr(-,root,root,-)
-%{tde_tdeincludedir}/tdepimmacros.h
 %{tde_libdir}/libtdepim.la
 %{tde_libdir}/libtdepim.so
 
@@ -1503,8 +1505,8 @@ This is the runtime package for programs that use the libkgantt-trinity library.
 %package -n trinity-libkgantt-devel
 Summary:	Trinity gantt charting library [development]
 Group:		Development/Libraries/Other
-Requires:	trinity-libkgantt = %{version}-%{release}
-Requires:	trinity-libtdepim-devel = %{version}-%{release}
+Requires:	trinity-libkgantt = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libtdepim-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-libkgantt-devel
 This is the development package which contains the headers for the libkgantt-trinity
@@ -1551,8 +1553,8 @@ This is the runtime package for programs that use the libkleopatra-trinity libra
 %package -n trinity-libkleopatra-devel
 Summary:	Trinity GnuPG interface libraries [development]
 Group:		Development/Libraries/Other
-Requires:	trinity-libkleopatra = %{version}-%{release}
-Requires:	trinity-libtdepim-devel = %{version}-%{release}
+Requires:	trinity-libkleopatra = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libtdepim-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-libkleopatra-devel
 This library is used by several TDE applications to interface to the
@@ -1595,7 +1597,7 @@ an object tree.
 %package -n trinity-libkmime-devel
 Summary:	Development files for libkmime
 Group:		Development/Libraries/Other
-Requires:	trinity-libkmime = %{version}-%{release}
+Requires:	trinity-libkmime = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-libkmime-devel
 %{summary}
@@ -1626,9 +1628,9 @@ library.
 %package -n trinity-libkpimexchange-devel
 Summary:	Trinity PIM Exchange library [development]
 Group:		Development/Libraries/Other
-Requires:	trinity-libkpimexchange = %{version}-%{release}
-Requires:	trinity-libkcal-devel = %{version}-%{release}
-Requires:	trinity-libtdepim-devel = %{version}-%{release}
+Requires:	trinity-libkpimexchange = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkcal-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libtdepim-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-libkpimexchange-devel
 This is the development package which contains the headers for the
@@ -1664,7 +1666,7 @@ library.
 %package -n trinity-libkpimidentities-devel
 Summary:	Development files for libkpimidentities
 Group:		Development/Libraries/Other
-Requires:	trinity-libkpimidentities = %{version}-%{release}
+Requires:	trinity-libkpimidentities = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-libkpimidentities-devel
 %{summary}
@@ -1693,8 +1695,8 @@ This is the runtime package for programs that use the libksieve-trinity library.
 %package -n trinity-libksieve-devel
 Summary:	Trinity mail/news message filtering library [development]
 Group:		Development/Libraries/Other
-Requires:	trinity-libksieve = %{version}-%{release}
-Requires:	trinity-libtdepim-devel = %{version}-%{release}
+Requires:	trinity-libksieve = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libtdepim-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-libksieve-devel
 This is the development package which contains the headers for the libksieve-trinity
@@ -1729,8 +1731,8 @@ This is the runtime library for packages using the ktnef-trinity library.
 %package -n trinity-libktnef-devel
 Summary:	KTNEF handler library [development]
 Group:		Development/Libraries/Other
-Requires:	trinity-libktnef = %{version}-%{release}
-Requires:	trinity-libtdepim-devel = %{version}-%{release}
+Requires:	trinity-libktnef = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libtdepim-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-libktnef-devel
 This library handles mail attachments using the TNEF format. These
@@ -1767,7 +1769,7 @@ This is the runtime package for programs that use the libmimelib-trinity library
 %package -n trinity-libmimelib-devel
 Summary:	Trinity mime library [development]
 Group:		Development/Libraries/Other
-Requires:	trinity-libmimelib = %{version}-%{release}
+Requires:	trinity-libmimelib = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-libmimelib-devel
 This library is used by several TDE applications to handle mime types.
@@ -1853,6 +1855,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_NO_BUILTIN_CHRPATH=ON \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
diff --git a/redhat/main/tdepim/trinity-tdepim-rpmlintrc b/redhat/core/tdepim/trinity-tdepim-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/main/tdepim/trinity-tdepim-rpmlintrc
+++ b/redhat/core/tdepim/trinity-tdepim-rpmlintrc
diff --git a/redhat/main/tdesdk/tdesdk.spec b/redhat/core/tdesdk/tdesdk.spec
index eeb166d8e..aa4454eb6 100644
--- a/redhat/main/tdesdk/tdesdk.spec
+++ b/redhat/core/tdesdk/tdesdk.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tdesdk
 %define tde_prefix /opt/trinity
@@ -64,7 +64,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-perl-dcop >= %{tde_version}
 BuildRequires:	trinity-tdepim-devel >= %{tde_version}
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	libtool
 BuildRequires:	fdupes
@@ -87,7 +87,7 @@ BuildRequires:	libidn-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gamin 1
 BuildRequires:	gamin-devel
 %endif
@@ -156,29 +156,29 @@ BuildRequires:	libtool-ltdl-devel
 %define build_kioslave 1
 %endif
 
-Obsoletes:		trinity-kdesdk < %{version}-%{release}
-Provides:		trinity-kdesdk = %{version}-%{release}
-Obsoletes:		trinity-kdesdk-libs < %{version}-%{release}
-Provides:		trinity-kdesdk-libs = %{version}-%{release}
-
-Requires: trinity-cervisia = %{version}-%{release}
-Requires: trinity-kapptemplate = %{version}-%{release}
-Requires: trinity-kbabel = %{version}-%{release}
-Requires: trinity-kbugbuster = %{version}-%{release}
-Requires: trinity-tdecachegrind = %{version}-%{release}
-Requires: trinity-tdecachegrind-converters = %{version}-%{release}
-Requires: %{name}-kfile-plugins = %{version}-%{release}
-Requires: %{name}-misc = %{version}-%{release}
-Requires: %{name}-scripts = %{version}-%{release}
-Requires: trinity-kmtrace = %{version}-%{release}
-Requires: trinity-kompare = %{version}-%{release}
-Requires: trinity-kspy = %{version}-%{release}
-Requires: trinity-kuiviewer = %{version}-%{release}
-Requires: trinity-libcvsservice0 = %{version}-%{release}
-Requires: trinity-poxml = %{version}-%{release}
-Requires: trinity-umbrello = %{version}-%{release}
-%{?build_kioslave:Requires: %{name}-tdeio-plugins = %{version}-%{release}}
-Requires: trinity-tdeunittest = %{version}-%{release}
+Obsoletes:		trinity-kdesdk < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kdesdk = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kdesdk-libs < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kdesdk-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Requires: trinity-cervisia = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kapptemplate = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kbabel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kbugbuster = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-tdecachegrind = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-tdecachegrind-converters = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-kfile-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-misc = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-scripts = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kmtrace = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kompare = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kspy = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kuiviewer = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-libcvsservice0 = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-poxml = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-umbrello = %{?epoch:%{epoch}:}%{version}-%{release}
+%{?build_kioslave:Requires: %{name}-tdeio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}}
+Requires: trinity-tdeunittest = %{?epoch:%{epoch}:}%{version}-%{release}
 
 
 %description
@@ -253,6 +253,7 @@ This package is part of Trinity, and a component of the TDE SDK module.
 %defattr(-,root,root,-)
 %{tde_bindir}/kapptemplate
 %{tde_datadir}/apps/kapptemplate/
+%{tde_mandir}/man1/kapptemplate.1*
 
 %pre -n trinity-kapptemplate
 if [ -d "%{tde_bindir}/kapptemplate" ]; then
@@ -378,13 +379,16 @@ This package is part of Trinity, and a component of the TDE SDK module.
 %{tde_datadir}/servicetypes/kbabel_validator.desktop
 %{tde_datadir}/servicetypes/kbabeldict_module.desktop
 %{tde_datadir}/servicetypes/kbabelfilter.desktop
+%{tde_mandir}/man1/catalogmanager.1*
+%{tde_mandir}/man1/kbabel.1*
+%{tde_mandir}/man1/kbabeldict.1*
 
 ##########
 
 %package -n trinity-kbabel-devel
 Summary:	PO-file editing suite for Trinity (development files)
 Group:		Development/Libraries/Other
-Requires:	trinity-kbabel = %{version}-%{release}
+Requires:	trinity-kbabel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kbabel-devel
 This is a suite of programs for editing gettext message files (PO-files).
@@ -434,6 +438,7 @@ This package is part of Trinity, and a component of the TDE SDK module.
 %{tde_datadir}/icons/locolor/*/apps/kbugbuster.png
 %{tde_datadir}/services/tderesources/kcal/bugzilla.desktop
 %{tde_tdedocdir}/HTML/en/kbugbuster/
+%{tde_mandir}/man1/kbugbuster.1*
 
 ##########
 
@@ -461,6 +466,7 @@ This package is part of Trinity, and a component of the TDE SDK module.
 %{tde_datadir}/icons/hicolor/*/apps/tdecachegrind.png
 %{tde_datadir}/mimelnk/application/x-tdecachegrind.desktop
 %{tde_tdedocdir}/HTML/en/tdecachegrind/
+%{tde_mandir}/man1/tdecachegrind.1*
 
 ##########
 
@@ -492,6 +498,11 @@ This package is part of Trinity, and a component of the TDE SDK module.
 %{tde_bindir}/memprof2calltree
 %{tde_bindir}/op2calltree
 %{tde_bindir}/pprof2calltree
+%{tde_mandir}/man1/dprof2calltree.1*
+%{tde_mandir}/man1/hotshot2calltree.1*
+%{tde_mandir}/man1/memprof2calltree.1*
+%{tde_mandir}/man1/op2calltree.1*
+%{tde_mandir}/man1/pprof2calltree.1*
 
 ##########
 
@@ -626,13 +637,46 @@ This package is part of Trinity, and a component of the TDE SDK module.
 %{tde_bindir}/svnchangesince
 %{tde_bindir}/svn-clean
 %{tde_datadir}/apps/katepart/syntax/tdesvn-buildrc.xml
-%{tde_mandir}/man1/cvsblame.1
-%{tde_mandir}/man1/cvscheck.1
-%{tde_mandir}/man1/cvsversion.1
-%{tde_mandir}/man1/kde-build.1
-%{tde_mandir}/man1/includemocs.1
-%{tde_mandir}/man1/noncvslist.1
-%{tde_mandir}/man1/tdesvn-build.1
+%{tde_mandir}/man1/adddebug.1*
+%{tde_mandir}/man1/build-progress.sh.1*
+%{tde_mandir}/man1/cheatmake.1*
+%{tde_mandir}/man1/create_cvsignore.1*
+%{tde_mandir}/man1/create_makefile.1*
+%{tde_mandir}/man1/create_makefiles.1*
+%{tde_mandir}/man1/cvsblame.1*
+%{tde_mandir}/man1/cvscheck.1*
+%{tde_mandir}/man1/cvs-clean.1*
+%{tde_mandir}/man1/cvs2dist.1*
+%{tde_mandir}/man1/cvsaskpass.1*
+%{tde_mandir}/man1/cvsbackport.1*
+%{tde_mandir}/man1/cvsforwardport.1*
+%{tde_mandir}/man1/cvslastchange.1*
+%{tde_mandir}/man1/cvslastlog.1*
+%{tde_mandir}/man1/cvsrevertlast.1*
+%{tde_mandir}/man1/cvsservice.1*
+%{tde_mandir}/man1/cvsversion.1*
+%{tde_mandir}/man1/cxxmetric.1*
+%{tde_mandir}/man1/extend_dmalloc.1*
+%{tde_mandir}/man1/extractattr.1*
+%{tde_mandir}/man1/extractrc.1*
+%{tde_mandir}/man1/findmissingcrystal.1*
+%{tde_mandir}/man1/fixkdeincludes.1*
+%{tde_mandir}/man1/fixuifiles.1*
+%{tde_mandir}/man1/includemocs.1*
+%{tde_mandir}/man1/kde-build.1*
+%{tde_mandir}/man1/kdedoc.1*
+%{tde_mandir}/man1/kdelnk2desktop.py.1*
+%{tde_mandir}/man1/kdemangen.pl.1*
+%{tde_mandir}/man1/licensecheck.1*
+%{tde_mandir}/man1/noncvslist.1*
+%{tde_mandir}/man1/makeobj.1*
+%{tde_mandir}/man1/package_crystalsvg.1*
+%{tde_mandir}/man1/png2mng.pl.1
+%{tde_mandir}/man1/pruneemptydirs.1
+%{tde_mandir}/man1/qtdoc.1*
+%{tde_mandir}/man1/tdekillall.1*
+%{tde_mandir}/man1/tdesvn-build.1*
+%{tde_mandir}/man1/zonetab2pot.py.1*
 %{tde_tdedocdir}/HTML/en/tdesvn-build/
 #scripts/kde-devel-gdb /opt/trinity/share/tdesdk-scripts
 #scripts/kde-devel-vim.vim /opt/trinity/share/tdesdk-scripts
@@ -673,6 +717,10 @@ This package is part of Trinity, and a component of the TDE SDK module.
 %{tde_libdir}/kmtrace/libktrace.la
 %{tde_libdir}/kmtrace/libktrace.so
 %{tde_datadir}/apps/kmtrace/
+%{tde_mandir}/man1/demangle.1*
+%{tde_mandir}/man1/kminspector.1*
+%{tde_mandir}/man1/kmmatch.1*
+%{tde_mandir}/man1/kmtrace.1*
 
 ##########
 
@@ -705,6 +753,7 @@ This package is part of Trinity, and a component of the TDE SDK module.
 %{tde_datadir}/icons/hicolor/*/apps/kompare.png
 %{tde_datadir}/icons/hicolor/scalable/apps/kompare.svgz
 %{tde_tdedocdir}/HTML/en/kompare/
+%{tde_mandir}/man1/kompare.1*
 
 ##########
 
@@ -729,6 +778,7 @@ This package is part of Trinity, and a component of the TDE SDK module.
 %defattr(-,root,root,-)
 %{tde_libdir}/libkspy.la
 %{tde_libdir}/libkspy.so.*
+%{tde_mandir}/man1/testkspy.1*
 
 ##########
 
@@ -760,6 +810,7 @@ This package is part of Trinity, and a component of the TDE SDK module.
 %{tde_datadir}/services/designerthumbnail.desktop
 %{tde_datadir}/services/kuiviewer_part.desktop
 %{tde_tdedocdir}/HTML/en/kuiviewer/
+%{tde_mandir}/man1/kuiviewer.1*
 
 ##########
 
@@ -796,7 +847,7 @@ This package is part of Trinity, and a component of the TDE SDK module.
 %package -n trinity-libcvsservice-devel
 Summary:	Development files for CVS DCOP service
 Group:		Development/Libraries/Other
-Requires:	trinity-libcvsservice0 = %{version}-%{release}
+Requires:	trinity-libcvsservice0 = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-libcvsservice-devel
 The library libcvsservice provides a DCOP service for accessing and
@@ -842,6 +893,11 @@ This package is part of Trinity, and a component of the TDE SDK module.
 %{tde_bindir}/swappo
 %{tde_bindir}/transxx
 %{tde_bindir}/xml2pot
+%{tde_mandir}/man1/po2xml.1*
+%{tde_mandir}/man1/split2po.1*
+%{tde_mandir}/man1/swappo.1*
+%{tde_mandir}/man1/transxx.1*
+%{tde_mandir}/man1/xml2pot.1*
 
 ##########
 
@@ -875,6 +931,7 @@ This package is part of Trinity, and a component of the TDE SDK module.
 %{tde_datadir}/icons/hicolor/*/mimetypes/umbrellofile.png
 %{tde_datadir}/mimelnk/application/x-umbrello.desktop
 %{tde_tdedocdir}/HTML/en/umbrello/
+%{tde_mandir}/man1/umbrello.1*
 
 ##########
 
@@ -885,8 +942,8 @@ Summary:	Subversion ioslave for Trinity
 Group:		Development/Languages/Other
 Requires:	subversion
 
-Obsoletes:	trinity-tdesdk-kio-plugins < %{version}-%{release}
-Provides:	trinity-tdesdk-kio-plugins = %{version}-%{release}
+Obsoletes:	trinity-tdesdk-kio-plugins < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-tdesdk-kio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description tdeio-plugins
 This package provides easy access to remote SVN repositories from within
@@ -949,8 +1006,8 @@ fi
 Summary:	Unit testing library for Trinity
 Group:		Development/Languages/Other
 
-Obsoletes:	trinity-kunittest < %{version}-%{release}
-Provides:	trinity-kunittest = %{version}-%{release}
+Obsoletes:	trinity-kunittest < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kunittest = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-tdeunittest
 tdeunittest is a small library that facilitates the writing of tests for
@@ -976,17 +1033,17 @@ This package is part of Trinity, and a component of the TDE SDK module.
 Summary:	Development files for %{name}
 Group:		Development/Libraries/Other
 
-Requires:	%{name} = %{version}-%{release}
-Requires:	trinity-kbabel-devel = %{version}-%{release}
-Requires:	%{name}-misc = %{version}-%{release}
-Requires:	trinity-kspy = %{version}-%{release}
-Requires:	trinity-kmtrace = %{version}-%{release}
-Requires:	trinity-tdeunittest = %{version}-%{release}
-Requires:	trinity-libcvsservice-devel = %{version}-%{release}
-Requires:	trinity-kompare = %{version}-%{release}
+Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kbabel-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	%{name}-misc = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kspy = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kmtrace = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-tdeunittest = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libcvsservice-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kompare = %{?epoch:%{epoch}:}%{version}-%{release}
 
-Obsoletes:	trinity-kdesdk-devel < %{version}-%{release}
-Provides:	trinity-kdesdk-devel = %{version}-%{release}
+Obsoletes:	trinity-kdesdk-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdesdk-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description devel
 This package contains the development files for tdesdk.
@@ -1050,6 +1107,7 @@ export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -L%{tde_libdir}"
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_NO_BUILTIN_CHRPATH=ON \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
diff --git a/redhat/main/tdesdk/trinity-tdesdk-rpmlintrc b/redhat/core/tdesdk/trinity-tdesdk-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/main/tdesdk/trinity-tdesdk-rpmlintrc
+++ b/redhat/core/tdesdk/trinity-tdesdk-rpmlintrc
diff --git a/redhat/main/tdetoys/tdetoys.spec b/redhat/core/tdetoys/tdetoys.spec
index 44a5d0c53..4767ad8f1 100644
--- a/redhat/main/tdetoys/tdetoys.spec
+++ b/redhat/core/tdetoys/tdetoys.spec
@@ -21,7 +21,7 @@
 
 # TDE variables
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tdetoys
 %define tde_prefix /opt/trinity
@@ -62,8 +62,9 @@ Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
 BuildRequires: trinity-tdelibs-devel >= %{tde_version}
 BuildRequires: trinity-kdesktop >= %{tde_version}
 BuildRequires: trinity-kicker >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -86,7 +87,7 @@ BuildRequires:	libidn-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gamin 1
 BuildRequires:	gamin-devel
 %endif
@@ -101,19 +102,19 @@ BuildRequires:	pcre-devel
 BuildRequires:	openssl-devel
 
 
-Obsoletes:		trinity-kdetoys < %{version}-%{release}
-Provides:		trinity-kdetoys = %{version}-%{release}
+Obsoletes:		trinity-kdetoys < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kdetoys = %{?epoch:%{epoch}:}%{version}-%{release}
 
 # Metapackage
-Requires: trinity-amor = %{version}-%{release}
-Requires: trinity-eyesapplet = %{version}-%{release}
-Requires: trinity-fifteenapplet = %{version}-%{release}
-Requires: trinity-kmoon = %{version}-%{release}
-Requires: trinity-kodo = %{version}-%{release}
-Requires: trinity-kteatime = %{version}-%{release}
-Requires: trinity-ktux = %{version}-%{release}
-Requires: trinity-kweather = %{version}-%{release}
-Requires: trinity-kworldclock = %{version}-%{release}
+Requires: trinity-amor = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-eyesapplet = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-fifteenapplet = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kmoon = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kodo = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kteatime = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ktux = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kweather = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kworldclock = %{?epoch:%{epoch}:}%{version}-%{release}
 
 
 %description
@@ -332,7 +333,10 @@ This package is part of Trinity, and a component of the TDE toys module.
 %{tde_tdelibdir}/kweatherreport.la
 %{tde_tdelibdir}/weather_panelapplet.la
 %{tde_tdelibdir}/weather_panelapplet.so
+%{tde_tdelibdir}/weather_sidebar.la
+%{tde_tdelibdir}/weather_sidebar.so
 %{tde_datadir}/apps/kicker/applets/kweather.desktop
+%{tde_datadir}/apps/konqsidebartng/
 %{tde_datadir}/apps/kweather/
 %{tde_datadir}/apps/kweatherservice/
 %{tde_datadir}/icons/hicolor/*/apps/kweather.png
@@ -402,6 +406,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/main/tdeutils/kcmlaptoprc b/redhat/core/tdeutils/kcmlaptoprc
index 66d400f5d..66d400f5d 100644
--- a/redhat/main/tdeutils/kcmlaptoprc
+++ b/redhat/core/tdeutils/kcmlaptoprc
diff --git a/redhat/main/tdeutils/klaptop_acpi_helper.console b/redhat/core/tdeutils/klaptop_acpi_helper.console
index 6a738ec88..6a738ec88 100644
--- a/redhat/main/tdeutils/klaptop_acpi_helper.console
+++ b/redhat/core/tdeutils/klaptop_acpi_helper.console
diff --git a/redhat/main/tdeutils/klaptop_acpi_helper.pam b/redhat/core/tdeutils/klaptop_acpi_helper.pam
index 321c2eefb..321c2eefb 100644
--- a/redhat/main/tdeutils/klaptop_acpi_helper.pam
+++ b/redhat/core/tdeutils/klaptop_acpi_helper.pam
diff --git a/redhat/main/tdeutils/tdeutils.spec b/redhat/core/tdeutils/tdeutils.spec
index 509b9310e..38004b45f 100644
--- a/redhat/main/tdeutils/tdeutils.spec
+++ b/redhat/core/tdeutils/tdeutils.spec
@@ -21,7 +21,7 @@
 
 # TDE variables
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tdeutils
 %define tde_prefix /opt/trinity
@@ -31,6 +31,7 @@
 %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_sbindir %{tde_prefix}/sbin
 %define tde_tdeappdir %{tde_datadir}/applications/tde
 %define tde_tdedocdir %{tde_docdir}/tde
@@ -63,18 +64,18 @@ Source2:	klaptop_acpi_helper.console
 Source3:	kcmlaptoprc
 Source4:	%{name}-rpmlintrc
 
-Obsoletes:	trinity-kdeutils < %{version}-%{release}
-Provides:	trinity-kdeutils = %{version}-%{release}
-Obsoletes:	trinity-kdeutils-extras < %{version}-%{release}
-Provides:	trinity-kdeutils-extras = %{version}-%{release}
-Obsoletes:	tdeutils < %{version}-%{release}
-Provides:	tdeutils = %{version}-%{release}
+Obsoletes:	trinity-kdeutils < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdeutils = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-kdeutils-extras < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdeutils-extras = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	tdeutils < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	tdeutils = %{?epoch:%{epoch}:}%{version}-%{release}
 
 BuildRequires:	trinity-filesystem >= %{tde_version}
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -84,6 +85,10 @@ BuildRequires:	net-snmp-devel
 BuildRequires:	gmp-devel
 
 # PYTHON support
+%if 0%{?sle_version} >= 150400 || 0%{?rhel} >= 9
+%define python python3
+%define __python %__python3
+%else
 %if 0%{?rhel} >= 8 || 0%{?fedora} >= 31
 %define python python2
 %define __python %__python2
@@ -91,6 +96,7 @@ BuildRequires:	gmp-devel
 %else
 %define python python
 %endif
+%endif
 BuildRequires:	%{python}
 BuildRequires:	%{python}-devel
 
@@ -122,7 +128,7 @@ BuildRequires:	libidn-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gamin 1
 BuildRequires:	gamin-devel
 %endif
@@ -145,7 +151,8 @@ BuildRequires:	pcre-devel
 BuildRequires:	libacl-devel
 
 # XSCREENSAVER support
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?suse_version}
+#  RHEL 8: available in EPEL
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
 %define with_xscreensaver 1
 %if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version}
 BuildRequires:	libXScrnSaver-devel
@@ -174,27 +181,27 @@ BuildRequires:	openssl-devel
 %define build_tdefilereplace 1
 %endif
 
-Requires: trinity-ark = %{version}-%{release}
-Requires: trinity-kcalc = %{version}-%{release}
-Requires: trinity-kcharselect = %{version}-%{release}
-Requires: trinity-tdelirc = %{version}-%{release}
-Requires: trinity-tdessh = %{version}-%{release}
-Requires: trinity-kdf = %{version}-%{release}
-Requires: trinity-kedit = %{version}-%{release}
-Requires: trinity-kfloppy = %{version}-%{release}
-Requires: trinity-kgpg = %{version}-%{release}
-Requires: trinity-khexedit = %{version}-%{release}
-Requires: trinity-kjots = %{version}-%{release}
-%{?build_klaptopdaemon:Requires: trinity-klaptopdaemon = %{version}-%{release}}
-Requires: trinity-kmilo = %{version}-%{release}
-Requires: trinity-kmilo-legacy = %{version}-%{release}
-Requires: trinity-kregexpeditor = %{version}-%{release}
-Requires: trinity-ksim = %{version}-%{release}
-Requires: trinity-ktimer = %{version}-%{release}
-Requires: trinity-tdewalletmanager = %{version}-%{release}
-Requires: trinity-superkaramba = %{version}-%{release}
+Requires: trinity-ark = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kcalc = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kcharselect = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-tdelirc = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-tdessh = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kdf = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kedit = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kfloppy = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kgpg = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-khexedit = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kjots = %{?epoch:%{epoch}:}%{version}-%{release}
+%{?build_klaptopdaemon:Requires: trinity-klaptopdaemon = %{?epoch:%{epoch}:}%{version}-%{release}}
+Requires: trinity-kmilo = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kmilo-legacy = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kregexpeditor = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ksim = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ktimer = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-tdewalletmanager = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-superkaramba = %{?epoch:%{epoch}:}%{version}-%{release}
 %if 0%{?build_tdefilereplace}
-Requires: trinity-tdefilereplace = %{version}-%{release}
+Requires: trinity-tdefilereplace = %{?epoch:%{epoch}:}%{version}-%{release}
 %endif
 
 %description
@@ -264,6 +271,7 @@ package.
 %{tde_datadir}/icons/hicolor/scalable/apps/ark.svgz
 %{tde_datadir}/services/ark_part.desktop
 %{tde_tdedocdir}/HTML/en/ark/
+%{tde_mandir}/man1/ark.1*
 
 ##########
 
@@ -293,6 +301,7 @@ It provides:
 %{tde_datadir}/icons/hicolor/*/apps/kcalc.png
 %{tde_datadir}/icons/hicolor/scalable/apps/kcalc.svgz
 %{tde_tdedocdir}/HTML/en/kcalc/
+%{tde_mandir}/man1/kcalc.1*
 
 ##########
 
@@ -315,6 +324,7 @@ This package contains kcharselect, a character set selector for TDE.
 %{tde_datadir}/apps/kicker/applets/kcharselectapplet.desktop
 %{tde_datadir}/icons/hicolor/*/apps/kcharselect.png
 %{tde_tdedocdir}/HTML/en/kcharselect/
+%{tde_mandir}/man1/kcharselect.1*
 
 ##########
 
@@ -323,8 +333,8 @@ Summary:	Infrared control for Trinity
 Group:		Applications/Utilities
 Requires:	trinity-filesystem
 
-Obsoletes:	trinity-kdelirc < %{version}-%{release}
-Provides:	trinity-kdelirc = %{version}-%{release}
+Obsoletes:	trinity-kdelirc < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdelirc = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-tdelirc
 This is a frontend for the LIRC suite to use infrared devices with TDE.
@@ -368,8 +378,8 @@ Requires:	openssh
 Requires:	openssh-clients
 %endif
 
-Obsoletes:	trinity-kdessh < %{version}-%{release}
-Provides:	trinity-kdessh = %{version}-%{release}
+Obsoletes:	trinity-kdessh < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdessh = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-tdessh
 This package contains TDE's frontend for ssh.
@@ -405,6 +415,8 @@ in a file manager.
 %{tde_datadir}/icons/hicolor/*/apps/kwikdisk.png
 %{tde_tdedocdir}/HTML/en/kdf/
 %{tde_tdedocdir}/HTML/en/kcontrol/storagedevices/
+%{tde_mandir}/man1/kdf.1*
+%{tde_mandir}/man1/kwikdisk.1*
 
 ##########
 
@@ -431,6 +443,7 @@ reasonably fast start.
 %{tde_datadir}/config.kcfg/kedit.kcfg
 %{tde_datadir}/icons/hicolor/*/apps/kedit.png
 %{tde_tdedocdir}/HTML/en/kedit/
+%{tde_mandir}/man1/kedit.1*
 
 ##########
 
@@ -450,6 +463,7 @@ to format 3.5" and 5.25" floppy disks.
 %{tde_datadir}/apps/konqueror/servicemenus/floppy_format.desktop
 %{tde_datadir}/icons/hicolor/*/apps/kfloppy.png
 %{tde_tdedocdir}/HTML/en/kfloppy/
+%{tde_mandir}/man1/kfloppy.1*
 
 ##########
 
@@ -485,6 +499,7 @@ Features:
 %{tde_datadir}/config.kcfg/kgpg.kcfg
 %{tde_datadir}/icons/hicolor/*/apps/kgpg.png
 %{tde_tdedocdir}/HTML/en/kgpg/
+%{tde_mandir}/man1/kgpg.1*
 
 ##########
 
@@ -512,6 +527,7 @@ support and other powerful features.
 %{tde_datadir}/services/kbyteseditwidget.desktop
 %{tde_datadir}/services/khexedit2part.desktop
 %{tde_tdedocdir}/HTML/en/khexedit/
+%{tde_mandir}/man1/khexedit.1*
 
 ##########
 
@@ -619,7 +635,7 @@ with special keys.
 %package -n trinity-kmilo-legacy
 Summary:	Non-standard plugins for KMilo
 Group:		Applications/Utilities
-Requires:	trinity-kmilo = %{version}-%{release}
+Requires:	trinity-kmilo = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	trinity-kcontrol
 
 %description -n trinity-kmilo-legacy
@@ -724,8 +740,8 @@ command execution.
 Summary:	Wallet manager for Trinity
 Group:		Applications/Utilities
 
-Obsoletes:	trinity-kwalletmanager < %{version}-%{release}
-Provides:	trinity-kwalletmanager = %{version}-%{release}
+Obsoletes:	trinity-kwalletmanager < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kwalletmanager = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-tdewalletmanager
 This program keeps various wallets for any kind of data that the user can
@@ -775,6 +791,7 @@ Here are just some examples of the things that can be done:
 %{tde_datadir}/icons/crystalsvg/scalable/mimetypes/superkaramba_theme.svgz
 %{tde_datadir}/mimelnk/application/x-superkaramba.desktop
 %{tde_tdedocdir}/HTML/en/superkaramba/
+%{tde_mandir}/man1/superkaramba.1*
 
 ##########
 
@@ -784,8 +801,8 @@ Here are just some examples of the things that can be done:
 Summary:	Batch search-and-replace component for TDE
 Group:		Applications/Utilities
 
-Obsoletes:	trinity-kfilereplace < %{version}-%{release}
-Provides:	trinity-kfilereplace = %{version}-%{release}
+Obsoletes:	trinity-kfilereplace < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kfilereplace = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-tdefilereplace
 TDEFileReplace is an embedded component for TDE that acts as a batch
@@ -817,13 +834,13 @@ This package is part of Trinity, as a component of the TDE utilities module.
 %package devel
 Summary:	Development files for %{name} 
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	trinity-tdelibs-devel
 
-Obsoletes:	trinity-kdeutils-devel < %{version}-%{release}
-Provides:	trinity-kdeutils-devel = %{version}-%{release}
-Obsoletes:	tdeutils-devel < %{version}-%{release}
-Provides:	tdeutils-devel = %{version}-%{release}
+Obsoletes:	trinity-kdeutils-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdeutils-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	tdeutils-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	tdeutils-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description devel
 This package contains the development files for tdeutils.
@@ -890,6 +907,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/main/tdeutils/trinity-tdeutils-rpmlintrc b/redhat/core/tdeutils/trinity-tdeutils-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/main/tdeutils/trinity-tdeutils-rpmlintrc
+++ b/redhat/core/tdeutils/trinity-tdeutils-rpmlintrc
diff --git a/redhat/main/tdevelop/tdevelop.spec b/redhat/core/tdevelop/tdevelop.spec
index 41071bd12..9f42f074b 100644
--- a/redhat/main/tdevelop/tdevelop.spec
+++ b/redhat/core/tdevelop/tdevelop.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tdevelop
 %define tde_prefix /opt/trinity
@@ -60,7 +60,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
 Source1:	%{name}-rpmlintrc
 
-Requires:	%{name}-libs = %{version}-%{release}
+Requires:	%{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 
 BuildRequires:	tqt3-apps-devel >= 3.5.0
 BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
@@ -68,8 +68,8 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	trinity-tdesdk-devel >= %{tde_version}
 
-Obsoletes:	trinity-kdevelop < %{version}-%{release}
-Provides:	trinity-kdevelop = %{version}-%{release}
+Obsoletes:	trinity-kdevelop < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdevelop = %{?epoch:%{epoch}:}%{version}-%{release}
 
 # SUSE desktop files utility
 %if 0%{?suse_version}
@@ -81,7 +81,7 @@ BuildRequires:	update-desktop-files
 BuildRequires:	brp-check-trinity
 %endif
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	fdupes
 BuildRequires:	desktop-file-utils
@@ -100,7 +100,7 @@ BuildRequires:	libidn-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gamin 1
 BuildRequires:	gamin-devel
 %endif
@@ -536,10 +536,10 @@ individual needs.
 %package devel
 Summary: Development files for %{name}
 Group:		Development/Libraries/Other
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 
-Obsoletes:	trinity-kdevelop-devel < %{version}-%{release}
-Provides:	trinity-kdevelop-devel = %{version}-%{release}
+Obsoletes:	trinity-kdevelop-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdevelop-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description devel
 This package contains the development files for tdevelop.
@@ -557,10 +557,10 @@ Summary: %{name} runtime libraries
 Group:   System Environment/Libraries
 Requires: trinity-tdelibs >= %{tde_version}
 # include to be paranoid, installing libs-only is still mostly untested -- Rex
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
-Obsoletes:	trinity-kdevelop-libs < %{version}-%{release}
-Provides:	trinity-kdevelop-libs = %{version}-%{release}
+Obsoletes:	trinity-kdevelop-libs < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdevelop-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description libs
 This package contains the libraries needed for the tdevelop programs.
@@ -640,6 +640,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_NO_BUILTIN_CHRPATH=ON \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
diff --git a/redhat/main/tdevelop/trinity-tdevelop-rpmlintrc b/redhat/core/tdevelop/trinity-tdevelop-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/main/tdevelop/trinity-tdevelop-rpmlintrc
+++ b/redhat/core/tdevelop/trinity-tdevelop-rpmlintrc
diff --git a/redhat/main/tdewebdev/css.tar.bz2 b/redhat/core/tdewebdev/css.tar.bz2
index c66fc5ba4..c66fc5ba4 100644
--- a/redhat/main/tdewebdev/css.tar.bz2
+++ b/redhat/core/tdewebdev/css.tar.bz2
diff --git a/redhat/main/tdewebdev/html.tar.bz2 b/redhat/core/tdewebdev/html.tar.bz2
index 7aa4db193..7aa4db193 100644
--- a/redhat/main/tdewebdev/html.tar.bz2
+++ b/redhat/core/tdewebdev/html.tar.bz2
diff --git a/redhat/main/tdewebdev/javascript.tar.bz2 b/redhat/core/tdewebdev/javascript.tar.bz2
index aa044ec2d..aa044ec2d 100644
--- a/redhat/main/tdewebdev/javascript.tar.bz2
+++ b/redhat/core/tdewebdev/javascript.tar.bz2
diff --git a/redhat/main/tdewebdev/php_manual_en_20030401.tar.bz2 b/redhat/core/tdewebdev/php_manual_en_20030401.tar.bz2
index 0b39d8cd0..0b39d8cd0 100644
--- a/redhat/main/tdewebdev/php_manual_en_20030401.tar.bz2
+++ b/redhat/core/tdewebdev/php_manual_en_20030401.tar.bz2
diff --git a/redhat/main/tdewebdev/tdewebdev.spec b/redhat/core/tdewebdev/tdewebdev.spec
index 2688f7ffb..824a8419a 100644
--- a/redhat/main/tdewebdev/tdewebdev.spec
+++ b/redhat/core/tdewebdev/tdewebdev.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tdewebdev
 %define tde_prefix /opt/trinity
@@ -31,6 +31,7 @@
 %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/tde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
@@ -67,7 +68,7 @@ Source10:		%{name}-rpmlintrc
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdesdk-devel >= %{tde_version}
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	cmake
 BuildRequires:	desktop-file-utils
 BuildRequires:	gcc-c++
 
@@ -82,6 +83,7 @@ BuildRequires:	brp-check-trinity
 %endif
 
 BuildRequires:	libxslt-devel
+
 %if 0%{?rhel} == 4
 # a bogus dep in libexslt.la file from EL-4 (WONTFIX bug http://bugzilla.redhat.com/142241)
 BuildRequires:	libgcrypt-devel
@@ -96,21 +98,27 @@ BuildRequires:	perl
 BuildRequires:	libxml2-devel
 #endif
 
+# ICU support
+BuildRequires:	libicu-devel
+
+# Readline support
+BuildRequires:	readline-devel
+
 %if "%{?tde_version}" != "14.1.0"
 %define build_tdefilereplace 1
 %endif
 
-Obsoletes:	trinity-kdewebdev-libs < %{version}-%{release}
-Provides:	trinity-kdewebdev-libs = %{version}-%{release}
-Obsoletes:	trinity-kdewebdev < %{version}-%{release}
-Provides:	trinity-kdewebdev = %{version}-%{release}
+Obsoletes:	trinity-kdewebdev-libs < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdewebdev-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-kdewebdev < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdewebdev = %{?epoch:%{epoch}:}%{version}-%{release}
 
-Requires: trinity-quanta = %{version}-%{release}
-Requires: trinity-quanta-data = %{version}-%{release}
-Requires: trinity-kimagemapeditor = %{version}-%{release}
-Requires: trinity-klinkstatus = %{version}-%{release}
-Requires: trinity-kommander = %{version}-%{release}
-%{?build_kxsldbg:Requires: trinity-kxsldbg = %{version}-%{release}}
+Requires: trinity-quanta = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-quanta-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kimagemapeditor = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-klinkstatus = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kommander = %{?epoch:%{epoch}:}%{version}-%{release}
+%{?build_kxsldbg:Requires: trinity-kxsldbg = %{?epoch:%{epoch}:}%{version}-%{release}}
 
 %description
 Web development applications, including:
@@ -129,11 +137,11 @@ Web development applications, including:
 Summary:	web development environment for TDE [Trinity]
 Group:		Applications/Development
 Requires:	trinity-tdefilereplace
-Requires:	trinity-klinkstatus = %{version}-%{release}
-Requires:	trinity-kommander = %{version}-%{release}
-Requires:	trinity-quanta-data = %{version}-%{release}
-#Requires:	trinity-kimagemapeditor = %{version}-%{release}
-#Requires:	trinity-kxsldbg = %{version}-%{release}
+Requires:	trinity-klinkstatus = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kommander = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-quanta-data = %{?epoch:%{epoch}:}%{version}-%{release}
+#Requires:	trinity-kimagemapeditor = %{?epoch:%{epoch}:}%{version}-%{release}
+#Requires:	trinity-kxsldbg = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	tidy
 
 %description -n trinity-quanta
@@ -168,6 +176,7 @@ This package is part of TDE, as a component of the TDE web development module.
 %{tde_datadir}/services/quanta_preview_config.desktop
 %{tde_datadir}/servicetypes/quantadebugger.desktop
 %{tde_tdedocdir}/HTML/en/quanta/
+%{tde_mandir}/man1/quanta.1*
 
 ##########
 
@@ -212,6 +221,7 @@ This package is part of TDE, as a component of the TDE web development module.
 %{tde_datadir}/icons/locolor/*/apps/kimagemapeditor.png
 %{tde_datadir}/services/kimagemapeditorpart.desktop
 %{tde_tdedocdir}/HTML/en/kimagemapeditor/
+%{tde_mandir}/man1/kimagemapeditor.1*
 
 ##########
 
@@ -241,6 +251,7 @@ This package is part of TDE, as a component of the TDE web development module.
 %{tde_datadir}/icons/hicolor/*/apps/klinkstatus.png
 %{tde_datadir}/services/klinkstatus_part.desktop
 %{tde_tdedocdir}/HTML/en/klinkstatus/
+%{tde_mandir}/man1/klinkstatus.1*
 
 ##########
 
@@ -293,13 +304,18 @@ This package is part of TDE, as a component of the TDE web development module.
 %{tde_datadir}/apps/katepart/syntax/kommander-new.xml
 %{tde_datadir}/apps/tdevappwizard/
 %{tde_datadir}/services/kommander_part.desktop
+%{tde_mandir}/man1/extractkmdr.1*
+%{tde_mandir}/man1/kmdr-editor.1*
+%{tde_mandir}/man1/kmdr-executor.1*
+%{tde_mandir}/man1/kmdr-plugins.1*
+%{tde_mandir}/man1/kmdr2po.1*
 
 ##########
 
 %package -n trinity-kommander-devel
 Summary:	development files for Kommander [Trinity]
 Group:		Development/Libraries
-Requires:	trinity-kommander = %{version}-%{release}
+Requires:	trinity-kommander = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-kommander-devel
 This package contains the headers and other development files for
@@ -366,6 +382,7 @@ This package is part of TDE, as a component of the TDE web development module.
 %{tde_datadir}/icons/hicolor/*/apps/kxsldbg.png
 %{tde_datadir}/icons/locolor/*/apps/kxsldbg.png
 %{tde_datadir}/services/kxsldbg_part.desktop
+%{tde_mandir}/man1/kxsldbg.1*
 
 %endif
 
@@ -377,8 +394,8 @@ This package is part of TDE, as a component of the TDE web development module.
 Summary:	Batch search-and-replace component for TDE
 Group:		Applications/Utilities
 
-Obsoletes:	trinity-kfilereplace < %{version}-%{release}
-Provides:	trinity-kfilereplace = %{version}-%{release}
+Obsoletes:	trinity-kfilereplace < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kfilereplace = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-tdefilereplace
 TDEFileReplace is an embedded component for TDE that acts as a batch
@@ -401,6 +418,7 @@ This package is part of Trinity, as a component of the TDE utilities module.
 %{tde_tdedocdir}/HTML/en/tdefilereplace/
 %{tde_datadir}/icons/hicolor/*/apps/tdefilereplace.png
 %{tde_datadir}/services/tdefilereplacepart.desktop
+%{tde_mandir}/man1/tdefilereplace.1*
 
 %endif
 
@@ -410,12 +428,12 @@ This package is part of Trinity, as a component of the TDE utilities module.
 Group: Development/Libraries
 Summary:	Header files and documentation for %{name} 
 
-Obsoletes:	trinity-kdewebdev-devel < %{version}-%{release}
-Provides:	trinity-kdewebdev-devel = %{version}-%{release}
+Obsoletes:	trinity-kdewebdev-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdewebdev-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 Requires:	trinity-tdelibs-devel >= %{tde_version}
-Requires:	%{name} = %{version}-%{release}
-Requires:	trinity-kommander-devel = %{version}-%{release}
+Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kommander-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description devel
 %{summary}.
@@ -437,45 +455,47 @@ Requires:	trinity-kommander-devel = %{version}-%{release}
 %__rm -rf kxsldbg/ doc/kxsldbg/ doc/xsldbg/
 %endif
 
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/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
+unset QTDIR QTLIB QTINC
 export PATH="%{tde_bindir}:${PATH}"
 
-# Specific path for RHEL4
-if [ -d "/usr/X11R6" ]; then
-  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
 fi
 
-# Warning: GCC visibility causes FTBFS [Bug #1285]
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --includedir=%{tde_tdeincludedir} \
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility \
+  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+  -DBIN_INSTALL_DIR="%{tde_bindir}" \
+  -DDOC_INSTALL_DIR="%{tde_docdir}" \
+  -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
+  -DLIB_INSTALL_DIR="%{tde_libdir}" \
+  -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
+  -DSYSCONF_INSTALL_DIR="%{_sysconfdir}/trinity" \
+  -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
   \
-  --enable-editors \
-  --with-extra-includes=%{_includedir}/tqt
-
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_QUANTA_CVSSERVICE=OFF \
+  \
+  -DBUILD_ALL=ON \
+  \
+  ..
 
-# WTF hack for RHEL4
-%if 0%{?rhel} == 4
-mkdir  kommander/plugin/.libs/
-ln -s . kommander/plugin/.libs/.libs
+# Strange cmake behaviour under rhel6
+%if 0%{?rhel} == 6
+grep -rl "CXX_FLAGS.*\"-O2" | while read file; do
+  sed -i "${file}" -e "s|\"||g"
+done
 %endif
 
 %__make %{?_smp_mflags} || %__make
@@ -484,7 +504,7 @@ ln -s . kommander/plugin/.libs/.libs
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{?buildroot}
-%__make install DESTDIR=%{?buildroot}
+%__make install DESTDIR=%{?buildroot} -C build
 
 
 ## package separately?  Why doesn't upstream include this? -- Rex
diff --git a/redhat/main/tdewebdev/trinity-tdewebdev-rpmlintrc b/redhat/core/tdewebdev/trinity-tdewebdev-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/main/tdewebdev/trinity-tdewebdev-rpmlintrc
+++ b/redhat/core/tdewebdev/trinity-tdewebdev-rpmlintrc
diff --git a/redhat/dependencies/akode/akode.spec b/redhat/dependencies/akode/akode.spec
index c2846be81..362abdf4b 100644
--- a/redhat/dependencies/akode/akode.spec
+++ b/redhat/dependencies/akode/akode.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
@@ -62,7 +62,7 @@ Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 Prefix:		%{tde_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:  gcc-c++
 BuildRequires:	libtool
 
diff --git a/redhat/dependencies/arts/arts.spec b/redhat/dependencies/arts/arts.spec
index df232280f..d4a7d9b33 100644
--- a/redhat/dependencies/arts/arts.spec
+++ b/redhat/dependencies/arts/arts.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg arts
 %define tde_prefix /opt/trinity
@@ -32,6 +32,7 @@
 %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_sbindir %{tde_prefix}/sbin
 %define tde_tdeappdir %{tde_datadir}/applications/tde
 %define tde_tdedocdir %{tde_docdir}/tde
@@ -66,7 +67,7 @@ BuildRequires:	libtqt4-devel >= %{tde_epoch}:4.2.0
 BuildRequires:	trinity-filesystem >= %{tde_version}
 Requires:		trinity-filesystem >= %{tde_version}
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -129,7 +130,7 @@ Requires:		libtqt4 >= %{tde_epoch}:4.2.0
 Requires:		audiofile
 
 %if "%{?tde_prefix}" == "/usr"
-Obsoletes:	arts
+Obsoletes:	arts < %{?epoch:%{epoch}:}%{version}-%{release}
 %endif
 
 %description
@@ -162,6 +163,9 @@ playing a wave file with some effects.
 %{tde_bindir}/artswrapper
 # The '.la' files are needed for runtime, not devel !
 %{tde_libdir}/lib*.la
+%{tde_mandir}/man1/artsc-config-trinity.1*
+%{tde_mandir}/man1/artscat-trinity.1*
+%{tde_mandir}/man1/artsdsp-trinity.1*
 
 ##########
 
@@ -170,7 +174,7 @@ Group:		Development/Libraries
 Summary:	ARTS (analog realtime synthesizer) - the TDE sound system (Development files)
 Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %if "%{?tde_prefix}" == "/usr"
-Obsoletes:	arts-devel
+Obsoletes:	arts-devel < %{?epoch:%{epoch}:}%{version}-%{release}
 %endif
 
 Requires:	alsa-lib-devel
@@ -250,6 +254,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_NO_BUILTIN_CHRPATH=ON \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
@@ -257,8 +262,9 @@ fi
   \
   -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
   -DBIN_INSTALL_DIR="%{tde_bindir}" \
-  -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}/arts" \
+  -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
   -DLIB_INSTALL_DIR="%{tde_libdir}" \
+  -DMAN_INSTALL_DIR="%{tde_mandir}" \
   -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
   \
   -DWITH_ALSA=ON \
diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt.spec b/redhat/dependencies/avahi-tqt/avahi-tqt.spec
index 2e65d3670..5423dd752 100644
--- a/redhat/dependencies/avahi-tqt/avahi-tqt.spec
+++ b/redhat/dependencies/avahi-tqt/avahi-tqt.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
@@ -52,7 +52,7 @@ Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
 BuildRequires:	libtqt4-devel >= %{tde_epoch}:4.2.0
 
-BuildRequires:	cmake
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec
index 3f266070b..bea084031 100644
--- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec
+++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
@@ -53,7 +53,7 @@ Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 BuildRequires:	libtqt3-mt-devel >= 3.5.0
 BuildRequires:	libtqt4-devel >= %{tde_epoch}:4.2.0
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt.spec b/redhat/dependencies/dbus-tqt/dbus-tqt.spec
index d03ce84fe..3bdbea59b 100644
--- a/redhat/dependencies/dbus-tqt/dbus-tqt.spec
+++ b/redhat/dependencies/dbus-tqt/dbus-tqt.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
@@ -52,7 +52,7 @@ Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
 BuildRequires:	libtqt4-devel >= %{tde_epoch}:4.2.0
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
diff --git a/redhat/dependencies/libart-lgpl/libart-lgpl.spec b/redhat/dependencies/libart-lgpl/libart-lgpl.spec
index bfc570a19..ccf75ed31 100644
--- a/redhat/dependencies/libart-lgpl/libart-lgpl.spec
+++ b/redhat/dependencies/libart-lgpl/libart-lgpl.spec
@@ -19,7 +19,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
@@ -51,7 +51,7 @@ BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -68,11 +68,11 @@ especially suitable for embedded applications.
 %package -n %{libart}_lgpl_2-2
 Summary:        Library of functions for 2D graphics - runtime files
 Group:			System/Libraries
-Obsoletes:		libart_lgpl < %{version}-%{release}
-Provides:		libart_lgpl = %{version}-%{release}
-Obsoletes:		%{_lib}art_lgpl2 < %{version}-%{release}
-Provides:		%{_lib}art_lgpl2 = %{version}-%{release}
-Provides:		libart_lgpl_2-2 = %{version}-%{release}
+Obsoletes:		libart_lgpl < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		libart_lgpl = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		%{_lib}art_lgpl2 < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		%{_lib}art_lgpl2 = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		libart_lgpl_2-2 = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n %{libart}_lgpl_2-2
 A library of functions for 2D graphics supporting a superset of the
@@ -194,6 +194,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
   \
diff --git a/redhat/dependencies/libcaldav/libcaldav.spec b/redhat/dependencies/libcaldav/libcaldav.spec
index cab420057..fd5979d40 100644
--- a/redhat/dependencies/libcaldav/libcaldav.spec
+++ b/redhat/dependencies/libcaldav/libcaldav.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg libcaldav
 %define tde_prefix /opt/trinity
@@ -54,7 +54,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	make
 BuildRequires:	libtool
 BuildRequires:	fdupes
@@ -166,6 +166,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
   \
diff --git a/redhat/dependencies/libcarddav/libcarddav.spec b/redhat/dependencies/libcarddav/libcarddav.spec
index 56a7395ab..865c7c27d 100644
--- a/redhat/dependencies/libcarddav/libcarddav.spec
+++ b/redhat/dependencies/libcarddav/libcarddav.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg libcarddav
 %define tde_prefix /opt/trinity
@@ -54,7 +54,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	make
 BuildRequires:	libtool
@@ -118,8 +118,8 @@ Requires:	%{libcarddav}0 = %{?epoch:%{epoch}:}%{version}-%{release}
 %{?libcurl_devel:Requires: %{libcurl_devel}}
 Requires:	glib2-devel
 
-Obsoletes:	trinity-libcarddav-devel < %{version}-%{release}
-Provides:	trinity-libcarddav-devel = %{version}-%{release}
+Obsoletes:	trinity-libcarddav-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-libcarddav-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:	libcarddav-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n %{libcarddav}-devel
@@ -168,6 +168,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
   \
diff --git a/redhat/dependencies/polkit-tqt/polkit-tqt.spec b/redhat/dependencies/polkit-tqt/polkit-tqt.spec
new file mode 100644
index 000000000..010c353fe
--- /dev/null
+++ b/redhat/dependencies/polkit-tqt/polkit-tqt.spec
@@ -0,0 +1,232 @@
+#
+# spec file for package polkit-tqt (version R14)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# TDE variables
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg polkit-tqt
+
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
+%define libpolkit_tqt %{_lib}%{tde_pkg}
+%else
+%define libpolkit_tqt lib%{tde_pkg}
+%endif
+
+
+Name:		trinity-%{tde_pkg}
+Version:	0.103.0
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	PolicyKit-tqt library
+Group:		Development/Libraries/C and C++
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Source1:		%{name}-rpmlintrc
+
+BuildRequires:	libtqt4-devel
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-dbus-1-tqt-devel
+BuildRequires:	trinity-filesystem >= %{tde_version}
+
+BuildRequires:	desktop-file-utils
+BuildRequires:	gcc-c++
+BuildRequires:	gettext
+
+BuildRequires:	polkit-devel
+
+%description
+PolicyKit is an application-level toolkit for defining and handling the policy
+that allows unprivileged processes to speak to privileged processes.
+
+It is a framework for centralizing the decision making process with respect to
+granting access to privileged operations for unprivileged (desktop) applications.
+
+libpolkit-tqt provides convenience classes and methods for TQt/TDE
+applications that want to use PolicyKit.
+
+This package contains the files necessary for running applications that use
+the libpolkit-tqt library.
+
+##########
+
+%package -n %{libpolkit_tqt}0
+Summary:	TQt source code editing component based on Scintilla
+Group:		Development/Libraries/C and C++
+Provides:	libpolkit-tqt = %{version}-%{release}
+Requires:	libtqt3-mt >= 3.5.0
+
+%description -n %{libpolkit_tqt}0
+PolicyKit is an application-level toolkit for defining and handling the policy
+that allows unprivileged processes to speak to privileged processes.
+
+It is a framework for centralizing the decision making process with respect to
+granting access to privileged operations for unprivileged (desktop) applications.
+
+libpolkit-tqt provides convenience classes and methods for TQt/TDE
+applications that want to use PolicyKit.
+
+This package contains the files necessary for running applications that use
+the libpolkit-tqt library.
+
+%post -n %{libpolkit_tqt}0
+/sbin/ldconfig
+
+%postun -n %{libpolkit_tqt}0
+/sbin/ldconfig
+
+%files -n %{libpolkit_tqt}0
+%defattr(-,root,root,-)
+%{_libdir}/libpolkit-tqt-agent.so.0
+%{_libdir}/libpolkit-tqt-agent.so.0.0.0
+%{_libdir}/libpolkit-tqt-core.so.0
+%{_libdir}/libpolkit-tqt-core.so.0.0.0
+%{_libdir}/libpolkit-tqt-gui.so.0
+%{_libdir}/libpolkit-tqt-gui.so.0.0.0
+
+##########
+
+%package -n %{libpolkit_tqt}-devel
+Summary:	PolicyKit-tqt development files
+Group:		Development/Libraries/C and C++
+Provides:	libpolkit-tqt-devel = %{version}-%{release}
+Requires:	%{libpolkit_tqt}0 = %{version}-%{release}
+Requires:	libtqt3-mt-devel >= 3.5.0
+
+%description -n %{libpolkit_tqt}-devel
+PolicyKit is an application-level toolkit for defining and handling the policy
+that allows unprivileged processes to speak to privileged processes.
+
+It is a framework for centralizing the decision making process with respect to
+granting access to privileged operations for unprivileged (desktop) applications.
+
+libpolkit-tqt provides convenience classes and methods for TQt/TDE
+applications that want to use PolicyKit.
+.
+This package contains the development libraries and headers.
+
+%post -n %{libpolkit_tqt}-devel
+/sbin/ldconfig
+
+%postun -n %{libpolkit_tqt}-devel
+/sbin/ldconfig
+
+%files -n %{libpolkit_tqt}-devel
+%defattr(-,root,root,-)
+%{_includedir}/polkit-tqt/
+%{_libdir}/cmake/polkit-tqt.cmake
+%{_libdir}/libpolkit-tqt-agent.so
+%{_libdir}/libpolkit-tqt-core.so
+%{_libdir}/libpolkit-tqt-gui.so
+%{_libdir}/pkgconfig/polkit-tqt-agent.pc
+%{_libdir}/pkgconfig/polkit-tqt-core.pc
+%{_libdir}/pkgconfig/polkit-tqt-gui.pc
+%{_libdir}/pkgconfig/polkit-tqt.pc
+
+##########
+
+%package -n %{libpolkit_tqt}-examples
+Summary:	Polkit-tqt Documentation
+Group:		Development/Libraries/C and C++
+Provides:	libpolkit-tqt-doc = %{version}-%{release}
+Requires:	%{libpolkit_tqt}0 = %{version}-%{release}
+Requires:	trinity-filesystem >= %{tde_version}
+
+%description -n %{libpolkit_tqt}-examples
+PolicyKit is an application-level toolkit for defining and handling the policy
+that allows unprivileged processes to speak to privileged processes.
+
+It is a framework for centralizing the decision making process with respect to
+granting access to privileged operations for unprivileged (desktop) applications.
+
+libpolkit-tqt provides convenience classes and methods for TQt/TDE
+applications that want to use PolicyKit.
+
+This package contains example files and applications.
+
+%files -n %{libpolkit_tqt}-examples
+%defattr(-,root,root,-)
+%{_sysconfdir}/dbus-1/system.d/org.tqt.policykit.examples.conf
+%{_bindir}/polkit-tqt-agent-example
+%{_bindir}/polkit-tqt-example
+%{_bindir}/polkit-tqt-example-helper
+%{_datadir}/apps/polkit-tqt/
+%{_datadir}/dbus-1/system-services/org.tqt.policykit.examples.service
+%{_datadir}/polkit-1/actions/org.tqt.policykit.examples.policy
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DBUILD_ALL="ON" \
+  -DWITH_ALL_OPTIONS="ON" \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+%__rm -rf %{?buildroot}
+%__make install -C build DESTDIR=%{?buildroot}
+
+# Unwanted files
+%__rm -f %{buildroot}%{_libdir}/libpolkit-tqt-agent.la
+%__rm -f %{buildroot}%{_libdir}/libpolkit-tqt-core.la
+%__rm -f %{buildroot}%{_libdir}/libpolkit-tqt-gui.la
+
+
+%clean
+%__rm -rf $RPM_BUILD_ROOT
+
+
+%changelog
diff --git a/redhat/dependencies/polkit-tqt/trinity-polkit-tqt-rpmlintrc b/redhat/dependencies/polkit-tqt/trinity-polkit-tqt-rpmlintrc
new file mode 100644
index 000000000..1a56a48f9
--- /dev/null
+++ b/redhat/dependencies/polkit-tqt/trinity-polkit-tqt-rpmlintrc
@@ -0,0 +1,2 @@
+setBadness('polkit-unauthorized-privilege', 0)
+setBadness('suse-dbus-unauthorized-service', 0)
diff --git a/redhat/dependencies/python-tqt/python-tqt.spec b/redhat/dependencies/pytqt/pytqt.spec
index 16ced1e89..a050b1cff 100644
--- a/redhat/dependencies/python-tqt/python-tqt.spec
+++ b/redhat/dependencies/pytqt/pytqt.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package python-tqt (version R14)
+# spec file for package pytqt (version R14)
 #
 # Copyright (c) 2014 Trinity Desktop Environment
 #
@@ -22,9 +22,9 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
-%define tde_pkg python-tqt
+%define tde_pkg pytqt
 %define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
@@ -59,8 +59,10 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-Obsoletes:		trinity-PyQt
-Obsoletes:		trinity-python-qt3
+Obsoletes:		trinity-PyQt < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-python-qt3 < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-python-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-python-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
 
 BuildRequires:	tqt3-apps-devel >= 3.5.0
 BuildRequires:	libtqt4-devel >= %{?epoch:%{epoch}:}4.2.0
@@ -71,6 +73,10 @@ BuildRequires:	libtqscintilla-devel >= %{?epoch:%{epoch}:}1.7.1
 BuildRequires:	gcc-c++
 
 # PYTHON support
+%if 0%{?sle_version} >= 150400
+%define python python3
+%define __python %__python3
+%else
 %if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
 %global python python2
 %global __python %__python2
@@ -79,6 +85,7 @@ BuildRequires:	gcc-c++
 %global python python
 %endif
 %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%endif
 BuildRequires:	%{python}
 BuildRequires:	%{python}-devel
 
@@ -113,30 +120,32 @@ BuildRequires:	%{_lib}xmu%{?mgaversion:6}-devel
 Python binding module that allows use of TQt X Window toolkit v3.
 You can use it to create portable graphics-capable scripts.
 
-At this moment python-tqt offers a vast subset of TQt API. There are
+At this moment pytqt offers a vast subset of TQt API. There are
 some minor issues related to the differences between C++ and Python
 (types, etc), but usually you'll be able to write code pretty much the
 same way in both languages (with syntax differences, of course)
 
 ##########
 
-%package -n python-tqt
+%package -n pytqt
 Summary:	TQt bindings for Python
 Group:		Development/Libraries/Python
 Requires:	trinity-filesystem >= %{tde_version}
 Requires:	sip4-tqt >= %{?epoch:%{epoch}:}4.10.5
 Requires:	libtqt4 >= %{?epoch:%{epoch}:}4.2.0
+Obsoletes:	python-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	python-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description -n python-tqt
+%description -n pytqt
 Python binding module that allows use of TQt X Window toolkit v3.
 You can use it to create portable graphics-capable scripts.
 
-At this moment python-tqt offers a vast subset of TQt API. There are
+At this moment pytqt offers a vast subset of TQt API. There are
 some minor issues related to the differences between C++ and Python
 (types, etc), but usually you'll be able to write code pretty much the
 same way in both languages (with syntax differences, of course)
 
-%files -n python-tqt
+%files -n pytqt
 %defattr(-,root,root,-)
 %doc NEWS README
 %dir %{python_sitearch}/python_tqt
@@ -151,34 +160,38 @@ same way in both languages (with syntax differences, of course)
 
 ##########
 
-%package -n python-tqt-gl
+%package -n pytqt-gl
 Summary:	TQt OpenGL bindings for Python
 Group:		Development/Libraries/Python
-Requires:	python-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	pytqt = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	python-tqt-gl < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	python-tqt-gl = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description -n python-tqt-gl
+%description -n pytqt-gl
 Python binding module that allows use of the OpenGL facilities
 offered by the TQt X Window toolkit v3. You can use it to create
 portable graphics-capable scripts.
 
-%files -n python-tqt-gl
+%files -n pytqt-gl
 %defattr(-,root,root,-)
 %{python_sitearch}/python_tqt/qtgl.so
 
 ##########
 
-%package -n python-tqt-tqtext
-Summary:	TQtext extensions for python-tqt
+%package -n pytqt-tqtext
+Summary:	TQtext extensions for pytqt
 Group:		Development/Libraries/Python
-Requires:	python-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	pytqt = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	python-tqt-tqtext < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	python-tqt-tqtext = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description -n python-tqt-tqtext
-python-tqt Extensions. Contains:
+%description -n pytqt-tqtext
+pytqt Extensions. Contains:
 
 * TQScintilla: a featureful TQt source code editing component based
               on Scintilla.
 
-%files -n python-tqt-tqtext
+%files -n pytqt-tqtext
 %defattr(-,root,root,-)
 %{python_sitearch}/python_tqt/qtext.so
 
@@ -187,7 +200,7 @@ python-tqt Extensions. Contains:
 %package -n trinity-pytqt-tools
 Summary:	Pyuic and pylupdate for TQt
 Group:		Development/Libraries/Python
-Requires:	python-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	pytqt = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-pytqt-tools
 pyuic is the PyQt counterpart for TQt's uic. It takes an XML
@@ -203,19 +216,21 @@ Linguist translation files from Python code.
 
 ##########
 
-%package -n python-tqt-devel
+%package -n pytqt-devel
 Summary:	TQt bindings for Python - Development files
 Group:		Development/Libraries/Python
-Requires:	python-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	pytqt = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	trinity-pytqt-tools = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	libtqt4-devel >= %{?epoch:%{epoch}:}4.2.0
+Obsoletes:	python-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	python-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description -n python-tqt-devel
+%description -n pytqt-devel
 Development .sip files with definitions of PyQt classes. They
 are needed to build PyQt, but also as building blocks of other
 packages based on them, like PyTDE.
 
-%files -n python-tqt-devel
+%files -n pytqt-devel
 %defattr(-,root,root,-)
 %{python_sitearch}/python_tqt/pyqtconfig.py*
 %dir %{_datadir}/sip
diff --git a/redhat/dependencies/sip4-tqt/sip4-tqt.spec b/redhat/dependencies/sip4-tqt/sip4-tqt.spec
index 2693049ad..030ee85d0 100644
--- a/redhat/dependencies/sip4-tqt/sip4-tqt.spec
+++ b/redhat/dependencies/sip4-tqt/sip4-tqt.spec
@@ -28,7 +28,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg sip4-tqt
 %define tde_prefix /opt/trinity
@@ -70,19 +70,36 @@ BuildRequires:	trinity-filesystem >= %{tde_version}
 
 BuildRequires:	gcc-c++
 
+# BISON support
+BuildRequires:  bison
+
+# FLEX support
+BuildRequires:	flex
+
 # PYTHON support
 %if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
 %global python python2
 %global __python %__python2
 %global python_sitearch %{python2_sitearch}
 %else
+%if 0%{?sle_version} >= 150400
+%global python python3
+%global __python %__python3
+%else
 %global python python
 %endif
+%endif
 %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 BuildRequires:	%{python}
 BuildRequires:	%{python}-devel
 
+# YACC support
+%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31
+BuildRequires:  byacc
+%endif
+
 %description
+
 SIP is a tool for generating bindings for C++ classes with some ideas
 borrowed from SWIG, but capable of tighter bindings because of its
 specificity towards C++ and Python.
diff --git a/redhat/dependencies/tqca-tls/tqca-tls.spec b/redhat/dependencies/tqca-tls/tqca-tls.spec
index d9f587514..09ea30645 100644
--- a/redhat/dependencies/tqca-tls/tqca-tls.spec
+++ b/redhat/dependencies/tqca-tls/tqca-tls.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tqca-tls
 %define tde_prefix /opt/trinity
@@ -57,7 +57,7 @@ Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 BuildRequires:  libtqt4-devel >= %{tde_epoch}:4.2.0
 BuildRequires:	libtqca-devel >= %{tde_epoch}:1.0
 
-BuildRequires:	cmake
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	openssl-devel >= 0.9.8
 
diff --git a/redhat/dependencies/tqca/tqca.spec b/redhat/dependencies/tqca/tqca.spec
index c2f69aa51..0435898ad 100644
--- a/redhat/dependencies/tqca/tqca.spec
+++ b/redhat/dependencies/tqca/tqca.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tqca
 %define tde_prefix /opt/trinity
@@ -31,6 +31,12 @@
 %define libtqca libtqca
 %endif
 
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
+%define libtqt3 %{_lib}tqt3
+%else
+%define libtqt3 libtqt3
+%endif
+
 
 Name:		trinity-%{tde_pkg}
 Epoch:		%{tde_epoch}
@@ -55,9 +61,13 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 Source1:		trinity-tqca-rpmlintrc
 
+Obsoletes:		%{libtqt3}-mt-tqca-tls < %{version}-%{release}
+Provides:		%{libtqt3}-mt-tqca-tls = %{version}-%{release}
+
 BuildRequires:  libtqt4-devel >= %{tde_epoch}:4.2.0
-BuildRequires:	cmake
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
+BuildRequires:	openssl-devel >= 0.9.8
 
 %description
 Taking a hint from the similarly-named Java Cryptography Architecture,
@@ -129,6 +139,8 @@ This packages contains the development files for TQCA
 %{_libdir}/libtqca.la
 %{_libdir}/libtqca.so
 %{_libdir}/pkgconfig/tqca.pc
+%dir %{_libdir}/tqt3/plugins/crypto
+%{_libdir}/tqt3/plugins/crypto/libtqca-tls.so
 
 ##########
 
diff --git a/redhat/dependencies/tqscintilla/tqscintilla.spec b/redhat/dependencies/tqscintilla/tqscintilla.spec
index 95fec75d2..e306fb57b 100644
--- a/redhat/dependencies/tqscintilla/tqscintilla.spec
+++ b/redhat/dependencies/tqscintilla/tqscintilla.spec
@@ -18,12 +18,9 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tqscintilla
-%define tde_prefix /opt/trinity
-%define tde_datadir %{tde_prefix}/share
-%define tde_tdedocdir %{tde_datadir}/doc/tde
 
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
 %define libtqscintilla %{_lib}tqscintilla
@@ -58,9 +55,10 @@ Source1:		trinity-tqscintilla-rpmlintrc
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-filesystem >= %{tde_version}
 
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
 BuildRequires:	gcc-c++
+BuildRequires:	gettext
 
 %description
 Scintilla is a free source code editing component. It has features found
@@ -94,7 +92,6 @@ TQScintilla is a port or Scintilla to the TQt GUI toolkit.
 %defattr(-,root,root,-)
 %doc ChangeLog LICENSE NEWS README
 %{_libdir}/libqscintilla.so.7
-%{_libdir}/libqscintilla.so.7.0
 %{_libdir}/libqscintilla.so.7.0.1
 %{_libdir}/tqt3/plugins/designer/*.so
 %dir %{_datadir}/tqt3/translations/
@@ -120,9 +117,11 @@ This package contains the development files for tqscintilla.
 
 %files -n %{libtqscintilla}-devel
 %defattr(-,root,root,-)
-%doc doc/Scintilla example
 %{_includedir}/tqscintilla/
 %{_libdir}/libqscintilla.so
+%{_libdir}/pkgconfig/qscintilla.pc
+%exclude %{_libdir}/libqscintilla.la
+%exclude %{_libdir}/tqt3/plugins/designer/*.la
 
 ##########
 
@@ -138,7 +137,7 @@ This package contains the documentation for tqscintilla.
 
 %files -n %{libtqscintilla}-doc
 %defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/en/%{name}/
+/usr/share/doc/libtqscintilla/
 
 ##########
 
@@ -151,74 +150,46 @@ This package contains the documentation for tqscintilla.
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-# Fix path in project files
-%__sed -i "qt/qscintilla.pro" \
-  -e "s|^INCLUDEPATH = .*|INCLUDEPATH = . ../include ../src /usr/include/tqt /usr/include/tqt3|" \
-  -e "s|^header.path = .*|header.path = %{_includedir}/tqt3|" \
-  -e "s|^trans.path = .*|trans.path = %{_datadir}/tqt3/translations|"
-
-%__sed -i "designer/designer.pro" \
-  -e "s|\$(QTDIR)|%{_libdir}/tqt3|" \
-  -e "s|# DESTDIR|DESTDIR|"
-
-export QTDIR=%{_libdir}/tqt3
-export TQTDIR=%{_prefix}
-( cd qt; tqmake "DESTDIR=$PWD/../tmplib" )
-( cd designer; tqmake )
-
 
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 
-# Workaround strange tqmake behaviour in RHEL5
-%if 0%{?rhel} == 5
-%__sed -i "qt/Makefile" -e "s|..\/..\/..\/..\/..|%{_prefix}|g"
-%endif
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
 
-export QTDIR=%{_libdir}/tqt3
-export TQTDIR=%{_prefix}
-%__make %{?_smp_mflags} -C qt
-%__make %{?_smp_mflags} -C designer
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DBUILD_ALL="ON" \
+  -DWITH_ALL_OPTIONS="ON" \
+  ..
+
+%__make %{?_smp_mflags} || %__make
 
 
 %install
-unset QTDIR QTINC QTLIB
-export QTDIR=%{_libdir}/tqt3
-export TQTDIR=%{_prefix}
-%__rm -rf $RPM_BUILD_ROOT
+%__rm -rf %{?buildroot}
+%__make install -C build DESTDIR=%{?buildroot}
+
+# Fix doc location
+if [ -d %{?buildroot}%{_docdir}/lib64tqscintilla7 ]; then
+  %__mv -f %{?buildroot}%{_docdir}/lib64tqscintilla7 %{?buildroot}%{_docdir}/libtqscintilla7
+fi
+if [ -d %{?buildroot}%{_docdir}/libtqscintilla7-1.7.1 ]; then
+  %__mv -f %{?buildroot}%{_docdir}/libtqscintilla7-1.7.1 %{?buildroot}%{_docdir}/libtqscintilla7
+fi
+
 
-# Installs the QT part
-%__make INSTALL_ROOT=$RPM_BUILD_ROOT -C qt install
-
-# Installs supplementary headers
-for i in include/*.h; do
-  %__install -D -m 644 $i %{buildroot}${QTINC}/private/${i##*/}
-done
-
-# Installs the HTML documentation correctly
-for i in doc/html/*; do
-  %__install -D -m 644 $i %{buildroot}%{tde_tdedocdir}/HTML/en/%{name}/${i##*/}
-done
-
-# Installs the Designer plugin
-for i in designer/*.so ${QTDIR}/plugins/designer/*.so ${TQTDIR}/plugins/designer/*.so; do
-  [ -r "${i}" ] || continue
-  %__install -D -m 644 $i %{buildroot}${QTDIR}/plugins/designer/${i##*/}
-done
-
-# Installs libraries
-%__mkdir_p %{buildroot}%{_libdir}
-%__mv -f tmplib/* %{buildroot}%{_libdir}
-
-# Fix private headers location
-%__mkdir_p %{buildroot}%{_includedir}
-%__mv -f %{buildroot}/private %{buildroot}%{_includedir}/tqt3
-%__mv -f %{buildroot}%{_includedir}/tqt3 %{buildroot}%{_includedir}/tqscintilla
-
-# Fix permissions
-chmod a-x %{buildroot}%{_includedir}/tqscintilla/*.h
-chmod a-x %{buildroot}%{_includedir}/tqscintilla/*.h
+# Fix headers location
+%__mv "%{?buildroot}%{_includedir}/tqt3" "%{?buildroot}%{_includedir}/tqscintilla"
 
 
 %clean
diff --git a/redhat/dependencies/tqt3/build-examples.sh b/redhat/dependencies/tqt3/build-examples.sh
index f8ef0b95c..4d654fcc9 120000
--- a/redhat/dependencies/tqt3/build-examples.sh
+++ b/redhat/dependencies/tqt3/build-examples.sh
@@ -1 +1 @@
-../../../ubuntu/trusty/dependencies/tqt3/debian/maintain/build-examples.sh
\ No newline at end of file
+../../../debian/_base/dependencies/tqt3/debian/maintain/build-examples.sh
\ No newline at end of file
diff --git a/redhat/dependencies/tqt3/tqt3.spec b/redhat/dependencies/tqt3/tqt3.spec
index cda9e55a8..1298ab280 100644
--- a/redhat/dependencies/tqt3/tqt3.spec
+++ b/redhat/dependencies/tqt3/tqt3.spec
@@ -17,7 +17,7 @@
 
 # TDE variables
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
@@ -48,6 +48,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{tde_version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 Source1:	build-examples.sh
+Source2:	trinity-tqt3-rpmlintrc
 
 BuildRequires: glibc-devel
 BuildRequires: gcc-c++
@@ -1208,6 +1209,7 @@ for full internationalization support of the application towards the end user.
 %{_datadir}/tqt3/translations/qt_it.qm
 %{_datadir}/tqt3/translations/qt_ja.qm
 %{_datadir}/tqt3/translations/qt_nb.qm
+%{_datadir}/tqt3/translations/qt_pt.qm
 %{_datadir}/tqt3/translations/qt_pt-br.qm
 %{_datadir}/tqt3/translations/qt_ru.qm
 %{_datadir}/tqt3/translations/qt_sk.qm
@@ -1322,6 +1324,7 @@ done
 # Checks for supplementary library dirs
 LIBDIRS=""
 for d in \
+	%{_libdir}/libglvnd \
 	%{_libdir}/mysql \
 	%{_libdir}/pgsql \
 ; do
diff --git a/redhat/dependencies/tqt3/trinity-tqt3-rpmlintrc b/redhat/dependencies/tqt3/trinity-tqt3-rpmlintrc
new file mode 100644
index 000000000..d131ff5e9
--- /dev/null
+++ b/redhat/dependencies/tqt3/trinity-tqt3-rpmlintrc
@@ -0,0 +1 @@
+setBadness('shlib-policy-name-error', 0)
diff --git a/redhat/dependencies/tqtinterface/tqtinterface.spec b/redhat/dependencies/tqtinterface/tqtinterface.spec
index 682250423..a4dfca52c 100644
--- a/redhat/dependencies/tqtinterface/tqtinterface.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface.spec
@@ -22,10 +22,9 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tqtinterface
-%define cmake_modules_dir %{_datadir}/cmake/Modules
 
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
 %define libtqt4 %{_lib}tqt4
@@ -57,12 +56,8 @@ Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
 BuildRequires:	libtqt3-mt-devel >= 3.5.0
 BuildRequires:	tqt3-dev-tools >= 3.5.0
+BuildRequires:	trinity-cmake >= %{tde_version}
 
-%if 0%{?suse_version} && 0%{?suse_version} < 1300
-BuildRequires:	trinity-cmake-macros
-%endif
-
-BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -137,10 +132,6 @@ Provides:	libtqt4 = %{?epoch:%{epoch}:}%{version}-%{release}
 
 Requires:	libtqt3-mt >= 3.5.0
 
-%if 0%{?suse_version} && 0%{?suse_version} < 1300
-Requires:		trinity-cmake-macros
-%endif
-
 Obsoletes:	trinity-tqtinterface < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:	trinity-tqtinterface = %{?epoch:%{epoch}:}%{version}-%{release}
 
@@ -171,10 +162,7 @@ Provides:	libtqt4-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	%{libtqt4} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	libtqt3-mt-devel >= 3.5.0
 Requires:	tqt3-dev-tools >= 3.5.0
-
-%if 0%{?suse_version} && 0%{?suse_version} < 1300
-Requires:		trinity-cmake-macros
-%endif
+Requires:	trinity-cmake >= %{version}-%{release}
 
 Obsoletes:	trinity-tqtinterface-devel < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:	trinity-tqtinterface-devel = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -210,7 +198,6 @@ although some code has been added for useful functions that are no longer part o
 %{_libdir}/libtqt.so
 %{_libdir}/pkgconfig/tqt.pc
 %{_libdir}/pkgconfig/tqtqui.pc
-%{cmake_modules_dir}/*.cmake
 
 ##########
 
@@ -265,12 +252,6 @@ fi
 %__rm -rf "%{?buildroot}"
 %__make install DESTDIR="%{?buildroot}" -C build
 
-# Install 'cmake' modules for development use
-%__mkdir_p "%{?buildroot}%{cmake_modules_dir}"
-for i in cmake/modules/*.cmake; do
-  %__install -m 644 "$i" "%{?buildroot}%{cmake_modules_dir}"
-done
-
 
 %clean
 %__rm -rf "%{?buildroot}"
diff --git a/redhat/docker/build.sh b/redhat/docker/build.sh
index 53df6d1c5..f558d17a1 100755
--- a/redhat/docker/build.sh
+++ b/redhat/docker/build.sh
@@ -4,7 +4,7 @@ DISTRIB="$1"
 TDE_VERSION="$2"
 ARCH="$3"
 
-[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.9"
+[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.13"
 [ -z "${ARCH}" ] && ARCH="x86_64"
 [ -x /usr/bin/podman ] && DOCKER=podman || DOCKER=docker
 
@@ -22,3 +22,9 @@ else
   echo "Saving image to '${FILE}'"
   ${DOCKER} image save "${IMAGE}" | pigz >"${FILE}"
 fi
+
+# Strip 'localhost/' prefix from image tag
+if ! docker images | while read name tag blah; do echo "${name}:${tag}"; done | grep -q "^${IMAGE}$"; then
+  docker image tag "localhost/${IMAGE}" "${IMAGE}"
+  #docker image rm "localhost/${IMAGE}"
+fi
diff --git a/redhat/docker/el5/Dockerfile.i686 b/redhat/docker/el5/Dockerfile.i686
index 02659ef80..e12ac2c99 100644
--- a/redhat/docker/el5/Dockerfile.i686
+++ b/redhat/docker/el5/Dockerfile.i686
@@ -1,32 +1,103 @@
 FROM centos32:5
 
-ARG TDE_VERSION=14.0.9
+ARG TDE_VERSION=14.0.13
 ARG ARCH=i686
 
 # Add local repositories
-RUN rm -f /etc/yum.repos.d/*.repo
-ADD centos-5.repo /etc/yum.repos.d/centos-5.repo
-ADD epel-5.repo /etc/yum.repos.d/epel-5.repo
-ADD repoforge-5.repo /etc/yum.repos.d/repoforge-5.repo
-
-# Install Trinity build dependencies
-ADD packages.trinity /etc/yum.repos.d/packages
-#RUN yum install -y setarch
-RUN setarch ${ARCH} yum update -y
-RUN setarch ${ARCH} yum install -y $(</etc/yum.repos.d/packages) || :
+COPY packages /packages
+RUN rpm -Uvh --force http://repo/repo/archives/centos/5/os/i386/CentOS/{curl-7.15.5-17.el5_9,libidn-0.6.5-1.1}.i386.rpm \
+ && echo "multilib_policy=best" >>/etc/yum.conf \
+ && cd /etc/yum.repos.d \
+ && rm -fv *.repo \
+ && curl http://repo/repo/{centos5,epel5,repoforge5}.repo >repos.repo \
+ && rpm -e --nodeps --justdb libselinux \
+ && setarch ${ARCH} yum -y update \
+ && setarch ${ARCH} yum -y install $(</packages) || :
 
 # Avoid conflict with gnome-screensaver
-RUN setarch ${ARCH} yum remove -y gnome-screensaver
-RUN setarch ${ARCH} yum install -y --disablerepo="*" --enablerepo="centos-5-extras" xscreensaver
+RUN setarch ${ARCH} yum -y remove gnome-screensaver \
+ && setarch ${ARCH} yum -y install --disablerepo="*" --enablerepo="centos-extras" xscreensaver
 
-# Add YUM repository for locally built packages
-ADD rpmbuild.repo /etc/yum.repos.d/rpmbuild.repo
-RUN sed -i "/etc/yum.repos.d/rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
+# Updated build tools (not provided in centos5)
+# Distro-specific patches
+RUN rpm -Uvh http://repo/trinity/archives/el5/tools/RPMS/{noarch/autoconf-2.63-5.el5.noarch,noarch/automake-1.11.1-4.el5.noarch,i686/m4-1.4.13-5.el5.i386}.rpm \
+ && rpm -Uvh http://repo/trinity/archives/el5/trinity-14.0.4/RPMS/i686/trinity-poppler{,-devel}-0.12.4-1.el5.i386.rpm \
+ && chmod a+r /usr/libexec/utempter/utempter \
+ && sed -i "/usr/include/jasper/jas_math.h" -e "/#include <stdint.h>/ s|$|\n#ifndef SIZE_MAX\n#define SIZE_MAX ((size_t) -1)\n#endif\n|"
 
 # Add non-root user to build packages
-RUN useradd -m -s /bin/bash -u 1000 trinity
-RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
-ADD rpmmacros /home/trinity/.rpmmacros
+RUN useradd -m -s /bin/bash -u 1000 trinity \
+ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
 
-# Distro-specific patches
-RUN sed -i "/usr/include/jasper/jas_math.h" -e "/#include <stdint.h>/ s|$|\n#ifndef SIZE_MAX\n#define SIZE_MAX ((size_t) -1)\n#endif\n|"
+# Fix sudo running in docker
+RUN sed -i "/etc/sudoers" -e "/requiretty/ s|^|#|"
+
+# Use GCC 4.4 by default
+RUN rm -f /usr/bin/gcc && ln -sf /usr/bin/gcc44 /usr/bin/gcc \
+ && rm -f /usr/bin/g++ && ln -sf /usr/bin/g++44 /usr/bin/g++ \
+ && rm -f /usr/bin/c++ && ln -sf /usr/bin/g++44 /usr/bin/c++
+
+USER trinity
+COPY rpmmacros /home/trinity/.rpmmacros
+RUN mkdir -p ${HOME}/rpmbuild/{BUILD,BUILDROOT,SOURCES,SPECS,RPMS/noarch,RPMS/${ARCH},SRPMS}
+
+# Build development tools
+RUN wget -nv -P /tmp http://vault.centos.org/6.10/os/Source/SPackages/cmake-2.8.12.2-4.el6.src.rpm \
+ && rpm -ivh --nomd5 /tmp/cmake-2.8.12.2-4.el6.src.rpm \
+ && setarch ${ARCH} rpmbuild -ba ${HOME}/rpmbuild/SPECS/cmake.spec --without gui \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/cmake-2*.rpm \
+ && rm -fv /tmp/*.src.rpm \
+ && sudo sed -i "/usr/share/cmake/Modules/FindGTK2.cmake" -e "/GTK2_GIO/ s|^|#|"
+
+RUN wget -nv -P /tmp http://vault.centos.org/6.10/os/Source/SPackages/binutils-2.20.51.0.2-5.48.el6.src.rpm \
+ && rpm -ivh --nomd5 /tmp/binutils-2.20.51.0.2-5.48.el6.src.rpm \
+ && setarch ${ARCH} rpmbuild -ba ${HOME}/rpmbuild/SPECS/binutils.spec --nodeps \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/binutils{,-devel}-2*.rpm \
+ && rm -fv /tmp/*.src.rpm
+
+RUN wget -nv -P /tmp http://archives.fedoraproject.org/pub/archive/epel/6/SRPMS/Packages/p/pcsc-perl-1.4.14-2.el6.src.rpm \
+ && rpm -ivh --nomd5 /tmp/pcsc-perl-1.4.14-2.el6.src.rpm \
+ && sed -i ${HOME}/rpmbuild/SPECS/pcsc-perl.spec -e "s|%license|%doc|" -e "/URL:/ s|$|\nBuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)|" \
+ && setarch ${ARCH} rpmbuild -ba ${HOME}/rpmbuild/SPECS/pcsc-perl.spec --define "__isa_bits 32" \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pcsc-perl-1*.rpm \
+ && rm -fv /tmp/*.src.rpm
+
+RUN wget -nv -P /tmp http://archives.fedoraproject.org/pub/archive/epel/6/SRPMS/Packages/s/sword-1.7.3-2.el6.src.rpm \
+ && rpm -ivh --nomd5 /tmp/sword-1.7.3-2.el6.src.rpm \
+ && sed -i ${HOME}/rpmbuild/SPECS/sword.spec -e "/URL:/ s|$|\nBuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)|" \
+ && setarch ${ARCH} rpmbuild -ba ${HOME}/rpmbuild/SPECS/sword.spec \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/sword{,-devel}-1*.rpm \
+ && rm -fv /tmp/*.src.rpm
+
+RUN wget -nv -P /tmp http://vault.centos.org/6.10/os/Source/SPackages/gnuchess-5.07-14.1.el6.src.rpm \
+ && rpm -ivh --nomd5 /tmp/gnuchess-5.07-14.1.el6.src.rpm \
+ && setarch ${ARCH} rpmbuild -ba ${HOME}/rpmbuild/SPECS/gnuchess.spec \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/gnuchess-5*.rpm \
+ && rm -fv /tmp/*.src.rpm
+
+RUN wget -nv -P /tmp http://fr2.rpmfind.net/linux/epel/7/SRPMS/Packages/p/perl-PAR-1.015-4.el7.src.rpm \
+ && rpm -ivh --nomd5 /tmp/perl-PAR-1.015-4.el7.src.rpm \
+ && sed -i ${HOME}/rpmbuild/SPECS/perl-PAR.spec -e "s|%license|%doc|" -e "/perl(AutoLoader)/ s|^|#|" -e "/URL:/ s|$|\nBuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)|" -e "/^make test/ s|^|#|" \
+ && setarch ${ARCH} rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-PAR.spec \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm \
+ && rm -fv /tmp/*.src.rpm
+
+RUN wget -nv -P /tmp http://vault.centos.org/7.7.1908/os/Source/SPackages/perl-Module-ScanDeps-1.10-3.el7.src.rpm \
+ && rpm -ivh --nomd5 /tmp/perl-Module-ScanDeps-1.10-3.el7.src.rpm \
+ && sed -i ${HOME}/rpmbuild/SPECS/perl-Module-ScanDeps.spec -e "/URL:/ s|$|\nBuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)|" -e "/^make test/ s|^|#|" \
+ && setarch ${ARCH} rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-Module-ScanDeps.spec \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Module-ScanDeps-*.rpm \
+ && rm -fv /tmp/*.src.rpm
+
+RUN wget -nv -P /tmp http://fr2.rpmfind.net/linux/epel/7/SRPMS/Packages/p/perl-PAR-Packer-1.041-2.el7.src.rpm \
+ && rpm -ivh --nomd5 /tmp/perl-PAR-Packer-1.041-2.el7.src.rpm \
+ && sed -i ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec -e "s|%license|%doc|" -e "/^make test/ s|^|#|" -e "/^Summary:/ s|$|\nGroup: Development/Languages|" -e "/URL:/ s|$|\nBuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)|" -e "s|desktop-file-install|desktop-file-install --vendor=''|" \
+ && setarch ${ARCH} rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec --define "_unpackaged_files_terminate_build 0" \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm --nodeps \
+ && rm -fv /tmp/*.src.rpm
+
+RUN wget -nv -P /tmp http://vault.centos.org/6.10/os/Source/SPackages/exempi-2.1.0-5.el6.src.rpm \
+ && rpm -ivh --nomd5 /tmp/exempi-2.1.0-5.el6.src.rpm \
+ && setarch ${ARCH} rpmbuild -ba ${HOME}/rpmbuild/SPECS/exempi.spec \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/exempi{,-devel}-2*.rpm \
+ && rm -fv /tmp/*.src.rpm
diff --git a/redhat/docker/el5/Dockerfile.x86_64 b/redhat/docker/el5/Dockerfile.x86_64
index 36506fc3b..cb11f82ab 100644
--- a/redhat/docker/el5/Dockerfile.x86_64
+++ b/redhat/docker/el5/Dockerfile.x86_64
@@ -1,14 +1,14 @@
 FROM centos:5
 
-ARG TDE_VERSION=14.0.9
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 # Add local repositories
 COPY packages /packages
-RUN rpm -Uvh http://repo/repo/archives/centos/5/os/x86_64/CentOS/{curl-7.15.5-17.el5_9,libidn-0.6.5-1.1}.x86_64.rpm \
+RUN rpm -Uvh --force http://repo/repo/archives/centos/5/os/x86_64/CentOS/{curl-7.15.5-17.el5_9,libidn-0.6.5-1.1}.x86_64.rpm \
  && echo "multilib_policy=best" >>/etc/yum.conf \
  && cd /etc/yum.repos.d \
- && rm -f *.repo \
+ && rm -fv *.repo \
  && curl http://repo/repo/{centos5,epel5,repoforge5}.repo >repos.repo \
  && rpm -e --nodeps --justdb libselinux \
  && yum -y update \
@@ -20,8 +20,8 @@ RUN setarch ${ARCH} yum -y remove gnome-screensaver \
 
 # Updated build tools (not provided in centos5)
 # Distro-specific patches
-RUN rpm -Uvh http://repo/trinity/archives/el5/tools/RPMS/{noarch/autoconf-2.63-5.el5.noarch,noarch/automake-1.11.1-4.el5.noarch,x86_64/m4-1.4.13-5.el5.x86_64}.rpm \
- && rpm -Uvh http://repo/trinity/archives/el5/trinity-14.0.4/RPMS/x86_64/trinity-poppler{,-devel}-0.12.4-1.el5.x86_64.rpm \
+RUN rpm -Uvh http://xh61v/trinity/archives/el5/tools/RPMS/{noarch/autoconf-2.63-5.el5.noarch,noarch/automake-1.11.1-4.el5.noarch,x86_64/m4-1.4.13-5.el5.x86_64}.rpm \
+ && rpm -Uvh http://xh61v/trinity/archives/el5/trinity-14.0.4/RPMS/x86_64/trinity-poppler{,-devel}-0.12.4-1.el5.x86_64.rpm \
  && chmod a+r /usr/libexec/utempter/utempter \
  && sed -i "/usr/include/jasper/jas_math.h" -e "/#include <stdint.h>/ s|$|\n#ifndef SIZE_MAX\n#define SIZE_MAX ((size_t) -1)\n#endif\n|"
 
@@ -29,57 +29,75 @@ RUN rpm -Uvh http://repo/trinity/archives/el5/tools/RPMS/{noarch/autoconf-2.63-5
 RUN useradd -m -s /bin/bash -u 1000 trinity \
  && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
 
+# Fix sudo running in docker
+RUN sed -i "/etc/sudoers" -e "/requiretty/ s|^|#|"
+
+# Use GCC 4.4 by default
+RUN rm -f /usr/bin/gcc && ln -sf /usr/bin/gcc44 /usr/bin/gcc \
+ && rm -f /usr/bin/g++ && ln -sf /usr/bin/g++44 /usr/bin/g++ \
+ && rm -f /usr/bin/c++ && ln -sf /usr/bin/g++44 /usr/bin/c++
+
 USER trinity
 COPY rpmmacros /home/trinity/.rpmmacros
 RUN mkdir -p ${HOME}/rpmbuild/{BUILD,BUILDROOT,SOURCES,SPECS,RPMS/noarch,RPMS/${ARCH},SRPMS}
 
-# Build development packages
-RUN rpm -i --nomd5 http://vault.centos.org/6.10/os/Source/SPackages/file-5.04-30.el6.src.rpm \
- && rpmbuild -ba ${HOME}/rpmbuild/SPECS/file.spec \
- && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/file{,-libs,-devel}-5*.rpm
-
-RUN rpm -i --nomd5 http://vault.centos.org/6.10/os/Source/SPackages/binutils-2.20.51.0.2-5.48.el6.src.rpm \
- && rpmbuild -ba ${HOME}/rpmbuild/SPECS/binutils.spec --nodeps \
- && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/binutils{,-devel}-2*.rpm
-
-RUN rpm -i --nomd5 http://fr2.rpmfind.net/linux/epel/6/SRPMS/Packages/p/pcsc-perl-1.4.14-2.el6.src.rpm \
+# Build development tools
+RUN wget -nv -P /tmp http://vault.centos.org/6.10/os/Source/SPackages/cmake-2.8.12.2-4.el6.src.rpm \
+ && rpm -ivh --nomd5 /tmp/cmake-2.8.12.2-4.el6.src.rpm \
+ && setarch ${ARCH} rpmbuild -ba ${HOME}/rpmbuild/SPECS/cmake.spec --without gui \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/cmake-2*.rpm \
+ && rm -fv /tmp/*.src.rpm \
+ && sudo sed -i "/usr/share/cmake/Modules/FindGTK2.cmake" -e "/GTK2_GIO/ s|^|#|"
+
+RUN wget -nv -P /tmp http://vault.centos.org/6.10/os/Source/SPackages/binutils-2.20.51.0.2-5.48.el6.src.rpm \
+ && rpm -ivh --nomd5 /tmp/binutils-2.20.51.0.2-5.48.el6.src.rpm \
+ && setarch ${ARCH} rpmbuild -ba ${HOME}/rpmbuild/SPECS/binutils.spec --nodeps \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/binutils{,-devel}-2*.rpm \
+ && rm -fv /tmp/*.src.rpm
+
+RUN wget -nv -P /tmp http://archives.fedoraproject.org/pub/archive/epel/6/SRPMS/Packages/p/pcsc-perl-1.4.14-2.el6.src.rpm \
+ && rpm -ivh --nomd5 /tmp/pcsc-perl-1.4.14-2.el6.src.rpm \
  && sed -i ${HOME}/rpmbuild/SPECS/pcsc-perl.spec -e "s|%license|%doc|" -e "/URL:/ s|$|\nBuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)|" \
- && rpmbuild -ba ${HOME}/rpmbuild/SPECS/pcsc-perl.spec --define "__isa_bits 64" \
- && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pcsc-perl-1*.rpm
+ && setarch ${ARCH} rpmbuild -ba ${HOME}/rpmbuild/SPECS/pcsc-perl.spec --define "__isa_bits 64" \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pcsc-perl-1*.rpm \
+ && rm -fv /tmp/*.src.rpm
 
-RUN rpm -i --nomd5 http://fr2.rpmfind.net/linux/epel/6/SRPMS/Packages/s/sword-1.7.3-2.el6.src.rpm \
+RUN wget -nv -P /tmp http://archives.fedoraproject.org/pub/archive/epel/6/SRPMS/Packages/s/sword-1.7.3-2.el6.src.rpm \
+ && rpm -ivh --nomd5 /tmp/sword-1.7.3-2.el6.src.rpm \
  && sed -i ${HOME}/rpmbuild/SPECS/sword.spec -e "/URL:/ s|$|\nBuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)|" \
- && rpmbuild -ba ${HOME}/rpmbuild/SPECS/sword.spec \
- && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/sword{,-devel}-1*.rpm
-
-RUN rpm -i --nomd5 http://vault.centos.org/6.10/os/Source/SPackages/gnuchess-5.07-14.1.el6.src.rpm \
- && rpmbuild -ba ${HOME}/rpmbuild/SPECS/gnuchess.spec \
- && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/gnuchess-5*.rpm
-
-RUN rpm -i --nomd5 http://fr2.rpmfind.net/linux/epel/7/SRPMS/Packages/p/perl-PAR-1.015-4.el7.src.rpm \
+ && setarch ${ARCH} rpmbuild -ba ${HOME}/rpmbuild/SPECS/sword.spec \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/sword{,-devel}-1*.rpm \
+ && rm -fv /tmp/*.src.rpm
+
+RUN wget -nv -P /tmp http://vault.centos.org/6.10/os/Source/SPackages/gnuchess-5.07-14.1.el6.src.rpm \
+ && rpm -ivh --nomd5 /tmp/gnuchess-5.07-14.1.el6.src.rpm \
+ && setarch ${ARCH} rpmbuild -ba ${HOME}/rpmbuild/SPECS/gnuchess.spec \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/gnuchess-5*.rpm \
+ && rm -fv /tmp/*.src.rpm
+
+RUN wget -nv -P /tmp http://fr2.rpmfind.net/linux/epel/7/SRPMS/Packages/p/perl-PAR-1.015-4.el7.src.rpm \
+ && rpm -ivh --nomd5 /tmp/perl-PAR-1.015-4.el7.src.rpm \
  && sed -i ${HOME}/rpmbuild/SPECS/perl-PAR.spec -e "s|%license|%doc|" -e "/perl(AutoLoader)/ s|^|#|" -e "/URL:/ s|$|\nBuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)|" -e "/^make test/ s|^|#|" \
- && rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-PAR.spec \
- && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm
+ && setarch ${ARCH} rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-PAR.spec \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm \
+ && rm -fv /tmp/*.src.rpm
 
-RUN rpm -i --nomd5 http://vault.centos.org/7.7.1908/os/Source/SPackages/perl-Module-ScanDeps-1.10-3.el7.src.rpm \
+RUN wget -nv -P /tmp http://vault.centos.org/7.7.1908/os/Source/SPackages/perl-Module-ScanDeps-1.10-3.el7.src.rpm \
+ && rpm -ivh --nomd5 /tmp/perl-Module-ScanDeps-1.10-3.el7.src.rpm \
  && sed -i ${HOME}/rpmbuild/SPECS/perl-Module-ScanDeps.spec -e "/URL:/ s|$|\nBuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)|" -e "/^make test/ s|^|#|" \
- && rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-Module-ScanDeps.spec \
- && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Module-ScanDeps-*.rpm
+ && setarch ${ARCH} rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-Module-ScanDeps.spec \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Module-ScanDeps-*.rpm \
+ && rm -fv /tmp/*.src.rpm
 
-RUN rpm -i --nomd5 http://fr2.rpmfind.net/linux/epel/7/SRPMS/Packages/p/perl-PAR-Packer-1.041-2.el7.src.rpm \
+RUN wget -nv -P /tmp http://fr2.rpmfind.net/linux/epel/7/SRPMS/Packages/p/perl-PAR-Packer-1.041-2.el7.src.rpm \
+ && rpm -ivh --nomd5 /tmp/perl-PAR-Packer-1.041-2.el7.src.rpm \
  && sed -i ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec -e "s|%license|%doc|" -e "/^make test/ s|^|#|" -e "/^Summary:/ s|$|\nGroup: Development/Languages|" -e "/URL:/ s|$|\nBuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)|" -e "s|desktop-file-install|desktop-file-install --vendor=''|" \
- && rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec --define "_unpackaged_files_terminate_build 0" \
- && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm --nodeps
-
-RPM rpm -i --nomd5 http://vault.centos.org/6.10/os/Source/SPackages/exempi-2.1.0-5.el6.src.rpm \
- && rpmbuild -ba ${HOME}/rpmbuild/SPECS/exempi.spec \
- && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/exempi{,-devel}-2*.rpm
- 
-RUN rpm -i --nomd5 http://vault.centos.org/6.10/os/Source/SPackages/pilot-link-0.12.4-6.el6.src.rpm \
- && rpmbuild -ba ${HOME}/rpmbuild/SPECS/pilot-link.spec \
- && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pilot-link{,-devel}-0*.rpm
-
-
-# sudo rm -f /usr/bin/gcc && sudo ln -sf /usr/bin/gcc44 /usr/bin/gcc
-# sudo rm -f /usr/bin/g++ && sudo ln -sf /usr/bin/g++44 /usr/bin/g++
-# sudo rm -f /usr/bin/c++ && sudo ln -sf /usr/bin/g++44 /usr/bin/c++
+ && setarch ${ARCH} rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec --define "_unpackaged_files_terminate_build 0" \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm --nodeps \
+ && rm -fv /tmp/*.src.rpm
+
+RUN wget -nv -P /tmp http://vault.centos.org/6.10/os/Source/SPackages/exempi-2.1.0-5.el6.src.rpm \
+ && rpm -ivh --nomd5 /tmp/exempi-2.1.0-5.el6.src.rpm \
+ && setarch ${ARCH} rpmbuild -ba ${HOME}/rpmbuild/SPECS/exempi.spec \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/exempi{,-devel}-2*.rpm \
+ && rm -fv /tmp/*.src.rpm
diff --git a/redhat/docker/el5/packages b/redhat/docker/el5/packages
index dbbe2f017..90d09f929 100644
--- a/redhat/docker/el5/packages
+++ b/redhat/docker/el5/packages
@@ -115,6 +115,7 @@ libogg-devel
 libotr-devel
 libpaper-devel
 libpqxx-devel
+libqalculate-devel
 libraw1394-devel
 librsvg2-devel
 libsamplerate-devel
@@ -218,6 +219,7 @@ vim-enhanced
 wireless-tools-devel
 xine-lib-devel
 xinetd
+xmlrpc-c-devel
 xmlto
 xorg-x11-font-utils
 xorg-x11-server-utils
diff --git a/redhat/docker/el6/Dockerfile.i686 b/redhat/docker/el6/Dockerfile.i686
index 69e8b11c6..36a570e32 100644
--- a/redhat/docker/el6/Dockerfile.i686
+++ b/redhat/docker/el6/Dockerfile.i686
@@ -1,6 +1,6 @@
 FROM centos32:6
 
-ARG TDE_VERSION=14.0.9
+ARG TDE_VERSION=14.0.13
 ARG ARCH=i686
 
 # Enable proxy
@@ -9,10 +9,14 @@ ARG ARCH=i686
 # Install Trinity build dependencies
 COPY packages /packages
 RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf" \
- && yum -y clean all \
+ && rpm -Uvh http://repo/repo/archives/centos/6/os/i386/Packages/wget-1.12-10.el6.i686.rpm \
+ && rm -fv /etc/yum.repos.d/*.repo \
+ && wget -P /etc/yum.repos.d -nv http://repo/repo/{centos6,epel6}.repo \
+ && sed -i /etc/yum.repos.d/*.repo -e "s|https://|http://|g" \
+ && setarch i686 yum -y clean all \
  && setarch i686 yum -y update \
- && setarch i686 yum -y install epel-release \
- && rpm -Uvh https://download1.rpmfusion.org/free/el/rpmfusion-free-release-6.noarch.rpm \
+ && rm -fv /etc/yum.repos.d/CentOS-*.repo \
+ && rpm -Uvh --nodeps https://download1.rpmfusion.org/free/el/rpmfusion-free-release-6.noarch.rpm \
  && setarch i686 yum -y install $(</packages)
 
 # Add YUM repository for locally built packages
@@ -35,7 +39,7 @@ COPY rpmmacros /home/trinity/.rpmmacros
 
 # Build supplementary development tools
 
-RUN sudo rpm -Uvh http://repo/trinity/el6/tools/RPMS/i686/m4-1.4.16-10.el6.i686.rpm
+RUN sudo rpm -Uvh http://xh61v/trinity/current/el6/tools/RPMS/i686/m4-1.4.16-10.el6.i686.rpm
 
 RUN setarch i686 rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/autoconf-2.69-11.el7.src.rpm --nodeps \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/autoconf-2*.rpm
@@ -58,3 +62,11 @@ RUN rpm -i https://fr2.rpmfind.net/linux/epel/7/SRPMS/Packages/p/perl-PAR-Packer
  && sed -i ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec -e "s|%license|%doc|" -e "/^make test/ s|^|#|" \
  && setarch i686 rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm --nodeps
+
+RUN rpm -i https://dl.fedoraproject.org/pub/epel/7/SRPMS/Packages/c/cln-1.3.4-1.el7.src.rpm \
+ && setarch i686 rpmbuild -ba ${HOME}/rpmbuild/SPECS/cln.spec \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/cln{,-devel}-1*.rpm
+
+RUN rpm -i https://dl.fedoraproject.org/pub/epel/7/SRPMS/Packages/l/libqalculate-0.9.7-7.el7.src.rpm \
+ && setarch i686 rpmbuild -ba ${HOME}/rpmbuild/SPECS/libqalculate.spec \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libqalculate{,-devel}-0*.rpm
diff --git a/redhat/docker/el6/Dockerfile.x86_64 b/redhat/docker/el6/Dockerfile.x86_64
index 36fb8f549..98e4a0df5 100644
--- a/redhat/docker/el6/Dockerfile.x86_64
+++ b/redhat/docker/el6/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM centos:6
 
-ARG TDE_VERSION=14.0.9
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 # Enable proxy
@@ -9,10 +9,14 @@ ARG ARCH=x86_64
 # Install Trinity build dependencies
 COPY packages /packages
 RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf" \
+ && rpm -Uvh http://repo/repo/archives/centos/6/os/x86_64/Packages/wget-1.12-10.el6.x86_64.rpm \
+ && rm -fv /etc/yum.repos.d/*.repo \
+ && wget -P /etc/yum.repos.d -nv http://repo/repo/{centos6,epel6}.repo \
+ && sed -i /etc/yum.repos.d/*.repo -e "s|https://|http://|g" \
  && yum -y clean all \
  && yum -y update \
- && yum -y install epel-release \
- && rpm -Uvh https://download1.rpmfusion.org/free/el/rpmfusion-free-release-6.noarch.rpm \
+ && rm -fv /etc/yum.repos.d/CentOS-*.repo \
+ && rpm -Uvh --nodeps https://download1.rpmfusion.org/free/el/rpmfusion-free-release-6.noarch.rpm \
  && yum -y install $(</packages)
 
 # Add YUM repository for locally built packages
@@ -58,3 +62,11 @@ RUN rpm -i https://fr2.rpmfind.net/linux/epel/7/SRPMS/Packages/p/perl-PAR-Packer
  && sed -i ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec -e "s|%license|%doc|" -e "/^make test/ s|^|#|" \
  && rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm --nodeps
+
+RUN rpm -i https://dl.fedoraproject.org/pub/epel/7/SRPMS/Packages/c/cln-1.3.4-1.el7.src.rpm \
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/cln.spec \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/cln{,-devel}-1*.rpm
+
+RUN rpm -i https://dl.fedoraproject.org/pub/epel/7/SRPMS/Packages/l/libqalculate-0.9.7-7.el7.src.rpm \
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/libqalculate.spec \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libqalculate{,-devel}-0*.rpm
diff --git a/redhat/docker/el6/packages b/redhat/docker/el6/packages
index 13d9d827c..78e50226a 100644
--- a/redhat/docker/el6/packages
+++ b/redhat/docker/el6/packages
@@ -9,6 +9,7 @@ binutils-devel
 bison
 boost-devel
 bzip2-devel
+byacc
 ccache
 ccrtp-devel
 cdparanoia
@@ -19,6 +20,7 @@ clamav
 clamav-devel
 clucene-core-devel
 cmake
+cmake3
 commoncpp2-devel
 cpp
 cppunit-devel
@@ -116,6 +118,7 @@ libraw1394-devel
 libsamplerate-devel
 libsmbclient-devel
 libsndfile-devel
+libssh-devel
 libssh2-devel
 libtheora-devel
 libtiff-devel
@@ -212,7 +215,9 @@ t1lib-devel
 t1utils
 taglib-devel
 tar
+texi2html
 texinfo
+texinfo-tex
 texlive-utils
 torsocks
 transfig
diff --git a/redhat/docker/el6/rpmmacros b/redhat/docker/el6/rpmmacros
index 3b33ecbc0..74a547ddb 100644
--- a/redhat/docker/el6/rpmmacros
+++ b/redhat/docker/el6/rpmmacros
@@ -3,3 +3,4 @@
 %_smp_mflags -j8
 %jobs 8
 %_topdir /home/trinity/rpmbuild
+%cmake %cmake3
diff --git a/redhat/docker/el7/Dockerfile.x86_64 b/redhat/docker/el7/Dockerfile.x86_64
index e76088a50..11347ba7a 100644
--- a/redhat/docker/el7/Dockerfile.x86_64
+++ b/redhat/docker/el7/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM centos:7
 
-ARG TDE_VERSION=14.0.9
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 # Enable proxy
@@ -38,11 +38,11 @@ COPY rpmmacros /home/trinity/.rpmmacros
 RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/21/Everything/source/SRPMS/d/dirmngr-1.1.1-5.fc21.src.rpm \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/dirmngr-1*.rpm
 
-RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/y/yaz-5.14.11-17.fc30.src.rpm --define "_pkgdocdir /usr/share/doc/yaz" \
+RUN rpmbuild --rebuild http://ftp.lip6.fr/ftp/pub/linux/distributions/fedora/releases/36/Everything/source/tree/Packages/y/yaz-5.31.1-4.fc36.src.rpm --define "_pkgdocdir /usr/share/doc/yaz" \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libyaz{,-devel}-5*.rpm
 
-RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/32/Everything/source/tree/Packages/r/rdesktop-1.9.0-2.fc32.src.rpm \
+RUN rpmbuild --rebuild http://ftp.lip6.fr/ftp/pub/linux/distributions/fedora/releases/36/Everything/source/tree/Packages/r/rdesktop-1.9.0-7.fc36.src.rpm \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdesktop-1*.rpm
 
-RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/32/Everything/source/tree/Packages/p/pilot-link-0.12.5-44.fc32.src.rpm \
+RUN rpmbuild --rebuild http://ftp.lip6.fr/ftp/pub/linux/distributions/fedora/releases/36/Everything/source/tree/Packages/p/pilot-link-0.12.5-50.fc36.src.rpm \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pilot-link{,-devel,-libs}-0*.rpm
diff --git a/redhat/docker/el7/packages b/redhat/docker/el7/packages
index 7368877e2..13ff38757 100644
--- a/redhat/docker/el7/packages
+++ b/redhat/docker/el7/packages
@@ -10,6 +10,7 @@ bison
 bluez-libs-devel
 boost-devel
 bzip2-devel
+byacc
 ccache
 cdparanoia
 cdparanoia-devel
@@ -19,6 +20,7 @@ clamav
 clamav-devel
 clucene-core-devel
 cmake
+cmake3
 cpp
 cppunit-devel
 createrepo
@@ -46,6 +48,7 @@ gamin-devel
 gcc
 gcc-c++
 gcc-gfortran
+geoip-devel
 gettext-devel
 glib-devel
 gmime-devel
@@ -114,8 +117,10 @@ libqalculate-devel
 libraw1394-devel
 librsvg2-tools
 libsamplerate-devel
+libsecret-devel
 libsmbclient-devel
 libsndfile-devel
+libssh-devel
 libssh2-devel
 libtheora-devel
 libtiff-devel
@@ -172,6 +177,7 @@ pigz
 pilot-link-devel
 pkcs11-helper-devel
 pkgconfig(pygtk-2.0)
+polkit-devel
 poppler-devel
 postgresql-devel
 ppp
diff --git a/redhat/docker/el7/rpmmacros b/redhat/docker/el7/rpmmacros
index b76d30014..e0a64de43 100644
--- a/redhat/docker/el7/rpmmacros
+++ b/redhat/docker/el7/rpmmacros
@@ -1,3 +1,4 @@
 %dist .el7
 %_smp_mflags -j8
 %jobs 8
+%cmake %cmake3
diff --git a/redhat/docker/el8/Dockerfile.x86_64 b/redhat/docker/el8/Dockerfile.x86_64
index 4f5a7acdd..bf260ca03 100644
--- a/redhat/docker/el8/Dockerfile.x86_64
+++ b/redhat/docker/el8/Dockerfile.x86_64
@@ -1,6 +1,6 @@
-FROM centos:8
+FROM rockylinux:8
 
-ARG TDE_VERSION=14.0.9
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 # Enable custom repository
@@ -40,19 +40,19 @@ COPY rpmmacros /home/trinity/.rpmmacros
 
 # Build supplementary development tools
 
-RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/32/Everything/source/tree/Packages/g/gnuchess-6.2.5-10.fc32.src.rpm \
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/g/gnuchess-6.2.9-3.fc36.src.rpm \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/gnuchess-6*.rpm
 
-RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/32/Everything/source/tree/Packages/p/pilot-link-0.12.5-44.fc32.src.rpm \
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/pilot-link-0.12.5-50.fc36.src.rpm \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pilot-link-{devel,libs}-0*.rpm
 
 RUN sudo rpm -Uvh http://rpms.remirepo.net/enterprise/8/remi/x86_64/hiredis-0.13.3-9.el8.remi.x86_64.rpm http://rpms.remirepo.net/enterprise/8/remi/x86_64/libyaz{,-devel}-5.14.11-14.el8.remi.x86_64.rpm
 
-RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/32/Everything/source/tree/Packages/p/perl-PAR-1.016-4.fc32.src.rpm \
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-PAR-1.017-5.fc36.src.rpm \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm
 
-RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/32/Everything/source/tree/Packages/p/perl-Getopt-ArgvFile-1.11-31.fc32.src.rpm \
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-Getopt-ArgvFile-1.11-37.fc36.src.rpm \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Getopt-ArgvFile-1*.rpm
 
-RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/32/Everything/source/tree/Packages/p/perl-PAR-Packer-1.049-5.fc32.src.rpm --nocheck \
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-PAR-Packer-1.054-3.fc36.src.rpm --nocheck \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm
diff --git a/redhat/docker/el8/packages b/redhat/docker/el8/packages
index 8cff5b2a9..06283e94e 100644
--- a/redhat/docker/el8/packages
+++ b/redhat/docker/el8/packages
@@ -10,23 +10,26 @@ bison
 bluez-libs-devel
 boost-devel
 boost-python3-devel
+byacc
 bzip2-devel
 cdparanoia
 cdparanoia-devel
 chrpath
 clamav
 clamav-devel
+cln-devel
 clucene-core-devel
 cmake
 cpp
 cppunit-devel
-createrepo
+createrepo_c
 cryptsetup-devel
 cups-devel
 dbus-glib-devel
 docbook2X
 doxygen
 emacs
+esound-devel
 exempi-devel
 exiv2-devel
 fdupes
@@ -59,7 +62,9 @@ gtk3-devel
 gtk-doc
 guile-devel
 heimdal-devel
+help2man
 hspell-devel
+html2ps
 icu
 ImageMagick-devel
 imake
@@ -91,6 +96,7 @@ libgsf-devel
 libgssglue-devel
 libical-devel
 libidn-devel
+libjpeg-turbo-utils
 libksba-devel
 libmad-devel
 libmemcached-devel
@@ -104,12 +110,15 @@ libogg-devel
 libotr-devel
 libpaper-devel
 libpcap-devel
+libqalculate-devel
 libraw1394-devel
 librsvg2-tools
 librsync-devel
 libsamplerate-devel
+libsecret-devel
 libsmbclient-devel
 libsndfile-devel
+libssh-devel
 libtheora-devel
 libtiff-devel
 libtirpc-devel
@@ -169,6 +178,7 @@ perl(XML::Parser)
 pigz
 pkcs11-helper-devel
 pkgconfig(pygtk-2.0)
+polkit-devel
 poppler-devel
 postgresql
 postgresql-devel
@@ -205,6 +215,7 @@ systemd-devel
 taglib-devel
 tcl
 texinfo
+texlive-dvips
 torsocks
 transfig
 unixODBC-devel
@@ -215,4 +226,5 @@ wireless-tools-devel
 xine-lib-devel
 xmlto
 xorg-x11-font-utils
+xscreensaver
 xz-devel
diff --git a/redhat/docker/el9/Dockerfile.x86_64 b/redhat/docker/el9/Dockerfile.x86_64
new file mode 100644
index 000000000..1e3df3557
--- /dev/null
+++ b/redhat/docker/el9/Dockerfile.x86_64
@@ -0,0 +1,100 @@
+FROM rockylinux:9
+
+ARG TDE_VERSION=14.0.13
+ARG ARCH=x86_64
+
+# Enable proxy
+# Install OVL plugin for DNF
+# Update distribution packages
+# Add EPEL repository
+# Add RPMFUSION repository
+# Enable supplementary repositories
+# Install Trinity build dependencies
+COPY packages /packages
+RUN echo "proxy=http://proxy:3128" >>"/etc/dnf/dnf.conf" \
+ && curl -o /usr/lib/python3.9/site-packages/dnf-plugins/ovl.py https://raw.githubusercontent.com/FlorianLudwig/dnf-plugin-ovl/master/ovl.py \
+ && dnf -y update \
+ && dnf -y install epel-release \
+ && dnf -y install https://download1.rpmfusion.org/free/el/updates/9/x86_64/r/rpmfusion-free-release-9-1.noarch.rpm \
+ && dnf -y install dnf-plugins-core \
+ && dnf config-manager --enable devel \
+ && dnf config-manager --enable plus \
+ && dnf -y --enableplugin=ovl install $(</packages)
+
+# Add YUM repository for locally built packages
+WORKDIR /etc/yum.repos.d
+COPY rpmbuild.repo rpmbuild.repo
+RUN sed -i "rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
+
+# Fix utempter detection
+RUN chmod a+r /usr/libexec/utempter/utempter
+
+# Add non-root user to build packages
+RUN useradd -m -s /bin/bash -u 1000 trinity \
+ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers"
+
+USER trinity
+COPY rpmmacros /home/trinity/.rpmmacros
+
+# Build supplementary development tools
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/g/gnuchess-6.2.9-3.fc36.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/gnuchess-6*.rpm
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/pilot-link-0.12.5-50.fc36.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pilot-link-{devel,libs}-0*.rpm
+
+RUN sudo rpm -Uvh \
+  http://rpms.remirepo.net/enterprise/9/remi/x86_64/libicu69-69.1-4.el9.remi.x86_64.rpm \
+  http://rpms.remirepo.net/enterprise/9/remi/x86_64/libyaz{,-devel}-5.32.0-1.el9.remi.x86_64.rpm
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-PAR-1.017-5.fc36.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-Getopt-ArgvFile-1.11-37.fc36.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Getopt-ArgvFile-1*.rpm
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-PAR-Packer-1.054-3.fc36.src.rpm --nocheck \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/b/bdftopcf-1.1-4.fc36.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/bdftopcf-1*.rpm
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/paper-2.3-4.fc36.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/paper-2*.rpm
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/psutils-2.07-2.fc36.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/psutils-2*.rpm
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/v/vorbis-tools-1.4.2-4.fc36.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/vorbis-tools-1*.rpm
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/35/Everything/source/tree/Packages/w/wireless-tools-29-28.fc35.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/wireless-tools{,-devel}-29*.rpm
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/s/sword-1.9.0-9.fc36.src.rpm --undefine "__cmake_in_source_build" \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/sword{,-devel}-1*.rpm
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/c/chmlib-0.40-26.fc36.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/chmlib{,-devel}-0*.rpm
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/h/html2ps-1.0-0.42.b7.fc36.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/html2ps-1*.rpm
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/l/libxml++-2.42.1-3.fc36.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libxml++{,-devel}-2*.rpm
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/l/libofx-0.10.3-2.fc36.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libofx{,-devel}-0*.rpm
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/g/GeoIP-GeoLite-data-2018.06-9.fc36.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/GeoIP-GeoLite-data-2*.rpm 
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/g/GeoIP-1.6.12-11.fc36.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/GeoIP{,-devel}-1*.rpm 
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/l/liblo-0.31-5.fc36.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/liblo{,-devel}-0*.rpm 
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/pcsc-perl-1.4.14-19.fc36.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pcsc-perl-1*.rpm 
diff --git a/redhat/docker/el9/packages b/redhat/docker/el9/packages
new file mode 100644
index 000000000..dda2b1b20
--- /dev/null
+++ b/redhat/docker/el9/packages
@@ -0,0 +1,219 @@
+alsa-lib-devel
+aspell
+aspell-devel
+audiofile-devel
+autotrace
+avahi-devel
+bind-devel
+binutils-devel
+bison
+bluez-libs-devel
+boost-devel
+boost-python3-devel
+byacc
+bzip2-devel
+cdparanoia
+cdparanoia-devel
+chrpath
+clamav
+clamav-devel
+cln-devel
+clucene-core-devel
+cmake
+cpp
+cppunit-devel
+crda
+createrepo_c
+cryptsetup-devel
+cups-devel
+dbus-glib-devel
+docbook2X
+doxygen
+emacs
+esound-devel
+exempi-devel
+exiv2-devel
+fdupes
+ffmpeg-devel
+fftw-devel
+file-devel
+flac-devel
+flex-devel
+fontforge
+fontpackages-devel
+fribidi-devel
+gcc
+gcc-c++
+gcc-gfortran
+gettext-devel
+giflib-devel
+glibmm24-devel
+gmp-devel
+gnulib-devel
+gperf
+gpgme-devel
+gphoto2-devel
+GraphicsMagick-devel
+gsl-devel
+gstreamer1-devel
+gstreamer1-plugins-base-devel
+gtk2-devel
+gtk3-devel
+gtk-doc
+help2man
+hiredis
+hspell-devel
+iceauth
+icu
+ImageMagick-devel
+imake
+imlib2-devel
+intltool
+jack-audio-connection-kit-devel
+jasper-devel
+java-1.8.0-openjdk-devel
+java-devel
+java-openjdk
+kernel
+lame-devel
+libacl-devel
+libao-devel
+libarchive-devel
+libassuan-devel
+libblkid-devel
+libcap-devel
+libcdio-devel
+libcdio-paranoia-devel
+libconfig-devel
+libcurl-devel
+libdb-devel
+libdb-cxx-devel
+libdvdread-devel
+libfontenc-devel
+libgsf-devel
+libical-devel
+libidn-devel
+libjpeg-turbo-utils
+libjxl
+libksba-devel
+libmad-devel
+libmemcached-devel
+libmng-devel
+libmpcdec-devel
+libmtp-devel
+libnsl2-devel
+libogg-devel
+libotr-devel
+libpaper-devel
+libpcap-devel
+libqalculate-devel
+libraw1394-devel
+librsvg2-tools
+librsync-devel
+libsamplerate-devel
+libsecret-devel
+libsmbclient-devel
+libsndfile-devel
+libssh-devel
+libtheora-devel
+libtiff-devel
+libtirpc-devel
+libtool
+libtool-ltdl-devel
+libutempter-devel
+libuuid-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
+libudisks2-devel
+libusb-devel
+lirc-devel
+lm_sensors-devel
+mesa-libGL-devel
+meson
+mysql-devel
+neon-devel
+netpbm-progs
+NetworkManager-libnm-devel
+net-snmp-devel
+net-tools
+nspr-devel
+ocaml
+ocaml(compiler)
+OpenEXR-devel
+openldap-devel
+opensc
+opensp-devel
+pam-devel
+pciutils-devel
+pcre-devel
+pcsc-lite-devel
+perl
+perl-devel
+perl-generators
+perl(ExtUtils::MakeMaker)
+perl(inc::Module::Install)
+perl(IPC::Run3)
+perl(PAR::Dist)
+perl(Module::Signature)
+perl(Test::Pod)
+perl(Test::Pod::Coverage)
+perl(XML::Parser)
+pigz
+pkcs11-helper-devel
+polkit-devel
+poppler-devel
+postgresql
+postgresql-devel
+ppp
+pulseaudio-libs-devel
+python3
+python3-devel
+python3-pyxattr
+rdesktop
+rdiff-backup
+readline-devel
+recode
+redhat-rpm-config
+redis
+rpcgen
+rpm-build
+ruby
+ruby-devel
+sane-backends-devel
+SDL-devel
+selinux-policy-devel
+speex-devel
+sqlite-devel
+subversion-devel
+sudo
+swig
+systemd-devel
+taglib-devel
+tcl
+texinfo
+texlive-collection-basic
+torsocks
+transfig
+unixODBC-devel
+usbutils
+valgrind
+wget
+xine-lib-devel
+xmlto
+xorg-x11-server-utils
+xorg-x11-util-macros
+xz-devel
diff --git a/redhat/docker/el9/rpmbuild.repo b/redhat/docker/el9/rpmbuild.repo
new file mode 100644
index 000000000..750290651
--- /dev/null
+++ b/redhat/docker/el9/rpmbuild.repo
@@ -0,0 +1,11 @@
+[rpmbuild.${ARCH}]
+name=rpmbuild.${ARCH}
+baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
+enabled=1
+gpgcheck=0
+
+[rpmbuild.noarch]
+name=rpmbuild.noarch
+baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
+enabled=1
+gpgcheck=0
diff --git a/redhat/docker/el9/rpmmacros b/redhat/docker/el9/rpmmacros
new file mode 100644
index 000000000..a6c71dccc
--- /dev/null
+++ b/redhat/docker/el9/rpmmacros
@@ -0,0 +1,6 @@
+%dist .el9
+%_smp_mflags -j8
+%jobs 8
+%__cmake_in_source_build 1
+%_debugsource_packages %nil
+%_debugsource_template %nil
diff --git a/redhat/docker/f25/Dockerfile.x86_64 b/redhat/docker/f25/Dockerfile.x86_64
index b694f3cf2..f200d9eb6 100644
--- a/redhat/docker/f25/Dockerfile.x86_64
+++ b/redhat/docker/f25/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM fedora:25
 
-ARG TDE_VERSION=14.0.9
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 # Add RPMFUSION repository
diff --git a/redhat/docker/f26/Dockerfile.i686 b/redhat/docker/f26/Dockerfile.i686
index 03991b3cc..bc8bb6f43 100644
--- a/redhat/docker/f26/Dockerfile.i686
+++ b/redhat/docker/f26/Dockerfile.i686
@@ -1,6 +1,6 @@
 FROM fedora32:26
 
-ARG TDE_VERSION=14.0.9
+ARG TDE_VERSION=14.0.13
 ARG ARCH=i686
 
 # Add RPMFUSION repository
diff --git a/redhat/docker/f26/Dockerfile.x86_64 b/redhat/docker/f26/Dockerfile.x86_64
index 502b336da..c8fda601c 100644
--- a/redhat/docker/f26/Dockerfile.x86_64
+++ b/redhat/docker/f26/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM fedora:26
 
-ARG TDE_VERSION=14.0.9
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 # Add RPMFUSION repository
diff --git a/redhat/docker/f27/Dockerfile.i686 b/redhat/docker/f27/Dockerfile.i686
index 96801742b..53d03fe5a 100644
--- a/redhat/docker/f27/Dockerfile.i686
+++ b/redhat/docker/f27/Dockerfile.i686
@@ -1,6 +1,6 @@
 FROM fedora32:27
 
-ARG TDE_VERSION=14.0.9
+ARG TDE_VERSION=14.0.13
 ARG ARCH=i686
 
 # Add RPMFUSION repository
diff --git a/redhat/docker/f27/Dockerfile.x86_64 b/redhat/docker/f27/Dockerfile.x86_64
index 0e15d1517..0e29b1ee4 100644
--- a/redhat/docker/f27/Dockerfile.x86_64
+++ b/redhat/docker/f27/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM fedora:27
 
-ARG TDE_VERSION=14.0.9
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 # Add RPMFUSION repository
diff --git a/redhat/docker/f28/Dockerfile.i686 b/redhat/docker/f28/Dockerfile.i686
index 0c498d2ed..209fa9aab 100644
--- a/redhat/docker/f28/Dockerfile.i686
+++ b/redhat/docker/f28/Dockerfile.i686
@@ -1,6 +1,6 @@
 FROM fedora32:28
 
-ARG TDE_VERSION=14.0.9
+ARG TDE_VERSION=14.0.13
 ARG ARCH=i686
 
 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf"
diff --git a/redhat/docker/f28/Dockerfile.x86_64 b/redhat/docker/f28/Dockerfile.x86_64
index 48e27c76c..ea6030994 100644
--- a/redhat/docker/f28/Dockerfile.x86_64
+++ b/redhat/docker/f28/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM fedora:28
 
-ARG TDE_VERSION=14.0.9
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf"
diff --git a/redhat/docker/f29/Dockerfile.i686 b/redhat/docker/f29/Dockerfile.i686
index cb39761f1..75db326b7 100644
--- a/redhat/docker/f29/Dockerfile.i686
+++ b/redhat/docker/f29/Dockerfile.i686
@@ -1,6 +1,6 @@
 FROM fedora32:29
 
-ARG TDE_VERSION=14.0.9
+ARG TDE_VERSION=14.0.13
 ARG ARCH=i686
 
 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf"
diff --git a/redhat/docker/f29/Dockerfile.x86_64 b/redhat/docker/f29/Dockerfile.x86_64
index 2fb25e83f..018c4da28 100644
--- a/redhat/docker/f29/Dockerfile.x86_64
+++ b/redhat/docker/f29/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM fedora:29
 
-ARG TDE_VERSION=14.0.9
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf"
diff --git a/redhat/docker/f30/Dockerfile.i686 b/redhat/docker/f30/Dockerfile.i686
index cc20af564..0bb6dfa50 100644
--- a/redhat/docker/f30/Dockerfile.i686
+++ b/redhat/docker/f30/Dockerfile.i686
@@ -1,6 +1,6 @@
 FROM fedora32:30
 
-ARG TDE_VERSION=14.0.9
+ARG TDE_VERSION=14.0.13
 ARG ARCH=i686
 
 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf"
diff --git a/redhat/docker/f30/Dockerfile.x86_64 b/redhat/docker/f30/Dockerfile.x86_64
index 278bb8e3f..5b42d6be3 100644
--- a/redhat/docker/f30/Dockerfile.x86_64
+++ b/redhat/docker/f30/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM fedora:30
 
-ARG TDE_VERSION=14.0.9
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf"
diff --git a/redhat/docker/f31/Dockerfile.x86_64 b/redhat/docker/f31/Dockerfile.x86_64
index 7c013b495..9e44bd470 100644
--- a/redhat/docker/f31/Dockerfile.x86_64
+++ b/redhat/docker/f31/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM fedora:31
 
-ARG TDE_VERSION=14.0.9
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf"
diff --git a/redhat/docker/f32/Dockerfile.x86_64 b/redhat/docker/f32/Dockerfile.x86_64
index 13560403b..b07ebffcd 100644
--- a/redhat/docker/f32/Dockerfile.x86_64
+++ b/redhat/docker/f32/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM fedora:32
 
-ARG TDE_VERSION=14.0.9
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf"
@@ -26,3 +26,7 @@ RUN chmod a+r /usr/libexec/utempter/utempter
 # Add non-root user to build packages
 RUN useradd -m -s /bin/bash -u 1000 trinity && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
 COPY rpmmacros /home/trinity/.rpmmacros
+
+RUN rpm -i http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/32/Everything/source/tree/Packages/p/python-exif-2.2.0-5.fc32.src.rpm \
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/python-exif.spec --define "py2 1" \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/noarch/python2-exif-*
diff --git a/redhat/docker/f32/packages b/redhat/docker/f32/packages
index 7b438ade0..4bd975a1e 100644
--- a/redhat/docker/f32/packages
+++ b/redhat/docker/f32/packages
@@ -193,6 +193,7 @@ postgresql-server-devel
 ppp
 pulseaudio-libs-devel
 python
+python2-setuptools
 python3-devel
 qt4-devel
 recode
@@ -229,6 +230,7 @@ xmedcon
 xmedcon-devel
 xmlto
 xorg-x11-font-utils
+xorg-x11-server-utils
 xscreensaver
 xscreensaver-extras
 xz-devel
diff --git a/redhat/docker/f32/rpmmacros b/redhat/docker/f32/rpmmacros
index fe41a3f29..b7585b5f2 100644
--- a/redhat/docker/f32/rpmmacros
+++ b/redhat/docker/f32/rpmmacros
@@ -1,3 +1,5 @@
 %dist .fc32
 %_smp_mflags -j8
 %jobs 8
+%_debugsource_packages %nil
+%_debugsource_template %nil
diff --git a/redhat/docker/f33/Dockerfile.x86_64 b/redhat/docker/f33/Dockerfile.x86_64
index d9e3ba04b..013dcb55a 100644
--- a/redhat/docker/f33/Dockerfile.x86_64
+++ b/redhat/docker/f33/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM fedora:33
 
-ARG TDE_VERSION=14.0.9
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 # Fix DNF database corruption
@@ -20,7 +20,15 @@ RUN sed -i "/etc/yum.repos.d/rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${T
 # Fix utempter detection
 RUN chmod a+r /usr/libexec/utempter/utempter
 
+RUN chmod 777 /tmp
+
 # Add non-root user to build packages
 RUN useradd -m -s /bin/bash -u 1000 trinity \
  && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
+
+USER trinity
 COPY rpmmacros /home/trinity/.rpmmacros
+
+RUN rpm -i http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/33/Everything/source/tree/Packages/p/python-exif-2.2.1-1.fc33.src.rpm \
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/python-exif.spec --define "py2 1" \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/noarch/python2-exif-*
diff --git a/redhat/docker/f33/packages b/redhat/docker/f33/packages
index d0532b160..2839b6997 100644
--- a/redhat/docker/f33/packages
+++ b/redhat/docker/f33/packages
@@ -192,6 +192,7 @@ postgresql-server-devel
 ppp
 pulseaudio-libs-devel
 python
+python2-setuptools
 python3-devel
 qt4-devel
 recode
diff --git a/redhat/docker/f34/Dockerfile.x86_64 b/redhat/docker/f34/Dockerfile.x86_64
new file mode 100644
index 000000000..0436b4b23
--- /dev/null
+++ b/redhat/docker/f34/Dockerfile.x86_64
@@ -0,0 +1,33 @@
+FROM fedora:34
+
+ARG TDE_VERSION=14.0.13
+ARG ARCH=x86_64
+
+# Fix DNF database corruption
+# Add RPMFUSION repository
+# Install Trinity build dependencies
+COPY packages /packages
+RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" \
+ && dnf -y install dnf-plugin-ovl findutils \
+ && dnf -y --enableplugin=ovl install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-34.noarch.rpm \
+ && dnf -y --enableplugin=ovl update \
+ && dnf -y --enableplugin=ovl install $(</packages)
+
+# Add YUM repository for locally built packages
+COPY rpmbuild.repo /etc/yum.repos.d/rpmbuild.repo
+RUN sed -i "/etc/yum.repos.d/rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
+
+# Fix utempter detection
+RUN chmod a+r /usr/libexec/utempter/utempter \
+ && chmod 777 /tmp
+
+# Add non-root user to build packages
+RUN useradd -m -s /bin/bash -u 1000 trinity \
+ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
+
+USER trinity
+COPY rpmmacros /home/trinity/.rpmmacros
+
+RUN rpm -i http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/34/Everything/source/tree/Packages/p/python-exif-2.3.2-2.fc34.src.rpm \
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/python-exif.spec --define "py2 1" \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/noarch/python2-exif-*
diff --git a/redhat/docker/f34/packages b/redhat/docker/f34/packages
new file mode 100644
index 000000000..84825b0a8
--- /dev/null
+++ b/redhat/docker/f34/packages
@@ -0,0 +1,238 @@
+alsa-lib-devel
+aspell
+aspell-devel
+audiofile-devel
+autotrace
+avahi-devel
+bdftopcf
+bind-devel
+binutils-devel
+bison
+boost-devel
+boost-python3-devel
+byacc
+bzip2-devel
+ccache
+cdparanoia
+cdparanoia-devel
+chmlib-devel
+chrpath
+clamav
+clamav-devel
+clucene-core-devel
+cmake
+cpp
+cppunit-devel
+createrepo
+cryptsetup-devel
+cups-devel
+dbus-glib-devel
+djvulibre
+djvulibre-devel
+dnf-plugin-ovl
+docbook2X
+doxygen
+dssi-devel
+esound-devel
+exempi-devel
+exiv2-devel
+fdupes
+fedora-rpm-macros
+ffmpeg-devel
+fftw-devel
+file-devel
+flac-devel
+flex-static
+fontforge
+fontpackages-devel
+fribidi-devel
+gcc
+gcc-c++
+geoip-devel
+gettext-devel
+giflib-devel
+glib-devel
+gmime-devel
+gmp-devel
+gnokii-devel
+gperf
+gpgme-devel
+gphoto2-devel
+GraphicsMagick-devel
+graphviz
+gsl-devel
+gstreamer1-devel
+gstreamer1-plugins-base-devel
+gtk2-devel
+gtk3-devel
+gtk+-devel
+gtk-doc
+guile-devel
+harfbuzz-devel
+hspell-devel
+htdig
+html2ps
+icu
+ImageMagick-devel
+imake
+imlib2-devel
+intltool
+jack-audio-connection-kit-devel
+jasper-devel
+java-1.8.0-openjdk-devel
+java-devel
+java-openjdk
+lame-devel
+lcms-devel
+libacl-devel
+libblkid-devel
+libcap-devel
+libcdio-devel
+libcdio-paranoia-devel
+libconfig-devel
+libcurl-devel
+libdb-cxx-devel
+libdb-devel
+libdvdread-devel
+libfontenc-devel
+libgadu-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
+libmusicbrainz5-devel
+libnjb-devel
+libnsl2-devel
+libofx-devel
+libogg-devel
+libotr-devel
+libpaper-devel
+libpqxx-devel
+libqalculate-devel
+libraw1394-devel
+librsvg2
+librsvg2-tools
+libsamplerate-devel
+libsmbclient-devel
+libsndfile-devel
+libssh-devel
+libssh2-devel
+libtheora-devel
+libtiff-devel
+libtirpc-devel
+libtool
+libtool-ltdl-devel
+libudev-devel
+libudisks2-devel
+libutempter-devel
+libuuid-devel
+libv4l-devel
+libvisual-devel
+libvncserver-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
+libyaz-devel
+libzrtpcpp-devel
+lirc-devel
+lm_sensors-devel
+meanwhile-devel
+mftrace
+mysql-devel
+nas-devel
+neon-devel
+netpbm-progs
+NetworkManager-libnm-devel
+net-snmp-devel
+net-tools
+nspr-devel
+ocaml
+ocaml(compiler)
+ocaml-facile-devel
+OpenEXR-devel
+openldap-devel
+opensc
+openslp-devel
+opensp-devel
+ortp-devel
+pam-devel
+pciutils-devel
+pcre-devel
+pcsc-lite-devel
+pcsc-perl
+perl
+perl-devel
+perl(ExtUtils::MakeMaker)
+perl(PAR::Packer)
+perl(XML::Parser)
+pilot-link-devel
+pkcs11-helper-devel
+pkgconfig(pygtk-2.0)
+polkit-devel
+poppler-devel
+postgresql
+postgresql-devel
+postgresql-server-devel
+ppp
+pulseaudio-libs-devel
+python
+python2-setuptools
+python3-devel
+qt4-devel
+recode
+redhat-rpm-config
+rpcgen
+rpm-build
+ruby
+ruby-devel
+sane-backends-devel
+scons
+SDL-devel
+selinux-policy-devel
+speex-devel
+sqlite-devel
+subversion-devel
+sudo
+swig
+sword-devel
+t1lib-devel
+t1utils
+taglib-devel
+texinfo
+texlive-newunicodechar
+torsocks
+transfig
+udisks-devel
+unixODBC-devel
+usbutils
+valgrind
+wireless-tools-devel
+xbase-devel
+xine-lib-devel
+xmedcon
+xmedcon-devel
+xmlto
+xorg-x11-font-utils
+xorg-x11-server-utils
+xscreensaver
+xscreensaver-extras
+xz-devel
diff --git a/redhat/docker/f34/rpmbuild.repo b/redhat/docker/f34/rpmbuild.repo
new file mode 100644
index 000000000..750290651
--- /dev/null
+++ b/redhat/docker/f34/rpmbuild.repo
@@ -0,0 +1,11 @@
+[rpmbuild.${ARCH}]
+name=rpmbuild.${ARCH}
+baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
+enabled=1
+gpgcheck=0
+
+[rpmbuild.noarch]
+name=rpmbuild.noarch
+baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
+enabled=1
+gpgcheck=0
diff --git a/redhat/docker/f34/rpmmacros b/redhat/docker/f34/rpmmacros
new file mode 100644
index 000000000..2cf7e47b1
--- /dev/null
+++ b/redhat/docker/f34/rpmmacros
@@ -0,0 +1,6 @@
+%dist .fc34
+%_smp_mflags -j8
+%jobs 8
+%__cmake_builddir %nil
+%_debugsource_packages %nil
+%_debugsource_template %nil
diff --git a/redhat/docker/f35/Dockerfile.x86_64 b/redhat/docker/f35/Dockerfile.x86_64
new file mode 100644
index 000000000..172edbd89
--- /dev/null
+++ b/redhat/docker/f35/Dockerfile.x86_64
@@ -0,0 +1,36 @@
+FROM fedora:35
+
+ARG TDE_VERSION=14.0.13
+ARG ARCH=x86_64
+
+# Fix DNF database corruption
+# Add RPMFUSION repository
+# Install Trinity build dependencies
+COPY packages /packages
+RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" \
+ && dnf -y install dnf-plugin-ovl findutils \
+ && dnf -y --enableplugin=ovl install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-35.noarch.rpm \
+ && dnf -y --enableplugin=ovl update \
+ && dnf -y --enableplugin=ovl install --skip-broken $(</packages)
+
+# Add YUM repository for locally built packages
+COPY rpmbuild.repo /etc/yum.repos.d/rpmbuild.repo
+RUN sed -i "/etc/yum.repos.d/rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
+
+# Fix utempter detection
+RUN chmod a+r /usr/libexec/utempter/utempter \
+ && chmod 777 /tmp
+
+# Add non-root user to build packages
+RUN useradd -m -s /bin/bash -u 1000 trinity \
+ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers \
+ && echo "export QA_RPATHS=\$(( 0x0001|0x0002 ))" >>/home/trinity/.bashrc
+
+USER trinity
+COPY rpmmacros /home/trinity/.rpmmacros
+
+RUN sudo rpm -Uvh https://download-ib01.fedoraproject.org/pub/fedora/linux/releases/34/Everything/aarch64/os/Packages/p/python2-setuptools-41.2.0-4.fc34.noarch.rpm
+
+RUN rpm -i http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/34/Everything/source/tree/Packages/p/python-exif-2.3.2-2.fc34.src.rpm \
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/python-exif.spec --define "py2 1" \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/noarch/python2-exif-*
diff --git a/redhat/docker/f35/packages b/redhat/docker/f35/packages
new file mode 100644
index 000000000..f6d605f1a
--- /dev/null
+++ b/redhat/docker/f35/packages
@@ -0,0 +1,238 @@
+alsa-lib-devel
+aspell
+aspell-devel
+audiofile-devel
+autotrace
+avahi-devel
+bdftopcf
+bind-devel
+binutils-devel
+bison
+boost-devel
+boost-python3-devel
+byacc
+bzip2-devel
+ccache
+cdparanoia
+cdparanoia-devel
+chmlib-devel
+chrpath
+clamav
+clamav-devel
+clucene-core-devel
+cmake
+cpp
+cppunit-devel
+createrepo_c
+cryptsetup-devel
+cups-devel
+dbus-glib-devel
+djvulibre
+djvulibre-devel
+dnf-plugin-ovl
+docbook2X
+doxygen
+dssi-devel
+esound-devel
+exempi-devel
+exiv2-devel
+fdupes
+fedora-rpm-macros
+ffmpeg-devel
+fftw-devel
+file-devel
+flac-devel
+flex-static
+fontpackages-devel
+fribidi-devel
+gcc
+gcc-c++
+geoip-devel
+gettext-devel
+giflib-devel
+glib-devel
+gmime-devel
+gmp-devel
+gnokii-devel
+gperf
+gpgme-devel
+gphoto2-devel
+GraphicsMagick-devel
+graphviz
+gsl-devel
+gstreamer1-devel
+gstreamer1-plugins-base-devel
+gtk2-devel
+gtk3-devel
+gtk+-devel
+gtk-doc
+guile-devel
+harfbuzz-devel
+hspell-devel
+htdig
+html2ps
+iceauth
+icu
+ImageMagick-devel
+imake
+imlib2-devel
+intltool
+jack-audio-connection-kit-devel
+jasper-devel
+java-1.8.0-openjdk-devel
+java-devel
+java-openjdk
+lame-devel
+lcms-devel
+libacl-devel
+libblkid-devel
+libcap-devel
+libcdio-devel
+libcdio-paranoia-devel
+libconfig-devel
+libcurl-devel
+libdb-cxx-devel
+libdb-devel
+libdvdread-devel
+libfontenc-devel
+libgadu-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
+libmusicbrainz5-devel
+libnjb-devel
+libnsl2-devel
+libofx-devel
+libogg-devel
+libotr-devel
+libpaper-devel
+libpqxx-devel
+libqalculate-devel
+libraw1394-devel
+librsvg2
+librsvg2-tools
+libsamplerate-devel
+libsmbclient-devel
+libsndfile-devel
+libssh-devel
+libssh2-devel
+libtheora-devel
+libtiff-devel
+libtirpc-devel
+libtool
+libtool-ltdl-devel
+libudev-devel
+libudisks2-devel
+libutempter-devel
+libuuid-devel
+libv4l-devel
+libvisual-devel
+libvncserver-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
+libyaz-devel
+libzrtpcpp-devel
+lirc-devel
+lm_sensors-devel
+meanwhile-devel
+mesa-libGL-devel
+mftrace
+mysql-devel
+nas-devel
+neon-devel
+netpbm-progs
+NetworkManager-libnm-devel
+net-snmp-devel
+net-tools
+nspr-devel
+ocaml
+ocaml(compiler)
+ocaml-facile-devel
+OpenEXR-devel
+openldap-devel
+opensc
+openslp-devel
+opensp-devel
+ortp-devel
+pam-devel
+pciutils-devel
+pcre-devel
+pcsc-lite-devel
+pcsc-perl
+perl
+perl-devel
+perl(ExtUtils::MakeMaker)
+perl(PAR::Packer)
+perl(XML::Parser)
+pilot-link-devel
+pkcs11-helper-devel
+pkgconfig(pygtk-2.0)
+polkit-devel
+poppler-devel
+postgresql
+postgresql-devel
+postgresql-private-devel
+postgresql-server-devel
+ppp
+pulseaudio-libs-devel
+python
+python3-devel
+qt4-devel
+recode
+redhat-rpm-config
+rpcgen
+rpm-build
+ruby
+ruby-devel
+sane-backends-devel
+scons
+SDL-devel
+selinux-policy-devel
+speex-devel
+sqlite-devel
+subversion-devel
+sudo
+swig
+sword-devel
+t1lib-devel
+t1utils
+taglib-devel
+texinfo
+texlive-newunicodechar
+torsocks
+transfig
+udisks-devel
+unixODBC-devel
+usbutils
+valgrind
+wireless-tools-devel
+xbase-devel
+xine-lib-devel
+xmedcon
+xmedcon-devel
+xmlto
+xorg-x11-font-utils
+xscreensaver
+xscreensaver-extras
+xz-devel
diff --git a/redhat/docker/f35/rpmbuild.repo b/redhat/docker/f35/rpmbuild.repo
new file mode 100644
index 000000000..750290651
--- /dev/null
+++ b/redhat/docker/f35/rpmbuild.repo
@@ -0,0 +1,11 @@
+[rpmbuild.${ARCH}]
+name=rpmbuild.${ARCH}
+baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
+enabled=1
+gpgcheck=0
+
+[rpmbuild.noarch]
+name=rpmbuild.noarch
+baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
+enabled=1
+gpgcheck=0
diff --git a/redhat/docker/f35/rpmmacros b/redhat/docker/f35/rpmmacros
new file mode 100644
index 000000000..4ce88c1fd
--- /dev/null
+++ b/redhat/docker/f35/rpmmacros
@@ -0,0 +1,7 @@
+%dist .fc35
+%_smp_mflags -j8
+%jobs 8
+%__cmake_builddir %nil
+%__cmake_in_source_build 1
+%_debugsource_packages %nil
+%_debugsource_template %nil
diff --git a/redhat/docker/f36/Dockerfile.x86_64 b/redhat/docker/f36/Dockerfile.x86_64
new file mode 100644
index 000000000..967534f81
--- /dev/null
+++ b/redhat/docker/f36/Dockerfile.x86_64
@@ -0,0 +1,40 @@
+FROM fedora:36
+
+ARG TDE_VERSION=14.0.13
+ARG ARCH=x86_64
+
+# Fix DNF database corruption
+# Add RPMFUSION repository
+# Install Trinity build dependencies
+COPY packages /packages
+RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" \
+ && dnf -y install dnf-plugin-ovl findutils \
+ && dnf -y --enableplugin=ovl install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-36.noarch.rpm \
+ && dnf -y --enableplugin=ovl update \
+ && dnf -y --enableplugin=ovl install --skip-broken $(</packages)
+
+# Add YUM repository for locally built packages
+COPY rpmbuild.repo /etc/yum.repos.d/rpmbuild.repo
+RUN sed -i "/etc/yum.repos.d/rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
+
+# Fix utempter detection
+RUN chmod a+r /usr/libexec/utempter/utempter \
+ && chmod 777 /tmp
+
+# Add non-root user to build packages
+RUN useradd -m -s /bin/bash -u 1000 trinity \
+ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers \
+ && echo "export QA_RPATHS=\$(( 0x0001|0x0002 ))" >>/home/trinity/.bashrc
+
+USER trinity
+COPY rpmmacros /home/trinity/.rpmmacros
+
+RUN sudo rpm -Uvh https://download-ib01.fedoraproject.org/pub/fedora/linux/releases/34/Everything/aarch64/os/Packages/p/python2-setuptools-41.2.0-4.fc34.noarch.rpm
+
+RUN rpm -i http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/34/Everything/source/tree/Packages/p/python-exif-2.3.2-2.fc34.src.rpm \
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/python-exif.spec --define "py2 1" \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/noarch/python2-exif-*
+
+RUN rpm -i http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/35/Everything/source/tree/Packages/w/wireless-tools-29-28.fc35.src.rpm \
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/wireless-tools.spec \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/wireless-tools{,-devel}-29*
diff --git a/redhat/docker/f36/packages b/redhat/docker/f36/packages
new file mode 100644
index 000000000..71b1f0d27
--- /dev/null
+++ b/redhat/docker/f36/packages
@@ -0,0 +1,238 @@
+alsa-lib-devel
+aspell
+aspell-devel
+audiofile-devel
+autotrace
+avahi-devel
+bdftopcf
+bind-devel
+binutils-devel
+bison
+boost-devel
+boost-python3-devel
+byacc
+bzip2-devel
+ccache
+cdparanoia
+cdparanoia-devel
+chmlib-devel
+chrpath
+clamav
+clamav-devel
+clucene-core-devel
+cmake
+cpp
+cppunit-devel
+crda
+createrepo_c
+cryptsetup-devel
+cups-devel
+dbus-glib-devel
+djvulibre
+djvulibre-devel
+dnf-plugin-ovl
+docbook2X
+doxygen
+dssi-devel
+esound-devel
+exempi-devel
+exiv2-devel
+fdupes
+fedora-rpm-macros
+ffmpeg-devel
+fftw-devel
+file-devel
+flac-devel
+flex-static
+fontpackages-devel
+fribidi-devel
+gcc
+gcc-c++
+geoip-devel
+gettext-devel
+giflib-devel
+glib-devel
+gmime-devel
+gmp-devel
+gnokii-devel
+gperf
+gpgme-devel
+gphoto2-devel
+GraphicsMagick-devel
+graphviz
+gsl-devel
+gstreamer1-devel
+gstreamer1-plugins-base-devel
+gtk2-devel
+gtk3-devel
+gtk+-devel
+gtk-doc
+guile-devel
+harfbuzz-devel
+hspell-devel
+htdig
+html2ps
+iceauth
+icu
+ImageMagick-devel
+imake
+imlib2-devel
+intltool
+jack-audio-connection-kit-devel
+jasper-devel
+java-1.8.0-openjdk-devel
+java-devel
+java-openjdk
+lame-devel
+lcms-devel
+libacl-devel
+libblkid-devel
+libcap-devel
+libcdio-devel
+libcdio-paranoia-devel
+libconfig-devel
+libcurl-devel
+libdb-cxx-devel
+libdb-devel
+libdvdread-devel
+libfontenc-devel
+libgadu-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
+libmusicbrainz5-devel
+libnjb-devel
+libnsl2-devel
+libofx-devel
+libogg-devel
+libotr-devel
+libpaper-devel
+libpqxx-devel
+libqalculate-devel
+libraw1394-devel
+librsvg2
+librsvg2-tools
+libsamplerate-devel
+libsmbclient-devel
+libsndfile-devel
+libssh-devel
+libssh2-devel
+libtheora-devel
+libtiff-devel
+libtirpc-devel
+libtool
+libtool-ltdl-devel
+libudev-devel
+libudisks2-devel
+libutempter-devel
+libuuid-devel
+libv4l-devel
+libvisual-devel
+libvncserver-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
+libyaz-devel
+libzrtpcpp-devel
+lirc-devel
+lm_sensors-devel
+meanwhile-devel
+mesa-libGL-devel
+mftrace
+mysql-devel
+nas-devel
+neon-devel
+netpbm-progs
+NetworkManager-libnm-devel
+net-snmp-devel
+net-tools
+nspr-devel
+ocaml
+ocaml(compiler)
+ocaml-facile-devel
+OpenEXR-devel
+openldap-devel
+opensc
+openslp-devel
+opensp-devel
+ortp-devel
+pam-devel
+pciutils-devel
+pcre-devel
+pcsc-lite-devel
+pcsc-perl
+perl
+perl-devel
+perl(ExtUtils::MakeMaker)
+perl(PAR::Packer)
+perl(XML::Parser)
+pilot-link-devel
+pkcs11-helper-devel
+pkgconfig(pygtk-2.0)
+polkit-devel
+poppler-devel
+postgresql
+postgresql-devel
+postgresql-private-devel
+postgresql-server-devel
+ppp
+pulseaudio-libs-devel
+python
+python3-devel
+qt4-devel
+recode
+redhat-rpm-config
+rpcgen
+rpm-build
+ruby
+ruby-devel
+sane-backends-devel
+scons
+SDL-devel
+selinux-policy-devel
+speex-devel
+sqlite-devel
+subversion-devel
+sudo
+swig
+sword-devel
+t1lib-devel
+t1utils
+taglib-devel
+texinfo
+texlive-newunicodechar
+torsocks
+transfig
+udisks-devel
+unixODBC-devel
+usbutils
+valgrind
+xbase-devel
+xine-lib-devel
+xmedcon
+xmedcon-devel
+xmlto
+xorg-x11-font-utils
+xscreensaver
+xscreensaver-extras
+xz-devel
diff --git a/redhat/docker/f36/rpmbuild.repo b/redhat/docker/f36/rpmbuild.repo
new file mode 100644
index 000000000..750290651
--- /dev/null
+++ b/redhat/docker/f36/rpmbuild.repo
@@ -0,0 +1,11 @@
+[rpmbuild.${ARCH}]
+name=rpmbuild.${ARCH}
+baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
+enabled=1
+gpgcheck=0
+
+[rpmbuild.noarch]
+name=rpmbuild.noarch
+baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
+enabled=1
+gpgcheck=0
diff --git a/redhat/docker/f36/rpmmacros b/redhat/docker/f36/rpmmacros
new file mode 100644
index 000000000..fd63b7997
--- /dev/null
+++ b/redhat/docker/f36/rpmmacros
@@ -0,0 +1,8 @@
+%dist .fc36
+%_smp_mflags -j8
+%jobs 8
+%__brp_remove_la_files %nil
+%__cmake_builddir %nil
+%__cmake_in_source_build 1
+%_debugsource_packages %nil
+%_debugsource_template %nil
diff --git a/redhat/docker/f37/Dockerfile.x86_64 b/redhat/docker/f37/Dockerfile.x86_64
new file mode 100644
index 000000000..0aefc0840
--- /dev/null
+++ b/redhat/docker/f37/Dockerfile.x86_64
@@ -0,0 +1,47 @@
+FROM fedora:37
+
+ARG TDE_VERSION=14.0.13
+ARG ARCH=x86_64
+
+# Fix DNF database corruption
+# Add RPMFUSION repository
+# Install Trinity build dependencies
+COPY packages /packages
+RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" \
+ && rm -fv /etc/yum.repos.d/*{rawhide,testing}* \
+ && sed -i /etc/yum.repos.d/fedora{,-modular,-updates,-updates-modular}.repo  -e "1,12s|enabled=0|enabled=1|" -e "s|\$releasever|37|g" \
+ && dnf -y install dnf-plugin-ovl findutils \
+ && dnf -y --enableplugin=ovl install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-37.noarch.rpm \
+ && dnf -y --enableplugin=ovl update \
+ && dnf -y --enableplugin=ovl install --skip-broken $(</packages)
+
+# Add YUM repository for locally built packages
+COPY rpmbuild.repo /etc/yum.repos.d/rpmbuild.repo
+RUN sed -i "/etc/yum.repos.d/rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
+
+# Fix utempter detection
+RUN chmod a+r /usr/libexec/utempter/utempter \
+ && chmod 777 /tmp
+
+# Add non-root user to build packages
+RUN useradd -m -s /bin/bash -u 1000 trinity \
+ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers \
+ && echo "export QA_RPATHS=\$(( 0x0001|0x0002 ))" >>/home/trinity/.bashrc
+
+USER trinity
+COPY rpmmacros /home/trinity/.rpmmacros
+
+RUN sudo rpm -Uvh https://download-ib01.fedoraproject.org/pub/fedora/linux/releases/34/Everything/aarch64/os/Packages/p/python2-setuptools-41.2.0-4.fc34.noarch.rpm
+
+RUN rpm -i http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/34/Everything/source/tree/Packages/p/python-exif-2.3.2-2.fc34.src.rpm \
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/python-exif.spec --define "py2 1" \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/noarch/python2-exif-*
+
+RUN rpm -i http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/35/Everything/source/tree/Packages/w/wireless-tools-29-28.fc35.src.rpm \
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/wireless-tools.spec \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/wireless-tools{,-devel}-29*
+
+RUN rpm -i http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/l/libnjb-2.2.7-24.fc36.src.rpm \
+ && sed -i ${HOME}/rpmbuild/SPECS/libnjb.spec -e "s|libusb-devel|libusb1-devel|" \
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/libnjb.spec \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libnjb{,-devel}-2*
diff --git a/redhat/docker/f37/packages b/redhat/docker/f37/packages
new file mode 100644
index 000000000..474a39686
--- /dev/null
+++ b/redhat/docker/f37/packages
@@ -0,0 +1,240 @@
+alsa-lib-devel
+aspell
+aspell-devel
+audiofile-devel
+autotrace
+avahi-devel
+bdftopcf
+bind-devel
+binutils-devel
+bison
+boost-devel
+boost-python3-devel
+byacc
+bzip2-devel
+ccache
+cdparanoia
+cdparanoia-devel
+chmlib-devel
+chrpath
+clamav
+clamav-devel
+clucene-core-devel
+cmake
+cpp
+cppunit-devel
+crda
+createrepo_c
+cryptsetup-devel
+cups-devel
+dbus-glib-devel
+djvulibre
+djvulibre-devel
+dnf-plugin-ovl
+docbook2X
+doxygen
+dssi-devel
+esound-devel
+exempi-devel
+exiv2-devel
+fdupes
+fedora-rpm-macros
+ffmpeg-devel
+fftw-devel
+file-devel
+flac-devel
+flex-static
+fontpackages-devel
+fribidi-devel
+gcc
+gcc-c++
+geoip-devel
+gettext-devel
+giflib-devel
+glib-devel
+gmime-devel
+gmp-devel
+gnokii-devel
+gperf
+gpgme-devel
+gphoto2-devel
+GraphicsMagick-devel
+graphviz
+gsl-devel
+gstreamer1-devel
+gstreamer1-plugins-base-devel
+gtk2-devel
+gtk3-devel
+gtk+-devel
+gtk-doc
+guile-devel
+harfbuzz-devel
+hspell-devel
+htdig
+html2ps
+iceauth
+icu
+ImageMagick-devel
+imake
+imlib2-devel
+intltool
+jack-audio-connection-kit-devel
+jasper-devel
+java-1.8.0-openjdk-devel
+java-devel
+java-openjdk
+lame-devel
+lcms-devel
+libacl-devel
+libblkid-devel
+libcap-devel
+libcdio-devel
+libcdio-paranoia-devel
+libconfig-devel
+libcurl-devel
+libdb-cxx-devel
+libdb-devel
+libdvdread-devel
+libfontenc-devel
+libgadu-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
+libmusicbrainz5-devel
+libnjb-devel
+libnsl2-devel
+libofx-devel
+libogg-devel
+libotr-devel
+libpaper-devel
+libpqxx-devel
+libqalculate-devel
+libraw1394-devel
+librsvg2
+librsvg2-tools
+libsamplerate-devel
+libsmbclient-devel
+libsndfile-devel
+libssh-devel
+libssh2-devel
+libtheora-devel
+libtiff-devel
+libtirpc-devel
+libtool
+libtool-ltdl-devel
+libudev-devel
+libudisks2-devel
+libusb-compat-0.1-devel
+libusb1-devel
+libutempter-devel
+libuuid-devel
+libv4l-devel
+libvisual-devel
+libvncserver-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
+libyaz-devel
+libzrtpcpp-devel
+lirc-devel
+lm_sensors-devel
+meanwhile-devel
+mesa-libGL-devel
+mftrace
+mysql-devel
+nas-devel
+neon-devel
+netpbm-progs
+NetworkManager-libnm-devel
+net-snmp-devel
+net-tools
+nspr-devel
+ocaml
+ocaml(compiler)
+ocaml-facile-devel
+OpenEXR-devel
+openldap-devel
+opensc
+openslp-devel
+opensp-devel
+ortp-devel
+pam-devel
+pciutils-devel
+pcre-devel
+pcsc-lite-devel
+pcsc-perl
+perl
+perl-devel
+perl(ExtUtils::MakeMaker)
+perl(PAR::Packer)
+perl(XML::Parser)
+pilot-link-devel
+pkcs11-helper-devel
+pkgconfig(pygtk-2.0)
+polkit-devel
+poppler-devel
+postgresql
+postgresql-devel
+postgresql-private-devel
+postgresql-server-devel
+ppp
+pulseaudio-libs-devel
+python
+python3-devel
+qt4-devel
+recode
+redhat-rpm-config
+rpcgen
+rpm-build
+ruby
+ruby-devel
+sane-backends-devel
+scons
+SDL-devel
+selinux-policy-devel
+speex-devel
+sqlite-devel
+subversion-devel
+sudo
+swig
+sword-devel
+t1lib-devel
+t1utils
+taglib-devel
+texinfo
+texlive-newunicodechar
+torsocks
+transfig
+udisks-devel
+unixODBC-devel
+usbutils
+valgrind
+xbase-devel
+xine-lib-devel
+xmedcon
+xmedcon-devel
+xmlto
+xorg-x11-font-utils
+xscreensaver
+xscreensaver-extras
+xz-devel
diff --git a/redhat/docker/f37/rpmbuild.repo b/redhat/docker/f37/rpmbuild.repo
new file mode 100644
index 000000000..750290651
--- /dev/null
+++ b/redhat/docker/f37/rpmbuild.repo
@@ -0,0 +1,11 @@
+[rpmbuild.${ARCH}]
+name=rpmbuild.${ARCH}
+baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
+enabled=1
+gpgcheck=0
+
+[rpmbuild.noarch]
+name=rpmbuild.noarch
+baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
+enabled=1
+gpgcheck=0
diff --git a/redhat/docker/f37/rpmmacros b/redhat/docker/f37/rpmmacros
new file mode 100644
index 000000000..3865a262b
--- /dev/null
+++ b/redhat/docker/f37/rpmmacros
@@ -0,0 +1,9 @@
+%dist .fc37
+%_smp_mflags -j8
+%jobs 8
+%__brp_remove_la_files %nil
+%__cmake_builddir %nil
+%__cmake_in_source_build 1
+%_debugsource_packages %nil
+%_debugsource_template %nil
+%source_date_epoch_from_changelog 0
diff --git a/redhat/docker/mageia32.sh b/redhat/docker/mageia32.sh
index 29afb4b59..2f2e10e4f 100755
--- a/redhat/docker/mageia32.sh
+++ b/redhat/docker/mageia32.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 NAME="mageia32"
-VERSION="$1" # E.g: '26'
+VERSION="${1:-8}" # E.g: '26'
 IMAGE="${NAME}:${VERSION}"
 INSTALLROOT="/dev/shm/${IMAGE}"
 
diff --git a/redhat/docker/mga5/Dockerfile.x86_64 b/redhat/docker/mga5/Dockerfile.x86_64
index 71143f8d6..a8ef08acf 100644
--- a/redhat/docker/mga5/Dockerfile.x86_64
+++ b/redhat/docker/mga5/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM mageia:5.1
 
-ARG TDE_VERSION=14.0.9
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 # Reset URPMI repositories to default
diff --git a/redhat/docker/mga6/Dockerfile.i686 b/redhat/docker/mga6/Dockerfile.i686
index e4eb37873..344319a5f 100644
--- a/redhat/docker/mga6/Dockerfile.i686
+++ b/redhat/docker/mga6/Dockerfile.i686
@@ -1,6 +1,6 @@
 FROM mageia32:6
 
-ARG TDE_VERSION=14.0.9
+ARG TDE_VERSION=14.0.13
 ARG ARCH=i686
 
 # Reset URPMI repositories to default
diff --git a/redhat/docker/mga6/Dockerfile.x86_64 b/redhat/docker/mga6/Dockerfile.x86_64
index 79e83d9ac..73c33dcea 100644
--- a/redhat/docker/mga6/Dockerfile.x86_64
+++ b/redhat/docker/mga6/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM mageia:6
 
-ARG TDE_VERSION=14.0.9
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 # Reset URPMI repositories to default
diff --git a/redhat/docker/mga6/packages.i686 b/redhat/docker/mga6/packages.i686
index 6ee0415b2..85ed2ec06 100644
--- a/redhat/docker/mga6/packages.i686
+++ b/redhat/docker/mga6/packages.i686
@@ -153,6 +153,7 @@ libpx-devel
 libqalculate-devel
 libraw1394-devel
 librsvg
+libsecret-devel
 libsmbclient-devel
 libsm-devel
 libsndfile-devel
diff --git a/redhat/docker/mga6/packages.x86_64 b/redhat/docker/mga6/packages.x86_64
index 9af2ed003..f499915be 100644
--- a/redhat/docker/mga6/packages.x86_64
+++ b/redhat/docker/mga6/packages.x86_64
@@ -153,6 +153,7 @@ libpx-devel
 libqalculate-devel
 libraw1394-devel
 librsvg
+libsecret-devel
 libsmbclient-devel
 libsm-devel
 libsndfile-devel
diff --git a/redhat/docker/mga7/Dockerfile.i686 b/redhat/docker/mga7/Dockerfile.i686
index 0c51c70a6..0e82ab87c 100644
--- a/redhat/docker/mga7/Dockerfile.i686
+++ b/redhat/docker/mga7/Dockerfile.i686
@@ -1,6 +1,6 @@
 FROM mageia32:7
 
-ARG TDE_VERSION=14.0.9
+ARG TDE_VERSION=14.0.13
 ARG ARCH=i686
 
 # Reset URPMI repositories to default
diff --git a/redhat/docker/mga7/Dockerfile.x86_64 b/redhat/docker/mga7/Dockerfile.x86_64
index 90b30475b..8ad899d78 100644
--- a/redhat/docker/mga7/Dockerfile.x86_64
+++ b/redhat/docker/mga7/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM mageia:7
 
-ARG TDE_VERSION=14.0.9
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 # Reset URPMI repositories to default
diff --git a/redhat/docker/mga7/packages.i686 b/redhat/docker/mga7/packages.i686
index cc695fb73..f94a02efd 100644
--- a/redhat/docker/mga7/packages.i686
+++ b/redhat/docker/mga7/packages.i686
@@ -67,6 +67,7 @@ kde-dev-scripts
 libapr-devel
 libapr-util-devel
 libart_lgpl-devel
+libassuan-devel
 libattr-devel
 libavformat58
 libbinutils-devel
@@ -74,14 +75,10 @@ libblkid-devel
 libcdda-devel
 libcln-devel
 libclucene-devel
-libclucene-devel
-libcommoncpp-devel
 libcommoncpp-devel
 libconfig-devel
 libcryptsetup-devel
 libcurl-devel
-libcurl-devel
-libdvdread-devel
 libdvdread-devel
 libecpg9.6_6
 libexiv2-devel
@@ -89,7 +86,6 @@ libfbclient-devel
 libffmpeg-devel
 libflac++-devel
 libflac-devel
-libflac-devel
 libfontenc-devel
 libgadu-devel
 libgeoip-devel
@@ -108,14 +104,12 @@ libiodbc-devel
 libiw-devel
 libjack-devel
 libjasper-devel
-libjasper-devel
 libjpeg-devel
 libkarma-devel
 liblo-devel
 liblrdf-devel
 liblua-devel
 libmad-devel
-libmad-devel
 libmng-devel
 libmp3lame-devel
 libmp4v2-devel
@@ -127,7 +121,6 @@ libnpth-devel
 libofx-devel
 libotr-devel
 libpaper-devel
-libpaper-devel
 libpkcs11-helper-devel
 libpoppler-devel
 libpulseaudio-devel
@@ -140,7 +133,6 @@ libsmbclient-devel
 libsm-devel
 libsndfile-devel
 libt1lib-devel
-libt1lib-devel
 libtheora-devel
 libtiff-devel
 libtwolame-devel
@@ -162,7 +154,6 @@ libxdg-basedir-devel
 libxext-devel
 libxft-devel
 libxi-devel
-libxi-devel
 libxine1.2-devel
 libxinerama-devel
 libxkbfile-devel
@@ -174,8 +165,6 @@ libxslt-devel
 libxtst-devel
 libxv-devel
 libxxf86dga-devel
-libxxf86dga-devel
-libyaz-devel
 libyaz-devel
 lilo
 lirc-devel
diff --git a/redhat/docker/mga7/packages.x86_64 b/redhat/docker/mga7/packages.x86_64
index 9c8f92ea0..0c84baf4c 100644
--- a/redhat/docker/mga7/packages.x86_64
+++ b/redhat/docker/mga7/packages.x86_64
@@ -66,6 +66,7 @@ karma-sharp
 kde-dev-scripts
 lib64apr-devel
 lib64apr-util-devel
+lib64assuan-devel
 lib64avformat58
 lib64binutils-devel
 lib64boost_python3-devel
diff --git a/redhat/docker/mga8/Dockerfile.i686 b/redhat/docker/mga8/Dockerfile.i686
index e39ba47d2..46d2810d9 100644
--- a/redhat/docker/mga8/Dockerfile.i686
+++ b/redhat/docker/mga8/Dockerfile.i686
@@ -1,6 +1,6 @@
 FROM mageia32:8
 
-ARG TDE_VERSION=14.0.9
+ARG TDE_VERSION=14.0.13
 ARG ARCH=i686
 
 # Reset URPMI repositories to default
diff --git a/redhat/docker/mga8/Dockerfile.x86_64 b/redhat/docker/mga8/Dockerfile.x86_64
index f2385a34f..f9424ee50 100644
--- a/redhat/docker/mga8/Dockerfile.x86_64
+++ b/redhat/docker/mga8/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM mageia:8
 
-ARG TDE_VERSION=14.0.9
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 # Reset URPMI repositories to default
diff --git a/redhat/docker/mga8/packages.i686 b/redhat/docker/mga8/packages.i686
index af6c6feb7..a39a701af 100644
--- a/redhat/docker/mga8/packages.i686
+++ b/redhat/docker/mga8/packages.i686
@@ -55,6 +55,7 @@ gtk2-devel
 gtk+3.0-devel
 gtk-doc
 hspell-devel
+html2ps
 hunspell-en
 iceauth
 ImageMagick-devel
@@ -213,6 +214,7 @@ pinentry-gtk2
 pkgconfig(audiofile)
 pkgconfig(libpng16)
 polkit-agent-none
+polkit-devel
 postgresql13
 postgresql13-devel
 ppp
diff --git a/redhat/docker/mga8/packages.x86_64 b/redhat/docker/mga8/packages.x86_64
index ad8802b2c..998e0c682 100644
--- a/redhat/docker/mga8/packages.x86_64
+++ b/redhat/docker/mga8/packages.x86_64
@@ -55,6 +55,7 @@ gtk2-devel
 gtk+3.0-devel
 gtk-doc
 hspell-devel
+html2ps
 hunspell-en
 iceauth
 ImageMagick-devel
@@ -216,6 +217,7 @@ pinentry-gtk2
 pkgconfig(audiofile)
 pkgconfig(libpng16)
 polkit-agent-none
+polkit-devel
 postgresql13
 postgresql13-devel
 ppp
diff --git a/redhat/docker/mga9/Dockerfile.i686 b/redhat/docker/mga9/Dockerfile.i686
new file mode 100644
index 000000000..46d2810d9
--- /dev/null
+++ b/redhat/docker/mga9/Dockerfile.i686
@@ -0,0 +1,51 @@
+FROM mageia32:8
+
+ARG TDE_VERSION=14.0.13
+ARG ARCH=i686
+
+# Reset URPMI repositories to default
+# Enable more URPMI repositories
+RUN urpmi.removemedia -a \
+ && urpmi.addmedia --distrib http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/i586/ \
+ && sed -i "/etc/urpmi/urpmi.cfg" -e "/Tainted\\\ Release  {/{p;N;d}" -e "/Tainted\\\ Updates  {/{p;N;d}"
+
+# Enable english locales
+RUN urpmi --replacepkgs glibc \
+ && localedef -v -c -i en_US -f UTF-8 en_US.UTF-8 || :
+
+# Update distribution
+# Install Trinity build dependencies
+COPY packages.${ARCH} /packages
+RUN urpmi.update -a \
+ && urpmi --auto-select --auto \
+ && urpmi --auto $(</packages)
+
+# Enable ccache
+RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|"
+
+# Fix utempter detection
+RUN chmod a+r /usr/libexec/utempter/utempter
+
+# Fix poppler support
+RUN sed -i "/usr/include/poppler/poppler-config.h" -e "/define HAVE_SPLASH/ s|^|//|"
+
+# Add non-root user to build packages
+RUN rm -rf /home/trinity \
+ && useradd -m -s /bin/bash -u 1000 trinity \
+ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers"
+
+# Configure user trinity
+USER trinity
+COPY rpmmacros /home/trinity/.rpmmacros
+
+# Add rpmbuild repositories
+RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
+ && genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
+ && sudo urpmi.addmedia rpmbuild.${ARCH} ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
+ && mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \
+ && genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \
+ && sudo urpmi.addmedia rpmbuild.noarch ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
+
+# Build development packages that are missing
+RUN setarch ${ARCH} rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPMS/core/release/perl-PAR-Packer-1.51.0-2.mga8.src.rpm \
+ && sudo rpm -Uvh --force "${HOME}/rpmbuild/RPMS/"*"/perl-PAR-Packer-"*".rpm"
diff --git a/redhat/docker/mga9/Dockerfile.x86_64 b/redhat/docker/mga9/Dockerfile.x86_64
new file mode 100644
index 000000000..9d4ef301e
--- /dev/null
+++ b/redhat/docker/mga9/Dockerfile.x86_64
@@ -0,0 +1,51 @@
+FROM mageia:9
+
+ARG TDE_VERSION=14.0.13
+ARG ARCH=x86_64
+
+# Reset URPMI repositories to default
+# Enable more URPMI repositories
+RUN urpmi.removemedia -a \
+ && urpmi.addmedia --distrib http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/x86_64/ \
+ && sed -i "/etc/urpmi/urpmi.cfg" -e "/Tainted\\\ Release  {/{p;N;d}" -e "/Tainted\\\ Updates  {/{p;N;d}"
+
+# Enable english locales
+RUN urpmi --replacepkgs glibc \
+ && localedef -v -c -i en_US -f UTF-8 en_US.UTF-8 || :
+
+# Update distribution
+# Install Trinity build dependencies
+COPY packages.${ARCH} /packages
+RUN urpmi.update -a \
+ && urpmi --auto-select --auto \
+ && urpmi --auto $(</packages)
+
+# Enable ccache
+RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|"
+
+# Fix utempter detection
+RUN chmod a+r /usr/libexec/utempter/utempter
+
+# Fix poppler support
+RUN sed -i "/usr/include/poppler/poppler-config.h" -e "/define HAVE_SPLASH/ s|^|//|"
+
+# Add non-root user to build packages
+RUN rm -rf /home/trinity \
+ && useradd -m -s /bin/bash -u 1000 trinity \
+ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers"
+
+# Configure user trinity
+USER trinity
+COPY rpmmacros /home/trinity/.rpmmacros
+
+# Add rpmbuild repositories
+RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
+ && genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
+ && sudo urpmi.addmedia rpmbuild.${ARCH} ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
+ && mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \
+ && genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \
+ && sudo urpmi.addmedia rpmbuild.noarch ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
+
+# Build development packages that are missing
+RUN setarch ${ARCH} rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPMS/core/release/perl-PAR-Packer-1.51.0-2.mga8.src.rpm \
+ && sudo rpm -Uvh --force "${HOME}/rpmbuild/RPMS/"*"/perl-PAR-Packer-"*".rpm"
diff --git a/redhat/docker/mga9/packages.i686 b/redhat/docker/mga9/packages.i686
new file mode 100644
index 000000000..a39a701af
--- /dev/null
+++ b/redhat/docker/mga9/packages.i686
@@ -0,0 +1,256 @@
+advancecomp
+alsa-lib-devel
+aspell
+aspell-devel
+aspell-en
+audiofile-devel
+bind-devel
+bison
+boost-devel
+bzip2-devel
+ccache
+cdparanoia
+chmlib-devel
+chrpath
+clamav
+clamav-devel
+cmake
+ctags
+cups-devel
+curl-devel
+db5-devel
+dbus-devel
+dbus-glib
+dbus-glib-devel
+djvulibre
+docbook2x
+docbook-dtd412-xml
+docbook-style-xsl
+docbook-utils
+doxygen
+drakconf
+dssi-devel
+exempi-devel
+expat-devel
+fdupes
+fftw-devel
+firebird-devel
+flex
+fontconfig-devel
+freetype2-devel
+freetype-devel
+fribidi-devel
+gamin-devel
+gettext-devel
+glib2-devel
+glibc-i18ndata
+gmime-devel
+gnokii-devel
+gperf
+gpgme-devel
+gphoto2-devel
+GraphicsMagick-devel
+gsl-devel
+gtk2-devel
+gtk+3.0-devel
+gtk-doc
+hspell-devel
+html2ps
+hunspell-en
+iceauth
+ImageMagick-devel
+imake
+imlib2-devel
+intltool
+java-1.8.0-openjdk
+java-1.8.0-openjdk-devel
+java-devel
+karma-sharp
+kde-dev-scripts
+libapr-devel
+libapr-util-devel
+libart_lgpl-devel
+libattr-devel
+libavformat58
+libbinutils-devel
+libblkid-devel
+libcdda-devel
+libcln-devel
+libclucene-devel
+libclucene-devel
+libcommoncpp-devel
+libcommoncpp-devel
+libconfig-devel
+libcryptsetup-devel
+libcurl-devel
+libcurl-devel
+libdvdread-devel
+libdvdread-devel
+libecpg13_6
+libexiv2-devel
+libext2fs-devel
+libfbclient-devel
+libffmpeg-devel
+libflac++-devel
+libflac-devel
+libflac-devel
+libfontenc-devel
+libgadu-devel
+libgeoip-devel
+libgmime2.6-devel
+libgpod-devel
+libgsf-devel
+libgstreamer1.0-devel
+libgstreamer-plugins-base1.0-devel
+libhd-devel
+libical-devel
+libice-devel
+libidn-devel
+libifp-devel
+libinotifytools-devel
+libiodbc-devel
+libiw-devel
+libjack-devel
+libjasper-devel
+libjasper-devel
+libjpeg-devel
+libkarma-devel
+liblo-devel
+liblrdf-devel
+liblua-devel
+libmad-devel
+libmad-devel
+libmng-devel
+libmp3lame-devel
+libmp4v2-devel
+libmpcdec-devel
+libmtp-devel
+libmusicbrainz-devel
+libnjb-devel
+libnpth-devel
+libofx-devel
+libotr-devel
+libpaper-devel
+libpaper-devel
+libpkcs11-helper-devel
+libpoppler-devel
+libpulseaudio-devel
+libpx-devel
+libqalculate-devel
+libraw1394-devel
+librsvg
+libsane1-devel
+libsmbclient-devel
+libsm-devel
+libsndfile-devel
+libt1lib-devel
+libt1lib-devel
+libtheora-devel
+libtiff-devel
+libtwolame-devel
+libudev-devel
+libungif-devel
+libusb1.0-devel
+libutempter
+libutempter0
+libutempter-devel
+libv4l-devel
+libvisual-devel
+libvorbis-devel
+libwmf-devel
+libwpd-devel
+libx11-devel
+libxaw-devel
+libxcursor-devel
+libxdg-basedir-devel
+libxext-devel
+libxft-devel
+libxi-devel
+libxi-devel
+libxine1.2-devel
+libxinerama-devel
+libxkbfile-devel
+libxmu-devel
+libxrandr-devel
+libxrender-devel
+libxscrnsaver-devel
+libxslt-devel
+libxtst-devel
+libxv-devel
+libxxf86dga-devel
+libxxf86dga-devel
+libyaz-devel
+libyaz-devel
+lilo
+lirc-devel
+lm_sensors-devel
+mesaglu-devel
+mysql-devel
+nas-devel
+neon-devel
+netpbm
+net-snmp-devel
+notification-daemon
+ocaml
+ocaml-facile-devel
+OpenEXR-devel
+openldap-devel
+openldap-servers-devel
+opensc
+openslp-devel
+opensp-devel
+openssh-clients
+optipng
+pam-devel
+pciutils-devel
+perl-devel
+perl-ExtUtils-MakeMaker
+perl(IPC::Run3)
+perl(PAR::Packer)
+perl-pcsc-perl
+perl(XML::Parser)
+pilot-link-devel
+pinentry-gtk2
+pkgconfig(audiofile)
+pkgconfig(libpng16)
+polkit-agent-none
+polkit-devel
+postgresql13
+postgresql13-devel
+ppp
+python-devel
+python-sip
+qt4-devel
+readline-devel
+recode
+rpcgen
+rpm-build
+rpm-devel
+ruby-devel
+scons
+SDL-devel
+speex-devel
+sqlite3-devel
+sqlite-devel
+sshfs-fuse
+subversion-devel
+sudo
+swig
+sword-devel
+taglib-devel
+torsocks
+transfig
+udisks2-devel
+unixODBC-devel
+usbutils
+valgrind
+wv2-devel
+x11-font-util
+xbase-devel
+xmlto
+xscreensaver
+xscreensaver-base
+xscreensaver-extrusion
+xscreensaver-gl
+yaz
+zlib-devel
diff --git a/redhat/docker/mga9/packages.x86_64 b/redhat/docker/mga9/packages.x86_64
new file mode 100644
index 000000000..998e0c682
--- /dev/null
+++ b/redhat/docker/mga9/packages.x86_64
@@ -0,0 +1,259 @@
+advancecomp
+alsa-lib-devel
+aspell
+aspell-devel
+aspell-en
+audiofile-devel
+bind-devel
+bison
+boost-devel
+bzip2-devel
+ccache
+cdparanoia
+chmlib-devel
+chrpath
+clamav
+clamav-devel
+cmake
+ctags
+cups-devel
+curl-devel
+db5-devel
+dbus-devel
+dbus-glib
+dbus-glib-devel
+djvulibre
+docbook2x
+docbook-dtd412-xml
+docbook-style-xsl
+docbook-utils
+doxygen
+drakconf
+dssi-devel
+exempi-devel
+expat-devel
+fdupes
+fftw-devel
+firebird-devel
+flex
+fontconfig-devel
+freetype2-devel
+freetype-devel
+fribidi-devel
+gamin-devel
+gettext-devel
+glib2-devel
+glibc-i18ndata
+gmime-devel
+gnokii-devel
+gperf
+gpgme-devel
+gphoto2-devel
+GraphicsMagick-devel
+gsl-devel
+gtk2-devel
+gtk+3.0-devel
+gtk-doc
+hspell-devel
+html2ps
+hunspell-en
+iceauth
+ImageMagick-devel
+imake
+imlib2-devel
+intltool
+java-1.8.0-openjdk
+java-1.8.0-openjdk-devel
+java-devel
+karma-sharp
+kde-dev-scripts
+lib64apr-devel
+lib64apr-util-devel
+lib64avformat58
+lib64binutils-devel
+lib64boost_python3-devel
+lib64cln-devel
+lib64clucene-devel
+lib64commoncpp-devel
+lib64cryptsetup-devel
+lib64curl-devel
+lib64dvdread-devel
+lib64ecpg13_6
+lib64exiv2-devel
+lib64ext2fs-devel
+lib64fbclient-devel
+lib64ffmpeg-devel
+lib64flac++-devel
+lib64flac-devel
+lib64fontenc-devel
+lib64geoip-devel
+lib64gmime2.6-devel
+lib64gstreamer1.0-devel
+lib64gstreamer-plugins-base1.0-devel
+lib64inotifytools-devel
+lib64jasper-devel
+lib64jpeg-devel
+lib64lua-devel
+lib64mad-devel
+lib64mp3lame-devel
+lib64npth-devel
+lib64paper-devel
+lib64pkcs11-helper-devel
+lib64poppler-devel
+lib64pulseaudio-devel
+lib64sane1-devel
+lib64t1lib-devel
+lib64tiff-devel
+lib64twolame-devel
+lib64udev-devel
+lib64usb1.0-devel
+lib64utempter0
+lib64utempter-devel
+lib64v4l-devel
+lib64xaw-devel
+lib64xdg-basedir-devel
+lib64xi-devel
+lib64xine1.2-devel
+lib64xscrnsaver-devel
+lib64xtst-devel
+lib64xxf86dga-devel
+lib64yaz-devel
+libart_lgpl-devel
+libattr-devel
+libblkid-devel
+libcdda-devel
+libclucene-devel
+libcommoncpp-devel
+libconfig-devel
+libcurl-devel
+libdvdread-devel
+libffmpeg-devel
+libflac++-devel
+libflac-devel
+libgadu-devel
+libgpod-devel
+libgsf-devel
+libhd-devel
+libical-devel
+libice-devel
+libidn-devel
+libifp-devel
+libiodbc-devel
+libiw-devel
+libjack-devel
+libjasper-devel
+libkarma-devel
+liblo-devel
+liblrdf-devel
+libmad-devel
+libmng-devel
+libmp4v2-devel
+libmpcdec-devel
+libmtp-devel
+libmusicbrainz-devel
+libnjb-devel
+libofx-devel
+libotr-devel
+libpaper-devel
+libpx-devel
+libqalculate-devel
+libraw1394-devel
+librsvg
+libsmbclient-devel
+libsm-devel
+libsndfile-devel
+libt1lib-devel
+libtheora-devel
+libungif-devel
+libutempter
+libvisual-devel
+libvorbis-devel
+libwmf-devel
+libwpd-devel
+libx11-devel
+libxcursor-devel
+libxext-devel
+libxft-devel
+libxi-devel
+libxinerama-devel
+libxkbfile-devel
+libxmu-devel
+libxrandr-devel
+libxrender-devel
+libxslt-devel
+libxv-devel
+libxxf86dga-devel
+libyaz-devel
+lilo
+lirc-devel
+lm_sensors-devel
+mesaglu-devel
+mysql-devel
+nas-devel
+neon-devel
+netpbm
+net-snmp-devel
+notification-daemon
+ocaml
+ocaml-facile-devel
+OpenEXR-devel
+openldap-devel
+openldap-servers-devel
+opensc
+openslp-devel
+opensp-devel
+openssh-clients
+optipng
+pam-devel
+pciutils-devel
+perl-devel
+perl-ExtUtils-MakeMaker
+perl(IPC::Run3)
+perl(PAR::Packer)
+perl-pcsc-perl
+perl(XML::Parser)
+pilot-link-devel
+pinentry-gtk2
+pkgconfig(audiofile)
+pkgconfig(libpng16)
+polkit-agent-none
+polkit-devel
+postgresql13
+postgresql13-devel
+ppp
+python-devel
+python-sip
+qt4-devel
+readline-devel
+recode
+rpcgen
+rpm-build
+rpm-devel
+ruby-devel
+scons
+SDL-devel
+speex-devel
+sqlite3-devel
+sqlite-devel
+sshfs-fuse
+subversion-devel
+sudo
+swig
+sword-devel
+taglib-devel
+torsocks
+transfig
+udisks2-devel
+unixODBC-devel
+usbutils
+valgrind
+wv2-devel
+x11-font-util
+xbase-devel
+xmlto
+xscreensaver
+xscreensaver-base
+xscreensaver-extrusion
+xscreensaver-gl
+yaz
+zlib-devel
diff --git a/redhat/docker/mga9/rpmmacros b/redhat/docker/mga9/rpmmacros
new file mode 100644
index 000000000..2bc3bb37f
--- /dev/null
+++ b/redhat/docker/mga9/rpmmacros
@@ -0,0 +1,6 @@
+%_smp_mflags -j8
+%jobs 8
+%_program_prefix ""
+%_debugsource_packages %nil
+%_debugsource_template %nil
+%_vpath_builddir .
diff --git a/redhat/docker/opensuse32.sh b/redhat/docker/opensuse32.sh
index f2d686df5..1a78e6340 100755
--- a/redhat/docker/opensuse32.sh
+++ b/redhat/docker/opensuse32.sh
@@ -32,14 +32,20 @@ sudo zypper --root "${INSTALLROOT}" \
 sudo setarch i686 zypper --root "${INSTALLROOT}"  \
   install --download-only -y \
   bash \
+  docbook-utils \
   filesystem \
+  gawk \
   glibc \
   glibc-extra \
+  grep \
+  gzip \
   libpcre1 \
   libselinux1 \
   openSUSE-release \
   system-user-root \
   util-linux vim \
+  xz \
+  zlib \
   zypper
 sudo rpm -Uvh --root "${INSTALLROOT}" "${INSTALLROOT}/var/cache/zypp/packages/oss/"*"/"*".rpm"
 
diff --git a/redhat/docker/oss131/Dockerfile.x86_64 b/redhat/docker/oss131/Dockerfile.x86_64
index 5fff729ba..5c6329d04 100644
--- a/redhat/docker/oss131/Dockerfile.x86_64
+++ b/redhat/docker/oss131/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM opensuse:13.1
 
-ARG TDE_VERSION=14.0.9
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 # Add PACKMAN repository
diff --git a/redhat/docker/oss132/Dockerfile.x86_64 b/redhat/docker/oss132/Dockerfile.x86_64
index c29b62499..4d9cd433b 100644
--- a/redhat/docker/oss132/Dockerfile.x86_64
+++ b/redhat/docker/oss132/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM opensuse:13.2
 
-ARG TDE_VERSION=14.0.9
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 # Add PACKMAN repository
diff --git a/redhat/docker/oss150/Dockerfile.x86_64 b/redhat/docker/oss150/Dockerfile.x86_64
index 8a8f97004..c0c48fa74 100644
--- a/redhat/docker/oss150/Dockerfile.x86_64
+++ b/redhat/docker/oss150/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM opensuse/leap:15.0
 
-ARG TDE_VERSION=14.0.9
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 # Add PACKMAN repository
diff --git a/redhat/docker/oss151/Dockerfile.x86_64 b/redhat/docker/oss151/Dockerfile.x86_64
index 392963792..ad1e11ac5 100644
--- a/redhat/docker/oss151/Dockerfile.x86_64
+++ b/redhat/docker/oss151/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM opensuse/leap:15.1
 
-ARG TDE_VERSION=14.0.9
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 # Add PACKMAN repository
diff --git a/redhat/docker/oss151/packages b/redhat/docker/oss151/packages
index 26af91b78..0d75fd57e 100644
--- a/redhat/docker/oss151/packages
+++ b/redhat/docker/oss151/packages
@@ -8,12 +8,15 @@ bind-devel
 binutils-devel
 bison
 boost-devel
+brp-check-suse
+brp-extract-appdata
 ccache
 cdparanoia
 cdparanoia-devel
 chmlib-devel
 chrpath
 clamav
+clamav-devel
 cln-devel
 clucene-core-devel
 cmake
diff --git a/redhat/docker/oss152/Dockerfile.x86_64 b/redhat/docker/oss152/Dockerfile.x86_64
index 9fe6d9555..6efb20b54 100644
--- a/redhat/docker/oss152/Dockerfile.x86_64
+++ b/redhat/docker/oss152/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM opensuse/leap:15.2
 
-ARG TDE_VERSION=14.0.9
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 # Add PACKMAN repository
@@ -16,6 +16,7 @@ RUN echo PROXY_ENABLED="YES" >>/etc/sysconfig/proxy \
 # Add non-root user to build packages
 RUN useradd -m -s /bin/bash -u 1000 trinity \
  && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
+
 COPY rpmmacros /home/trinity/.rpmmacros
 
 # Add YUM repository for locally built packages
diff --git a/redhat/docker/oss152/packages b/redhat/docker/oss152/packages
index 7abef8938..0fd341899 100644
--- a/redhat/docker/oss152/packages
+++ b/redhat/docker/oss152/packages
@@ -16,6 +16,7 @@ cdparanoia-devel
 chmlib-devel
 chrpath
 clamav
+clamav-devel
 cln-devel
 clucene-core-devel
 cmake
diff --git a/redhat/docker/oss153/Dockerfile.x86_64 b/redhat/docker/oss153/Dockerfile.x86_64
new file mode 100644
index 000000000..842b020ff
--- /dev/null
+++ b/redhat/docker/oss153/Dockerfile.x86_64
@@ -0,0 +1,30 @@
+FROM opensuse/leap:15.3
+
+ARG TDE_VERSION=14.0.13
+ARG ARCH=x86_64
+
+# Add PACKMAN repository
+# Install Trinity build dependencies
+COPY packages /packages
+RUN set -x \
+ && echo PROXY_ENABLED="YES" >>/etc/sysconfig/proxy \
+ && echo HTTP_PROXY="http://proxy:3128/" >>/etc/sysconfig/proxy \
+ && zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Leap_15.3/ packman \
+ && zypper refresh \
+ && zypper -n install libudisks2-0-devel-2.8.1-1.39.x86_64 \
+ && zypper -n install postgresql10{,-devel,-server}-10.17-8.35.1.x86_64 \
+ && zypper -n update \
+ && zypper -n install -l $(</packages)
+
+# Add non-root user to build packages
+RUN useradd -m -s /bin/bash -u 1000 trinity \
+ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
+
+USER trinity
+COPY rpmmacros /home/trinity/.rpmmacros
+
+# Add YUM repository for locally built packages
+RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
+ && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH} \
+ && mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \
+ && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch
diff --git a/redhat/docker/oss153/packages b/redhat/docker/oss153/packages
new file mode 100644
index 000000000..cf45a5a34
--- /dev/null
+++ b/redhat/docker/oss153/packages
@@ -0,0 +1,218 @@
+alsa-devel
+aspell
+aspell-devel
+audiofile-devel
+automake
+bdftopcf
+bind-devel
+binutils-devel
+bison
+brp-check-suse
+brp-extract-appdata
+ccache
+cdparanoia
+cdparanoia-devel
+chmlib-devel
+chrpath
+clamav
+clamav-devel
+cln-devel
+clucene-core-devel
+cmake
+createrepo
+cups-devel
+cyrus-sasl-devel
+dbus-1-devel
+dbus-1-glib-devel
+djvulibre
+docbook-utils
+docbook-xsl-stylesheets
+docbook2x
+doxygen GraphicsMagick
+dssi-devel
+fdupes
+ffmpeg-devel
+fftw3-devel
+file-devel
+flac-devel
+flex
+freetype-devel
+fribidi-devel
+gamin-devel
+gcc-c++
+giflib-devel
+git
+glu-devel
+gmime-devel
+gmime2_6-devel
+gmp-devel
+gperf xmlto
+GraphicsMagick-devel
+gsl-devel
+gstreamer-devel
+gstreamer-plugins-base-devel 
+gstreamer-devel
+gtk2-devel
+gtk3-devel
+gtk-doc
+htdig
+html2ps
+hunspell-devel
+iceauth
+ImageMagick-devel
+imlib2-devel
+intltool
+java-1_8_0-openjdk-devel
+less
+libacl-devel
+libao-devel
+libart_lgpl-devel
+libavahi-devel
+libavcodec-devel
+libblkid-devel
+libboost_python-py3-1_66_0-devel
+libboost_system1_66_0-devel
+libbz2-devel
+libcap-devel
+libcdio-devel
+libcdio-paranoia-devel
+libconfig-devel
+libcryptsetup-devel
+libcurl-devel
+libdb-4_8-devel
+libdvdread-devel
+libexempi-devel
+libexiv2-devel
+libgadu-devel
+libGeoIP-devel
+libgpgme-devel
+libgphoto2-devel
+libgpod-devel
+libgssglue-devel
+libical-devel
+libICE-devel
+libidn-devel
+libiw-devel
+libjack-devel
+libjasper-devel
+liblcms2-devel
+liblo-devel
+liblrdf-devel
+libmad-devel
+libmng-devel
+libmp3lame-devel
+libmpcdec-devel
+libmtp-devel
+libmusicbrainz-devel 
+libmysqld-devel
+libneon-devel
+libnjb-devel
+libnsl-devel
+libofx-devel
+libotr-devel
+libpaper-devel
+libpisock-devel
+libpng16-devel
+libpoppler-devel
+libpqxx-devel
+libpulse-devel
+libqalculate-devel
+libraw1394-devel
+librsvg-devel
+libsamplerate-devel
+libSDL-devel
+libSM-devel
+libsmbclient-devel
+libsndfile-devel
+libtag-devel
+libtheora-devel
+libtiff-devel
+libtirpc-devel
+libtool
+libtwolame-devel
+libudev-devel
+libuuid-devel
+libv4l-devel
+libvisual-devel
+libvorbis-devel
+libwmf-devel
+libwpd-devel
+libxine-devel
+libXmu-devel
+libxslt-devel
+libXt-devel
+libyaz-devel
+libzrtpcpp-devel
+lirc-devel
+make
+makeinfo
+meanwhile-devel
+Mesa-devel
+Mesa-libGL-devel
+mozilla-nspr-devel
+mysql-devel
+net-tools
+net-tools-deprecated
+NetworkManager-devel
+ocaml
+openexr-devel
+opensc
+openslp-devel
+opensp-devel
+pam-devel
+patch
+pciutils-devel
+pcre-devel
+pcsc-lite-devel
+perl-PAR-Packer
+perl-pcsc
+pkcs11-helper-devel
+pkgconfig(pygtk-2.0)
+polkit-devel
+python-devel
+python3-devel
+python3-sip-devel
+recode
+rpcgen
+rpm-build
+rpmlint
+rsvg-convert
+ruby
+ruby-devel
+sane-backends-devel
+scons
+speex-devel
+sqlite3-devel
+subversion-devel
+sudo
+swig
+sword-devel
+torsocks
+transfig
+unixODBC-devel
+update-desktop-files
+usbutils
+utempter-devel
+valgrind
+vim
+wireless-tools
+wv2-devel
+xbase-devel
+xcb-proto-devel
+xorg-x11
+xscreensaver
+xscreensaver-data
+xscreensaver-data-extra
+xz-devel
+
+font-util
+imake
+libXScrnSaver-devel
+libXdmcp-devel
+libfontenc-devel
+libssh-devel
+libxkbfile-devel
+libXxf86vm-devel
+libXxf86dga-devel
+libXaw-devel
+libXv-devel
diff --git a/redhat/docker/oss153/rpmmacros b/redhat/docker/oss153/rpmmacros
new file mode 100644
index 000000000..bdf6be354
--- /dev/null
+++ b/redhat/docker/oss153/rpmmacros
@@ -0,0 +1,4 @@
+%dist .oss153
+%_smp_mflags -j8
+%jobs 8
+%sle_version 150300
diff --git a/redhat/docker/oss154/Dockerfile.x86_64 b/redhat/docker/oss154/Dockerfile.x86_64
new file mode 100644
index 000000000..bf03a3966
--- /dev/null
+++ b/redhat/docker/oss154/Dockerfile.x86_64
@@ -0,0 +1,32 @@
+FROM opensuse/leap:15.4
+
+ARG TDE_VERSION=14.0.13
+ARG ARCH=x86_64
+
+# Add PACKMAN repository
+# Install Trinity build dependencies
+COPY packages /packages
+RUN set -x \
+ && echo PROXY_ENABLED="YES" >>/etc/sysconfig/proxy \
+ && echo HTTP_PROXY="http://proxy:3128/" >>/etc/sysconfig/proxy \
+ && rm -fv /etc/zypp/repos.d/repo-sle-* \
+ && zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Leap_15.4/ packman \
+ && zypper refresh \
+ && zypper -n update \
+ && zypper -n install --oldpackage libldap-2_4-2-2.4.46-150200.14.5.1.x86_64 libldap-2_4-2-2.4.46-150200.14.5.1.x86_64 libldap-data-2.4.46-150200.14.5.1.noarch \
+ && zypper -n install -l $(</packages)
+
+RUN ln -sfv python3 /usr/bin/python
+
+# Add non-root user to build packages
+RUN useradd -m -s /bin/bash -u 1000 trinity \
+ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
+
+USER trinity
+COPY rpmmacros /home/trinity/.rpmmacros
+
+# Add YUM repository for locally built packages
+RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
+ && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH} \
+ && mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \
+ && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch
diff --git a/redhat/docker/oss154/packages b/redhat/docker/oss154/packages
new file mode 100644
index 000000000..cf75e1def
--- /dev/null
+++ b/redhat/docker/oss154/packages
@@ -0,0 +1,218 @@
+alsa-devel
+aspell
+aspell-devel
+audiofile-devel
+automake
+bdftopcf
+binutils-devel
+bison
+brp-check-suse
+brp-extract-appdata
+ccache
+cdparanoia
+cdparanoia-devel
+chmlib-devel
+chrpath
+clamav
+clamav-devel
+cln-devel
+clucene-core-devel
+cmake
+createrepo_c
+cups-devel
+cyrus-sasl-devel
+dbus-1-devel
+dbus-1-glib-devel
+djvulibre
+docbook-utils
+docbook-xsl-stylesheets
+docbook2x
+doxygen GraphicsMagick
+dssi-devel
+fdupes
+ffmpeg-devel
+fftw3-devel
+file-devel
+flac-devel
+flex
+font-util
+freetype-devel
+fribidi-devel
+gamin-devel
+gcc-c++
+giflib-devel
+git
+glu-devel
+gmime-devel
+gmime2_6-devel
+gmp-devel
+gperf xmlto
+GraphicsMagick-devel
+gsl-devel
+gstreamer-devel
+gstreamer-plugins-base-devel 
+gstreamer-devel
+gtk2-devel
+gtk3-devel
+gtk-doc
+htdig
+html2ps
+hunspell-devel
+iceauth
+ImageMagick-devel
+imake
+imlib2-devel
+intltool
+java-1_8_0-openjdk-devel
+less
+libacl-devel
+libao-devel
+libart_lgpl-devel
+libavahi-devel
+libavcodec-devel
+libblkid-devel
+libboost_python-py3-1_66_0-devel
+libboost_system1_66_0-devel
+libbz2-devel
+libcap-devel
+libcdio-devel
+libcdio-paranoia-devel
+libconfig-devel
+libcryptsetup-devel
+libcurl-devel
+libdb-4_8-devel
+libdvdread-devel
+libexempi-devel
+libexiv2-devel
+libfontenc-devel
+libgadu-devel
+libGeoIP-devel
+libgpgme-devel
+libgphoto2-devel
+libgpod-devel
+libgssglue-devel
+libical-devel
+libICE-devel
+libidn-devel
+libiw-devel
+libjack-devel
+libjasper-devel
+libjpeg8-devel
+liblcms2-devel
+liblo-devel
+liblrdf-devel
+libmad-devel
+libmng-devel
+libmp3lame-devel
+libmpcdec-devel
+libmtp-devel
+libmusicbrainz-devel 
+libmysqld-devel
+libneon-devel
+libnjb-devel
+libnsl-devel
+libofx-devel
+libotr-devel
+libpaper-devel
+libpng16-devel
+libpoppler-devel
+libpqxx-devel
+libpulse-devel
+libqalculate-devel
+libraw1394-devel
+librsvg-devel
+libsamplerate-devel
+libSDL-devel
+libSM-devel
+libsmbclient-devel
+libsndfile-devel
+libssh-devel
+libtag-devel
+libtheora-devel
+libtiff-devel
+libtirpc-devel
+libtool
+libtwolame-devel
+libudev1
+libudisks2-0-devel
+libuuid-devel
+libv4l-devel
+libvisual-devel
+libvorbis-devel
+libwmf-devel
+libwpd-devel
+libXaw-devel
+libXdmcp-devel
+libxine-devel
+libxkbfile-devel
+libXpm-devel
+libXmu-devel
+libXScrnSaver-devel
+libxslt-devel
+libXt-devel
+libXv-devel
+libXxf86dga-devel
+libXxf86vm-devel
+libyaz-devel
+libzrtpcpp-devel
+lirc-devel
+make
+makeinfo
+meanwhile-devel
+Mesa-devel
+Mesa-libGL-devel
+mozilla-nspr-devel
+mysql-devel
+net-tools
+net-tools-deprecated
+NetworkManager-devel
+ocaml
+openexr-devel
+opensc
+openslp-devel
+opensp-devel
+pam-devel
+patch
+pciutils-devel
+pcre-devel
+pcsc-lite-devel
+perl-PAR-Packer
+perl-pcsc
+pkcs11-helper-devel
+polkit-devel
+postgresql10
+postgresql10-devel
+python3-devel
+python3-sip-devel
+recode
+rpcgen
+rpm-build
+rpmlint
+rsvg-convert
+ruby
+ruby-devel
+sane-backends-devel
+scons
+speex-devel
+sqlite3-devel
+subversion-devel
+sudo
+swig
+sword-devel
+torsocks
+transfig
+unixODBC-devel
+update-desktop-files
+usbutils
+utempter-devel
+valgrind
+vim
+wireless-tools
+wv2-devel
+xbase-devel
+xcb-proto-devel
+xorg-x11
+xscreensaver
+xscreensaver-data
+xscreensaver-data-extra
+xz-devel
diff --git a/redhat/docker/oss154/rpmmacros b/redhat/docker/oss154/rpmmacros
new file mode 100644
index 000000000..9917a9332
--- /dev/null
+++ b/redhat/docker/oss154/rpmmacros
@@ -0,0 +1,5 @@
+%dist .oss154
+%_smp_mflags -j8
+%jobs 8
+%sle_version 150400
+%_build_insert_debug_package %nil
diff --git a/redhat/docker/oss421/Dockerfile.x86_64 b/redhat/docker/oss421/Dockerfile.x86_64
index 04c9cb037..701b47d89 100644
--- a/redhat/docker/oss421/Dockerfile.x86_64
+++ b/redhat/docker/oss421/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM opensuse:42.1
 
-ARG TDE_VERSION=14.0.9
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 # Add PACKMAN repository
diff --git a/redhat/docker/oss422/Dockerfile.x86_64 b/redhat/docker/oss422/Dockerfile.x86_64
index e15df37ae..ad34292c5 100644
--- a/redhat/docker/oss422/Dockerfile.x86_64
+++ b/redhat/docker/oss422/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM opensuse:42.2
 
-ARG TDE_VERSION=14.0.9
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 # Add PACKMAN repository
diff --git a/redhat/docker/oss423/Dockerfile.x86_64 b/redhat/docker/oss423/Dockerfile.x86_64
index edaef5572..5f3bc940a 100644
--- a/redhat/docker/oss423/Dockerfile.x86_64
+++ b/redhat/docker/oss423/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM opensuse:42.3
 
-ARG TDE_VERSION=14.0.9
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 # Add PACKMAN repository
diff --git a/redhat/docker/osstw/Dockerfile.i686 b/redhat/docker/osstw/Dockerfile.i686
index 4864ac6fe..ffaad703d 100644
--- a/redhat/docker/osstw/Dockerfile.i686
+++ b/redhat/docker/osstw/Dockerfile.i686
@@ -1,27 +1,39 @@
 FROM opensuse32/tumbleweed:latest
 
-ARG TDE_VERSION=14.0.9
+ARG TDE_VERSION=14.0.13
 ARG ARCH=i686
 
 # Add PACKMAN repository
 COPY packages /packages
 RUN zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Tumbleweed/ packman \
  && zypper ar -f -G -n gnome http://ftp.lysator.liu.se/pub/opensuse/repositories/GNOME:/Next/openSUSE_Factory gnome \
- && setarch ${ARCH} zypper refresh \
  && setarch ${ARCH} zypper -n refresh \
  && setarch ${ARCH} zypper -n dup \
  && setarch ${ARCH} zypper -n update \
- && setarch ${ARCH} zypper -n install $(</packages)
+ && setarch ${ARCH} zypper -n install --allow-vendor-change $(</packages)
 
 # Add non-root user to build packages
 RUN useradd -m -s /bin/bash -u 1000 trinity \
  && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
 
+# Fix postgresql
+RUN ln -sfv /usr/lib/postgresql10/bin/pg_config /usr/bin/pg_config
+
 USER trinity
-ADD rpmmacros /home/trinity/.rpmmacros
+COPY rpmmacros /home/trinity/.rpmmacros
 
 # Add YUM repository for locally built packages
 RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
  && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH} \
  && mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \
  && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch
+
+# Add GeoIP
+RUN setarch ${ARCH} rpmbuild --rebuild https://ftp.lysator.liu.se/pub/opensuse/source/distribution/leap/15.3/repo/oss/src/GeoIP-1.6.12-6.3.1.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/*GeoIP*.rpm
+
+# Add lilypond (i686 only)
+RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/lilypond-2.23.3-3.9.src.rpm \
+ && sed -i "${HOME}/rpmbuild/SPECS/lilypond.spec" -e "/^ExcludeArch/d" \
+ && setarch ${ARCH} rpmbuild -ba "${HOME}/rpmbuild/SPECS/lilypond.spec" \
+ && sudo rpm -Uvh "${HOME}/rpmbuild/RPMS/"*"/lilypond"{,-fonts-common,-texgy-fonts,-emmentaler-fonts}"-2"*".rpm"
diff --git a/redhat/docker/osstw/Dockerfile.x86_64 b/redhat/docker/osstw/Dockerfile.x86_64
index b82b9de29..21fc9a863 100644
--- a/redhat/docker/osstw/Dockerfile.x86_64
+++ b/redhat/docker/osstw/Dockerfile.x86_64
@@ -1,12 +1,13 @@
 FROM opensuse/tumbleweed:latest
 
-ARG TDE_VERSION=14.0.9
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 # Add PACKMAN repository
-RUN zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Tumbleweed/ packman
-ADD packages /packages
-RUN zypper refresh \
+COPY packages /packages
+RUN zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Tumbleweed/ packman \
+ && zypper -n refresh \
+ && zypper -n install busybox perl shadow \
  && zypper -n dup \
  && zypper -n update \
  && zypper -n install $(</packages)
@@ -16,10 +17,14 @@ RUN useradd -m -s /bin/bash -u 1000 trinity \
  && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
 
 USER trinity
-ADD rpmmacros /home/trinity/.rpmmacros
+COPY rpmmacros /home/trinity/.rpmmacros
 
 # Add YUM repository for locally built packages
 RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
  && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH} \
  && mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \
  && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch
+
+# Add GeoIP
+RUN rpmbuild --rebuild https://ftp.lysator.liu.se/pub/opensuse/source/distribution/leap/15.3/repo/oss/src/GeoIP-1.6.12-6.3.1.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/*GeoIP*.rpm
diff --git a/redhat/docker/osstw/packages b/redhat/docker/osstw/packages
index 2f103ee95..6a0428a66 100644
--- a/redhat/docker/osstw/packages
+++ b/redhat/docker/osstw/packages
@@ -4,19 +4,18 @@ aspell-devel
 audiofile-devel
 automake
 bdftopcf
-bind-devel
 binutils-devel
 bison
 bluez-devel
 boost-devel
 brp-check-suse
-brp-extract-appdata
 ccache
 cdparanoia
 cdparanoia-devel
 chmlib-devel
 chrpath
 clamav
+clamav-devel
 cln-devel
 clucene-core-devel
 cmake
@@ -24,8 +23,10 @@ createrepo_c
 cups-devel
 curl
 cyrus-sasl-devel
+dblatex
 dbus-1-devel
 dbus-1-glib-devel
+dejavu-fonts
 djvulibre
 docbook-utils
 docbook-xsl-stylesheets
@@ -45,6 +46,7 @@ freetype-devel
 fribidi-devel
 gamin-devel
 gcc-c++
+ghostscript-fonts-other mftrace
 giflib-devel
 glu-devel
 gmime-devel
@@ -93,6 +95,7 @@ libical-devel
 libidn-devel
 libiw-devel
 libjack-devel
+libjasper7
 libjasper-devel
 liblcms2-devel
 liblo-devel
@@ -111,7 +114,6 @@ libofx-devel
 libopenssl-devel
 libotr-devel
 libpaper-devel
-libpisock-devel
 libpng16-devel
 libpoppler-devel
 libpqxx-devel
@@ -124,14 +126,15 @@ libSDL-devel
 libsensors4-devel
 libsmbclient-devel
 libsndfile-devel
+libssh-devel
 libtag-devel
 libtheora-devel
 libtiff-devel
 libtirpc-devel
 libtool
 libtwolame-devel
-libudev-devel
 libudisks2-0-devel
+libuuid-devel
 libv4l-devel
 libvisual-devel
 libvorbis-devel
@@ -176,8 +179,12 @@ pcsc-lite-devel
 perl-PAR-Packer
 perl-pcsc
 pkcs11-helper-devel
+pkgconfig(guile-1.8)
+polkit-devel
 postgresql10
 postgresql10-devel
+potrace-devel
+ppp
 python-devel
 python-gtk-devel
 python3-devel
@@ -186,6 +193,7 @@ rpcgen
 rpm-build
 rpm-devel
 rsvg-convert
+rsync
 ruby
 ruby-devel
 sane-backends-devel
@@ -196,16 +204,22 @@ subversion-devel
 sudo
 swig
 sword-devel
+t1utils
+texi2html
+texinfo
 texlive-adjustbox
 texlive-etoc
+texlive-float
 texlive-hanging
 texlive-metafont-bin
+texlive-metapost
 texlive-multirow
 texlive-natbib
 texlive-newunicodechar
 texlive-refman
 texlive-sectsty
 texlive-stackengine
+texlive-lh
 texlive-tocloft
 torsocks
 transfig
@@ -224,3 +238,4 @@ xscreensaver-data
 xscreensaver-data-extra
 xz
 xz-devel
+zip
diff --git a/redhat/docker/pclinuxos.pkg b/redhat/docker/pclinuxos.pkg
index 0a3a5f767..30bb665db 100644
--- a/redhat/docker/pclinuxos.pkg
+++ b/redhat/docker/pclinuxos.pkg
@@ -28,7 +28,7 @@ gnutls
 grep
 gzip
 icu
-icu65-data
+icu69-data
 info-install
 kernel-userspace-headers
 krb5
@@ -52,22 +52,25 @@ lib64curl4
 lib64db4.8
 lib64dbnss4.8
 lib64elfutils1
+lib64ev4
 lib64expat1
 lib64ext2fs2
 lib64fdisk1
 lib64ffi6
+lib64ffi8
 lib64fuse2
 lib64fuse3_3
 lib64gcrypt20
 lib64gdbm3
 lib64gdk_pixbuf2.0_0
+lib64gdk_pixbuf_xlib2.0_0
 lib64gio2.0_0
 lib64glib2.0_0
 lib64gmp10
 lib64gnutls30
 lib64gpg-error0
 lib64gudev1.0_0
-lib64icu65
+lib64icu69
 lib64idn2_0
 lib64intl8
 lib64iso9660_7
@@ -79,16 +82,17 @@ lib64keyutils1
 lib64krb53
 lib64ksba8
 lib64ldap2.4_2
-lib64libcap-ng0
+lib64cap-ng0
 lib64lua5.1
 lib64lzma5
 lib64magic1
 lib64mount1
-lib64mpfr4
+lib64mpfr6
 lib64ncurses5
 lib64ncurses6
 lib64ncursesw6
-lib64nettle7
+lib64nettle8
+lib64nghttp2_14
 lib64notify4
 lib64npth0
 lib64nspr4
@@ -108,6 +112,7 @@ lib64popt0
 lib64psl5
 lib64python3.6
 lib64readline7
+lib64readline8
 lib64rpm1
 lib64rtmp1
 lib64sasl2
@@ -122,6 +127,7 @@ lib64tiff3
 lib64tiff5
 lib64tirpc3
 lib64udev0
+lib64unbound8
 lib64unistring2
 lib64usb1.0_0
 lib64usb-compat0.1_4
diff --git a/redhat/docker/pclinuxos.sh b/redhat/docker/pclinuxos.sh
index 52f858357..cd7689569 100755
--- a/redhat/docker/pclinuxos.sh
+++ b/redhat/docker/pclinuxos.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -ex
 
 NAME="pclinuxos"
-VERSION="${1:-2020}" # E.g: '2020'
+VERSION="${1:-2021}" # E.g: '2020'
 IMAGE="${NAME}:${VERSION}"
 INSTALLROOT="/dev/shm/${IMAGE}"
 
@@ -47,11 +47,12 @@ sudo chroot "${INSTALLROOT}" apt-get -y upgrade
 sudo umount "${INSTALLROOT}/dev/shm"
 sudo umount "${INSTALLROOT}/dev"
 
-sudo tar -C "${INSTALLROOT}" -c . >"${IMAGE}.tar"
+docker rmi -f "${IMAGE}" || :
+sudo tar -C "${INSTALLROOT}" -c . | docker import - "${IMAGE}"
+docker run -ti --rm "${IMAGE}" ls -l
 sudo rm -rf "${INSTALLROOT}"
 
-docker rmi -f "${IMAGE}" || :
-cat "${IMAGE}.tar" | docker import - "${IMAGE}"
+docker image save "${IMAGE}" >"${IMAGE}.tar"
 rm -f "${IMAGE}.tar.gz"
 pigz -9 "${IMAGE}.tar"
 mv -vf "${IMAGE}.tar.gz" "${HOME}/tde/obs"
diff --git a/redhat/docker/pclinuxos/Dockerfile.x86_64 b/redhat/docker/pclinuxos/Dockerfile.x86_64
index 85b9bb441..66036cba0 100644
--- a/redhat/docker/pclinuxos/Dockerfile.x86_64
+++ b/redhat/docker/pclinuxos/Dockerfile.x86_64
@@ -1,6 +1,6 @@
-FROM pclinuxos:2020
+FROM pclinuxos:2021
 
-ARG TDE_VERSION=14.0.9
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 # Update distribution
@@ -26,7 +26,8 @@ COPY genla.sh /usr/bin/genla.sh
 RUN genla.sh libbluetooth && mv /usr/lib64/libbluetooth.la /lib64 \
  && genla.sh libjpeg \
  && genla.sh liblcms \
- && genla.sh libusb-1.0 && mv /usr/lib64/libusb-1.0.la /lib64 && cp /lib64/libusb-1.0.la /lib64/libusb.la
+ && genla.sh libusb-1.0 && mv /usr/lib64/libusb-1.0.la /lib64 && cp /lib64/libusb-1.0.la /lib64/libusb.la \
+ && ln -sf /usr/lib64/libglvnd/libGL.so /usr/lib64/libGL.so
 
 # Add non-root user to build packages
 RUN rm -rf /home/trinity \
@@ -37,15 +38,21 @@ USER trinity
 COPY rpmmacros /home/trinity/.rpmmacros
 
 # Build supplementary development tools
-RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7.1/SRPMS/core/release/torsocks-2.3.0-1.mga7.src.rpm \
+RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPMS/core/release/torsocks-2.3.0-2.mga8.src.rpm \
  && sed -i ${HOME}/rpmbuild/SPECS/torsocks.spec -e "s|%license|%doc|" \
- && rpmbuild -ba ${HOME}/rpmbuild/SPECS/torsocks.spec
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/torsocks.spec \
+ && sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/torsocks-2*.rpm
 
-RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7.1/SRPMS/core/release/cscope-15.9-1.mga7.src.rpm \
+RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPMS/core/release/cscope-15.9-2.mga8.src.rpm \
  && sed -i ${HOME}/rpmbuild/SPECS/cscope.spec  -e "s|%autopatch|%patch0|" \
- && rpmbuild -ba ${HOME}/rpmbuild/SPECS/cscope.spec
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/cscope.spec \
+ && sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/cscope-15*.rpm
 
-USER root
-RUN rpm -Uvh /home/trinity/rpmbuild/RPMS/*/torsocks-2*.rpm /home/trinity/rpmbuild/RPMS/*/cscope-15*.rpm
+RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPMS/core/release/rpcsvc-proto-1.4-1.mga8.src.rpm \
+ && sed -i ${HOME}/rpmbuild/SPECS/rpcsvc-proto.spec  -e "s|%autosetup .*|%setup -q|" -e "s|%configure|%configure2_5x|" -e "s|%license|%doc|" \
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/rpcsvc-proto.spec \
+ && sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/rpcgen-1*.rpm
 
-USER trinity
+RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPMS/core/release/html2ps-2.0-3.b7.8.mga8.src.rpm \
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/html2ps.spec \
+ && sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/html2ps-2*.rpm
diff --git a/redhat/docker/pclinuxos/packages.x86_64 b/redhat/docker/pclinuxos/packages.x86_64
index 800b9989a..e63e1594e 100644
--- a/redhat/docker/pclinuxos/packages.x86_64
+++ b/redhat/docker/pclinuxos/packages.x86_64
@@ -9,8 +9,11 @@ ccache
 cdparanoia
 chmlib-devel
 chrpath
+clamav
+clamav-devel
 cmake
 cups-devel
+dbus-glib-devel
 desktop-file-utils
 djvulibre
 docbook-style-xsl
@@ -48,7 +51,7 @@ intltool
 java-devel
 java-sun
 lcms-devel
-lib64clucene-devel
+lib64clucene2-devel
 lib64cryptsetup-devel
 lib64db4.8-devel
 lib64dvdread-devel
@@ -58,6 +61,8 @@ lib64geoip-devel
 lib64gif-devel
 lib64gpod4
 lib64gpod-devel
+lib64gstreamer1.0-devel
+lib64gstreamer-plugins-base1.0-devel
 lib64idn-devel
 lib64inotifytools-devel
 lib64iw29-devel
@@ -66,10 +71,13 @@ lib64mpcdec-devel
 lib64OpenSP5-devel
 lib64pcsclite-devel
 lib64pkcs11-helper-devel
+lib64polkit1-devel
 lib64poppler-devel
 lib64readline-devel
 lib64sane1-devel
 lib64sndfile-devel
+lib64ssh-devel
+lib64unwind-devel
 lib64usb1.0-devel
 lib64usb-compat0.1-devel
 lib64wv2-devel
@@ -79,6 +87,7 @@ lib64xtst-devel
 lib64yaz-devel
 libcap-devel
 libcdda-devel
+libcln-devel
 libconfig-devel
 libcurl-devel
 libffmpeg-devel
@@ -112,10 +121,12 @@ libraw1394-devel
 librsvg
 librsync-devel
 libsamplerate-devel
+libsecret-devel
 libsmbclient-devel
 libsm-devel
 libt1lib-devel
 libtheora-devel
+libtirpc-devel
 libudev-devel
 libuuid-devel
 libv4l-devel
@@ -140,6 +151,7 @@ libxslt-devel
 libxxf86dga-devel
 lirc-devel
 lm_sensors-devel
+m4
 mesaglu-devel
 mysql-devel
 nas-devel
@@ -151,13 +163,16 @@ openldap-devel
 opensc
 openslp-devel
 pam-devel
+pcre-devel
 perl-devel
+perl-Image-Magick
 perl-PAR-Packer
 perl-pcsc-perl
 pilot-link-devel
 pkgconfig(pygtk-2.0)
 postgresql
 postgresql-devel
+ppp
 pth-devel
 python3
 python-devel
@@ -186,6 +201,5 @@ vim-enhanced
 x11-font-util
 xscreensaver
 xscreensaver-base
-xscreensaver-extrusion
 xscreensaver-gl
 yaz
diff --git a/redhat/docker/pclinuxos/rpmmacros b/redhat/docker/pclinuxos/rpmmacros
index 6b1a9016a..a8b78eb0d 100644
--- a/redhat/docker/pclinuxos/rpmmacros
+++ b/redhat/docker/pclinuxos/rpmmacros
@@ -1,4 +1,5 @@
 %dist .pclos
 %_smp_mflags -j8
 %jobs 8
-%pclinuxos 2019
+%pclinuxos 2022
+%configure %configure2_5x
diff --git a/redhat/docker/pull.sh b/redhat/docker/pull.sh
index 478a14664..30064325f 100755
--- a/redhat/docker/pull.sh
+++ b/redhat/docker/pull.sh
@@ -4,7 +4,7 @@ DISTRIB="$1"
 TDE_VERSION="$2"
 ARCH="$3"
 
-[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.9"
+[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.13"
 [ -z "${ARCH}" ] && ARCH="x86_64"
 
 IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}"
diff --git a/redhat/docker/push.sh b/redhat/docker/push.sh
index 76a12557f..0d4ea6ace 100755
--- a/redhat/docker/push.sh
+++ b/redhat/docker/push.sh
@@ -4,7 +4,7 @@ DISTRIB="$1"
 TDE_VERSION="$2"
 ARCH="$3"
 
-[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.9"
+[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.13"
 [ -z "${ARCH}" ] && ARCH="x86_64"
 
 IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}"
diff --git a/redhat/docker/remove.sh b/redhat/docker/remove.sh
index 6eb8a8589..7d9d87b2e 100755
--- a/redhat/docker/remove.sh
+++ b/redhat/docker/remove.sh
@@ -4,7 +4,7 @@ DISTRIB="$1"
 TDE_VERSION="$2"
 ARCH="$3"
 
-[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.9"
+[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.13"
 [ -z "${ARCH}" ] && ARCH="x86_64"
 
 IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}"
diff --git a/redhat/docker/run.sh b/redhat/docker/run.sh
index 16da72fa2..91eb82e99 100755
--- a/redhat/docker/run.sh
+++ b/redhat/docker/run.sh
@@ -4,7 +4,7 @@ DISTRIB="$1"
 TDE_VERSION="$2"
 ARCH="$3"
 
-[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.9"
+[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.13"
 [ -z "${ARCH}" ] && ARCH="x86_64"
 [ -x /usr/bin/podman ] && DOCKER=podman || DOCKER=docker
 
diff --git a/redhat/extras/brp-check-trinity/brp-check-trinity.spec b/redhat/extras/brp-check-trinity/brp-check-trinity.spec
index de83a2194..f7dd246b0 100644
--- a/redhat/extras/brp-check-trinity/brp-check-trinity.spec
+++ b/redhat/extras/brp-check-trinity/brp-check-trinity.spec
@@ -17,7 +17,7 @@
 
 # TDE variables
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_prefix /opt/trinity
 
@@ -43,10 +43,14 @@ BuildArch:	noarch
 
 BuildRequires:	update-desktop-files
 BuildRequires:	brp-check-suse
+%if 0%{?suse_version} <= 1500
 BuildRequires:	brp-extract-appdata
+%endif
 Requires:	update-desktop-files
 Requires:	brp-check-suse
+%if 0%{?suse_version} <= 1500
 Requires:	brp-extract-appdata
+%endif
 Requires:	sed
 
 
@@ -69,8 +73,9 @@ for i in \
 	map-desktop-category.sh \
 	suse_update_desktop_file.sh \
 ; do
-	echo "Patching file '/usr/lib/rpm/${i}' ..."
 	[ -r "/usr/lib/rpm/${i}" ] || continue
+	[ -r "/usr/lib/rpm.orig/${i}" ] && continue
+	echo "Patching file '/usr/lib/rpm/${i}' ..."
 	install -D "/usr/lib/rpm/${i}" "/usr/lib/rpm.orig/${i}"
 	sed -i "/usr/lib/rpm/${i}" \
 		-e "s|opt/kde3|opt/trinity|g" \
@@ -82,11 +87,12 @@ for i in \
 		-e "s|applications/kde|applications/tde|g" \
 		-e "s|KDE|TDE|g" \
 		-e "s|kde-|tde-|g" \
-%if 0%{?suse_version} == 1550
+%if 0%{?suse_version} >= 1550
 		-e "s|/usr/share/applications|/opt/trinity/share/applications|g" \
 		-e "/^for i in/ s|\\\| /\$RPM_BUILD_ROOT/opt/trinity/share/applnk \\\|" \
 %endif
 		-e "s|tde-settings.menu|kde-settings.menu|g"
+	diff -Nua "/usr/lib/rpm.orig/${i}" "/usr/lib/rpm/${i}" || :
 done
 
 
diff --git a/redhat/extras/fileshareset/fileshareset.spec b/redhat/extras/fileshareset/fileshareset.spec
index d48421788..2470b3412 100644
--- a/redhat/extras/fileshareset/fileshareset.spec
+++ b/redhat/extras/fileshareset/fileshareset.spec
@@ -92,11 +92,25 @@ export LDFLAGS="$LDFLAGS -pie"
 mkdir -p "${RPM_BUILD_ROOT}%{_sysconfdir}/security/"
 echo "RESTRICT=yes" > "${RPM_BUILD_ROOT}%{_sysconfdir}/security/fileshare.conf"
 
+# Remove setuid bit on some binaries.
+chmod 0755 "%{?buildroot}%{_bindir}/fileshareset"
+
+# Rename binary to avoid conflict with kde3
+mv "%{?buildroot}%{_bindir}/fileshareset" "%{?buildroot}%{_bindir}/fileshareset2"
+ln -sf "fileshareset2"  "%{?buildroot}%{_bindir}/filesharelist"
+
 
 %clean
 %__rm -rf $RPM_BUILD_ROOT
 
 
+%post
+%if 0%{?suse_version}
+# Sets permissions on setuid files (openSUSE specific)
+%set_permissions %{_bindir}/fileshareset2
+%endif
+
+
 %files
 %defattr(-,root,root,-)
 %{_bindir}/filesharelist
@@ -105,16 +119,16 @@ echo "RESTRICT=yes" > "${RPM_BUILD_ROOT}%{_sysconfdir}/security/fileshare.conf"
 
 # Setuid program
 %if 0%{?suse_version}
-%verify(not mode) %{_bindir}/fileshareset
+%verify(not mode) %{_bindir}/fileshareset2
 %else
-%attr(4755,root,root) %{_bindir}/fileshareset
+%attr(4755,root,root) %{_bindir}/fileshareset2
 %endif
 
 
 %if 0%{?suse_version}
 # Check permissions on setuid files (openSUSE specific)
 %verifyscript
-%verify_permissions -e /usr/bin/fileshareset
+%verify_permissions -e %{_bindir}/fileshareset2
 %endif
 
 
diff --git a/redhat/extras/htdig/htdig.spec b/redhat/extras/htdig/htdig.spec
index a2a42e6c6..dab280946 100644
--- a/redhat/extras/htdig/htdig.spec
+++ b/redhat/extras/htdig/htdig.spec
@@ -5,13 +5,19 @@
 
 Summary:	A web indexing and searching system for a small domain or intranet
 Name:		htdig
-Version:	3.2.0b7
+Version:	3.2.0b6_19
 Release:	1%{?dist}
 License:	GPL
 Group:		Networking/WWW
 URL:		http://www.htdig.org/
 
-Source0:	htdig-3.2.0b7.tar.gz
+Source0:	htdig_3.2.0b6.orig.tar.gz
+
+Patch1:		patches/htdig_3.2.0b6-13.diff
+Patch2:		patches/gcc-6
+Patch3:		patches/sourceforge_logo
+Patch4:		patches/drop-bogus-assignment
+Patch5:		patches/gcc-11
 
 BuildRequires:	flex >= 2.5.4a-13
 BuildRequires:	libtool
@@ -172,7 +178,12 @@ fi
 ##########
 
 %prep
-%setup -q
+%setup -q -n htdig-3.2.0b6
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 autoreconf -fiv
 
 
diff --git a/redhat/extras/htdig/patches/drop-bogus-assignment b/redhat/extras/htdig/patches/drop-bogus-assignment
new file mode 100644
index 000000000..2328280e3
--- /dev/null
+++ b/redhat/extras/htdig/patches/drop-bogus-assignment
@@ -0,0 +1,16 @@
+--- htdig-3.2.0b6.orig/htdig/Parsable.cc
++++ htdig-3.2.0b6/htdig/Parsable.cc
+@@ -74,7 +74,6 @@ Parsable::addString(Retriever& retriever
+ 	    retriever.got_word(w, wordindex++, slot); // slot for img_alt
+ 	w = HtWordToken(0);
+     }
+-    w = '\0';
+ }
+ 
+ //*****************************************************************************
+@@ -92,5 +91,4 @@ Parsable::addKeywordString(Retriever& re
+ 	    retriever.got_word(w, wordindex++, 9);
+ 	w = HtWordToken(0);
+     }
+-    w = '\0';
+ }
diff --git a/redhat/extras/htdig/patches/gcc-11 b/redhat/extras/htdig/patches/gcc-11
new file mode 100644
index 000000000..09c974cea
--- /dev/null
+++ b/redhat/extras/htdig/patches/gcc-11
@@ -0,0 +1,370 @@
+Index: b/htword/WordBitCompress.cc
+===================================================================
+--- a/htword/WordBitCompress.cc
++++ b/htword/WordBitCompress.cc
+@@ -29,7 +29,7 @@
+ #include"WordBitCompress.h"
+ 
+ // ******** HtVector_byte (implementation)
+-#define GType byte
++#define GType byte_t
+ #define HtVectorGType HtVector_byte
+ #include "HtVectorGenericCode.h"
+ 
+@@ -424,13 +424,13 @@
+ // **************************************************
+ 
+ void 
+-BitStream::put_zone(byte *vals,int n,const char *tag)
++BitStream::put_zone(byte_t *vals,int n,const char *tag)
+ {
+     add_tag(tag);
+     for(int i=0;i<(n+7)/8;i++){put_uint(vals[i],TMin(8,n-8*i),NULL);}
+ }
+ void 
+-BitStream::get_zone(byte *vals,int n,const char *tag)
++BitStream::get_zone(byte_t *vals,int n,const char *tag)
+ {
+     check_tag(tag);
+     for(int i=0;i<(n+7)/8;i++){vals[i]=get_uint(TMin(8,n-8*i));}
+@@ -699,16 +699,16 @@
+     if(all){printf("\n");}
+ 
+ }
+-byte *
++byte_t *
+ BitStream::get_data()
+ {
+-    byte *res=(byte *)malloc(buff.size());
++    byte_t *res=(byte_t *)malloc(buff.size());
+     CHECK_MEM(res);
+     for(int i=0;i<buff.size();i++){res[i]=buff[i];}
+     return(res);
+ }
+ void 
+-BitStream::set_data(const byte *nbuff,int nbits)
++BitStream::set_data(const byte_t *nbuff,int nbits)
+ {
+     if(buff.size()!=1 || bitpos!=0)
+     {
+@@ -835,7 +835,7 @@
+ 
+ 
+ int 
+-Compressor::put_fixedbitl(byte *vals,int n,const char *tag)
++Compressor::put_fixedbitl(byte_t *vals,int n,const char *tag)
+ {
+     int cpos=bitpos;
+     int i,j;
+@@ -844,19 +844,19 @@
+     put_uint_vl(n,NBITS_NVALS,"size");
+     if(n==0){return 0;}
+ 
+-    byte maxv=vals[0];
++    byte_t maxv=vals[0];
+     for(i=1;i<n;i++)
+     {
+-	byte v=vals[i];
++	byte_t v=vals[i];
+ 	if(v>maxv){maxv=v;}
+     }
+     int nbits=num_bits(maxv);
+-    if(n>=pow2(NBITS_NVALS)){errr("Compressor::put_fixedbitl(byte *) : overflow: nvals>2^16");}
++    if(n>=pow2(NBITS_NVALS)){errr("Compressor::put_fixedbitl(byte_t *) : overflow: nvals>2^16");}
+     put_uint(nbits,NBITS_NBITS_CHARVAL,"nbits");
+     add_tag("data");
+     for(i=0;i<n;i++)
+     {
+-	byte v=vals[i];
++	byte_t v=vals[i];
+ 	for(j=0;j<nbits;j++) {put(v&pow2(j));}
+     }	
+     return(bitpos-cpos);
+@@ -887,15 +887,15 @@
+     }
+ }
+ int 
+-Compressor::get_fixedbitl(byte **pres,const char *tag/*="BADTAG!"*/)
++Compressor::get_fixedbitl(byte_t **pres,const char *tag/*="BADTAG!"*/)
+ {
+-    if(check_tag(tag)==NOTOK){errr("Compressor::get_fixedbitl(byte *): check_tag failed");}
++    if(check_tag(tag)==NOTOK){errr("Compressor::get_fixedbitl(byte_t *): check_tag failed");}
+     int n=get_uint_vl(NBITS_NVALS);
+     if(!n){*pres=NULL;return 0;}
+     int nbits=get_uint(NBITS_NBITS_CHARVAL);
+-    if(verbose)printf("get_fixedbitl(byte):n%3d nbits:%2d\n",n,nbits);
++    if(verbose)printf("get_fixedbitl(byte_t):n%3d nbits:%2d\n",n,nbits);
+     int i;
+-    byte *res=new byte[n];
++    byte_t *res=new byte_t[n];
+     CHECK_MEM(res);
+     for(i=0;i<n;i++)
+     {
+Index: b/htword/WordBitCompress.h
+===================================================================
+--- a/htword/WordBitCompress.h
++++ b/htword/WordBitCompress.h
+@@ -28,9 +28,9 @@
+ #include"HtVector_int.h"
+ #include"HtMaxMin.h"
+ 
+-typedef unsigned char byte;
++typedef unsigned char byte_t;
+ // ******** HtVector_byte (header)
+-#define GType byte
++#define GType byte_t
+ #define HtVectorGType HtVector_byte
+ #include "HtVectorGeneric.h"
+ 
+@@ -123,12 +123,12 @@
+     }
+ 
+     // gets a bit from the bitstream
+-    inline byte get(const char *tag=(char*)NULL)
++    inline byte_t get(const char *tag=(char*)NULL)
+     {
+ 	// SPEED CRITICAL SECTION
+ 	if(check_tag(tag)==NOTOK){errr("BitStream::get() check_tag failed");}
+ 	if(bitpos>=(buff.size()<<3)){errr("BitStream::get reading past end of BitStream!");}
+-	byte res=buff[bitpos>>3] & pow2(bitpos & 0x07);
++	byte_t res=buff[bitpos>>3] & pow2(bitpos & 0x07);
+ //  	printf("get:res:%d bitpos:%5d/%d buff[%3d]=%x\n",res,bitpos,bitpos%8,bitpos/8,buff[bitpos/8]);
+ 	bitpos++;
+ 	return(res);
+@@ -139,8 +139,8 @@
+     unsigned int get_uint(               int n,const char *tag=(char*)NULL);
+ 
+     // get/put n bits of data stored in vals
+-    void put_zone(byte *vals,int n,const char *tag);
+-    void get_zone(byte *vals,int n,const char *tag);
++    void put_zone(byte_t *vals,int n,const char *tag);
++    void get_zone(byte_t *vals,int n,const char *tag);
+ 
+     // 
+     inline void add_tag(const char *tag)
+@@ -167,9 +167,9 @@
+     int buffsize(){return(buff.size());}
+ 
+     // get a copy of the buffer
+-    byte *get_data();
++    byte_t *get_data();
+     // set the buffer from outside data (current buffer must be empty)
+-    void set_data(const byte *nbuff,int nbits);
++    void set_data(const byte_t *nbuff,int nbits);
+       
+     // use this for reading a BitStream after you have written in it 
+     // (generally for debuging)
+@@ -211,7 +211,7 @@
+ #define NBITS_VAL 32
+ // number of bits to code he number of bits used by an unsigned int value
+ #define NBITS_NBITS_VAL  5
+-// number of bits to code the number of bits used by a byte value
++// number of bits to code the number of bits used by a byte_t value
+ #define NBITS_NBITS_CHARVAL 4
+ 
+ class Compressor : public BitStream
+@@ -240,8 +240,8 @@
+     int get_vals(unsigned int **pres,const char *tag=(char*)"BADTAG!");
+ 
+     // compress/decompress an array of bytes (very simple)
+-    int put_fixedbitl(byte *vals,int n,const char *tag);    
+-    int get_fixedbitl(byte **pres,const char *tag=(char*)"BADTAG!");
++    int put_fixedbitl(byte_t *vals,int n,const char *tag);
++    int get_fixedbitl(byte_t **pres,const char *tag=(char*)"BADTAG!");
+ 
+     // compress/decompress an array of unsigned ints (very simple)
+     void get_fixedbitl(unsigned int *res,int n);
+Index: b/htword/WordDBPage.cc
+===================================================================
+--- a/htword/WordDBPage.cc
++++ b/htword/WordDBPage.cc
+@@ -155,7 +155,7 @@
+ 	Uncompress_main(pin);
+ 	break;
+     case CMPRTYPE_BADCOMPRESS:// this page did not compress correctly
+-	pin->get_zone((byte *)pg,pgsz*8,"INITIALBUFFER");
++	pin->get_zone((byte_t *)pg,pgsz*8,"INITIALBUFFER");
+ 	break;
+     default:
+ 	errr("WordDBPage::Uncompress: CMPRTYPE incoherent");
+@@ -181,7 +181,7 @@
+     int *rnum_sizes=new int[nnums];
+     CHECK_MEM(rnum_sizes);
+     // char differences between words
+-    byte *rworddiffs=NULL;
++    byte_t *rworddiffs=NULL;
+     int nrworddiffs;
+ 
+     // *********** read header
+@@ -288,7 +288,7 @@
+     return OK;
+ }
+ void 
+-WordDBPage::Uncompress_rebuild(unsigned int **rnums,int *rnum_sizes,int nnums0,byte *rworddiffs,int nrworddiffs)
++WordDBPage::Uncompress_rebuild(unsigned int **rnums,int *rnum_sizes,int nnums0,byte_t *rworddiffs,int nrworddiffs)
+ {
+     int irwordiffs=0;
+     int nfields=WordKey::NFields();
+@@ -405,7 +405,7 @@
+ 
+ // display
+ void 
+-WordDBPage::Uncompress_show_rebuild(unsigned int **rnums,int *rnum_sizes,int nnums0,byte *rworddiffs,int nrworddiffs)
++WordDBPage::Uncompress_show_rebuild(unsigned int **rnums,int *rnum_sizes,int nnums0,byte_t *rworddiffs,int nrworddiffs)
+ {
+     int i,j;
+     if(verbose)
+@@ -464,7 +464,7 @@
+ 	res->put_uint(COMPRESS_VERSION,NBITS_COMPRESS_VERSION,"COMPRESS_VERSION");
+ 	res->put_uint(CMPRTYPE_BADCOMPRESS,NBITS_CMPRTYPE,"CMPRTYPE");
+ 
+-	res->put_zone((byte *)pg,pgsz*8,"INITIALBUFFER");
++	res->put_zone((byte_t *)pg,pgsz*8,"INITIALBUFFER");
+     }
+ 
+     if(verbose)
+@@ -761,7 +761,7 @@
+ 	printf("compare failed in some unknown place in header:\n");
+ 	for(i=0;i<(int)(sizeof(PAGE)-sizeof(db_indx_t));i++)
+ 	{
+-	    printf("%3d: %3x %3x\n",i,((byte *)pg)[i],((byte *)other.pg)[i]);
++	    printf("%3d: %3x %3x\n",i,((byte_t *)pg)[i],((byte_t *)other.pg)[i]);
+ 	}
+     }
+ 
+@@ -998,7 +998,7 @@
+ 	  printf("%5d: ",nn);
+ 	  for(j=0;j<20;j++)
+ 	  {
+-	      printf("%2x ",((byte *)pg)[nn++]);
++	      printf("%2x ",((byte_t *)pg)[nn++]);
+ 	      if(nn>=pgsz){break;}
+ 	  }
+ 	  printf("\n");
+Index: b/htword/WordDBPage.h
+===================================================================
+--- a/htword/WordDBPage.h
++++ b/htword/WordDBPage.h
+@@ -65,7 +65,7 @@
+ 	}
+     }
+     WordDBRecord():WordRecord(){;}
+-    WordDBRecord(byte *dat,int len,int rectyp):WordRecord()
++    WordDBRecord(byte_t *dat,int len,int rectyp):WordRecord()
+     {
+ 	type=(rectyp ? DefaultType() : WORD_RECORD_STATS);
+ 	Unpack(String((char *)dat,len));
+@@ -118,7 +118,7 @@
+ 	}
+ 	else{Unpack(String((char *)nkey->data,nkey->len));}
+     }
+-    WordDBKey(byte *data,int len):WordKey()
++    WordDBKey(byte_t *data,int len):WordKey()
+     {
+ 	key=NULL;
+ 	if(!data || !len){errr("WordDBKey::WordDBKey(data,len) !data || !len");}
+@@ -207,7 +207,7 @@
+     void *alloc_entry(int size)
+     {
+ 	size=WORD_ALIGN_TO(size,4);	
+-	int inp_pos=((byte *)&(pg->inp[insert_indx]))-(byte *)pg;
++	int inp_pos=((byte_t *)&(pg->inp[insert_indx]))-(byte_t *)pg;
+ 	insert_pos-=size;
+ 	if(insert_pos<=inp_pos)
+ 	{
+@@ -216,7 +216,7 @@
+ 	    errr("WordDBPage::alloc_entry: PAGE OVERFLOW");
+ 	}
+ 	pg->inp[insert_indx++]=insert_pos;
+-	return((void *)((byte *)pg+insert_pos));
++	return((void *)((byte_t *)pg+insert_pos));
+     }
+ 
+     
+@@ -260,11 +260,11 @@
+ 	    ky.Pack(pkey);
+ 	    keylen=pkey.length();
+ 	}
+-	int size=keylen+((byte *)&(bti.data))-((byte *)&bti);// pos of data field in BINTERNAL
++	int size=keylen+((byte_t *)&(bti.data))-((byte_t *)&bti);// pos of data field in BINTERNAL
+ 	if(empty)
+ 	{
+ 	    if(verbose){printf("WordDBPage::insert_btikey: empty : BINTERNAL:%d datapos:%d keylen:%d size:%d alligned to:%d\n",(int)sizeof(BINTERNAL),
+-			       (int)(((byte *)&(bti.data))-((byte *)&bti)),
++			       (int)(((byte_t *)&(bti.data))-((byte_t *)&bti)),
+ 			       keylen,size,WORD_ALIGN_TO(size,4));}
+ 	}
+ 
+@@ -306,8 +306,8 @@
+     int  Uncompress_main(Compressor *pin);
+     void Uncompress_vals_chaged_flags(Compressor &in,unsigned int **pcflags,int *pn);
+     int  Uncompress_header(Compressor &in);
+-    void Uncompress_rebuild(unsigned int **rnums,int *rnum_sizes,int nnums,byte *rworddiffs,int nrworddiffs);
+-    void Uncompress_show_rebuild(unsigned int **rnums,int *rnum_sizes,int nnums,byte *rworddiffs,int nrworddiffs);
++    void Uncompress_rebuild(unsigned int **rnums,int *rnum_sizes,int nnums,byte_t *rworddiffs,int nrworddiffs);
++    void Uncompress_show_rebuild(unsigned int **rnums,int *rnum_sizes,int nnums,byte_t *rworddiffs,int nrworddiffs);
+ 
+     int TestCompress(int debuglevel);
+     int Compare(WordDBPage &other);
+@@ -326,14 +326,14 @@
+ 	    out.put_uint(btikey(i)->type ,sizeof(btikey(i)->type )*8,label_str("seperatekey_bti_type" ,i));
+ 	    out.put_uint(btikey(i)->pgno ,sizeof(btikey(i)->pgno )*8,label_str("seperatekey_bti_pgno" ,i));
+ 	    out.put_uint(btikey(i)->nrecs,sizeof(btikey(i)->nrecs)*8,label_str("seperatekey_bti_nrecs",i));
+-	    if(len){out.put_zone((byte *)btikey(i)->data,8*len,label_str("seperatekey_btidata",i));}
++	    if(len){out.put_zone((byte_t *)btikey(i)->data,8*len,label_str("seperatekey_btidata",i));}
+ 	}
+ 	else
+ 	{
+ 	    int len=key(i)->len;
+ 	    out.put_uint(len,NBITS_KEYLEN,label_str("seperatekey_len",i));
+ 	    if(verbose){printf("WordDBPage::compress_key: compress(typ5):%d\n",len);}
+-	    out.put_zone((byte *)key(i)->data,8*len,label_str("seperatekey_data",i));
++	    out.put_zone((byte_t *)key(i)->data,8*len,label_str("seperatekey_data",i));
+ 	}
+     }
+     void compress_data(Compressor &out,int i)
+@@ -341,7 +341,7 @@
+ 	int len=data(i)->len;
+ 	out.put_uint(len,NBITS_DATALEN,label_str("seperatedata_len",i));
+ 	if(verbose){printf("WordDBPage::compress_data: compressdata(typ5):%d\n",len);}
+-	out.put_zone((byte *)data(i)->data,8*len,label_str("seperatedata_data",i));
++	out.put_zone((byte_t *)data(i)->data,8*len,label_str("seperatedata_data",i));
+     }
+     WordDBKey uncompress_key(Compressor &in,int i)
+     {
+@@ -360,7 +360,7 @@
+ 	    if(len!=bti.len){errr("WordDBPage::uncompress_key: incoherence: len!=bti.len");}
+ 	    if(len)
+ 	    {
+-		byte *gotdata=new byte[len];
++		byte_t *gotdata=new byte_t[len];
+ 		CHECK_MEM(gotdata);
+ 		in.get_zone(gotdata,8*len,label_str("seperatekey_btidata",i));
+ 		res=WordDBKey(gotdata,len);
+@@ -370,7 +370,7 @@
+ 	}
+ 	else
+ 	{
+-	    byte *gotdata=new byte[len];
++	    byte_t *gotdata=new byte_t[len];
+ 	    CHECK_MEM(gotdata);
+ 	    in.get_zone(gotdata,8*len,label_str("seperatekey_data",i));
+ 	    res=WordDBKey(gotdata,len);
+@@ -384,7 +384,7 @@
+ 	WordDBRecord res;
+ 	int len=in.get_uint(NBITS_DATALEN,label_str("seperatedata_len",i));
+ 	if(verbose)printf("uncompressdata:len:%d\n",len);
+-	byte *gotdata=new byte[len];
++	byte_t *gotdata=new byte_t[len];
+ 	CHECK_MEM(gotdata);
+ 	in.get_zone(gotdata,8*len,label_str("seperatedata_data",i));
+ 	res=WordDBRecord(gotdata,len,rectyp);
+@@ -488,7 +488,7 @@
+     {
+ 	init0();
+ 	pgsz=npgsz;
+-	pg=(PAGE *)(new byte[pgsz]);
++	pg=(PAGE *)(new byte_t[pgsz]);
+ 	CHECK_MEM(pg);
+ 	insert_pos=pgsz;
+ 	insert_indx=0;
diff --git a/redhat/extras/htdig/patches/gcc-6 b/redhat/extras/htdig/patches/gcc-6
new file mode 100644
index 000000000..5031ea0c7
--- /dev/null
+++ b/redhat/extras/htdig/patches/gcc-6
@@ -0,0 +1,12 @@
+Description: Fix FTBFS with gcc-6.
+--- htdig-3.2.0b6.orig/htfuzzy/Accents.cc
++++ htdig-3.2.0b6/htfuzzy/Accents.cc
+@@ -43,7 +43,7 @@ extern int debug;
+ | table iso-latin1 "minusculisee" et "de-accentuee" |
+ `--------------------------------------------------*/
+   
+-static char MinusculeISOLAT1[256] = {
++static unsigned char MinusculeISOLAT1[256] = {
+      0,   1,   2,   3,   4,   5,   6,   7,
+      8,   9,  10,  11,  12,  13,  14,  15,
+     16,  17,  18,  19,  20,  21,  22,  23,
diff --git a/redhat/extras/htdig/patches/htdig_3.2.0b6-13.diff b/redhat/extras/htdig/patches/htdig_3.2.0b6-13.diff
new file mode 100644
index 000000000..4562e03fe
--- /dev/null
+++ b/redhat/extras/htdig/patches/htdig_3.2.0b6-13.diff
@@ -0,0 +1,176 @@
+Description: complete diff against upstream of version 3.2.0b6
+
+--- htdig-3.2.0b6.orig/db/os_rw.c
++++ htdig-3.2.0b6/db/os_rw.c
+@@ -5,6 +5,13 @@
+  *	Sleepycat Software.  All rights reserved.
+  */
+ 
++#define _XOPEN_SOURCE 500
++#include <sys/types.h>
++#include <unistd.h>
++#ifndef u_long
++typedef __u_long u_long;
++#endif
++
+ #include "db_config.h"
+ 
+ #ifndef lint
+--- htdig-3.2.0b6.orig/htcommon/defaults.cc
++++ htdig-3.2.0b6/htcommon/defaults.cc
+@@ -596,7 +596,7 @@
+ 	<a href=\"htfuzzy.html\">htfuzzy</a> for more information on the \
+ 	format of this file. \
+ " }, \
+-{ "endings_root2word_db", "${common_dir}/root2word.db",  \
++{ "endings_root2word_db", "${database_dir}/root2word.db",  \
+ 	"string", "htfuzzy htsearch", "", "all", "File Layout", "endings_root2word_db: /var/htdig/r2w.db", " \
+ 	This attributes specifies the database filename to be \
+ 	used in the 'endings' fuzzy search algorithm. The \
+@@ -610,7 +610,7 @@
+ 	This is because this database can be shared with \
+ 	different search databases. \
+ " }, \
+-{ "endings_word2root_db", "${common_dir}/word2root.db",  \
++{ "endings_word2root_db", "${database_dir}/word2root.db",  \
+ 	"string", "htfuzzy htsearch", "", "all", "File Layout", "endings_word2root_db: /var/htdig/w2r.bm", " \
+ 	This attributes specifies the database filename to be \
+ 	used in the 'endings' fuzzy search algorithm. The \
+@@ -2426,7 +2426,7 @@
+ 	that this does not limit the number of documents that \
+ 	are matched in any way. \
+ " }, \
+-{ "synonym_db", "${common_dir}/synonyms.db",  \
++{ "synonym_db", "${database_dir}/synonyms.db",  \
+ 	"string", "htsearch htfuzzy", "", "3.0", "File Layout", "synonym_db: ${database_base}.syn.db", " \
+ 	Points to the database that <a href=\"htfuzzy.html\"> \
+ 	htfuzzy</a> creates when the <strong>synonyms</strong> \
+--- htdig-3.2.0b6.orig/htdig/Server.cc
++++ htdig-3.2.0b6/htdig/Server.cc
+@@ -341,6 +341,8 @@
+     {
+ 	String	fullpatt = "^[^:]*://[^/]*(";
+ 	fullpatt << pattern << ')';
++	if (pattern.length() == 0)
++		fullpatt = "";
+ 	_disallow.set(fullpatt, config->Boolean("case_sensitive"));
+     }
+ }
+--- htdig-3.2.0b6.orig/htsearch/Collection.h
++++ htdig-3.2.0b6/htsearch/Collection.h
+@@ -36,9 +36,9 @@
+                const char *docExcerpt);
+     ~Collection();
+ 
+-    void Collection::Open();
++    void Open();
+ 
+-    void Collection::Close(); 
++    void Close(); 
+ 
+     char *getWordFile() { return wordFile.get(); }
+     DocumentRef         *getDocumentRef(int id);
+--- htdig-3.2.0b6.orig/htsearch/Display.cc
++++ htdig-3.2.0b6/htsearch/Display.cc
+@@ -54,6 +54,7 @@
+ 
+ #include <math.h>
+ #include <float.h>
++#include <values.h>
+ 
+ #if !defined(DBL_MAX)
+ # if defined (MAXDOUBLE)
+@@ -137,7 +138,7 @@
+       // Must temporarily stash the message in a String, since
+       // displaySyntaxError will overwrite the static temp used in form.
+ 
+-      String s(form("No such sort method: `%s'", (const char*)config->Find("sort")));
++      String s("Invalid sort method.");
+ 
+       displaySyntaxError(s);
+       return;
+--- htdig-3.2.0b6.orig/htsearch/htsearch.cc
++++ htdig-3.2.0b6/htsearch/htsearch.cc
+@@ -211,8 +211,7 @@
+ 	}
+ 	if (access((char*)configFile, R_OK) < 0)
+ 	{
+-	    reportError(form("Unable to read configuration file '%s'",
+-			     configFile.get()));
++		reportError("Unable to read configuration file");
+ 	}
+ 	config->Read(configFile);
+ 
+--- htdig-3.2.0b6.orig/htsearch/qtest.cc
++++ htdig-3.2.0b6/htsearch/qtest.cc
+@@ -132,8 +132,7 @@
+ 
+     if (access((char*)configFile, R_OK) < 0)
+     {
+-	reportError(form("Unable to find configuration file '%s'",
+-			 configFile.get()));
++    	reportError("Unable to find configuration file");
+     }
+ 	
+     config->Read(configFile);
+--- htdig-3.2.0b6.orig/htword/WordDBPage.cc
++++ htdig-3.2.0b6/htword/WordDBPage.cc
+@@ -82,7 +82,7 @@
+   	if(debuglevel>2)printf("TOTAL SIZE: %6d %8f\n",size,size/8.0);
+ 	// argh! compare failed somthing went wrong
+ 	// display the compress/decompress sequence and fail
+-	if(cmp || size>8*1024*1000000000)
++	if(cmp || size>8*1024)
+ 	{
+ 	    if(size>8*1024)
+ 	    {
+--- htdig-3.2.0b6.orig/installdir/rundig
++++ htdig-3.2.0b6/installdir/rundig
+@@ -7,17 +7,18 @@
+ #
+ # This is a sample script to create a search database for ht://Dig.
+ #
+-DBDIR=@DATABASE_DIR@
+-COMMONDIR=@COMMON_DIR@
+-BINDIR=@BIN_DIR@
+-conffile=@DEFAULT_CONFIG_FILE@
++DBDIR=/var/lib/htdig
++COMMONDIR=/etc/htdig
++BINDIR=/usr/bin
++conffile=/etc/htdig/htdig.conf
+ 
+ # To help debug problems, try running rundig -vvv
+ # This will add lots of debugging output to all of the programs
+-stats= opts= alt=
++stats= opts= alt= nohtnotify=
+ while [ "$#" -gt 0 ]
+ do
+     case "$1" in
++    --no-htnotify) nohtnotify="true" ;;
+     -a)  alt="$1" ;;
+     -s)  stats="$1" ;;
+     -c)  shift
+@@ -65,7 +66,11 @@
+     test -f db.words.db.work_weakcmpr &&
+ 	mv -f db.words.db.work_weakcmpr db.words.db_weakcmpr) ;;
+ esac
+-$BINDIR/htnotify $opts
++if [ "$nohtnotify" = "true" ]; then
++	echo "Skipping htnotify."
++else
++	$BINDIR/htnotify $opts
++fi
+ # If you want to use the soundex and (or) metaphone fuzzy matchings,
+ # Uncomment the following line
+ # $BINDIR/htfuzzy $opts soundex metaphone
+--- htdig-3.2.0b6.orig/libhtdig/ResultFetch.cc
++++ htdig-3.2.0b6/libhtdig/ResultFetch.cc
+@@ -142,7 +142,7 @@
+         // Must temporarily stash the message in a String, since
+         // displaySyntaxError will overwrite the static temp used in form.
+ 
+-        String s(form("No such sort method: `%s'", (const char *) config->Find("sort")));
++        String s("Invalid search method.");
+ 
+         displaySyntaxError(s);
+         //return;
diff --git a/redhat/extras/htdig/patches/kfreebsd b/redhat/extras/htdig/patches/kfreebsd
new file mode 100644
index 000000000..d30d68be7
--- /dev/null
+++ b/redhat/extras/htdig/patches/kfreebsd
@@ -0,0 +1,25 @@
+From: Steven Chamberlain <steven@pyro.eu.org>
+Subject: only use ETIME if defined
+Bug-Debian: http://bugs.debian.org/765284
+Forwarded: no
+
+ETIME relates to an optional POSIX STREAMS extension not implemented
+on some platforms (such as GNU/kFreeBSD).
+
+Don't check for this return value on platforms that don't define it.
+
+--- htdig-3.2.0b6.orig/db/mut_pthread.c.orig	2002-02-02 18:18:05.000000000 +0000
++++ htdig-3.2.0b6/db/mut_pthread.c	2014-10-14 12:40:53.771737556 +0100
+@@ -201,7 +201,11 @@
+ 			 * call, and Solaris delivers the signal to the wrong
+ 			 * LWP.
+ 			 */
+-			if (ret != 0 && ret != ETIME && ret != ETIMEDOUT)
++			if (ret != 0 &&
++#ifdef ETIME
++			    ret != ETIME &&
++#endif
++			    ret != ETIMEDOUT)
+ 				return (ret);
+ 		}
+ 
diff --git a/redhat/extras/htdig/patches/series b/redhat/extras/htdig/patches/series
new file mode 100644
index 000000000..da0d40c91
--- /dev/null
+++ b/redhat/extras/htdig/patches/series
@@ -0,0 +1,6 @@
+htdig_3.2.0b6-13.diff
+kfreebsd
+gcc-6
+sourceforge_logo
+drop-bogus-assignment
+gcc-11
diff --git a/redhat/extras/htdig/patches/sourceforge_logo b/redhat/extras/htdig/patches/sourceforge_logo
new file mode 100644
index 000000000..dd3d1e719
--- /dev/null
+++ b/redhat/extras/htdig/patches/sourceforge_logo
@@ -0,0 +1,118 @@
+Description: don't remote-link SourceForge's logo
+ This let SourceForge track everyone who reads these docs.  As the image is
+ not freely licensed, let's leave only a piece of text.
+--- htdig-3.2.0b6.orig/htdoc/FAQ.html
++++ htdig-3.2.0b6/htdoc/FAQ.html
+@@ -2585,6 +2585,6 @@ find /path/to/your/document/root -type f
+ 	  	Last modified: $Date: 2004/05/28 13:15:16 $
+ <br> 
+     <a href="http://sourceforge.net/"> 
+-          <img src="http://sourceforge.net/sflogo.php?group_id=4593&amp;type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a>
++          SourceForge</a>
+   </body>
+ </html>
+--- htdig-3.2.0b6.orig/htdoc/author.html
++++ htdig-3.2.0b6/htdoc/author.html
+@@ -34,6 +34,6 @@
+ 	Last modified: $Date: 2004/05/28 13:15:18 $
+ <br> 
+     <a href="http://sourceforge.net/"> 
+-          <img src="http://sourceforge.net/sflogo.php?group_id=4593&amp;type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a>
++          SourceForge</a>
+   </body>
+ </html>
+--- htdig-3.2.0b6.orig/htdoc/bugs.html
++++ htdig-3.2.0b6/htdoc/bugs.html
+@@ -50,6 +50,6 @@
+ 	Last modified: $Date: 2004/05/28 13:15:18 $
+ <br> 
+     <a href="http://sourceforge.net/"> 
+-          <img src="http://sourceforge.net/sflogo.php?group_id=4593&amp;type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a>
++          SourceForge</a>
+   </body>
+ </html>
+--- htdig-3.2.0b6.orig/htdoc/isp.html
++++ htdig-3.2.0b6/htdoc/isp.html
+@@ -81,7 +81,7 @@
+ 	Last modified: $Date: 2004/05/28 13:15:19 $
+ <br> 
+     <a href="http://sourceforge.net/"> 
+-          <img src="http://sourceforge.net/sflogo.php?group_id=4593&amp;type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a>
++          SourceForge</a>
+ 
+ </body>
+ </html>
+--- htdig-3.2.0b6.orig/htdoc/mailing.html
++++ htdig-3.2.0b6/htdoc/mailing.html
+@@ -55,6 +55,6 @@
+ 	Last modified: $Date: 2004/05/28 13:15:19 $
+ <br>
+     <a href="http://sourceforge.net/">
+-      <img src="http://sourceforge.net/sflogo.php?group_id=4593&amp;type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a>
++      SourceForge</a>
+   </body>
+ </html>
+--- htdig-3.2.0b6.orig/htdoc/main.html
++++ htdig-3.2.0b6/htdoc/main.html
+@@ -103,6 +103,6 @@
+ 	Last modified: $Date: 2004/05/28 13:15:19 $
+ <br>
+     <a href="http://sourceforge.net/">
+-      <img src="http://sourceforge.net/sflogo.php?group_id=4593&amp;type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a>
++      SourceForge</a>
+   </body>
+ </html>
+--- htdig-3.2.0b6.orig/htdoc/rundig.html
++++ htdig-3.2.0b6/htdoc/rundig.html
+@@ -184,7 +184,7 @@
+ 	Last modified: $Date: 2004/06/12 13:39:13 $
+ <br> 
+     <a href="http://sourceforge.net/"> 
+-          <img src="http://sourceforge.net/sflogo.php?group_id=4593&amp;type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a>
++          SourceForge</a>
+ 
+   </body>
+ </html>
+--- htdig-3.2.0b6.orig/htdoc/running.html
++++ htdig-3.2.0b6/htdoc/running.html
+@@ -131,7 +131,7 @@
+ 	Last modified: $Date: 2004/05/28 13:15:19 $
+ <br> 
+     <a href="http://sourceforge.net/"> 
+-          <img src="http://sourceforge.net/sflogo.php?group_id=4593&amp;type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a>
++          SourceForge</a>
+ 
+   </body>
+ </html>
+--- htdig-3.2.0b6.orig/htdoc/uses.html
++++ htdig-3.2.0b6/htdoc/uses.html
+@@ -646,7 +646,7 @@
+ 	Last modified: $Date: 2004/05/28 13:15:19 $
+ <br> 
+     <a href="http://sourceforge.net/"> 
+-          <img src="http://sourceforge.net/sflogo.php?group_id=4593&amp;type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a>
++          SourceForge</a>
+ 
+ </body>
+ </html>
+--- htdig-3.2.0b6.orig/htdoc/where.html
++++ htdig-3.2.0b6/htdoc/where.html
+@@ -121,6 +121,6 @@
+ <br> 
+ 
+    <a href="http://sourceforge.net/"> 
+-<img src="http://sourceforge.net/sflogo.php?group_id=4593&amp;type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a> 
++SourceForge</a> 
+   </body>
+ </html>
+--- htdig-3.2.0b6.orig/test/htdocs/set1/bad_local.htm
++++ htdig-3.2.0b6/test/htdocs/set1/bad_local.htm
+@@ -51,7 +51,7 @@
+ 	Last modified: $Date: 2004/01/18 12:54:15 $
+ <br> 
+     <a href="http://sourceforge.net/"> 
+-          <img src="http://sourceforge.net/sflogo.php?group_id=4593&amp;type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a>
++          SourceForge</a>
+ 
+   </body>
+ </html>
diff --git a/redhat/extras/pinentry-tqt/pinentry-tqt.spec b/redhat/extras/pinentry-tqt/pinentry-tqt.spec
new file mode 100644
index 000000000..8c26664fe
--- /dev/null
+++ b/redhat/extras/pinentry-tqt/pinentry-tqt.spec
@@ -0,0 +1,116 @@
+#
+# spec file for package pinentry-tqt (version R14)
+#
+# 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/
+#
+
+
+Name:		pinentry-tqt
+Version:	1.1.1
+Release:	1%{?dist}
+Summary:	PIN or passphrase entry dialogs
+Group:		System/Libraries
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{name}-%{version}.tar.gz
+
+BuildRequires:	trinity-tqtinterface-devel
+
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+BuildRequires:	gcc-c++
+BuildRequires:	autoconf automake libtool m4
+BuildRequires:	pkgconfig
+
+BuildRequires:	libassuan-devel
+BuildRequires:	libsecret-devel
+
+Requires:		pinentry
+
+
+%description
+This is a collection of PIN or passphrase entry dialogs which
+utilize the Assuan protocol as specified in the Libassuan manual.
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q
+
+%__sed -i "configure.ac" \
+ -e "/^min_automake_version=/ s|=.*|=\"1.13\"|" \
+ -e "/^NEED_GPG_ERROR_VERSION=/ s|=.*|=1.12|"
+
+
+%build
+unset QTDIR QTINC QTLIB
+
+if [ -d "/usr/include/libassuan2" ]; then
+  export CFLAGS="%{optflags} -I/usr/include/libassuan2"
+fi
+
+./autogen.sh
+
+%if 0%{?mgaversion} == 6 || 0%{?mgaversion} == 7 || 0%{?pclinuxos}
+%configure2_5x \
+%else
+%configure \
+%endif
+  --enable-pinentry-tqt \
+  --enable-libsecret \
+  --disable-doc \
+  --disable-pinentry-curses \
+  --disable-pinentry-fltk \
+  --disable-pinentry-gnome3 \
+  --disable-pinentry-gtk2 \
+  --disable-pinentry-qt \
+  --disable-pinentry-qt5 \
+  --disable-pinentry-tty
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+%__rm -f "%{buildroot}%{_bindir}/pinentry"
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%{_bindir}/pinentry-tqt
+
+
+%changelog
diff --git a/redhat/extras/trinity-desktop/trinity-desktop.spec b/redhat/extras/trinity-desktop/trinity-desktop.spec
index c2c9889df..07f41dcd5 100644
--- a/redhat/extras/trinity-desktop/trinity-desktop.spec
+++ b/redhat/extras/trinity-desktop/trinity-desktop.spec
@@ -16,7 +16,7 @@
 #
 
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
@@ -49,6 +49,9 @@ Source0:	trinity-3.5.13-fedora.repo
 Source1:	trinity-3.5.13-rhel.repo
 Source2:	RPM-GPG-KEY-trinity
 
+%if 0%{?fedora} >= 32 || 0%{?mgaversion} >= 7 || 0%{?pclinuxos} || 0%{?rhel} >= 8 || 0%{?suse_version}
+Requires:	pinentry-tqt
+%endif
 Requires:	trinity-tdeaccessibility >= %{version}
 Requires:	trinity-tdeaddons >= %{version}
 Requires:	trinity-tdeadmin >= %{version}
@@ -142,8 +145,14 @@ Requires: trinity-kile
 Requires: trinity-kima
 Requires: trinity-kiosktool
 Requires: trinity-kkbswitch
+%if 0%{?fedora} || 0%{?mgaversion} >= 7 || 0%{?pclinuxos} || 0%{?rhel} >= 7 || 0%{?suse_version}
+Requires: trinity-klamav
+%endif
 Requires: trinity-klcddimmer
+%if 0%{?rhel} <= 8
+# No mplayer on RHEL9
 Requires: trinity-kmplayer
+%endif
 Requires: trinity-kmyfirewall
 Requires: trinity-kmymoney
 Requires: trinity-knemo
@@ -154,11 +163,16 @@ Requires: trinity-knowit
 Requires: trinity-knmap
 Requires: trinity-knutclient
 Requires: trinity-koffice-suite
+Requires: trinity-kompose
 Requires: trinity-konversation
 Requires: trinity-kooldock
 Requires: trinity-kopete-otr
 Requires: trinity-kpicosim
+%if 0%{?sle_version} <= 150300 && 0%{?suse_version} != 1599
+%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora} || 0%{?rhel} >= 6
 Requires: trinity-kpilot
+%endif
+%endif
 #Requires: trinity-kplayer
 Requires: trinity-krecipes
 Requires: trinity-krename
@@ -178,24 +192,42 @@ Requires: trinity-kvkbd
 Requires: trinity-kvpnc
 Requires: trinity-kxmleditor
 Requires: trinity-mathemagics
+%if 0%{?rhel} <= 8
 Requires: trinity-mplayerthumbs
+%endif
 Requires: trinity-piklab
+%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora} || 0%{?rhel} >= 7
+# On RHEL6, polkit is too old
+Requires: trinity-polkit-agent-tde
+%endif
 Requires: trinity-potracegui
-#Requires: trinity-qalculate-tde
+Requires: trinity-qalculate-tde
+# On RHEL, lilypond is not available, so no rosegarden :'-(
+%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora}
+Requires: trinity-rosegarden
+%endif
 Requires: trinity-smb4k
 Requires: trinity-smartcardauth
 Requires: trinity-soundkonverter
 Requires: trinity-tastymenu
+%if 0%{?sle_version} <= 150300 && 0%{?rhel} <= 8
 Requires: trinity-tde-guidance
+%endif
 Requires: trinity-tde-style-baghira
 Requires: trinity-tde-style-domino
 Requires: trinity-tde-style-ia-ora
 Requires: trinity-tde-style-lipstik
 Requires: trinity-tde-style-qtcurve
+%if 0%{?sle_version} <= 150300 && 0%{?rhel} <= 8
 Requires: trinity-tde-systemsettings
+%endif
 Requires: trinity-tdedocker
+%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora} || 0%{?rhel} >= 7
+Requires: trinity-tdeio-appinfo
+%endif
 Requires: trinity-tdeio-apt
 Requires: trinity-tdeio-ftps
+Requires: trinity-tdeio-gopher
 Requires: trinity-tdeio-locate
 Requires: trinity-tdeio-sword
 Requires: trinity-tdeio-umountwrapper
@@ -204,12 +236,16 @@ Requires: trinity-tdepacman
 Requires: trinity-tdepowersave
 %endif
 Requires: trinity-tderadio
+Requires: trinity-tdesshaskpass
 Requires: trinity-tdesudo
 Requires: trinity-tdesvn
 Requires: trinity-tdmtheme
 Requires: trinity-tellico
 Requires: trinity-tork
 Requires: trinity-twin-style-crystal
+Requires: trinity-twin-style-dekorator
+Requires: trinity-twin-style-machbunt
+Requires: trinity-twin-style-suse2
 Requires: trinity-wlassistant
 Requires: trinity-yakuake
 
@@ -224,7 +260,7 @@ Requires: trinity-tdenetworkmanager
 %endif
 
 # Power management
-Obsoletes: trinity-tde-guidance-powermanager
+Obsoletes: trinity-tde-guidance-powermanager < %{?epoch:%{epoch}:}%{version}-%{release}
 
 # Decoration-related stuff (not installed by default)
 #Requires: trinity-kgtk-qt3
@@ -232,11 +268,6 @@ Obsoletes: trinity-tde-guidance-powermanager
 #Requires: trinity-gtk3-tqt-engine
 #Requires: trinity-qt4-tqt-theme-engine
 
-# On RHEL 5/7, lilypond is not available, so no rosegarden :'-(
-%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora}
-Requires: trinity-rosegarden
-%endif
-
 # Compiz-related stuff does not work (obsolete)
 #Requires: trinity-compizconfig-backend-kconfig
 #Requires: trinity-desktop-effects-kde
diff --git a/redhat/extras/trinity-filesystem/trinity-filesystem.spec b/redhat/extras/trinity-filesystem/trinity-filesystem.spec
index 75f8c052b..1ae57054b 100644
--- a/redhat/extras/trinity-filesystem/trinity-filesystem.spec
+++ b/redhat/extras/trinity-filesystem/trinity-filesystem.spec
@@ -17,7 +17,7 @@
 
 # TDE variables
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
@@ -62,6 +62,8 @@ This package installs the Trinity directory structure.
 %defattr(-,root,root,-)
 %dir %{tde_prefix}
 
+%dir %{_datadir}/apps
+
 %dir %{tde_bindir}
 
 %dir %{tde_datadir}
@@ -137,6 +139,8 @@ This package installs the Trinity directory structure.
 %build
 
 %install
+%__install -d -m 755 %{?buildroot}%{_datadir}/apps
+
 %__install -d -m 755 %{?buildroot}%{tde_prefix}
 
 %__install -d -m 755 %{?buildroot}%{tde_bindir}
@@ -253,6 +257,7 @@ done
 %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/et/common
 %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/fi/common
 %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/fr/common
+%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/gl/common
 %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/he/common
 %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/hu/common
 %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/it/common
@@ -266,10 +271,12 @@ done
 %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/sk/common
 %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/sl/common
 %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/sr/common
+%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/sr@Latn/common
 %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/sv/common
 %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/tr/common
 %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/uk/common
 %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/zh_CN/common
+%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/zh_Hans/common
 %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/zh_TW/common
 
 %__install -d -m 755 %{?buildroot}%{tde_includedir}
@@ -317,6 +324,7 @@ done
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bn
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bo
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/br
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/braille
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bs
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bt
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bw
@@ -350,6 +358,7 @@ done
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ee
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/eg
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/eh
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/eo
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/er
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/es
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/et
@@ -391,6 +400,7 @@ done
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/jm
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/jo
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/jp
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/jv
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ke
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/kg
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/kh
@@ -419,6 +429,7 @@ done
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/me
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mg
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mh
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mi
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mk
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ml
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mm
@@ -527,6 +538,7 @@ done
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/br/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/bs/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/ca/LC_MESSAGES/
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/ca@valencia/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/cs/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/csb/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/cy/LC_MESSAGES/
@@ -602,6 +614,7 @@ done
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/tg/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/th/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/tr/LC_MESSAGES/
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/ug/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/uk/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/uk@cyrillic/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/uz/LC_MESSAGES/
@@ -614,6 +627,7 @@ done
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/xx/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/zh_CN.GB2312/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/zh_CN/LC_MESSAGES/
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/zh_Hans/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/zh_TW.Big5/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/zh_TW/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/zu/LC_MESSAGES/
@@ -626,6 +640,11 @@ for b in kcheckpass kgrantpty kpac_dhcp_helper kppp start_tdeinit tdmtsak tdekbd
     echo "%{tde_bindir}/${b}          root:root       4711" >>/etc/permissions.local
   fi
 done
+for b in fileshareset ; do
+  if ! grep -q "^%{_bindir}/${b}" "/etc/permissions.local"; then
+    echo "%{_bindir}/${b}          root:root       4711" >>/etc/permissions.local
+  fi
+done
 %endif
 
 
diff --git a/redhat/libraries/kipi-plugins/kipi-plugins.spec b/redhat/libraries/kipi-plugins/kipi-plugins.spec
index 273410c95..602ae384d 100644
--- a/redhat/libraries/kipi-plugins/kipi-plugins.spec
+++ b/redhat/libraries/kipi-plugins/kipi-plugins.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kipi-plugins
 %define tde_prefix /opt/trinity
@@ -93,7 +93,7 @@ BuildRequires:	libexiv2-devel
 %endif
 
 # GPOD (ipod) support
-%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
+%if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?rhel} == 8 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
 %define with_gpod 1
 BuildRequires:	libgpod-devel >= 0.4.2
 %endif
diff --git a/redhat/libraries/libkdcraw/libkdcraw.spec b/redhat/libraries/libkdcraw/libkdcraw.spec
index 415b85004..02afad0fc 100644
--- a/redhat/libraries/libkdcraw/libkdcraw.spec
+++ b/redhat/libraries/libkdcraw/libkdcraw.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg libkdcraw
 %define tde_prefix /opt/trinity
@@ -56,10 +56,11 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-filesystem >= %{tde_version}
 
-BuildRequires: automake autoconf libtool
+BuildRequires: libtool
 BuildRequires: gcc-c++
 BuildRequires: desktop-file-utils
 BuildRequires: pkgconfig
@@ -161,38 +162,49 @@ library documentation is available on kdcraw.h header file.
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/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: gcc-hidden-visibility causes FTBFS in digikam !
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --includedir=%{tde_tdeincludedir} \
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+  -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
+  -DLIB_INSTALL_DIR="%{tde_libdir}" \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DPLUGIN_INSTALL_DIR="%{tde_tdelibdir}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DBUILD_ALL=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_TRANSLATIONS=ON \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
+  ..
 
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
 
 
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
 
 %find_lang %{tde_pkg}
 
diff --git a/redhat/libraries/libkexiv2/libkexiv2.spec b/redhat/libraries/libkexiv2/libkexiv2.spec
index 5a91ade74..6b9b7b5a2 100644
--- a/redhat/libraries/libkexiv2/libkexiv2.spec
+++ b/redhat/libraries/libkexiv2/libkexiv2.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg libkexiv2
 %define tde_prefix /opt/trinity
@@ -67,7 +67,7 @@ Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gettext
 BuildRequires:	gcc-c++
 
@@ -159,6 +159,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
   \
diff --git a/redhat/libraries/libkipi/libkipi.spec b/redhat/libraries/libkipi/libkipi.spec
index 3685be0a2..38eba2393 100644
--- a/redhat/libraries/libkipi/libkipi.spec
+++ b/redhat/libraries/libkipi/libkipi.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg libkipi
 %define tde_prefix /opt/trinity
@@ -92,7 +92,7 @@ BuildRequires:	libidn-devel
 BuildRequires:	openssl-devel
 
 # CMAKE
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 
 %description
 Libkipi is a library
@@ -179,6 +179,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
   \
diff --git a/redhat/libraries/libksquirrel/libksquirrel.spec b/redhat/libraries/libksquirrel/libksquirrel.spec
index 4fe2672bd..f432c5e8f 100644
--- a/redhat/libraries/libksquirrel/libksquirrel.spec
+++ b/redhat/libraries/libksquirrel/libksquirrel.spec
@@ -26,7 +26,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg libksquirrel
 %define tde_prefix /opt/trinity
@@ -35,6 +35,7 @@
 %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/tde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
@@ -324,6 +325,23 @@ This package contains the runtime libraries for KSquirrel.
 %{tde_datadir}/ksquirrel-libs/libkls_tiff.so.ui
 %{tde_datadir}/ksquirrel-libs/libkls_xcf.so.ui
 %{tde_datadir}/ksquirrel-libs/rgbmap
+%{tde_mandir}/man1/ksquirrel-libs-camera2ppm.1
+%{tde_mandir}/man1/ksquirrel-libs-dcraw.1
+%{tde_mandir}/man1/ksquirrel-libs-dicom2png.1
+%{tde_mandir}/man1/ksquirrel-libs-fig2ppm.1
+%{tde_mandir}/man1/ksquirrel-libs-iff2ppm.1
+%{tde_mandir}/man1/ksquirrel-libs-leaf2ppm.1
+%{tde_mandir}/man1/ksquirrel-libs-ljpeg2ppm-s.1
+%{tde_mandir}/man1/ksquirrel-libs-ljpeg2ppm.1
+%{tde_mandir}/man1/ksquirrel-libs-mac2ppm.1
+%{tde_mandir}/man1/ksquirrel-libs-neo2ppm.1
+%{tde_mandir}/man1/ksquirrel-libs-pi12ppm.1
+%{tde_mandir}/man1/ksquirrel-libs-pi32ppm.1
+%{tde_mandir}/man1/ksquirrel-libs-svg2png.1
+%{tde_mandir}/man1/ksquirrel-libs-ttf2pnm.1
+%{tde_mandir}/man1/ksquirrel-libs-utah2ppm.1
+%{tde_mandir}/man1/ksquirrel-libs-xcf2pnm.1
+%{tde_mandir}/man1/ksquirrel-libs-xim2ppm.1
 
 ##########
 
@@ -534,7 +552,7 @@ fi
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 
-%if 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
+%if 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8 || 0%{?fedora} >= 34
 CXXFLAGS="${CXXFLAGS} -std=c++11"
 %endif
 
diff --git a/redhat/libraries/libtdeldap/libtdeldap.spec b/redhat/libraries/libtdeldap/libtdeldap.spec
index bebf5f63d..cf049df44 100644
--- a/redhat/libraries/libtdeldap/libtdeldap.spec
+++ b/redhat/libraries/libtdeldap/libtdeldap.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg libtdeldap
 %define tde_prefix /opt/trinity
@@ -64,7 +64,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 BuildRequires:	gcc-c++
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	pkgconfig
 
 # LIBTOOL
@@ -95,14 +95,6 @@ BuildRequires:	openldap2-devel
 BuildRequires:	openldap24-libs-devel
 %endif
 
-# HEIMDAL support
-#%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
-#BuildRequires:	heimdal-devel
-#%endif
-#%if 0%{?suse_version}
-#BuildRequires:	libheimdal-devel
-#%endif
-
 # UDEV support
 %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
 %define with_tdehwlib 1
@@ -126,6 +118,9 @@ BuildRequires:	libidn-devel
 # OPENSSL support
 BuildRequires:	openssl-devel
 
+# KRB5 support
+BuildRequires:	krb5-devel
+
 
 %description
 LDAP interface library for TDE management modules.
@@ -186,6 +181,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/libraries/libtqt-perl/libtqt-perl.spec b/redhat/libraries/libtqt-perl/libtqt-perl.spec
index 12c7b734e..729be4c3c 100644
--- a/redhat/libraries/libtqt-perl/libtqt-perl.spec
+++ b/redhat/libraries/libtqt-perl/libtqt-perl.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg libtqt-perl
 %define tde_prefix /opt/trinity
diff --git a/redhat/libraries/python-trinity/python-trinity.spec b/redhat/libraries/pytde/pytde.spec
index 36621f7a6..ef7c94f19 100644
--- a/redhat/libraries/python-trinity/python-trinity.spec
+++ b/redhat/libraries/pytde/pytde.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package python-trinity (version R14)
+# spec file for package pytde (version R14)
 #
 # Copyright (c) 2014 Trinity Desktop Environment
 #
@@ -18,9 +18,9 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
-%define tde_pkg python-trinity
+%define tde_pkg pytde
 %define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
@@ -74,8 +74,8 @@ BuildRequires:	gcc-c++
 BuildRequires:	%{python}
 BuildRequires:	%{python}-devel
 
-BuildRequires:	python-tqt-devel
-Requires:		python-tqt
+BuildRequires:	pytqt-devel
+Requires:		pytqt
 
 # SIP
 BuildRequires:	sip4-tqt-devel >= 4.10.5
@@ -83,6 +83,8 @@ Requires:		sip4-tqt >= 4.10.5
 
 Obsoletes:	python-trinity < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:	python-trinity = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-python-trinity < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-python-trinity = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description
 Python binding module that provides wide access to the Trinity API,
@@ -103,8 +105,10 @@ Summary:	Trinity bindings for Python - Development files and scripts
 Group:		Development/Libraries/Python
 Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
-Obsoletes:	python-trinity-devel < %{version}-%{release}
-Provides:	python-trinity-devel = %{version}-%{release}
+Obsoletes:	python-trinity-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	python-trinity-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-python-trinity-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-python-trinity-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description devel
 Development .sip files with definitions of PyTDE classes. They
@@ -127,6 +131,8 @@ Group:		Development/Libraries/Python
 
 Obsoletes:	python-trinity-doc < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:	python-trinity-doc = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-python-trinity-doc < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-python-trinity-doc = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description doc
 General documentation and examples for PyTDE providing programming
@@ -134,7 +140,7 @@ tips and working code you can use to learn from.
 
 %files doc
 %defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/en/python-trinity/
+%{tde_tdedocdir}/HTML/en/pytde/
 
 ##########
 
@@ -174,7 +180,7 @@ export PATH="%{tde_bindir}:${PATH}"
 
 # Install documentation
 %__mkdir_p %{buildroot}%{tde_tdedocdir}/HTML/en/
-%__cp -rf doc %{buildroot}%{tde_tdedocdir}/HTML/en/python-trinity/
+%__cp -rf doc %{buildroot}%{tde_tdedocdir}/HTML/en/pytde/
 
 
 %clean
diff --git a/redhat/libraries/pytdeextensions/pytdeextensions.spec b/redhat/libraries/pytdeextensions/pytdeextensions.spec
index cf67a4b48..30c1f416c 100644
--- a/redhat/libraries/pytdeextensions/pytdeextensions.spec
+++ b/redhat/libraries/pytdeextensions/pytdeextensions.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg pytdeextensions
 %define tde_prefix /opt/trinity
@@ -62,11 +62,11 @@ BuildRequires:	gettext
 BuildRequires:	autoconf automake libtool m4
 BuildRequires:	gcc-c++
 
-BuildRequires:	python-tqt-devel >= %{?epoch:%{epoch}:}3.18.1
-BuildRequires:	trinity-python-trinity-devel
+BuildRequires:	pytqt-devel >= %{?epoch:%{epoch}:}3.18.1
+BuildRequires:	trinity-pytde-devel
 BuildRequires:	trinity-pytqt-tools
-Requires:		python-tqt
-Requires:		trinity-python-trinity
+Requires:		pytqt
+Requires:		trinity-pytde
 
 Requires:		trinity-libpythonize0 = %{?epoch:%{epoch}:}%{version}-%{release}
 
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.el4 b/redhat/main/tdebase/pamd.kcheckpass-trinity.el4
deleted file mode 100644
index 48e0276a6..000000000
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.el4
+++ /dev/null
@@ -1,11 +0,0 @@
-#%PAM-1.0
-auth       required	pam_stack.so service=system-auth
-auth       required	pam_nologin.so
-auth       sufficient	pam_timestamp.so
-account    required	pam_stack.so service=system-auth
-password   required	pam_stack.so service=system-auth
-session    required	pam_stack.so service=system-auth
-session    required  pam_loginuid.so
-session    optional	pam_timestamp.so
-session    optional	pam_selinux.so
-session    optional	pam_console.so
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.el4 b/redhat/main/tdebase/pamd.kdm-trinity-np.el4
deleted file mode 100644
index 687312da5..000000000
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.el4
+++ /dev/null
@@ -1,9 +0,0 @@
-#%PAM-1.0
-auth       required	pam_env.so
-auth       required	pam_nologin.so
-auth       required	pam_permit.so
-account    required	pam_stack.so service=system-auth
-password   required	pam_stack.so service=system-auth
-session    required	pam_stack.so service=system-auth
-session    required  pam_loginuid.so
-session    optional  pam_console.so
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.mga5 b/redhat/main/tdebase/pamd.kdm-trinity-np.mga5
deleted file mode 100644
index f884c1de6..000000000
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.mga5
+++ /dev/null
@@ -1,11 +0,0 @@
-#%PAM-1.0
-auth       required    pam_env.so
-auth       required    pam_permit.so
-account    required    pam_nologin.so
-account    include     system-auth
-password   include     system-auth
-session    required    pam_loginuid.so
-session    optional    pam_console.so
-session    optional    pam_keyinit.so force revoke
-session    required    pam_namespace.so
-session    include     system-auth
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.mga6 b/redhat/main/tdebase/pamd.kdm-trinity-np.mga6
deleted file mode 100644
index f884c1de6..000000000
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.mga6
+++ /dev/null
@@ -1,11 +0,0 @@
-#%PAM-1.0
-auth       required    pam_env.so
-auth       required    pam_permit.so
-account    required    pam_nologin.so
-account    include     system-auth
-password   include     system-auth
-session    required    pam_loginuid.so
-session    optional    pam_console.so
-session    optional    pam_keyinit.so force revoke
-session    required    pam_namespace.so
-session    include     system-auth
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.mga7 b/redhat/main/tdebase/pamd.kdm-trinity-np.mga7
deleted file mode 100644
index f884c1de6..000000000
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.mga7
+++ /dev/null
@@ -1,11 +0,0 @@
-#%PAM-1.0
-auth       required    pam_env.so
-auth       required    pam_permit.so
-account    required    pam_nologin.so
-account    include     system-auth
-password   include     system-auth
-session    required    pam_loginuid.so
-session    optional    pam_console.so
-session    optional    pam_keyinit.so force revoke
-session    required    pam_namespace.so
-session    include     system-auth
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.el4 b/redhat/main/tdebase/pamd.kdm-trinity.el4
deleted file mode 100644
index 48e0276a6..000000000
--- a/redhat/main/tdebase/pamd.kdm-trinity.el4
+++ /dev/null
@@ -1,11 +0,0 @@
-#%PAM-1.0
-auth       required	pam_stack.so service=system-auth
-auth       required	pam_nologin.so
-auth       sufficient	pam_timestamp.so
-account    required	pam_stack.so service=system-auth
-password   required	pam_stack.so service=system-auth
-session    required	pam_stack.so service=system-auth
-session    required  pam_loginuid.so
-session    optional	pam_timestamp.so
-session    optional	pam_selinux.so
-session    optional	pam_console.so
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.mga5 b/redhat/main/tdebase/pamd.kdm-trinity.mga5
deleted file mode 100644
index cb0982c9a..000000000
--- a/redhat/main/tdebase/pamd.kdm-trinity.mga5
+++ /dev/null
@@ -1,15 +0,0 @@
-#%PAM-1.0
-auth       required    pam_env.so
-auth       required    pam_succeed_if.so 
-auth       sufficient  pam_succeed_if.so user ingroup nopasswdlogin
-auth       substack    system-auth
--auth      optional    pam_kwallet.so
-account    required    pam_nologin.so
-account    include     system-auth
-password   include     system-auth
-session    required    pam_loginuid.so
-session    optional    pam_console.so
-session    optional    pam_keyinit.so force revoke
-session    required    pam_namespace.so
-session    include     system-auth
--session   optional    pam_kwallet.so
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.mga6 b/redhat/main/tdebase/pamd.kdm-trinity.mga6
deleted file mode 100644
index cb0982c9a..000000000
--- a/redhat/main/tdebase/pamd.kdm-trinity.mga6
+++ /dev/null
@@ -1,15 +0,0 @@
-#%PAM-1.0
-auth       required    pam_env.so
-auth       required    pam_succeed_if.so 
-auth       sufficient  pam_succeed_if.so user ingroup nopasswdlogin
-auth       substack    system-auth
--auth      optional    pam_kwallet.so
-account    required    pam_nologin.so
-account    include     system-auth
-password   include     system-auth
-session    required    pam_loginuid.so
-session    optional    pam_console.so
-session    optional    pam_keyinit.so force revoke
-session    required    pam_namespace.so
-session    include     system-auth
--session   optional    pam_kwallet.so
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.mga7 b/redhat/main/tdebase/pamd.kdm-trinity.mga7
deleted file mode 100644
index cb0982c9a..000000000
--- a/redhat/main/tdebase/pamd.kdm-trinity.mga7
+++ /dev/null
@@ -1,15 +0,0 @@
-#%PAM-1.0
-auth       required    pam_env.so
-auth       required    pam_succeed_if.so 
-auth       sufficient  pam_succeed_if.so user ingroup nopasswdlogin
-auth       substack    system-auth
--auth      optional    pam_kwallet.so
-account    required    pam_nologin.so
-account    include     system-auth
-password   include     system-auth
-session    required    pam_loginuid.so
-session    optional    pam_console.so
-session    optional    pam_keyinit.so force revoke
-session    required    pam_namespace.so
-session    include     system-auth
--session   optional    pam_kwallet.so
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.el4 b/redhat/main/tdebase/pamd.kscreensaver-trinity.el4
deleted file mode 100644
index 48e0276a6..000000000
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.el4
+++ /dev/null
@@ -1,11 +0,0 @@
-#%PAM-1.0
-auth       required	pam_stack.so service=system-auth
-auth       required	pam_nologin.so
-auth       sufficient	pam_timestamp.so
-account    required	pam_stack.so service=system-auth
-password   required	pam_stack.so service=system-auth
-session    required	pam_stack.so service=system-auth
-session    required  pam_loginuid.so
-session    optional	pam_timestamp.so
-session    optional	pam_selinux.so
-session    optional	pam_console.so
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc31 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc31
deleted file mode 100644
index 0a37e6e13..000000000
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc31
+++ /dev/null
@@ -1,5 +0,0 @@
-#%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.kscreensaver-trinity.fc32 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc32
deleted file mode 100644
index 0a37e6e13..000000000
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc32
+++ /dev/null
@@ -1,5 +0,0 @@
-#%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.kscreensaver-trinity.fc33 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc33
deleted file mode 100644
index 0a37e6e13..000000000
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc33
+++ /dev/null
@@ -1,5 +0,0 @@
-#%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.kscreensaver-trinity.mga5 b/redhat/main/tdebase/pamd.kscreensaver-trinity.mga5
deleted file mode 100644
index 0a37e6e13..000000000
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.mga5
+++ /dev/null
@@ -1,5 +0,0 @@
-#%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.kscreensaver-trinity.mga6 b/redhat/main/tdebase/pamd.kscreensaver-trinity.mga6
deleted file mode 100644
index 0a37e6e13..000000000
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.mga6
+++ /dev/null
@@ -1,5 +0,0 @@
-#%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.kscreensaver-trinity.mga7 b/redhat/main/tdebase/pamd.kscreensaver-trinity.mga7
deleted file mode 100644
index 0a37e6e13..000000000
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.mga7
+++ /dev/null
@@ -1,5 +0,0 @@
-#%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/tdm.service.mga6 b/redhat/main/tdebase/tdm.service.mga6
deleted file mode 100644
index eda2906e2..000000000
--- a/redhat/main/tdebase/tdm.service.mga6
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Trinity Display Manager
-Documentation=man:tdm(1)
-Conflicts=getty@tty1.service
-After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service systemd-logind.service
-
-[Service]
-ExecStart=/opt/trinity/bin/tdm
-Restart=always
-
-[Install]
-Alias=display-manager.service
diff --git a/redhat/main/tdebase/tdm.service.mga7 b/redhat/main/tdebase/tdm.service.mga7
deleted file mode 100644
index eda2906e2..000000000
--- a/redhat/main/tdebase/tdm.service.mga7
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Trinity Display Manager
-Documentation=man:tdm(1)
-Conflicts=getty@tty1.service
-After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service systemd-logind.service
-
-[Service]
-ExecStart=/opt/trinity/bin/tdm
-Restart=always
-
-[Install]
-Alias=display-manager.service