372 files changed, 4271 insertions, 1975 deletions

diff --git a/redhat/Makefile b/redhat/Makefile
index 440ddb369..cf87f272c 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -1,7 +1,7 @@
 SHELL := /bin/bash
 PATH := $(PATH):$(shell pwd)/build
 TDE_VERSION := $(shell echo $${TDE_VERSION:-14.1.0})
-TDE_GIT_DIR := $(shell cd ../../tde; pwd)
+TDE_GIT_DIR := $(shell cd ../..; pwd)
 TDE_PACKAGING_DIR := $(shell [ -n "$${TDE_PACKAGING_DIR}" ] && cd "$${TDE_PACKAGING_DIR}" || cd ..; pwd)
 RPMDIR := "$(shell rpm -E %{_rpmdir}.tde-$(TDE_VERSION))"
 DIST := $(shell rpm -E %dist)
@@ -23,42 +23,37 @@ buildpkg = \
   echo
 
 
-all:	common dependencies main libraries applications i18n meta
-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 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 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-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-suse2 wlassistant yakuake
-i18n:	gwenview-i18n k3b-i18n koffice-i18n tde-i18n
-
-### Trinity Common
-
-cmake:
-	$(call buildpkg,common/cmake)
+all: dependencies core libraries applications i18n meta external
+dependencies: tde-cmake tqt3 tqtinterface akode arts libart_lgpl libcaldav libcarddav polkit-tqt pytqt sip4-tqt tqca tqscintilla avahi-tqt dbus-tqt dbus-1-tqt
+core: 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 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 tdebluez 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 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)
 
 polkit-tqt: tqtinterface dbus-1-tqt
@@ -66,15 +61,16 @@ ifeq (,$(filter $(DIST), .el5 .el6 ))
 	$(call buildpkg,dependencies/polkit-tqt)
 endif
 
-python-tqt: sip4-tqt tdelibs tqscintilla
-ifeq (,$(filter $(DIST), .oss154 ))
-	$(call buildpkg,dependencies/python-tqt)
-endif
+pytqt: sip4-tqt tdelibs tqscintilla
+	$(call buildpkg,dependencies/pytqt)
 
 sip4-tqt:
 	$(call buildpkg,dependencies/sip4-tqt)
 
-tqca:	tqtinterface
+tde-cmake:
+	$(call buildpkg,dependencies/tde-cmake)
+
+tqca: tqtinterface
 	$(call buildpkg,dependencies/tqca)
 
 tqscintilla: tqca tdelibs
@@ -83,63 +79,63 @@ tqscintilla: tqca tdelibs
 tqt3:
 	$(call buildpkg,dependencies/tqt3)
 
-tqtinterface:	tqt3
+tqtinterface: tqt3
 	$(call buildpkg,dependencies/tqtinterface)
 
