70 files changed, 862 insertions, 219 deletions

diff --git a/debian/_base/libraries/python-trinity/debian/NEWS.Debian b/debian/_base/libraries/pytde/debian/NEWS.Debian
index 367c6950d..367c6950d 100644
--- a/debian/_base/libraries/python-trinity/debian/NEWS.Debian
+++ b/debian/_base/libraries/pytde/debian/NEWS.Debian
diff --git a/debian/_base/libraries/python-trinity/debian/changelog b/debian/_base/libraries/pytde/debian/changelog
index 12485eccd..12485eccd 100644
--- a/debian/_base/libraries/python-trinity/debian/changelog
+++ b/debian/_base/libraries/pytde/debian/changelog
diff --git a/debian/_base/libraries/python-trinity/debian/compat b/debian/_base/libraries/pytde/debian/compat
index ec635144f..ec635144f 100644
--- a/debian/_base/libraries/python-trinity/debian/compat
+++ b/debian/_base/libraries/pytde/debian/compat
diff --git a/debian/_base/libraries/python-trinity/debian/control b/debian/_base/libraries/pytde/debian/control
index 633a24c00..633a24c00 100644
--- a/debian/_base/libraries/python-trinity/debian/control
+++ b/debian/_base/libraries/pytde/debian/control
diff --git a/debian/_base/libraries/python-trinity/debian/copyright b/debian/_base/libraries/pytde/debian/copyright
index eec6b36a5..eec6b36a5 100644
--- a/debian/_base/libraries/python-trinity/debian/copyright
+++ b/debian/_base/libraries/pytde/debian/copyright
diff --git a/debian/_base/libraries/python-trinity/debian/patches/.gitignore b/debian/_base/libraries/pytde/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/debian/_base/libraries/python-trinity/debian/patches/.gitignore
+++ b/debian/_base/libraries/pytde/debian/patches/.gitignore
diff --git a/debian/_base/libraries/python-trinity/debian/pytdeconfig.py b/debian/_base/libraries/pytde/debian/pytdeconfig.py
index eac264752..eac264752 100644
--- a/debian/_base/libraries/python-trinity/debian/pytdeconfig.py
+++ b/debian/_base/libraries/pytde/debian/pytdeconfig.py
diff --git a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs b/debian/_base/libraries/pytde/debian/python-trinity-trinity-dev.dirs
index c395de89f..c395de89f 100644
--- a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs
+++ b/debian/_base/libraries/pytde/debian/python-trinity-trinity-dev.dirs
diff --git a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.install b/debian/_base/libraries/pytde/debian/python-trinity-trinity-dev.install
index f7d970bcb..f7d970bcb 100644
--- a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.install
+++ b/debian/_base/libraries/pytde/debian/python-trinity-trinity-dev.install
diff --git a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.dirs b/debian/_base/libraries/pytde/debian/python-trinity-trinity-doc.dirs
index 96235463f..96235463f 100644
--- a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.dirs
+++ b/debian/_base/libraries/pytde/debian/python-trinity-trinity-doc.dirs
diff --git a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.doc-base b/debian/_base/libraries/pytde/debian/python-trinity-trinity-doc.doc-base
index bb9705168..bb9705168 100644
--- a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.doc-base
+++ b/debian/_base/libraries/pytde/debian/python-trinity-trinity-doc.doc-base
diff --git a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.examples b/debian/_base/libraries/pytde/debian/python-trinity-trinity-doc.examples
index e39721e20..e39721e20 100644
--- a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.examples
+++ b/debian/_base/libraries/pytde/debian/python-trinity-trinity-doc.examples
diff --git a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.install b/debian/_base/libraries/pytde/debian/python-trinity-trinity-doc.install
index 20b273acb..20b273acb 100644
--- a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.install
+++ b/debian/_base/libraries/pytde/debian/python-trinity-trinity-doc.install
diff --git a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity.install b/debian/_base/libraries/pytde/debian/python-trinity-trinity.install
index facee2907..facee2907 100644
--- a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity.install
+++ b/debian/_base/libraries/pytde/debian/python-trinity-trinity.install
diff --git a/debian/_base/libraries/python-trinity/debian/rules b/debian/_base/libraries/pytde/debian/rules
index ddbb6b15f..ddbb6b15f 100755
--- a/debian/_base/libraries/python-trinity/debian/rules
+++ b/debian/_base/libraries/pytde/debian/rules
diff --git a/debian/_base/libraries/python-trinity/debian/source/format b/debian/_base/libraries/pytde/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/libraries/python-trinity/debian/source/format
+++ b/debian/_base/libraries/pytde/debian/source/format
diff --git a/debian/_base/libraries/python-trinity/debian/source/options b/debian/_base/libraries/pytde/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/libraries/python-trinity/debian/source/options
+++ b/debian/_base/libraries/pytde/debian/source/options
diff --git a/debian/_base/libraries/python-trinity/debian/watch b/debian/_base/libraries/pytde/debian/watch
index 8b3afcac0..8b3afcac0 100644
--- a/debian/_base/libraries/python-trinity/debian/watch
+++ b/debian/_base/libraries/pytde/debian/watch
diff --git a/dilos/libraries/python-trinity/debian/NEWS.Debian b/dilos/libraries/pytde/debian/NEWS.Debian
index 367c6950d..367c6950d 100644
--- a/dilos/libraries/python-trinity/debian/NEWS.Debian
+++ b/dilos/libraries/pytde/debian/NEWS.Debian
diff --git a/dilos/libraries/python-trinity/debian/changelog b/dilos/libraries/pytde/debian/changelog
index 12485eccd..12485eccd 100644
--- a/dilos/libraries/python-trinity/debian/changelog
+++ b/dilos/libraries/pytde/debian/changelog
diff --git a/dilos/libraries/python-trinity/debian/compat b/dilos/libraries/pytde/debian/compat
index ec635144f..ec635144f 100644
--- a/dilos/libraries/python-trinity/debian/compat
+++ b/dilos/libraries/pytde/debian/compat
diff --git a/dilos/libraries/python-trinity/debian/control b/dilos/libraries/pytde/debian/control
index 85cb1de20..85cb1de20 100644
--- a/dilos/libraries/python-trinity/debian/control
+++ b/dilos/libraries/pytde/debian/control
diff --git a/dilos/libraries/python-trinity/debian/copyright b/dilos/libraries/pytde/debian/copyright
index eec6b36a5..eec6b36a5 100644
--- a/dilos/libraries/python-trinity/debian/copyright
+++ b/dilos/libraries/pytde/debian/copyright
diff --git a/dilos/libraries/python-trinity/debian/patches/.gitignore b/dilos/libraries/pytde/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/dilos/libraries/python-trinity/debian/patches/.gitignore
+++ b/dilos/libraries/pytde/debian/patches/.gitignore
diff --git a/dilos/libraries/python-trinity/debian/pytdeconfig.py b/dilos/libraries/pytde/debian/pytdeconfig.py
index eac264752..eac264752 100644
--- a/dilos/libraries/python-trinity/debian/pytdeconfig.py
+++ b/dilos/libraries/pytde/debian/pytdeconfig.py
diff --git a/dilos/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs b/dilos/libraries/pytde/debian/python-trinity-trinity-dev.dirs
index be8aad160..be8aad160 100644
--- a/dilos/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs
+++ b/dilos/libraries/pytde/debian/python-trinity-trinity-dev.dirs
diff --git a/dilos/libraries/python-trinity/debian/python-trinity-trinity-dev.install b/dilos/libraries/pytde/debian/python-trinity-trinity-dev.install
index c523f227e..c523f227e 100644
--- a/dilos/libraries/python-trinity/debian/python-trinity-trinity-dev.install
+++ b/dilos/libraries/pytde/debian/python-trinity-trinity-dev.install
diff --git a/dilos/libraries/python-trinity/debian/python-trinity-trinity-doc.dirs b/dilos/libraries/pytde/debian/python-trinity-trinity-doc.dirs
index 96235463f..96235463f 100644
--- a/dilos/libraries/python-trinity/debian/python-trinity-trinity-doc.dirs
+++ b/dilos/libraries/pytde/debian/python-trinity-trinity-doc.dirs
diff --git a/dilos/libraries/python-trinity/debian/python-trinity-trinity-doc.doc-base b/dilos/libraries/pytde/debian/python-trinity-trinity-doc.doc-base
index bb9705168..bb9705168 100644
--- a/dilos/libraries/python-trinity/debian/python-trinity-trinity-doc.doc-base
+++ b/dilos/libraries/pytde/debian/python-trinity-trinity-doc.doc-base
diff --git a/dilos/libraries/python-trinity/debian/python-trinity-trinity-doc.examples b/dilos/libraries/pytde/debian/python-trinity-trinity-doc.examples
index e39721e20..e39721e20 100644
--- a/dilos/libraries/python-trinity/debian/python-trinity-trinity-doc.examples
+++ b/dilos/libraries/pytde/debian/python-trinity-trinity-doc.examples
diff --git a/dilos/libraries/python-trinity/debian/python-trinity-trinity-doc.install b/dilos/libraries/pytde/debian/python-trinity-trinity-doc.install
index 20b273acb..20b273acb 100644
--- a/dilos/libraries/python-trinity/debian/python-trinity-trinity-doc.install
+++ b/dilos/libraries/pytde/debian/python-trinity-trinity-doc.install
diff --git a/dilos/libraries/python-trinity/debian/python-trinity-trinity.install b/dilos/libraries/pytde/debian/python-trinity-trinity.install
index facee2907..facee2907 100644
--- a/dilos/libraries/python-trinity/debian/python-trinity-trinity.install
+++ b/dilos/libraries/pytde/debian/python-trinity-trinity.install
diff --git a/dilos/libraries/python-trinity/debian/rules b/dilos/libraries/pytde/debian/rules
index 3bae8384b..3bae8384b 100755
--- a/dilos/libraries/python-trinity/debian/rules
+++ b/dilos/libraries/pytde/debian/rules
diff --git a/dilos/libraries/python-trinity/debian/source/format b/dilos/libraries/pytde/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/dilos/libraries/python-trinity/debian/source/format
+++ b/dilos/libraries/pytde/debian/source/format
diff --git a/dilos/libraries/python-trinity/debian/source/options b/dilos/libraries/pytde/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/dilos/libraries/python-trinity/debian/source/options
+++ b/dilos/libraries/pytde/debian/source/options
diff --git a/dilos/libraries/python-trinity/debian/watch b/dilos/libraries/pytde/debian/watch
index 8b3afcac0..8b3afcac0 100644
--- a/dilos/libraries/python-trinity/debian/watch
+++ b/dilos/libraries/pytde/debian/watch
diff --git a/redhat/Makefile b/redhat/Makefile
index 44bb52a59..a7f4aeae0 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -23,13 +23,13 @@ buildpkg = \
   echo
 
 
