RPM: lots of updates for Trinity 14.1.2

Signed-off-by: François Andriot <[email protected]>

55 files changed, 841 insertions, 288 deletions

diff --git a/redhat/Makefile b/redhat/Makefile
index e67da2c2f..e9892467e 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -27,7 +27,7 @@ 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 kommando kompose konversation kooldock kopete-otr kpicosim kpilot kplayer 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
+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 kommando kompose konversation kooldock kopete-otr kpicosim kpilot kplayer 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-polyester tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico tork twin-style-crystal twin-style-dekorator twin-style-fahrenheit twin-style-machbunt twin-style-suse2 wlassistant yakuake
 i18n: gwenview-i18n k3b-i18n koffice-i18n tde-i18n
 
 ### Trinity Dependencies
@@ -35,7 +35,7 @@ i18n: gwenview-i18n k3b-i18n koffice-i18n tde-i18n
 akode: tqtinterface trinity-filesystem
 	$(call buildpkg,dependencies/akode)
 
-arts: tqtinterface trinity-filesystem esound
+arts: tqtinterface trinity-filesystem
 	$(call buildpkg,dependencies/arts)
 
 avahi-tqt: tqtinterface
@@ -116,7 +116,7 @@ tdelibs: brp-check-trinity tqt3 tqtinterface arts dbus-tqt dbus-1-tqt avahi-tqt
 tdemultimedia: tdebase akode
 	$(call buildpkg,core/tdemultimedia)
 
-tdenetwork: tdebase rdesktop
+tdenetwork: tdebase rdesktop tqca
 	$(call buildpkg,core/tdenetwork)
 
 tdepim: tdebase libcaldav libcarddav
@@ -143,13 +143,8 @@ ifneq (,$(filter $(DIST), .oss151 .oss152 .oss153 .oss154 .oss155 .osstw ))
 	$(call buildpkg,3rdparty/brp-check-trinity)
 endif
 
-esound:
-ifneq (,$(filter $(DIST), .mga6 .mga7 .mga8 .mga9 .oss151 .oss152 .oss153 .oss154 .oss155 .osstw ))
-	$(call buildpkg,3rdparty/esound)
-endif
-
 htdig:
-ifneq (,$(filter $(DIST), .el7 .el8 .el9 .fc38 .fc39 .mga6 .mga7 .mga8 .mga9 ))
+ifneq (,$(filter $(DIST), .el7 .el8 .el9 .fc38 .fc39 .fc40 .mga6 .mga7 .mga8 .mga9 ))
 	$(call buildpkg,extras/htdig)
 endif
 
@@ -186,7 +181,7 @@ ifneq (,$(filter $(DIST),.oss150 .oss151))
 endif
 
 wv2:
-ifneq (,$(filter $(DIST), .el5 .el6 .el7 .el8 .el9 .fc30 .fc31 .fc32 .fc33 .fc34 .fc35 .fc36 .fc37 .fc38 .fc39))
+ifneq (,$(filter $(DIST), .el5 .el6 .el7 .el8 .el9 .fc30 .fc31 .fc32 .fc33 .fc34 .fc35 .fc36 .fc37 .fc38 .fc39 .fc40))
 	$(call buildpkg,3rdparty/wv2)
 endif
 
@@ -595,6 +590,9 @@ tde-style-ia-ora: tdebase
 tde-style-lipstik: tdebase
 	$(call buildpkg,applications/themes/tde-style-lipstik)
 
+tde-style-polyester: tdebase
+	$(call buildpkg,applications/themes/tde-style-polyester)
+
 tde-style-qtcurve: tdebase
 	$(call buildpkg,applications/themes/tde-style-qtcurve)
 
@@ -622,6 +620,9 @@ twin-style-crystal: tdebase
 twin-style-dekorator: tdebase
 	$(call buildpkg,applications/themes/twin-style-dekorator)
 
+twin-style-fahrenheit: tdebase
+	$(call buildpkg,applications/themes/twin-style-fahrenheit)
+
 twin-style-machbunt: tdebase
 	$(call buildpkg,applications/themes/twin-style-machbunt)
 
diff --git a/redhat/applications/graphics/gwenview/gwenview.spec b/redhat/applications/graphics/gwenview/gwenview.spec
index 3ae976205..73562a68e 100644
--- a/redhat/applications/graphics/gwenview/gwenview.spec
+++ b/redhat/applications/graphics/gwenview/gwenview.spec
@@ -207,8 +207,10 @@ export PATH="%{tde_bindir}:${PATH}"
 %{tde_datadir}/icons/hicolor/scalable/apps/gvdirpart.svg
 %{tde_datadir}/icons/hicolor/scalable/apps/gwenview.svgz
 %{tde_datadir}/man/man1/gwenview.1*
+%{tde_datadir}/pixmaps/gwenview.xpm
 %{tde_datadir}/services/gvdirpart.desktop
 %{tde_datadir}/services/gvimagepart.desktop
 %lang(en) %{tde_tdedocdir}/HTML/en/gwenview/
 
+
 %changelog
diff --git a/redhat/applications/internet/kvirc/kvirc.spec b/redhat/applications/internet/kvirc/kvirc.spec
index a3337d46b..16e07193b 100644
--- a/redhat/applications/internet/kvirc/kvirc.spec
+++ b/redhat/applications/internet/kvirc/kvirc.spec
@@ -172,10 +172,10 @@ export PATH="%{tde_bindir}:${PATH}"
   --with-kde-services-dir=%{tde_datadir}/services \
   --with-kde-library-dir=%{tde_libdir} \
   --with-kde-include-dir=%{tde_tdeincludedir} \
-  --with-qt-name=tqt \
-  --with-qt-library-dir=%{_libdir} \
-  --with-qt-include-dir=%{_includedir}/tqt3 \
-  --with-qt-moc=%{_bindir}/tmoc
+  --with-tqt-name=tqt \
+  --with-tqt-library-dir=%{_libdir} \
+  --with-tqt-include-dir=%{_includedir}/tqt3 \
+  --with-tqt-moc=%{_bindir}/tmoc
 
 # Symbolic links must exist prior to parallel building
 %__make symlinks -C src/kvilib/build