-# Main packages
-tdeaccessibility:	tdebase tdemultimedia
-	$(call buildpkg,main/tdeaccessibility)
+# Core packages
+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 pinentry-tqt
-	$(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 tde-cmake
+	$(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 tdepim
-	$(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:
@@ -153,7 +149,7 @@ ifneq (,$(filter $(DIST), .mga6 .mga7 .mga8 .oss151 .oss152 .oss153 .oss154 .oss
 endif
 
 htdig:
-ifneq (,$(filter $(DIST), .el7 .el8 .mga6 .mga7 .mga8 ))
+ifneq (,$(filter $(DIST), .el7 .el8 .el9 .mga6 .mga7 .mga8 ))
 	$(call buildpkg,extras/htdig)
 endif
 
@@ -163,7 +159,7 @@ ifneq (,$(filter $(DIST), .mga6 .mga7 .oss151 .osstw ))
 endif
 
 lcms:
-ifneq (,$(filter $(DIST), .el7 .el8 .mga7 .mga8 .oss151 .oss152 .oss153 .oss154 .osstw ))
+ifneq (,$(filter $(DIST), .el7 .el8 .el9 .mga7 .mga8 .oss151 .oss152 .oss153 .oss154 .osstw ))
 	$(call buildpkg,3rdparty/lcms)
 endif
 
@@ -171,7 +167,7 @@ libbeagle:
 	$(call buildpkg,3rdparty/libbeagle)
 
 mp4v2:
-ifneq (,$(filter $(DIST), .oss151 .oss152 .oss153 .oss154 .osstw ))
+ifneq (,$(filter $(DIST), .el9 .oss151 .oss152 .oss153 .osstw ))
 	$(call buildpkg,3rdparty/mp4v2)
 endif
 
@@ -193,459 +189,459 @@ ifneq (,$(filter $(DIST),.oss150 .oss151))
 endif
 
 wv2:
-ifneq (,$(filter $(DIST), .el5 .el6 .el7 .el8 .fc30 .fc31 .fc32 .fc33 .fc34 .fc35 .fc36 ))
+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
-ifeq (,$(filter $(DIST), .oss154 ))
+pytdeextensions: tqtinterface pytde
 	$(call buildpkg,libraries/pytdeextensions)
-endif
 
-python-trinity:	tqtinterface python-tqt
-ifeq (,$(filter $(DIST), .oss154 ))
-	$(call buildpkg,libraries/python-trinity)
-endif
+pytde: tqtinterface pytqt
+	$(call buildpkg,libraries/pytde)
 
 ### 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/k3b)
+k3b: tdebase
+	$(call buildpkg,applications/multimedia/k3b)
 
-k9copy:	tdebase k3b
-	$(call buildpkg,applications/k9copy)
+k9copy: tdebase k3b
+	$(call buildpkg,applications/multimedia/k9copy)
 
-kaffeine:	tdebase
-	$(call buildpkg,applications/kaffeine)
+kaffeine: tdebase
+	$(call buildpkg,applications/multimedia/kaffeine)
 
-kaffeine-mozilla:	tdebase kaffeine
-	$(call buildpkg,applications/kaffeine-mozilla)
+kaffeine-mozilla: tdebase kaffeine
+	$(call buildpkg,applications/multimedia/kaffeine-mozilla)
 
-kasablanca:	tdebase
-	$(call buildpkg,applications/kasablanca)
+kasablanca: tdebase
+	$(call buildpkg,applications/internet/kasablanca)
 
-katapult:	tdebase
-	$(call buildpkg,applications/katapult)
+katapult: tdebase
+	$(call buildpkg,applications/system/katapult)
 
-kbarcode:	tdebase
-	$(call buildpkg,applications/kbarcode)
+kbarcode: tdebase
+	$(call buildpkg,applications/utilities/kbarcode)
 
-kbfx:	tdebase
-	$(call buildpkg,applications/kbfx)
+kbfx: tdebase
+	$(call buildpkg,applications/system/kbfx)
 
-kbibtex:	tdebase
-	$(call buildpkg,applications/kbibtex)
+kbibtex: tdebase
+	$(call buildpkg,applications/office/kbibtex)
 
-kbiff:	tdebase
-	$(call buildpkg,applications/kbiff)
+kbiff: tdebase
+	$(call buildpkg,applications/internet/kbiff)
 
-kbookreader:	tdebase
-	$(call buildpkg,applications/kbookreader)
+kbookreader: tdebase
+	$(call buildpkg,applications/office/kbookreader)
 
-kchmviewer:	tdebase
-	$(call buildpkg,applications/kchmviewer)
+kchmviewer: tdebase
+	$(call buildpkg,applications/utilities/kchmviewer)
 
-kcmautostart:	tdebase
-	$(call buildpkg,applications/kcmautostart)
+kcmautostart: tdebase
+	$(call buildpkg,applications/system/kcmautostart)
 
-kcmldap:	tdebase libtdeldap
-	$(call buildpkg,applications/kcmldap)
+kcmldap: tdebase libtdeldap
+	$(call buildpkg,applications/misc/kcmldap)
 
-kcmldapcontroller:	tdebase kcmldap
-	$(call buildpkg,applications/kcmldapcontroller)
+kcmldapcontroller: tdebase kcmldap
+	$(call buildpkg,applications/misc/kcmldapcontroller)
 
-kcmldapmanager:	tdebase kcmldap
-	$(call buildpkg,applications/kcmldapmanager)
+kcmldapmanager: tdebase kcmldap
+	$(call buildpkg,applications/misc/kcmldapmanager)
 
-kcpuload:	tdebase
-	$(call buildpkg,applications/kcpuload)
+kcpuload: tdebase
+	$(call buildpkg,applications/utilities/kcpuload)
 
-kdbg:	tdebase
-	$(call buildpkg,applications/kdbg)
+kdbg: tdebase
+	$(call buildpkg,applications/development/kdbg)
 
-kdbusnotification:	tdebase
-	$(call buildpkg,applications/kdbusnotification)
+kdbusnotification: tdebase
+	$(call buildpkg,applications/system/kdbusnotification)
 
-kdiff3:	tdebase
-	$(call buildpkg,applications/kdiff3)
+kdiff3: tdebase
+	$(call buildpkg,applications/development/kdiff3)
 
-kdirstat:	tdebase
-	$(call buildpkg,applications/kdirstat)
+kdirstat: tdebase
+	$(call buildpkg,applications/utilities/kdirstat)
 
-kdpkg:	tdebase
-	$(call buildpkg,applications/kdpkg)
+kdpkg: tdebase
+	$(call buildpkg,applications/settings/kdpkg)
 
-keep:	tdebase rdiff-backup
-	$(call buildpkg,applications/keep)
+keep: tdebase rdiff-backup
+	$(call buildpkg,applications/utilities/keep)
 
-kerberostray:	tdebase
-	$(call buildpkg,applications/kerberostray)
+kerberostray: tdebase
+	$(call buildpkg,applications/misc/kerberostray)
 
-keximdb:	tdebase koffice
-	$(call buildpkg,applications/keximdb)
+keximdb: tdebase koffice
+	$(call buildpkg,applications/office/keximdb)
 
-kftpgrabber:	tdebase
-	$(call buildpkg,applications/kftpgrabber)
+kftpgrabber: tdebase
+	$(call buildpkg,applications/internet/kftpgrabber)
 
-kgtk-qt3:	tdebase
-	$(call buildpkg,applications/kgtk-qt3)
+kgtk-qt3: tdebase
+	$(call buildpkg,applications/themes/kgtk-qt3)
 
-kile:	tdebase
-	$(call buildpkg,applications/kile)
+kile: tdebase
+	$(call buildpkg,applications/office/kile)
 
-kima:	tdebase
-	$(call buildpkg,applications/kima)
+kima: tdebase
+	$(call buildpkg,applications/settings/kima)
 
-kiosktool:	tdebase
-	$(call buildpkg,applications/kiosktool)
+kiosktool: tdebase
+	$(call buildpkg,applications/settings/kiosktool)
 
-kkbswitch:	tdebase
-	$(call buildpkg,applications/kkbswitch)
+kkbswitch: tdebase
+	$(call buildpkg,applications/settings/kkbswitch)
 
-klamav:	tdebase
+klamav: tdebase
 # Requires clamav >= 0.101.0
 ifeq (,$(filter $(DIST), .el5 .el6 .mga6))
-	$(call buildpkg,applications/klamav)
+	$(call buildpkg,applications/system/klamav)
 endif
 
-klcddimmer:	tdebase
-	$(call buildpkg,applications/klcddimmer)
-
-kmplayer:	tdebase
-	$(call buildpkg,applications/kmplayer)
+klcddimmer: tdebase
+	$(call buildpkg,applications/settings/klcddimmer)
 
-kmyfirewall:	tdebase
-	$(call buildpkg,applications/kmyfirewall)
+kmplayer: tdebase
+	$(call buildpkg,applications/multimedia/kmplayer)
 
-kmymoney:	tdebase recode
-	$(call buildpkg,applications/kmymoney)
+kmyfirewall: tdebase
+	$(call buildpkg,applications/settings/kmyfirewall)
 
-knemo:	tdebase
-	$(call buildpkg,applications/knemo)
+kmymoney: tdebase recode
+	$(call buildpkg,applications/office/kmymoney)
 
-knetload:	tdebase
-	$(call buildpkg,applications/knetload)
+knemo: tdebase
+	$(call buildpkg,applications/system/knemo)
 
-knetstats:	tdebase
-	$(call buildpkg,applications/knetstats)
+knetload: tdebase
+	$(call buildpkg,applications/system/knetload)
 
-knetworkmanager8:	tdebase
-ifneq (,$(filter $(DIST),.el6))
-	$(call buildpkg,applications/knetworkmanager8)
-endif
+knetstats: tdebase
+	$(call buildpkg,applications/system/knetstats)
 
-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)
 
-kompose:	tdebase
-	$(call buildpkg,applications/kompose)
+kompose: tdebase
+	$(call buildpkg,applications/utilities/kompose)
 
-konversation:	tdebase
-	$(call buildpkg,applications/konversation)
+konversation: tdebase
+	$(call buildpkg,applications/internet/konversation)
 
-kooldock:	tdebase
-	$(call buildpkg,applications/kooldock)
+kooldock: tdebase
+	$(call buildpkg,applications/system/kooldock)
 
-kopete-otr:	tdebase tdenetwork
-	$(call buildpkg,applications/kopete-otr)
+kopete-otr: tdebase tdenetwork
+	$(call buildpkg,applications/internet/kopete-otr)
 
-kpicosim:	tdebase
-	$(call buildpkg,applications/kpicosim)
+kpicosim: tdebase
+	$(call buildpkg,applications/development/kpicosim)
 
-kpilot:	tdebase tdepim
+kpilot: tdebase tdepim
 ifeq (,$(filter $(DIST),.el5 .oss154 .osstw))
-	$(call buildpkg,applications/kpilot)
+	$(call buildpkg,applications/office/kpilot)
 endif
 
-kpowersave:	tdebase
-	$(call buildpkg,applications/kpowersave)
+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
-	$(call buildpkg,applications/mplayerthumbs)
+mplayerthumbs: tdebase
+	$(call buildpkg,applications/multimedia/mplayerthumbs)
 
-piklab:	tdebase
-	$(call buildpkg,applications/piklab)
+piklab: tdebase
+	$(call buildpkg,applications/development/piklab)
 
-polkit-agent-tde:	tdebase
+polkit-agent-tde: tdebase
 ifeq (,$(filter $(DIST), .el5 .el6 ))
-	$(call buildpkg,applications/polkit-agent-tde)
+	$(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 .oss153 .oss154 .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)
+
+tdebluez:
+	$(call buildpkg,applications/system/tdebluez)
 
-tdedocker:	tdebase
-	$(call buildpkg,applications/tdedocker)
+tdedocker: tdebase
+	$(call buildpkg,applications/system/tdedocker)
 
-tde-guidance:	tdebase pytdeextensions
-ifeq (,$(filter $(DIST), .oss154 ))
-	$(call buildpkg,applications/tde-guidance)
+tde-guidance: tdebase pytdeextensions
+	$(call buildpkg,applications/settings/tde-guidance)
+
+tdeio-appinfo: tdebase
+ifeq (,$(filter $(DIST), .el5 .el6 ))
+	$(call buildpkg,applications/tdeio/tdeio-appinfo)
 endif
 
-tdeio-apt:	tdebase
-	$(call buildpkg,applications/tdeio-apt)
+tdeio-apt: tdebase
+	$(call buildpkg,applications/tdeio/tdeio-apt)
 
-tdeio-ftps:	tdebase
-	$(call buildpkg,applications/tdeio-ftps)
+tdeio-ftps: tdebase
+	$(call buildpkg,applications/tdeio/tdeio-ftps)
 
-tdeio-gopher:	tdebase
-	$(call buildpkg,applications/tdeio-gopher)
+tdeio-gopher: tdebase
+	$(call buildpkg,applications/tdeio/tdeio-gopher)
 
-tdeio-locate:	tdebase
-	$(call buildpkg,applications/tdeio-locate)
+tdeio-locate: tdebase
+	$(call buildpkg,applications/tdeio/tdeio-locate)
 
-tdeio-sword:	tdebase
-	$(call buildpkg,applications/tdeio-sword)
+tdeio-sword: tdebase
+	$(call buildpkg,applications/tdeio/tdeio-sword)
 
-tdeio-umountwrapper:	tdebase
-	$(call buildpkg,applications/tdeio-umountwrapper)
+tdeio-umountwrapper: tdebase
+	$(call buildpkg,applications/tdeio/tdeio-umountwrapper)
 
-tdenetworkmanager:	tdebase
+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)
 
-tdesshaskpass:	tdebase
-	$(call buildpkg,applications/tdesshaskpass)
+tdesshaskpass: tdebase
+	$(call buildpkg,applications/system/tdesshaskpass)
 
-tde-style-baghira:	tdebase
-	$(call buildpkg,applications/tde-style-baghira)
+tde-style-baghira: tdebase
+	$(call buildpkg,applications/themes/tde-style-baghira)
 
-tde-style-domino:	tdebase
-	$(call buildpkg,applications/tde-style-domino)
+tde-style-domino: tdebase
+	$(call buildpkg,applications/themes/tde-style-domino)
 
-tde-style-ia-ora:	tdebase
-	$(call buildpkg,applications/tde-style-ia-ora)
+tde-style-ia-ora: tdebase
+	$(call buildpkg,applications/themes/tde-style-ia-ora)
 
-tde-style-lipstik:	tdebase
-	$(call buildpkg,applications/tde-style-lipstik)
+tde-style-lipstik: tdebase
+	$(call buildpkg,applications/themes/tde-style-lipstik)
 
-tde-style-qtcurve:	tdebase
-	$(call buildpkg,applications/tde-style-qtcurve)
+tde-style-qtcurve: tdebase
+	$(call buildpkg,applications/themes/tde-style-qtcurve)
 
-tdesudo:	tdebase
-	$(call buildpkg,applications/tdesudo)
+tdesudo: tdebase
+	$(call buildpkg,applications/settings/tdesudo)
 
-tdesvn:	tdebase
-	$(call buildpkg,applications/tdesvn)
+tdesvn: tdebase
+	$(call buildpkg,applications/development/tdesvn)
 
-tde-systemsettings:	tdebase
-	$(call buildpkg,applications/tde-systemsettings)
+tde-systemsettings: tdebase
+	$(call buildpkg,applications/settings/tde-systemsettings)
 
-tdmtheme:	tdebase
+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)
 
-tork:	tdebase
-	$(call buildpkg,applications/tork)
+twin-style-crystal: tdebase
+	$(call buildpkg,applications/themes/twin-style-crystal)
 
-twin-style-crystal:	tdebase
-	$(call buildpkg,applications/twin-style-crystal)
+twin-style-dekorator: tdebase
+	$(call buildpkg,applications/themes/twin-style-dekorator)
 
-twin-style-dekorator:	tdebase
-	$(call buildpkg,applications/twin-style-dekorator)
+twin-style-machbunt: tdebase
+	$(call buildpkg,applications/themes/twin-style-machbunt)
 
 twin-style-suse2: tdebase
-	$(call buildpkg,applications/twin-style-suse2)
+	$(call buildpkg,applications/themes/twin-style-suse2)
 
-wlassistant:	tdebase
-	$(call buildpkg,applications/wlassistant)
+wlassistant: tdebase
+	$(call buildpkg,applications/settings/wlassistant)
 
-yakuake:	tdebase
-	$(call buildpkg,applications/yakuake)
+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
@@ -656,7 +652,7 @@ meta:
 fileshareset:
 	$(call buildpkg,extras/fileshareset)
 
-pinentry-tqt:	tqtinterface
+pinentry-tqt: tqtinterface
 ifeq (,$(filter $(DIST), .el5 .el6 .el7 ))
 	$(call buildpkg,extras/pinentry-tqt)
 endif
diff --git a/redhat/applications/adept/adept.spec b/redhat/applications/adept/adept.spec
deleted file mode 100644
index ba1c416f4..000000000
--- a/redhat/applications/adept/adept.spec
+++ /dev/null
@@ -1,208 +0,0 @@
-#
-# spec file for package adept (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/
-#
-
-# Default version for this component
-%define tde_pkg adept
-%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
-%endif
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		Package management suite for Trinity
-Version:		2.1.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://lpnotfr.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-util
-
-BuildRequires:	libapt-front-devel
-
-Requires:		%{name}-manager = %{version}-%{release}
-Requires:		%{name}-installer = %{version}-%{release}
-Requires:		%{name}-updater = %{version}-%{release}
-Requires:		%{name}-notifier = %{version}-%{release}
-Requires:		%{name}-batch = %{version}-%{release}
-
-
-%description
-These packages belong to the adept suite:
- * adept-manager - package manager
- * adept-installer - application manager
- * adept-updater - system upgrade wizard
- * adept-notifier - systray notification of available updates
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS CHANGELOG ChangeLog COPYING
-
-##########
-
-%package common
-Requires:		trinity-konsole
-Summary:		Package manager for Trinity -- common files
-
-%description common
-Icons and other common files for all adept components.
-
-##########
-
-%package manager
-Requires:		%{name}-common = %{version}-%{release}
-Summary:		package manager for Trinity
- 
-%description manager
-Adept Manager is a graphical user interface for package management.
-
-Besides these basic functions the following features are provided:
- * Search and filter the list of available packages (also using debtags)
- * Perform smart system upgrades
- * Edit the list of used repositories (sources.list)
- * Configure packages through the debconf system
-
-Please also install libtqt-perl if you want the TDE Debconf frontend
-to function.
-
-##########
-
-%package installer
-Requires:		%{name}-common = %{version}-%{release}
-Summary:		simple user interface for application management (for Trinity)
-
-%description installer
-Adept Installer presents a list of applications available through the
-Advanced Package Tool (APT). An application is considered a package
-that contains a .desktop file for use with TDE, GNOME or other
-desktop environment.
-
-##########
-
-%package updater
-Requires:		%{name}-common = %{version}-%{release}
-Summary:		system update tool for Trinity
-
-%description updater
-Adept Updater provides a simple wizard-style user interface to system
-upgrades. It uses same algorithms as apt-get dist-upgrade.
-
-##########
-
-%package notifier
-Requires:		%{name}-common = %{version}-%{release}
-Requires:		%{name}-updater = %{version}-%{release}
-Summary:		System tray notifier of available system updates
- 
-%description notifier
-Adept Notifier provides a system tray icon notifying the user of
-available updates.  It will run Adept Updater for the user when
-clicked.
-
-##########
-
-%package batch
-Requires:		%{name}-manager = %{version}-%{release}
-Summary:		command line install for Adept
-
-%description batch
-Adept Batch lets you install packages with Adept from the
-command line.  It is intended for shell scripts and being run
-by external applications.
-
-##########
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-##########
-
-%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} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  \
-  --enable-rpath \
-  --enable-closure \
-  \
-  --with-extra-includes=%{_includedir}/tqt3 \
-  \
-  --enable-adept
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-
-%changelog
diff --git a/redhat/applications/kdbg/kdbg.spec b/redhat/applications/development/kdbg/kdbg.spec
index 628167d81..593ff73da 100644
--- a/redhat/applications/kdbg/kdbg.spec
+++ b/redhat/applications/development/kdbg/kdbg.spec
@@ -63,7 +63,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires: libtool m4
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
@@ -130,6 +130,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/kdiff3/kdiff3.spec b/redhat/applications/development/kdiff3/kdiff3.spec
index 6eba92631..085e83b9f 100644
--- a/redhat/applications/kdiff3/kdiff3.spec
+++ b/redhat/applications/development/kdiff3/kdiff3.spec
@@ -60,7 +60,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 187bcf3c1..bd6a45ea8 100644
--- a/redhat/applications/kpicosim/kpicosim.spec
+++ b/redhat/applications/development/kpicosim/kpicosim.spec
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 \
diff --git a/redhat/applications/kscope/kscope.spec b/redhat/applications/development/kscope/kscope.spec
index ad3b6bbd7..36bade6eb 100644
--- a/redhat/applications/kscope/kscope.spec
+++ b/redhat/applications/development/kscope/kscope.spec
@@ -63,7 +63,7 @@ BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 Requires:		cscope
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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_NO_BUILTIN_CHRPATH=ON \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
diff --git a/redhat/applications/ktechlab/ktechlab.spec b/redhat/applications/development/ktechlab/ktechlab.spec
index 095cdfeaf..84364ac92 100644
--- a/redhat/applications/ktechlab/ktechlab.spec
+++ b/redhat/applications/development/ktechlab/ktechlab.spec
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -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_NO_BUILTIN_CHRPATH=ON \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
diff --git a/redhat/applications/kxmleditor/kxmleditor.spec b/redhat/applications/development/kxmleditor/kxmleditor.spec
index 13fc08a17..e380101ae 100644
--- a/redhat/applications/kxmleditor/kxmleditor.spec
+++ b/redhat/applications/development/kxmleditor/kxmleditor.spec
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 ff8d574d2..ddc1c3123 100644
--- a/redhat/applications/piklab/piklab.spec
+++ b/redhat/applications/development/piklab/piklab.spec
@@ -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 7ee60eec3..98047b557 100644
--- a/redhat/applications/tdesvn/tdesvn.spec
+++ b/redhat/applications/development/tdesvn/tdesvn.spec
@@ -60,7 +60,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires: libtool
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
@@ -91,7 +91,7 @@ BuildRequires:	libidn-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 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
@@ -117,7 +117,7 @@ applications like konqueror via the TDE component technology KParts.
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%doc AUTHORS ChangeLog COPYING
 %{tde_bindir}/tdesvn
 %{tde_bindir}/tdesvnaskpass
 %{tde_tdelibdir}/tdesvnpart.la
@@ -267,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 \
@@ -275,7 +276,7 @@ fi
   -DBIN_INSTALL_DIR=%{tde_bindir} \
   -DINCLUDE_INSTALL_DIR=%{tde_includedir} \
   -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DMAN_INSTALL_DIR=%{tde_mandir}/man1 \
+  -DMAN_INSTALL_DIR=%{tde_mandir} \
   -DPKGCONFIG_INSTALL_DIR=%{tde_tdelibdir}/pkgconfig \
   -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
   \
diff --git a/redhat/applications/filelight-l10n/filelight-l10n.spec b/redhat/applications/filelight-l10n/filelight-l10n.spec
deleted file mode 100644
index 1525e5eb3..000000000
--- a/redhat/applications/filelight-l10n/filelight-l10n.spec
+++ /dev/null
@@ -1,112 +0,0 @@
-# Default version for this component
-%define kdecomp filelight-l10n
-
-%define debug_package %{nil}
-
-
-# TDE 3.5.13 specific building variables
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-Name:		trinity-%{kdecomp}
-Summary:	Localization (l10n) for Filelight, disk space usage tool [Trinity]
-Version:	1.0
-Release:	2%{?dist}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-%if 0%{?fedora} > 0 || 0%{?rhel} >= 6
-BuildArch:	noarch
-%endif
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-Requires:		trinity-filelight
-
-%description
-This package provides localization(l10n) files (translations and docs) for
-Filelight, Filelight allows you to understand your disk usage by graphically
-representing your filesystem as a set of concentric, segmented rings.
-
-See the 'filelight' package description for more information.
-
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-# Removes 'en' (primary) language HTML doc, since it is already in main package.
-%__rm -rf doc/filelight
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -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 || : ; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{_includedir}"
-
-./configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --datadir=%{tde_datadir} \
-  --docdir=%{tde_tdedocdir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang filelight --with-kde
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-
-%files -f filelight.lang
-%defattr(-,root,root,-)
-
-
-%changelog
diff --git a/redhat/applications/knights/knights.spec b/redhat/applications/games/knights/knights.spec
index 200d6e915..027d087be 100644
--- a/redhat/applications/knights/knights.spec
+++ b/redhat/applications/games/knights/knights.spec
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 f6ab3805d..348b72e65 100644
--- a/redhat/applications/tdepacman/tdepacman.spec
+++ b/redhat/applications/games/tdepacman/tdepacman.spec
@@ -66,7 +66,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 \
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 5c4815399..5c4815399 100644
--- a/redhat/applications/digikam/digikam.spec
+++ b/redhat/applications/graphics/digikam/digikam.spec
diff --git a/redhat/applications/gwenview-i18n/gwenview-i18n.spec b/redhat/applications/graphics/gwenview-i18n/gwenview-i18n.spec
index 2c11af151..e39d2a6da 100644
--- a/redhat/applications/gwenview-i18n/gwenview-i18n.spec
+++ b/redhat/applications/graphics/gwenview-i18n/gwenview-i18n.spec
@@ -66,7 +66,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -151,7 +151,7 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %files -f gwenview.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING TODO
+%doc AUTHORS COPYING
 %lang(da) %{tde_tdedocdir}/HTML/da/gwenview/
 %lang(de) %{tde_tdedocdir}/HTML/de/gwenview/
 %lang(et) %{tde_tdedocdir}/HTML/et/gwenview/
diff --git a/redhat/applications/gwenview/gwenview.spec b/redhat/applications/graphics/gwenview/gwenview.spec
index 723996a29..723996a29 100644
--- a/redhat/applications/gwenview/gwenview.spec
+++ b/redhat/applications/graphics/gwenview/gwenview.spec
diff --git a/redhat/applications/ksquirrel/ksquirrel.spec b/redhat/applications/graphics/ksquirrel/ksquirrel.spec
index fc17cceda..fc17cceda 100644
--- a/redhat/applications/ksquirrel/ksquirrel.spec
+++ b/redhat/applications/graphics/ksquirrel/ksquirrel.spec
diff --git a/redhat/applications/potracegui/potracegui.spec b/redhat/applications/graphics/potracegui/potracegui.spec
index 87760d1cf..173c739c1 100644
--- a/redhat/applications/potracegui/potracegui.spec
+++ b/redhat/applications/graphics/potracegui/potracegui.spec
@@ -60,7 +60,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 \
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 373c65ab3..000000000
--- a/redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../ubuntu/xenial/applications/themes/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 62aa57f04..000000000
--- a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde4
+++ /dev/null
@@ -1 +0,0 @@
-../../../ubuntu/xenial/applications/themes/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 2d0ca2867..000000000
--- a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4
+++ /dev/null
@@ -1 +0,0 @@
-../../../ubuntu/xenial/applications/themes/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 a9c342fcd..06004d5f4 100644
--- a/redhat/applications/kasablanca/kasablanca.spec
+++ b/redhat/applications/internet/kasablanca/kasablanca.spec
@@ -63,7 +63,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext 
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 \
diff --git a/redhat/applications/kbiff/kbiff.spec b/redhat/applications/internet/kbiff/kbiff.spec
index 8cca38c4f..b7dcdd2ba 100644
--- a/redhat/applications/kbiff/kbiff.spec
+++ b/redhat/applications/internet/kbiff/kbiff.spec
@@ -64,7 +64,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 \
diff --git a/redhat/applications/kftpgrabber/kftpgrabber.spec b/redhat/applications/internet/kftpgrabber/kftpgrabber.spec
index 1757ef3a0..6dd764389 100644
--- a/redhat/applications/kftpgrabber/kftpgrabber.spec
+++ b/redhat/applications/internet/kftpgrabber/kftpgrabber.spec
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 \
diff --git a/redhat/applications/knmap/knmap.spec b/redhat/applications/internet/knmap/knmap.spec
index 4b9b3b822..6317ab30d 100644
--- a/redhat/applications/knmap/knmap.spec
+++ b/redhat/applications/internet/knmap/knmap.spec
@@ -62,7 +62,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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/konversation/konversation.spec b/redhat/applications/internet/konversation/konversation.spec
index 80e0b7e39..f368e749f 100644
--- a/redhat/applications/konversation/konversation.spec
+++ b/redhat/applications/internet/konversation/konversation.spec
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -74,6 +74,13 @@ BuildRequires:	libidn-devel
 # OPENSSL support
 BuildRequires:	openssl-devel
 
+# PYTHON support
+%global python python3
+%global __python %__python3
+%global python_sitearch %{python3_sitearch}
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
+BuildRequires:	%{python}
+BuildRequires:	%{python}-devel
 
 # SUSE desktop files utility
 %if 0%{?suse_version}
@@ -110,6 +117,7 @@ BuildRequires:	libXi6-devel
 #  RHEL 6: available in EPEL
 #  RHEL 7: available in NUX
 #  RHEL 8: available in EPEL
+#  RHEL 9: available in EPEL
 %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
 %define with_xscreensaver 1
 
@@ -182,7 +190,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
 
 
@@ -201,6 +209,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 \
@@ -263,6 +272,8 @@ export PATH="%{tde_bindir}:${PATH}"
 %{tde_datadir}/icons/crystalsvg/scalable/actions/konv_message.svgz
 %{tde_datadir}/icons/hicolor/*/apps/konversation.png
 %{tde_datadir}/icons/hicolor/scalable/apps/konversation.svgz
+%{tde_mandir}/man1/konversation.1*
+%{tde_mandir}/man1/konversationircprotocolhandler.1*
 
 
 %changelog
diff --git a/redhat/applications/kopete-otr/kopete-otr.spec b/redhat/applications/internet/kopete-otr/kopete-otr.spec
index 90d3bf659..df690fe31 100644
--- a/redhat/applications/kopete-otr/kopete-otr.spec
+++ b/redhat/applications/internet/kopete-otr/kopete-otr.spec
@@ -68,7 +68,7 @@ BuildRequires:	trinity-tdenetwork-devel >= %{tde_version}
 # Kopete is provided by tdenetwork
 Requires:		trinity-kopete >= %{tde_version}
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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_NO_BUILTIN_CHRPATH=ON \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
diff --git a/redhat/applications/kshowmail/kshowmail.spec b/redhat/applications/internet/kshowmail/kshowmail.spec
index 74044fd96..286488b60 100644
--- a/redhat/applications/kshowmail/kshowmail.spec
+++ b/redhat/applications/internet/kshowmail/kshowmail.spec
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	trinity-tdepim-devel >= %{tde_version}
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 \
diff --git a/redhat/applications/kstreamripper/kstreamripper.spec b/redhat/applications/internet/kstreamripper/kstreamripper.spec
index b7bd141c4..3360fc21f 100644
--- a/redhat/applications/kstreamripper/kstreamripper.spec
+++ b/redhat/applications/internet/kstreamripper/kstreamripper.spec
@@ -75,7 +75,7 @@ BuildRequires:	update-desktop-files
 BuildRequires:	brp-check-trinity
 %endif
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 ce6aaea3e..4cb54d155 100644
--- a/redhat/applications/ktorrent/ktorrent.spec
+++ b/redhat/applications/internet/ktorrent/ktorrent.spec
@@ -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 da3af96ad..da3af96ad 100644
--- a/redhat/applications/kvirc/kvirc.spec
+++ b/redhat/applications/internet/kvirc/kvirc.spec
diff --git a/redhat/applications/kvpnc/kvpnc.spec b/redhat/applications/internet/kvpnc/kvpnc.spec
index 9377caf39..2a9d9ca92 100644
--- a/redhat/applications/kvpnc/kvpnc.spec
+++ b/redhat/applications/internet/kvpnc/kvpnc.spec
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 \
diff --git a/redhat/applications/smb4k/smb4k.spec b/redhat/applications/internet/smb4k/smb4k.spec
index 8d1ee44d5..8d1ee44d5 100644
--- a/redhat/applications/smb4k/smb4k.spec
+++ b/redhat/applications/internet/smb4k/smb4k.spec
diff --git a/redhat/applications/tork/tork.spec b/redhat/applications/internet/tork/tork.spec
index d9d1cf771..66d721f6b 100644
--- a/redhat/applications/tork/tork.spec
+++ b/redhat/applications/internet/tork/tork.spec
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	trinity-tdepim-devel >= %{tde_version}
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 \
diff --git a/redhat/applications/knetworkmanager8/knetworkmanager8.spec b/redhat/applications/knetworkmanager8/knetworkmanager8.spec
deleted file mode 100644
index 923d189f4..000000000
--- a/redhat/applications/knetworkmanager8/knetworkmanager8.spec
+++ /dev/null
@@ -1,193 +0,0 @@
-#
-# spec file for package knetworkmanager8 (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.1.0
-%endif
-%define tde_pkg knetworkmanager
-%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.8
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Trinity applet for Network Manager
-Group:		Applications/Internet
-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}8-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-dbus-1-tqt-devel >= 1:0.9
-BuildRequires:	trinity-dbus-tqt-devel >= 1:0.63
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	libtool
-
-# 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%{?rhel} || 0%{?fedora}
-Requires:		NetworkManager-gnome
-%else
-Requires:		networkmanager
-%endif
-
-# NetworkManager support
-BuildRequires:	NetworkManager-glib-devel
-
-# HAL support
-BuildRequires:	hal-devel
-
-Obsoletes:		trinity-knetworkmanager < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description
-KNetworkManager is a system tray applet for controlling network
-connections on systems that use the NetworkManager daemon.
-
-%files -f knetworkmanager.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/knetworkmanager
-%{tde_libdir}/*.la
-%{tde_libdir}/*.so
-%{tde_tdelibdir}/knetworkmanager_openvpn.so.*
-%{tde_tdelibdir}/knetworkmanager_pptp.so.*
-%{tde_tdelibdir}/knetworkmanager_vpnc.so.*
-%{_sysconfdir}/dbus-1/system.d/knetworkmanager.conf
-%{tde_tdeappdir}/knetworkmanager.desktop
-%{tde_datadir}/apps/knetworkmanager
-%{tde_datadir}/icons/hicolor/*/apps/knetworkmanager*
-%{tde_datadir}/servicetypes/knetworkmanager_plugin.desktop
-%{tde_datadir}/servicetypes/knetworkmanager_vpnplugin.desktop
-%{tde_datadir}/services/knetworkmanager_openvpn.desktop
-%{tde_datadir}/services/knetworkmanager_pptp.desktop
-%{tde_datadir}/services/knetworkmanager_vpnc.desktop
-
-##########
-
-%package devel
-Summary:		Common data shared among the MySQL GUI Suites
-Group:			Development/Libraries
-Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-Obsoletes:		trinity-knetworkmanager-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-knetworkmanager-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description devel
-Development headers for knetworkmanager
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/*.h
-%{tde_tdelibdir}/*.la
-%{tde_tdelibdir}/*.so
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-
-%prep 
-%setup -q -n %{name}8-%{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-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} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --disable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility \
-  \
-  --with-openvpn \
-  --with-vpnc \
-  --with-pptp
-
-# Does not support parallel build
-%__make
-
-
-%install
-%__rm -rf $RPM_BUILD_ROOT
-%__make install DESTDIR=%{?buildroot}
-%find_lang knetworkmanager
-
-
-%clean
-%__rm -rf $RPM_BUILD_ROOT
-
-
-%changelog
diff --git a/redhat/applications/kpowersave/kpowersave.spec b/redhat/applications/kpowersave/kpowersave.spec
deleted file mode 100644
index 30563e4fd..000000000
--- a/redhat/applications/kpowersave/kpowersave.spec
+++ /dev/null
@@ -1,210 +0,0 @@
-#
-# spec file for package kpowersave (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.1.0
-%endif
-%define tde_pkg kpowersave
-%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.7.3
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	HAL based power management applet for Trinityfiles or directories.
-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:	hal-devel
-BuildRequires:	trinity-dbus-tqt-devel >= 1:0.63
-
-BuildRequires:	trinity-cmake >= %{tde_version}
-BuildRequires: libtool
-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
-
-# XSCREENSAVER support
-#  RHEL 4: disabled
-#  RHEL 6: available in EPEL
-#  RHEL 7: available in NUX
-#  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
-BuildRequires:	libXScrnSaver-devel
-BuildRequires:	xscreensaver
-BuildRequires:	xscreensaver-base
-BuildRequires:	xscreensaver-extras
-%if 0%{?fedora}
-BuildRequires:	xscreensaver-extras-base
-%endif
-BuildRequires:	xscreensaver-gl-base
-BuildRequires:	xscreensaver-gl-extras
-%endif
-
-%if 0%{?suse_version}
-BuildRequires:	libXScrnSaver-devel
-BuildRequires:	xscreensaver
-BuildRequires:	xscreensaver-data
-BuildRequires:	xscreensaver-data-extra
-%endif
-
-%endif
-
-
-%description
-KPowersave is a TDE systray applet which allows to control the power 
-management settings and policies of your computer.
-It relies on HAL to do the heavy lifting.
-
-Current feature list:
- * support for ACPI, APM and PMU
- * trigger suspend to disk/ram and standby
- * switch cpu frequency policy (between: performance, dynamic and powersave)
- * applet icon with information about AC state, battery fill and battery
-   (warning) states
- * applet tooltip with information about battery fill and remaining battery 
-   time/percentage
- * autosuspend (to suspend the machine if the user has been inactive for a 
-   defined time)
- * a global configurable blacklist with programs which prevent autosuspend
-   (e.g. videoplayer and cd burning tools)
- * trigger lock screen and select the lock method
- * KNotify support
- * online help
- * localisations for many languages
- 
-KPowersave supports schemes with following configurable specific 
-settings for:
- * screensaver
- * DPMS
- * autosuspend
- * scheme specific blacklist for autosuspend
- * notification settings
-
-
-##########
-
-%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 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__mkdir_p build
-cd build
-%endif
-
-%cmake \
-  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -DCMAKE_SKIP_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} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  -DCMAKE_SKIP_RPATH="OFF" \
-  ..
-
-%__make %{?_smp_mflags}
-
-
-%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 ChangeLog COPYING NEWS README.md TODO
-%{tde_bindir}/kpowersave
-%{tde_libdir}/libtdeinit_kpowersave.la
-%{tde_libdir}/libtdeinit_kpowersave.so
-%{tde_tdelibdir}/kpowersave.la
-%{tde_tdelibdir}/kpowersave.so
-%{tde_tdeappdir}/kpowersave.desktop
-%{tde_datadir}/apps/kpowersave/eventsrc
-%{tde_datadir}/apps/kpowersave/icons/*/*/*/*.png
-%{tde_datadir}/icons/hicolor/*/*/*.png
-%{tde_datadir}/autostart/kpowersave-autostart.desktop
-%{tde_datadir}/config/kpowersaverc
-
-%changelog
diff --git a/redhat/applications/kuickshow/kuickshow.spec b/redhat/applications/kuickshow/kuickshow.spec
deleted file mode 100644
index d8a94d07c..000000000
--- a/redhat/applications/kuickshow/kuickshow.spec
+++ /dev/null
@@ -1,168 +0,0 @@
-#
-# spec file for package kuickshow (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.1.0
-%endif
-%define tde_pkg kuickshow
-%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.8.13
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Quick picture viewer for TDE
-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:	autoconf automake libtool m4
-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
-
-# IMLIB1 support
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?suse_version}
-BuildRequires:	imlib-devel
-%endif
-%if 0%{?mgaversion}
-BuildRequires:	imlib1-devel
-%endif
-
-# GIF support
-%if 0%{?suse_version} || 0%{?fedora} >= 28
-BuildRequires:	giflib-devel 
-%else
-BuildRequires:	libungif-devel 
-%endif
-
-
-%description
-Kuickshow is a picture viewer for TDE. It displays the directory structure,
-displaying images as thumbnails.
-Clicking on an image shows the image in its normal size. 
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-
-%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} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{?buildroot}
-
-# Missing category will make this fail.
-echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/kuickshow
-%{tde_datadir}/applications/*/*.desktop
-%{tde_datadir}/apps/kuickshow/
-%{tde_datadir}/icons/hicolor/*/*/*
-%{tde_libdir}/libtdeinit_%{tde_pkg}.so
-%{tde_libdir}/*.la
-%{tde_tdelibdir}/*.so
-%{tde_tdelibdir}/*.la
-%{tde_tdedocdir}/HTML/en/kuickshow/
-
-
-%changelog
diff --git a/redhat/applications/bibletime/bibletime.spec b/redhat/applications/misc/bibletime/bibletime.spec
index 4ecd291ea..ad1fe5dcb 100644
--- a/redhat/applications/bibletime/bibletime.spec
+++ b/redhat/applications/misc/bibletime/bibletime.spec
@@ -64,7 +64,7 @@ Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	cmake
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -114,67 +114,64 @@ texts, write own notes, save, print etc.).
 %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 PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-
-%if 0%{?fedora} >= 31 || 0%{?rhel} >= 8
-CXXFLAGS="${RPM_OPT_FLAGS} -std=c++11"
-%endif
-
-%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"
+
+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} \
+  -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
-
-# Not SMP safe !
-%__make -C bibletime/frontend
-
-# SMP safe !
+  -DWITH_ALL_OPTIONS=ON \
+  -DBUILD_ALL=ON \
+  ..
+
 %__make %{?_smp_mflags} || %__make
 
 
 %install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/pics/*
-%__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/bibletimeui.rc
-%__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/tips
+%__rm -fr $RPM_BUILD_ROOT
+%__make install DESTDIR=$RPM_BUILD_ROOT -C build
 
-echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_datadir}/applications/bibletime.desktop"
+%find_lang %{tde_pkg}
 
 
 %clean
 %__rm -rf %{buildroot}
 
 
-%files
+%files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
 %{tde_bindir}/bibletime
 %{tde_tdeincludedir}/bibletimeinterface.h
-%{tde_datadir}/applications/bibletime.desktop
+%{tde_tdeappdir}/bibletime.desktop
 %{tde_datadir}/apps/bibletime/
 %{tde_datadir}/icons/hicolor/*/*/*.png
 %{tde_tdedocdir}/HTML/en/bibletime/
+%lang(de) %dir %{tde_mandir}/de/
+%lang(de) %dir %{tde_mandir}/de/man1/
+%lang(de) %{tde_mandir}/de/man1/bibletime.1*
+%{tde_mandir}/man1/bibletime.1*
 
 
 %changelog
diff --git a/redhat/applications/fusion-icon/fusion-icon.spec b/redhat/applications/misc/fusion-icon/fusion-icon.spec
index e3f8bf5cb..e3f8bf5cb 100644
--- a/redhat/applications/fusion-icon/fusion-icon.spec
+++ b/redhat/applications/misc/fusion-icon/fusion-icon.spec
diff --git a/redhat/applications/kcmldap/kcmldap.spec b/redhat/applications/misc/kcmldap/kcmldap.spec
index 1f83bf798..68af31207 100644
--- a/redhat/applications/kcmldap/kcmldap.spec
+++ b/redhat/applications/misc/kcmldap/kcmldap.spec
@@ -58,7 +58,7 @@ 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:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
@@ -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:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -196,6 +196,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 fe4121f07..c99c0b685 100644
--- a/redhat/applications/kcmldapcontroller/kcmldapcontroller.spec
+++ b/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec
@@ -57,13 +57,13 @@ 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:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 BuildRequires:	trinity-libtdeldap-devel >= 0.5
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -190,6 +190,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 16aec6e48..bbe317e3d 100644
--- a/redhat/applications/kcmldapmanager/kcmldapmanager.spec
+++ b/redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec
@@ -57,13 +57,13 @@ 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:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 BuildRequires:	trinity-libtdeldap-devel >= 0.5
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -174,6 +174,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 5bc1c3709..38e159c48 100644
--- a/redhat/applications/kerberostray/kerberostray.spec
+++ b/redhat/applications/misc/kerberostray/kerberostray.spec
@@ -57,13 +57,13 @@ 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:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 BuildRequires:	trinity-libtdeldap-devel >= 0.5
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -153,6 +153,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 c2b24ef16..e2f5fa46d 100644
--- a/redhat/applications/krecipes/krecipes.spec
+++ b/redhat/applications/misc/krecipes/krecipes.spec
@@ -79,17 +79,12 @@ BuildRequires:	brp-check-trinity
 BuildRequires:	mysql-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
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200
 BuildRequires: postgresql-server-devel
 %else
 BuildRequires: postgresql-devel
 %endif
-%endif
 
 # SQLITE support
 BuildRequires:	sqlite-devel
@@ -130,6 +125,7 @@ export PATH="%{tde_bindir}:${PATH}"
   --includedir=%{tde_tdeincludedir} \
   --docdir=%{tde_tdedocdir} \
   --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
   \
   --disable-dependency-tracking \
   --disable-debug \
@@ -185,6 +181,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 eee0076ca..d0aa408ce 100644
--- a/redhat/applications/amarok/amarok.spec
+++ b/redhat/applications/multimedia/amarok/amarok.spec
@@ -66,7 +66,7 @@ BuildRequires:	trinity-filesystem >= %{tde_version}
 Requires:		trinity-filesystem >= %{tde_version}
 
 BuildRequires:	desktop-file-utils
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	gettext
@@ -99,24 +99,24 @@ 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:	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
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200
 BuildRequires: postgresql-server-devel
 %else
 BuildRequires: postgresql-devel
 %endif
-%endif
 
 # not used anymore, in favor of libvisual ? -- Rex
 #{?fedora:BuildRequires:  xmms-devel}
@@ -126,7 +126,7 @@ BuildRequires:	libidn-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 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
@@ -167,7 +167,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
@@ -264,19 +264,10 @@ BuildRequires:	rubypick
 %endif
 
 # 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
-%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)")}
+%global python python3
+%global __python %__python3
+%global python_sitearch %{python3_sitearch}
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 BuildRequires:	%{python}
 BuildRequires:	%{python}-devel
 
@@ -466,7 +457,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
 
 
@@ -491,6 +482,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 3207527cf..60a487700 100644
--- a/redhat/applications/codeine/codeine.spec
+++ b/redhat/applications/multimedia/codeine/codeine.spec
@@ -63,7 +63,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 \
diff --git a/redhat/applications/k3b-i18n/k3b-i18n.spec b/redhat/applications/multimedia/k3b-i18n/k3b-i18n.spec
index 81266f348..e995c3215 100644
--- a/redhat/applications/k3b-i18n/k3b-i18n.spec
+++ b/redhat/applications/multimedia/k3b-i18n/k3b-i18n.spec
@@ -70,7 +70,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -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 2edb92088..ed7d62590 100644
--- a/redhat/applications/k3b/k3b.spec
+++ b/redhat/applications/multimedia/k3b/k3b.spec
@@ -63,7 +63,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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%{?fedora} <= 33 ) || 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*
 
 ##########
 
@@ -436,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 656727906..0a9801a8d 100644
--- a/redhat/applications/k9copy/k9copy.spec
+++ b/redhat/applications/multimedia/k9copy/k9copy.spec
@@ -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 2b72a1dff..c37dad135 100644
--- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla.spec
+++ b/redhat/applications/multimedia/kaffeine-mozilla/kaffeine-mozilla.spec
@@ -59,7 +59,7 @@ BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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_NO_BUILTIN_CHRPATH=ON \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
diff --git a/redhat/applications/kaffeine/kaffeine.spec b/redhat/applications/multimedia/kaffeine/kaffeine.spec
index f09429271..da41a4682 100644
--- a/redhat/applications/kaffeine/kaffeine.spec
+++ b/redhat/applications/multimedia/kaffeine/kaffeine.spec
@@ -64,7 +64,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -293,6 +293,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/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 6132f7d9f..74db046b5 100644
--- a/redhat/applications/kmplayer/kmplayer.spec
+++ b/redhat/applications/multimedia/kmplayer/kmplayer.spec
@@ -62,7 +62,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -279,6 +279,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/kplayer/kplayer.spec b/redhat/applications/multimedia/kplayer/kplayer.spec
index 2246f8d37..bb86e0371 100644
--- a/redhat/applications/kplayer/kplayer.spec
+++ b/redhat/applications/multimedia/kplayer/kplayer.spec
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 af8bb6924..14d1f1fb0 100644
--- a/redhat/applications/mplayerthumbs/mplayerthumbs.spec
+++ b/redhat/applications/multimedia/mplayerthumbs/mplayerthumbs.spec
@@ -60,7 +60,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 \
diff --git a/redhat/applications/rosegarden/rosegarden.spec b/redhat/applications/multimedia/rosegarden/rosegarden.spec
index 94c5bfee1..3e6834a7f 100644
--- a/redhat/applications/rosegarden/rosegarden.spec
+++ b/redhat/applications/multimedia/rosegarden/rosegarden.spec
@@ -64,7 +64,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires: libtool
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
@@ -115,7 +115,7 @@ BuildRequires:  libidn-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 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
@@ -187,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 \
@@ -233,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 6c3ffae19..6c3ffae19 100644
--- a/redhat/applications/soundkonverter/soundkonverter.spec
+++ b/redhat/applications/multimedia/soundkonverter/soundkonverter.spec
diff --git a/redhat/applications/tderadio/tderadio.spec b/redhat/applications/multimedia/tderadio/tderadio.spec
index 47ef2c7ca..4070f8b6b 100644
--- a/redhat/applications/tderadio/tderadio.spec
+++ b/redhat/applications/multimedia/tderadio/tderadio.spec
@@ -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
@@ -147,45 +147,37 @@ 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_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 +185,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 +194,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 +210,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 +227,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 2f66f7f8f..35916dcb1 100644
--- a/redhat/applications/basket/basket.spec
+++ b/redhat/applications/office/basket/basket.spec
@@ -65,7 +65,7 @@ BuildRequires:	trinity-kontact-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gpgme-devel
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 4777b3b36..bef708968 100644
--- a/redhat/applications/kbibtex/kbibtex.spec
+++ b/redhat/applications/office/kbibtex/kbibtex.spec
@@ -63,7 +63,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 \
diff --git a/redhat/applications/kbookreader/kbookreader.spec b/redhat/applications/office/kbookreader/kbookreader.spec
index 8cc7ca8c4..22ba62914 100644
--- a/redhat/applications/kbookreader/kbookreader.spec
+++ b/redhat/applications/office/kbookreader/kbookreader.spec
@@ -62,7 +62,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 \
diff --git a/redhat/applications/keximdb/keximdb.spec b/redhat/applications/office/keximdb/keximdb.spec
index bf89c420e..967b8a3c6 100644
--- a/redhat/applications/keximdb/keximdb.spec
+++ b/redhat/applications/office/keximdb/keximdb.spec
@@ -64,7 +64,7 @@ BuildRequires:	desktop-file-utils
 BuildRequires:	trinity-koffice-devel
 BuildRequires:	trinity-koffice-kexi
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 31b8d0947..d7d26d1e1 100644
--- a/redhat/applications/kile/kile.spec
+++ b/redhat/applications/office/kile/kile.spec
@@ -62,7 +62,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	cmake
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -149,45 +149,43 @@ 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_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 +219,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 ac1fe772a..fa7afc315 100644
--- a/redhat/applications/kmymoney/kmymoney.spec
+++ b/redhat/applications/office/kmymoney/kmymoney.spec
@@ -215,6 +215,7 @@ fi
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
   -DCMAKE_SKIP_INSTALL_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/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 d9b671aa0..4f1c28370 100644
--- a/redhat/applications/knowit/knowit.spec
+++ b/redhat/applications/office/knowit/knowit.spec
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 f71f0fe38..077854145 100644
--- a/redhat/applications/koffice-i18n/koffice-i18n.spec
+++ b/redhat/applications/office/koffice-i18n/koffice-i18n.spec
@@ -74,7 +74,7 @@ BuildRequires:	desktop-file-utils
 BuildRequires:	findutils
 BuildRequires:	gettext
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	cmake
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -573,45 +573,67 @@ Provides: %{name}-tz_TW = %{?epoch:%{epoch}:}%{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_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 43b5365eb..e137cc9b9 100644
--- a/redhat/applications/koffice/koffice.spec
+++ b/redhat/applications/office/koffice/koffice.spec
@@ -113,18 +113,15 @@ BuildRequires:	libexif-devel
 BuildRequires:	readline-devel
 
 # PYTHON support
-%if 0%{?sle_version} >= 150400
+#  lib/kross/configure.in.in :
+#   WARNING: Building Kross python plugin is now prohibited at all times,
+#   because it is not compatible with Python >= 3.
 %define with_python 0
-%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)")}
+%global python python3
+%global __python %__python3
+%global python_sitearch %{python3_sitearch}
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
+%if 0%{?with_python}
 BuildRequires:	%{python}
 BuildRequires:	%{python}-devel
 %endif
@@ -223,12 +220,13 @@ BuildRequires:	trinity-poppler-devel >= 0.12
 %if 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version}
 %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
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200
 BuildRequires:	postgresql-server-devel
 %else
 BuildRequires:	postgresql-devel
-BuildRequires:	libpqxx-devel
 %endif
+BuildRequires:	libpqxx-devel
 %endif
 %endif
 Obsoletes:		trinity-libpqxx < %{?epoch:%{epoch}:}%{version}-%{release}
@@ -248,7 +246,7 @@ BuildRequires:	wv2-devel
 
 # MESA support
 %if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}mesagl1-devel
+BuildRequires:	%{_lib}mesagl-devel
 BuildRequires:	%{_lib}mesaglu1-devel
 %endif
 %if 0%{?fedora} || 0%{?rhel}
@@ -260,11 +258,6 @@ BuildRequires:	Mesa-libGL-devel
 BuildRequires:	Mesa-libGLU-devel
 %endif
 
-# OPENJPEG
-%if 0%{?mgaversion} || 0%{?mdkversion}
-#BuildRequires:	%{_lib}openjpeg-devel
-%endif
-
 # LIBXI support
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	%{_lib}xi-devel
@@ -394,6 +387,10 @@ Requires:		perl
 %{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*
 
 ##########
 
@@ -430,6 +427,7 @@ License:		LGPLv2+
 %{tde_libdir}/libkrossapi.so.*
 %{tde_libdir}/libkrossmain.so.*
 %endif
+%{tde_mandir}/man1/kspread.1*
 
 ##########
 
@@ -475,6 +473,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*
 
 ##########
 
@@ -537,6 +536,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*
 
 ##########
 
@@ -561,6 +562,7 @@ Obsoletes:      kivio < %{?epoch:%{epoch}:}%{version}-%{release}
 %{tde_datadir}/config.kcfg/kivio.kcfg
 %{tde_datadir}/services/kivio*.desktop
 %{tde_tdeappdir}/*kivio.desktop
+%{tde_mandir}/man1/kivio.1*
 
 ##########
 
@@ -587,6 +589,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*
 
 ##########
 
@@ -616,6 +619,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*
 
 ##########
 
@@ -721,6 +726,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*
 
 ##########
 
@@ -761,6 +767,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 39f4382f6..dd4c68ad5 100644
--- a/redhat/applications/kpilot/kpilot.spec
+++ b/redhat/applications/office/kpilot/kpilot.spec
@@ -63,7 +63,7 @@ BuildRequires:	desktop-file-utils
 BuildRequires:	trinity-tdepim-devel >= %{tde_version}
 BuildRequires:	gettext
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 76e327043..ee92c8f4b 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/
@@ -69,7 +69,7 @@ BuildRequires:	trinity-libpoppler-tqt-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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%{?fedora} <= 33 ) || 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,19 +154,10 @@ BuildRequires:	libacl-devel
 BuildRequires:	libattr-devel
 
 # 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
-%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)")}
+%global python python3
+%global __python %__python3
+%global python_sitearch %{python3_sitearch}
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 BuildRequires:	%{python}
 BuildRequires:	%{python}-devel
 
@@ -197,6 +188,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*
 
 ##########
 
@@ -228,7 +220,14 @@ documentation.
 %{tde_datadir}/apps/tellico/*.xml
 %{tde_datadir}/apps/tellico/*.png
 %{tde_datadir}/apps/tellico/entry-templates
+%if 0%{?rhel} == 7 || 0%{?suse_version}
 %{tde_datadir}/apps/tellico/*.py*
+%if 0%{?rhel} == 7
+%{tde_datadir}/apps/tellico/__pycache__/
+%endif
+%else
+%pycached %{tde_datadir}/apps/tellico/*.py
+%endif
 %{tde_datadir}/apps/tellico/pics
 %{tde_datadir}/apps/tellico/report-templates
 %{tde_datadir}/apps/tellico/tellico.dtd
@@ -297,7 +296,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
 
 
@@ -317,6 +316,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 279725f90..827385dc7 100644
--- a/redhat/applications/kima/kima.spec
+++ b/redhat/applications/settings/kima/kima.spec
@@ -63,7 +63,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 \
diff --git a/redhat/applications/kiosktool/kiosktool.spec b/redhat/applications/settings/kiosktool/kiosktool.spec
index 913ff3ed4..5aae73aa9 100644
--- a/redhat/applications/kiosktool/kiosktool.spec
+++ b/redhat/applications/settings/kiosktool/kiosktool.spec
@@ -64,7 +64,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 \
diff --git a/redhat/applications/kkbswitch/kkbswitch.spec b/redhat/applications/settings/kkbswitch/kkbswitch.spec
index 0f6c24db8..4381ff697 100644
--- a/redhat/applications/kkbswitch/kkbswitch.spec
+++ b/redhat/applications/settings/kkbswitch/kkbswitch.spec
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 \
diff --git a/redhat/applications/klcddimmer/klcddimmer.spec b/redhat/applications/settings/klcddimmer/klcddimmer.spec
index c62c09936..918f57f48 100644
--- a/redhat/applications/klcddimmer/klcddimmer.spec
+++ b/redhat/applications/settings/klcddimmer/klcddimmer.spec
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 \
diff --git a/redhat/applications/kmyfirewall/kmyfirewall.spec b/redhat/applications/settings/kmyfirewall/kmyfirewall.spec
index 7998140e5..7998140e5 100644
--- a/redhat/applications/kmyfirewall/kmyfirewall.spec
+++ b/redhat/applications/settings/kmyfirewall/kmyfirewall.spec
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/tde-guidance/tde-guidance.spec b/redhat/applications/settings/tde-guidance/tde-guidance.spec
index 202b88003..946a06d97 100644
--- a/redhat/applications/tde-guidance/tde-guidance.spec
+++ b/redhat/applications/settings/tde-guidance/tde-guidance.spec
@@ -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
@@ -105,6 +105,7 @@ BuildRequires:	libXxf86vm-devel
 #  RHEL 6: available in EPEL
 #  RHEL 7: available in NUX
 #  RHEL 8: available in EPEL
+#  RHEL 9: available in EPEL
 %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
 %define with_xscreensaver 1
 
@@ -143,19 +144,15 @@ BuildRequires:	xscreensaver-gl
 %endif
 
 # 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
-%global python python
-%endif
-%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%global python python3
+%global __python %__python3
+%global python_sitearch %{python3_sitearch}
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 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
@@ -194,6 +191,7 @@ or can be run as standalone applications.
 %{tde_datadir}/apps/guidance/
 %{tde_tdeappdir}/*.desktop
 %{tde_datadir}/icons/crystalsvg/*/*/*.png
+%if 0%{?rhel} == 7 || 0%{?suse_version}
 %{python_sitearch}/%{name}/SMBShareSelectDialog.py*
 %{python_sitearch}/%{name}/SimpleCommandRunner.py*
 %{python_sitearch}/%{name}/fuser.py*
@@ -205,9 +203,34 @@ or can be run as standalone applications.
 %{python_sitearch}/%{name}/unixauthdb.py*
 %{python_sitearch}/%{name}/userconfig.py*
 %{python_sitearch}/%{name}/wineconfig.py*
+%if 0%{?rhel} == 7
+%{python_sitearch}/%{name}/__pycache__/SMBShareSelectDialog.*.pyc
+%{python_sitearch}/%{name}/__pycache__/SimpleCommandRunner.*.pyc
+%{python_sitearch}/%{name}/__pycache__/fuser.*.pyc
+%{python_sitearch}/%{name}/__pycache__/fuser_ui.*.pyc
+%{python_sitearch}/%{name}/__pycache__/grubconfig.*.pyc
+%{python_sitearch}/%{name}/__pycache__/mountconfig.*.pyc
+%{python_sitearch}/%{name}/__pycache__/serviceconfig.*.pyc
+%{python_sitearch}/%{name}/__pycache__/sizeview.*.pyc
+%{python_sitearch}/%{name}/__pycache__/unixauthdb.*.pyc
+%{python_sitearch}/%{name}/__pycache__/userconfig.*.pyc
+%{python_sitearch}/%{name}/__pycache__/wineconfig.*.pyc
+%endif
+%else
+%pycached %{python_sitearch}/%{name}/SMBShareSelectDialog.py
+%pycached %{python_sitearch}/%{name}/SimpleCommandRunner.py
+%pycached %{python_sitearch}/%{name}/fuser.py
+%pycached %{python_sitearch}/%{name}/fuser_ui.py
+%pycached %{python_sitearch}/%{name}/grubconfig.py
+%pycached %{python_sitearch}/%{name}/mountconfig.py
+%pycached %{python_sitearch}/%{name}/serviceconfig.py
+%pycached %{python_sitearch}/%{name}/sizeview.py
+%pycached %{python_sitearch}/%{name}/unixauthdb.py
+%pycached %{python_sitearch}/%{name}/userconfig.py
+%pycached %{python_sitearch}/%{name}/wineconfig.py
+%endif
 %{tde_tdedocdir}/HTML/en/guidance/
 
-
 # Files from powermanager
 %if 0%{?with_powermanager}
 %exclude %{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png
@@ -236,12 +259,28 @@ Guidance configuration tools.
 %files backends
 %defattr(-,root,root,-)
 %dir %{python_sitearch}/%{name}
+%if 0%{?rhel} == 7 || 0%{?suse_version}
 %{python_sitearch}/%{name}/MicroHAL.py*
 %{python_sitearch}/%{name}/drivedetect.py*
 %{python_sitearch}/%{name}/wineread.py*
 %{python_sitearch}/%{name}/winewrite.py*
 %{python_sitearch}/%{name}/xf86misc.py*
-%{python_sitearch}/ixf86misc.so
+%if 0%{?rhel} == 7
+%{python_sitearch}/%{name}/__pycache__/MicroHAL.*.pyc
+%{python_sitearch}/%{name}/__pycache__/drivedetect.*.pyc
+%{python_sitearch}/%{name}/__pycache__/wineread.*.pyc
+%{python_sitearch}/%{name}/__pycache__/winewrite.*.pyc
+%{python_sitearch}/%{name}/__pycache__/xf86misc.*.pyc
+%endif
+%else
+%pycached %{python_sitearch}/%{name}/MicroHAL.py
+%pycached %{python_sitearch}/%{name}/drivedetect.py
+%pycached %{python_sitearch}/%{name}/wineread.py
+%pycached %{python_sitearch}/%{name}/winewrite.py
+%pycached %{python_sitearch}/%{name}/xf86misc.py
+%endif
+%{python_sitearch}/ixf86misc*.so
+%{python_sitearch}/xf86misc*.pyc
 
 ##########
 
@@ -268,6 +307,7 @@ suspend using HAL.
 %files powermanager
 %defattr(-,root,root,-)
 %{tde_bindir}/guidance-power-manager
+%if 0%{?rhel} == 7 || 0%{?suse_version}
 %{python_sitearch}/%{name}/MicroHAL.py*
 %{python_sitearch}/%{name}/guidance-power-manager.py*
 %{python_sitearch}/%{name}/powermanage.py*
@@ -276,6 +316,24 @@ suspend using HAL.
 %{python_sitearch}/%{name}/guidance_power_manager_ui.py*
 %{python_sitearch}/%{name}/notify.py*
 %{python_sitearch}/%{name}/tooltip.py*
+%{python_sitearch}/%{name}/__pycache__/MicroHAL.*.pyc
+%{python_sitearch}/%{name}/__pycache__/guidance-power-manager.*.pyc
+%{python_sitearch}/%{name}/__pycache__/powermanage.*.pyc
+%{python_sitearch}/%{name}/__pycache__/gpmhelper.*.pyc
+%{python_sitearch}/%{name}/__pycache__/powermanager_ui.*.pyc
+%{python_sitearch}/%{name}/__pycache__/guidance_power_manager_ui.*.pyc
+%{python_sitearch}/%{name}/__pycache__/notify.*.pyc
+%{python_sitearch}/%{name}/__pycache__/tooltip.*.pyc
+%else
+%pycached %{python_sitearch}/%{name}/MicroHAL.py
+%pycached %{python_sitearch}/%{name}/guidance-power-manager.py
+%pycached %{python_sitearch}/%{name}/powermanage.py
+%pycached %{python_sitearch}/%{name}/gpmhelper.py
+%pycached %{python_sitearch}/%{name}/powermanager_ui.py
+%pycached %{python_sitearch}/%{name}/guidance_power_manager_ui.py
+%pycached %{python_sitearch}/%{name}/notify.py
+%pycached %{python_sitearch}/%{name}/tooltip.py
+%endif
 %{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png
 %{tde_datadir}/apps/guidance/pics/ac-adapter.png
 %{tde_datadir}/apps/guidance/pics/battery*.png
@@ -305,7 +363,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=
@@ -327,7 +385,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}"
@@ -384,8 +442,9 @@ chrpath -r %{tde_libdir} %{buildroot}%{tde_tdelibdir}/kcm_*.so
 ##### BACKENDS INSTALLATION
 
 # The xf86misc stuff should not go under /opt/trinity bur under /usr !!!
-%__mv -f %{buildroot}%{tde_libdir}/python*/site-packages/ixf86misc.so %{buildroot}%{python_sitearch}
-%__mv -f %{buildroot}%{tde_libdir}/python*/site-packages/xf86misc.py* %{buildroot}%{python_sitearch}/%{name}
+%__mv -f %{buildroot}%{tde_libdir}/python*/site-packages/ixf86misc*.so %{buildroot}%{python_sitearch}/
+%__mv -f %{buildroot}%{tde_libdir}/python*/site-packages/__pycache__/xf86misc*.pyc %{buildroot}%{python_sitearch}/
+%__mv -f %{buildroot}%{tde_libdir}/python*/site-packages/xf86misc.py* %{buildroot}%{python_sitearch}/%{name}/
 
 %if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
 %__rm -f %{buildroot}%{tde_datadir}/apps/guidance/MonitorsDB
@@ -433,13 +492,8 @@ chmod 0755 %{buildroot}%{python_sitearch}/%{name}/gpmhelper.py
 
 # Replace all '#!' calls to python with /usr/bin/python
 # and make them executable
-%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?mgaversion} >= 8
-%define python /usr/bin/python2
-%else
-%define python /usr/bin/python
-%endif
 for i in `find %{buildroot} -type f`; do
-	sed '1s,#!.*python[^ ]*\(.*\),#! %python\1,' \
+	sed '1s,#!.*python[^ ]*\(.*\),#!/usr/bin/env %python\1,' \
 		$i > $i.temp;
 	if cmp --quiet $i $i.temp; then
 		rm -f $i.temp;
@@ -453,6 +507,7 @@ done
 # Removes useless files
 find %{buildroot} -name "*.egg-info" -exec rm -f {} \;
 find %{buildroot}%{tde_libdir} -name "*.a" -exec rm -f {} \;
+%__rm -rf %{buildroot}%{tde_libdir}/python*/site-packages/guidance-*.egg-info/
 
 
 %clean
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 c51e46f4c..18b2af3d8 100644
--- a/redhat/applications/tde-systemsettings/tde-systemsettings.spec
+++ b/redhat/applications/settings/tde-systemsettings/tde-systemsettings.spec
@@ -69,7 +69,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_NO_BUILTIN_CHRPATH=ON \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
diff --git a/redhat/applications/tdenetworkmanager/tdenetworkmanager.spec b/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec
index b8e37c2c5..bae1fa842 100644
--- a/redhat/applications/tdenetworkmanager/tdenetworkmanager.spec
+++ b/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec
@@ -62,7 +62,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires: libtool
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
@@ -136,7 +136,7 @@ BuildRequires:	libidn-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 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
@@ -219,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 89ffa7add..78395d8da 100644
--- a/redhat/applications/tdesudo/tdesudo.spec
+++ b/redhat/applications/settings/tdesudo/tdesudo.spec
@@ -60,7 +60,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 \
diff --git a/redhat/applications/wlassistant/wlassistant.spec b/redhat/applications/settings/wlassistant/wlassistant.spec
index 823f48b66..00322f76c 100644
--- a/redhat/applications/wlassistant/wlassistant.spec
+++ b/redhat/applications/settings/wlassistant/wlassistant.spec
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires: libtool
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
@@ -96,25 +96,16 @@ BuildRequires:	libidn-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 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%{?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
-%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)")}
+%global python python3
+%global __python %__python3
+%global python_sitearch %{python3_sitearch}
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 BuildRequires:	%{python}
 BuildRequires:	%{python}-devel
 
@@ -162,6 +153,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/dolphin/dolphin.spec b/redhat/applications/system/dolphin/dolphin.spec
index 09b73918d..be49385f3 100644
--- a/redhat/applications/dolphin/dolphin.spec
+++ b/redhat/applications/system/dolphin/dolphin.spec
@@ -62,7 +62,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 456a9958b..a2d25b15f 100644
--- a/redhat/applications/katapult/katapult.spec
+++ b/redhat/applications/system/katapult/katapult.spec
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 3e5c06b1b..415697e00 100644
--- a/redhat/applications/kbfx/kbfx.spec
+++ b/redhat/applications/system/kbfx/kbfx.spec
@@ -62,7 +62,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires: libtool
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
@@ -82,7 +82,7 @@ BuildRequires:	libidn-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 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
@@ -147,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 bd0a90c70..09b86d7a6 100644
--- a/redhat/applications/kcmautostart/kcmautostart.spec
+++ b/redhat/applications/system/kcmautostart/kcmautostart.spec
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 \
diff --git a/redhat/applications/kdbusnotification/kdbusnotification.spec b/redhat/applications/system/kdbusnotification/kdbusnotification.spec
index 194020fbc..380ea714c 100644
--- a/redhat/applications/kdbusnotification/kdbusnotification.spec
+++ b/redhat/applications/system/kdbusnotification/kdbusnotification.spec
@@ -59,7 +59,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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/klamav/klamav.spec b/redhat/applications/system/klamav/klamav.spec
index 41882f16e..015eaa364 100644
--- a/redhat/applications/klamav/klamav.spec
+++ b/redhat/applications/system/klamav/klamav.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.1.0
 %endif
 %define tde_pkg klamav
 %define tde_prefix /opt/trinity
@@ -58,7 +58,7 @@ BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
@@ -105,6 +105,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/knemo/knemo.spec b/redhat/applications/system/knemo/knemo.spec
index 29ef60d10..b6f820d57 100644
--- a/redhat/applications/knemo/knemo.spec
+++ b/redhat/applications/system/knemo/knemo.spec
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -151,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 \
diff --git a/redhat/applications/knetload/knetload.spec b/redhat/applications/system/knetload/knetload.spec
index c6d482b2f..33cddaa00 100644
--- a/redhat/applications/knetload/knetload.spec
+++ b/redhat/applications/system/knetload/knetload.spec
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 d6dfad2c8..6fc41e1f5 100644
--- a/redhat/applications/knetstats/knetstats.spec
+++ b/redhat/applications/system/knetstats/knetstats.spec
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 4d5338bc0..410e8e783 100644
--- a/redhat/applications/kooldock/kooldock.spec
+++ b/redhat/applications/system/kooldock/kooldock.spec
@@ -62,7 +62,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 \
@@ -161,7 +162,7 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
+%doc AUTHORS ChangeLog COPYING TODO
 %{tde_bindir}/kooldock
 %{tde_datadir}/apps/kooldock/
 %{tde_datadir}/icons/crystalsvg/16x16/apps/kooldock.png
diff --git a/redhat/applications/krusader/krusader.spec b/redhat/applications/system/krusader/krusader.spec
index cf314c68f..cf314c68f 100644
--- a/redhat/applications/krusader/krusader.spec
+++ b/redhat/applications/system/krusader/krusader.spec
diff --git a/redhat/applications/kshutdown/kshutdown.spec b/redhat/applications/system/kshutdown/kshutdown.spec
index 3889525f7..f86297e04 100644
--- a/redhat/applications/kshutdown/kshutdown.spec
+++ b/redhat/applications/system/kshutdown/kshutdown.spec
@@ -60,7 +60,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 \
diff --git a/redhat/applications/ksystemlog/ksystemlog.spec b/redhat/applications/system/ksystemlog/ksystemlog.spec
index 412aab89d..731557a72 100644
--- a/redhat/applications/ksystemlog/ksystemlog.spec
+++ b/redhat/applications/system/ksystemlog/ksystemlog.spec
@@ -60,7 +60,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -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_NO_BUILTIN_CHRPATH=ON \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
diff --git a/redhat/applications/kvkbd/kvkbd.spec b/redhat/applications/system/kvkbd/kvkbd.spec
index 14d1ae3bd..1a36e6ce4 100644
--- a/redhat/applications/kvkbd/kvkbd.spec
+++ b/redhat/applications/system/kvkbd/kvkbd.spec
@@ -60,7 +60,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 \
diff --git a/redhat/applications/polkit-agent-tde/polkit-agent-tde.spec b/redhat/applications/system/polkit-agent-tde/polkit-agent-tde.spec
index 4bf776156..bbcf45ee8 100644
--- a/redhat/applications/polkit-agent-tde/polkit-agent-tde.spec
+++ b/redhat/applications/system/polkit-agent-tde/polkit-agent-tde.spec
@@ -17,7 +17,7 @@
 
 # TDE variables
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.11
+%define tde_version 14.1.0
 %endif
 %define tde_pkg polkit-agent-tde
 %define tde_prefix /opt/trinity
@@ -59,7 +59,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	libpolkit-tqt-devel
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -99,6 +99,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/smartcardauth/smartcardauth.spec b/redhat/applications/system/smartcardauth/smartcardauth.spec
index 1578431a9..ac53e189a 100644
--- a/redhat/applications/smartcardauth/smartcardauth.spec
+++ b/redhat/applications/system/smartcardauth/smartcardauth.spec
@@ -66,7 +66,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 59e0991ab..635273ad1 100644
--- a/redhat/applications/tastymenu/tastymenu.spec
+++ b/redhat/applications/system/tastymenu/tastymenu.spec
@@ -62,7 +62,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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/system/tdebluez/tdebluez.spec b/redhat/applications/system/tdebluez/tdebluez.spec
new file mode 100644
index 000000000..e17236b1c
--- /dev/null
+++ b/redhat/applications/system/tdebluez/tdebluez.spec
@@ -0,0 +1,254 @@
+#
+# spec file for package tdebluez (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.1.0
+%endif
+%define tde_pkg tdebluez
+%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}
+Epoch:		%{tde_epoch}
+Version:	1.0.8
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	TDE Bluetooth Framework
+Group:		Applications/Multimedia
+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-tde-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	libtool
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-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
+The TDE Bluetooth Framework is a set of tools built on top of Linux' Bluetooth
+stack BlueZ5. It provides easy access to the most common Bluetooth profiles and
+makes data exchange with Bluetooth devices like phones and PDAs as
+straightforward as possible.
+
+Features:
+* tdebluez -- a tray applet to handle incoming inquiries and control
+              adapters and devices
+* tdebluezauth -- authentication agent
+* tdeioclient -- cli to obex
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%{tde_bindir}/tdebluez
+%{tde_bindir}/tdebluezauth
+%{tde_bindir}/tdebluezioclient
+%{tde_libdir}/libtdeinit_tdebluez.so
+%{tde_libdir}/libtdeinit_tdebluez.la
+%{tde_tdelibdir}/tdebluez.so
+%{tde_tdelibdir}/tdebluez.la
+%{tde_tdelibdir}/tdeio_bluetooth.so
+%{tde_tdelibdir}/tdeio_bluetooth.la
+%{tde_tdelibdir}/tdeio_obex.so
+%{tde_tdelibdir}/tdeio_obex.la
+%{tde_tdedocdir}/HTML/*
+%{tde_datadir}/apps/tdebluez/
+%{tde_tdeappdir}/tdebluez.desktop
+%{tde_tdeappdir}/tdebluezauth.desktop
+%{tde_datadir}/autostart/tdebluez.autostart.desktop
+%{tde_datadir}/icons/hicolor/*/apps/tdebluez.png
+%{tde_datadir}/icons/hicolor/scalable/apps/tdebluez.svgz
+%{tde_datadir}/mimelnk/bluetooth/*
+%{tde_datadir}/services/bluetooth.protocol
+%{tde_datadir}/services/obexftp.protocol
+%{tde_datadir}/services/obexopp.protocol
+%{tde_datadir}/apps/konqsidebartng/virtual_folders/services/bluetooth_sidebarentry.desktop
+%{tde_datadir}/apps/konqsidebartng/virtual_folders/services/obex_sidebarentry.desktop
+%{_sysconfdir}/dbus-1/system.d/org.trinitydesktop.tdebluez.conf
+
+
+##########
+
+%package -n trinity-libtdebluez
+Summary:	Bluetooth library for TDE
+
+%description -n trinity-libtdebluez
+This package is part of the TDE Bluetooth Framework.
+It contains a Bluetooth library for TDE.
+
+See the 'trinity-tdebluez' package for more informations.
+
+%files -n trinity-libtdebluez
+%defattr(-,root,root,-)
+%{tde_libdir}/libtdebluez.la
+%{tde_libdir}/libtdebluez.so.*
+
+##########
+
+%package -n trinity-libtdeobex
+Summary:	Obex library for TDE
+
+%description -n trinity-libtdeobex
+This package is part of the TDE Bluetooth Framework.
+It contains a Bluetooth library for TDE.
+
+See the 'trinity-tdebluez' package for more informations.
+
+%files -n trinity-libtdeobex
+%defattr(-,root,root,-)
+%{tde_libdir}/libtdeobex.la
+%{tde_libdir}/libtdeobex.so.*
+
+##########
+
+%package -n trinity-libtdebluez-devel
+Summary:	Development files for libtdebluez
+
+%description -n trinity-libtdebluez-devel
+This package is part of the TDE Bluetooth Framework.
+It contains the development files for libtdebluez.
+
+See the 'trinity-tdebluez' package for more informations.
+
+%files -n trinity-libtdebluez-devel
+%defattr(-,root,root,-)
+%{tde_includedir}/tdebluez/*
+%{tde_libdir}/libtdebluez.so
+%{tde_datadir}/cmake/libtdebluez.cmake
+
+##########
+
+%package -n trinity-libtdeobex-devel
+Summary:	Development files for libtdeobex
+
+%description -n trinity-libtdeobex-devel
+This package is part of the TDE Bluetooth Framework.
+It contains the development files for libtdeobex.
+
+See the 'trinity-tdebluez' package for more informations.
+
+%files -n trinity-libtdeobex-devel
+%defattr(-,root,root,-)
+%{tde_includedir}/tdeobex/*
+%{tde_libdir}/libtdeobex.so
+%{tde_datadir}/cmake/libtdeobex.cmake
+
+##########
+
+%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}" \
+  -DINCLUDE_INSTALL_DIR="%{tde_includedir}" \
+  -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
+
+%find_lang %{tde_pkg}
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%changelog
diff --git a/redhat/applications/tdedocker/tdedocker.spec b/redhat/applications/system/tdedocker/tdedocker.spec
index 2a88d64c2..1b7f796f1 100644
--- a/redhat/applications/tdedocker/tdedocker.spec
+++ b/redhat/applications/system/tdedocker/tdedocker.spec
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 461b1c98e..a57c0e328 100644
--- a/redhat/applications/tdepowersave/tdepowersave.spec
+++ b/redhat/applications/system/tdepowersave/tdepowersave.spec
@@ -63,7 +63,7 @@ BuildRequires:	desktop-file-utils
 BuildRequires:	libdbus-tqt-1-devel >= %{tde_epoch}:0.63
 BuildRequires:	libdbus-1-tqt-devel >= %{tde_epoch}:0.9
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires: libtool
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
@@ -88,6 +88,7 @@ BuildRequires:	libudev-devel
 # XSCREENSAVER support
 #  Disabled on RHEL4
 #  RHEL 8: available in EPEL
+#  RHEL 9: available in EPEL
 %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
 %define with_xscreensaver 1
 %if 0%{?rhel} == 5
@@ -117,7 +118,7 @@ BuildRequires:	libidn-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 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
@@ -188,6 +189,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,7 +234,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
index 191e9949e..8277d6397 100644
--- a/redhat/applications/system/tdesshaskpass/tdesshaskpass.spec
+++ b/redhat/applications/system/tdesshaskpass/tdesshaskpass.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.10
+%define tde_version 14.1.0
 %endif
 %define tde_pkg tdesshaskpass
 %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:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 \
diff --git a/redhat/applications/yakuake/yakuake.spec b/redhat/applications/system/yakuake/yakuake.spec
index 2dd8f3cf9..97d9157af 100644
--- a/redhat/applications/yakuake/yakuake.spec
+++ b/redhat/applications/system/yakuake/yakuake.spec
@@ -60,7 +60,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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..57f61207f
--- /dev/null
+++ b/redhat/applications/tdeio/tdeio-appinfo/tdeio-appinfo.spec
@@ -0,0 +1,161 @@
+#
+# 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.1.0
+%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-tde-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_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 d52db658a..3efdf5d7e 100644
--- a/redhat/applications/tdeio-apt/tdeio-apt.spec
+++ b/redhat/applications/tdeio/tdeio-apt/tdeio-apt.spec
@@ -60,7 +60,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 \
diff --git a/redhat/applications/tdeio-ftps/tdeio-ftps.spec b/redhat/applications/tdeio/tdeio-ftps/tdeio-ftps.spec
index efb471c97..947e89b16 100644
--- a/redhat/applications/tdeio-ftps/tdeio-ftps.spec
+++ b/redhat/applications/tdeio/tdeio-ftps/tdeio-ftps.spec
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/tdeio-gopher/tdeio-gopher.spec b/redhat/applications/tdeio/tdeio-gopher/tdeio-gopher.spec
index c8fd9e09d..8b833c35e 100644
--- a/redhat/applications/tdeio-gopher/tdeio-gopher.spec
+++ b/redhat/applications/tdeio/tdeio-gopher/tdeio-gopher.spec
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -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/tdeio-locate/tdeio-locate.spec b/redhat/applications/tdeio/tdeio-locate/tdeio-locate.spec
index cdbfafeef..e8a4418ed 100644
--- a/redhat/applications/tdeio-locate/tdeio-locate.spec
+++ b/redhat/applications/tdeio/tdeio-locate/tdeio-locate.spec
@@ -60,7 +60,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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%{?fedora} <= 33 ) || 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
@@ -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 c95b32631..8a3804e89 100644
--- a/redhat/applications/tdeio-sword/tdeio-sword.spec
+++ b/redhat/applications/tdeio/tdeio-sword/tdeio-sword.spec
@@ -66,7 +66,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 \
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 3509b473d..6bb629f89 100644
--- a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper.spec
+++ b/redhat/applications/tdeio/tdeio-umountwrapper/tdeio-umountwrapper.spec
@@ -65,7 +65,7 @@ BuildRequires:	desktop-file-utils
 Obsoletes:		trinity-kio-umountwrapper < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:		trinity-kio-umountwrapper = %{?epoch:%{epoch}:}%{version}-%{release}
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 \
diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine.spec b/redhat/applications/themes/gtk-qt-engine/gtk-qt-engine.spec
index 843cd5440..457febb76 100644
--- a/redhat/applications/gtk-qt-engine/gtk-qt-engine.spec
+++ b/redhat/applications/themes/gtk-qt-engine/gtk-qt-engine.spec
@@ -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:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 e4100aaca..ce227d406 100644
--- a/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine.spec
+++ b/redhat/applications/themes/gtk3-tqt-engine/gtk3-tqt-engine.spec
@@ -62,7 +62,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	cmake
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -96,58 +96,46 @@ GTK3 style engine which uses the active TDE style to draw its widgets
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%if "%_lib" == "lib64"
-%__sed -i "tdegtk/Makefile.am" -e "s|/lib/|/lib64/|g"
-%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
 export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
 
-if [ -d "/usr/include/atk-1.0" ]; then
-  extra_includes="%{_includedir}/atk-1.0:${extra_includes}"
-fi
-if [ -d "/usr/include/gdk-pixbuf-2.0" ]; then
-  extra_includes="%{_includedir}/gdk-pixbuf-2.0:${extra_includes}"
-fi
-if [ -d "/usr/include/gtk-3.0" ]; then
-  extra_includes="%{_includedir}/gtk-3.0:${extra_includes}"
-fi
-if [ -d "/usr/include/pango-1.0" ]; then
-  extra_includes="%{_includedir}/pango-1.0:${extra_includes}"
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
 fi
 
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --docdir=%{tde_tdedocdir} \
-  --libdir=%{tde_libdir} \
+# 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} \
   \
-  --with-extra-includes=${extra_includes}
+  -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}
+%__rm -fr $RPM_BUILD_ROOT
+%__make install DESTDIR=$RPM_BUILD_ROOT -C build
 
 
 %clean
diff --git a/redhat/applications/kgtk-qt3/kgtk-qt3.spec b/redhat/applications/themes/kgtk-qt3/kgtk-qt3.spec
index cff4f8b69..76893f3c9 100644
--- a/redhat/applications/kgtk-qt3/kgtk-qt3.spec
+++ b/redhat/applications/themes/kgtk-qt3/kgtk-qt3.spec
@@ -62,7 +62,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires: libtool
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
@@ -89,7 +89,7 @@ BuildRequires:	gtk+2.0-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 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
@@ -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 \
diff --git a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin.spec b/redhat/applications/themes/ksplash-engine-moodin/ksplash-engine-moodin.spec
index 8a6c3aeac..97ac46a3f 100644
--- a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin.spec
+++ b/redhat/applications/themes/ksplash-engine-moodin/ksplash-engine-moodin.spec
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 d564e576e..d564e576e 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
diff --git a/redhat/applications/tde-style-baghira/tde-style-baghira.spec b/redhat/applications/themes/tde-style-baghira/tde-style-baghira.spec
index 7cab17109..3ae8a3cf4 100644
--- a/redhat/applications/tde-style-baghira/tde-style-baghira.spec
+++ b/redhat/applications/themes/tde-style-baghira/tde-style-baghira.spec
@@ -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:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 \
@@ -190,6 +191,8 @@ export PATH="%{tde_bindir}:${PATH}"
 %{tde_datadir}/icons/crystalsvg/64x64/apps/baghira_white.png
 %{tde_datadir}/icons/crystalsvg/64x64/apps/baghira_yellow.png
 %lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/baghira-starter.mo
+%lang(pl) %{tde_datadir}/locale/pl/LC_MESSAGES/baghira-usermanager.mo
+%lang(pt_BR) %{tde_datadir}/locale/pt_BR/LC_MESSAGES/baghira-usermanager.mo
 %{tde_mandir}/man1/bab.1*
 
 
diff --git a/redhat/applications/tde-style-domino/tde-style-domino.spec b/redhat/applications/themes/tde-style-domino/tde-style-domino.spec
index 7bb66c619..55517e191 100644
--- a/redhat/applications/tde-style-domino/tde-style-domino.spec
+++ b/redhat/applications/themes/tde-style-domino/tde-style-domino.spec
@@ -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:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 14277f757..febea2eab 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
@@ -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:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -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 629182637..d021dccf8 100644
--- a/redhat/applications/tde-style-lipstik/tde-style-lipstik.spec
+++ b/redhat/applications/themes/tde-style-lipstik/tde-style-lipstik.spec
@@ -65,7 +65,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 368233282..f7df29f07 100644
--- a/redhat/applications/tde-style-qtcurve/tde-style-qtcurve.spec
+++ b/redhat/applications/themes/tde-style-qtcurve/tde-style-qtcurve.spec
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires: libtool
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
@@ -85,7 +85,7 @@ BuildRequires:	libacl-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 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
@@ -147,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 0dcf28d8c..abb9f2240 100644
--- a/redhat/applications/tdmtheme/tdmtheme.spec
+++ b/redhat/applications/themes/tdmtheme/tdmtheme.spec
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 \
diff --git a/redhat/applications/twin-style-crystal/twin-style-crystal.spec b/redhat/applications/themes/twin-style-crystal/twin-style-crystal.spec
index 093d4e599..8d53b5469 100644
--- a/redhat/applications/twin-style-crystal/twin-style-crystal.spec
+++ b/redhat/applications/themes/twin-style-crystal/twin-style-crystal.spec
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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_NO_BUILTIN_CHRPATH=ON \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
@@ -135,13 +136,15 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot} -C build
 
+%find_lang %{tde_pkg}
+
 
 %clean
 %__rm -rf %{buildroot}
 
 
 
-%files
+%files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
 %{tde_tdelibdir}/twin3_crystal.la
diff --git a/redhat/applications/twin-style-dekorator/twin-style-dekorator.spec b/redhat/applications/themes/twin-style-dekorator/twin-style-dekorator.spec
index 47950e707..e5a20e401 100644
--- a/redhat/applications/twin-style-dekorator/twin-style-dekorator.spec
+++ b/redhat/applications/themes/twin-style-dekorator/twin-style-dekorator.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.10
+%define tde_version 14.1.0
 %endif
 %define tde_pkg twin-style-dekorator
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -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_NO_BUILTIN_CHRPATH=ON \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
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..d8734ef3d
--- /dev/null
+++ b/redhat/applications/themes/twin-style-machbunt/twin-style-machbunt.spec
@@ -0,0 +1,154 @@
+#
+# 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.1.0
+%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-tde-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_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/twin-style-suse2/twin-style-suse2.spec b/redhat/applications/themes/twin-style-suse2/twin-style-suse2.spec
index c53e0e878..48ae0e695 100644
--- a/redhat/applications/twin-style-suse2/twin-style-suse2.spec
+++ b/redhat/applications/themes/twin-style-suse2/twin-style-suse2.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.10
+%define tde_version 14.1.0
 %endif
 %define tde_pkg twin-style-suse2
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -112,6 +112,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/abakus/abakus.spec b/redhat/applications/utilities/abakus/abakus.spec
index ecc87ddbb..432c6072c 100644
--- a/redhat/applications/abakus/abakus.spec
+++ b/redhat/applications/utilities/abakus/abakus.spec
@@ -60,7 +60,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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%{?fedora} <= 33 ) || 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/filelight.spec b/redhat/applications/utilities/filelight/filelight.spec
index f3a4a5897..09023a7c8 100644
--- a/redhat/applications/filelight/filelight.spec
+++ b/redhat/applications/utilities/filelight/filelight.spec
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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%{?fedora} <= 33 ) || 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
@@ -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 8684d27bb..b197f9741 100644
--- a/redhat/applications/kbarcode/kbarcode.spec
+++ b/redhat/applications/utilities/kbarcode/kbarcode.spec
@@ -64,7 +64,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 b6c21725b..c2904d693 100644
--- a/redhat/applications/kchmviewer/kchmviewer.spec
+++ b/redhat/applications/utilities/kchmviewer/kchmviewer.spec
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 \
diff --git a/redhat/applications/kcpuload/kcpuload.spec b/redhat/applications/utilities/kcpuload/kcpuload.spec
index 12749667d..594396581 100644
--- a/redhat/applications/kcpuload/kcpuload.spec
+++ b/redhat/applications/utilities/kcpuload/kcpuload.spec
@@ -62,7 +62,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 cddd115ee..1b9bc1148 100644
--- a/redhat/applications/kdirstat/kdirstat.spec
+++ b/redhat/applications/utilities/kdirstat/kdirstat.spec
@@ -61,7 +61,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 e4c67749a..adbf9d811 100644
--- a/redhat/applications/keep/keep.spec
+++ b/redhat/applications/utilities/keep/keep.spec
@@ -62,7 +62,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 e171f037e..ab101e33e 100644
--- a/redhat/applications/knutclient/knutclient.spec
+++ b/redhat/applications/utilities/knutclient/knutclient.spec
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 \
diff --git a/redhat/applications/kompose/kompose.spec b/redhat/applications/utilities/kompose/kompose.spec
index bdda7fcd9..6fbe30cfa 100644
--- a/redhat/applications/kompose/kompose.spec
+++ b/redhat/applications/utilities/kompose/kompose.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.1.0
 %endif
 %define tde_pkg kompose
 %define tde_prefix /opt/trinity
@@ -52,7 +52,7 @@ BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
@@ -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/krename/krename.spec b/redhat/applications/utilities/krename/krename.spec
index 5cbec4e22..e36feb919 100644
--- a/redhat/applications/krename/krename.spec
+++ b/redhat/applications/utilities/krename/krename.spec
@@ -60,7 +60,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 aa329febc..f89269441 100644
--- a/redhat/applications/ksensors/ksensors.spec
+++ b/redhat/applications/utilities/ksensors/ksensors.spec
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 \
diff --git a/redhat/applications/mathemagics/mathemagics.spec b/redhat/applications/utilities/mathemagics/mathemagics.spec
index 3eb6700dd..7164239fb 100644
--- a/redhat/applications/mathemagics/mathemagics.spec
+++ b/redhat/applications/utilities/mathemagics/mathemagics.spec
@@ -59,7 +59,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 \
diff --git a/redhat/applications/qalculate-tde/qalculate-tde.spec b/redhat/applications/utilities/qalculate-tde/qalculate-tde.spec
index d786285a8..4a421c78a 100644
--- a/redhat/applications/qalculate-tde/qalculate-tde.spec
+++ b/redhat/applications/utilities/qalculate-tde/qalculate-tde.spec
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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_NO_BUILTIN_CHRPATH=ON \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
diff --git a/redhat/build/get_latest_tarball_filename.sh b/redhat/build/get_latest_tarball_filename.sh
index c3f971c0b..e2558d585 100755
--- a/redhat/build/get_latest_tarball_filename.sh
+++ b/redhat/build/get_latest_tarball_filename.sh
@@ -5,14 +5,20 @@ TDE_VERSION="${2:-${TDE_VERSION:-14.1.0}}"
 
 [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1
 [ -d "${TARBALLS_DIR}" ] || TARBALLS_DIR=~/tde/tarballs/${TDE_VERSION}/
-[ -d "${TDE_PACKAGING_DIR}" ] || TDE_PACKAGING_DIR=~/tde/master/tde-packaging
+[ -d "${TDE_PACKAGING_DIR}" ] || TDE_PACKAGING_DIR=~/tde/master/tde/packaging
 [ -d "${DIST_PACKAGING_DIR}" ] || DIST_PACKAGING_DIR=${TDE_PACKAGING_DIR}/redhat/
 
 EXTRA_DIR="$(cd ${TARBALLS_DIR}/../extras/; pwd)"
 
 RET=""
 for dir in "${TARBALLS_DIR}" "${EXTRA_DIR}" "${DIST_PACKAGING_DIR}"; do
-  for v in "${PKGNAME}-${TDE_VERSION}*.tar.*" "trinity-${PKGNAME}-${TDE_VERSION}*.tar.*" "${PKGNAME}[-_][0-9]*.tar.*"; do
+  for v in \
+    "${PKGNAME}-${TDE_VERSION}.tar.*" \
+    "${PKGNAME}-${TDE_VERSION}*.tar.*" \
+     "trinity-${PKGNAME}-${TDE_VERSION}.tar.*" \
+     "trinity-${PKGNAME}-${TDE_VERSION}*.tar.*" \
+     "${PKGNAME}[-_][0-9]*.tar.*" \
+  ; do
     RET=$(find "${dir}" -follow -type f -name ${v} | sort | tail -n 1)
     [ -r "${RET}" ] && break
   done
diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh
index 11993d820..cae4e786b 100755
--- a/redhat/build/get_rpm_package_name.sh
+++ b/redhat/build/get_rpm_package_name.sh
@@ -20,7 +20,7 @@ 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"|"polkit-tqt"|"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"|"pinentry-tqt"|"python-qt3"|"rdesktop"|"recode"|"rdiff-backup"|"sword"|"tar") PREFIX="";;
   # Extra build stuff
@@ -64,6 +64,7 @@ case "${PKGNAME}" in
   "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")
@@ -87,7 +88,7 @@ if [ -n "${DEVEL}" ]; then
 
   # Some other packags NOT having development package
   case "${PKGNAME}" in
-    "autoconf"|"automake"|"brp-check-trinity"|"cmake"|"cscope"|"gnuchess"|"hal-info"|"lilypond"|"m4"|"mftrace"|"pcsc-perl"|"rdesktop"|"recode"|"rdiff-backup"|"torsocks") exit 0;;
+    "autoconf"|"automake"|"brp-check-trinity"|"cscope"|"gnuchess"|"hal-info"|"lilypond"|"m4"|"mftrace"|"pcsc-perl"|"rdesktop"|"recode"|"rdiff-backup"|"tde-cmake"|"torsocks") exit 0;;
     "tqca-tls"|"tdeadmin"|"tdetoys"|"tde-i18n"*|"tdeaddons"|"tdeartwork"|"libtqt-perl"|"kipi-plugins") exit 0;;
   esac
 
diff --git a/redhat/build/get_source_files.sh b/redhat/build/get_source_files.sh
index 1b0463e4c..529aa49ed 100755
--- a/redhat/build/get_source_files.sh
+++ b/redhat/build/get_source_files.sh
@@ -14,7 +14,11 @@ while read var val; do
   case "${var}" in
     Version:*) VERSION="${val}";;
     Source*:|Source:|Patch[0-9]*:)
-      FILE="${SPECDIR}/${val##*/}"
+      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
diff --git a/redhat/build/get_specfile.sh b/redhat/build/get_specfile.sh
index 4f5dec5b2..ce8042e31 100755
--- a/redhat/build/get_specfile.sh
+++ b/redhat/build/get_specfile.sh
@@ -5,7 +5,7 @@ TDE_VERSION="${2:-${TDE_VERSION:-14.1.0}}"
 
 [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1
 
-[ -d "${TDE_PACKAGING_DIR}" ] || TDE_PACKAGING_DIR="${HOME}/tde/${TDE_BRANCH:-master}/tde-packaging"
+[ -d "${TDE_PACKAGING_DIR}" ] || TDE_PACKAGING_DIR="${HOME}/tde/${TDE_BRANCH:-master}/tde/packaging"
 [ -d "${DIST_PACKAGING_DIR}" ] || DIST_PACKAGING_DIR="${TDE_PACKAGING_DIR}/redhat"
 
 # Special case for QT3
diff --git a/redhat/main/tde-i18n/tde-i18n.spec b/redhat/core/tde-i18n/tde-i18n.spec
index 418ae31d4..3884089c7 100644
--- a/redhat/main/tde-i18n/tde-i18n.spec
+++ b/redhat/core/tde-i18n/tde-i18n.spec
@@ -70,7 +70,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 
 BuildRequires:	findutils
 BuildRequires:	gettext
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 
 %description
diff --git a/redhat/main/tdeaccessibility/tdeaccessibility.spec b/redhat/core/tdeaccessibility/tdeaccessibility.spec
index 0856bcf0f..7034a5984 100644
--- a/redhat/main/tdeaccessibility/tdeaccessibility.spec
+++ b/redhat/core/tdeaccessibility/tdeaccessibility.spec
@@ -450,6 +450,7 @@ fi
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
   -DCMAKE_SKIP_INSTALL_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/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 83fda2d77..5b57a05de 100644
--- a/redhat/main/tdeaddons/tdeaddons.spec
+++ b/redhat/core/tdeaddons/tdeaddons.spec
@@ -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
@@ -70,7 +71,7 @@ BuildRequires: trinity-tdegames-devel >= %{tde_version}
 BuildRequires: trinity-tdemultimedia-devel >= %{tde_version}
 BuildRequires: trinity-tdepim-devel >= %{tde_version}
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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%{?fedora} <= 33 ) || 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
@@ -137,18 +138,10 @@ BuildRequires:	db4-devel
 #BuildRequires:	xmms-devel
 #%endif
 