-all:	common dependencies main libraries applications i18n meta external
-common:	cmake
-dependencies:	tqt3 tqtinterface akode arts libart_lgpl libcaldav libcarddav polkit-tqt sip4-tqt tqca tqscintilla avahi-tqt dbus-tqt dbus-1-tqt
-main:	tdelibs tdebase tdeaccessibility tdeadmin tdegames tdemultimedia tdepim tdetoys tdevelop tdeaddons tdeartwork tdebindings tdeedu tdegraphics tdenetwork tdesdk tdeutils tdewebdev
-libraries:	kipi-plugins libkdcraw libkexiv2 libkipi libksquirrel libtdeldap libtqt-perl pytdeextensions 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-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
+all: common dependencies main libraries applications i18n meta external
+common: cmake
+dependencies: tqt3 tqtinterface akode arts libart_lgpl libcaldav libcarddav polkit-tqt sip4-tqt tqca tqscintilla avahi-tqt dbus-tqt dbus-1-tqt
+main: tdelibs tdebase tdeaccessibility tdeadmin tdegames tdemultimedia tdepim tdetoys tdevelop tdeaddons tdeartwork tdebindings tdeedu tdegraphics tdenetwork tdesdk tdeutils tdewebdev
+libraries: kipi-plugins libkdcraw libkexiv2 libkipi libksquirrel libtdeldap libtqt-perl pytdeextensions pytde
+applications: abakus amarok basket bibletime codeine digikam dolphin filelight gtk3-tqt-engine gtk-qt-engine gwenview k3b k9copy kaffeine kaffeine-mozilla kasablanca katapult kbarcode kbfx kbibtex kbiff kbookreader kchmviewer kcmautostart kcmldap kcmldapcontroller kcmldapmanager kcpuload kdbg kdbusnotification kdiff3 kdirstat keep kerberostray keximdb kftpgrabber kile kima kiosktool kkbswitch klamav klcddimmer kmplayer kmyfirewall kmymoney knemo knetload knetstats knetworkmanager8 knights knmap knowit knutclient koffice kompose konversation kooldock kopete-otr kpicosim kpilot krecipes krename krusader kscope ksensors kshowmail kshutdown ksplash-engine-moodin ksquirrel kstreamripper ksystemlog ktechlab ktorrent kvirc kvkbd kvpnc kxmleditor mathemagics mplayerthumbs piklab polkit-agent-tde potracegui qalculate-tde qt4-tqt-theme-engine rosegarden smartcardauth smb4k soundkonverter tde-guidance tdeio-appinfo tdeio-apt tdeio-ftps tdeio-gopher tastymenu tdedocker tdeio-locate tdeio-sword tdeio-umountwrapper tdenetworkmanager tdepacman tdepowersave tderadio tdesshaskpass tde-style-baghira tde-style-domino tde-style-ia-ora tde-style-lipstik tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico tork twin-style-crystal twin-style-dekorator twin-style-machbunt twin-style-suse2 wlassistant yakuake
+i18n: gwenview-i18n k3b-i18n koffice-i18n tde-i18n
 
 ### Trinity Common
 