@@ -227,6 +227,8 @@ export PATH="%{tde_bindir}:${PATH}"
 %exclude %{tde_libdir}/kvirc/*/modules/*.so
 %{tde_libdir}/kvirc/
 %{tde_tdeappdir}/kvirc.desktop
+%{tde_datadir}/apps/tdeconf_update/kvirc_soundsystem.upd
+%{tde_datadir}/apps/tdeconf_update/kvirc_soundsystem_upd.sh
 %{tde_datadir}/icons/hicolor/*/*/*.png
 %{tde_datadir}/icons/hicolor/*/*/*.svgz
 %{tde_datadir}/icons/hicolor/*/*/*.xpm
diff --git a/redhat/applications/internet/smb4k/smb4k.spec b/redhat/applications/internet/smb4k/smb4k.spec
index 285b431ec..81ad2fda6 100644
--- a/redhat/applications/internet/smb4k/smb4k.spec
+++ b/redhat/applications/internet/smb4k/smb4k.spec
@@ -58,11 +58,13 @@ Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	cmake
 BuildRequires:	gcc-c++
+BuildRequires:	libtool
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
 
@@ -143,41 +145,44 @@ Requires:		%{name} = %{version}-%{release}
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
 
 %build
 unset QTDIR QTINC 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} \
-  --program-prefix="" \
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+# Warning: GCC visibility causes FTBFS [Bug #1285]
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON" \
+  ..
 
-# SMP safe !
-%__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
 
 %find_lang %{tde_pkg}
 
diff --git a/redhat/applications/misc/kcmldap/kcmldap.spec b/redhat/applications/misc/kcmldap/kcmldap.spec
index 698538c1b..1c1eb3e5e 100644
--- a/redhat/applications/misc/kcmldap/kcmldap.spec
+++ b/redhat/applications/misc/kcmldap/kcmldap.spec
@@ -152,6 +152,7 @@ This is a TDE control center module to manage TDE connections to Kerberos realms
 %dir %{tde_datadir}/pixmaps
 %{tde_datadir}/pixmaps/kcmldapbonding_step1.png
 %{tde_datadir}/pixmaps/kcmldapbonding_step3.png
+%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/kcmldap.mo
 
 ##########
 
diff --git a/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec b/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec
index 133ef56ed..f4f4df817 100644
--- a/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec
+++ b/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec
@@ -157,6 +157,7 @@ This is a TDE control center module to manage users, groups, and machines in Ker
 %dir %{tde_datadir}/pixmaps
 %{tde_datadir}/pixmaps/kcmldapcontroller_step1.png
 %{tde_datadir}/pixmaps/kcmldapcontroller_step4.png
+%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/kcmldapcontroller.mo
 
 ##########
 
diff --git a/redhat/applications/multimedia/amarok/amarok.spec b/redhat/applications/multimedia/amarok/amarok.spec
index d1cba544d..f249ae50e 100644
--- a/redhat/applications/multimedia/amarok/amarok.spec
+++ b/redhat/applications/multimedia/amarok/amarok.spec
@@ -88,7 +88,7 @@ BuildRequires:	brp-check-trinity
 BuildRequires:	alsa-lib-devel
 
 # ESOUND support
-BuildRequires:	esound-devel
+#BuildRequires:	esound-devel
 
 # PCRE support
 BuildRequires:	pcre-devel
diff --git a/redhat/applications/settings/tde-guidance/tde-guidance.spec b/redhat/applications/settings/tde-guidance/tde-guidance.spec
index 7775efeb5..3e2932e27 100644
--- a/redhat/applications/settings/tde-guidance/tde-guidance.spec
+++ b/redhat/applications/settings/tde-guidance/tde-guidance.spec
@@ -63,12 +63,13 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:	trinity-pytdeextensions
 BuildRequires:	trinity-libpythonize0-devel
 BuildRequires:	trinity-pytde
 BuildRequires:	chrpath
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	libtool
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -92,14 +93,6 @@ BuildRequires:	pytqt-devel
 BuildRequires:	trinity-pytde-devel
 BuildRequires:	trinity-pytqt-tools
 
-# LIBXXF86VM support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}xxf86vm-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1210
-BuildRequires:	libXxf86vm-devel
-%endif
-
 # XSCREENSAVER support
 #  RHEL 4: disabled
 #  RHEL 6: available in EPEL
@@ -191,38 +184,37 @@ or can be run as standalone applications.
 %{tde_tdeappdir}/*.desktop
 %{tde_datadir}/icons/crystalsvg/*/*/*.png
 %if 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
-%{python_sitearch}/%{name}/SMBShareSelectDialog.py*
-%{python_sitearch}/%{name}/SimpleCommandRunner.py*
-%{python_sitearch}/%{name}/fuser.py*
-%{python_sitearch}/%{name}/fuser_ui.py*
-%{python_sitearch}/%{name}/mountconfig.py*
-%{python_sitearch}/%{name}/serviceconfig.py*
-%{python_sitearch}/%{name}/sizeview.py*
-%{python_sitearch}/%{name}/unixauthdb.py*
-%{python_sitearch}/%{name}/userconfig.py*
+%{python_sitelib}/tde-guidance/SMBShareSelectDialog.py*
+%{python_sitelib}/tde-guidance/SimpleCommandRunner.py*
+%{python_sitelib}/tde-guidance/fuser.py*
+%{python_sitelib}/tde-guidance/fuser_ui.py*
+%{python_sitelib}/tde-guidance/mountconfig.py*
+%{python_sitelib}/tde-guidance/serviceconfig.py*
+%{python_sitelib}/tde-guidance/sizeview.py*
+%{python_sitelib}/tde-guidance/unixauthdb.py*
+%{python_sitelib}/tde-guidance/userconfig.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__/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_sitelib}/tde-guidance/__pycache__/SMBShareSelectDialog.*.pyc
+%{python_sitelib}/tde-guidance/__pycache__/SimpleCommandRunner.*.pyc
+%{python_sitelib}/tde-guidance/__pycache__/fuser.*.pyc
+%{python_sitelib}/tde-guidance/__pycache__/fuser_ui.*.pyc
+%{python_sitelib}/tde-guidance/__pycache__/mountconfig.*.pyc
+%{python_sitelib}/tde-guidance/__pycache__/serviceconfig.*.pyc
+%{python_sitelib}/tde-guidance/__pycache__/sizeview.*.pyc
+%{python_sitelib}/tde-guidance/__pycache__/unixauthdb.*.pyc
+%{python_sitelib}/tde-guidance/__pycache__/userconfig.*.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}/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_sitelib}/tde-guidance/SMBShareSelectDialog.py
+%pycached %{python_sitelib}/tde-guidance/SimpleCommandRunner.py
+%pycached %{python_sitelib}/tde-guidance/fuser.py
+%pycached %{python_sitelib}/tde-guidance/fuser_ui.py
+%pycached %{python_sitelib}/tde-guidance/mountconfig.py
+%pycached %{python_sitelib}/tde-guidance/serviceconfig.py
+%pycached %{python_sitelib}/tde-guidance/sizeview.py
+%pycached %{python_sitelib}/tde-guidance/unixauthdb.py
+%pycached %{python_sitelib}/tde-guidance/userconfig.py
 %endif
-%{tde_tdedocdir}/HTML/en/guidance/
 
 # Files from powermanager
 %if 0%{?with_powermanager}
@@ -232,6 +224,11 @@ or can be run as standalone applications.
 %exclude %{tde_datadir}/apps/guidance/pics/processor.png
 %endif
 
+%{tde_tdedocdir}/HTML/en/tde-guidance/
+%{tde_mandir}/man1/mountconfig-trinity.1*
+%{tde_mandir}/man1/serviceconfig-trinity.1*
+%{tde_mandir}/man1/userconfig-trinity.1*
+
 ##########
 
 %package backends
@@ -251,20 +248,15 @@ Guidance configuration tools.
 
 %files backends
 %defattr(-,root,root,-)
-%dir %{python_sitearch}/%{name}
+%dir %{python_sitelib}/tde-guidance
 %if 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
-%{python_sitearch}/%{name}/MicroHAL.py*
-%{python_sitearch}/%{name}/xf86misc.py*
+%{python_sitelib}/tde-guidance/MicroHAL.py*
 %if 0%{?rhel} == 7
-%{python_sitearch}/%{name}/__pycache__/MicroHAL.*.pyc
-%{python_sitearch}/%{name}/__pycache__/xf86misc.*.pyc
+%{python_sitelib}/tde-guidance/__pycache__/MicroHAL.*.pyc
 %endif
 %else
-%pycached %{python_sitearch}/%{name}/MicroHAL.py
-%pycached %{python_sitearch}/%{name}/xf86misc.py
+%pycached %{python_sitelib}/tde-guidance/MicroHAL.py
 %endif
-%{python_sitearch}/ixf86misc*.so
-%{python_sitearch}/xf86misc*.pyc
 
 ##########
 
@@ -292,31 +284,31 @@ suspend using HAL.
 %defattr(-,root,root,-)
 %{tde_bindir}/guidance-power-manager
 %if 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
-%{python_sitearch}/%{name}/MicroHAL.py*
-%{python_sitearch}/%{name}/guidance-power-manager.py*
-%{python_sitearch}/%{name}/powermanage.py*
-%{python_sitearch}/%{name}/gpmhelper.py*
-%{python_sitearch}/%{name}/powermanager_ui.py*
-%{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
+%{python_sitelib}/tde-guidance/MicroHAL.py*
+%{python_sitelib}/tde-guidance/guidance-power-manager.py*
+%{python_sitelib}/tde-guidance/powermanage.py*
+%{python_sitelib}/tde-guidance/gpmhelper.py*
+%{python_sitelib}/tde-guidance/powermanager_ui.py*
+%{python_sitelib}/tde-guidance/guidance_power_manager_ui.py*
+%{python_sitelib}/tde-guidance/notify.py*
+%{python_sitelib}/tde-guidance/tooltip.py*
+%{python_sitelib}/tde-guidance/__pycache__/MicroHAL.*.pyc
+%{python_sitelib}/tde-guidance/__pycache__/guidance-power-manager.*.pyc
+%{python_sitelib}/tde-guidance/__pycache__/powermanage.*.pyc
+%{python_sitelib}/tde-guidance/__pycache__/gpmhelper.*.pyc
+%{python_sitelib}/tde-guidance/__pycache__/powermanager_ui.*.pyc
+%{python_sitelib}/tde-guidance/__pycache__/guidance_power_manager_ui.*.pyc
+%{python_sitelib}/tde-guidance/__pycache__/notify.*.pyc
+%{python_sitelib}/tde-guidance/__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
+%pycached %{python_sitelib}/tde-guidance/MicroHAL.py
+%pycached %{python_sitelib}/tde-guidance/guidance-power-manager.py
+%pycached %{python_sitelib}/tde-guidance/powermanage.py
+%pycached %{python_sitelib}/tde-guidance/gpmhelper.py
+%pycached %{python_sitelib}/tde-guidance/powermanager_ui.py
+%pycached %{python_sitelib}/tde-guidance/guidance_power_manager_ui.py
+%pycached %{python_sitelib}/tde-guidance/notify.py
+%pycached %{python_sitelib}/tde-guidance/tooltip.py
 %endif
 %{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png
 %{tde_datadir}/apps/guidance/pics/ac-adapter.png
@@ -347,151 +339,43 @@ suspend using HAL.
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
-#export PYTHONPATH=%{python_sitearch}/pytqt
-
-# Avoids 'error: byte-compiling is disabled.' on Mandriva/Mageia
-export PYTHONDONTWRITEBYTECODE=
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
 
-# FTBFS on PCLOS ...
 export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I%{tde_tdeincludedir} -I%{tde_includedir}"
 
-# Specific path for RHEL4
-if [ -d /usr/X11R6 ]; then
-  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-  %__sed -i "setup.py" -e "s|/usr/X11R6/lib|/usr/X11R6/%{_lib}|g"
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
 fi
 
-# FIXME: ordinal not in range in rhel7
-%if 0%{?rhel} == 7
-export LC_ALL=en_US.UTF-8
-%endif
-
-%__python ./setup.py build
+# Warning: GCC visibility causes FTBFS [Bug #1285]
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON" \
+  ..
+
+%__make %{?_smp_mflags} || %__make
 
 
 %install
-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}/pytqt"
-
-# Support for 'sip4-tqt'
-export PYTHONPATH="%{python_sitearch}/sip4_tqt:${PYTHONPATH}"
-
-# For Mageia/Mandriva: Avoids 'error: byte-compiling must be disabled.
-export PYTHONDONTWRITEBYTECODE=
-
-# FIXME: ordinal not in range in rhel7
-%if 0%{?rhel} == 7
-export LC_ALL=en_US.UTF-8
-%endif
-
-%__rm -rf %{buildroot}
-%__python ./setup.py install \
-	--prefix=%{tde_prefix} \
-	--root=%{buildroot}
-
-# Fix temporary build directories remaining inside .py files
-for f in %{buildroot}%{tde_datadir}/apps/guidance/*.py; do
-	%__sed -i "${f}" -e "s|%{buildroot}||g"
-done
-
-##### MAIN PACKAGE INSTALLATION (based on Debian/Ubuntu packaging rules)
-# install icons to right place
-%__mkdir_p %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps
-%__cp -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-app-daemons.png \
-	%{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/daemons.png
-%__cp -f %{buildroot}%{tde_datadir}/apps/guidance/pics/kcmpartitions.png \
-	%{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/disksfilesystems.png
-%__cp -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-user.png \
-	%{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/userconfig.png
-
-# fix binary-or-shlib-defines-rpath
-chrpath -r %{tde_libdir} %{buildroot}%{tde_tdelibdir}/kcm_*.so
-
-# move python modules in %{python_sitearch} (/usr/lib/pythonXX/site-packages)
-%__mkdir_p %{buildroot}%{python_sitearch}/%{name} 
-%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/*.py* %{buildroot}%{python_sitearch}/%{name}
-
-# Generates the startup scripts
-%__rm -f %{buildroot}%{tde_bindir}/*
-%__ln_s -f %{python_sitearch}/%{name}/mountconfig.py %{buildroot}%{tde_bindir}/mountconfig
-%__ln_s -f %{python_sitearch}/%{name}/serviceconfig.py %{buildroot}%{tde_bindir}/serviceconfig
-%__ln_s -f %{python_sitearch}/%{name}/userconfig.py %{buildroot}%{tde_bindir}/userconfig
-
-# fix script-not-executable
-%__chmod 0755 %{buildroot}%{python_sitearch}/%{name}/fuser.py
-
-##### 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/__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
-%__ln_s -f /usr/share/hwdata/MonitorsDB %{buildroot}%{tde_datadir}/apps/guidance/MonitorsDB
-%endif
-
-%if 0%{?with_powermanager}
-##### POWERMANAGER INSTALLATION
-# install icon to right place
-%__install -D -p -m0644 kde/powermanager/pics/battery-charging-100.png \
-		%{buildroot}%{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png
-%__install -D -p -m0644 kde/powermanager/pics/*.png \
-		%{buildroot}%{tde_datadir}/apps/guidance/pics/
-
-# install desktop file
-%__install -D -p -m0644 powermanager/guidance-power-manager.desktop \
-		%{buildroot}%{tde_datadir}/autostart/guidance-power-manager.desktop
-
-# copy python modules in PYSUPPORT_PATH
-%__cp powermanager/guidance_power_manager_ui.py %{buildroot}%{python_sitearch}/%{name}
-%__cp powermanager/notify.py %{buildroot}%{python_sitearch}/%{name}
-%__cp powermanager/tooltip.py %{buildroot}%{python_sitearch}/%{name}
-
-# generate guidance-power-manager script
-cat <<EOF >%{?buildroot}%{tde_bindir}/guidance-power-manager
-#!/bin/sh
-export PYTHONPATH=%{python_sitearch}/%{name}:%{python_sitearch}/sip4-tqt
-%{python_sitearch}/%{name}/guidance-power-manager.py &
-EOF
-chmod +x %{buildroot}%{tde_bindir}/guidance-power-manager
-
-# fix script-not-executable
-chmod 0755 %{buildroot}%{python_sitearch}/%{name}/powermanage.py
-chmod 0755 %{buildroot}%{python_sitearch}/%{name}/gpmhelper.py
-
-%else
-%__rm -f %{buildroot}%{python_sitearch}/%{name}/gpmhelper.py*
-%__rm -f %{buildroot}%{python_sitearch}/%{name}/guidance-power-manager.py*
-%__rm -f %{buildroot}%{python_sitearch}/%{name}/guidance_power_manager_ui.py*
-%__rm -f %{buildroot}%{python_sitearch}/%{name}/powermanage.py*
-%__rm -f %{buildroot}%{python_sitearch}/%{name}/powermanager_ui.py*
-%__rm -f %{buildroot}%{tde_datadir}/apps/guidance/powermanager_ui.ui
-
-%endif
-
-# Replace all '#!' calls to python with /usr/bin/python
-# and make them executable
-for i in `find %{buildroot} -type f`; do
-	sed '1s,#!.*python[^ ]*\(.*\),#!/usr/bin/env %python\1,' \
-		$i > $i.temp;
-	if cmp --quiet $i $i.temp; then
-		rm -f $i.temp;
-	else
-		mv -f $i.temp $i;
-		chmod 755 $i;
-		echo "fixed interpreter: $i";
-	fi;
-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/
+%__rm -fr $RPM_BUILD_ROOT
+%__make install DESTDIR=$RPM_BUILD_ROOT -C build
 
 
 %clean
diff --git a/redhat/applications/system/kbfx/kbfx.spec b/redhat/applications/system/kbfx/kbfx.spec
index ad06072a5..f4279ad39 100644
--- a/redhat/applications/system/kbfx/kbfx.spec
+++ b/redhat/applications/system/kbfx/kbfx.spec
@@ -228,6 +228,7 @@ export PATH="%{tde_bindir}:${PATH}"
 %lang(hu) %{tde_datadir}/locale/hu/LC_MESSAGES/kbfxconfigapp.mo
 %lang(it) %{tde_datadir}/locale/it/LC_MESSAGES/kbfxconfigapp.mo
 %lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/kbfxconfigapp.mo
+%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/kbfxconfigapp.mo
 %{tde_datadir}/mimelnk/application/x-kbfxtheme.desktop
 
 
diff --git a/redhat/applications/system/krusader/krusader.spec b/redhat/applications/system/krusader/krusader.spec
index 25abd094a..84c5d59ce 100644
--- a/redhat/applications/system/krusader/krusader.spec
+++ b/redhat/applications/system/krusader/krusader.spec
@@ -169,6 +169,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
 %{tde_tdeappdir}/krusader.desktop
 %{tde_tdeappdir}/krusader_root-mode.desktop
 %{tde_datadir}/apps/krusader
+%{tde_datadir}/apps/tdeconf_update/krusader_tqt_selection.upd
 %{tde_datadir}/icons/crystalsvg/*/apps/*.png
 %{tde_datadir}/icons/locolor/*/apps/*.png
 %{tde_datadir}/services/krarc.protocol
diff --git a/redhat/applications/themes/tde-style-ia-ora/tde-style-ia-ora.spec b/redhat/applications/themes/tde-style-ia-ora/tde-style-ia-ora.spec
index e5ffdca03..9971dcde6 100644
--- a/redhat/applications/themes/tde-style-ia-ora/tde-style-ia-ora.spec
+++ b/redhat/applications/themes/tde-style-ia-ora/tde-style-ia-ora.spec
@@ -145,6 +145,9 @@ fi
 %{tde_tdelibdir}/twin_iaora_config.so
 %{tde_datadir}/apps/tdestyle/themes/ia_ora.themerc
 %{tde_datadir}/apps/twin/iaora.desktop
+%{_libdir}/gtk-2.0/2.10.0/engines/libia_ora.la
+%{_libdir}/gtk-2.0/2.10.0/engines/libia_ora.so
+%{_datadir}/themes/Ia*
 
 
 %changelog
diff --git a/redhat/applications/themes/tde-style-polyester/tde-style-polyester.spec b/redhat/applications/themes/tde-style-polyester/tde-style-polyester.spec
new file mode 100644
index 000000000..394708490
--- /dev/null
+++ b/redhat/applications/themes/tde-style-polyester/tde-style-polyester.spec
@@ -0,0 +1,143 @@
+#
+# spec file for package polyester (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.1
+%endif
+%define tde_pkg tde-style-polyester
+%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
+
+# Required for Mageia and PCLinuxOS: removes the ldflag '--no-undefined'
+%define _disable_ld_no_undefined 1
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	1.0.3
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Domino widget style and twin decoration for TDE
+Group:		Graphical desktop/TDE
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <[email protected]>
+
+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:	trinity-tde-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	libtool
+
+%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version}
+BuildRequires:          libjpeg-devel
+%else
+BuildRequires:          jpeg-devel
+%endif
+
+%description
+Domino is a style with a soft look. It allows to fine adjust the shininess
+of the widgets by customizable color gradients.
+
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+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} \
+  -DDATA_INSTALL_DIR=%{tde_datadir}/apps \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DBUILD_ALL=ON \
+  ..
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+
+%clean
+%__rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root)
+%{tde_tdelibdir}/plugins/styles/polyester.la
+%{tde_tdelibdir}/plugins/styles/polyester.so
+%{tde_tdelibdir}/tdestyle_polyester_config.la
+%{tde_tdelibdir}/tdestyle_polyester_config.so
+%{tde_tdelibdir}/twin_polyester.la
+%{tde_tdelibdir}/twin_polyester.so
+%{tde_tdelibdir}/twin_polyester_config.la
+%{tde_tdelibdir}/twin_polyester_config.so
+%{tde_datadir}/apps/tdedisplay/color-schemes/PolyesterBlue.kcsrc
+%{tde_datadir}/apps/tdedisplay/color-schemes/PolyesterEmerald.kcsrc
+%{tde_datadir}/apps/tdedisplay/color-schemes/PolyesterOrangeJuice.kcsrc
+%{tde_datadir}/apps/tdestyle/themes/polyester.themerc
+%{tde_datadir}/apps/twin/polyester.desktop
+
+
+%changelog
diff --git a/redhat/applications/themes/twin-style-fahrenheit/twin-style-fahrenheit.spec b/redhat/applications/themes/twin-style-fahrenheit/twin-style-fahrenheit.spec
new file mode 100644
index 000000000..6986d3f7b
--- /dev/null
+++ b/redhat/applications/themes/twin-style-fahrenheit/twin-style-fahrenheit.spec
@@ -0,0 +1,158 @@
+#
+# spec file for package twin-style-fahrenheit (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.1
+%endif
+%define tde_pkg twin-style-fahrenheit
+%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.3
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <[email protected]>
+
+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 SUSE 9.3 KDE Window decoration extracted from SUSE.
+
+It features in additon to the original theme several new button
+styles and a changeable titlebar image.
+
+A color scheme for TDE is provided too.
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+  -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
+  -DLIB_INSTALL_DIR="%{tde_libdir}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  \
+  -DBUILD_ALL=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_TRANSLATIONS=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/twin_fahrenheit.la
+%{tde_tdelibdir}/twin_fahrenheit.so
+%{tde_datadir}/apps/twin/fahrenheit.desktop
+%{tde_datadir}/apps/twin/fahrenheit/close.png
+%{tde_datadir}/apps/twin/fahrenheit/help.png
+%{tde_datadir}/apps/twin/fahrenheit/maximize.png
+%{tde_datadir}/apps/twin/fahrenheit/minimize.png
+%{tde_datadir}/apps/twin/fahrenheit/minmax.png
+%{tde_datadir}/apps/twin/fahrenheit/sticky.png
+%{tde_datadir}/apps/twin/fahrenheit/unsticky.png
+
+
+%changelog
diff --git a/redhat/build/update_repository.sh b/redhat/build/update_repository.sh
index 83887fd9b..641cdf2db 100755
--- a/redhat/build/update_repository.sh
+++ b/redhat/build/update_repository.sh
@@ -11,6 +11,7 @@ done
 
 ARCH="$(rpm -E %{_target_cpu})"
 RPMDIR=$(rpm -E %{_rpmdir}.tde-${TDE_VERSION})
+dist="$(rpm -E %dist)"
 
 [ -d "${RPMDIR}/noarch" ] || mkdir -p "${RPMDIR}/noarch"
 [ -d "${RPMDIR}/${ARCH}" ] || mkdir -p "${RPMDIR}/${ARCH}"
@@ -23,7 +24,7 @@ elif [ -x /usr/bin/zypper ]; then
   REPOUPDATE='(cd ${RPMDIR}; createrepo --workers=${WORKERS} ${ARCH} & createrepo --workers=${WORKERS} noarch & wait; sudo zypper refresh rpmbuild.${ARCH} rpmbuild.noarch)'
   #REPOUPDATE='(rsync -av ${RPMDIR}/ /tmp/rpm${dist}/ && cd /tmp/rpm${dist}; umask 0000; createrepo --workers=${WORKERS} ${ARCH} & createrepo --workers=${WORKERS} noarch & wait; rsync -av /tmp/rpm${dist}/ ${RPMDIR}/; sudo zypper refresh rpmbuild.${ARCH} rpmbuild.noarch)'
 elif [ -x /usr/bin/yum ]; then
-  if [ "$(rpm -E %dist)" = ".el5" ]; then
+  if [ "${dist}" = ".el5" ]; then
     REPOUPDATE='(cd ${RPMDIR}; createrepo ${ARCH} & createrepo noarch & wait; sudo yum clean metadata --disablerepo="*" --enablerepo="rpmbuild*")'
   else
     REPOUPDATE='(cd ${RPMDIR}; createrepo --workers=${WORKERS} ${ARCH} & createrepo --workers=${WORKERS} noarch & wait; sudo yum clean metadata --disablerepo="*" --enablerepo="rpmbuild*")'
diff --git a/redhat/core/tdeartwork/tdeartwork.spec b/redhat/core/tdeartwork/tdeartwork.spec
index 24d94f6f2..52528e891 100644
--- a/redhat/core/tdeartwork/tdeartwork.spec
+++ b/redhat/core/tdeartwork/tdeartwork.spec
@@ -75,7 +75,7 @@ BuildRequires:	gettext
 BuildRequires:	libidn-devel
 
 # ESOUND support
-BuildRequires:	esound-devel
+#BuildRequires:	esound-devel
 
 # ACL support
 BuildRequires:	libacl-devel
diff --git a/redhat/core/tdebase/pamd.kcheckpass-trinity.fc40 b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc40
new file mode 120000
index 000000000..bcd188214
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc40
@@ -0,0 +1 @@
+pamd.kcheckpass-trinity.fc39
\ No newline at end of file
diff --git a/redhat/core/tdebase/pamd.kdm-trinity-np.fc40 b/redhat/core/tdebase/pamd.kdm-trinity-np.fc40
new file mode 120000
index 000000000..9d4df92f4
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.fc40
@@ -0,0 +1 @@
+pamd.kdm-trinity-np.fc39
\ No newline at end of file
diff --git a/redhat/core/tdebase/pamd.kdm-trinity.fc40 b/redhat/core/tdebase/pamd.kdm-trinity.fc40
new file mode 120000
index 000000000..5022f14ef
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kdm-trinity.fc40
@@ -0,0 +1 @@
+pamd.kdm-trinity.fc39
\ No newline at end of file
diff --git a/redhat/core/tdebase/pamd.kscreensaver-trinity.fc40 b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc40
new file mode 120000
index 000000000..a7b20accd
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc40
@@ -0,0 +1 @@
+pamd.kscreensaver-trinity.fc39
\ No newline at end of file
diff --git a/redhat/core/tdebase/tdebase.spec b/redhat/core/tdebase/tdebase.spec
index a427e2eb7..60c5a7a12 100644
--- a/redhat/core/tdebase/tdebase.spec
+++ b/redhat/core/tdebase/tdebase.spec
@@ -266,10 +266,10 @@ BuildRequires:	libusb-devel
 %endif
 
 # ESOUND support
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-%define with_esound 1
-BuildRequires:	esound-devel
-%endif
+#if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
+#define with_esound 1
+#BuildRequires:	esound-devel
+#endif
 
 # IDN support
 BuildRequires:	libidn-devel
@@ -442,6 +442,9 @@ BuildRequires:	xorg-x11-libxkbfile-devel
 %endif
 %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1210
 BuildRequires:	libxkbfile-devel
+%if 0%{?fedora} || 0%{?rhel} >= 7
+BuildRequires:	xkeyboard-config-devel
+%endif
 %endif
 
 # XDMCP support
diff --git a/redhat/core/tdebase/tdm.fc40.te b/redhat/core/tdebase/tdm.fc40.te
new file mode 120000
index 000000000..6d3f39b54
--- /dev/null
+++ b/redhat/core/tdebase/tdm.fc40.te
@@ -0,0 +1 @@
+tdm.fc39.te
\ No newline at end of file
diff --git a/redhat/core/tdebindings/tdebindings.spec b/redhat/core/tdebindings/tdebindings.spec
index 27fb4156b..5ab3d977b 100644
--- a/redhat/core/tdebindings/tdebindings.spec
+++ b/redhat/core/tdebindings/tdebindings.spec
@@ -1139,14 +1139,8 @@ 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
-
-# Fedora >= 39 comes with python 3.12, but we want version 3.11
-%if 0%{?fedora} >= 39
-export PYTHON=%{__python3}
-%endif
+# Force python version
+export PYTHON=%{__python}
 
 # Warning: GCC visibility causes FTBFS [Bug #1285]
 %configure \
@@ -1176,6 +1170,11 @@ export PYTHON=%{__python3}
   %{?with_java:--with-java=%{java_home}} %{!?with_java:--without-java} \
   %{?with_qscintilla:--enable-qscintilla} %{!?with_qscintilla:--disable-qscintilla}
 
+# Ensure python was detected properly
+if grep "LIBPYTHON=''" "config.log"; then
+  exit 1
+fi
+
 # Build dcopperl with specific options
 pushd dcopperl
 CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL INSTALLDIRS=vendor INSTALLVENDORMAN3DIR=%{tde_mandir}/man3
diff --git a/redhat/core/tdemultimedia/tdemultimedia.spec b/redhat/core/tdemultimedia/tdemultimedia.spec
index 432e2d0bd..abc95e468 100644
--- a/redhat/core/tdemultimedia/tdemultimedia.spec
+++ b/redhat/core/tdemultimedia/tdemultimedia.spec
@@ -126,6 +126,10 @@ BuildRequires:	libcdda-devel
 BuildRequires:	cdparanoia-devel
 %endif
 
+# CDIO support
+BuildRequires:	libcdio-devel
+BuildRequires:	libcdio-paranoia-devel
+
 # FLAC support
 %if 0%{?mgaversion} || 0%{?mdkversion}
 %if 0%{?pclinuxos}
diff --git a/redhat/core/tdenetwork/tdenetwork.spec b/redhat/core/tdenetwork/tdenetwork.spec
index 0e4463018..f53b0d0f0 100644
--- a/redhat/core/tdenetwork/tdenetwork.spec
+++ b/redhat/core/tdenetwork/tdenetwork.spec
@@ -1062,6 +1062,7 @@ A tdeioslave and tded module that provide Zeroconf support. Try
 %{tde_datadir}/apps/zeroconf/_nfs._tcp
 %{tde_datadir}/apps/zeroconf/_ssh._tcp
 %{tde_datadir}/apps/zeroconf/_rfb._tcp
+%{tde_datadir}/apps/zeroconf/_sftp-ssh._tcp
 %{tde_tdelibdir}/tdeio_zeroconf.so
 %{tde_tdelibdir}/tdeio_zeroconf.la
 %{tde_tdelibdir}/kded_dnssdwatcher.so
diff --git a/redhat/dependencies/akode/akode.spec b/redhat/dependencies/akode/akode.spec
index 7cc92149a..c6b070cab 100644
--- a/redhat/dependencies/akode/akode.spec
+++ b/redhat/dependencies/akode/akode.spec
@@ -83,7 +83,7 @@ BuildRequires: flac-devel
 %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
 %define _with_jack --with-jack
 %if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: libjack-devel
+BuildRequires: %{_lib}jack-devel
 %endif
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
 BuildRequires: jack-audio-connection-kit-devel
diff --git a/redhat/dependencies/arts/arts.spec b/redhat/dependencies/arts/arts.spec
index 9846dcedd..fd50cb40d 100644
--- a/redhat/dependencies/arts/arts.spec
+++ b/redhat/dependencies/arts/arts.spec
@@ -78,7 +78,7 @@ BuildRequires:	gsl-devel
 BuildRequires:	libvorbis-devel
 
 # ESOUND support
-%define with_esound 1
+#define with_esound 1
 %if 0%{?with_esound}
 BuildRequires:	esound-devel
 %endif
@@ -271,8 +271,8 @@ fi
   -DWITH_AUDIOFILE=ON \
   -DWITH_VORBIS=ON \
   %{?with_libmad:-DWITH_MAD=ON} %{!?with_libmad:-DWITH_MAD=OFF} \
-  %{?with_esound:-DWITH_ESOUND=ON} \
-  %{?with_jack:-DWITH_JACK=ON} \
+  %{?with_esound:-DWITH_ESOUND=ON} %{!?with_esound:-DWITH_ESOUND=OFF} \
+  %{?with_jack:-DWITH_JACK=ON} %{!?with_jack:-DWITH_JACK=OFF} \
   ..
 
 %__make %{?_smp_mflags} || %__make
diff --git a/redhat/dependencies/sip4-tqt/sip4-tqt.spec b/redhat/dependencies/sip4-tqt/sip4-tqt.spec
index 7dae151e8..4f4496ad1 100644
--- a/redhat/dependencies/sip4-tqt/sip4-tqt.spec
+++ b/redhat/dependencies/sip4-tqt/sip4-tqt.spec
@@ -80,7 +80,6 @@ BuildRequires:	flex
 %if "%{python}" == ""
 %global python python3
 %endif
-%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}
diff --git a/redhat/docker/el7/packages b/redhat/docker/el7/packages
index 78dd12598..a39c59cdd 100644
--- a/redhat/docker/el7/packages
+++ b/redhat/docker/el7/packages
@@ -218,6 +218,7 @@ usbutils
 valgrind
 wireless-tools-devel
 xine-lib-devel
+xkeyboard-config-devel
 xmlto
 xorg-x11-font-utils
 xscreensaver
diff --git a/redhat/docker/el7/rpmmacros b/redhat/docker/el7/rpmmacros
index e0a64de43..f47c6c067 100644
--- a/redhat/docker/el7/rpmmacros
+++ b/redhat/docker/el7/rpmmacros
@@ -2,3 +2,5 @@
 %_smp_mflags -j8
 %jobs 8
 %cmake %cmake3
+%python python3
+%__python /usr/bin/python3
diff --git a/redhat/docker/el8/Dockerfile.x86_64 b/redhat/docker/el8/Dockerfile.x86_64
index f2e00c95c..2bc43a412 100644
--- a/redhat/docker/el8/Dockerfile.x86_64
+++ b/redhat/docker/el8/Dockerfile.x86_64
@@ -32,6 +32,10 @@ RUN sed -i "rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE
 # Fix utempter detection
 RUN chmod a+r /usr/libexec/utempter/utempter
 
+# Fix python3.6 detection (tdebindings; kvirc)
+RUN ln -sfv python3.6m /usr/include/python3.6 \
+ && ln -sfv python3 /usr/bin/python
+
 # Add non-root user to build packages
 RUN useradd -m -s /bin/bash -u 1000 trinity \
  && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers"
diff --git a/redhat/docker/el8/packages b/redhat/docker/el8/packages
index 06283e94e..38d1c15b6 100644
--- a/redhat/docker/el8/packages
+++ b/redhat/docker/el8/packages
@@ -26,6 +26,8 @@ createrepo_c
 cryptsetup-devel
 cups-devel
 dbus-glib-devel
+djvu-libre
+djvu-libre-devel
 docbook2X
 doxygen
 emacs
@@ -187,8 +189,6 @@ ppp
 psutils
 pulseaudio-libs-devel
 pylibacl
-python2
-python2-devel
 python3
 python3-devel
 python3-pyxattr
@@ -224,6 +224,7 @@ valgrind
 wget
 wireless-tools-devel
 xine-lib-devel
+xkeyboard-config-devel
 xmlto
 xorg-x11-font-utils
 xscreensaver
diff --git a/redhat/docker/el8/rpmmacros b/redhat/docker/el8/rpmmacros
index dc2cb7e68..d2d495cbe 100644
--- a/redhat/docker/el8/rpmmacros
+++ b/redhat/docker/el8/rpmmacros
@@ -3,3 +3,5 @@
 %jobs 8
 %_debugsource_packages %nil
 %_debugsource_template %nil
+%python python3
+%__python /usr/bin/python3
diff --git a/redhat/docker/el9/packages b/redhat/docker/el9/packages
index da83cd4e3..9103ab3c2 100644
--- a/redhat/docker/el9/packages
+++ b/redhat/docker/el9/packages
@@ -27,6 +27,8 @@ createrepo_c
 cryptsetup-devel
 cups-devel
 dbus-glib-devel
+djvu-libre
+djvu-libre-devel
 docbook2X
 doxygen
 emacs
@@ -215,6 +217,7 @@ usbutils
 valgrind
 wget
 xine-lib-devel
+xkeyboard-config-devel
 xmlto
 xorg-x11-server-utils
 xorg-x11-util-macros
diff --git a/redhat/docker/el9/rpmmacros b/redhat/docker/el9/rpmmacros
index a6c71dccc..67367b01a 100644
--- a/redhat/docker/el9/rpmmacros
+++ b/redhat/docker/el9/rpmmacros
@@ -4,3 +4,5 @@
 %__cmake_in_source_build 1
 %_debugsource_packages %nil
 %_debugsource_template %nil
+%python python3
+%__python /usr/bin/python3
diff --git a/redhat/docker/f39/packages b/redhat/docker/f39/packages
index 8f51317f3..4a76d8eeb 100644
--- a/redhat/docker/f39/packages
+++ b/redhat/docker/f39/packages
@@ -232,6 +232,7 @@ usbutils
 valgrind
 xbase-devel
 xine-lib-devel
+xkeyboard-config-devel
 xmedcon
 xmedcon-devel
 xmlto
diff --git a/redhat/docker/f39/rpmmacros b/redhat/docker/f39/rpmmacros
index 206994877..e199a1097 100644
--- a/redhat/docker/f39/rpmmacros
+++ b/redhat/docker/f39/rpmmacros
@@ -8,3 +8,4 @@
 %_debugsource_template %nil
 %source_date_epoch_from_changelog 0
 %python python3
+%__python /usr/bin/python3
diff --git a/redhat/docker/f40/Dockerfile.x86_64 b/redhat/docker/f40/Dockerfile.x86_64
new file mode 100644
index 000000000..3e8ac0557
--- /dev/null
+++ b/redhat/docker/f40/Dockerfile.x86_64
@@ -0,0 +1,41 @@
+FROM fedora:40
+
+ARG TDE_VERSION=14.1.1
+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{,-updates}.repo  -e "1,12s|enabled=0|enabled=1|" -e "s|\$releasever|40|g" \
+ && dnf -y install dnf-plugin-ovl findutils \
+ && dnf -y --enableplugin=ovl install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-40.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 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 https://archives.fedoraproject.org/pub/archive/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/f40/packages b/redhat/docker/f40/packages
new file mode 100644
index 000000000..4a76d8eeb
--- /dev/null
+++ b/redhat/docker/f40/packages
@@ -0,0 +1,242 @@
+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
+less
+libacl-devel
+libblkid-devel
+libcap-devel
+libcdio-devel
+libcdio-paranoia-devel
+libconfig-devel
+libcurl-devel
+libdb-cxx-devel
+libdb-devel
+libdvdread-devel
+libfontenc-devel
+libgadu-devel
+libgpod-devel
+libgsf-devel
+libical-devel
+libidn-devel
+libifp-devel
+liblo-devel
+liblrdf-devel
+libmad-devel
+libmng-devel
+libmp4v2-devel
+libmpcdec-devel
+libmtp-devel
+libmusicbrainz5-devel
+libnjb-devel
+libnsl2-devel
+libofx-devel
+libogg-devel
+libotr-devel
+libpaper-devel
+libpqxx-devel
+libqalculate-devel
+libraw1394-devel
+librsvg2
+librsvg2-tools
+libsamplerate-devel
+libsmbclient-devel
+libsndfile-devel
+libssh-devel
+libssh2-devel
+libtheora-devel
+libtiff-devel
+libtirpc-devel
+libtool
+libtool-ltdl-devel
+libudev-devel
+libudisks2-devel
+libusb-compat-0.1-devel
+libusb1-devel
+libutempter-devel
+libuuid-devel
+libv4l-devel
+libvisual-devel
+libvncserver-devel
+libvorbis-devel
+libwmf-devel
+libwpd-devel
+libXaw-devel
+libXcomposite-devel
+libXdamage-devel
+libXdmcp-devel
+libxkbfile-devel
+libXScrnSaver-devel
+libxslt-devel
+libXtst-devel
+libXv-devel
+libXxf86dga-devel
+libXxf86vm-devel
+libyaz-devel
+libzrtpcpp-devel
+lirc-devel
+lm_sensors-devel
+meanwhile-devel
+mesa-libGL-devel
+mftrace
+mysql-devel
+nas-devel
+neon-devel
+netpbm-progs
+NetworkManager-libnm-devel
+net-snmp-devel
+net-tools
+nspr-devel
+ocaml
+ocaml(compiler)
+ocaml-facile-devel
+OpenEXR-devel
+openldap-devel
+opensc
+openslp-devel
+opensp-devel
+ortp-devel
+pam-devel
+pciutils-devel
+pcre-devel
+pcsc-lite-devel
+pcsc-perl
+perl
+perl-devel
+perl(ExtUtils::MakeMaker)
+perl(PAR::Packer)
+perl(XML::Parser)
+pilot-link-devel
+pkcs11-helper-devel
+pkgconfig(pygtk-2.0)
+polkit-devel
+poppler-devel
+postgresql
+postgresql-private-devel
+postgresql-server-devel
+ppp
+pulseaudio-libs-devel
+python3.11
+python3.11-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
+xkeyboard-config-devel
+xmedcon
+xmedcon-devel
+xmlto
+xorg-x11-font-utils
+xscreensaver
+xscreensaver-extras
+xz-devel
diff --git a/redhat/docker/f40/rpmbuild.repo b/redhat/docker/f40/rpmbuild.repo
new file mode 100644
index 000000000..750290651
--- /dev/null
+++ b/redhat/docker/f40/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/f40/rpmmacros b/redhat/docker/f40/rpmmacros
new file mode 100644
index 000000000..5c930ad58
--- /dev/null
+++ b/redhat/docker/f40/rpmmacros
@@ -0,0 +1,11 @@
+%dist .fc40
+%_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
+%python python3
+%__python /usr/bin/python3.11
diff --git a/redhat/docker/mageia32.sh b/redhat/docker/mageia32.sh
index 29afb4b59..01aa1f672 100755
--- a/redhat/docker/mageia32.sh
+++ b/redhat/docker/mageia32.sh
@@ -3,6 +3,7 @@
 NAME="mageia32"
 VERSION="$1" # E.g: '26'
 IMAGE="${NAME}:${VERSION}"
+TAR="${NAME}-${VERSION}.tar"
 INSTALLROOT="/dev/shm/${IMAGE}"
 
 sudo rm -rf "${INSTALLROOT}"
@@ -12,8 +13,8 @@ setarch i686 sudo urpmi \
   --auto \
   bash vim urpmi mageia-release-common
 
-sudo tar -C "${INSTALLROOT}" -c . >"${IMAGE}.tar"
+sudo tar -C "${INSTALLROOT}" -c . >"${TAR}"
 sudo rm -rf "${INSTALLROOT}"
 
 docker rmi -f "${IMAGE}"
-docker import "${IMAGE}.tar" "${IMAGE}"
+docker import "${TAR}" "${IMAGE}"
diff --git a/redhat/docker/mga9/packages.x86_64 b/redhat/docker/mga9/packages.x86_64
index d0f67751d..21c9a7d60 100644
--- a/redhat/docker/mga9/packages.x86_64
+++ b/redhat/docker/mga9/packages.x86_64
@@ -193,6 +193,7 @@ nas-devel
 neon-devel
 netpbm
 net-snmp-devel
+net-tools
 notification-daemon
 ocaml
 ocaml-facile-devel
diff --git a/redhat/docker/mga9/rpmmacros b/redhat/docker/mga9/rpmmacros
index a92be537d..e0f078bca 100644
--- a/redhat/docker/mga9/rpmmacros
+++ b/redhat/docker/mga9/rpmmacros
@@ -6,3 +6,5 @@
 %_debugsource_packages %nil
 %_debugsource_template %nil
 %_vpath_builddir .
+%python python3
+%__python /usr/bin/python3
diff --git a/redhat/docker/oss155/Dockerfile.x86_64 b/redhat/docker/oss155/Dockerfile.x86_64
index 8bc7e0bef..11162caaf 100644
--- a/redhat/docker/oss155/Dockerfile.x86_64
+++ b/redhat/docker/oss155/Dockerfile.x86_64
@@ -30,7 +30,7 @@ RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
  && 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.5/repo/oss/src/libheimdal-7.8.0-bp155.2.3.src.rpm \
+RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/distribution/leap/15.5/repo/oss/src/libheimdal-7.8.0-bp155.2.7.src.rpm \
  && wget -nv -O "${HOME}/rpmbuild/SOURCES/heimdal-7.8.0.tar.gz" "https://github.com/heimdal/heimdal/releases/download/heimdal-7.8.0/heimdal-7.8.0.tar.gz" \
  && sed -i "${HOME}/rpmbuild/SPECS/libheimdal.spec" -e "/^Source0:/ s|.*|Source0: heimdal-7.8.0.tar.gz|" -e "/^Patch0/ s|^|#|" \
  && rpmbuild -bc ${HOME}/rpmbuild/SPECS/libheimdal.spec \
diff --git a/redhat/docker/oss155/rpmmacros b/redhat/docker/oss155/rpmmacros
index 3a9593ace..7fe3f58e6 100644
--- a/redhat/docker/oss155/rpmmacros
+++ b/redhat/docker/oss155/rpmmacros
@@ -3,3 +3,5 @@
 %jobs 8
 %sle_version 150500
 %_build_insert_debug_package %nil
+%python python3
+%__python /usr/bin/python3
diff --git a/redhat/docker/osstw/Dockerfile.i686 b/redhat/docker/osstw/Dockerfile.i686
index 9c445bffe..6908d881d 100644
--- a/redhat/docker/osstw/Dockerfile.i686
+++ b/redhat/docker/osstw/Dockerfile.i686
@@ -26,14 +26,14 @@ RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
  && 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/tumbleweed/repo/oss/src/libheimdal-7.8.0-3.4.src.rpm \
+RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/libheimdal-7.8.0-3.5.src.rpm \
  && wget -nv -O "${HOME}/rpmbuild/SOURCES/heimdal-7.8.0.tar.gz" "https://github.com/heimdal/heimdal/releases/download/heimdal-7.8.0/heimdal-7.8.0.tar.gz" \
  && sed -i "${HOME}/rpmbuild/SPECS/libheimdal.spec" -e "/^Source0:/ s|.*|Source0: heimdal-7.8.0.tar.gz|" -e "/^Patch0/ s|^|#|" \
  && setarch ${ARCH} rpmbuild -bc ${HOME}/rpmbuild/SPECS/libheimdal.spec \
  && sudo make -C ${HOME}/rpmbuild/BUILD/heimdal-7.8.0/tools/ install
 
 # Add lilypond (i686 only)
-RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/lilypond-2.24.3-1.1.src.rpm \
+RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/lilypond-2.24.3-1.5.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,-emmentaler-fonts}"-2"*".rpm"
diff --git a/redhat/docker/osstw/Dockerfile.x86_64 b/redhat/docker/osstw/Dockerfile.x86_64
index 07873cdb7..71fe6b7e5 100644
--- a/redhat/docker/osstw/Dockerfile.x86_64
+++ b/redhat/docker/osstw/Dockerfile.x86_64
@@ -26,8 +26,10 @@ RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
  && 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/tumbleweed/repo/oss/src/libheimdal-7.8.0-3.4.src.rpm \
+RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/libheimdal-7.8.0-3.5.src.rpm \
  && wget -nv -O "${HOME}/rpmbuild/SOURCES/heimdal-7.8.0.tar.gz" "https://github.com/heimdal/heimdal/releases/download/heimdal-7.8.0/heimdal-7.8.0.tar.gz" \
  && sed -i "${HOME}/rpmbuild/SPECS/libheimdal.spec" -e "/^Source0:/ s|.*|Source0: heimdal-7.8.0.tar.gz|" -e "/^Patch0/ s|^|#|" \
+ && export ac_cv_sys_large_files=no \
+ && export ac_cv_sys_file_offset_bits=no \
  && rpmbuild -bc ${HOME}/rpmbuild/SPECS/libheimdal.spec \
  && sudo make -C ${HOME}/rpmbuild/BUILD/heimdal-7.8.0/tools/ install
diff --git a/redhat/docker/osstw/rpmmacros b/redhat/docker/osstw/rpmmacros
index 174b79fb3..37788e61e 100644
--- a/redhat/docker/osstw/rpmmacros
+++ b/redhat/docker/osstw/rpmmacros
@@ -1,4 +1,5 @@
 %dist .osstw
 %_smp_mflags -j8
 %jobs 8
+%python python3
 %__python %__python3
diff --git a/redhat/docker/pclinuxos.sh b/redhat/docker/pclinuxos.sh
index 1b428daf0..42ab539cc 100755
--- a/redhat/docker/pclinuxos.sh
+++ b/redhat/docker/pclinuxos.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -ex
 
 NAME="pclinuxos"
-VERSION="${1:-2023}" # E.g: '2020'
+VERSION="${1:-2024}" # E.g: '2020'
 IMAGE="${NAME}:${VERSION}"
 INSTALLROOT="/dev/shm/${IMAGE}"
 
diff --git a/redhat/docker/pclinuxos/Dockerfile.x86_64 b/redhat/docker/pclinuxos/Dockerfile.x86_64
index 10bb88882..8c5e5dc91 100644
--- a/redhat/docker/pclinuxos/Dockerfile.x86_64
+++ b/redhat/docker/pclinuxos/Dockerfile.x86_64
@@ -1,4 +1,4 @@
-FROM pclinuxos:2023
+FROM pclinuxos:2024
 
 ARG TDE_VERSION=14.1.1
 ARG ARCH=x86_64
@@ -26,8 +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 \
- && ln -sf /usr/lib64/libglvnd/libGL.so /usr/lib64/libGL.so
+ && genla.sh libusb-1.0 && mv /usr/lib64/libusb-1.0.la /lib64 && cp /lib64/libusb-1.0.la /lib64/libusb.la
 
 # Add non-root user to build packages
 RUN rm -rf /home/trinity \
diff --git a/redhat/docker/pclinuxos/rpmmacros b/redhat/docker/pclinuxos/rpmmacros
index a8b78eb0d..5c9fcc2e4 100644
--- a/redhat/docker/pclinuxos/rpmmacros
+++ b/redhat/docker/pclinuxos/rpmmacros
@@ -3,3 +3,5 @@
 %jobs 8
 %pclinuxos 2022
 %configure %configure2_5x
+%python python3
+%__python /usr/bin/python3
diff --git a/redhat/extras/htdig/htdig.spec b/redhat/extras/htdig/htdig.spec
index dab280946..8e9d108e5 100644
--- a/redhat/extras/htdig/htdig.spec
+++ b/redhat/extras/htdig/htdig.spec
@@ -204,6 +204,10 @@ autoreconf -fiv
     --with-apache=/usr/sbin/httpd \
     --with-zlib=%{_prefix}
 
+%if 0%{fedora} == 40
+echo "#define HAVE_SHMGET 1" >>"db/db_config.h"
+%endif
+
 %__make %{?_smp_mflags}
 mv htdoc/ChangeLog .
 
diff --git a/redhat/extras/pinentry-tqt/pinentry-tqt.spec b/redhat/extras/pinentry-tqt/pinentry-tqt.spec
index 08e2085ed..4dcf1907c 100644
--- a/redhat/extras/pinentry-tqt/pinentry-tqt.spec
+++ b/redhat/extras/pinentry-tqt/pinentry-tqt.spec
@@ -17,7 +17,7 @@
 
 
 Name:		pinentry-tqt
-Version:	1.2.1
+Version:	1.3.0
 Release:	1%{?dist}
 Summary:	PIN or passphrase entry dialogs
 Group:		System/Libraries
diff --git a/redhat/extras/trinity-desktop/trinity-desktop.spec b/redhat/extras/trinity-desktop/trinity-desktop.spec
index ab14d4d9d..5fb0923ad 100644
--- a/redhat/extras/trinity-desktop/trinity-desktop.spec
+++ b/redhat/extras/trinity-desktop/trinity-desktop.spec
@@ -212,6 +212,7 @@ Requires: trinity-tde-style-domino
 Requires: trinity-tde-style-ia-ora
 Requires: trinity-tde-style-lipstik
 Requires: trinity-tde-style-qtcurve
+Requires: trinity-tde-style-polyester
 Requires: trinity-tde-systemsettings
 Requires: trinity-tdedocker
 %if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora} || 0%{?rhel} >= 7
@@ -237,6 +238,7 @@ Requires: trinity-tellico
 Requires: trinity-tork
 Requires: trinity-twin-style-crystal
 Requires: trinity-twin-style-dekorator
+Requires: trinity-twin-style-fahrenheit
 Requires: trinity-twin-style-machbunt
 Requires: trinity-twin-style-suse2
 Requires: trinity-wlassistant
diff --git a/redhat/libraries/libksquirrel/libksquirrel.spec b/redhat/libraries/libksquirrel/libksquirrel.spec
index 793027459..fff871761 100644
--- a/redhat/libraries/libksquirrel/libksquirrel.spec
+++ b/redhat/libraries/libksquirrel/libksquirrel.spec
@@ -108,17 +108,17 @@ BuildRequires:	libungif-devel
 BuildRequires: libmng-devel
 
 # DJVU support
-%if 0%{?fedora} || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
 %define with_djvu 1
 BuildRequires:	djvulibre
 %endif
 
 # XMEDCON support
-%if 0%{?fedora}
-%define with_xmedcon 1
-BuildRequires:	xmedcon
-BuildRequires:	xmedcon-devel
-%endif
+#if 0%{?fedora}
+#define with_xmedcon 1
+#BuildRequires:	xmedcon
+#BuildRequires:	xmedcon-devel
+#endif
 
 # RSVG support
 %if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
@@ -578,6 +578,7 @@ fi
   -DWITH_GCC_VISIBILITY=ON \
   \
   -DBUILD_ALL=ON \
+  -DBUILD_DICOM=OFF \
   -DBUILD_PICT=OFF \
   ..