-# PYTHON2 support
-%if 0%{?sle_version} >= 150400
-%define with_python 0
-%else
+# PYTHON support
 %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
+%global python python3
+%global __python %__python3
 
 Requires: trinity-atlantikdesigner = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: trinity-kaddressbook-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -198,6 +191,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*
 
 ##########
 
@@ -355,6 +349,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*
 
 ##########
 
@@ -582,6 +577,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*
 
 ##########
 
@@ -607,6 +606,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*
 
 ##########
 
@@ -664,6 +664,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*
 
 ##########
 
@@ -708,6 +711,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 9eebbaa10..441e3d866 100644
--- a/redhat/main/tdeadmin/tdeadmin.spec
+++ b/redhat/core/tdeadmin/tdeadmin.spec
@@ -72,7 +72,7 @@ Provides:		trinity-kdeadmin = %{?epoch:%{epoch}:}%{version}-%{release}
 BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:	libtool
 BuildRequires:	fdupes
 BuildRequires:	gcc-c++
@@ -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 8f375e734..ad15a0c1d 100644
--- a/redhat/main/tdeartwork/tdeartwork.spec
+++ b/redhat/core/tdeartwork/tdeartwork.spec
@@ -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
@@ -66,7 +67,7 @@ BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	fdupes
 
@@ -104,6 +105,7 @@ BuildRequires:	libart_lgpl-devel
 #  RHEL 6: available in EPEL
 #  RHEL 7: available in NUX
 #  RHEL 8: available in EPEL