@@ -37,28 +37,28 @@ cmake:
 	$(call buildpkg,common/cmake)
 
 ### Trinity Dependencies
-akode:	tqtinterface trinity-filesystem
+akode: tqtinterface trinity-filesystem
 	$(call buildpkg,dependencies/akode)
 
-arts:	tqtinterface trinity-filesystem esound
+arts: tqtinterface trinity-filesystem esound
 	$(call buildpkg,dependencies/arts)
 
-avahi-tqt:	tqtinterface
+avahi-tqt: tqtinterface
 	$(call buildpkg,dependencies/avahi-tqt)
 
-dbus-1-tqt:	tqtinterface
+dbus-1-tqt: tqtinterface
 	$(call buildpkg,dependencies/dbus-1-tqt)
 
 dbus-tqt: tqtinterface
 	$(call buildpkg,dependencies/dbus-tqt)
 
-libart_lgpl:	tqtinterface
+libart_lgpl: tqtinterface
 	$(call buildpkg,dependencies/libart-lgpl)
 
 libcaldav: tqtinterface
 	$(call buildpkg,dependencies/libcaldav)
 
-libcarddav:	tqtinterface
+libcarddav: tqtinterface
 	$(call buildpkg,dependencies/libcarddav)
 
 polkit-tqt: tqtinterface dbus-1-tqt
@@ -66,9 +66,9 @@ ifeq (,$(filter $(DIST), .el5 .el6 ))
 	$(call buildpkg,dependencies/polkit-tqt)
 endif
 
-python-tqt: sip4-tqt tdelibs tqscintilla
+pytqt: sip4-tqt tdelibs tqscintilla
 ifeq (,$(filter $(DIST), .el9 .oss154 ))
-	$(call buildpkg,dependencies/python-tqt)
+	$(call buildpkg,dependencies/pytqt)
 endif
 
 sip4-tqt:
@@ -76,7 +76,7 @@ ifeq (,$(filter $(DIST), .el9 ))
 	$(call buildpkg,dependencies/sip4-tqt)
 endif
 
-tqca:	tqtinterface
+tqca: tqtinterface
 	$(call buildpkg,dependencies/tqca)
 
 tqscintilla: tqca tdelibs
@@ -85,62 +85,62 @@ tqscintilla: tqca tdelibs
 tqt3:
 	$(call buildpkg,dependencies/tqt3)
 
-tqtinterface:	tqt3
+tqtinterface: tqt3
 	$(call buildpkg,dependencies/tqtinterface)
 
 # Main packages
-tdeaccessibility:	tdebase tdemultimedia
+tdeaccessibility: tdebase tdemultimedia
 	$(call buildpkg,core/tdeaccessibility)
 
-tdeaddons:	tdebase tdegames tdemultimedia tdenetwork tdepim
+tdeaddons: tdebase tdegames tdemultimedia tdenetwork tdepim
 	$(call buildpkg,core/tdeaddons)
 
-tdeadmin:	tdebase
+tdeadmin: tdebase
 	$(call buildpkg,core/tdeadmin)
 
-tdeartwork:	tdebase
+tdeartwork: tdebase
 	$(call buildpkg,core/tdeartwork)
 
-tdebase:	tdelibs htdig fileshareset pinentry-tqt
+tdebase: tdelibs htdig fileshareset pinentry-tqt
 	$(call buildpkg,core/tdebase)
 
-tdebindings:	tdebase tqscintilla
+tdebindings: tdebase tqscintilla
 	$(call buildpkg,core/tdebindings)
 
-tdeedu:	tdebase
+tdeedu: tdebase
 	$(call buildpkg,core/tdeedu)
 
-tdegames:	tdebase tdemultimedia
+tdegames: tdebase tdemultimedia
 	$(call buildpkg,core/tdegames)
 
-tdegraphics:	tdebase lcms
+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
+tdelibs: brp-check-trinity tqt3 tqtinterface arts dbus-tqt dbus-1-tqt avahi-tqt fileshareset trinity-filesystem libart_lgpl
 	$(call buildpkg,core/tdelibs)
 
-tdemultimedia:	tdebase akode
+tdemultimedia: tdebase akode
 	$(call buildpkg,core/tdemultimedia)
 
-tdenetwork:	tdebase rdesktop
+tdenetwork: tdebase rdesktop
 	$(call buildpkg,core/tdenetwork)
 
-tdepim:	tdebase libcaldav libcarddav
+tdepim: tdebase libcaldav libcarddav
 	$(call buildpkg,core/tdepim)
 
-tdesdk:		tdebase tdebindings tdepim
+tdesdk: tdebase tdebindings tdepim
 	$(call buildpkg,core/tdesdk)
 
-tdetoys:	tdebase
+tdetoys: tdebase
 	$(call buildpkg,core/tdetoys)
 
-tdeutils:	tdebase
+tdeutils: tdebase
 	$(call buildpkg,core/tdeutils)
 
-tdevelop:	tdebase tdesdk
+tdevelop: tdebase tdesdk
 	$(call buildpkg,core/tdevelop)
 
-tdewebdev:	tdebase tdesdk
+tdewebdev: tdebase tdesdk
 	$(call buildpkg,core/tdewebdev)
 
 ### 3rd party libraries and tools
@@ -201,465 +201,465 @@ endif
 
 
 ### Trinity Libraries
-kipi-plugins:	tqtinterface tdelibs tdepim libkdcraw libkexiv2 libkipi
+kipi-plugins: tqtinterface tdelibs tdepim libkdcraw libkexiv2 libkipi
 	$(call buildpkg,libraries/kipi-plugins)
 
-libkdcraw:	tqtinterface lcms
+libkdcraw: tqtinterface lcms
 	$(call buildpkg,libraries/libkdcraw)
 
-libkexiv2:	tqtinterface tdelibs
+libkexiv2: tqtinterface tdelibs
 	$(call buildpkg,libraries/libkexiv2)
 
-libkipi:	tqtinterface
+libkipi: tqtinterface
 	$(call buildpkg,libraries/libkipi)
 
-libksquirrel:	tdelibs
+libksquirrel: tdelibs
 	$(call buildpkg,libraries/libksquirrel)
 
-libtdeldap:	tqtinterface
+libtdeldap: tqtinterface
 	$(call buildpkg,libraries/libtdeldap)
 
-libtqt-perl:	tqtinterface
+libtqt-perl: tqtinterface
 	$(call buildpkg,libraries/libtqt-perl)
 
-mlt:	tqtinterface
+mlt: tqtinterface
 	$(call buildpkg,libraries/mlt)
 