+#  RHEL 9: available in EPEL
 %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
 %define with_xscreensaver 1
 
@@ -164,7 +166,7 @@ BuildRequires:	%{jack_devel}
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 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
@@ -384,12 +386,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
 
 ##########
@@ -515,6 +539,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
 
@@ -724,6 +750,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 \
@@ -735,12 +762,11 @@ fi
   -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
   \
   %{!?with_xscreensaver:-DWITH_XSCREENSAVER=OFF} \
-  %{!?with_libart}:-DWITH_LIBART=OFF} \
+  %{!?with_libart:-DWITH_LIBART=OFF} \
   -DWITH_ALL_OPTIONS=ON \
   -DWITH_ARTS=ON \
   -DWITH_LIBART=ON \
   -DWITH_OPENGL=ON \
-  -DWITH_XSCREENSAVER=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.fc34 b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc34
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc34
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc34
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc35 b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc35
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc35
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc35
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc36 b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc36
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc36
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc36
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.mdv2011.0 b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc37
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.mdv2011.0
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc37
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.mga8 b/redhat/core/tdebase/pamd.kcheckpass-trinity.mdv2011.0
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.mga8
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.mdv2011.0
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2012 b/redhat/core/tdebase/pamd.kcheckpass-trinity.mga8
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2012
+++ 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.pclos2013 b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2012
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2013
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2012
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2014 b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2013
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2014
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2013
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2015 b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2014
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2015
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2014
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2016 b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2015
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2016
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2015
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2017 b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2016
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2017
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2016
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2018 b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2017
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2018
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2017
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.el6 b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2018
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.el6
+++ 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.fc34 b/redhat/core/tdebase/pamd.kdm-trinity-np.fc34
index 0616e66f6..0616e66f6 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.fc34
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.fc34
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc35 b/redhat/core/tdebase/pamd.kdm-trinity-np.fc35
index 0616e66f6..0616e66f6 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.fc35
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.fc35
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc36 b/redhat/core/tdebase/pamd.kdm-trinity-np.fc36
index 0616e66f6..0616e66f6 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.fc36
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.fc36
diff --git a/redhat/core/tdebase/pamd.kdm-trinity-np.fc37 b/redhat/core/tdebase/pamd.kdm-trinity-np.fc37
new file mode 100644
index 000000000..0616e66f6
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.fc37
@@ -0,0 +1,16 @@
+ #%PAM-1.0
+auth       required    pam_env.so
+auth       required    pam_permit.so
+auth       include     postlogin
+account    required    pam_nologin.so
+account    include     system-auth
+password   include     system-auth
+session    required    pam_selinux.so close
+session    required    pam_loginuid.so
+session    optional    pam_console.so
+-session    optional    pam_ck_connector.so
+session    required    pam_selinux.so open
+session    optional    pam_keyinit.so force revoke
+session    required    pam_namespace.so
+session    include     system-auth
+session    include     postlogin
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-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.fc34 b/redhat/core/tdebase/pamd.kdm-trinity.fc34
index 4e760760f..4e760760f 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity.fc34
+++ b/redhat/core/tdebase/pamd.kdm-trinity.fc34
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc35 b/redhat/core/tdebase/pamd.kdm-trinity.fc35
index 4e760760f..4e760760f 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity.fc35
+++ b/redhat/core/tdebase/pamd.kdm-trinity.fc35
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc36 b/redhat/core/tdebase/pamd.kdm-trinity.fc36
index 4e760760f..4e760760f 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity.fc36
+++ b/redhat/core/tdebase/pamd.kdm-trinity.fc36
diff --git a/redhat/core/tdebase/pamd.kdm-trinity.fc37 b/redhat/core/tdebase/pamd.kdm-trinity.fc37
new file mode 100644
index 000000000..4e760760f
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kdm-trinity.fc37
@@ -0,0 +1,23 @@
+#%PAM-1.0
+auth     [success=done ignore=ignore default=bad] pam_selinux_permit.so
+auth       required    pam_env.so
+auth       substack    system-auth
+-auth       optional    pam_gnome_keyring.so
+-auth       optional    pam_kwallet.so
+-auth       optional    pam_kwallet5.so
+auth       include     postlogin
+account    required    pam_nologin.so
+account    include     system-auth
+password   include     system-auth
+session    required    pam_selinux.so close
+session    required    pam_loginuid.so
+session    optional    pam_console.so
+-session    optional    pam_ck_connector.so
+session    required    pam_selinux.so open
+session    optional    pam_keyinit.so force revoke
+session    required    pam_namespace.so
+session    include     system-auth
+-session    optional    pam_gnome_keyring.so auto_start
+-session    optional    pam_kwallet.so
+-session    optional    pam_kwallet5.so
+session    include     postlogin
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.el7 b/redhat/core/tdebase/pamd.kscreensaver-trinity.el6
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.el7
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.el6
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc34 b/redhat/core/tdebase/pamd.kscreensaver-trinity.el7
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc34
+++ 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.kscreensaver-trinity.fc35 b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc34
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc35
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc34
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc36 b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc35
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc36
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc35
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.mdv2011.0 b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc36
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.mdv2011.0
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc36
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.mga8 b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc37
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.mga8
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc37
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2012 b/redhat/core/tdebase/pamd.kscreensaver-trinity.mdv2011.0
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2012
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.mdv2011.0
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2013 b/redhat/core/tdebase/pamd.kscreensaver-trinity.mga8
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2013
+++ 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.pclos2014 b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2012
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2014
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2012
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2015 b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2013
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2015
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2013
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2016 b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2014
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2016
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2014
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2017 b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2015
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2017
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2015
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2018 b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2016
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2018
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2016
diff --git a/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2017 b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2017
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2017
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth       include	system-auth
+account    include	system-auth
+password   include	system-auth
+session    include	system-auth
diff --git a/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2018 b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2018
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2018
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth       include	system-auth
+account    include	system-auth
+password   include	system-auth
+session    include	system-auth
diff --git a/redhat/main/tdebase/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 9427a628b..9648593b8 100644
--- a/redhat/main/tdebase/tdebase.spec
+++ b/redhat/core/tdebase/tdebase.spec
@@ -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
@@ -164,6 +165,14 @@ Requires:	redhat-logos
 %define tde_starticon /usr/share/icons/hicolor/96x96/apps/system-logo-icon.png
 %endif
 