-pytdeextensions:	tqtinterface python-trinity
+pytdeextensions: tqtinterface pytde
 ifeq (,$(filter $(DIST), .el9 .oss154 ))
 	$(call buildpkg,libraries/pytdeextensions)
 endif
 
-python-trinity:	tqtinterface python-tqt
+pytde: tqtinterface pytqt
 ifeq (,$(filter $(DIST), .el9 .oss154 ))
-	$(call buildpkg,libraries/python-trinity)
+	$(call buildpkg,libraries/pytde)
 endif
 
 ### Trinity Applications
-abakus:	tdebase
+abakus: tdebase
 	$(call buildpkg,applications/utilities/abakus)
 
-adept:	tdebase
+adept: tdebase
 	$(call buildpkg,applications/system/adept)
 
-amarok:	tdebase mp4v2
+amarok: tdebase mp4v2
 	$(call buildpkg,applications/multimedia/amarok)
 
-basket:	tdebase tdepim
+basket: tdebase tdepim
 	$(call buildpkg,applications/office/basket)
 
-bibletime:	tdebase
+bibletime: tdebase
 	$(call buildpkg,applications/misc/bibletime)
 
-codeine:	tdebase
+codeine: tdebase
 	$(call buildpkg,applications/multimedia/codeine)
 
-compizconfig-backend-kconfig:	tdebase
+compizconfig-backend-kconfig: tdebase
 	$(call buildpkg,applications/misc/compizconfig-backend-kconfig)
 
-desktop-effects-tde:	tdebase
+desktop-effects-tde: tdebase
 	$(call buildpkg,applications/misc/desktop-effects-tde)
 
-digikam:	tdebase libkdcraw libkexiv2 libkipi libksquirrel
+digikam: tdebase libkdcraw libkexiv2 libkipi libksquirrel
 	$(call buildpkg,applications/graphics/digikam)
 
-dolphin:	tdebase
+dolphin: tdebase
 	$(call buildpkg,applications/system/dolphin)
 
-filelight:	tdebase
+filelight: tdebase
 	$(call buildpkg,applications/utilities/filelight)
 
-filelight-l10n:	tdebase
+filelight-l10n: tdebase
 	$(call buildpkg,applications/filelight-l10n)
 
-fusion-icon:	tdebase
+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/themes/gtk3-tqt-engine)
 endif
 
-gtk-qt-engine:	tdebase
+gtk-qt-engine: tdebase
 ifeq (,$(filter $(DIST),.el5))
 	$(call buildpkg,applications/themes/gtk-qt-engine)
 endif
 
-gwenview:	tdebase
+gwenview: tdebase
 	$(call buildpkg,applications/graphics/gwenview)
 
-k3b:	tdebase
+k3b: tdebase
 	$(call buildpkg,applications/multimedia/k3b)
 
-k9copy:	tdebase k3b
+k9copy: tdebase k3b
 	$(call buildpkg,applications/multimedia/k9copy)
 
-kaffeine:	tdebase
+kaffeine: tdebase
 	$(call buildpkg,applications/multimedia/kaffeine)
 
-kaffeine-mozilla:	tdebase kaffeine
+kaffeine-mozilla: tdebase kaffeine
 	$(call buildpkg,applications/multimedia/kaffeine-mozilla)
 
-kasablanca:	tdebase
+kasablanca: tdebase
 	$(call buildpkg,applications/internet/kasablanca)
 
-katapult:	tdebase
+katapult: tdebase
 	$(call buildpkg,applications/system/katapult)
 
-kbarcode:	tdebase
+kbarcode: tdebase
 	$(call buildpkg,applications/utilities/kbarcode)
 
-kbfx:	tdebase
+kbfx: tdebase
 	$(call buildpkg,applications/system/kbfx)
 
-kbibtex:	tdebase
+kbibtex: tdebase
 	$(call buildpkg,applications/office/kbibtex)
 
-kbiff:	tdebase
+kbiff: tdebase
 	$(call buildpkg,applications/internet/kbiff)
 
-kbookreader:	tdebase
+kbookreader: tdebase
 	$(call buildpkg,applications/office/kbookreader)
 
-kchmviewer:	tdebase
+kchmviewer: tdebase
 	$(call buildpkg,applications/utilities/kchmviewer)
 
-kcmautostart:	tdebase
+kcmautostart: tdebase
 	$(call buildpkg,applications/system/kcmautostart)
 
-kcmldap:	tdebase libtdeldap
+kcmldap: tdebase libtdeldap
 	$(call buildpkg,applications/misc/kcmldap)
 
-kcmldapcontroller:	tdebase kcmldap
+kcmldapcontroller: tdebase kcmldap
 	$(call buildpkg,applications/misc/kcmldapcontroller)
 
-kcmldapmanager:	tdebase kcmldap
+kcmldapmanager: tdebase kcmldap
 	$(call buildpkg,applications/misc/kcmldapmanager)
 
-kcpuload:	tdebase
+kcpuload: tdebase
 	$(call buildpkg,applications/utilities/kcpuload)
 
-kdbg:	tdebase
+kdbg: tdebase
 	$(call buildpkg,applications/development/kdbg)
 
-kdbusnotification:	tdebase
+kdbusnotification: tdebase
 	$(call buildpkg,applications/system/kdbusnotification)
 
-kdiff3:	tdebase
+kdiff3: tdebase
 	$(call buildpkg,applications/development/kdiff3)
 
-kdirstat:	tdebase
+kdirstat: tdebase
 	$(call buildpkg,applications/utilities/kdirstat)
 
-kdpkg:	tdebase
+kdpkg: tdebase
 	$(call buildpkg,applications/settings/kdpkg)
 
-keep:	tdebase rdiff-backup
+keep: tdebase rdiff-backup
 	$(call buildpkg,applications/utilities/keep)
 
-kerberostray:	tdebase
+kerberostray: tdebase
 	$(call buildpkg,applications/misc/kerberostray)
 
-keximdb:	tdebase koffice
+keximdb: tdebase koffice
 	$(call buildpkg,applications/office/keximdb)
 
-kftpgrabber:	tdebase
+kftpgrabber: tdebase
 	$(call buildpkg,applications/internet/kftpgrabber)
 
-kgtk-qt3:	tdebase
+kgtk-qt3: tdebase
 	$(call buildpkg,applications/themes/kgtk-qt3)
 
-kile:	tdebase
+kile: tdebase
 	$(call buildpkg,applications/office/kile)
 
-kima:	tdebase
+kima: tdebase
 	$(call buildpkg,applications/settings/kima)
 
-kiosktool:	tdebase
+kiosktool: tdebase
 	$(call buildpkg,applications/settings/kiosktool)
 
-kkbswitch:	tdebase
+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/system/klamav)
 endif
 
-klcddimmer:	tdebase
+klcddimmer: tdebase
 	$(call buildpkg,applications/settings/klcddimmer)
 
-kmplayer:	tdebase
+kmplayer: tdebase
 	$(call buildpkg,applications/multimedia/kmplayer)
 