+# 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 Theme
 %if 0%{?mgaversion}
 Requires:	mageia-theme-Default
@@ -203,7 +212,7 @@ Requires:	hicolor-icon-theme-branding
 BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	make
 BuildRequires:	fdupes
@@ -248,8 +257,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}
@@ -262,7 +276,7 @@ BuildRequires:	libidn-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 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
@@ -332,6 +346,7 @@ BuildRequires:	OpenEXR-devel
 #  RHEL 6: available in EPEL
 #  RHEL 7: available in NUX
 #  RHEL 8: available in EPEL
+#  RHEL 9: available in EPEL
 %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
 %define with_xscreensaver 1
 
@@ -487,12 +502,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 || 0%{?fedora} >= 34
 BuildRequires:	font-util
+%endif
+
+%if 0%{?suse_version} >= 1220 || 0%{?fedora} >= 34 || 0%{?rhel} >= 9
 BuildRequires:	bdftopcf
 %endif
 
@@ -543,6 +561,16 @@ 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 = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -731,6 +759,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*
 
 ##########
 
@@ -789,6 +818,7 @@ 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*
 
 ##########
 
@@ -831,7 +861,7 @@ 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*
 
 ##########
 
@@ -1202,6 +1232,8 @@ TDE applications, particularly those in the TDE base module.
 %{tde_bindir}/krandom.kss
 %{tde_bindir}/ksystraycmd
 %{tde_bindir}/kxkb
+%{tde_bindir}/tde_license_info
+%{tde_bindir}/tde_show_license_info
 %dir %{tde_libdir}/tdeconf_update_bin
 %{tde_libdir}/tdeconf_update_bin/khotkeys_update
 %{tde_tdelibdir}/kcminit.la
@@ -1247,6 +1279,7 @@ TDE applications, particularly those in the TDE base module.
 %{tde_datadir}/apps/tdeconf_update/konqueror_gestures_trinity21_update.upd
 %{tde_datadir}/apps/kdcop/
 %{tde_datadir}/apps/khotkeys/
+%{tde_datadir}/autostart/tde_license_info.desktop
 %{tde_datadir}/services/kxkb.desktop
 %if 0%{?suse_version} == 0
 %config(noreplace) %{_sysconfdir}/pam.d/kcheckpass-trinity
@@ -1257,6 +1290,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
@@ -1698,8 +1747,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
@@ -1756,7 +1807,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
@@ -1767,6 +1820,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
@@ -1836,6 +1892,7 @@ system passwords.
 %{_datadir}/faces/Star.png
 %{_datadir}/faces/Teddybear.png
 %{_datadir}/faces/Turtle.png
+%{tde_mandir}/man1/tdepasswd.1*
 
 ##########
 
@@ -1898,6 +1955,9 @@ 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*
 
 ##########
 
@@ -2030,6 +2090,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
@@ -2191,6 +2257,7 @@ workstations.
 %{tde_datadir}/services/kfindpart.desktop
 %{tde_datadir}/servicetypes/findpart.desktop
 %{tde_tdedocdir}/HTML/en/kfind/
+%{tde_mandir}/man1/kfind.1*
 
 ##########
 
@@ -2340,6 +2407,10 @@ functionality.
 %if 0%{?mgaversion} >= 3
 %{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*
 
 ##########
 
@@ -2428,6 +2499,7 @@ structure.
 %{tde_datadir}/apps/kcontroledit/
 %{tde_datadir}/apps/kmenuedit/
 %{tde_tdedocdir}/HTML/en/kmenuedit/
+%{tde_mandir}/man1/kmenuedit.1*
 
 ##########
 
@@ -2560,6 +2632,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
@@ -2667,6 +2742,7 @@ 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*
 
 ##########
 
@@ -2687,6 +2763,7 @@ 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*
 
 ##########
 
@@ -2708,6 +2785,7 @@ 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*
 
 ##########
 
@@ -2745,6 +2823,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}
@@ -3191,6 +3270,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/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.fc34.te b/redhat/core/tdebase/tdm.fc34.te
index afe6de52a..afe6de52a 100644
--- a/redhat/main/tdebase/tdm.fc34.te
+++ b/redhat/core/tdebase/tdm.fc34.te
diff --git a/redhat/main/tdebase/tdm.fc35.te b/redhat/core/tdebase/tdm.fc35.te
index afe6de52a..afe6de52a 100644
--- a/redhat/main/tdebase/tdm.fc35.te
+++ b/redhat/core/tdebase/tdm.fc35.te
diff --git a/redhat/main/tdebase/tdm.fc36.te b/redhat/core/tdebase/tdm.fc36.te
index afe6de52a..afe6de52a 100644
--- a/redhat/main/tdebase/tdm.fc36.te
+++ b/redhat/core/tdebase/tdm.fc36.te
diff --git a/redhat/core/tdebase/tdm.fc37.te b/redhat/core/tdebase/tdm.fc37.te
new file mode 100644
index 000000000..afe6de52a
--- /dev/null
+++ b/redhat/core/tdebase/tdm.fc37.te
@@ -0,0 +1,11 @@
+
+module tdm 1.0;
+
+require {
+	type fprintd_t;
+	type init_t;
+	class dbus send_msg;
+}
+
+#============= fprintd_t ==============
+allow fprintd_t init_t:dbus send_msg;
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.fc34 b/redhat/core/tdebase/tdm.service.fc34
index 9ef7e07ff..9ef7e07ff 100644
--- a/redhat/main/tdebase/tdm.service.fc34
+++ b/redhat/core/tdebase/tdm.service.fc34
diff --git a/redhat/main/tdebase/tdm.service.fc35 b/redhat/core/tdebase/tdm.service.fc35
index 9ef7e07ff..9ef7e07ff 100644
--- a/redhat/main/tdebase/tdm.service.fc35
+++ b/redhat/core/tdebase/tdm.service.fc35
diff --git a/redhat/main/tdebase/tdm.service.fc36 b/redhat/core/tdebase/tdm.service.fc36
index 9ef7e07ff..9ef7e07ff 100644
--- a/redhat/main/tdebase/tdm.service.fc36
+++ b/redhat/core/tdebase/tdm.service.fc36
diff --git a/redhat/core/tdebase/tdm.service.fc37 b/redhat/core/tdebase/tdm.service.fc37
new file mode 100644
index 000000000..9ef7e07ff
--- /dev/null
+++ b/redhat/core/tdebase/tdm.service.fc37
@@ -0,0 +1,12 @@
+[Unit]
+Description=The Trinity login manager
+Conflicts=getty@tty1.service
+After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service
+
+[Service]
+ExecStart=/opt/trinity/bin/tdm
+Restart=always
+IgnoreSIGPIPE=no
+
+[Install]
+Alias=display-manager.service
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 59baee29d..9f3bf5d1b 100644
--- a/redhat/main/tdebindings/tdebindings.spec
+++ b/redhat/core/tdebindings/tdebindings.spec
@@ -169,21 +169,13 @@ BuildRequires: Mesa-libGLU-devel
 %endif
 
 # PYTHON support
-%if 0%{?sle_version} >= 150400
-%define with_python 0
-%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)")}
+%global python python3
+%global __python %__python3
+%global python_sitearch %{python3_sitearch}
+%{!?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
@@ -373,6 +365,7 @@ 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
 
@@ -693,7 +686,14 @@ This package is part of the official TDE bindings module.
 %defattr(-,root,root,-)
 %{python_sitearch}/pcop.la
 %{python_sitearch}/pcop.so
+%if 0%{?rhel} == 7 || 0%{?suse_version}
 %{python_sitearch}/pydcop.py*
+%if 0%{?rhel} == 7
+%{python_sitearch}/__pycache__/pydcop.*.pyc
+%endif
+%else
+%pycached %{python_sitearch}/pydcop.py
+%endif
 
 %endif
 
@@ -806,6 +806,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
 
 ##########
@@ -836,6 +837,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*
 
 ##########
 
@@ -867,6 +871,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*
 
 ##########
 
@@ -1131,6 +1139,10 @@ EXTRA_INCLUDES="/usr/include/ruby-%{rb20_ver}:/usr/include/ruby-%{rb20_ver}/%{_t
 EXTRA_INCLUDES="/usr/include/ruby-%{rb_ver}:/usr/include/ruby-%{rb_ver}/%{_target}-gnu"
 %endif
 
+if [ -d "/usr/include/python3.6m" ]; then
+  EXTRA_INCLUDES="/usr/include/python3.6m:${EXTRA_INCLUDES}"
+fi
+
 # Warning: GCC visibility causes FTBFS [Bug #1285]
 %configure \
   --prefix=%{tde_prefix} \
@@ -1150,7 +1162,7 @@ EXTRA_INCLUDES="/usr/include/ruby-%{rb_ver}:/usr/include/ruby-%{rb_ver}/%{_targe
   --enable-rpath \
   --disable-gcc-hidden-visibility \
   \
-  --with-extra-includes=%{_includedir}/tqscintilla:${EXTRA_INCLUDES} \
+  --with-extra-includes=%{_includedir}/tqt:${EXTRA_INCLUDES} \
   --with-extra-libs=%{tde_libdir} \
 %if 0%{with_python}
   --with-pythondir=%{_usr} \
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 06f9dd206..7bbef35e9 100644
--- a/redhat/main/tdeedu/tdeedu.spec
+++ b/redhat/core/tdeedu/tdeedu.spec
@@ -63,7 +63,7 @@ Source1:		%{name}-rpmlintrc
 
 BuildRequires: trinity-tdelibs-devel >= %{tde_version}
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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
@@ -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 7c925dd1c..273705e9f 100644
--- a/redhat/main/tdegames/tdegames.spec
+++ b/redhat/core/tdegames/tdegames.spec
@@ -66,7 +66,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	trinity-tdemultimedia-devel >= %{tde_version}
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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%{?fedora} <= 33 ) || 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
@@ -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 7d3037300..1be2d079d 100644
--- a/redhat/main/tdegraphics/tdegraphics.spec
+++ b/redhat/core/tdegraphics/tdegraphics.spec
@@ -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:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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%{?fedora} <= 33 ) || 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
 
 # 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
@@ -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*
 
 ##########
 
@@ -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*
 
 ##########
 
@@ -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 5f9eac00b..e66e5d75c 100644
--- a/redhat/main/tdelibs/tdelibs.spec
+++ b/redhat/core/tdelibs/tdelibs.spec
@@ -86,7 +86,7 @@ Requires:		trinity-filesystem >= %{tde_version}
 Requires:		fileshareset >= 2.0
 %endif
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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%{?fedora} <= 33 ) || 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
@@ -657,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 0370625f9..08056f129 100644
--- a/redhat/main/tdemultimedia/tdemultimedia.spec
+++ b/redhat/core/tdemultimedia/tdemultimedia.spec
@@ -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
@@ -72,7 +73,7 @@ BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	fdupes
 BuildRequires:	desktop-file-utils
@@ -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*
 
 ##########
 
@@ -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*
 
 ##########
 
@@ -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*
 
 ##########
 
@@ -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*
 
 ##########
 
@@ -968,6 +975,7 @@ 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*
 
 ##########
 
@@ -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 c7681f983..2dd26ce3e 100644
--- a/redhat/main/tdenetwork/tdenetwork.spec
+++ b/redhat/core/tdenetwork/tdenetwork.spec
@@ -77,7 +77,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	libtqca-devel >= %{tde_epoch}:1.0
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:	gettext
 BuildRequires:	coreutils 
 BuildRequires:	gcc-c++
@@ -137,7 +137,7 @@ BuildRequires:	pcre-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 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
@@ -252,6 +252,14 @@ 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
@@ -433,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*
 
 ##########
 
@@ -492,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*
 
 ##########
 
@@ -721,6 +731,7 @@ 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*
 
 ##########
 
@@ -918,7 +929,7 @@ Summary:		Talk daemon for Trinity
 Group:			Applications/Internet
 Requires:		trinity-kcontrol >= %{tde_version}
 Requires:		trinity-tdebase-data >= %{tde_version}
-%if 0%{?fedora} == 0 || 0%{?fedora} <= 33
+%if 0%{?with_xinetd}
 Requires:		xinetd
 %endif
 
@@ -938,10 +949,10 @@ 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
 
@@ -974,6 +985,7 @@ 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
 
@@ -1024,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*
 
 ##########
 
@@ -1095,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 \
@@ -1167,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/
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 244229e11..e3a9f483e 100644
--- a/redhat/main/tdepim/tdepim.spec
+++ b/redhat/core/tdepim/tdepim.spec
@@ -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:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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%{?fedora} <= 33 ) || 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
@@ -149,6 +149,7 @@ BuildRequires:	libXcomposite-devel
 #  RHEL 6: available in EPEL
 #  RHEL 7: available in NUX
 #  RHEL 8: available in EPEL
+#  RHEL 9: available in EPEL
 %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
 %define with_xscreensaver 1
 
@@ -1855,6 +1856,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 0718a6fa8..53dfffc6e 100644
--- a/redhat/main/tdesdk/tdesdk.spec
+++ b/redhat/core/tdesdk/tdesdk.spec
@@ -64,7 +64,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-perl-dcop >= %{tde_version}
 BuildRequires:	trinity-tdepim-devel >= %{tde_version}
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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%{?fedora} <= 33 ) || 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
@@ -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,6 +379,9 @@ 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*
 
 ##########
 
@@ -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*
 
 ##########
 
@@ -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*
 
 ##########
 
@@ -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 98b95239a..eb823346d 100644
--- a/redhat/main/tdetoys/tdetoys.spec
+++ b/redhat/core/tdetoys/tdetoys.spec
@@ -64,7 +64,7 @@ BuildRequires: trinity-kdesktop >= %{tde_version}
 BuildRequires: trinity-kicker >= %{tde_version}
 BuildRequires: trinity-tdebase-devel >= %{tde_version}
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -87,7 +87,7 @@ BuildRequires:	libidn-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 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
@@ -325,10 +325,12 @@ This package is part of Trinity, and a component of the TDE toys module.
 %{tde_bindir}/kweatherreport
 %{tde_libdir}/libtdeinit_kweatherreport.so
 %{tde_libdir}/libtdeinit_kweatherreport.la
-%{tde_tdelibdir}/kcm_weather.so
-%{tde_tdelibdir}/kcm_weather.la
+%{tde_tdelibdir}/kcm_weatherapplet.so
+%{tde_tdelibdir}/kcm_weatherapplet.la
 %{tde_tdelibdir}/kcm_weatherservice.so
 %{tde_tdelibdir}/kcm_weatherservice.la
+%{tde_tdelibdir}/kcm_weatherstations.so
+%{tde_tdelibdir}/kcm_weatherstations.la
 %{tde_tdelibdir}/kweatherreport.so
 %{tde_tdelibdir}/kweatherreport.la
 %{tde_tdelibdir}/weather_panelapplet.la
@@ -341,8 +343,9 @@ This package is part of Trinity, and a component of the TDE toys module.
 %{tde_datadir}/apps/kweatherservice/
 %{tde_datadir}/icons/hicolor/*/apps/kweather.png
 %{tde_datadir}/services/kweatherservice.desktop
-%{tde_datadir}/services/kcmweather.desktop
+%{tde_datadir}/services/kcmweatherapplet.desktop
 %{tde_datadir}/services/kcmweatherservice.desktop
+%{tde_datadir}/services/kcmweatherstations.desktop
 %{tde_tdedocdir}/HTML/en/kweather/
 %{tde_mandir}/man*/kweatherreport.*
 %{tde_mandir}/man*/kweatherservice.*
@@ -406,6 +409,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 a482ce2cb..eb42326d0 100644
--- a/redhat/main/tdeutils/tdeutils.spec
+++ b/redhat/core/tdeutils/tdeutils.spec
@@ -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
@@ -74,7 +75,7 @@ BuildRequires:	trinity-filesystem >= %{tde_version}
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -84,18 +85,9 @@ BuildRequires:	net-snmp-devel
 BuildRequires:	gmp-devel
 
 # PYTHON support
-%if 0%{?sle_version} >= 150400
-%define python python3
-%define __python %__python3
-%else
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31
-%define python python2
-%define __python %__python2
-%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%else
-%define python python
-%endif
-%endif
+%global python python3
+%global __python %__python3
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 BuildRequires:	%{python}
 BuildRequires:	%{python}-devel
 
@@ -127,7 +119,7 @@ BuildRequires:	libidn-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 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
@@ -151,6 +143,7 @@ BuildRequires:	libacl-devel
 
 # XSCREENSAVER support
 #  RHEL 8: available in EPEL
+#  RHEL 9: 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}
@@ -270,6 +263,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*
 
 ##########
 
@@ -299,6 +293,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*
 
 ##########
 
@@ -321,6 +316,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*
 
 ##########
 
@@ -411,6 +407,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*
 
 ##########
 
@@ -437,6 +435,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*
 
 ##########
 
@@ -456,6 +455,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*
 
 ##########
 
@@ -491,6 +491,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*
 
 ##########
 
@@ -518,6 +519,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*
 
 ##########
 
@@ -781,6 +783,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*
 
 ##########
 
@@ -814,6 +817,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
 
@@ -896,6 +900,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 8755c4bd0..5730a8207 100644
--- a/redhat/main/tdevelop/tdevelop.spec
+++ b/redhat/core/tdevelop/tdevelop.spec
@@ -81,7 +81,7 @@ BuildRequires:	update-desktop-files
 BuildRequires:	brp-check-trinity
 %endif
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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%{?fedora} <= 33 ) || 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,12 +155,8 @@ BuildRequires:	libacl-devel
 BuildRequires:	openssl-devel
 
 # PYTHON support
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30 || 0%{?mgaversion} >= 8
-%global python python2
-%global __python python2
-%else
-%global __python python2
-%endif
+%global python python3
+%global __python %__python3
 
 
 %description
@@ -640,6 +636,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 7892fe02b..58bc4c371 100644
--- a/redhat/main/tdewebdev/tdewebdev.spec
+++ b/redhat/core/tdewebdev/tdewebdev.spec
@@ -471,6 +471,7 @@ fi
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
   -DCMAKE_SKIP_INSTALL_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/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 6176c2d49..11b6ee27a 100644
--- a/redhat/dependencies/akode/akode.spec
+++ b/redhat/dependencies/akode/akode.spec
@@ -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:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:  gcc-c++
 BuildRequires:	libtool
 
diff --git a/redhat/dependencies/arts/arts.spec b/redhat/dependencies/arts/arts.spec
index 8480ddc7e..5e7809a97 100644
--- a/redhat/dependencies/arts/arts.spec
+++ b/redhat/dependencies/arts/arts.spec
@@ -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:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -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*
 
 ##########
 
@@ -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 df1e72379..3937f6ff3 100644
--- a/redhat/dependencies/avahi-tqt/avahi-tqt.spec
+++ b/redhat/dependencies/avahi-tqt/avahi-tqt.spec
@@ -52,7 +52,7 @@ Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
 BuildRequires:	libtqt4-devel >= %{tde_epoch}:4.2.0
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 2915ce93e..5c2aef17e 100644
--- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec
+++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec
@@ -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:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 f9bddec2e..2fd896c2f 100644
--- a/redhat/dependencies/dbus-tqt/dbus-tqt.spec
+++ b/redhat/dependencies/dbus-tqt/dbus-tqt.spec
@@ -52,7 +52,7 @@ Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
 BuildRequires:	libtqt4-devel >= %{tde_epoch}:4.2.0
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 95d16308f..039697747 100644
--- a/redhat/dependencies/libart-lgpl/libart-lgpl.spec
+++ b/redhat/dependencies/libart-lgpl/libart-lgpl.spec
@@ -51,7 +51,7 @@ BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -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 d0287ec28..29569afb4 100644
--- a/redhat/dependencies/libcaldav/libcaldav.spec
+++ b/redhat/dependencies/libcaldav/libcaldav.spec
@@ -54,7 +54,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 09970f7a0..a06752bc1 100644
--- a/redhat/dependencies/libcarddav/libcarddav.spec
+++ b/redhat/dependencies/libcarddav/libcarddav.spec
@@ -54,7 +54,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	make
 BuildRequires:	libtool