-kmyfirewall:	tdebase
+kmyfirewall: tdebase
 	$(call buildpkg,applications/settings/kmyfirewall)
 
-kmymoney:	tdebase recode
+kmymoney: tdebase recode
 	$(call buildpkg,applications/office/kmymoney)
 
-knemo:	tdebase
+knemo: tdebase
 	$(call buildpkg,applications/system/knemo)
 
-knetload:	tdebase
+knetload: tdebase
 	$(call buildpkg,applications/system/knetload)
 
-knetstats:	tdebase
+knetstats: tdebase
 	$(call buildpkg,applications/system/knetstats)
 
-knetworkmanager8:	tdebase
+knetworkmanager8: tdebase
 ifneq (,$(filter $(DIST),.el6))
 	$(call buildpkg,applications/settings/knetworkmanager8)
 endif
 
-knights:	tdebase
+knights: tdebase
 	$(call buildpkg,applications/games/knights)
 
-knmap:	tdebase
+knmap: tdebase
 	$(call buildpkg,applications/internet/knmap)
 
-knowit:	tdebase
+knowit: tdebase
 	$(call buildpkg,applications/office/knowit)
 
-knutclient:	tdebase
+knutclient: tdebase
 	$(call buildpkg,applications/utilities/knutclient)
 
-koffice:	tdebase tdegraphics wv2
+koffice: tdebase tdegraphics wv2
 	$(call buildpkg,applications/office/koffice)
 
-kompose:	tdebase
+kompose: tdebase
 	$(call buildpkg,applications/utilities/kompose)
 
-konversation:	tdebase
+konversation: tdebase
 	$(call buildpkg,applications/internet/konversation)
 
-kooldock:	tdebase
+kooldock: tdebase
 	$(call buildpkg,applications/system/kooldock)
 
-kopete-otr:	tdebase tdenetwork
+kopete-otr: tdebase tdenetwork
 	$(call buildpkg,applications/internet/kopete-otr)
 
-kpicosim:	tdebase
+kpicosim: tdebase
 	$(call buildpkg,applications/development/kpicosim)
 
-kpilot:	tdebase tdepim
+kpilot: tdebase tdepim
 ifeq (,$(filter $(DIST),.el5 .oss154 .osstw))
 	$(call buildpkg,applications/office/kpilot)
 endif
 
-kpowersave:	tdebase
+kpowersave: tdebase
 	$(call buildpkg,applications/system/kpowersave)
 
-krecipes:	tdebase
+krecipes: tdebase
 	$(call buildpkg,applications/misc/krecipes)
 
-krename:	tdebase
+krename: tdebase
 	$(call buildpkg,applications/utilities/krename)
 
-krusader:	tdebase tdebindings
+krusader: tdebase tdebindings
 	$(call buildpkg,applications/system/krusader)
 
-kscope:	tdebase
+kscope: tdebase
 	$(call buildpkg,applications/development/kscope)
 
-ksensors:	tdebase
+ksensors: tdebase
 	$(call buildpkg,applications/utilities/ksensors)
 
-kshowmail:	tdebase tdepim
+kshowmail: tdebase tdepim
 	$(call buildpkg,applications/internet/kshowmail)
 
-kshutdown:	tdebase
+kshutdown: tdebase
 	$(call buildpkg,applications/system/kshutdown)
 
-ksplash-engine-moodin:	tdebase
+ksplash-engine-moodin: tdebase
 	$(call buildpkg,applications/themes/ksplash-engine-moodin)
 
-ksquirrel:	tdebase libkipi libksquirrel
+ksquirrel: tdebase libkipi libksquirrel
 	$(call buildpkg,applications/graphics/ksquirrel)
 
-kstreamripper:	tdebase
+kstreamripper: tdebase
 	$(call buildpkg,applications/internet/kstreamripper)
 
-ksystemlog:	tdebase
+ksystemlog: tdebase
 	$(call buildpkg,applications/system/ksystemlog)
 
-ktechlab:	tdebase
+ktechlab: tdebase
 	$(call buildpkg,applications/development/ktechlab)
 
-ktorrent:	tdebase
+ktorrent: tdebase
 	$(call buildpkg,applications/internet/ktorrent)
 
-kvirc:	tdebase
+kvirc: tdebase
 	$(call buildpkg,applications/internet/kvirc)
 
-kvkbd:	tdebase
+kvkbd: tdebase
 	$(call buildpkg,applications/system/kvkbd)
 
-kvpnc:	tdebase
+kvpnc: tdebase
 	$(call buildpkg,applications/internet/kvpnc)
 
-kxmleditor:	tdebase
+kxmleditor: tdebase
 	$(call buildpkg,applications/development/kxmleditor)
 
 mathemagics: tdebase
 	$(call buildpkg,applications/utilities/mathemagics)
 
-mplayerthumbs:	tdebase
+mplayerthumbs: tdebase
 ifeq (,$(filter $(DIST),.el9))
 	$(call buildpkg,applications/multimedia/mplayerthumbs)
 endif
 
-piklab:	tdebase
+piklab: tdebase
 	$(call buildpkg,applications/development/piklab)
 
-polkit-agent-tde:	tdebase
+polkit-agent-tde: tdebase
 ifeq (,$(filter $(DIST), .el5 .el6 ))
 	$(call buildpkg,applications/system/polkit-agent-tde)
 endif
 
-potracegui:	tdebase
+potracegui: tdebase
 	$(call buildpkg,applications/graphics/potracegui)
 
 qalculate-tde:
 	$(call buildpkg,applications/utilities/qalculate-tde)
 
-qt4-tqt-theme-engine:	tdebase
+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
+rosegarden: tdebase
 ifeq (,$(filter $(DIST),.el5 .el6 .el7 .el8 .el9))
 	$(call buildpkg,applications/multimedia/rosegarden)
 endif
 
-smartcardauth:	tdebase
+smartcardauth: tdebase
 	$(call buildpkg,applications/system/smartcardauth)
 
-smb4k:	tdebase
+smb4k: tdebase
 	$(call buildpkg,applications/internet/smb4k)
 
-soundkonverter:	tdebase
+soundkonverter: tdebase
 	$(call buildpkg,applications/multimedia/soundkonverter)
 
 tastymenu:
 	$(call buildpkg,applications/system/tastymenu)
 
-tdedocker:	tdebase
+tdedocker: tdebase
 	$(call buildpkg,applications/system/tdedocker)
 
-tde-guidance:	tdebase pytdeextensions
+tde-guidance: tdebase pytdeextensions
 ifeq (,$(filter $(DIST), .el9 .oss154 ))
 	$(call buildpkg,applications/settings/tde-guidance)
 endif
 
-tdeio-appinfo:	tdebase
+tdeio-appinfo: tdebase
 ifeq (,$(filter $(DIST), .el5 .el6 ))
 	$(call buildpkg,applications/tdeio/tdeio-appinfo)
 endif
 