@@ -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
index 403ddbf5a..aa965f98c 100644
--- a/redhat/dependencies/polkit-tqt/polkit-tqt.spec
+++ b/redhat/dependencies/polkit-tqt/polkit-tqt.spec
@@ -17,7 +17,7 @@
 
 # TDE variables
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.11
+%define tde_version 14.1.0
 %endif
 %define tde_pkg polkit-tqt
 
@@ -50,9 +50,10 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 Source1:		%{name}-rpmlintrc
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:	trinity-dbus-1-tqt-devel
 BuildRequires:	trinity-filesystem >= %{tde_version}
+BuildRequires:	libtqt4-devel
 
 BuildRequires:	desktop-file-utils
 BuildRequires:	gcc-c++
diff --git a/redhat/dependencies/python-tqt/python-tqt.spec b/redhat/dependencies/pytqt/pytqt.spec
index be24592b2..d7285cd3c 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
 #
@@ -24,7 +24,7 @@
 %if "%{?tde_version}" == ""
 %define tde_version 14.1.0
 %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
@@ -61,6 +61,8 @@ Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
 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,19 +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
-%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)")}
-%endif
+%global python python3
+%global __python %__python3
+%global python_sitearch %{python3_sitearch}
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 BuildRequires:	%{python}
 BuildRequires:	%{python}-devel
 
@@ -118,81 +111,94 @@ 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
-%{python_sitearch}/python_tqt/__init__.py*
-%{python_sitearch}/python_tqt/qt.so
-%{python_sitearch}/python_tqt/qtcanvas.so
-%{python_sitearch}/python_tqt/qtnetwork.so
-%{python_sitearch}/python_tqt/qtsql.so
-%{python_sitearch}/python_tqt/qttable.so
-%{python_sitearch}/python_tqt/qtui.so
-%{python_sitearch}/python_tqt/qtxml.so
+%dir %{python_sitearch}/PyTQt
+%if 0%{?rhel} == 7 || 0%{?suse_version}
+%{python_sitearch}/PyTQt/__init__.py*
+%if 0%{?rhel} == 7
+%{python_sitearch}/PyTQt/__pycache__/__init__.*.pyc
+%endif
+%else
+%pycached %{python_sitearch}/PyTQt/__init__.py
+%endif
+%{python_sitearch}/PyTQt/tqt.so
+%{python_sitearch}/PyTQt/tqtcanvas.so
+%{python_sitearch}/PyTQt/tqtnetwork.so
+%{python_sitearch}/PyTQt/tqtsql.so
+%{python_sitearch}/PyTQt/tqttable.so
+%{python_sitearch}/PyTQt/tqtui.so
+%{python_sitearch}/PyTQt/tqtxml.so
 
 ##########
 
-%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
+%{python_sitearch}/PyTQt/tqtgl.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
+%{python_sitearch}/PyTQt/tqtext.so
 
 ##########
 
 %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,26 +209,35 @@ Linguist translation files from Python code.
 
 %files -n trinity-pytqt-tools
 %defattr(-,root,root,-)
-%{tde_bindir}/pylupdate
-%{tde_bindir}/pyuic
+%{tde_bindir}/pytqlupdate
+%{tde_bindir}/pytquic
 
 ##########
 
-%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*
+%if 0%{?rhel} == 7 || 0%{?suse_version}
+%{python_sitearch}/PyTQt/pytqtconfig.py*
+%if 0%{?rhel} == 7
+%{python_sitearch}/PyTQt/__pycache__/pytqtconfig.*.pyc
+%endif
+%else
+%pycached %{python_sitearch}/PyTQt/pytqtconfig.py
+%endif
 %dir %{_datadir}/sip
 %{_datadir}/sip/tqt/
 
@@ -245,16 +260,13 @@ export PATH="%{tde_bindir}:${PATH}"
 mkdir build
 cd build
 
-# WTF ? CentOS 6 !
-cp -rf ../pyuic3 ../pylupdate3 
-
 echo yes | %__python ../configure.py \
-	-c -n %{_includedir}/tqscintilla \
+	-c -n %{_includedir}/tqt3 \
 	-g %{_includedir}/tqt3 \
 	-q %{_datadir}/tqt3 \
 	-y tqt-mt \
 	-o %{_libdir} -u -j 10 \
-	-d %{python_sitearch}/python_tqt \
+	-d %{python_sitearch}/PyTQt \
 	-v %{_datadir}/sip/tqt \
 	-b %{tde_bindir} \
 	-w \
@@ -272,7 +284,6 @@ echo yes | %__python ../configure.py \
 
 
 %clean
-%__rm -rf %{?buildroot}%{python_sitearch}/python_tqt/__init__.py
 
 
 %changelog
diff --git a/redhat/dependencies/sip4-tqt/sip4-tqt.spec b/redhat/dependencies/sip4-tqt/sip4-tqt.spec
index a2bf18df4..0c60df09d 100644
--- a/redhat/dependencies/sip4-tqt/sip4-tqt.spec
+++ b/redhat/dependencies/sip4-tqt/sip4-tqt.spec
@@ -77,19 +77,10 @@ BuildRequires:  bison
 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)")}
+%global python_sitearch %{python3_sitearch}
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 BuildRequires:	%{python}
 BuildRequires:	%{python}-devel
 
@@ -119,7 +110,18 @@ specificity towards C++ and Python.
 
 %files -n sip4-tqt
 %defattr(-,root,root,-)
-%{python_sitearch}/sip4_tqt/
+%{python_sitearch}/sip_tqt.so
+%if 0%{?rhel} == 7 || 0%{?suse_version}
+%{python_sitearch}/sip_tqt_config.py*
+%{python_sitearch}/sip_tqt_distutils.py*
+%if 0%{?rhel} == 7
+%{python_sitearch}/__pycache__/sip_tqt_config.*.pyc
+%{python_sitearch}/__pycache__/sip_tqt_distutils.*.pyc
+%endif
+%else
+%pycached %{python_sitearch}/sip_tqt_config.py
+%pycached %{python_sitearch}/sip_tqt_distutils.py
+%endif
 
 ##########
 
@@ -153,8 +155,8 @@ needed to develop Python bindings with sip.
 
 %files -n sip4-tqt-devel
 %defattr(-,root,root,-)
-%{tde_bindir}/sip
-%{tde_includedir}/sip.h
+%{tde_bindir}/sip-tqt
+%{tde_includedir}/sip-tqt.h
 
 ##########
 
@@ -176,7 +178,7 @@ mkdir build
 cd build
 %__python ../configure.py \
 	-b %{tde_bindir} \
-	-d %{python_sitearch}/sip4_tqt \
+	-d %{python_sitearch} \
 	-e %{tde_includedir} \
 	-u STRIP="" \
 	CFLAGS="${RPM_OPT_FLAGS} -I%{_includedir}/tqt -I%{_includedir}/tqt3 -I${PWD}/../sipgen -DYYERROR_VERBOSE" \
diff --git a/redhat/common/cmake/cmake.spec b/redhat/dependencies/tde-cmake/tde-cmake.spec
index cd6825db3..71b89c4fb 100644
--- a/redhat/common/cmake/cmake.spec
+++ b/redhat/dependencies/tde-cmake/tde-cmake.spec
@@ -19,7 +19,7 @@
 %if "%{?tde_version}" == ""
 %define tde_version 14.1.0
 %endif
-%define tde_pkg cmake
+%define tde_pkg tde-cmake
 
 %if 0%{?rhel} == 6 || 0%{?rhel} == 7
 %define cmake_datadir %{_datadir}/cmake3
@@ -55,6 +55,8 @@ BuildRequires:	desktop-file-utils
 
 Requires:		cmake
 
+Obsoletes:		trinity-cmake < %{version}-%{release}
+Provides:		trinity-cmake = %{version}-%{release}
 
 %description
 TDE uses its own set of modules and macros to simplify CMake rules.