-tdeio-apt:	tdebase
+tdeio-apt: tdebase
 	$(call buildpkg,applications/tdeio/tdeio-apt)
 
-tdeio-ftps:	tdebase
+tdeio-ftps: tdebase
 	$(call buildpkg,applications/tdeio/tdeio-ftps)
 
-tdeio-gopher:	tdebase
+tdeio-gopher: tdebase
 	$(call buildpkg,applications/tdeio/tdeio-gopher)
 
-tdeio-locate:	tdebase
+tdeio-locate: tdebase
 	$(call buildpkg,applications/tdeio/tdeio-locate)
 
-tdeio-sword:	tdebase
+tdeio-sword: tdebase
 	$(call buildpkg,applications/tdeio/tdeio-sword)
 
-tdeio-umountwrapper:	tdebase
+tdeio-umountwrapper: tdebase
 	$(call buildpkg,applications/tdeio/tdeio-umountwrapper)
 
-tdenetworkmanager:	tdebase
+tdenetworkmanager: tdebase
 ifeq (,$(filter $(DIST),.el5 .el6))
 	$(call buildpkg,applications/settings/tdenetworkmanager)
 endif
 
-tdepacman:	tdebase
+tdepacman: tdebase
 	$(call buildpkg,applications/games/tdepacman)
 
-tdepowersave:	tdebase
+tdepowersave: tdebase
 ifeq (,$(filter $(DIST),.el5))
 	$(call buildpkg,applications/system/tdepowersave)
 endif
 
-tderadio:	tdebase
+tderadio: tdebase
 	$(call buildpkg,applications/multimedia/tderadio)
 
-tdesshaskpass:	tdebase
+tdesshaskpass: tdebase
 	$(call buildpkg,applications/system/tdesshaskpass)
 
-tde-style-baghira:	tdebase
+tde-style-baghira: tdebase
 	$(call buildpkg,applications/themes/tde-style-baghira)
 
-tde-style-domino:	tdebase
+tde-style-domino: tdebase
 	$(call buildpkg,applications/themes/tde-style-domino)
 
-tde-style-ia-ora:	tdebase
+tde-style-ia-ora: tdebase
 	$(call buildpkg,applications/themes/tde-style-ia-ora)
 
-tde-style-lipstik:	tdebase
+tde-style-lipstik: tdebase
 	$(call buildpkg,applications/themes/tde-style-lipstik)
 
-tde-style-qtcurve:	tdebase
+tde-style-qtcurve: tdebase
 	$(call buildpkg,applications/themes/tde-style-qtcurve)
 
-tdesudo:	tdebase
+tdesudo: tdebase
 	$(call buildpkg,applications/settings/tdesudo)
 
-tdesvn:	tdebase
+tdesvn: tdebase
 	$(call buildpkg,applications/development/tdesvn)
 
-tde-systemsettings:	tdebase
+tde-systemsettings: tdebase
 ifeq (,$(filter $(DIST), .el9 .oss154 ))
 	$(call buildpkg,applications/settings/tde-systemsettings)
 endif
 
-tdmtheme:	tdebase
+tdmtheme: tdebase
 	$(call buildpkg,applications/tdmtheme)
 
-tellico:	tdebase tdegraphics tdemultimedia tdepim
+tellico: tdebase tdegraphics tdemultimedia tdepim
 	$(call buildpkg,applications/office/tellico)
 
-tork:	tdebase
+tork: tdebase
 	$(call buildpkg,applications/internet/tork)
 
-twin-style-crystal:	tdebase
+twin-style-crystal: tdebase
 	$(call buildpkg,applications/themes/twin-style-crystal)
 
-twin-style-dekorator:	tdebase
+twin-style-dekorator: tdebase
 	$(call buildpkg,applications/themes/twin-style-dekorator)
 
-twin-style-machbunt:	tdebase
+twin-style-machbunt: tdebase
 	$(call buildpkg,applications/themes/twin-style-machbunt)
 
 twin-style-suse2: tdebase
 	$(call buildpkg,applications/themes/twin-style-suse2)
 
-wlassistant:	tdebase
+wlassistant: tdebase
 	$(call buildpkg,applications/settings/wlassistant)
 
-yakuake:	tdebase
+yakuake: tdebase
 	$(call buildpkg,applications/system/yakuake)
 
 ### Trinity Translations
-gwenview-i18n:	tdebase
+gwenview-i18n: tdebase
 	$(call buildpkg,applications/graphics/gwenview-i18n)
 
-k3b-i18n:	tdebase
+k3b-i18n: tdebase
 	$(call buildpkg,applications/multimedia/k3b-i18n)
 
-koffice-i18n:	tdebase
+koffice-i18n: tdebase
 	$(call buildpkg,applications/office/koffice-i18n)
 
-tde-i18n:	tdebase
+tde-i18n: tdebase
 	$(call buildpkg,tde-i18n)
 
 ### Meta packages
@@ -670,7 +670,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/settings/tde-guidance/tde-guidance.spec b/redhat/applications/settings/tde-guidance/tde-guidance.spec
index c81df72a5..4d9b1bf9c 100644
--- a/redhat/applications/settings/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
@@ -154,8 +154,8 @@ BuildRequires:	xscreensaver-gl
 BuildRequires:	%{python}
 BuildRequires:	%{python}-devel
 
-Requires:		python-tqt
-Requires:		trinity-python-trinity
+Requires:		pytqt
+Requires:		trinity-pytde
 Requires:		trinity-pytdeextensions
 %if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
 Requires:		hwdata
@@ -305,7 +305,7 @@ suspend using HAL.
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
-#export PYTHONPATH=%{python_sitearch}/python-tqt
+#export PYTHONPATH=%{python_sitearch}/pytqt
 
 # Avoids 'error: byte-compiling is disabled.' on Mandriva/Mageia
 export PYTHONDONTWRITEBYTECODE=
@@ -327,7 +327,7 @@ unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 export EXTRA_MODULE_DIR="%{python_sitearch}/%{name}"
 export SIPTQT_DIR="%{python_sitearch}/sip4_tqt"
-export PYTHONPATH="%{python_sitearch}/python-tqt"
+export PYTHONPATH="%{python_sitearch}/pytqt"
 
 # Support for 'sip4-tqt'
 export PYTHONPATH="%{python_sitearch}/sip4_tqt:${PYTHONPATH}"
diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh
index ac821c4af..ea121d4a1 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
diff --git a/redhat/core/tdebase/tdebase.spec b/redhat/core/tdebase/tdebase.spec
index 86f4c6b88..20d2c036d 100644
--- a/redhat/core/tdebase/tdebase.spec
+++ b/redhat/core/tdebase/tdebase.spec
@@ -170,10 +170,10 @@ Requires:	redhat-logos
 %define tde_starticon /usr/share/icons/hicolor/96x96/apps/system-logo-icon.png
 %endif
 