@@ -105,6 +107,7 @@ fi
 %{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
diff --git a/redhat/dependencies/tqca-tls/tqca-tls.spec b/redhat/dependencies/tqca-tls/tqca-tls.spec
index ca5b7c49a..567649b9a 100644
--- a/redhat/dependencies/tqca-tls/tqca-tls.spec
+++ b/redhat/dependencies/tqca-tls/tqca-tls.spec
@@ -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:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 ff7f51a8a..258b6a3c5 100644
--- a/redhat/dependencies/tqca/tqca.spec
+++ b/redhat/dependencies/tqca/tqca.spec
@@ -65,7 +65,7 @@ Obsoletes:		%{libtqt3}-mt-tqca-tls < %{version}-%{release}
 Provides:		%{libtqt3}-mt-tqca-tls = %{version}-%{release}
 
 BuildRequires:  libtqt4-devel >= %{tde_epoch}:4.2.0
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	openssl-devel >= 0.9.8
 
diff --git a/redhat/dependencies/tqscintilla/tqscintilla.spec b/redhat/dependencies/tqscintilla/tqscintilla.spec
index 7e152751d..b926e184e 100644
--- a/redhat/dependencies/tqscintilla/tqscintilla.spec
+++ b/redhat/dependencies/tqscintilla/tqscintilla.spec
@@ -55,7 +55,7 @@ Source1:		trinity-tqscintilla-rpmlintrc
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-filesystem >= %{tde_version}
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gcc-c++
 BuildRequires:	gettext
@@ -91,8 +91,8 @@ TQScintilla is a port or Scintilla to the TQt GUI toolkit.
 %files -n %{libtqscintilla}7
 %defattr(-,root,root,-)
 %doc ChangeLog LICENSE NEWS README
-%{_libdir}/libqscintilla.so.7
-%{_libdir}/libqscintilla.so.7.0.1
+%{_libdir}/libtqscintilla.so.7
+%{_libdir}/libtqscintilla.so.7.0.1
 %{_libdir}/tqt3/plugins/designer/*.so
 %dir %{_datadir}/tqt3/translations/
 %{_datadir}/tqt3/translations/*.qm
@@ -117,10 +117,39 @@ This package contains the development files for tqscintilla.
 
 %files -n %{libtqscintilla}-devel
 %defattr(-,root,root,-)
-%{_includedir}/tqscintilla/
-%{_libdir}/libqscintilla.so
-%{_libdir}/pkgconfig/qscintilla.pc
-%exclude %{_libdir}/libqscintilla.la
+#%{_includedir}/tqscintilla/
+%{_includedir}/tqt3/tqextscintilla.h
+%{_includedir}/tqt3/tqextscintillaapis.h
+%{_includedir}/tqt3/tqextscintillabase.h
+%{_includedir}/tqt3/tqextscintillacommand.h
+%{_includedir}/tqt3/tqextscintillacommandset.h
+%{_includedir}/tqt3/tqextscintilladocument.h
+%{_includedir}/tqt3/tqextscintillaglobal.h
+%{_includedir}/tqt3/tqextscintillalexer.h
+%{_includedir}/tqt3/tqextscintillalexerbash.h
+%{_includedir}/tqt3/tqextscintillalexerbatch.h
+%{_includedir}/tqt3/tqextscintillalexercpp.h
+%{_includedir}/tqt3/tqextscintillalexercsharp.h
+%{_includedir}/tqt3/tqextscintillalexercss.h
+%{_includedir}/tqt3/tqextscintillalexerdiff.h
+%{_includedir}/tqt3/tqextscintillalexerhtml.h
+%{_includedir}/tqt3/tqextscintillalexeridl.h
+%{_includedir}/tqt3/tqextscintillalexerjava.h
+%{_includedir}/tqt3/tqextscintillalexerjavascript.h
+%{_includedir}/tqt3/tqextscintillalexerlua.h
+%{_includedir}/tqt3/tqextscintillalexermakefile.h
+%{_includedir}/tqt3/tqextscintillalexerperl.h
+%{_includedir}/tqt3/tqextscintillalexerpov.h
+%{_includedir}/tqt3/tqextscintillalexerproperties.h
+%{_includedir}/tqt3/tqextscintillalexerpython.h
+%{_includedir}/tqt3/tqextscintillalexerruby.h
+%{_includedir}/tqt3/tqextscintillalexersql.h
+%{_includedir}/tqt3/tqextscintillalexertex.h
+%{_includedir}/tqt3/tqextscintillamacro.h
+%{_includedir}/tqt3/tqextscintillaprinter.h
+%{_libdir}/libtqscintilla.so
+%{_libdir}/pkgconfig/tqscintilla.pc
+%exclude %{_libdir}/libtqscintilla.la
 %exclude %{_libdir}/tqt3/plugins/designer/*.la
 
 ##########
@@ -137,12 +166,7 @@ This package contains the documentation for tqscintilla.
 
 %files -n %{libtqscintilla}-doc
 %defattr(-,root,root,-)
-%{_docdir}/libtqscintilla7/
-%exclude %{_docdir}/libtqscintilla7/ChangeLog
-%exclude %{_docdir}/libtqscintilla7/LICENSE
-%exclude %{_docdir}/libtqscintilla7/NEWS
-%exclude %{_docdir}/libtqscintilla7/README
-/usr/share/doc/libtqscintilla/
+%{_docdir}/libtqscintilla/
 
 ##########
 
@@ -184,8 +208,10 @@ fi
 %__rm -rf %{?buildroot}
 %__make install -C build DESTDIR=%{?buildroot}
 
-# Fix headers location
-%__mv "%{?buildroot}%{_includedir}/tqt3" "%{?buildroot}%{_includedir}/tqscintilla"
+%if "%{?_docdir}" != "%{_datadir}/doc"
+%__mkdir_p "%{?buildroot}%{_docdir}"
+%__mv "%{?buildroot}%{_datadir}/doc/libtqscintilla/" "%{?buildroot}%{_docdir}/libtqscintilla/"
+%endif
 
 
 %clean
diff --git a/redhat/dependencies/tqt3/tqt3.spec b/redhat/dependencies/tqt3/tqt3.spec
index 5441fc8f4..4d79d2247 100644
--- a/redhat/dependencies/tqt3/tqt3.spec
+++ b/redhat/dependencies/tqt3/tqt3.spec
@@ -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++
@@ -267,17 +268,12 @@ BuildRequires: sqlite3-devel
 %endif
 
 # 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
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200
 BuildRequires: postgresql-server-devel
 %else
 BuildRequires: postgresql-devel
 %endif
-%endif
 
 # Firebird support
 %if 0%{?mdkversion} || 0%{?mgaversion}
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 4d9b6b348..475aeac18 100644
--- a/redhat/dependencies/tqtinterface/tqtinterface.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface.spec
@@ -56,7 +56,7 @@ 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}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
@@ -162,7 +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
-Requires:	trinity-cmake >= %{version}-%{release}
+Requires:	trinity-tde-cmake >= %{version}-%{release}
 
 Obsoletes:	trinity-tqtinterface-devel < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:	trinity-tqtinterface-devel = %{?epoch:%{epoch}:}%{version}-%{release}
diff --git a/redhat/docker/build.sh b/redhat/docker/build.sh
index d4c1229c7..cbc2a003f 100755
--- a/redhat/docker/build.sh
+++ b/redhat/docker/build.sh
@@ -26,5 +26,5 @@ 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 remove "localhost/${IMAGE}"
+  #docker image remove "localhost/${IMAGE}"
 fi
diff --git a/redhat/docker/el5/Dockerfile.x86_64 b/redhat/docker/el5/Dockerfile.x86_64
index a6033ebea..806685e8a 100644
--- a/redhat/docker/el5/Dockerfile.x86_64
+++ b/redhat/docker/el5/Dockerfile.x86_64
@@ -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|"
 
diff --git a/redhat/docker/el6/packages b/redhat/docker/el6/packages
index 9c05dc013..78e50226a 100644
--- a/redhat/docker/el6/packages
+++ b/redhat/docker/el6/packages
@@ -118,6 +118,7 @@ libraw1394-devel
 libsamplerate-devel
 libsmbclient-devel
 libsndfile-devel
+libssh-devel
 libssh2-devel
 libtheora-devel
 libtiff-devel
diff --git a/redhat/docker/el7/Dockerfile.x86_64 b/redhat/docker/el7/Dockerfile.x86_64
index cae7bab86..a856eb671 100644
--- a/redhat/docker/el7/Dockerfile.x86_64
+++ b/redhat/docker/el7/Dockerfile.x86_64
@@ -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 https://archives.fedoraproject.org/pub/archive/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 https://archives.fedoraproject.org/pub/archive/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 https://archives.fedoraproject.org/pub/archive/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 46c7034d9..78dd12598 100644
--- a/redhat/docker/el7/packages
+++ b/redhat/docker/el7/packages
@@ -9,7 +9,9 @@ binutils-devel
 bison
 bluez-libs-devel
 boost-devel
+boost-python36-devel
 bzip2-devel
+byacc
 ccache
 cdparanoia
 cdparanoia-devel
@@ -19,6 +21,7 @@ clamav
 clamav-devel
 clucene-core-devel
 cmake
+cmake3
 cpp
 cppunit-devel
 createrepo
@@ -64,6 +67,7 @@ gtk2-devel
 gtk+-devel
 gtk-doc
 guile-devel
+heimdal-devel
 hiredis-devel
 hspell-devel
 html2ps
@@ -118,6 +122,7 @@ libsamplerate-devel
 libsecret-devel
 libsmbclient-devel
 libsndfile-devel
+libssh-devel
 libssh2-devel
 libtheora-devel
 libtiff-devel
@@ -174,11 +179,13 @@ pigz
 pilot-link-devel
 pkcs11-helper-devel
 pkgconfig(pygtk-2.0)
+polkit-devel
 poppler-devel
 postgresql-devel
 ppp
 pth-devel
 pulseaudio-libs-devel
+python3-devel
 qt-devel
 readline-devel
 recode
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 090d63f9d..78f152ba6 100644
--- a/redhat/docker/el8/Dockerfile.x86_64
+++ b/redhat/docker/el8/Dockerfile.x86_64
@@ -1,4 +1,4 @@
-FROM centos:8
+FROM rockylinux:8
 
 ARG TDE_VERSION=14.1.0
 ARG ARCH=x86_64
@@ -14,7 +14,8 @@ COPY centos-devel.repo /etc/yum.repos.d/centos-devel.repo
 # Enable supplementary repositories
 # Install Trinity build dependencies
 COPY packages /packages
-RUN echo "proxy=http://proxy:3128" >>"/etc/dnf/dnf.conf" \
+RUN set -x \
+ && echo "proxy=http://proxy:3128" >>"/etc/dnf/dnf.conf" \
  && curl -o /usr/lib/python3.6/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 \
@@ -40,19 +41,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/30/Everything/source/tree/Packages/p/perl-PAR-1.015-8.fc30.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/30/Everything/source/tree/Packages/p/perl-Getopt-ArgvFile-1.11-28.fc30.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/30/Everything/source/tree/Packages/p/perl-PAR-Packer-1.047-4.fc30.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 deb431bbe..06283e94e 100644
--- a/redhat/docker/el8/packages
+++ b/redhat/docker/el8/packages
@@ -45,6 +45,7 @@ gamin-devel
 gcc
 gcc-c++
 gcc-gfortran
+geoip-devel
 gettext-devel
 giflib-devel
 glibmm24-devel
@@ -61,7 +62,9 @@ gtk3-devel
 gtk-doc
 guile-devel
 heimdal-devel
+help2man
 hspell-devel
+html2ps
 icu
 ImageMagick-devel
 imake
@@ -93,6 +96,7 @@ libgsf-devel
 libgssglue-devel
 libical-devel
 libidn-devel
+libjpeg-turbo-utils
 libksba-devel
 libmad-devel
 libmemcached-devel
@@ -114,6 +118,7 @@ libsamplerate-devel
 libsecret-devel
 libsmbclient-devel
 libsndfile-devel
+libssh-devel
 libtheora-devel
 libtiff-devel
 libtirpc-devel
@@ -210,6 +215,7 @@ systemd-devel
 taglib-devel
 tcl
 texinfo
+texlive-dvips
 torsocks
 transfig
 unixODBC-devel
diff --git a/redhat/docker/el9/Dockerfile.x86_64 b/redhat/docker/el9/Dockerfile.x86_64
new file mode 100644
index 000000000..32039dce0
--- /dev/null
+++ b/redhat/docker/el9/Dockerfile.x86_64
@@ -0,0 +1,100 @@
+FROM rockylinux:9
+
+ARG TDE_VERSION=14.1.0
+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 https://archives.fedoraproject.org/pub/archive/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..da83cd4e3
--- /dev/null
+++ b/redhat/docker/el9/packages
@@ -0,0 +1,226 @@
+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
+heimdal-devel
+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
+mplayer
+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-server-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
+xscreensaver
+xscreensaver-base
+xscreensaver-extras
+xscreensaver-gl-base
+xscreensaver-gl-extras
+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/f34/Dockerfile.x86_64 b/redhat/docker/f34/Dockerfile.x86_64
index 3b1aee7d6..18b2ad704 100644
--- a/redhat/docker/f34/Dockerfile.x86_64
+++ b/redhat/docker/f34/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM fedora:34
 
-ARG TDE_VERSION=14.0.10
+ARG TDE_VERSION=14.1.0
 ARG ARCH=x86_64
 
 # Fix DNF database corruption
diff --git a/redhat/docker/f35/Dockerfile.x86_64 b/redhat/docker/f35/Dockerfile.x86_64
index b4a34b522..ff247e8ca 100644
--- a/redhat/docker/f35/Dockerfile.x86_64
+++ b/redhat/docker/f35/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM fedora:35
 
-ARG TDE_VERSION=14.0.10
+ARG TDE_VERSION=14.1.0
 ARG ARCH=x86_64
 
 # Fix DNF database corruption
diff --git a/redhat/docker/f35/rpmmacros b/redhat/docker/f35/rpmmacros
index f8169a30e..4ce88c1fd 100644
--- a/redhat/docker/f35/rpmmacros
+++ b/redhat/docker/f35/rpmmacros
@@ -2,5 +2,6 @@
 %_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
index 80c5d583c..a17525d51 100644
--- a/redhat/docker/f36/Dockerfile.x86_64
+++ b/redhat/docker/f36/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM fedora:36
 
-ARG TDE_VERSION=14.0.12
+ARG TDE_VERSION=14.1.0
 ARG ARCH=x86_64
 
 # Fix DNF database corruption
diff --git a/redhat/docker/f36/rpmmacros b/redhat/docker/f36/rpmmacros
index 22a794cc1..fd63b7997 100644
--- a/redhat/docker/f36/rpmmacros
+++ b/redhat/docker/f36/rpmmacros
@@ -1,6 +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..0390ea2f7
--- /dev/null
+++ b/redhat/docker/f37/Dockerfile.x86_64
@@ -0,0 +1,43 @@
+FROM fedora:37
+
+ARG TDE_VERSION=14.1.0
+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 https://archives.fedoraproject.org/pub/archive/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..cca3f9bb1
--- /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
+heimdal-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
+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/mga8/Dockerfile.i686 b/redhat/docker/mga8/Dockerfile.i686
index e39ba47d2..f465d0914 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.1.0
 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..6e978f9ee 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.1.0
 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..c44677fa0 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,11 +214,11 @@ pinentry-gtk2
 pkgconfig(audiofile)
 pkgconfig(libpng16)
 polkit-agent-none
+polkit-devel
 postgresql13
 postgresql13-devel
 ppp
-python-devel
-python-sip
+python3-devel
 qt4-devel
 readline-devel
 recode
diff --git a/redhat/docker/mga8/packages.x86_64 b/redhat/docker/mga8/packages.x86_64
index ad8802b2c..22bc88e76 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,11 +217,11 @@ pinentry-gtk2
 pkgconfig(audiofile)
 pkgconfig(libpng16)
 polkit-agent-none
+polkit-devel
 postgresql13
 postgresql13-devel
 ppp
-python-devel
-python-sip
+python3-devel
 qt4-devel
 readline-devel
 recode
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/oss152/packages b/redhat/docker/oss152/packages
index 0fd341899..ec21f7f6b 100644
--- a/redhat/docker/oss152/packages
+++ b/redhat/docker/oss152/packages
@@ -163,8 +163,8 @@ perl-PAR-Packer
 perl-pcsc
 pkcs11-helper-devel
 pkgconfig(pygtk-2.0)
-postgresql10
-postgresql10-devel
+postgresql
+postgresql-devel
 python-devel
 python3-devel
 python-sip-devel
diff --git a/redhat/docker/oss153/Dockerfile.x86_64 b/redhat/docker/oss153/Dockerfile.x86_64
index cf1d2e93d..5931d6e4c 100644
--- a/redhat/docker/oss153/Dockerfile.x86_64
+++ b/redhat/docker/oss153/Dockerfile.x86_64
@@ -1,16 +1,17 @@
 FROM opensuse/leap:15.3
 
-ARG TDE_VERSION=14.0.10
+ARG TDE_VERSION=14.1.0
 ARG ARCH=x86_64
 
 # Add PACKMAN repository
 # Install Trinity build dependencies
 COPY packages /packages
-RUN echo PROXY_ENABLED="YES" >>/etc/sysconfig/proxy \
+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.rpm https://ftp.lysator.liu.se/pub/opensuse/distribution/leap/15.3/repo/oss/x86_64/libudisks2-0-devel-2.8.1-1.39.x86_64.rpm \
+ && zypper -n install libudisks2-0-devel-2.8.1-1.39.x86_64 \
  && zypper -n update \
  && zypper -n install -l $(</packages)
 
diff --git a/redhat/docker/oss153/packages b/redhat/docker/oss153/packages
index 78c263029..0f6f7c6f2 100644
--- a/redhat/docker/oss153/packages
+++ b/redhat/docker/oss153/packages
@@ -90,6 +90,7 @@ libgphoto2-devel
 libgpod-devel
 libgssglue-devel
 libical-devel
+libICE-devel
 libidn-devel
 libiw-devel
 libjack-devel
@@ -120,6 +121,7 @@ libraw1394-devel
 librsvg-devel
 libsamplerate-devel
 libSDL-devel
+libSM-devel
 libsmbclient-devel
 libsndfile-devel
 libtag-devel
@@ -136,7 +138,9 @@ libvorbis-devel
 libwmf-devel
 libwpd-devel
 libxine-devel
+libXmu-devel
 libxslt-devel
+libXt-devel
 libyaz-devel
 libzrtpcpp-devel
 lirc-devel
@@ -164,7 +168,6 @@ perl-PAR-Packer
 perl-pcsc
 pkcs11-helper-devel
 pkgconfig(pygtk-2.0)
-postgresql10
 python-devel
 python3-devel
 python3-sip-devel
@@ -200,3 +203,15 @@ 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/oss154/Dockerfile.x86_64 b/redhat/docker/oss154/Dockerfile.x86_64
index b2bd08902..0a3e3f436 100644
--- a/redhat/docker/oss154/Dockerfile.x86_64
+++ b/redhat/docker/oss154/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM opensuse/leap:15.4
 
-ARG TDE_VERSION=14.0.12
+ARG TDE_VERSION=14.1.0
 ARG ARCH=x86_64
 
 # Add PACKMAN repository
@@ -9,10 +9,8 @@ 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 remove libjpeg62-devel \
+ && zypper -n refresh \
  && zypper -n update \
  && zypper -n install -l $(</packages)
 
@@ -30,3 +28,10 @@ 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
+
+# Install heimdal development files
+RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/distribution/leap/15.4/repo/oss/src/libheimdal-7.7.0-bp154.1.43.src.rpm \
+ && wget -nv -O "${HOME}/rpmbuild/SOURCES/heimdal-7.7.0.tar.gz" "https://github.com/heimdal/heimdal/releases/download/heimdal-7.7.0/heimdal-7.7.0.tar.gz" \
+ && sed -i "${HOME}/rpmbuild/SPECS/libheimdal.spec" -e "/^Source0:/ s|.*|Source0: heimdal-7.7.0.tar.gz|" -e "/^%patch0/ s|^%|#|" \
+ && rpmbuild -bc ${HOME}/rpmbuild/SPECS/libheimdal.spec \
+ && sudo make -C ${HOME}/rpmbuild/BUILD/heimdal-7.7.0/tools/ install
diff --git a/redhat/docker/oss154/packages b/redhat/docker/oss154/packages
index 68265c8db..324cad2de 100644
--- a/redhat/docker/oss154/packages
+++ b/redhat/docker/oss154/packages
@@ -20,6 +20,7 @@ clucene-core-devel
 cmake
 createrepo_c
 cups-devel
+curl
 cyrus-sasl-devel
 dbus-1-devel
 dbus-1-glib-devel
@@ -104,6 +105,7 @@ liblrdf-devel
 libmad-devel
 libmng-devel
 libmp3lame-devel
+libmp4v2-devel
 libmpcdec-devel
 libmtp-devel
 libmusicbrainz-devel 
@@ -126,6 +128,7 @@ libSDL-devel
 libSM-devel
 libsmbclient-devel
 libsndfile-devel
+libssh-devel
 libtag-devel
 libtheora-devel
 libtiff-devel
@@ -175,12 +178,14 @@ patch
 pciutils-devel
 pcre-devel
 pcsc-lite-devel
+perl(JSON)
 perl-PAR-Packer
 perl-pcsc
 pkcs11-helper-devel
 polkit-devel
-postgresql10
-postgresql10-devel
+postgresql
+postgresql-devel
+postgresql-server-devel
 python3-devel
 python3-sip-devel
 recode
@@ -198,6 +203,7 @@ subversion-devel
 sudo
 swig
 sword-devel
+texinfo
 torsocks
 transfig
 unixODBC-devel
@@ -206,6 +212,7 @@ usbutils
 utempter-devel
 valgrind
 vim
+wget
 wireless-tools
 wv2-devel
 xbase-devel
diff --git a/redhat/docker/osstw/Dockerfile.i686 b/redhat/docker/osstw/Dockerfile.i686
index b286049c6..ec076eabd 100644
--- a/redhat/docker/osstw/Dockerfile.i686
+++ b/redhat/docker/osstw/Dockerfile.i686
@@ -33,6 +33,7 @@ RUN setarch ${ARCH} rpmbuild --rebuild https://ftp.lysator.liu.se/pub/opensuse/s
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/*GeoIP*.rpm
 
 # Add lilypond (i686 only)
-#RUN rpm -ivh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/lilypond-2.23.3-3.6.src.rpm \
-# && sed -i "${HOME}/rpmbuild/SPECS/lilypond.spec" -e "/^ExcludeArch/d" \
-# && setarch ${ARCH} rpmbuild -ba ~/rpmbuild/SPECS/lilypond.spec
+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/packages b/redhat/docker/osstw/packages
index 184e75ae2..263bd6947 100644
--- a/redhat/docker/osstw/packages
+++ b/redhat/docker/osstw/packages
@@ -9,7 +9,6 @@ bison
 bluez-devel
 boost-devel
 brp-check-suse
-brp-extract-appdata
 ccache
 cdparanoia
 cdparanoia-devel
@@ -39,6 +38,7 @@ ffmpeg-4-libavcodec-devel
 ffmpeg-4-libavdevice-devel
 fftw3-devel
 file-devel
+findutils
 flac-devel
 flex
 font-util
@@ -96,6 +96,7 @@ libical-devel
 libidn-devel
 libiw-devel
 libjack-devel
+libjasper7
 libjasper-devel
 liblcms2-devel
 liblo-devel
@@ -126,6 +127,7 @@ libSDL-devel
 libsensors4-devel
 libsmbclient-devel
 libsndfile-devel
+libssh-devel
 libtag-devel
 libtheora-devel
 libtiff-devel
@@ -181,8 +183,9 @@ perl-pcsc
 pkcs11-helper-devel
 pkgconfig(guile-1.8)
 polkit-devel
-postgresql10
-postgresql10-devel
+postgresql
+postgresql-devel
+postgresql-server-devel
 potrace-devel
 ppp
 python-devel
@@ -228,6 +231,7 @@ usbutils
 utempter-devel
 valgrind
 vim
+wget
 wireless-tools
 wv2-devel
 xcb-proto-devel
diff --git a/redhat/docker/pclinuxos/Dockerfile.x86_64 b/redhat/docker/pclinuxos/Dockerfile.x86_64
index f3d5ac938..2aa9f8200 100644
--- a/redhat/docker/pclinuxos/Dockerfile.x86_64
+++ b/redhat/docker/pclinuxos/Dockerfile.x86_64
@@ -26,7 +26,7 @@ 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
diff --git a/redhat/docker/pclinuxos/packages.x86_64 b/redhat/docker/pclinuxos/packages.x86_64
index 3135b2a39..85dd12684 100644
--- a/redhat/docker/pclinuxos/packages.x86_64
+++ b/redhat/docker/pclinuxos/packages.x86_64
@@ -13,6 +13,7 @@ clamav
 clamav-devel
 cmake
 cups-devel
+dbus-glib-devel
 desktop-file-utils
 djvulibre
 docbook-style-xsl
@@ -52,7 +53,6 @@ java-sun
 lcms-devel
 lib64clucene2-devel
 lib64cryptsetup-devel
-lib64db4.8-devel
 lib64dvdread-devel
 lib64exiv2-devel
 lib64fbclient-devel
@@ -75,6 +75,7 @@ lib64poppler-devel
 lib64readline-devel
 lib64sane1-devel
 lib64sndfile-devel
+lib64ssh-devel
 lib64unwind-devel
 lib64usb1.0-devel
 lib64usb-compat0.1-devel
@@ -88,7 +89,6 @@ libcdda-devel
 libcln-devel
 libconfig-devel
 libcurl-devel
-libffmpeg-devel
 libflac-devel
 libflac++-devel
 libfontenc-devel
@@ -161,6 +161,7 @@ openldap-devel
 opensc
 openslp-devel
 pam-devel
+pcre-devel
 perl-devel
 perl-Image-Magick
 perl-PAR-Packer
diff --git a/redhat/docker/run.sh b/redhat/docker/run.sh
index 974e21ead..322383e2d 100755
--- a/redhat/docker/run.sh
+++ b/redhat/docker/run.sh
@@ -31,7 +31,7 @@ ${DOCKER} run -ti --rm \
   -e TMPPATH=/tmp \
   -e TDE_VERSION=${TDE_VERSION} \
   -e TDE_BRANCH=${TDE_BRANCH} \
-  -w /home/trinity/tde/${TDE_BRANCH}/tde-packaging/redhat \
+  -w /home/trinity/tde/${TDE_BRANCH}/tde/packaging/redhat \
   -v ${HOME}/.gnupg:/home/trinity/.gnupg \
   -v ${HOME}/tde/master:/home/trinity/tde/master \
   -v ${HOME}/tde/r14.0.x:/home/trinity/tde/r14.0.x \
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/trinity-desktop/trinity-desktop.spec b/redhat/extras/trinity-desktop/trinity-desktop.spec
index 06391b49f..e05691fba 100644
--- a/redhat/extras/trinity-desktop/trinity-desktop.spec
+++ b/redhat/extras/trinity-desktop/trinity-desktop.spec
@@ -138,7 +138,6 @@ Requires: trinity-kdiff3
 Requires: trinity-kdirstat
 Requires: trinity-keep
 Requires: trinity-kerberostray
-#Requires: trinity-kerry
 Requires: trinity-keximdb
 Requires: trinity-kftpgrabber
 Requires: trinity-kile
@@ -165,7 +164,7 @@ Requires: trinity-konversation
 Requires: trinity-kooldock
 Requires: trinity-kopete-otr
 Requires: trinity-kpicosim
-%if 0%{?sle_version} <= 150300
+%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
@@ -205,9 +204,8 @@ Requires: trinity-smb4k
 Requires: trinity-smartcardauth
 Requires: trinity-soundkonverter
 Requires: trinity-tastymenu
-%if 0%{?sle_version} <= 150300
+Requires: trinity-tdebluez
 Requires: trinity-tde-guidance
-%endif
 Requires: trinity-tde-style-baghira
 Requires: trinity-tde-style-domino
 Requires: trinity-tde-style-ia-ora
@@ -215,12 +213,16 @@ Requires: trinity-tde-style-lipstik
 Requires: trinity-tde-style-qtcurve
 Requires: trinity-tde-systemsettings
 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
+Requires: trinity-tdenetworkmanager
 Requires: trinity-tdepacman
 %if 0%{?rhel} != 5
 Requires: trinity-tdepowersave
@@ -234,20 +236,11 @@ 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
 
-# Network management
-# RHEL 6 and openSUSE 11.x: knetworkmanager8
-%if 0%{?suse_version} && 0%{?suse_version} <= 1140 || 0%{?rhel} == 6
-Requires: trinity-knetworkmanager
-%endif
-# Other distros use tdenetworkmanager (since R14)
-%if 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora}
-Requires: trinity-tdenetworkmanager
-%endif
-
 # Power management
 Obsoletes: trinity-tde-guidance-powermanager < %{?epoch:%{epoch}:}%{version}-%{release}
 
diff --git a/redhat/libraries/kipi-plugins/kipi-plugins.spec b/redhat/libraries/kipi-plugins/kipi-plugins.spec
index 66d8f9eac..a7fbe66a1 100644
--- a/redhat/libraries/kipi-plugins/kipi-plugins.spec
+++ b/redhat/libraries/kipi-plugins/kipi-plugins.spec
@@ -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 3f4464dac..05f951ecc 100644
--- a/redhat/libraries/libkdcraw/libkdcraw.spec
+++ b/redhat/libraries/libkdcraw/libkdcraw.spec
@@ -56,7 +56,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-filesystem >= %{tde_version}
 
@@ -178,6 +178,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/libkexiv2/libkexiv2.spec b/redhat/libraries/libkexiv2/libkexiv2.spec
index 858918854..5b6d29cc1 100644
--- a/redhat/libraries/libkexiv2/libkexiv2.spec
+++ b/redhat/libraries/libkexiv2/libkexiv2.spec
@@ -67,7 +67,7 @@ Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 3d66e9868..9eb9a7bc1 100644
--- a/redhat/libraries/libkipi/libkipi.spec
+++ b/redhat/libraries/libkipi/libkipi.spec
@@ -92,7 +92,7 @@ BuildRequires:	libidn-devel
 BuildRequires:	openssl-devel
 
 # CMAKE
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-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 4cfa2120f..f20dcbf71 100644
--- a/redhat/libraries/libksquirrel/libksquirrel.spec
+++ b/redhat/libraries/libksquirrel/libksquirrel.spec
@@ -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
 
 ##########
 
diff --git a/redhat/libraries/libtdeldap/libtdeldap.spec b/redhat/libraries/libtdeldap/libtdeldap.spec
index d27b53dee..878c2fbd0 100644
--- a/redhat/libraries/libtdeldap/libtdeldap.spec
+++ b/redhat/libraries/libtdeldap/libtdeldap.spec
@@ -64,7 +64,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 BuildRequires:	gcc-c++
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:	pkgconfig
 
 # LIBTOOL
@@ -176,6 +176,11 @@ if [ -d "/usr/include/openldap24" ]; then
   RPM_OPT_FLAGS="-I%{_includedir}/openldap24 -L%{_libdir}/openldap24 ${RPM_OPT_FLAGS}"
 fi
 
+# heimdal pkgconfig (Fedora)
+if [ -d "%{_libdir}/heimdal/lib/pkgconfig" ]; then
+  PKG_CONFIG_PATH="%{_libdir}/heimdal/lib/pkgconfig:${PKG_CONFIG_PATH}"
+fi
+
 if ! rpm -E %%cmake|grep -q "cd build"; then
   %__mkdir_p build
   cd build
@@ -186,6 +191,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/python-trinity/python-trinity.spec b/redhat/libraries/pytde/pytde.spec
index cde093dd8..cfe105cbb 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
 #
@@ -20,7 +20,7 @@
 %if "%{?tde_version}" == ""
 %define tde_version 14.1.0
 %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
@@ -63,19 +63,15 @@ BuildRequires:	autoconf automake libtool m4
 BuildRequires:	gcc-c++
 
 # 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
-%global python python
-%endif
-%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%global python python3
+%global __python %__python3
+%global python_sitearch %{python3_sitearch}
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 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 +79,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,
@@ -93,8 +91,20 @@ from tdeio, tdejs, tdehtml and tdeprint.
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
 %{python_sitearch}/*.so
-%{python_sitearch}/dcop*.py*
-%{python_sitearch}/pytde*.py*
+%if 0%{?rhel} == 7 || 0%{?suse_version}
+%{python_sitearch}/dcopexport.py*
+%{python_sitearch}/dcopext.py*
+%{python_sitearch}/pytdeconfig.py*
+%if 0%{?rhel} == 7
+%{python_sitearch}/__pycache__/dcopexport.*.pyc
+%{python_sitearch}/__pycache__/dcopext.*.pyc
+%{python_sitearch}/__pycache__/pytdeconfig.*.pyc
+%endif
+%else
+%pycached %{python_sitearch}/dcopexport.py
+%pycached %{python_sitearch}/dcopext.py
+%pycached %{python_sitearch}/pytdeconfig.py
+%endif
 
 ##########
 
@@ -105,6 +115,8 @@ Requires:	%{name} = %{?epoch:%{epoch}:}%{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 +139,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 +148,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/
 
 ##########
 
@@ -147,9 +161,7 @@ tips and working code you can use to learn from.
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?mgaversion} >= 8
-%__sed -i "contrib/tdepyuic" -e "s|/usr/bin/env python|/usr/bin/env python2|"
-%endif
+%__sed -i "contrib/tdepyuic" -e "s|/usr/bin/env python|/usr/bin/env python3|"
 
 
 %build
@@ -174,7 +186,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 000f79b48..edab0594a 100644
--- a/redhat/libraries/pytdeextensions/pytdeextensions.spec
+++ b/redhat/libraries/pytdeextensions/pytdeextensions.spec
@@ -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}
 
@@ -75,14 +75,10 @@ BuildRequires:	sip4-tqt-devel >= 4.10.5
 Requires:		sip4-tqt >= 4.10.5
 
 # 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
-%global python python
-%endif
-%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%global python python3
+%global __python %__python3
+%global python_sitearch %{python3_sitearch}
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 BuildRequires:	%{python}
 BuildRequires:	%{python}-devel
 
@@ -182,14 +178,6 @@ for f in src/*.py; do
     -e "s|/usr/lib/pyshared/python\*|%{python_sitearch}|g"
 done
 
-# Do not look for 'libpython2.x.so' (from -devel) package.
-# Instead look for versioned runtime library.
-LIBPYTHON="$(readlink %{_libdir}/libpython2.*.so)"
-if [ -f "%{_libdir}/${LIBPYTHON}" ]; then
-  %__sed -i "src/tdedistutils.py" \
-    -e "s|#define LIB_PYTHON \".*\"|#define LIB_PYTHON \"%{_libdir}/${LIBPYTHON}\"|"
-fi
-
 # Fix FTBFS on RHEL 5
 %if 0%{?rhel} == 5
 %__sed -i "src/pythonize."* -e "s|const char \*object|char \*object|g"
@@ -204,7 +192,7 @@ fi
           "app_templates/kdeutility/src/kdeutility.py" \
           "app_templates/tdeioslave/setup.py" \
           "app_templates/tdeioslave/src/tdeioslave.py" \
-  -e "s|/usr/bin/python|/usr/bin/env python2|"
+  -e "s|/usr/bin/python|/usr/bin/env %{python}|"
 %endif