-# Rocky 9 Theme
-%if 0%{?rocky} == 9
-Requires:	rocky-backgrounds
-Requires:	rocky-logos
+# 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
diff --git a/redhat/core/tdelibs/trinity-tdelibs-rpmlintrc b/redhat/core/tdelibs/trinity-tdelibs-rpmlintrc
index cd73a0285..c65feac8b 100644
--- a/redhat/core/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/dependencies/python-tqt/python-tqt.spec b/redhat/dependencies/pytqt/pytqt.spec
index b8ae60bae..a050b1cff 100644
--- a/redhat/dependencies/python-tqt/python-tqt.spec
+++ b/redhat/dependencies/pytqt/pytqt.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package python-tqt (version R14)
+# spec file for package pytqt (version R14)
 #
 # Copyright (c) 2014 Trinity Desktop Environment
 #
@@ -24,7 +24,7 @@
 %if "%{?tde_version}" == ""
 %define tde_version 14.0.13
 %endif
-%define tde_pkg python-tqt
+%define tde_pkg pytqt
 %define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
@@ -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
@@ -118,30 +120,32 @@ BuildRequires:	%{_lib}xmu%{?mgaversion:6}-devel
 Python binding module that allows use of TQt X Window toolkit v3.
 You can use it to create portable graphics-capable scripts.
 
-At this moment python-tqt offers a vast subset of TQt API. There are
+At this moment pytqt offers a vast subset of TQt API. There are
 some minor issues related to the differences between C++ and Python
 (types, etc), but usually you'll be able to write code pretty much the
 same way in both languages (with syntax differences, of course)
 
 ##########
 
-%package -n python-tqt
+%package -n pytqt
 Summary:	TQt bindings for Python
 Group:		Development/Libraries/Python
 Requires:	trinity-filesystem >= %{tde_version}
 Requires:	sip4-tqt >= %{?epoch:%{epoch}:}4.10.5
 Requires:	libtqt4 >= %{?epoch:%{epoch}:}4.2.0
+Obsoletes:	python-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	python-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description -n python-tqt
+%description -n pytqt
 Python binding module that allows use of TQt X Window toolkit v3.
 You can use it to create portable graphics-capable scripts.
 
-At this moment python-tqt offers a vast subset of TQt API. There are
+At this moment pytqt offers a vast subset of TQt API. There are
 some minor issues related to the differences between C++ and Python
 (types, etc), but usually you'll be able to write code pretty much the
 same way in both languages (with syntax differences, of course)
 
-%files -n python-tqt
+%files -n pytqt
 %defattr(-,root,root,-)
 %doc NEWS README
 %dir %{python_sitearch}/python_tqt
@@ -156,34 +160,38 @@ same way in both languages (with syntax differences, of course)
 
 ##########
 
-%package -n python-tqt-gl
+%package -n pytqt-gl
 Summary:	TQt OpenGL bindings for Python
 Group:		Development/Libraries/Python
-Requires:	python-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	pytqt = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	python-tqt-gl < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	python-tqt-gl = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description -n python-tqt-gl
+%description -n pytqt-gl
 Python binding module that allows use of the OpenGL facilities
 offered by the TQt X Window toolkit v3. You can use it to create
 portable graphics-capable scripts.
 
-%files -n python-tqt-gl
+%files -n pytqt-gl
 %defattr(-,root,root,-)
 %{python_sitearch}/python_tqt/qtgl.so
 
 ##########
 
-%package -n python-tqt-tqtext
-Summary:	TQtext extensions for python-tqt
+%package -n pytqt-tqtext
+Summary:	TQtext extensions for pytqt
 Group:		Development/Libraries/Python
-Requires:	python-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	pytqt = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	python-tqt-tqtext < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	python-tqt-tqtext = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description -n python-tqt-tqtext
-python-tqt Extensions. Contains:
+%description -n pytqt-tqtext
+pytqt Extensions. Contains:
 
 * TQScintilla: a featureful TQt source code editing component based
               on Scintilla.
 
-%files -n python-tqt-tqtext
+%files -n pytqt-tqtext
 %defattr(-,root,root,-)
 %{python_sitearch}/python_tqt/qtext.so
 
@@ -192,7 +200,7 @@ python-tqt Extensions. Contains:
 %package -n trinity-pytqt-tools
 Summary:	Pyuic and pylupdate for TQt
 Group:		Development/Libraries/Python
-Requires:	python-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	pytqt = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-pytqt-tools
 pyuic is the PyQt counterpart for TQt's uic. It takes an XML
@@ -208,19 +216,21 @@ Linguist translation files from Python code.
 
 ##########
 
-%package -n python-tqt-devel
+%package -n pytqt-devel
 Summary:	TQt bindings for Python - Development files
 Group:		Development/Libraries/Python
-Requires:	python-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	pytqt = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	trinity-pytqt-tools = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	libtqt4-devel >= %{?epoch:%{epoch}:}4.2.0
+Obsoletes:	python-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	python-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description -n python-tqt-devel
+%description -n pytqt-devel
 Development .sip files with definitions of PyQt classes. They
 are needed to build PyQt, but also as building blocks of other
 packages based on them, like PyTDE.
 
-%files -n python-tqt-devel
+%files -n pytqt-devel
 %defattr(-,root,root,-)
 %{python_sitearch}/python_tqt/pyqtconfig.py*
 %dir %{_datadir}/sip
diff --git a/redhat/dependencies/tqt3/tqt3.spec b/redhat/dependencies/tqt3/tqt3.spec
index 2444b29be..1298ab280 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++
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/docker/el9/packages b/redhat/docker/el9/packages
index 67cd3c9c9..dda2b1b20 100644
--- a/redhat/docker/el9/packages
+++ b/redhat/docker/el9/packages
@@ -94,6 +94,7 @@ libgsf-devel
 libical-devel
 libidn-devel
 libjpeg-turbo-utils
+libjxl
 libksba-devel
 libmad-devel
 libmemcached-devel
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/libraries/python-trinity/python-trinity.spec b/redhat/libraries/pytde/pytde.spec
index b8eee62a8..ef7c94f19 100644
--- a/redhat/libraries/python-trinity/python-trinity.spec
+++ b/redhat/libraries/pytde/pytde.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package python-trinity (version R14)
+# spec file for package pytde (version R14)
 #
 # Copyright (c) 2014 Trinity Desktop Environment
 #
@@ -20,7 +20,7 @@
 %if "%{?tde_version}" == ""
 %define tde_version 14.0.13
 %endif
-%define tde_pkg python-trinity
+%define tde_pkg pytde
 %define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
@@ -74,8 +74,8 @@ BuildRequires:	gcc-c++
 BuildRequires:	%{python}
 BuildRequires:	%{python}-devel
 
-BuildRequires:	python-tqt-devel
-Requires:		python-tqt
+BuildRequires:	pytqt-devel
+Requires:		pytqt
 
 # SIP
 BuildRequires:	sip4-tqt-devel >= 4.10.5
@@ -83,6 +83,8 @@ Requires:		sip4-tqt >= 4.10.5
 
 Obsoletes:	python-trinity < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:	python-trinity = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-python-trinity < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-python-trinity = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description
 Python binding module that provides wide access to the Trinity API,
@@ -105,6 +107,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 +131,8 @@ Group:		Development/Libraries/Python
 
 Obsoletes:	python-trinity-doc < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:	python-trinity-doc = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-python-trinity-doc < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-python-trinity-doc = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description doc
 General documentation and examples for PyTDE providing programming
@@ -134,7 +140,7 @@ tips and working code you can use to learn from.
 
 %files doc
 %defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/en/python-trinity/
+%{tde_tdedocdir}/HTML/en/pytde/
 
 ##########
 
@@ -174,7 +180,7 @@ export PATH="%{tde_bindir}:${PATH}"
 
 # Install documentation
 %__mkdir_p %{buildroot}%{tde_tdedocdir}/HTML/en/
-%__cp -rf doc %{buildroot}%{tde_tdedocdir}/HTML/en/python-trinity/
+%__cp -rf doc %{buildroot}%{tde_tdedocdir}/HTML/en/pytde/
 
 
 %clean
diff --git a/redhat/libraries/pytdeextensions/pytdeextensions.spec b/redhat/libraries/pytdeextensions/pytdeextensions.spec
index b18982398..30c1f416c 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}
 
diff --git a/ubuntu/_base/libraries/python-trinity/debian/NEWS.Debian b/ubuntu/_base/libraries/pytde/debian/NEWS.Debian
index 367c6950d..367c6950d 100644
--- a/ubuntu/_base/libraries/python-trinity/debian/NEWS.Debian
+++ b/ubuntu/_base/libraries/pytde/debian/NEWS.Debian
diff --git a/ubuntu/_base/libraries/python-trinity/debian/changelog b/ubuntu/_base/libraries/pytde/debian/changelog
index 12485eccd..12485eccd 100644
--- a/ubuntu/_base/libraries/python-trinity/debian/changelog
+++ b/ubuntu/_base/libraries/pytde/debian/changelog
diff --git a/ubuntu/_base/libraries/python-trinity/debian/compat b/ubuntu/_base/libraries/pytde/debian/compat
index ec635144f..ec635144f 100644
--- a/ubuntu/_base/libraries/python-trinity/debian/compat
+++ b/ubuntu/_base/libraries/pytde/debian/compat
diff --git a/ubuntu/_base/libraries/python-trinity/debian/control b/ubuntu/_base/libraries/pytde/debian/control
index ccaad6fb3..ccaad6fb3 100644
--- a/ubuntu/_base/libraries/python-trinity/debian/control
+++ b/ubuntu/_base/libraries/pytde/debian/control
diff --git a/ubuntu/_base/libraries/python-trinity/debian/copyright b/ubuntu/_base/libraries/pytde/debian/copyright
index eec6b36a5..eec6b36a5 100644
--- a/ubuntu/_base/libraries/python-trinity/debian/copyright
+++ b/ubuntu/_base/libraries/pytde/debian/copyright
diff --git a/ubuntu/_base/libraries/python-trinity/debian/patches/.gitignore b/ubuntu/_base/libraries/pytde/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/libraries/python-trinity/debian/patches/.gitignore
+++ b/ubuntu/_base/libraries/pytde/debian/patches/.gitignore
diff --git a/ubuntu/_base/libraries/python-trinity/debian/pytdeconfig.py b/ubuntu/_base/libraries/pytde/debian/pytdeconfig.py
index eac264752..eac264752 100644
--- a/ubuntu/_base/libraries/python-trinity/debian/pytdeconfig.py
+++ b/ubuntu/_base/libraries/pytde/debian/pytdeconfig.py
diff --git a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs b/ubuntu/_base/libraries/pytde/debian/python-trinity-trinity-dev.dirs
index c395de89f..c395de89f 100644
--- a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs
+++ b/ubuntu/_base/libraries/pytde/debian/python-trinity-trinity-dev.dirs
diff --git a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.install b/ubuntu/_base/libraries/pytde/debian/python-trinity-trinity-dev.install
index f7d970bcb..f7d970bcb 100644
--- a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.install
+++ b/ubuntu/_base/libraries/pytde/debian/python-trinity-trinity-dev.install
diff --git a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.dirs b/ubuntu/_base/libraries/pytde/debian/python-trinity-trinity-doc.dirs
index 96235463f..96235463f 100644
--- a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.dirs
+++ b/ubuntu/_base/libraries/pytde/debian/python-trinity-trinity-doc.dirs
diff --git a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.doc-base b/ubuntu/_base/libraries/pytde/debian/python-trinity-trinity-doc.doc-base
index bb9705168..bb9705168 100644
--- a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.doc-base
+++ b/ubuntu/_base/libraries/pytde/debian/python-trinity-trinity-doc.doc-base
diff --git a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.examples b/ubuntu/_base/libraries/pytde/debian/python-trinity-trinity-doc.examples
index e39721e20..e39721e20 100644
--- a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.examples
+++ b/ubuntu/_base/libraries/pytde/debian/python-trinity-trinity-doc.examples
diff --git a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.install b/ubuntu/_base/libraries/pytde/debian/python-trinity-trinity-doc.install
index 20b273acb..20b273acb 100644
--- a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.install
+++ b/ubuntu/_base/libraries/pytde/debian/python-trinity-trinity-doc.install
diff --git a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity.install b/ubuntu/_base/libraries/pytde/debian/python-trinity-trinity.install
index facee2907..facee2907 100644
--- a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity.install
+++ b/ubuntu/_base/libraries/pytde/debian/python-trinity-trinity.install
diff --git a/ubuntu/_base/libraries/python-trinity/debian/rules b/ubuntu/_base/libraries/pytde/debian/rules
index ddbb6b15f..ddbb6b15f 100755
--- a/ubuntu/_base/libraries/python-trinity/debian/rules
+++ b/ubuntu/_base/libraries/pytde/debian/rules
diff --git a/ubuntu/_base/libraries/python-trinity/debian/source/format b/ubuntu/_base/libraries/pytde/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/libraries/python-trinity/debian/source/format
+++ b/ubuntu/_base/libraries/pytde/debian/source/format
diff --git a/ubuntu/_base/libraries/python-trinity/debian/source/options b/ubuntu/_base/libraries/pytde/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/libraries/python-trinity/debian/source/options
+++ b/ubuntu/_base/libraries/pytde/debian/source/options
diff --git a/ubuntu/_base/libraries/python-trinity/debian/watch b/ubuntu/_base/libraries/pytde/debian/watch
index 8b3afcac0..8b3afcac0 100644
--- a/ubuntu/_base/libraries/python-trinity/debian/watch
+++ b/ubuntu/_base/libraries/pytde/debian/watch