150 files changed, 2560 insertions, 1042 deletions

diff --git a/redhat/applications/kdbg/kdbg.spec b/redhat/applications/development/kdbg/kdbg.spec
index 33fe3e918..f15f9e9d5 100644
--- a/redhat/applications/kdbg/kdbg.spec
+++ b/redhat/applications/development/kdbg/kdbg.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kdbg
 %define tde_prefix /opt/trinity
@@ -63,7 +63,8 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires: libtool m4
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -113,33 +114,38 @@ Features include the following:
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
 
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
-export kde_confdir="%{tde_confdir}"
-
-# Warning: --enable-final causes FTBFS
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --docdir=%{tde_tdedocdir} \
-  --libdir=%{tde_libdir} \
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+  -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GCC_VISIBILITY=ON \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --disable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
+  -DBUILD_ALL=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_TRANSLATIONS=ON \
+  ..
 
 %__make %{?_smp_mflags} || %__make
 
@@ -147,7 +153,7 @@ export kde_confdir="%{tde_confdir}"
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
 
 %find_lang %{tde_pkg}
 
@@ -167,6 +173,7 @@ export PATH="%{tde_bindir}:${PATH}"
 %lang(ru) %{tde_tdedocdir}/HTML/ru/kdbg/
 %{tde_datadir}/icons/hicolor/*/apps/kdbg.png
 %{tde_datadir}/icons/locolor/*/apps/kdbg.png
+%{tde_mandir}/man1/kdbg.*
 
 
 %changelog
diff --git a/redhat/applications/kdiff3/kdiff3.spec b/redhat/applications/development/kdiff3/kdiff3.spec
index f3cbd4f95..7b901eb50 100644
--- a/redhat/applications/kdiff3/kdiff3.spec
+++ b/redhat/applications/development/kdiff3/kdiff3.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kdiff3
 %define tde_prefix /opt/trinity
@@ -60,7 +60,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -116,6 +116,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/kpicosim/kpicosim.spec b/redhat/applications/development/kpicosim/kpicosim.spec
index 680a59420..be5aabf54 100644
--- a/redhat/applications/kpicosim/kpicosim.spec
+++ b/redhat/applications/development/kpicosim/kpicosim.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kpicosim
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	cmake
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -120,6 +120,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -159,7 +160,7 @@ fi
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README
+%doc AUTHORS ChangeLog COPYING README.md
 %{tde_bindir}/kpicosim
 %{tde_tdeappdir}/kpicosim.desktop
 %{tde_datadir}/apps/katepart/syntax/psm.xml
diff --git a/redhat/applications/kscope/kscope.spec b/redhat/applications/development/kscope/kscope.spec
index 0d125e093..ff4a09b2c 100644
--- a/redhat/applications/kscope/kscope.spec
+++ b/redhat/applications/development/kscope/kscope.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kscope
 %define tde_prefix /opt/trinity
@@ -63,7 +63,7 @@ BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 Requires:		cscope
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -123,45 +123,48 @@ Main Features:
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
 
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+# Warning: GCC visibility causes FTBFS [Bug #1285]
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
-  
-%__make %{?_smp_mflags}
+  -DWITH_ALL_OPTIONS=ON \
+  -DBUILD_ALL=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
 
 
 %install
 %__rm -rf $RPM_BUILD_ROOT
-%__make install DESTDIR=$RPM_BUILD_ROOT
+%__make install DESTDIR=$RPM_BUILD_ROOT -C build
 
 %find_lang %{tde_pkg}
 
-# Move desktop icon to correct location
-%__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
-%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}"
-
 # Updates applications categories for openSUSE
 %if 0%{?suse_version}
 %suse_update_desktop_file %{tde_pkg} Development IDE
@@ -174,13 +177,14 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README ChangeLog
+%doc AUTHORS COPYING README.md ChangeLog
 %{tde_bindir}/kscope
 %{tde_tdeappdir}/kscope.desktop
 %{tde_datadir}/apps/kscope/
 %{tde_tdedocdir}/HTML/en/kscope/
 %{tde_datadir}/icons/hicolor/*/apps/kscope.png
 %{tde_datadir}/icons/locolor/*/apps/kscope.png
+%{tde_mandir}/man1/kscope.1*
 
 
 %changelog
diff --git a/redhat/applications/ktechlab/ktechlab.spec b/redhat/applications/development/ktechlab/ktechlab.spec
index 94c5348a9..2e4c66048 100644
--- a/redhat/applications/ktechlab/ktechlab.spec
+++ b/redhat/applications/development/ktechlab/ktechlab.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg ktechlab
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -101,47 +101,45 @@ Homepage: http://ktechlab.org/
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
 
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 
-# Warning: --enable-final causes FTBFS
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --disable-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
+  -DBUILD_ALL=ON \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GPSIM=OFF \
+  ..
 
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
 
 
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
 
 %find_lang %{tde_pkg}
 
-%__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
-%__mv -f "%{?buildroot}%{tde_datadir}/applnk/Development/ktechlab.desktop" "%{?buildroot}%{tde_tdeappdir}"
-%__rm -rf "%{?buildroot}%{tde_datadir}/applnk"
-
 # Updates applications categories for openSUSE
 %if 0%{?suse_version}
 %suse_update_desktop_file -r -n ktechlab Science Math
@@ -166,6 +164,8 @@ export PATH="%{tde_bindir}:${PATH}"
 %{tde_datadir}/mimelnk/application/x-flowcode.desktop
 %{tde_datadir}/mimelnk/application/x-ktechlab.desktop
 %{tde_datadir}/mimelnk/application/x-microbe.desktop
+%{tde_mandir}/man1/ktechlab.1*
+%{tde_mandir}/man1/microbe.1*
 
 
 %changelog
diff --git a/redhat/applications/kxmleditor/kxmleditor.spec b/redhat/applications/development/kxmleditor/kxmleditor.spec
index 229e674ec..4635ee43f 100644
--- a/redhat/applications/kxmleditor/kxmleditor.spec
+++ b/redhat/applications/development/kxmleditor/kxmleditor.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kxmleditor
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -76,8 +76,6 @@ BuildRequires:	update-desktop-files
 BuildRequires:	brp-check-trinity
 %endif
 
-Requires:		mplayer
-
 
 %description
 KXML Editor is a simple program, that displays and edits the contents of an
@@ -110,6 +108,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -131,10 +130,6 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %find_lang %{tde_pkg}
 
-# Move desktop icon to correct location
-%__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
-%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}"
-
 # Updates applications categories for openSUSE
 %if 0%{?suse_version}
 %suse_update_desktop_file -G "XML Editor" -r "%{tde_pkg}" Utility Editor
diff --git a/redhat/applications/piklab/piklab.spec b/redhat/applications/development/piklab/piklab.spec
index 7dae16d60..86906fb80 100644
--- a/redhat/applications/piklab/piklab.spec
+++ b/redhat/applications/development/piklab/piklab.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg piklab
 %define tde_prefix /opt/trinity
@@ -84,7 +84,12 @@ BuildRequires:	readline-devel
 BuildRequires:  %{_lib}usb1.0-devel
 BuildRequires:  %{_lib}usb-compat0.1-devel
 %else
-BuildRequires:  libusb-devel
+%if 0%{?fedora} >= 37
+BuildRequires:	libusb1-devel
+BuildRequires:	libusb-compat-0.1-devel
+%else
+BuildRequires:	libusb-devel
+%endif
 %endif
 
 
diff --git a/redhat/applications/tdesvn/tdesvn.spec b/redhat/applications/development/tdesvn/tdesvn.spec
index a816cfdb1..6813b17ad 100644
--- a/redhat/applications/tdesvn/tdesvn.spec
+++ b/redhat/applications/development/tdesvn/tdesvn.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tdesvn
 %define tde_prefix /opt/trinity
@@ -60,7 +60,8 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake libtool
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires: libtool
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -90,7 +91,7 @@ BuildRequires:	libidn-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gamin 1
 BuildRequires:	gamin-devel
 %endif
@@ -266,6 +267,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/knights/knights.spec b/redhat/applications/games/knights/knights.spec
index f2ffb27af..d5177c358 100644
--- a/redhat/applications/knights/knights.spec
+++ b/redhat/applications/games/knights/knights.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg knights
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -131,6 +131,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/tdepacman/tdepacman.spec b/redhat/applications/games/tdepacman/tdepacman.spec
index 53be48778..59269b25a 100644
--- a/redhat/applications/tdepacman/tdepacman.spec
+++ b/redhat/applications/games/tdepacman/tdepacman.spec
@@ -18,7 +18,7 @@
 # Default version for this component
 %define tde_pkg tdepacman
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 
 # TDE specific building variables
@@ -66,7 +66,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	cmake
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -103,6 +103,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -131,7 +132,7 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
+%doc AUTHORS ChangeLog COPYING README.md TODO
 %{tde_bindir}/tdepacman
 %{tde_tdeappdir}/tdepacman.desktop
 %{tde_datadir}/apps/tdepacman/
diff --git a/redhat/applications/digikam/digikam-open_in_digikam.desktop b/redhat/applications/graphics/digikam/digikam-open_in_digikam.desktop
index ddf7f93b4..ddf7f93b4 100644
--- a/redhat/applications/digikam/digikam-open_in_digikam.desktop
+++ b/redhat/applications/graphics/digikam/digikam-open_in_digikam.desktop
diff --git a/redhat/applications/digikam/digikam.spec b/redhat/applications/graphics/digikam/digikam.spec
index 9e318e179..d24f6e1af 100644
--- a/redhat/applications/digikam/digikam.spec
+++ b/redhat/applications/graphics/digikam/digikam.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg digikam
 %define tde_prefix /opt/trinity
@@ -308,9 +308,7 @@ Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %lang(nl) %{tde_tdedocdir}/HTML/nl/digikam/
 %lang(nl) %{tde_tdedocdir}/HTML/nl/showfoto/
 %lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/digikam/
-#lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/showfoto/
 %lang(ru) %{tde_tdedocdir}/HTML/ru/digikam/
-#lang(ru) %{tde_tdedocdir}/HTML/ru/showfoto/
 %lang(sv) %{tde_tdedocdir}/HTML/sv/digikam/
 %lang(sv) %{tde_tdedocdir}/HTML/sv/showfoto/
 
diff --git a/redhat/applications/gwenview-i18n/gwenview-i18n.spec b/redhat/applications/graphics/gwenview-i18n/gwenview-i18n.spec
index 08f95f29c..a44800bfe 100644
--- a/redhat/applications/gwenview-i18n/gwenview-i18n.spec
+++ b/redhat/applications/graphics/gwenview-i18n/gwenview-i18n.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg gwenview-i18n
 %define tde_prefix /opt/trinity
@@ -66,7 +66,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	cmake
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
diff --git a/redhat/applications/gwenview/gwenview.spec b/redhat/applications/graphics/gwenview/gwenview.spec
index 1003d3d49..d821cf0ae 100644
--- a/redhat/applications/gwenview/gwenview.spec
+++ b/redhat/applications/graphics/gwenview/gwenview.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg gwenview
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/ksquirrel/ksquirrel.spec b/redhat/applications/graphics/ksquirrel/ksquirrel.spec
index be4dd8f8a..858682933 100644
--- a/redhat/applications/ksquirrel/ksquirrel.spec
+++ b/redhat/applications/graphics/ksquirrel/ksquirrel.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg ksquirrel
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/kuickshow/kuickshow.spec b/redhat/applications/graphics/kuickshow/kuickshow.spec
index 7a6409f6e..ec3d708ab 100644
--- a/redhat/applications/kuickshow/kuickshow.spec
+++ b/redhat/applications/graphics/kuickshow/kuickshow.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kuickshow
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/potracegui/potracegui.spec b/redhat/applications/graphics/potracegui/potracegui.spec
index 40628271b..6350a6d5e 100644
--- a/redhat/applications/potracegui/potracegui.spec
+++ b/redhat/applications/graphics/potracegui/potracegui.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg potracegui
 %define tde_prefix /opt/trinity
@@ -60,7 +60,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -120,6 +120,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -158,7 +159,7 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README
+%doc AUTHORS ChangeLog COPYING README.md
 %{tde_bindir}/potracegui
 %{tde_tdeappdir}/potracegui.desktop
 %{tde_datadir}/apps/potracegui/
diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh b/redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh
deleted file mode 120000
index 0c82b8b5f..000000000
--- a/redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../ubuntu/xenial/applications/gtk-qt-engine/debian/gtk-qt-engine.rc.sh
\ No newline at end of file
diff --git a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde4 b/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde4
deleted file mode 120000
index f71a6795b..000000000
--- a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde4
+++ /dev/null
@@ -1 +0,0 @@
-../../../ubuntu/xenial/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4
\ No newline at end of file
diff --git a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4 b/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4
deleted file mode 120000
index 8e006a46b..000000000
--- a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4
+++ /dev/null
@@ -1 +0,0 @@
-../../../ubuntu/xenial/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde4
\ No newline at end of file
diff --git a/redhat/applications/kasablanca/kasablanca.spec b/redhat/applications/internet/kasablanca/kasablanca.spec
index 8d1c35d58..bd2eeef62 100644
--- a/redhat/applications/kasablanca/kasablanca.spec
+++ b/redhat/applications/internet/kasablanca/kasablanca.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kasablanca
 %define tde_prefix /opt/trinity
@@ -63,7 +63,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext 
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -139,6 +139,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -177,7 +178,7 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README
+%doc AUTHORS ChangeLog COPYING README.md
 %{tde_bindir}/kasablanca
 %{tde_datadir}/apps/kasablanca/
 %{tde_datadir}/config.kcfg/kbconfig.kcfg
diff --git a/redhat/applications/kbiff/kbiff.spec b/redhat/applications/internet/kbiff/kbiff.spec
index 4df376b6c..2e858f385 100644
--- a/redhat/applications/kbiff/kbiff.spec
+++ b/redhat/applications/internet/kbiff/kbiff.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kbiff
 %define tde_prefix /opt/trinity
@@ -64,7 +64,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -122,6 +122,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -160,7 +161,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kbiff.desktop"
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README ChangeLog
+%doc AUTHORS COPYING README.md ChangeLog
 %{tde_bindir}/kbiff
 %{tde_libdir}/libtdeinit_kbiff.la
 %{tde_libdir}/libtdeinit_kbiff.so
diff --git a/redhat/applications/kftpgrabber/kftpgrabber.spec b/redhat/applications/internet/kftpgrabber/kftpgrabber.spec
index 256ea066f..c3bd78a21 100644
--- a/redhat/applications/kftpgrabber/kftpgrabber.spec
+++ b/redhat/applications/internet/kftpgrabber/kftpgrabber.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kftpgrabber
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -124,38 +124,41 @@ Requires: 	%{name} = %{version}-%{release}
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
 
 %build
 unset QTDIR QTINC QTDIR
 export PATH="%{tde_bindir}:${PATH}"
 
-# Warning: --enable-final causes FTBFS
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --disable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
-  
-%__make %{?_smp_mflags}
+  -DWITH_ALL_OPTIONS=ON \
+  -DBUILD_ALL=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
 
 
 %install
 %__rm -rf $RPM_BUILD_ROOT
-%__make install DESTDIR=$RPM_BUILD_ROOT
+%__make install DESTDIR=$RPM_BUILD_ROOT -C build
 
 %find_lang %{tde_pkg}
 
@@ -166,7 +169,7 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README ChangeLog
+%doc AUTHORS COPYING README.md ChangeLog
 %{tde_bindir}/kftpgrabber
 %{tde_libdir}/libkftpinterfaces.so.0
 %{tde_libdir}/libkftpinterfaces.so.0.0.0
@@ -188,6 +191,7 @@ export PATH="%{tde_bindir}:${PATH}"
 %{tde_datadir}/services/kftpimportplugin_ncftp.desktop
 %{tde_datadir}/servicetypes/kftpbookmarkimportplugin.desktop
 %{tde_tdedocdir}/HTML/en/kftpgrabber/
+%{tde_mandir}/man1/kftpgrabber.1*
 
 
 %files devel
diff --git a/redhat/applications/knmap/knmap.spec b/redhat/applications/internet/knmap/knmap.spec
index 411f29a30..b8ae3d2ec 100644
--- a/redhat/applications/knmap/knmap.spec
+++ b/redhat/applications/internet/knmap/knmap.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg knmap
 %define tde_prefix /opt/trinity
@@ -62,7 +62,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -133,6 +133,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -177,7 +178,7 @@ fi
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README ChangeLog
+%doc AUTHORS COPYING README.md ChangeLog
 %{tde_bindir}/knmap
 %{tde_tdeappdir}/knmap.desktop
 %{tde_datadir}/apps/knmap/
diff --git a/redhat/applications/konversation/konversation.spec b/redhat/applications/internet/konversation/konversation.spec
index cb80acee6..c5ba96312 100644
--- a/redhat/applications/konversation/konversation.spec
+++ b/redhat/applications/internet/konversation/konversation.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg konversation
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -74,6 +74,23 @@ BuildRequires:	libidn-devel
 # OPENSSL support
 BuildRequires:	openssl-devel
 
+# PYTHON support
+%if 0%{?sle_version} >= 150400 || 0%{?rhel} >= 9
+%define with_python 0
+%global __python %__python3
+%else
+%define with_python 1
+%if 0%{?rhel} == 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 8
+%global python python2
+%global __python %__python2
+%global python_sitearch %{python2_sitearch}
+%else
+%global python python
+%endif
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+BuildRequires:	%{python}
+BuildRequires:	%{python}-devel
+%endif
 
 # SUSE desktop files utility
 %if 0%{?suse_version}
@@ -109,7 +126,8 @@ BuildRequires:	libXi6-devel
 #  RHEL 5: available in centos-extras
 #  RHEL 6: available in EPEL
 #  RHEL 7: available in NUX
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?suse_version}
+#  RHEL 8: available in EPEL
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || ( 0%{?rhel} >= 5 && 0%{?rhel} <= 8 ) || 0%{?suse_version}
 %define with_xscreensaver 1
 
 %if 0%{?fedora} || 0%{?rhel} >= 5
@@ -139,7 +157,9 @@ BuildRequires:	%{_lib}xscrnsaver%{?mgaversion:1}-devel
 %endif
 BuildRequires:	xscreensaver
 BuildRequires:	xscreensaver-base
+%if 0%{?pclinuxos} == 0
 BuildRequires:	xscreensaver-extrusion
+%endif
 BuildRequires:	xscreensaver-gl
 %endif
 %endif
@@ -179,7 +199,7 @@ and experienced users alike will appreciate its many features:
 %if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?mgaversion} >= 8
 %__sed -i "konversation/scripts/media" \
           "konversation/scripts/weather" \
-  -e "s|/usr/bin/env python|/usr/bin/env python2|"
+  -e "s|/usr/bin/env python|/usr/bin/env %{python}|"
 %endif
 
 
@@ -198,6 +218,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/kopete-otr/kopete-otr.spec b/redhat/applications/internet/kopete-otr/kopete-otr.spec
index bcfdb4487..aa019adc3 100644
--- a/redhat/applications/kopete-otr/kopete-otr.spec
+++ b/redhat/applications/internet/kopete-otr/kopete-otr.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kopete-otr
 %define tde_prefix /opt/trinity
@@ -68,7 +68,7 @@ BuildRequires:	trinity-tdenetwork-devel >= %{tde_version}
 # Kopete is provided by tdenetwork
 Requires:		trinity-kopete >= %{tde_version}
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -104,39 +104,47 @@ users with IM-Cients supporting the OTR encryption method.
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
 
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DCMAKE_LIBRARY_PATH=%{tde_libdir} \
+  -DKOPETE_INCLUDE_DIR=%{tde_tdeincludedir}/kopete \
+  \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
+  -DBUILD_ALL=ON \
+  -DWITH_ALL_OPTIONS=ON \
+  ..
 
-%__make %{_smp_mflags} || %__make
+%__make %{?_smp_mflags} || %__make
 
 
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
 
 # Unwanted files
 %__rm -f %{?buildroot}%{tde_libdir}/libkotr.so
@@ -150,7 +158,7 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %files -f kopete_otr.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
+%doc AUTHORS COPYING README.md
 %{tde_libdir}/libkotr.la
 %{tde_libdir}/libkotr.so.0
 %{tde_libdir}/libkotr.so.0.0.0
diff --git a/redhat/applications/kshowmail/kshowmail.spec b/redhat/applications/internet/kshowmail/kshowmail.spec
index 5dae2bc42..3f22687a7 100644
--- a/redhat/applications/kshowmail/kshowmail.spec
+++ b/redhat/applications/internet/kshowmail/kshowmail.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kshowmail
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	trinity-tdepim-devel >= %{tde_version}
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -118,6 +118,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -160,7 +161,7 @@ install -D -m 644 "pics/kshowmail.png"          "$RPM_BUILD_ROOT%{tde_datadir}/i
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README ChangeLog
+%doc AUTHORS COPYING README.md ChangeLog
 %{tde_bindir}/kshowmail
 %{tde_tdelibdir}/kcm_kshowmailconfigaccounts.la
 %{tde_tdelibdir}/kcm_kshowmailconfigaccounts.so
diff --git a/redhat/applications/kstreamripper/kstreamripper.spec b/redhat/applications/internet/kstreamripper/kstreamripper.spec
index b4eda9a91..e56b828b7 100644
--- a/redhat/applications/kstreamripper/kstreamripper.spec
+++ b/redhat/applications/internet/kstreamripper/kstreamripper.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kstreamripper
 %define tde_prefix /opt/trinity
@@ -75,7 +75,7 @@ BuildRequires:	update-desktop-files
 BuildRequires:	brp-check-trinity
 %endif
 
-BuildRequires:	cmake
+BuildRequires:	trinity-cmake >= %{tde_version}
 
 
 %description
@@ -113,6 +113,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/ktorrent/ktorrent.spec b/redhat/applications/internet/ktorrent/ktorrent.spec
index 9a2b241b7..c48835a15 100644
--- a/redhat/applications/ktorrent/ktorrent.spec
+++ b/redhat/applications/internet/ktorrent/ktorrent.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg ktorrent
 %define tde_prefix /opt/trinity
@@ -214,6 +214,7 @@ export PATH="%{tde_bindir}:${PATH}"
 %{tde_tdelibdir}/ktzeroconfplugin.la
 %{tde_tdelibdir}/ktzeroconfplugin.so
 %endif
+%{tde_mandir}/man1/ktorrent.1*
 
 
 %changelog
diff --git a/redhat/applications/kvirc/kvirc.spec b/redhat/applications/internet/kvirc/kvirc.spec
index 8761a4a6f..3df715e34 100644
--- a/redhat/applications/kvirc/kvirc.spec
+++ b/redhat/applications/internet/kvirc/kvirc.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kvirc
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/kvpnc/kvpnc.spec b/redhat/applications/internet/kvpnc/kvpnc.spec
index 94bb3de8b..e38a97b74 100644
--- a/redhat/applications/kvpnc/kvpnc.spec
+++ b/redhat/applications/internet/kvpnc/kvpnc.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kvpnc
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -126,6 +126,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -159,7 +160,7 @@ export PATH="%{_bindir}:${PATH}"
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
+%doc AUTHORS ChangeLog COPYING README.md TODO
 %{tde_bindir}/kvpnc
 %{tde_tdeappdir}/kvpnc.desktop
 %{tde_datadir}/apps/kvpnc/
@@ -169,6 +170,7 @@ export PATH="%{_bindir}:${PATH}"
 %lang(sv) %{tde_datadir}/doc/tde/HTML/sv/kvpnc/
 %{tde_datadir}/icons/hicolor/*/apps/kvpnc.png
 %{tde_datadir}/icons/locolor/*/apps/kvpnc.png
+%{tde_docdir}/kvpnc/
 %{tde_tdedocdir}/HTML/en/tdeioslave/pcf/
 %{tde_datadir}/services/pcf.protocol
 %{tde_mandir}/man1/*.1*
diff --git a/redhat/applications/smb4k/smb4k.spec b/redhat/applications/internet/smb4k/smb4k.spec
index 83f5c4f20..449801a12 100644
--- a/redhat/applications/smb4k/smb4k.spec
+++ b/redhat/applications/internet/smb4k/smb4k.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg smb4k
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/tork/tork.spec b/redhat/applications/internet/tork/tork.spec
index 034726821..04207d15a 100644
--- a/redhat/applications/tork/tork.spec
+++ b/redhat/applications/internet/tork/tork.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tork
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	trinity-tdepim-devel >= %{tde_version}
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -82,6 +82,15 @@ BuildRequires:	torsocks
 # OPENSSL support
 BuildRequires:	openssl-devel
 
+# GEOIP
+%if 0%{?suse_version}
+%if 0%{?suse_version} < 1550
+BuildRequires:	libGeoIP-devel
+%endif
+%else
+BuildRequires:	geoip-devel
+%endif
+
 
 %description
 TorK is an Anonymity Manager for the TDE Desktop. Browse anonymously on 
@@ -100,39 +109,41 @@ on the Tor network.
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
 
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 
-# NOTICE: --enable-final causes FTBFS !
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --mandir=%{tde_mandir} \
-  --program-prefix="" \
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --disable-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
-  
+  -DBUILD_ALL=ON \
+  -DWITH_ALL_OPTIONS=ON \
+  \
+  ..
+
 %__make %{?_smp_mflags}
 
 
 %install
 %__rm -rf $RPM_BUILD_ROOT
-%__make install DESTDIR=$RPM_BUILD_ROOT
+%__make install DESTDIR=$RPM_BUILD_ROOT -C build
 
 %find_lang %{tde_pkg}
 
@@ -143,10 +154,20 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README TODO ChangeLog USINGTORK
+%doc AUTHORS ChangeLog COPYING README.md TODO USINGTORK
 %{tde_bindir}/tork
 %{tde_bindir}/torkarkollon
 %{tde_bindir}/usewithtor
+%{tde_tdelibdir}/kickermenu_tork.la
+%{tde_tdelibdir}/kickermenu_tork.so
+%{tde_tdelibdir}/tdehtml_tork.la
+%{tde_tdelibdir}/tdehtml_tork.so
+%{tde_tdelibdir}/tdeio_torioslave.la
+%{tde_tdelibdir}/tdeio_torioslave.so
+%{tde_tdeappdir}/tork_plug_in.desktop
+%{tde_datadir}/apps/kicker/menuext/torkmenu.desktop
+%{tde_datadir}/apps/tdehtml/kpartplugins/tork_plug_in.rc
+%{tde_datadir}/services/torioslave.protocol
 %{tde_tdeappdir}/tork.desktop
 %{tde_datadir}/apps/konqueror/servicemenus/tork_downloadwithfirefox.desktop
 %{tde_datadir}/apps/konqueror/servicemenus/tork_downloadwithkonqueror.desktop
@@ -154,7 +175,6 @@ export PATH="%{tde_bindir}:${PATH}"
 %{tde_datadir}/apps/tork/
 %{tde_datadir}/config.kcfg/torkconfig.kcfg
 %{tde_tdedocdir}/HTML/en/tork/
-%{tde_datadir}/icons/hicolor/*/actions/tork.png
 %{tde_datadir}/icons/hicolor/*/apps/tork.png
 %dir %{tde_datadir}/menu
 %{tde_datadir}/menu/tork
diff --git a/redhat/applications/kstreamripper/scons-local-2.5.1.tar.gz b/redhat/applications/kstreamripper/scons-local-2.5.1.tar.gz
deleted file mode 100644
index ef63468b1..000000000
--- a/redhat/applications/kstreamripper/scons-local-2.5.1.tar.gz
+++ /dev/null
diff --git a/redhat/applications/bibletime/bibletime.spec b/redhat/applications/misc/bibletime/bibletime.spec
index c33a47113..56d940aa8 100644
--- a/redhat/applications/bibletime/bibletime.spec
+++ b/redhat/applications/misc/bibletime/bibletime.spec
@@ -23,7 +23,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg bibletime
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/fusion-icon/fusion-icon.spec b/redhat/applications/misc/fusion-icon/fusion-icon.spec
index 7c36c1773..41d2e2184 100644
--- a/redhat/applications/fusion-icon/fusion-icon.spec
+++ b/redhat/applications/misc/fusion-icon/fusion-icon.spec
@@ -1,6 +1,6 @@
 # Default version for this component
 %define tde_pkg fusion-icon
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 
 %if "%{?python2_sitelib}" == ""
 %define python2_sitelib    %(python2 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
diff --git a/redhat/applications/kcmldap/kcmldap.spec b/redhat/applications/misc/kcmldap/kcmldap.spec
index ae639e2a7..387e42e98 100644
--- a/redhat/applications/kcmldap/kcmldap.spec
+++ b/redhat/applications/misc/kcmldap/kcmldap.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kcmldap
 %define tde_prefix /opt/trinity
@@ -67,7 +67,7 @@ BuildRequires:	trinity-libtdeldap-devel >= 0.5
 Requires:		trinity-tde-ldap-cert-updater = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:		trinity-kcontrol-ldap-bonding = %{?epoch:%{epoch}:}%{version}-%{release}
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -104,14 +104,6 @@ BuildRequires:	openldap24-libs-devel
 # KRB5 support
 BuildRequires:	krb5-devel
 
-# HEIMDAL support
-#%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
-#BuildRequires:	heimdal-devel
-#%endif
-#%if 0%{?suse_version}
-#BuildRequires:	libheimdal-devel
-#%endif
-
 # UDEV support
 %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
 %define with_tdehwlib 1
@@ -196,6 +188,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/kcmldapcontroller/kcmldapcontroller.spec b/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec
index 36cd9d3c5..c5bca20d0 100644
--- a/redhat/applications/kcmldapcontroller/kcmldapcontroller.spec
+++ b/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kcmldapcontroller
 %define tde_prefix /opt/trinity
@@ -63,7 +63,7 @@ BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 BuildRequires:	trinity-libtdeldap-devel >= 0.5
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -94,14 +94,6 @@ BuildRequires:	openldap24-libs-devel
 # KRB5 support
 BuildRequires:	krb5-devel
 
-# HEIMDAL support
-#%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
-#BuildRequires:	heimdal-devel
-#%endif
-#%if 0%{?suse_version}
-#BuildRequires:	libheimdal-devel
-#%endif
-
 # UDEV support
 %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
 %define with_tdehwlib 1
@@ -190,6 +182,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/kcmldapmanager/kcmldapmanager.spec b/redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec
index 4187c7b77..542a3ce3c 100644
--- a/redhat/applications/kcmldapmanager/kcmldapmanager.spec
+++ b/redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kcmldapmanager
 %define tde_prefix /opt/trinity
@@ -63,7 +63,7 @@ BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 BuildRequires:	trinity-libtdeldap-devel >= 0.5
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -91,14 +91,6 @@ BuildRequires:	openldap24-libs-devel
 # KRB5 support
 BuildRequires:	krb5-devel
 
-# HEIMDAL support
-#%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
-#BuildRequires:	heimdal-devel
-#%endif
-#%if 0%{?suse_version}
-#BuildRequires:	libheimdal-devel
-#%endif
-
 # UDEV support
 %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
 %define with_tdehwlib 1
@@ -174,6 +166,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/kerberostray/kerberostray.spec b/redhat/applications/misc/kerberostray/kerberostray.spec
index fa8def28d..be49ed367 100644
--- a/redhat/applications/kerberostray/kerberostray.spec
+++ b/redhat/applications/misc/kerberostray/kerberostray.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kerberostray
 %define tde_prefix /opt/trinity
@@ -63,7 +63,7 @@ BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 BuildRequires:	trinity-libtdeldap-devel >= 0.5
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -91,14 +91,6 @@ BuildRequires:	openldap24-libs-devel
 # KRB5 support
 BuildRequires:	krb5-devel
 
-# HEIMDAL support
-#%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
-#BuildRequires:	heimdal-devel
-#%endif
-#%if 0%{?suse_version}
-#BuildRequires:	libheimdal-devel
-#%endif
-
 # UDEV support
 %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
 %define with_tdehwlib 1
@@ -153,6 +145,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/krecipes/krecipes.spec b/redhat/applications/misc/krecipes/krecipes.spec
index d84afa5fc..f7112b8fe 100644
--- a/redhat/applications/krecipes/krecipes.spec
+++ b/redhat/applications/misc/krecipes/krecipes.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg krecipes
 %define tde_prefix /opt/trinity
@@ -79,7 +79,17 @@ BuildRequires:	brp-check-trinity
 BuildRequires:	mysql-devel
 
 # POSTGRESQL support
-BuildRequires:	postgresql-devel
+%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200
+BuildRequires:	postgresql10
+BuildRequires:	postgresql10-devel
+%else
+BuildRequires: postgresql
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8
+BuildRequires: postgresql-server-devel
+%else
+BuildRequires: postgresql-devel
+%endif
+%endif
 
 # SQLITE support
 BuildRequires:	sqlite-devel
@@ -120,6 +130,7 @@ export PATH="%{tde_bindir}:${PATH}"
   --includedir=%{tde_tdeincludedir} \
   --docdir=%{tde_tdedocdir} \
   --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
   \
   --disable-dependency-tracking \
   --disable-debug \
@@ -175,6 +186,6 @@ export PATH="%{tde_bindir}:${PATH}"
 %lang(et) %{tde_tdedocdir}/HTML/et/
 %lang(pt) %{tde_tdedocdir}/HTML/pt/
 %lang(sv) %{tde_tdedocdir}/HTML/sv/
-
+%{tde_mandir}/man1/krecipes.1*
 
 %changelog
diff --git a/redhat/applications/amarok/amarok.spec b/redhat/applications/multimedia/amarok/amarok.spec
index 99e8e731d..9de59f8ad 100644
--- a/redhat/applications/amarok/amarok.spec
+++ b/redhat/applications/multimedia/amarok/amarok.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg amarok
 %define tde_prefix /opt/trinity
@@ -66,7 +66,7 @@ BuildRequires:	trinity-filesystem >= %{tde_version}
 Requires:		trinity-filesystem >= %{tde_version}
 
 BuildRequires:	desktop-file-utils
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	gettext
@@ -99,13 +99,30 @@ BuildRequires:	libtool
 BuildRequires:	libtool-ltdl-devel
 %endif
 
+%if 0%{?fedora} >= 37
+BuildRequires:	libusb1-devel
+BuildRequires:	libusb-compat-0.1-devel
+%else
 BuildRequires:	libusb-devel
+%endif
 BuildRequires:	mysql-devel
-BuildRequires:	postgresql-devel
 BuildRequires:	SDL-devel
 BuildRequires:	taglib-devel
 BuildRequires:	sqlite-devel
 
+# POSTGRESQL support
+%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200
+BuildRequires:	postgresql10
+BuildRequires:	postgresql10-devel
+%else
+BuildRequires: postgresql
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8
+BuildRequires: postgresql-server-devel
+%else
+BuildRequires: postgresql-devel
+%endif
+%endif
+
 # not used anymore, in favor of libvisual ? -- Rex
 #{?fedora:BuildRequires:  xmms-devel}
 
@@ -114,7 +131,7 @@ BuildRequires:	libidn-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gamin 1
 BuildRequires:	gamin-devel
 %endif
@@ -155,7 +172,7 @@ BuildRequires:	karma-sharp
 %endif
 
 # GPOD (ipod) support
-%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
+%if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?rhel} == 8 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
 %define with_gpod 1
 BuildRequires:	libgpod-devel >= 0.4.2
 %endif
@@ -252,13 +269,18 @@ BuildRequires:	rubypick
 %endif
 
 # PYTHON support
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
+%if 0%{?sle_version} >= 150400 || 0%{?rhel} >= 8
+%define python python3
+%define __python %__python3
+%else
+%if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
 %global python python2
 %global __python %__python2
 %global python_sitearch %{python2_sitearch}
 %else
 %global python python
 %endif
+%endif
 %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 BuildRequires:	%{python}
 BuildRequires:	%{python}-devel
@@ -279,7 +301,7 @@ Amarok is a multimedia player with:
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc COPYING AUTHORS ChangeLog README
+%doc COPYING AUTHORS ChangeLog README.md
 %{tde_bindir}/amarok
 %{tde_bindir}/amarokapp
 %{tde_bindir}/amarokcollectionscanner
@@ -396,7 +418,7 @@ Requires:		trinity-konqueror
 %defattr(-,root,root,-)
 %{tde_datadir}/apps/konqueror/servicemenus/*.desktop
 %{tde_tdelibdir}/konqsidebar_universalamarok.*
-%{tde_datadir}/apps/konqsidebartng/*/amarok.desktop
+%{tde_datadir}/apps/konqsidebartng/*/amarok_konquisidebar.desktop
 
 
 ##########
@@ -449,7 +471,7 @@ fi
           "amarok/src/scripts/webcontrol/Playlist.py" \
           "amarok/src/scripts/webcontrol/RequestHandler.py" \
           "amarok/src/scripts/webcontrol/WebControl.py" \
-  -e "s|/usr/bin/env python|/usr/bin/env python2|"
+  -e "s|/usr/bin/env python|/usr/bin/env %{python}|"
 %endif
 
 
@@ -474,6 +496,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_NO_BUILTIN_CHRPATH=ON \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
diff --git a/redhat/applications/codeine/codeine.spec b/redhat/applications/multimedia/codeine/codeine.spec
index a03422bde..c1bd4b0d3 100644
--- a/redhat/applications/codeine/codeine.spec
+++ b/redhat/applications/multimedia/codeine/codeine.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg codeine
 %define tde_prefix /opt/trinity
@@ -63,7 +63,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	cmake
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -124,6 +124,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -131,7 +132,10 @@ fi
   -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
   -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
   -DLIB_INSTALL_DIR=%{tde_libdir} \
+  \
   -DBUILD_ALL=ON \
+  -DWITH_ALL_OPTIONS=ON \
+  \
   ..
 
 %__make %{?_smp_mflags}
@@ -149,7 +153,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING FAQ README TODO
+%doc COPYING FAQ README.md TODO
 %{tde_bindir}/codeine
 %{tde_tdeappdir}/codeine.desktop
 %{tde_datadir}/apps/codeine/
diff --git a/redhat/applications/k3b-i18n/k3b-i18n.spec b/redhat/applications/multimedia/k3b-i18n/k3b-i18n.spec
index f5076abb7..70bb9c4ce 100644
--- a/redhat/applications/k3b-i18n/k3b-i18n.spec
+++ b/redhat/applications/multimedia/k3b-i18n/k3b-i18n.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg k3b-i18n
 %define tde_prefix /opt/trinity
@@ -70,7 +70,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	cmake
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -94,8 +94,8 @@ Group:			Applications/Archiving
 Requires:		trinity-k3b
 Summary:		Danish (da) translations for K3B [Trinity]
 
-Obsoletes:		trinity-k3b-i18n-da < %{version}-%{release}
-Provides:		trinity-k3b-i18n-da = %{version}-%{release}
+Obsoletes:		trinity-k3b-i18n-da < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-k3b-i18n-da = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Danish
 This package contains the Danish translations for K3B.
@@ -112,8 +112,8 @@ Group:			Applications/Archiving
 Requires:		trinity-k3b
 Summary:		German (de) translations for K3B [Trinity]
 
-Obsoletes:		trinity-k3b-i18n-de < %{version}-%{release}
-Provides:		trinity-k3b-i18n-de = %{version}-%{release}
+Obsoletes:		trinity-k3b-i18n-de < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-k3b-i18n-de = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description German
 This package contains the German translations for K3B.
@@ -130,8 +130,8 @@ Group:			Applications/Archiving
 Requires:		trinity-k3b >= %{version}
 Summary:		Greek (el) translations for K3B [Trinity]
 
-Obsoletes:		trinity-k3b-i18n-el < %{version}-%{release}
-Provides:		trinity-k3b-i18n-el = %{version}-%{release}
+Obsoletes:		trinity-k3b-i18n-el < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-k3b-i18n-el = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Greek
 This package contains the greek translations for K3B.
@@ -148,8 +148,8 @@ Group:			Applications/Archiving
 Requires:		trinity-k3b
 Summary:		Spanish (es) translations for K3B [Trinity]
 
-Obsoletes:		trinity-k3b-i18n-es < %{version}-%{release}
-Provides:		trinity-k3b-i18n-es = %{version}-%{release}
+Obsoletes:		trinity-k3b-i18n-es < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-k3b-i18n-es = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Spanish
 This package contains the Spanish translations for K3B.
@@ -166,8 +166,8 @@ Group:			Applications/Archiving
 Requires:		trinity-k3b
 Summary:		Estonian (et) translations for K3B [Trinity]
 
-Obsoletes:		trinity-k3b-i18n-et < %{version}-%{release}
-Provides:		trinity-k3b-i18n-et = %{version}-%{release}
+Obsoletes:		trinity-k3b-i18n-et < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-k3b-i18n-et = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Estonian
 This package contains the Estonian translations for K3B.
@@ -184,8 +184,8 @@ Group:			Applications/Archiving
 Requires:		trinity-k3b
 Summary:		French (fr) translations for K3B [Trinity]
 
-Obsoletes:		trinity-k3b-i18n-fr < %{version}-%{release}
-Provides:		trinity-k3b-i18n-fr = %{version}-%{release}
+Obsoletes:		trinity-k3b-i18n-fr < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-k3b-i18n-fr = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description French
 This package contains the French translations for K3B.
@@ -202,8 +202,8 @@ Group:			Applications/Archiving
 Requires:		trinity-k3b
 Summary:		Italian (it) translations for K3B [Trinity]
 
-Obsoletes:		trinity-k3b-i18n-it < %{version}-%{release}
-Provides:		trinity-k3b-i18n-it = %{version}-%{release}
+Obsoletes:		trinity-k3b-i18n-it < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-k3b-i18n-it = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Italian
 This package contains the Italian translations for K3B.
@@ -220,8 +220,8 @@ Group:			Applications/Archiving
 Requires:		trinity-k3b
 Summary:		Dutch (nl) translations for K3B [Trinity]
 
-Obsoletes:		trinity-k3b-i18n-nl < %{version}-%{release}
-Provides:		trinity-k3b-i18n-nl = %{version}-%{release}
+Obsoletes:		trinity-k3b-i18n-nl < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-k3b-i18n-nl = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Dutch
 This package contains the Dutch translations for K3B.
@@ -238,8 +238,8 @@ Group:			Applications/Archiving
 Requires:		trinity-k3b
 Summary:		Polish (pl) translations for K3B [Trinity]
 
-Obsoletes:		trinity-k3b-i18n-pl < %{version}-%{release}
-Provides:		trinity-k3b-i18n-pl = %{version}-%{release}
+Obsoletes:		trinity-k3b-i18n-pl < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-k3b-i18n-pl = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Polish
 This package contains the Polish translations for K3B.
@@ -256,8 +256,8 @@ Group:			Applications/Archiving
 Requires:		trinity-k3b
 Summary:		Portuguese (pt) translations for K3B [Trinity]
 
-Obsoletes:		trinity-k3b-i18n-pt < %{version}-%{release}
-Provides:		trinity-k3b-i18n-pt = %{version}-%{release}
+Obsoletes:		trinity-k3b-i18n-pt < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-k3b-i18n-pt = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Portuguese
 This package contains the Portuguese translations for K3B.
@@ -274,10 +274,10 @@ Group:			Applications/Archiving
 Requires:		trinity-k3b
 Summary:		Brazilian Portuguese (pt_BR) translations for K3B [Trinity]
 
-Obsoletes:		trinity-k3b-i18n-pt_BR < %{version}-%{release}
-Provides:		trinity-k3b-i18n-pt_BR = %{version}-%{release}
-Obsoletes:		trinity-k3b-i18n-ptbr < %{version}-%{release}
-Provides:		trinity-k3b-i18n-ptbr = %{version}-%{release}
+Obsoletes:		trinity-k3b-i18n-pt_BR < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-k3b-i18n-pt_BR = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-k3b-i18n-ptbr < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-k3b-i18n-ptbr = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Brazil
 This package contains the Brazilian Portuguese translations for K3B.
@@ -294,8 +294,8 @@ Group:			Applications/Archiving
 Requires:		trinity-k3b
 Summary:		Russian (ru) translations for K3B [Trinity]
 
-Obsoletes:		trinity-k3b-i18n-ru < %{version}-%{release}
-Provides:		trinity-k3b-i18n-ru = %{version}-%{release}
+Obsoletes:		trinity-k3b-i18n-ru < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-k3b-i18n-ru = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Russian
 This package contains the Russian translations for K3B.
@@ -312,8 +312,8 @@ Group:			Applications/Archiving
 Requires:		trinity-k3b
 Summary:		Swedish (sv) translations for K3B [Trinity]
 
-Obsoletes:		trinity-k3b-i18n-sv < %{version}-%{release}
-Provides:		trinity-k3b-i18n-sv = %{version}-%{release}
+Obsoletes:		trinity-k3b-i18n-sv < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-k3b-i18n-sv = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Swedish
 This package contains the Swedish translations for K3B.
@@ -330,8 +330,8 @@ Group:			Applications/Archiving
 Requires:		trinity-k3b
 Summary:		Ukrainian (uk) translations for K3B [Trinity]
 
-Obsoletes:		trinity-k3b-i18n-uk < %{version}-%{release}
-Provides:		trinity-k3b-i18n-uk = %{version}-%{release}
+Obsoletes:		trinity-k3b-i18n-uk < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-k3b-i18n-uk = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description Ukrainian
 This package contains the Ukrainian translations for K3B.
@@ -361,6 +361,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_NO_BUILTIN_CHRPATH=ON \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
diff --git a/redhat/applications/k3b/k3b.spec b/redhat/applications/multimedia/k3b/k3b.spec
index 2670a3355..7500a19ca 100644
--- a/redhat/applications/k3b/k3b.spec
+++ b/redhat/applications/multimedia/k3b/k3b.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg k3b
 %define tde_prefix /opt/trinity
@@ -63,7 +63,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -90,7 +90,7 @@ BuildRequires:	libidn-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gamin 1
 BuildRequires:	gamin-devel
 %endif
@@ -271,7 +271,7 @@ start.
 %{tde_tdelibdir}/libk3bwavedecoder.la
 %{tde_tdelibdir}/libk3bwavedecoder.so
 %lang(en) %{tde_tdedocdir}/HTML/en/k3b/
-
+%{tde_mandir}/man1/k3b.1*
 
 ##########
 
@@ -422,6 +422,10 @@ unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
 
+%if 0%{?rhel} == 7
+RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -std=c++11"
+%endif
+
 if ! rpm -E %%cmake|grep -q "cd build"; then
   %__mkdir_p build
   cd build
@@ -432,6 +436,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_NO_BUILTIN_CHRPATH=ON \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
diff --git a/redhat/applications/k3b/k3brc b/redhat/applications/multimedia/k3b/k3brc
index 5d967f599..5d967f599 100644
--- a/redhat/applications/k3b/k3brc
+++ b/redhat/applications/multimedia/k3b/k3brc
diff --git a/redhat/applications/k3b/trinity-k3b-rpmlintrc b/redhat/applications/multimedia/k3b/trinity-k3b-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/applications/k3b/trinity-k3b-rpmlintrc
+++ b/redhat/applications/multimedia/k3b/trinity-k3b-rpmlintrc
diff --git a/redhat/applications/k9copy/k9copy.spec b/redhat/applications/multimedia/k9copy/k9copy.spec
index c87edd850..20a351632 100644
--- a/redhat/applications/k9copy/k9copy.spec
+++ b/redhat/applications/multimedia/k9copy/k9copy.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg k9copy
 %define tde_prefix /opt/trinity
@@ -150,6 +150,7 @@ fi
   --bindir=%{tde_bindir} \
   --datadir=%{tde_datadir} \
   --includedir=%{tde_tdeincludedir} \
+  --mandir=%{tde_mandir} \
   \
   --disable-dependency-tracking \
   --disable-debug \
@@ -185,6 +186,7 @@ export PATH="%{tde_bindir}:${PATH}"
 %{tde_datadir}/apps/konqueror/servicemenus/k9copy_open.desktop
 %lang(en) %{tde_tdedocdir}/HTML/en/k9copy/
 %{tde_datadir}/icons/hicolor/*/apps/k9copy.png
+%{tde_mandir}/man1/k9copy.1*
 
 
 %changelog
diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla.spec b/redhat/applications/multimedia/kaffeine-mozilla/kaffeine-mozilla.spec
index 027cbd16e..f17d087bb 100644
--- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla.spec
+++ b/redhat/applications/multimedia/kaffeine-mozilla/kaffeine-mozilla.spec
@@ -19,7 +19,7 @@
 %define tde_pkg kaffeine-mozilla
 %define tde_prefix /opt/trinity
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 
 # TDE specific building variables
@@ -59,7 +59,7 @@ BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -98,33 +98,47 @@ when a page containing a supported media format is loaded.
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "ltmain.sh"
-%__make -f "admin/Makefile.common"
-
 
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 
-%configure \
-  --prefix=%{_libdir}/mozilla \
+if [ -d "%{_includedir}/nspr4" ]; then
+  RPM_OPT_FLAGS="-I%{_includedir}/nspr4 ${RPM_OPT_FLAGS}"
+fi
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DCMAKE_PROGRAM_PATH="%{tde_bindir}" \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
+  ..
 
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
 
 
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
 
 # Remove useless filess
 %__rm -f %{?buildroot}%{_libdir}/mozilla/plugins/kaffeineplugin.a
@@ -136,7 +150,7 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README
+%doc AUTHORS ChangeLog COPYING
 # These files are installed outside TDE prefix
 %dir %{_libdir}/mozilla
 %dir %{_libdir}/mozilla/plugins
diff --git a/redhat/applications/kaffeine/kaffeine.spec b/redhat/applications/multimedia/kaffeine/kaffeine.spec
index 1ca4e10a3..51d127d5a 100644
--- a/redhat/applications/kaffeine/kaffeine.spec
+++ b/redhat/applications/multimedia/kaffeine/kaffeine.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kaffeine
 %define tde_prefix /opt/trinity
@@ -64,7 +64,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -114,8 +114,20 @@ BuildRequires:	libXext-devel
 BuildRequires:	libXtst-devel
 BuildRequires:	libXinerama-devel
 %endif
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
-BuildRequires: libxcb-devel
+
+# XCB support
+%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?pclinuxos} || 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?pclinuxos} == 0
+%define with_xcb 1
+%endif
+%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?pclinuxos}
+BuildRequires:	libxcb-devel
+%endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?pclinuxos} == 0
+BuildRequires:	%{_lib}xcb-devel
+%endif
+%endif
 %endif
 
 # GSTREAMER support
@@ -178,6 +190,11 @@ BuildRequires:	lame-devel
 %endif
 %endif
 
+# DVB support
+%if 0%{?rhel} != 5
+%define with_dvb 1
+%endif
+
 # WTF support
 %if 0%{?mgaversion} || 0%{?mdkversion}
 %if 0%{?pclinuxos} == 0
@@ -200,7 +217,7 @@ Konqueror plugin, OSD and much more.
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
+%doc AUTHORS ChangeLog COPYING README.md TODO
 %{tde_bindir}/kaffeine
 %{tde_libdir}/libkaffeinepart.so
 %{tde_tdelibdir}/lib*.*
@@ -215,6 +232,7 @@ Konqueror plugin, OSD and much more.
 %{tde_datadir}/mimelnk/*/*.desktop
 %{tde_datadir}/service*/*.desktop
 %{tde_tdedocdir}/HTML/en/kaffeine/
+%{tde_mandir}/man1/kaffeine.1*
 
 ##########
 
@@ -260,47 +278,45 @@ Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
 
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --mandir=%{tde_mandir} \
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
   \
-  --with-xinerama \
-  --with-gstreamer \
-  --with-lame \
-%if 0%{?rhel} > 0 && 0%{?rhel} <= 5
-  --without-dvb \
-%endif
-  
+  -DWITH_ALL_OPTIONS=ON \
+  %{?!with_dvb:-DWITH_DVB=OFF} \
+  %{?!with_lame:-DWITH_LAME=OFF} \
+  %{?!with_xcb:-DWITH_XCB=OFF} \
+  -DBUILD_ALL=ON \
+  ..
 
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
 
 
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf $RPM_BUILD_ROOT
-%__make install DESTDIR=$RPM_BUILD_ROOT
+%__make install DESTDIR=%{buildroot} -C build
 
 ## File lists
 # locale's
diff --git a/redhat/applications/kaffeine/trinity-kaffeine-rpmlintrc b/redhat/applications/multimedia/kaffeine/trinity-kaffeine-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/applications/kaffeine/trinity-kaffeine-rpmlintrc
+++ b/redhat/applications/multimedia/kaffeine/trinity-kaffeine-rpmlintrc
diff --git a/redhat/applications/kmplayer/kmplayer.spec b/redhat/applications/multimedia/kmplayer/kmplayer.spec
index a86ad59de..bf956c1de 100644
--- a/redhat/applications/kmplayer/kmplayer.spec
+++ b/redhat/applications/multimedia/kmplayer/kmplayer.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kmplayer
 %define tde_prefix /opt/trinity
@@ -62,7 +62,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -139,6 +139,16 @@ BuildRequires:	dbus-1-glib-devel
 BuildRequires:	dbus-glib-devel
 %endif
 
+# NSPR support
+%if 0%{?suse_version}
+BuildRequires:	mozilla-nspr-devel
+%else
+BuildRequires:	nspr-devel
+%endif
+
+# Koffice support
+BuildRequires:	trinity-koffice-devel
+
 Requires:		%{name}-base = %{?epoch:%{epoch}:}%{version}-%{release}
 
 
@@ -160,15 +170,21 @@ KMPlayer can:
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog INSTALL README TODO
+%doc AUTHORS COPYING ChangeLog INSTALL README.md TODO
 %{tde_bindir}/kmplayer
 %{tde_bindir}/knpplayer
 %{tde_bindir}/kxvplayer
+%{tde_datadir}/services/kmplayer_koffice.desktop
+%{tde_libdir}/libkmplayercommon.so.1
+%{tde_libdir}/libkmplayercommon.so.1.0.0
 %{tde_libdir}/libtdeinit_kmplayer.la
 %{tde_libdir}/libtdeinit_kmplayer.so
 %{tde_tdelibdir}/kmplayer.la
 %{tde_tdelibdir}/kmplayer.so
+%{tde_tdelibdir}/libkmplayerkofficepart.la
+%{tde_tdelibdir}/libkmplayerkofficepart.so
 %{tde_tdeappdir}/kmplayer.desktop
+
 %exclude %{tde_datadir}/apps/kmplayer/bookmarks.xml
 %exclude %{tde_datadir}/apps/kmplayer/kmplayerpartui.rc
 %exclude %{tde_datadir}/apps/kmplayer/noise.gif
@@ -190,13 +206,15 @@ Core files needed for KMPlayer.
 %{tde_libdir}/libkmplayercommon.so
 %{tde_bindir}/kgstplayer
 %{tde_bindir}/kxineplayer
-%config(noreplace) %{tde_confdir}/kmplayerrc
+%dir %{tde_datadir}/config
+%config(noreplace) %{tde_datadir}/config/kmplayerrc
 %{tde_datadir}/apps/kmplayer/bookmarks.xml
 %{tde_datadir}/apps/kmplayer/noise.gif
 %{tde_datadir}/icons/hicolor/*/apps/kmplayer.png
 %{tde_datadir}/icons/hicolor/*/apps/kmplayer.svgz
 %{tde_datadir}/mimelnk/application/x-kmplayer.desktop
 %{tde_datadir}/mimelnk/video/x-ms-wmp.desktop
+%{tde_mandir}/man1/kmplayer.1*
 
 ##########
 
@@ -245,33 +263,35 @@ Documention for KMPlayer, a basic audio/video viewer application for TDE.
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
 
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-export kde_confdir="%{tde_confdir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
+  -DWITH_ALL_OPTIONS=ON \
+  -DBUILD_ALL=ON \
+  ..
 
 %__make %{?_smp_mflags} || %__make
 
@@ -279,7 +299,7 @@ export kde_confdir="%{tde_confdir}"
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
 
 %find_lang %{tde_pkg}
 
diff --git a/redhat/applications/kplayer/kplayer.spec b/redhat/applications/multimedia/kplayer/kplayer.spec
index a7ce8f31e..8d6c4ff50 100644
--- a/redhat/applications/kplayer/kplayer.spec
+++ b/redhat/applications/multimedia/kplayer/kplayer.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kplayer
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -131,6 +131,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/mplayerthumbs/mplayerthumbs.spec b/redhat/applications/multimedia/mplayerthumbs/mplayerthumbs.spec
index c736f4d49..a613b826b 100644
--- a/redhat/applications/mplayerthumbs/mplayerthumbs.spec
+++ b/redhat/applications/multimedia/mplayerthumbs/mplayerthumbs.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg mplayerthumbs
 %define tde_prefix /opt/trinity
@@ -60,7 +60,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -124,6 +124,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -147,23 +148,23 @@ fi
 %__rm -rf $RPM_BUILD_ROOT
 %__make install DESTDIR=%{buildroot} -C build
 
-%find_lang %{tde_pkg}
-
 
 %clean
 %__rm -rf $RPM_BUILD_ROOT
 
 
-%files -f %{tde_pkg}.lang
+%files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README
-%{tde_bindir}/mplayerthumbsconfig
-%{tde_tdelibdir}/videopreview.la
-%{tde_tdelibdir}/videopreview.so
-%{tde_datadir}/apps/videopreview/
-%{tde_datadir}/config.kcfg/mplayerthumbs.kcfg
-%{tde_datadir}/services/videopreview.desktop
-%{tde_tdedocdir}/HTML/en/videopreview/
+%doc AUTHORS ChangeLog COPYING README.md
+%{tde_bindir}/mplayer-thumbnailer-config
+%{tde_tdelibdir}/mplayer-thumbnailer.la
+%{tde_tdelibdir}/mplayer-thumbnailer.so
+%{tde_datadir}/apps/mplayer-thumbnailer/
+%{tde_datadir}/apps/tdeconf_update/mplayer-thumbnailer-cfg-rename.upd
+%{tde_datadir}/config.kcfg/mplayer-thumbnailer.kcfg
+%{tde_datadir}/services/mplayer-thumbnailer.desktop
+%{tde_tdedocdir}/HTML/en/mplayer-thumbnailer/
+%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/mplayer-thumbnailer.mo
 
 
 %changelog
diff --git a/redhat/applications/rosegarden/rosegarden.spec b/redhat/applications/multimedia/rosegarden/rosegarden.spec
index cb13479d0..b8cae72de 100644
--- a/redhat/applications/rosegarden/rosegarden.spec
+++ b/redhat/applications/multimedia/rosegarden/rosegarden.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg rosegarden
 %define tde_prefix /opt/trinity
@@ -64,7 +64,8 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	cmake libtool
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires: libtool
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -114,7 +115,7 @@ BuildRequires:  libidn-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gamin 1
 BuildRequires:  gamin-devel
 %endif
@@ -186,6 +187,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -232,6 +234,10 @@ export PATH="%{tde_bindir}:${PATH}"
 %{tde_bindir}/rosegarden-lilypondview
 %{tde_bindir}/rosegarden-project-package
 %{tde_bindir}/rosegardensequencer
+%{tde_mandir}/man1/rosegarden-audiofile-importer.1*
+%{tde_mandir}/man1/rosegarden-lilypondview.1*
+%{tde_mandir}/man1/rosegarden-project-package.1*
+%{tde_mandir}/man1/rosegarden.1*
 
 %files data -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
diff --git a/redhat/applications/soundkonverter/soundkonverter.spec b/redhat/applications/multimedia/soundkonverter/soundkonverter.spec
index bda7d2780..ee2c4eec2 100644
--- a/redhat/applications/soundkonverter/soundkonverter.spec
+++ b/redhat/applications/multimedia/soundkonverter/soundkonverter.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg soundkonverter
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/tderadio/tderadio.spec b/redhat/applications/multimedia/tderadio/tderadio.spec
index 27d4ef6b2..048f24c87 100644
--- a/redhat/applications/tderadio/tderadio.spec
+++ b/redhat/applications/multimedia/tderadio/tderadio.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tderadio
 %define tde_prefix /opt/trinity
@@ -65,7 +65,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	cmake
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -108,8 +108,8 @@ BuildRequires:	lame-devel
 %endif
 %endif
 
-Obsoletes:		trinity-kradio < %{version}-%{release}
-Provides:		trinity-kradio = %{version}-%{release}
+Obsoletes:		trinity-kradio < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kradio = %{?epoch:%{epoch}:}%{version}-%{release}
 
 
 %description
@@ -147,45 +147,36 @@ of new plugins (e.g. Internet Radio Streams, new cool GUIs) are welcome.
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
 
 
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
-
-# Warning: --enable-visibility causes applications fails to start !
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --program-prefix="" \
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
   \
-  %{?with_lirc:--enable-lirc} %{?!with_lirc:--disable-lirc} \
-  --enable-v4l2 \
-  --enable-lame \
-  --enable-ogg \
-  --enable-alsa \
-  --enable-oss
-
-%if 0%{?mgaversion} >= 6 || 0%{?pclinuxos} >= 2018
-%__sed -i "tderadio3/plugins/"*"/Makefile" -e "s|-Wl,--no-undefined||"
-%endif
+  -DBUILD_ALL=ON \
+  ..
 
 %__make %{?_smp_mflags}
 
@@ -193,7 +184,7 @@ export PATH="%{tde_bindir}:${PATH}"
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
 
 %find_lang %{tde_pkg}
 
@@ -202,6 +193,13 @@ export PATH="%{tde_bindir}:${PATH}"
 %suse_update_desktop_file -G "Radio Tuner" %{tde_pkg} AudioVideo Tuner
 %endif
 
+# Remove devel files
+%__rm -f %{?buildroot}%{tde_libdir}/libtderadio.la
+%__rm -f %{?buildroot}%{tde_libdir}/libtderadio.so
+
+# Remove pixmas
+%__rm -fr %{?buildroot}%{tde_datadir}/pixmaps/
+
 
 %clean
 %__rm -rf %{buildroot}
@@ -211,6 +209,8 @@ export PATH="%{tde_bindir}:${PATH}"
 %defattr(-,root,root,-)
 %{tde_bindir}/convert-presets
 %{tde_bindir}/tderadio
+%{tde_libdir}/libtderadio.so.0
+%{tde_libdir}/libtderadio.so.0.0.0
 %dir %{tde_libdir}/tderadio
 %dir %{tde_libdir}/tderadio/plugins
 %{tde_libdir}/tderadio/plugins/*.la
@@ -226,5 +226,8 @@ export PATH="%{tde_bindir}:${PATH}"
 %lang(pt) %{tde_datadir}/locale/pt/LC_MESSAGES/*.mo
 %lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/*.mo
 %{tde_tdedocdir}/HTML/en/tderadio/
+%{tde_mandir}/man1/convert-presets.1*
+%{tde_mandir}/man1/tderadio.1*
+
 
 %changelog
diff --git a/redhat/applications/basket/basket.spec b/redhat/applications/office/basket/basket.spec
index d4a9b33d4..42e1df681 100644
--- a/redhat/applications/basket/basket.spec
+++ b/redhat/applications/office/basket/basket.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg basket
 %define tde_prefix /opt/trinity
@@ -65,7 +65,7 @@ BuildRequires:	trinity-kontact-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gpgme-devel
 
-BuildRequires:	cmake
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -117,6 +117,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INCLUDE_PATH="%{tde_tdeincludedir}" \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
diff --git a/redhat/applications/kbibtex/kbibtex.spec b/redhat/applications/office/kbibtex/kbibtex.spec
index 475d33ded..901569d1a 100644
--- a/redhat/applications/kbibtex/kbibtex.spec
+++ b/redhat/applications/office/kbibtex/kbibtex.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kbibtex
 %define tde_prefix /opt/trinity
@@ -63,7 +63,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -125,6 +125,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -162,7 +163,7 @@ fi
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING NEWS README TODO ChangeLog
+%doc AUTHORS COPYING NEWS README.md TODO ChangeLog
 %{tde_bindir}/kbibtex
 %{tde_tdelibdir}/libkbibtexpart.la
 %{tde_tdelibdir}/libkbibtexpart.so
diff --git a/redhat/applications/kbookreader/kbookreader.spec b/redhat/applications/office/kbookreader/kbookreader.spec
index 83b10e451..2861cf231 100644
--- a/redhat/applications/kbookreader/kbookreader.spec
+++ b/redhat/applications/office/kbookreader/kbookreader.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kbookreader
 %define tde_prefix /opt/trinity
@@ -62,7 +62,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -119,6 +119,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -144,7 +145,7 @@ export PATH="%{tde_bindir}:${PATH}"
 
 # Updates applications categories for openSUSE
 %if 0%{?suse_version}
-%suse_update_desktop_file "%{?buildroot}%{tde_tdeappdir}/bookreader.desktop" Office Viewer
+%suse_update_desktop_file "%{?buildroot}%{tde_tdeappdir}/kbookreader.desktop" Office Viewer
 %endif
 
 %find_lang %{tde_pkg} || touch %{tde_pkg}.lang
@@ -157,13 +158,13 @@ export PATH="%{tde_bindir}:${PATH}"
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
-%{tde_bindir}/bookreader
-%{tde_bindir}/bookreader_client
-%{tde_tdeappdir}/bookreader.desktop
-%{tde_datadir}/apps/bookreader/
-%{tde_datadir}/config.kcfg/bookreader.kcfg
-%{tde_tdedocdir}/HTML/en/bookreader/
-%{tde_datadir}/icons/hicolor/*/apps/bookreader.png
+%{tde_bindir}/kbookreader
+%{tde_bindir}/kbookreader_client
+%{tde_tdeappdir}/kbookreader.desktop
+%{tde_datadir}/apps/kbookreader/
+%{tde_datadir}/config.kcfg/kbookreader.kcfg
+%{tde_tdedocdir}/HTML/en/kbookreader/
+%{tde_datadir}/icons/hicolor/*/apps/kbookreader.png
 
 
 %changelog
diff --git a/redhat/applications/keximdb/keximdb.spec b/redhat/applications/office/keximdb/keximdb.spec
index a873b6a8a..af8b3c0df 100644
--- a/redhat/applications/keximdb/keximdb.spec
+++ b/redhat/applications/office/keximdb/keximdb.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg keximdb
 %define tde_prefix /opt/trinity
@@ -64,7 +64,7 @@ BuildRequires:	desktop-file-utils
 BuildRequires:	trinity-koffice-devel
 BuildRequires:	trinity-koffice-kexi
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -125,6 +125,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/kile/kile.spec b/redhat/applications/office/kile/kile.spec
index 9e1f5bf38..8fc9a86ae 100644
--- a/redhat/applications/kile/kile.spec
+++ b/redhat/applications/office/kile/kile.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kile
 %define tde_prefix /opt/trinity
@@ -62,7 +62,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	cmake
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -76,51 +76,51 @@ BuildRequires:	update-desktop-files
 BuildRequires:	brp-check-trinity
 %endif
 
-Obsoletes: %{name}-i18n-ar
-Obsoletes: %{name}-i18n-bg
-Obsoletes: %{name}-i18n-br
-Obsoletes: %{name}-i18n-ca
-Obsoletes: %{name}-i18n-cs
-Obsoletes: %{name}-i18n-cy
-Obsoletes: %{name}-i18n-da
-Obsoletes: %{name}-i18n-de
-Obsoletes: %{name}-i18n-el
-Obsoletes: %{name}-i18n-engb
-Obsoletes: %{name}-i18n-es
-Obsoletes: %{name}-i18n-et
-Obsoletes: %{name}-i18n-eu
-Obsoletes: %{name}-i18n-fi
-Obsoletes: %{name}-i18n-fr
-Obsoletes: %{name}-i18n-ga
-Obsoletes: %{name}-i18n-gl
-Obsoletes: %{name}-i18n-hi
-Obsoletes: %{name}-i18n-hu
-Obsoletes: %{name}-i18n-is
-Obsoletes: %{name}-i18n-it
-Obsoletes: %{name}-i18n-ja
-Obsoletes: %{name}-i18n-lt
-Obsoletes: %{name}-i18n-ms
-Obsoletes: %{name}-i18n-mt
-Obsoletes: %{name}-i18n-nb
-Obsoletes: %{name}-i18n-nds
-Obsoletes: %{name}-i18n-nl
-Obsoletes: %{name}-i18n-nn
-Obsoletes: %{name}-i18n-pa
-Obsoletes: %{name}-i18n-pl
-Obsoletes: %{name}-i18n-pt
-Obsoletes: %{name}-i18n-ptbr
-Obsoletes: %{name}-i18n-ro
-Obsoletes: %{name}-i18n-ru
-Obsoletes: %{name}-i18n-rw
-Obsoletes: %{name}-i18n-sk
-Obsoletes: %{name}-i18n-sr
-Obsoletes: %{name}-i18n-srlatin
-Obsoletes: %{name}-i18n-sv
-Obsoletes: %{name}-i18n-ta
-Obsoletes: %{name}-i18n-th
-Obsoletes: %{name}-i18n-tr
-Obsoletes: %{name}-i18n-uk
-Obsoletes: %{name}-i18n-zhcn
+Obsoletes: %{name}-i18n-ar < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-bg < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-br < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-ca < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-cs < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-cy < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-da < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-de < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-el < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-engb < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-es < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-et < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-eu < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-fi < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-fr < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-ga < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-gl < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-hi < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-hu < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-is < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-it < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-ja < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-lt < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-ms < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-mt < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-nb < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-nds < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-nl < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-nn < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-pa < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-pl < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-pt < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-ptbr < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-ro < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-ru < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-rw < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-sk < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-sr < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-srlatin < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-sv < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-ta < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-th < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-tr < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-uk < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-zhcn < %{?epoch:%{epoch}:}%{version}-%{release}
 
 
 %description
@@ -149,45 +149,42 @@ Kile can support large projects consisting of several smaller files.
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
 
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+# Warning: GCC visibility causes the KCM not to work at all !
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DDATA_INSTALL_DIR=%{tde_datadir}/apps \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  ..
 
 %__make %{?_smp_mflags}
 
 
+
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%__chmod +x %{buildroot}%{tde_datadir}/apps/kile/test/runTests.sh
-
-# Unwanted files ...
-%__rm -f %{?buildroot}%{tde_datadir}/apps/katepart/syntax/bibtex.xml
-%__rm -f %{?buildroot}%{tde_datadir}/apps/katepart/syntax/latex.xml
+%__make install DESTDIR=%{buildroot} -C build
 
 %find_lang %{tde_pkg}
 
@@ -221,6 +218,7 @@ export PATH="%{tde_bindir}:${PATH}"
 %lang(pt) %{tde_tdedocdir}/HTML/pt/kile/
 %lang(sv) %{tde_tdedocdir}/HTML/sv/kile/
 
+%{tde_mandir}/man1/kile.1*
 
 
 %changelog
diff --git a/redhat/applications/kmymoney/kmymoney.spec b/redhat/applications/office/kmymoney/kmymoney.spec
index ee5f52e8d..ed8d04fb8 100644
--- a/redhat/applications/kmymoney/kmymoney.spec
+++ b/redhat/applications/office/kmymoney/kmymoney.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kmymoney
 %define tde_prefix /opt/trinity
@@ -68,7 +68,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	cmake
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -84,6 +84,7 @@ BuildRequires:	update-desktop-files
 BuildRequires:	brp-check-trinity
 %endif
 
+BuildRequires:	html2ps
 BuildRequires:	recode
 BuildRequires:	libofx-devel
 
@@ -148,17 +149,17 @@ have '%{name}' package installed, you will hardly find this package useful.
 %{tde_datadir}/apps/kmymoney2/
 %{tde_datadir}/config.kcfg/kmymoney2.kcfg
 %{tde_datadir}/icons/hicolor/*/*/*.png
-%dir %{tde_datadir}/icons/Tango/
-%dir %{tde_datadir}/icons/Tango/*/
-%dir %{tde_datadir}/icons/Tango/*/*/
-%{tde_datadir}/icons/Tango/*/*/*.png
-%{tde_datadir}/icons/Tango/scalable/*.svgz
+#%dir %{tde_datadir}/icons/Tango/
+#%dir %{tde_datadir}/icons/Tango/*/
+#%dir %{tde_datadir}/icons/Tango/*/*/
+#%{tde_datadir}/icons/Tango/*/*/*.png
+#%{tde_datadir}/icons/Tango/scalable/*.svgz
 %{tde_datadir}/icons/locolor/*/*/*.png
-%dir %{tde_datadir}/icons/oxygen/
-%dir %{tde_datadir}/icons/oxygen/*/
-%dir %{tde_datadir}/icons/oxygen/*/*/
-%{tde_datadir}/icons/oxygen/*/*/*.png
-%{tde_datadir}/icons/oxygen/scalable/*.svgz
+#%dir %{tde_datadir}/icons/oxygen/
+#%dir %{tde_datadir}/icons/oxygen/*/
+#%dir %{tde_datadir}/icons/oxygen/*/*/
+#%{tde_datadir}/icons/oxygen/*/*/*.png
+#%{tde_datadir}/icons/oxygen/scalable/*.svgz
 %{tde_tdedocdir}/HTML/en/kmymoney2/
 %{tde_mandir}/man1/kmymoney2.*
 %{tde_datadir}/apps/kmm_ofximport/
@@ -181,6 +182,7 @@ This package contains development files needed for KMyMoney plugins.
 %{tde_libdir}/libkmm_mymoney.la
 %{tde_libdir}/libkmm_plugin.la
 %{tde_libdir}/*.so
+%{_libdir}/tqt3/plugins/designer/libkmymoney.la
 %{_libdir}/tqt3/plugins/designer/libkmymoney.so
 
 ##########
@@ -197,54 +199,48 @@ This package contains development files needed for KMyMoney plugins.
 
 %__install -m644 %{SOURCE1} kmymoney2/widgets/
 
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
 
 %build
-unset QTDIR QTINC QTLIB
+unset QTDIR QTLIB QTINC
 export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-
-%if 0%{?fedora} >= 29 || 0%{?rhel} >= 8
-LDFLAGS="-Wl,--allow-shlib-undefined"
-%endif
 
-# Warning: --enable-final causes FTBFS
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+  -DBIN_INSTALL_DIR="%{tde_bindir}" \
+  -DDOC_INSTALL_DIR="%{tde_docdir}" \
+  -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
+  -DLIB_INSTALL_DIR="%{tde_libdir}" \
+  -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
+  -DSYSCONF_INSTALL_DIR="%{_sysconfdir}/trinity" \
+  -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --disable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility \
+  -DWITH_ALL_OPTIONS=ON \
   \
-  --with-qmake=%{_bindir}/tqmake \
-  --with-qt-dir=%{_libdir}/tqt3 \
+  -DBUILD_ALL=ON \
   \
-  --disable-pdf-docs \
-  --enable-ofxplugin \
-  --enable-ofxbanking \
-  --enable-qtdesigner \
-  --disable-sqlite3
+  ..
 
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
 
 
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
 
 %find_lang kmymoney2
 
diff --git a/redhat/applications/kmymoney/kmymoneytitlelabel.png b/redhat/applications/office/kmymoney/kmymoneytitlelabel.png
index 70d72ac98..70d72ac98 100644
--- a/redhat/applications/kmymoney/kmymoneytitlelabel.png
+++ b/redhat/applications/office/kmymoney/kmymoneytitlelabel.png
diff --git a/redhat/applications/kmymoney/trinity-kmymoney-rpmlintrc b/redhat/applications/office/kmymoney/trinity-kmymoney-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/applications/kmymoney/trinity-kmymoney-rpmlintrc
+++ b/redhat/applications/office/kmymoney/trinity-kmymoney-rpmlintrc
diff --git a/redhat/applications/knowit/knowit.spec b/redhat/applications/office/knowit/knowit.spec
index 397257722..9cb76c32d 100644
--- a/redhat/applications/knowit/knowit.spec
+++ b/redhat/applications/office/knowit/knowit.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg knowit
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	cmake
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -119,6 +119,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/koffice-i18n/koffice-i18n.spec b/redhat/applications/office/koffice-i18n/koffice-i18n.spec
index c63a62f6f..e28ae5757 100644
--- a/redhat/applications/koffice-i18n/koffice-i18n.spec
+++ b/redhat/applications/office/koffice-i18n/koffice-i18n.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg koffice-i18n
 %define tde_prefix /opt/trinity
@@ -74,7 +74,7 @@ BuildRequires:	desktop-file-utils
 BuildRequires:	findutils
 BuildRequires:	gettext
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	cmake
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -95,49 +95,49 @@ BuildRequires:	brp-check-trinity
 %package Bulgarian
 Summary:		Bulgarian(bg) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-bg = %{version}-%{release}
+Provides: %{name}-bg = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Bulgarian
 %{summary}.
 
 %package Bengali
 Summary:		Bengali(bn) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-bn = %{version}-%{release}
+Provides: %{name}-bn = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Bengali
 %{summary}.
 
 %package Tibetan
 Summary:		Tibetan(bo) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-bo = %{version}-%{release}
+Provides: %{name}-bo = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Tibetan
 %{summary}.
 
 %package Breton
 Summary:		Breton(br) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-br = %{version}-%{release}
+Provides: %{name}-br = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Breton
 %{summary}.
 
 %package Bosnian
 Summary:		Bosnian(bs) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-bs = %{version}-%{release}
+Provides: %{name}-bs = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Bosnian
 %{summary}.
 
 %package Catalan
 Summary:		Catalan(ca) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-ca = %{version}-%{release}
+Provides: %{name}-ca = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Catalan
 %{summary}.
 
 %package Czech
 Summary:		Czech(cs) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-cs = %{version}-%{release}
+Provides: %{name}-cs = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Czech
 %{summary}.
 
@@ -150,421 +150,421 @@ Group:			User Interface/Desktops
 %package Welsh
 Summary:		Welsh(cy) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-cy = %{version}-%{release}
+Provides: %{name}-cy = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Welsh
 %{summary}.
 
 %package Danish
 Summary:		Danish(da) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-da = %{version}-%{release}
+Provides: %{name}-da = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Danish
 %{summary}.
 
 %package German
 Summary:		German(de) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-de = %{version}-%{release}
+Provides: %{name}-de = %{?epoch:%{epoch}:}%{version}-%{release}
 %description German
 %{summary}.
 
 %package Greek
 Summary:		Greek(el) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-el = %{version}-%{release}
+Provides: %{name}-el = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Greek
 %{summary}.
 
 %package British
 Summary:		British(en_GB) English support for TDE
 Group:			User Interface/Desktops
-Provides: %{name}-en_GB = %{version}-%{release}
+Provides: %{name}-en_GB = %{?epoch:%{epoch}:}%{version}-%{release}
 %description British
 %{summary}.
 
 %package Esperanto
 Summary:		Esperanto(eo) support for TDE
 Group:			User Interface/Desktops
-Provides: %{name}-eo = %{version}-%{release}
+Provides: %{name}-eo = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Esperanto
 %{summary}.
 
 %package Spanish
 Summary:		Spanish(es) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-es = %{version}-%{release}
+Provides: %{name}-es = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Spanish
 %{summary}.
 
 %package Estonian
 Summary:		Estonian(et) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-et = %{version}-%{release}
+Provides: %{name}-et = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Estonian
 %{summary}.
 
 %package Basque
 Summary:		Basque(eu) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-eu = %{version}-%{release}
+Provides: %{name}-eu = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Basque
 %{summary}.
 
 %package Finnish
 Summary:		Finnish(fi) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-fi = %{version}-%{release}
+Provides: %{name}-fi = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Finnish
 %{summary}.
 
 %package Faroese
 Summary:		Faroese(fo) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-fo = %{version}-%{release}
+Provides: %{name}-fo = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Faroese
 %{summary}.
 
 %package French
 Summary:		French(fr) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-fr = %{version}-%{release}
+Provides: %{name}-fr = %{?epoch:%{epoch}:}%{version}-%{release}
 %description French
 %{summary}.
 
 %package Frisian
 Summary:		Frisian(fy) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-fy = %{version}-%{release}
+Provides: %{name}-fy = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Frisian
 %{summary}.
 
 %package Irish
 Summary:		Irish(ga) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Obsoletes: kde-i18n-Gaeilge < %{version}
-Provides: %{name}-ga = %{version}-%{release}
+Obsoletes: kde-i18n-Gaeilge < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: %{name}-ga = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Irish
 %{summary}.
 
 %package Galician
 Summary:		Galician(gl) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-gl = %{version}-%{release}
+Provides: %{name}-gl = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Galician
 %{summary}.
 
 %package Hebrew
 Summary:		Hebrew(he) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-he = %{version}-%{release}
+Provides: %{name}-he = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Hebrew
 %{summary}.
 
 %package Hindi
 Summary:		Hindi(hi) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-hi = %{version}-%{release}
+Provides: %{name}-hi = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Hindi
 %{summary}.
 
 %package Croatian
 Summary:		Croatian(hr) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-hr = %{version}-%{release}
+Provides: %{name}-hr = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Croatian
 %{summary}.
 
 %package Hungarian
 Summary:		Hungarian(hu) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-hu = %{version}-%{release}
+Provides: %{name}-hu = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Hungarian
 %{summary}.
 
 %package Indonesian
 Summary:		Indonesian(id) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-id = %{version}-%{release}
+Provides: %{name}-id = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Indonesian
 %{summary}.
 
 %package Icelandic
 Summary:		Icelandic(is) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-is = %{version}-%{release}
+Provides: %{name}-is = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Icelandic
 %{summary}.
 
 %package Italian
 Summary:		Italian(it) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-it = %{version}-%{release}
+Provides: %{name}-it = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Italian
 %{summary}.
 
 %package Japanese
 Summary:		Japanese(ja) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-ja = %{version}-%{release}
+Provides: %{name}-ja = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Japanese
 %{summary}.
 
 %package Khmer
 Summary:		Khmer(km) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-km = %{version}-%{release}
+Provides: %{name}-km = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Khmer
 %{summary}.
 
 %package Korean
 Summary:		Korean(ko) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-ko = %{version}-%{release}
+Provides: %{name}-ko = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Korean
 %{summary}.
 
 %package Kurdish
 Summary:		Kurdish(ku) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-ku = %{version}-%{release}
+Provides: %{name}-ku = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Kurdish
 %{summary}.
 
 %package Lao
 Summary:		Lao(lo) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-lo = %{version}-%{release}
+Provides: %{name}-lo = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Lao
 %{summary}.
 
 %package Lithuanian
 Summary:		Lithuanian(lt) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-lt = %{version}-%{release}
+Provides: %{name}-lt = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Lithuanian
 %{summary}.
 
 %package Latvian
 Summary:		Latvian(lv) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-lv = %{version}-%{release}
+Provides: %{name}-lv = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Latvian
 %{summary}.
 
 %package Maori
 Summary:		Maori(mi) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-mi = %{version}-%{release}
+Provides: %{name}-mi = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Maori
 %{summary}.
 
 %package Macedonian
 Summary:		Macedonian(mk) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-mk = %{version}-%{release}
+Provides: %{name}-mk = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Macedonian
 %{summary}.
 
 %package Malay
 Summary:		Malay(ms) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-ms = %{version}-%{release}
+Provides: %{name}-ms = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Malay
 %{summary}.
 
 %package Maltese
 Summary:		Maltese(mt) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-mt = %{version}-%{release}
+Provides: %{name}-mt = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Maltese
 %{summary}.
 
 %package LowSaxon
 Summary:		Low Saxon (nds) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-nds = %{version}-%{release}
+Provides: %{name}-nds = %{?epoch:%{epoch}:}%{version}-%{release}
 %description LowSaxon
 %{summary}.
 
 %package Nepali
 Summary:		Nepali(ne) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-ne = %{version}-%{release}
+Provides: %{name}-ne = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Nepali
 %{summary}.
 
 %package Dutch
 Summary:		Dutch(nl) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-nl = %{version}-%{release}
+Provides: %{name}-nl = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Dutch
 %{summary}.
 
 %package Norwegian
 Summary:		Norwegian(no) (Bokmaal) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-no = %{version}-%{release}
+Provides: %{name}-no = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Norwegian
 %{summary}.
 
 %package Norwegian-Nynorsk
 Summary:		Norwegian(nn) (Nynorsk) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-nn = %{version}-%{release}
+Provides: %{name}-nn = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Norwegian-Nynorsk
 %{summary}.
 
 %package Occitan
 Summary:		Occitan(oc) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-oc = %{version}-%{release}
+Provides: %{name}-oc = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Occitan
 %{summary}.
 
 %package Polish
 Summary:		Polish(pl) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-pl = %{version}-%{release}
+Provides: %{name}-pl = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Polish
 %{summary}.
 
 %package Portuguese
 Summary:		Portuguese(pt) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-pt = %{version}-%{release}
+Provides: %{name}-pt = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Portuguese
 %{summary}.
 
 %package Punjabi
 Summary:		Punjabi(pa) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-pa = %{version}-%{release}
+Provides: %{name}-pa = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Punjabi
 %{summary}.
 
 %package Brazil
 Summary:		Brazil(pt_BR) Portuguese language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-pt_BR = %{version}-%{release}
+Provides: %{name}-pt_BR = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Brazil
 %{summary}.
 
 %package Romanian
 Summary:		Romanian(ro) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-ro = %{version}-%{release}
+Provides: %{name}-ro = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Romanian
 %{summary}.
 
 %package Russian
 Summary:		Russian(ru) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-ru = %{version}-%{release}
+Provides: %{name}-ru = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Russian
 %{summary}.
 
 %package Slovak
 Summary:		Slovak(sk) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-sk = %{version}-%{release}
+Provides: %{name}-sk = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Slovak
 %{summary}.
 
 %package Slovenian
 Summary:		Slovenian(sl) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-sl = %{version}-%{release}
+Provides: %{name}-sl = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Slovenian
 %{summary}.
 
 %package Serbian
 Summary:		Serbian(sr) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-sr = %{version}-%{release}
+Provides: %{name}-sr = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Serbian
 %{summary}.
 
 %package Swedish
 Summary:		Swedish(sv) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-sv = %{version}-%{release}
+Provides: %{name}-sv = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Swedish
 %{summary}.
 
 %package Tamil
 Summary:		Tamil(ta) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-ta = %{version}-%{release}
+Provides: %{name}-ta = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Tamil
 %{summary}.
 
 %package Tajik
 Summary:		Tajik(tg) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-tg = %{version}-%{release}
+Provides: %{name}-tg = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Tajik
 %{summary}.
 
 %package Thai
 Summary:		Thai(th) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-th = %{version}-%{release}
+Provides: %{name}-th = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Thai
 %{summary}.
 
 %package Turkish
 Summary:		Turkish(tr) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-tr = %{version}-%{release}
+Provides: %{name}-tr = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Turkish
 %{summary}.
 
 %package Ukrainian
 Summary:		Ukrainian(uk) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-uk = %{version}-%{release}
+Provides: %{name}-uk = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Ukrainian
 %{summary}.
 
 %package Venda
 Summary:		Venda(ven) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-ven = %{version}-%{release}
+Provides: %{name}-ven = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Venda
 %{summary}.
 
 %package Vietnamese
 Summary:		Vietnamese(vi) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-vi = %{version}-%{release}
+Provides: %{name}-vi = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Vietnamese
 %{summary}.
 
 %package Walloon
 Summary:		Walloon(wa) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-wa = %{version}-%{release}
+Provides: %{name}-wa = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Walloon
 %{summary}.
 
 %package Xhosa
 Summary:		Xhosa(xh) (a Bantu language) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-xh = %{version}-%{release}
+Provides: %{name}-xh = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Xhosa
 %{summary}.
 
 %package Chinese
 Summary:		Chinese(zh_CN) (Simplified Chinese) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-zh_CN = %{version}-%{release}
+Provides: %{name}-zh_CN = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Chinese
 %{summary}.
 
 %package Chinese-Big5
 Summary:		Chinese(zh_TW) (Big5) language support for Koffice [Trinity]
 Group:			User Interface/Desktops
-Provides: %{name}-tz_TW = %{version}-%{release}
+Provides: %{name}-tz_TW = %{?epoch:%{epoch}:}%{version}-%{release}
 %description Chinese-Big5
 %{summary}.
 
@@ -573,45 +573,66 @@ Provides: %{name}-tz_TW = %{version}-%{release}
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-
 
 %build
+unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
+
+(
+for l in . %{TDE_LANGS}; do
+  if [ $l != '.' ]; then
+    pushd "%{tde_pkg}-${l}"
+  else
+    pushd ${l}
+  fi
+
+  if ! rpm -E %%cmake|grep -q "cd build"; then
+    %__mkdir_p build
+    cd build
+  fi
+
+  %cmake \
+    -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+    -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+    -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+    -DCMAKE_SKIP_RPATH=OFF \
+    -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+    -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DWITH_GCC_VISIBILITY=OFF \
+    \
+    -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+    -DDATA_INSTALL_DIR=%{tde_datadir}/apps \
+    -DLIB_INSTALL_DIR=%{tde_libdir} \
+    -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+    \
+    -DBUILD_ALL=ON \
+    \
+    ..
+
+  %__make %{?_smp_mflags}
+
+  popd
+done
+) 2>&1 | tee /tmp/rpmbuild.$$
 
-export kde_htmldir="%{tde_tdedocdir}/HTML"
+if grep -qw TDE_Error /tmp/rpmbuild.$$; then
+  echo "Error while building. See '/tmp/rpmbuild.$$'"
+  exit 1
+fi
 
-for l in %{TDE_LANGS}; do
-  for f in koffice-i18n-${l}/; do
-    if [ -d "${f}" ]; then 
-      pushd ${f}
-      %__sed -i "configure.in" -e "s|AM_CONFIG_HEADER|AC_CONFIG_HEADER|"
-      %__make -f "admin/Makefile.common"
-      %configure \
-        --prefix=%{tde_prefix} \
-        --datadir=%{tde_datadir} \
-        --docdir=%{tde_tdedocdir}
-      %__make %{?_smp_mflags}
-      popd
-    fi
-  done
-done
+wait
+rm -f /tmp/rpmbuild.$$
 
 %install
-%__rm -rf %{?buildroot}
 export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
 
 for l in %{TDE_LANGS}; do
-  for f in koffice-i18n-${l}/; do
-    if [ -d "${f}" ] && [ -r "${f}/Makefile" ] ; then 
-      %__make install DESTDIR="%{?buildroot}" -C "${f}"
-    fi
-  done
+  %__make DESTDIR=%{buildroot} -C build install-${l}
 done
 
-# remove zero-length file
-find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \;
 
 %clean
 %__rm -rf %{buildroot}
diff --git a/redhat/applications/koffice/koffice.spec b/redhat/applications/office/koffice/koffice.spec
index a9d246641..8d5a12144 100644
--- a/redhat/applications/koffice/koffice.spec
+++ b/redhat/applications/office/koffice/koffice.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg koffice
 %define tde_prefix /opt/trinity
@@ -113,7 +113,12 @@ BuildRequires:	libexif-devel
 BuildRequires:	readline-devel
 
 # PYTHON support
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
+%if 0%{?sle_version} >= 150400 || 0%{?rhel} >= 9
+%define with_python 0
+%global __python %__python3
+%else
+%define with_python 1
+%if 0%{?rhel} == 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 8
 %global python python2
 %global __python %__python2
 %global python_sitearch %{python2_sitearch}
@@ -123,6 +128,7 @@ BuildRequires:	readline-devel
 %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 BuildRequires:	%{python}
 BuildRequires:	%{python}-devel
+%endif
 
 # LCMS support
 %if 0%{?suse_version} || 0%{?rhel} >= 7
@@ -216,18 +222,22 @@ BuildRequires:	trinity-poppler-devel >= 0.12
 # POSTGRESQL support
 #  Requires 'libpqxx', for kexi-driver-pgqsl
 %if 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version}
-%if 0%{?suse_version} != 1500 && 0%{?suse_version} != 1550
+%if 0%{?suse_version} != 1500 && 0%{?suse_version} != 1550 && 0%{?pclinuxos} == 0
 %define with_postgresql 1
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8
+BuildRequires:	postgresql-server-devel
+%else
 BuildRequires:	postgresql-devel
 BuildRequires:	libpqxx-devel
 %endif
 %endif
-Obsoletes:		trinity-libpqxx
+%endif
+Obsoletes:		trinity-libpqxx < %{?epoch:%{epoch}:}%{version}-%{release}
 
 # WPD support
 #  For chalk and filters
 BuildRequires:	libwpd-devel
-Obsoletes:		trinity-libwpd
+Obsoletes:		trinity-libwpd < %{?epoch:%{epoch}:}%{version}-%{release}
 
 # WV2 support
 %if 0%{?mgaversion} || 0%{?mdkversion}
@@ -239,7 +249,11 @@ BuildRequires:	wv2-devel
 
 # MESA support
 %if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} >= 8
+BuildRequires:	%{_lib}mesagl-devel
+%else
 BuildRequires:	%{_lib}mesagl1-devel
+%endif
 BuildRequires:	%{_lib}mesaglu1-devel
 %endif
 %if 0%{?fedora} || 0%{?rhel}
@@ -377,12 +391,18 @@ Requires:		perl
 %{tde_tdeappdir}/*koshell.desktop
 %{tde_datadir}/apps/kofficewidgets/
 %if 0%{?with_kross}
+%if 0%{?with_python}
 %{tde_datadir}/apps/kross/
 %{tde_tdelibdir}/krosspython.*
+%endif
 %if 0%{?with_ruby}
 %{tde_tdelibdir}/krossruby.*
 %endif
 %endif
+%{tde_mandir}/man1/koconverter.1*
+%{tde_mandir}/man1/koscript.1*
+%{tde_mandir}/man1/koshell.1*
+%{tde_mandir}/man1/kthesaurus.1*
 
 ##########
 
@@ -419,6 +439,7 @@ License:		LGPLv2+
 %{tde_libdir}/libkrossapi.so.*
 %{tde_libdir}/libkrossmain.so.*
 %endif
+%{tde_mandir}/man1/kspread.1*
 
 ##########
 
@@ -464,6 +485,7 @@ Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
 %{tde_datadir}/templates/TextDocument.desktop
 %{tde_datadir}/templates/.source/TextDocument.kwt
 %{tde_tdeappdir}/*kword.desktop
+%{tde_mandir}/man1/kword.1*
 
 ##########
 
@@ -526,6 +548,8 @@ Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
 %{tde_datadir}/templates/Presentation.desktop
 %{tde_datadir}/templates/.source/Presentation.kpt
 %{tde_tdeappdir}/*kpresenter.desktop
+%{tde_mandir}/man1/kprconverter.pl.1*
+%{tde_mandir}/man1/kpresenter.1*
 
 ##########
 
@@ -533,7 +557,7 @@ Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
 Summary:		A flowcharting application
 Group:			Applications/Productivity
 Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      kivio < %{version}-%{release}
+Obsoletes:      kivio < %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description kivio
 %{summary}.
@@ -550,6 +574,7 @@ Obsoletes:      kivio < %{version}-%{release}
 %{tde_datadir}/config.kcfg/kivio.kcfg
 %{tde_datadir}/services/kivio*.desktop
 %{tde_tdeappdir}/*kivio.desktop
+%{tde_mandir}/man1/kivio.1*
 
 ##########
 
@@ -576,6 +601,7 @@ Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
 %{tde_datadir}/templates/Illustration.desktop
 %{tde_datadir}/templates/.source/Illustration.karbon
 %{tde_tdeappdir}/*karbon.desktop
+%{tde_mandir}/man1/karbon.1*
 
 ##########
 
@@ -605,6 +631,8 @@ Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
 %{tde_datadir}/services/kugar*.desktop
 %{tde_tdeappdir}/*kugar.desktop
 %{tde_tdeappdir}/*kudesigner.desktop
+%{tde_mandir}/man1/kudesigner.1*
+%{tde_mandir}/man1/kugar.1*
 
 ##########
 
@@ -614,7 +642,7 @@ Group:			Applications/Productivity
 Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %if 0%{?with_postgresql} == 0
-Obsoletes:		%{name}-kexi-driver-pgsql
+Obsoletes:		%{name}-kexi-driver-pgsql < %{?epoch:%{epoch}:}%{version}-%{release}
 %endif
 
 %description kexi
@@ -710,6 +738,7 @@ Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
 %{tde_datadir}/apps/kchart/
 %{tde_datadir}/services/kchart*.desktop
 %{tde_tdeappdir}/*kchart.desktop
+%{tde_mandir}/man1/kchart.1*
 
 ##########
 
@@ -750,6 +779,7 @@ Requires:		dejavu
 %{tde_datadir}/apps/kformula/
 %{tde_datadir}/services/kformula*.desktop
 %{tde_tdeappdir}/*kformula.desktop
+%{tde_mandir}/man1/kformula.1*
 
 ##########
 
diff --git a/redhat/applications/koffice/koshell.png b/redhat/applications/office/koffice/koshell.png
index c66ef99e8..c66ef99e8 100644
--- a/redhat/applications/koffice/koshell.png
+++ b/redhat/applications/office/koffice/koshell.png
diff --git a/redhat/applications/koffice/trinity-koffice-rpmlintrc b/redhat/applications/office/koffice/trinity-koffice-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/applications/koffice/trinity-koffice-rpmlintrc
+++ b/redhat/applications/office/koffice/trinity-koffice-rpmlintrc
diff --git a/redhat/applications/kpilot/kpilot.spec b/redhat/applications/office/kpilot/kpilot.spec
index 3fb166849..3b5a2320c 100644
--- a/redhat/applications/kpilot/kpilot.spec
+++ b/redhat/applications/office/kpilot/kpilot.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kpilot
 %define tde_prefix /opt/trinity
@@ -63,7 +63,7 @@ BuildRequires:	desktop-file-utils
 BuildRequires:	trinity-tdepim-devel >= %{tde_version}
 BuildRequires:	gettext
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -140,6 +140,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/kpilot/trinity-kpilot-rpmlintrc b/redhat/applications/office/kpilot/trinity-kpilot-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/applications/kpilot/trinity-kpilot-rpmlintrc
+++ b/redhat/applications/office/kpilot/trinity-kpilot-rpmlintrc
diff --git a/redhat/applications/tellico/tellico.spec b/redhat/applications/office/tellico/tellico.spec
index 894a74be8..1645a3e61 100644
--- a/redhat/applications/tellico/tellico.spec
+++ b/redhat/applications/office/tellico/tellico.spec
@@ -1,4 +1,4 @@
-%if 0%{?fedora} >= 23
+%if 0%{?fedora} >= 23 || 0%{?rhel} >= 9
 %define _hardened_ldflags %nil
 %endif
 
@@ -13,7 +13,7 @@
 # file, is the same license as for the pristine package itself (unless the
 # license for the pristine package is not an Open Source License, in which
 # case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
+# license that confolrms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 #
 # Please submit bugfixes or comments via http://www.trinitydesktop.org/
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tellico
 %define tde_prefix /opt/trinity
@@ -69,7 +69,7 @@ BuildRequires:	trinity-libpoppler-tqt-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -139,7 +139,7 @@ BuildRequires:	libidn-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gamin 1
 BuildRequires:	gamin-devel
 %endif
@@ -154,17 +154,25 @@ BuildRequires:	libacl-devel
 BuildRequires:	libattr-devel
 
 # PYTHON support
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
+%if 0%{?sle_version} >= 150400 || 0%{?rhel} >= 9
+%define python python3
+%define __python %__python3
+%else
+%if 0%{?rhel} == 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
 %global python python2
 %global __python %__python2
 %global python_sitearch %{python2_sitearch}
 %else
 %global python python
 %endif
+%endif
 %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 BuildRequires:	%{python}
 BuildRequires:	%{python}-devel
 
+# Readline support
+BuildRequires:	readline-devel
+
 
 Requires:		%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:		%{name}-scripts = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -189,6 +197,7 @@ It also makes it easy for other softwares to use the Tellico data.
 %{tde_bindir}/tellico
 %{tde_datadir}/applications
 %config(noreplace) %{tde_confdir}/tellicorc
+%{tde_mandir}/man1/tellico.1*
 
 ##########
 
@@ -289,7 +298,7 @@ fi
           "src/fetch/scripts/ministerio_de_cultura.py" \
           "src/fetch/scripts/fr.allocine.py" \
           "src/translators/griffith2tellico.py" \
-  -e "s|/usr/bin/env python|/usr/bin/env python2|"
+  -e "s|/usr/bin/env python|/usr/bin/env %{python}|"
 %endif
 
 
@@ -309,6 +318,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_NO_BUILTIN_CHRPATH=ON \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
diff --git a/redhat/applications/kima/kima.spec b/redhat/applications/settings/kima/kima.spec
index 9df373a5b..bde20158a 100644
--- a/redhat/applications/kima/kima.spec
+++ b/redhat/applications/settings/kima/kima.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kima
 %define tde_prefix /opt/trinity
@@ -63,7 +63,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -124,6 +124,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -162,7 +163,7 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
+%doc AUTHORS ChangeLog COPYING README.md TODO
 %{tde_tdelibdir}/libkima.la
 %{tde_tdelibdir}/libkima.so
 %{tde_datadir}/apps/kicker/applets/kima.desktop
diff --git a/redhat/applications/kiosktool/kiosktool.spec b/redhat/applications/settings/kiosktool/kiosktool.spec
index ada3aa3d5..6bd1357a2 100644
--- a/redhat/applications/kiosktool/kiosktool.spec
+++ b/redhat/applications/settings/kiosktool/kiosktool.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kiosktool
 %define tde_prefix /opt/trinity
@@ -64,7 +64,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -122,6 +122,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -167,7 +168,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc ChangeLog COPYING README TODO
+%doc ChangeLog COPYING README.md TODO
 %{tde_bindir}/kiosktool
 %{tde_bindir}/kiosktool-tdedirs
 %{tde_tdeappdir}/kiosktool.desktop
diff --git a/redhat/applications/kkbswitch/kkbswitch.spec b/redhat/applications/settings/kkbswitch/kkbswitch.spec
index 85ef51ca5..b9113b344 100644
--- a/redhat/applications/kkbswitch/kkbswitch.spec
+++ b/redhat/applications/settings/kkbswitch/kkbswitch.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kkbswitch
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -129,6 +129,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -174,7 +175,7 @@ fi
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog README TODO
+%doc AUTHORS ChangeLog README.md TODO
 %{tde_bindir}/kkbswitch
 %{tde_tdeappdir}/kkbswitch.desktop
 %{tde_datadir}/apps/kkbswitch/
diff --git a/redhat/applications/klcddimmer/klcddimmer.spec b/redhat/applications/settings/klcddimmer/klcddimmer.spec
index c892a3b08..bdd52f204 100644
--- a/redhat/applications/klcddimmer/klcddimmer.spec
+++ b/redhat/applications/settings/klcddimmer/klcddimmer.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg klcddimmer
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -114,6 +114,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -147,7 +148,7 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING LICENSE NEWS README
+%doc AUTHORS COPYING LICENSE NEWS README.md
 %{tde_libdir}/klcddimmer_panelapplet.la
 %{tde_libdir}/klcddimmer_panelapplet.so
 %{tde_datadir}/apps/kicker/applets/klcddimmer.desktop
diff --git a/redhat/applications/kmyfirewall/kmyfirewall.spec b/redhat/applications/settings/kmyfirewall/kmyfirewall.spec
index 62580f261..857fa4f82 100644
--- a/redhat/applications/kmyfirewall/kmyfirewall.spec
+++ b/redhat/applications/settings/kmyfirewall/kmyfirewall.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kmyfirewall
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/kmyfirewall/trinity-kmyfirewall-rpmlintrc b/redhat/applications/settings/kmyfirewall/trinity-kmyfirewall-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/applications/kmyfirewall/trinity-kmyfirewall-rpmlintrc
+++ b/redhat/applications/settings/kmyfirewall/trinity-kmyfirewall-rpmlintrc
diff --git a/redhat/applications/knetworkmanager8/knetworkmanager8.spec b/redhat/applications/settings/knetworkmanager8/knetworkmanager8.spec
index 35e4bb1c7..10be14d90 100644
--- a/redhat/applications/knetworkmanager8/knetworkmanager8.spec
+++ b/redhat/applications/settings/knetworkmanager8/knetworkmanager8.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg knetworkmanager
 %define tde_prefix /opt/trinity
@@ -89,8 +89,8 @@ BuildRequires:	NetworkManager-glib-devel
 # HAL support
 BuildRequires:	hal-devel
 
-Obsoletes:		trinity-knetworkmanager < %{version}-%{release}
-Provides:		trinity-knetworkmanager = %{version}-%{release}
+Obsoletes:		trinity-knetworkmanager < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description
 KNetworkManager is a system tray applet for controlling network
@@ -119,10 +119,10 @@ connections on systems that use the NetworkManager daemon.
 %package devel
 Summary:		Common data shared among the MySQL GUI Suites
 Group:			Development/Libraries
-Requires:		%{name} = %{version}-%{release}
+Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
-Obsoletes:		trinity-knetworkmanager-devel < %{version}-%{release}
-Provides:		trinity-knetworkmanager-devel = %{version}-%{release}
+Obsoletes:		trinity-knetworkmanager-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-knetworkmanager-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description devel
 Development headers for knetworkmanager
diff --git a/redhat/applications/tde-guidance/tde-guidance.spec b/redhat/applications/settings/tde-guidance/tde-guidance.spec
index 8a27e3bd4..4d9b1bf9c 100644
--- a/redhat/applications/tde-guidance/tde-guidance.spec
+++ b/redhat/applications/settings/tde-guidance/tde-guidance.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tde-guidance
 %define tde_prefix /opt/trinity
@@ -65,7 +65,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	trinity-pytdeextensions
 BuildRequires:	trinity-libpythonize0-devel
-BuildRequires:	trinity-python-trinity
+BuildRequires:	trinity-pytde
 BuildRequires:	chrpath
 
 BuildRequires:	autoconf automake libtool m4
@@ -88,8 +88,8 @@ BuildRequires:	sip4-tqt-devel >= 4.10.5
 Requires:		sip4-tqt >= 4.10.5
 
 # PYTHON-QT support
-BuildRequires:	python-tqt-devel
-BuildRequires:	trinity-python-trinity-devel
+BuildRequires:	pytqt-devel
+BuildRequires:	trinity-pytde-devel
 BuildRequires:	trinity-pytqt-tools
 
 # LIBXXF86VM support
@@ -104,7 +104,8 @@ BuildRequires:	libXxf86vm-devel
 #  RHEL 4: disabled
 #  RHEL 6: available in EPEL
 #  RHEL 7: available in NUX
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?suse_version}
+#  RHEL 8: available in EPEL
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
 %define with_xscreensaver 1
 
 %if 0%{?fedora} || 0%{?rhel} >= 5
@@ -134,7 +135,9 @@ BuildRequires:	%{_lib}xscrnsaver%{?mgaversion:1}-devel
 %endif
 BuildRequires:	xscreensaver
 BuildRequires:	xscreensaver-base
+%if 0%{?pclinuxos} == 0
 BuildRequires:	xscreensaver-extrusion
+%endif
 BuildRequires:	xscreensaver-gl
 %endif
 %endif
@@ -151,8 +154,8 @@ BuildRequires:	xscreensaver-gl
 BuildRequires:	%{python}
 BuildRequires:	%{python}-devel
 
-Requires:		python-tqt
-Requires:		trinity-python-trinity
+Requires:		pytqt
+Requires:		trinity-pytde
 Requires:		trinity-pytdeextensions
 %if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
 Requires:		hwdata
@@ -162,7 +165,7 @@ Requires:		%{name}-backends = %{?epoch:%{epoch}:}%{version}-%{release}
 
 # POWERMANAGER support (requires HAL)
 #define with_powermanager 1
-Obsoletes:	trinity-tde-guidance-powermanager
+Obsoletes:	trinity-tde-guidance-powermanager < %{?epoch:%{epoch}:}%{version}-%{release}
 
 Obsoletes:		trinity-guidance < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:		trinity-guidance = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -191,7 +194,6 @@ or can be run as standalone applications.
 %{tde_datadir}/apps/guidance/
 %{tde_tdeappdir}/*.desktop
 %{tde_datadir}/icons/crystalsvg/*/*/*.png
-%{tde_datadir}/icons/crystalsvg/*/*/*.svg
 %{python_sitearch}/%{name}/SMBShareSelectDialog.py*
 %{python_sitearch}/%{name}/SimpleCommandRunner.py*
 %{python_sitearch}/%{name}/fuser.py*
@@ -303,7 +305,7 @@ suspend using HAL.
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
-#export PYTHONPATH=%{python_sitearch}/python-tqt
+#export PYTHONPATH=%{python_sitearch}/pytqt
 
 # Avoids 'error: byte-compiling is disabled.' on Mandriva/Mageia
 export PYTHONDONTWRITEBYTECODE=
@@ -325,7 +327,7 @@ unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 export EXTRA_MODULE_DIR="%{python_sitearch}/%{name}"
 export SIPTQT_DIR="%{python_sitearch}/sip4_tqt"
-export PYTHONPATH="%{python_sitearch}/python-tqt"
+export PYTHONPATH="%{python_sitearch}/pytqt"
 
 # Support for 'sip4-tqt'
 export PYTHONPATH="%{python_sitearch}/sip4_tqt:${PYTHONPATH}"
diff --git a/redhat/applications/tde-guidance/trinity-tde-guidance-rpmlintrc b/redhat/applications/settings/tde-guidance/trinity-tde-guidance-rpmlintrc
index bd7a50a17..bd7a50a17 100644
--- a/redhat/applications/tde-guidance/trinity-tde-guidance-rpmlintrc
+++ b/redhat/applications/settings/tde-guidance/trinity-tde-guidance-rpmlintrc
diff --git a/redhat/applications/tde-systemsettings/tde-settings-laptops.directory b/redhat/applications/settings/tde-systemsettings/tde-settings-laptops.directory
index d37d9ba13..d37d9ba13 100644
--- a/redhat/applications/tde-systemsettings/tde-settings-laptops.directory
+++ b/redhat/applications/settings/tde-systemsettings/tde-settings-laptops.directory
diff --git a/redhat/applications/tde-systemsettings/tde-systemsettings.spec b/redhat/applications/settings/tde-systemsettings/tde-systemsettings.spec
index c34b5db25..4156d4ee7 100644
--- a/redhat/applications/tde-systemsettings/tde-systemsettings.spec
+++ b/redhat/applications/settings/tde-systemsettings/tde-systemsettings.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tde-systemsettings
 %define tde_prefix /opt/trinity
@@ -69,7 +69,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -84,7 +84,9 @@ BuildRequires:	update-desktop-files
 BuildRequires:	brp-check-trinity
 %endif
 
+%if 0%{?suse_version} == 0 || 0%{?sle_version} <= 150300
 Requires:		trinity-guidance
+%endif
 
 
 %description
@@ -102,42 +104,47 @@ Control Centre with an improved user interface.
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
 
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
-export kde_confdir="%{tde_confdir}"
-
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --sysconfdir=%{tde_sysconfdir} \
-  --mandir=%{tde_mandir} \
-  --program-prefix="" \
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+# Warning: GCC visibility causes FTBFS [Bug #1285]
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  -DSYSCONF_INSTALL_DIR="/etc/trinity" \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
+  -DWITH_ALL_OPTIONS=ON \
+  -DBUILD_ALL=ON \
+  ..
 
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
 
 
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
 
 %__install -D -m 644 %{SOURCE1} %{buildroot}%{tde_datadir}/desktop-directories/tde-settings-laptops.directory
 
@@ -168,7 +175,7 @@ done
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc README TODO
+%doc README.md TODO
 %dir %{tde_sysconfdir}/xdg
 %dir %{tde_sysconfdir}/xdg/menus
 %dir %{tde_sysconfdir}/xdg/menus/applications-merged
@@ -184,7 +191,7 @@ done
 %config(noreplace) %{tde_confdir}/systemsettingsrc
 %{tde_datadir}/desktop-directories/*.directory
 %{tde_datadir}/icons/crystalsvg/*/apps/systemsettings.png
-%{tde_tdedocdir}/HTML/en/systemsettings/
+%{tde_tdedocdir}/HTML/en/tde-systemsettings/
 %{tde_mandir}/man1/systemsettings.1*
 
 %changelog
diff --git a/redhat/applications/tdenetworkmanager/tdenetworkmanager.spec b/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec
index ec951f116..78979984e 100644
--- a/redhat/applications/tdenetworkmanager/tdenetworkmanager.spec
+++ b/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tdenetworkmanager
 %define tde_prefix /opt/trinity
@@ -62,7 +62,8 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	cmake libtool
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires: libtool
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -77,8 +78,8 @@ BuildRequires:	update-desktop-files
 BuildRequires:	brp-check-trinity
 %endif
 
-Obsoletes:		trinity-knetworkmanager < %{version}-%{release}
-Provides:		trinity-knetworkmanager = %{version}-%{release}
+Obsoletes:		trinity-knetworkmanager < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release}
 
 # NETWORKMANAGER support
 %if 0%{?rhel} || 0%{?fedora}
@@ -135,7 +136,7 @@ BuildRequires:	libidn-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gamin 1
 BuildRequires:	gamin-devel
 %endif
@@ -179,7 +180,7 @@ fi
 %package devel
 Summary:		Common data shared among the MySQL GUI Suites
 Group:			Development/Libraries
-Requires:		%{name} = %{version}-%{release}
+Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description devel
 Development headers for tdenetworkmanager
@@ -218,6 +219,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/tdenetworkmanager/trinity-tdenetworkmanager-rpmlintrc b/redhat/applications/settings/tdenetworkmanager/trinity-tdenetworkmanager-rpmlintrc
index 8668d5e81..8668d5e81 100644
--- a/redhat/applications/tdenetworkmanager/trinity-tdenetworkmanager-rpmlintrc
+++ b/redhat/applications/settings/tdenetworkmanager/trinity-tdenetworkmanager-rpmlintrc
diff --git a/redhat/applications/tdesudo/tdesudo.spec b/redhat/applications/settings/tdesudo/tdesudo.spec
index 2ead68733..0b68294f0 100644
--- a/redhat/applications/tdesudo/tdesudo.spec
+++ b/redhat/applications/settings/tdesudo/tdesudo.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tdesudo
 %define tde_prefix /opt/trinity
@@ -60,7 +60,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -84,8 +84,8 @@ BuildRequires:	update-desktop-files
 BuildRequires:	brp-check-trinity
 %endif
 
-Obsoletes:	trinity-kdesudo < %{version}-%{release}
-Provides:	trinity-kdesudo = %{version}-%{release}
+Obsoletes:	trinity-kdesudo < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdesudo = %{?epoch:%{epoch}:}%{version}-%{release}
 
 Requires:		sudo
 
@@ -123,6 +123,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/wlassistant/wlassistant.spec b/redhat/applications/settings/wlassistant/wlassistant.spec
index 9aeca6cf9..3ea4d2209 100644
--- a/redhat/applications/wlassistant/wlassistant.spec
+++ b/redhat/applications/settings/wlassistant/wlassistant.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg wlassistant
 %define tde_prefix /opt/trinity
@@ -61,7 +61,8 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	cmake libtool
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires: libtool
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -95,19 +96,24 @@ BuildRequires:	libidn-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gamin 1
 BuildRequires:	gamin-devel
 %endif
 
 # PYTHON support
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
+%if 0%{?sle_version} >= 150400 || 0%{?rhel} >= 9
+%define python python3
+%define __python %__python3
+%else
+%if 0%{?rhel} == 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
 %global python python2
 %global __python %__python2
 %global python_sitearch %{python2_sitearch}
 %else
 %global python python
 %endif
+%endif
 %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 BuildRequires:	%{python}
 BuildRequires:	%{python}-devel
@@ -156,6 +162,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -165,7 +172,7 @@ fi
   -DLIB_INSTALL_DIR=%{tde_libdir} \
   -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
   \
-  -DBUILD_ALL=on \
+  -DBUILD_ALL=ON \
   ..
 
 %__make %{?_smp_mflags}
diff --git a/redhat/applications/adept/adept.spec b/redhat/applications/system/adept/adept.spec
index 89d0a117c..ca5c2f430 100644
--- a/redhat/applications/adept/adept.spec
+++ b/redhat/applications/system/adept/adept.spec
@@ -18,7 +18,7 @@
 # Default version for this component
 %define tde_pkg adept
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 
 # TDE specific building variables
diff --git a/redhat/applications/dolphin/dolphin.spec b/redhat/applications/system/dolphin/dolphin.spec
index 91bfe0907..bfa6d1910 100644
--- a/redhat/applications/dolphin/dolphin.spec
+++ b/redhat/applications/system/dolphin/dolphin.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg dolphin
 %define tde_prefix /opt/trinity
@@ -62,7 +62,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -119,6 +119,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/katapult/katapult.spec b/redhat/applications/system/katapult/katapult.spec
index 286141d4a..c1c1f2019 100644
--- a/redhat/applications/katapult/katapult.spec
+++ b/redhat/applications/system/katapult/katapult.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg katapult
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -120,6 +120,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/kbfx/kbfx.spec b/redhat/applications/system/kbfx/kbfx.spec
index f813a56e9..909a33b8f 100644
--- a/redhat/applications/kbfx/kbfx.spec
+++ b/redhat/applications/system/kbfx/kbfx.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kbfx
 %define tde_prefix /opt/trinity
@@ -62,7 +62,8 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake libtool
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires: libtool
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -81,7 +82,7 @@ BuildRequires:	libidn-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gamin 1
 BuildRequires:	gamin-devel
 %endif
@@ -146,6 +147,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/kcmautostart/kcmautostart.spec b/redhat/applications/system/kcmautostart/kcmautostart.spec
index 94dcd89fe..15702bf19 100644
--- a/redhat/applications/kcmautostart/kcmautostart.spec
+++ b/redhat/applications/system/kcmautostart/kcmautostart.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kcmautostart
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -119,6 +119,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -152,7 +153,7 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %files -f autostart.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING INSTALL README
+%doc AUTHORS ChangeLog COPYING INSTALL README.md
 %{tde_tdelibdir}/kcm_autostart.la
 %{tde_tdelibdir}/kcm_autostart.so
 %{tde_tdeappdir}/autostart.desktop
diff --git a/redhat/applications/kdbusnotification/kdbusnotification.spec b/redhat/applications/system/kdbusnotification/kdbusnotification.spec
index de2de11db..a919a36aa 100644
--- a/redhat/applications/kdbusnotification/kdbusnotification.spec
+++ b/redhat/applications/system/kdbusnotification/kdbusnotification.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kdbusnotification
 %define tde_prefix /opt/trinity
@@ -59,7 +59,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -133,6 +133,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/system/klamav/klamav.spec b/redhat/applications/system/klamav/klamav.spec
new file mode 100644
index 000000000..98c891c6a
--- /dev/null
+++ b/redhat/applications/system/klamav/klamav.spec
@@ -0,0 +1,151 @@
+#
+# spec file for package klamav (version R14)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg klamav
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+%define tde_tdeappdir %{tde_appdir}/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:			trinity-%{tde_pkg}
+Summary:        Frontend for clamav
+Version:		0.46
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+Group:			Applications/Utilities
+
+Vendor:			Trinity Project
+Packager:		Francois Andriot <francois.andriot@free.fr>
+#URL:			http://www.trinitydesktop.org/
+Url:            http://klamav.sourceforge.net/
+
+Prefix:			%{_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	gettext
+BuildRequires:	curl-devel
+BuildRequires:	gmp-devel
+BuildRequires:	sqlite-devel
+#BuildRequires:	unsermake
+
+# CLAMAV support
+BuildRequires:  clamav
+BuildRequires:  clamav-devel
+Requires:		clamav
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+
+%description
+A TDE front-end for the Clam AntiVirus antivirus toolkit.
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DBUILD_ALL=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+chmod u+r %{buildroot}%{tde_bindir}/ScanWithKlamAV
+
+%find_lang %{tde_pkg}
+
+
+%clean
+%__rm -rf %{buildroot}
+	
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%attr(111,root,root) %{tde_bindir}/ScanWithKlamAV
+%{tde_bindir}/klamav
+%{tde_bindir}/klammail
+%{tde_tdeappdir}/klamav.desktop
+%{tde_datadir}/apps/klamav/
+%{tde_datadir}/apps/konqueror/servicemenus/klamav-dropdown.desktop
+%{tde_tdedocdir}/HTML/en/klamav/
+%{tde_datadir}/icons/hicolor/32x32/apps/klamav.png
+%{tde_datadir}/icons/hicolor/48x48/apps/klamav.png
+
+
+%changelog
diff --git a/redhat/applications/knemo/knemo.spec b/redhat/applications/system/knemo/knemo.spec
index a46492eaa..b8c152a97 100644
--- a/redhat/applications/knemo/knemo.spec
+++ b/redhat/applications/system/knemo/knemo.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg knemo
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -98,6 +98,7 @@ BuildRequires:	libidn-devel
 BuildRequires:	openssl-devel
 
 # Wireless support
+%define with_wifi 1
 %if 0%{?fedora} >= 6 || 0%{?rhel} >= 5
 BuildRequires: wireless-tools-devel
 %endif
@@ -150,6 +151,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -159,6 +161,7 @@ fi
   -DLIB_INSTALL_DIR="%{tde_libdir}" \
   \
   -DWITH_ALL_OPTIONS=ON \
+  %{!?with_wifi:-DWITH_LIBIW=OFF} \
   -DWITH_GCC_VISIBILITY=ON \
   \
   -DBUILD_ALL=ON \
diff --git a/redhat/applications/knetload/knetload.spec b/redhat/applications/system/knetload/knetload.spec
index 27842130e..cba84df2b 100644
--- a/redhat/applications/knetload/knetload.spec
+++ b/redhat/applications/system/knetload/knetload.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg knetload
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -124,6 +124,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/knetstats/knetstats.spec b/redhat/applications/system/knetstats/knetstats.spec
index a87b7ba2c..6d873bc4c 100644
--- a/redhat/applications/knetstats/knetstats.spec
+++ b/redhat/applications/system/knetstats/knetstats.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg knetstats
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -119,6 +119,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/kooldock/kooldock.spec b/redhat/applications/system/kooldock/kooldock.spec
index 99e783355..679eb263b 100644
--- a/redhat/applications/kooldock/kooldock.spec
+++ b/redhat/applications/system/kooldock/kooldock.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kooldock
 %define tde_prefix /opt/trinity
@@ -62,7 +62,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -128,6 +128,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/kpowersave/kpowersave.spec b/redhat/applications/system/kpowersave/kpowersave.spec
index e14bc569f..b5aec8ecc 100644
--- a/redhat/applications/kpowersave/kpowersave.spec
+++ b/redhat/applications/system/kpowersave/kpowersave.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kpowersave
 %define tde_prefix /opt/trinity
@@ -63,7 +63,8 @@ BuildRequires:	desktop-file-utils
 BuildRequires:	hal-devel
 BuildRequires:	trinity-dbus-tqt-devel >= 1:0.63
 
-BuildRequires:	cmake libtool
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires: libtool
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -82,7 +83,8 @@ BuildRequires:	brp-check-trinity
 #  RHEL 4: disabled
 #  RHEL 6: available in EPEL
 #  RHEL 7: available in NUX
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?suse_version}
+#  RHEL 8: available in EPEL
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
 %define with_xscreensaver 1
 
 %if 0%{?fedora} || 0%{?rhel} >= 5
@@ -165,6 +167,7 @@ cd build
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -192,7 +195,7 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%doc AUTHORS ChangeLog COPYING NEWS README.md TODO
 %{tde_bindir}/kpowersave
 %{tde_libdir}/libtdeinit_kpowersave.la
 %{tde_libdir}/libtdeinit_kpowersave.so
diff --git a/redhat/applications/krusader/krusader.spec b/redhat/applications/system/krusader/krusader.spec
index 1bcf8ce5b..25c9ff32e 100644
--- a/redhat/applications/krusader/krusader.spec
+++ b/redhat/applications/system/krusader/krusader.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg krusader
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/kshutdown/kshutdown.spec b/redhat/applications/system/kshutdown/kshutdown.spec
index 8d34aed67..c7c463346 100644
--- a/redhat/applications/kshutdown/kshutdown.spec
+++ b/redhat/applications/system/kshutdown/kshutdown.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kshutdown
 %define tde_prefix /opt/trinity
@@ -60,7 +60,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -125,6 +125,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -163,7 +164,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kshutdown.desktop"
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README
+%doc AUTHORS ChangeLog COPYING README.md
 %{tde_bindir}/kshutdown
 %{tde_tdelibdir}/kshutdownlockout_panelapplet.la
 %{tde_tdelibdir}/kshutdownlockout_panelapplet.so
diff --git a/redhat/applications/ksystemlog/ksystemlog.spec b/redhat/applications/system/ksystemlog/ksystemlog.spec
index 52b4b5b27..e7d443300 100644
--- a/redhat/applications/ksystemlog/ksystemlog.spec
+++ b/redhat/applications/system/ksystemlog/ksystemlog.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg ksystemlog
 %define tde_prefix /opt/trinity
@@ -60,7 +60,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -97,39 +97,46 @@ quickly see problems occuring on their server.
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
 
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+# Warning: GCC visibility causes FTBFS [Bug #1285]
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DBUILD_ALL=ON \
+  ..
 
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
 
 
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
 
 # Missing category will make this fail.
 echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
@@ -143,7 +150,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README
+%doc AUTHORS COPYING README.md
 %{tde_bindir}/ksystemlog
 %{tde_tdeappdir}/ksystemlog.desktop
 %{tde_datadir}/apps/ksystemlog/
@@ -151,5 +158,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
 %{tde_datadir}/icons/hicolor/*/apps/ksystemlog.png
 %{tde_datadir}/icons/hicolor/*/apps/ksystemlog.svgz
 %{tde_tdedocdir}/HTML/en/ksystemlog/
+%{tde_mandir}/man1/ksystemlog.1*
+
 
 %changelog
diff --git a/redhat/applications/kvkbd/kvkbd.spec b/redhat/applications/system/kvkbd/kvkbd.spec
index 26d803011..c5f3283ff 100644
--- a/redhat/applications/kvkbd/kvkbd.spec
+++ b/redhat/applications/system/kvkbd/kvkbd.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kvkbd
 %define tde_prefix /opt/trinity
@@ -60,7 +60,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -118,6 +118,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -157,7 +158,7 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README
+%doc AUTHORS COPYING README.md
 %{tde_bindir}/kvkbd
 %{tde_tdeappdir}/kvkbd.desktop
 %{tde_datadir}/apps/kvkbd/
diff --git a/redhat/applications/system/polkit-agent-tde/polkit-agent-tde.spec b/redhat/applications/system/polkit-agent-tde/polkit-agent-tde.spec
new file mode 100644
index 000000000..a2b1220c7
--- /dev/null
+++ b/redhat/applications/system/polkit-agent-tde/polkit-agent-tde.spec
@@ -0,0 +1,132 @@
+#
+# spec file for package polkit-agent-tde (version R14)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# TDE variables
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg polkit-agent-tde
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
+%define tde_datadir %{tde_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
+%define tde_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Version:	0.99.1
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	TDE dialogs for PolicyKit
+Group:		Environment/Desktop
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	libpolkit-tqt-devel
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	libtool
+
+%description
+PolicyKit is an application-level toolkit for defining and handling the policy
+that allows unprivileged processes to speak to privileged processes.
+
+It is a framework for centralizing the decision making process with respect to
+granting access to privileged operations for unprivileged (desktop) applications.
+
+PolicyKit-agent-tde provides a D-Bus session bus service that is used to
+bring up authentication dialogs used for obtaining privileges.
+
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DBUILD_ALL=ON \
+  -DWITH_ALL_OPTIONS=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+%find_lang %{tde_pkg}
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%{_bindir}/polkit-agent-tde
+%dir %{_datadir}/autostart
+%{_datadir}/autostart/polkit-agent-tde.desktop
+
+
+%changelog
diff --git a/redhat/applications/smartcardauth/smartcardauth.spec b/redhat/applications/system/smartcardauth/smartcardauth.spec
index 6f440a1d9..e001dfcd3 100644
--- a/redhat/applications/smartcardauth/smartcardauth.spec
+++ b/redhat/applications/system/smartcardauth/smartcardauth.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg smartcardauth
 %define tde_prefix /opt/trinity
@@ -66,7 +66,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -173,6 +173,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
   \
diff --git a/redhat/applications/smartcardauth/trinity-smartcardauth-rpmlintrc b/redhat/applications/system/smartcardauth/trinity-smartcardauth-rpmlintrc
index 7dc0bac20..7dc0bac20 100644
--- a/redhat/applications/smartcardauth/trinity-smartcardauth-rpmlintrc
+++ b/redhat/applications/system/smartcardauth/trinity-smartcardauth-rpmlintrc
diff --git a/redhat/applications/tastymenu/tastymenu.spec b/redhat/applications/system/tastymenu/tastymenu.spec
index 4ed1ff0c7..5e5c75ba8 100644
--- a/redhat/applications/tastymenu/tastymenu.spec
+++ b/redhat/applications/system/tastymenu/tastymenu.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tastymenu
 %define tde_prefix /opt/trinity
@@ -62,7 +62,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -117,6 +117,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/tdedocker/tdedocker.spec b/redhat/applications/system/tdedocker/tdedocker.spec
index 61697f190..5812749bf 100644
--- a/redhat/applications/tdedocker/tdedocker.spec
+++ b/redhat/applications/system/tdedocker/tdedocker.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tdedocker
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -146,6 +146,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/tdepowersave/tdepowersave.spec b/redhat/applications/system/tdepowersave/tdepowersave.spec
index 436090fee..296de3b4c 100644
--- a/redhat/applications/tdepowersave/tdepowersave.spec
+++ b/redhat/applications/system/tdepowersave/tdepowersave.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tdepowersave
 %define tde_prefix /opt/trinity
@@ -63,7 +63,8 @@ BuildRequires:	desktop-file-utils
 BuildRequires:	libdbus-tqt-1-devel >= %{tde_epoch}:0.63
 BuildRequires:	libdbus-1-tqt-devel >= %{tde_epoch}:0.9
 
-BuildRequires:	cmake libtool
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires: libtool
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -86,7 +87,8 @@ BuildRequires:	libudev-devel
 
 # XSCREENSAVER support
 #  Disabled on RHEL4
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?suse_version}
+#  RHEL 8: available in EPEL
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
 %define with_xscreensaver 1
 %if 0%{?rhel} == 5
 BuildRequires:	xorg-x11-proto-devel
@@ -115,7 +117,7 @@ BuildRequires:	libidn-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gamin 1
 BuildRequires:	gamin-devel
 %endif
@@ -124,8 +126,8 @@ BuildRequires:	gamin-devel
 BuildRequires:	openssl-devel
 
 
-Obsoletes:		trinity-kpowersave < %{version}-%{release}
-Provides:		trinity-kpowersave = %{version}-%{release}
+Obsoletes:		trinity-kpowersave < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kpowersave = %{?epoch:%{epoch}:}%{version}-%{release}
 
 
 %description
@@ -186,6 +188,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -230,7 +233,7 @@ fi
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%doc AUTHORS ChangeLog COPYING TODO
 %{tde_bindir}/tdepowersave
 %{tde_libdir}/libtdeinit_tdepowersave.la
 %{tde_libdir}/libtdeinit_tdepowersave.so
diff --git a/redhat/applications/system/tdesshaskpass/tdesshaskpass.spec b/redhat/applications/system/tdesshaskpass/tdesshaskpass.spec
new file mode 100644
index 000000000..93c72ba6f
--- /dev/null
+++ b/redhat/applications/system/tdesshaskpass/tdesshaskpass.spec
@@ -0,0 +1,160 @@
+#
+# spec file for package tdesshaskpass (version R14)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg tdesshaskpass
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
+%define tde_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.4.1
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	interactively prompt users for a passphrase for ssh-add
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+%if 0%{?sle_version} >= 150200
+Requires:		openssh
+%else
+Requires:		openssh-clients
+%endif
+
+%description
+A TDE version of ssh-askpass with TDEWallet support.
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+  -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
+  -DLIB_INSTALL_DIR="%{tde_libdir}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DBUILD_ALL=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_TRANSLATIONS=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%doc ChangeLog COPYING README.md
+%{tde_bindir}/*
+%{tde_mandir}/man1/*.1*
+
+
+%changelog
diff --git a/redhat/applications/yakuake/yakuake.spec b/redhat/applications/system/yakuake/yakuake.spec
index c52be4cde..849b49201 100644
--- a/redhat/applications/yakuake/yakuake.spec
+++ b/redhat/applications/system/yakuake/yakuake.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg yakuake
 %define tde_prefix /opt/trinity
@@ -60,7 +60,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -115,6 +115,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/tdeio/tdeio-appinfo/tdeio-appinfo.spec b/redhat/applications/tdeio/tdeio-appinfo/tdeio-appinfo.spec
new file mode 100644
index 000000000..1fecbfec7
--- /dev/null
+++ b/redhat/applications/tdeio/tdeio-appinfo/tdeio-appinfo.spec
@@ -0,0 +1,160 @@
+#
+# spec file for package tdeio-appinfo (version R14)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg tdeio-appinfo
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
+%define tde_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.3
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	TDEIO slave for the appinfo protocol
+Group:		Productivity/Networking/Ftp/Clients
+URL:		http://lukeplant.me.uk/kio-appinfo/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
+%description
+Adds support for the "appinfo:" protocol
+to Konqueror and other TDE applications.
+.
+This enables you to perform appinfo: searches in TDE.
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+  -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
+  -DLIB_INSTALL_DIR="%{tde_libdir}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DBUILD_ALL=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_TRANSLATIONS=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+%__rm -rf %{?buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+
+%clean
+%__rm -rf %{?buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING README.md
+%{tde_tdelibdir}/tdeio_appinfo.la
+%{tde_tdelibdir}/tdeio_appinfo.so
+%{tde_datadir}/services/appinfo.protocol
+
+
+%changelog
diff --git a/redhat/applications/tdeio-apt/tdeio-apt.spec b/redhat/applications/tdeio/tdeio-apt/tdeio-apt.spec
index 547abe0ab..21e330cf7 100644
--- a/redhat/applications/tdeio-apt/tdeio-apt.spec
+++ b/redhat/applications/tdeio/tdeio-apt/tdeio-apt.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tdeio-apt
 %define tde_prefix /opt/trinity
@@ -60,7 +60,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -118,6 +118,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -141,14 +142,14 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot} -C build
 
-%find_lang %{tde_pkg}
+%find_lang tdeio_apt
 
 
 %clean
 %__rm -rf %{buildroot}
 
 
-%files -f %{tde_pkg}.lang
+%files -f tdeio_apt.lang
 %defattr(-,root,root,-)
 %doc AUTHORS CHANGELOG ChangeLog COPYING
 %{tde_tdelibdir}/tdeio_apt.la
diff --git a/redhat/applications/tdeio-ftps/tdeio-ftps.spec b/redhat/applications/tdeio/tdeio-ftps/tdeio-ftps.spec
index 6a1b7e55e..c8e84f7e9 100644
--- a/redhat/applications/tdeio-ftps/tdeio-ftps.spec
+++ b/redhat/applications/tdeio/tdeio-ftps/tdeio-ftps.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tdeio-ftps
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -85,8 +85,8 @@ BuildRequires:	update-desktop-files
 BuildRequires:	brp-check-trinity
 %endif
 
-Obsoletes:		trinity-kio-ftps < %{version}-%{release}
-Provides:		trinity-kio-ftps < %{version}-%{release}
+Obsoletes:		trinity-kio-ftps < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kio-ftps = %{?epoch:%{epoch}:}%{version}-%{release}
 
 
 %description
@@ -121,6 +121,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -144,17 +145,17 @@ fi
 %__rm -rf %{?buildroot}
 %__make install DESTDIR=%{buildroot} -C build
 
-%find_lang %{tde_pkg}
+%find_lang tdeio_ftps
 
 
 %clean
 %__rm -rf %{?buildroot}
 
 
-%files -f %{tde_pkg}.lang
+%files -f tdeio_ftps.lang
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
-%doc README Changelog COPYING AUTHORS
+%doc README.md Changelog COPYING AUTHORS
 %{tde_tdelibdir}/tdeio_ftps.la
 %{tde_tdelibdir}/tdeio_ftps.so
 %{tde_datadir}/services/ftps.protocol
diff --git a/redhat/applications/tdeio-gopher/tdeio-gopher.spec b/redhat/applications/tdeio/tdeio-gopher/tdeio-gopher.spec
index 24a4c6847..dbef03ad3 100644
--- a/redhat/applications/tdeio-gopher/tdeio-gopher.spec
+++ b/redhat/applications/tdeio/tdeio-gopher/tdeio-gopher.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tdeio-gopher
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -72,9 +72,6 @@ BuildRequires:	libacl-devel
 # IDN support
 BuildRequires:	libidn-devel
 
-# OPENSSL support
-BuildRequires:	openssl-devel
-
 # SUSE desktop files utility
 %if 0%{?suse_version}
 BuildRequires:	update-desktop-files
@@ -85,9 +82,6 @@ BuildRequires:	update-desktop-files
 BuildRequires:	brp-check-trinity
 %endif
 
-Obsoletes:		trinity-kio-gopher < %{version}-%{release}
-Provides:		trinity-kio-gopher < %{version}-%{release}
-
 
 %description
 Adds support for the "gopher:" protocol
@@ -123,6 +117,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -146,40 +141,41 @@ fi
 %__rm -rf %{?buildroot}
 %__make install DESTDIR=%{buildroot} -C build
 
-%find_lang %{tde_pkg}
+%find_lang tdeio_gopher
 
 
 %clean
 %__rm -rf %{?buildroot}
 
 
-%files -f %{tde_pkg}.lang
+%files -f tdeio_gopher.lang
 %defattr(-,root,root,-)
 %doc ChangeLog COPYING FAQ README VERSION
 %{tde_tdelibdir}/tdeio_gopher.la
 %{tde_tdelibdir}/tdeio_gopher.so
 %{tde_datadir}/services/gopher.protocol
-%lang(ca) %{tde_tdedocdir}/HTML/ca/tdeio-gopher/
-%lang(da) %{tde_tdedocdir}/HTML/da/tdeio-gopher/
-%lang(de) %{tde_tdedocdir}/HTML/de/tdeio-gopher/
-%lang(en) %{tde_tdedocdir}/HTML/en/tdeioslave/gopher/
-%lang(en_GB) %{tde_tdedocdir}/HTML/en_GB/tdeio-gopher/
-%lang(es) %{tde_tdedocdir}/HTML/es/tdeio-gopher/
-%lang(et) %{tde_tdedocdir}/HTML/et/tdeio-gopher/
-%lang(fr) %{tde_tdedocdir}/HTML/fr/tdeio-gopher/
-%lang(gl) %{tde_tdedocdir}/HTML/gl/tdeio-gopher/
-%lang(hu) %{tde_tdedocdir}/HTML/hu/tdeio-gopher/
-%lang(it) %{tde_tdedocdir}/HTML/it/tdeio-gopher/
-%lang(nl) %{tde_tdedocdir}/HTML/nl/tdeio-gopher/
-%lang(pl) %{tde_tdedocdir}/HTML/pl/tdeio-gopher/
-%lang(pt) %{tde_tdedocdir}/HTML/pt/tdeio-gopher/
-%lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/tdeio-gopher/
-%lang(ro) %{tde_tdedocdir}/HTML/ro/tdeio-gopher/
-%lang(ru) %{tde_tdedocdir}/HTML/ru/tdeio-gopher/
-%lang(sr) %{tde_tdedocdir}/HTML/sr/tdeio-gopher/
-%lang(sr@Latn) %{tde_tdedocdir}/HTML/sr@Latn/tdeio-gopher/
-%lang(sv) %{tde_tdedocdir}/HTML/sv/tdeio-gopher/
-%lang(uk) %{tde_tdedocdir}/HTML/uk/tdeio-gopher/
+%lang(ca) %{tde_tdedocdir}/HTML/ca/tdeioslave/
+%lang(da) %{tde_tdedocdir}/HTML/da/tdeioslave/
+%lang(de) %{tde_tdedocdir}/HTML/de/tdeioslave/
+%lang(en) %{tde_tdedocdir}/HTML/en/tdeioslave/
+%lang(en_GB) %{tde_tdedocdir}/HTML/en_GB/tdeioslave/
+%lang(es) %{tde_tdedocdir}/HTML/es/tdeioslave/
+%lang(et) %{tde_tdedocdir}/HTML/et/tdeioslave/
+%lang(fr) %{tde_tdedocdir}/HTML/fr/tdeioslave/
+%lang(gl) %{tde_tdedocdir}/HTML/gl/tdeioslave/
+%lang(hu) %{tde_tdedocdir}/HTML/hu/tdeioslave/
+%lang(it) %{tde_tdedocdir}/HTML/it/tdeioslave/
+%lang(nl) %{tde_tdedocdir}/HTML/nl/tdeioslave/
+%lang(pl) %{tde_tdedocdir}/HTML/pl/tdeioslave/
+%lang(pt) %{tde_tdedocdir}/HTML/pt/tdeioslave/
+%lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/tdeioslave/
+%lang(ro) %{tde_tdedocdir}/HTML/ro/tdeioslave/
+%lang(ru) %{tde_tdedocdir}/HTML/ru/tdeioslave/
+%lang(sk) %{tde_tdedocdir}/HTML/sk/tdeioslave/
+%lang(sr) %{tde_tdedocdir}/HTML/sr/tdeioslave/
+%lang(sr@Latn) %{tde_tdedocdir}/HTML/sr@Latn/tdeioslave/
+%lang(sv) %{tde_tdedocdir}/HTML/sv/tdeioslave/
+%lang(uk) %{tde_tdedocdir}/HTML/uk/tdeioslave/
 
 
 %changelog
diff --git a/redhat/applications/tdeio-locate/tdeio-locate.spec b/redhat/applications/tdeio/tdeio-locate/tdeio-locate.spec
index 7b95bc677..5d3339de7 100644
--- a/redhat/applications/tdeio-locate/tdeio-locate.spec
+++ b/redhat/applications/tdeio/tdeio-locate/tdeio-locate.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tdeio-locate
 %define tde_prefix /opt/trinity
@@ -60,7 +60,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	libtool
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
@@ -84,7 +84,7 @@ BuildRequires:	libidn-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gamin 1
 BuildRequires:	gamin-devel
 %endif
@@ -92,8 +92,8 @@ BuildRequires:	gamin-devel
 # OPENSSL support
 BuildRequires:	openssl-devel
 
-Obsoletes:		trinity-kio-locate < %{version}-%{release}
-Provides:		trinity-kio-locate = %{version}-%{release}
+Obsoletes:		trinity-kio-locate < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kio-locate = %{?epoch:%{epoch}:}%{version}-%{release}
 
 
 %description
@@ -133,6 +133,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -155,19 +156,20 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot} -C build
 
-%find_lang %{tde_pkg}
+%find_lang tdeio_locate
+
 
 %clean
 %__rm -rf %{buildroot}
 
 
 
-%files -f %{tde_pkg}.lang
+%files -f tdeio_locate.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING TODO
 %{tde_tdelibdir}/tdeio_locate.la
 %{tde_tdelibdir}/tdeio_locate.so
-%{tde_tdedocdir}/HTML/en/tdeio-locate/
+%{tde_tdedocdir}/HTML/en/tdeioslave/locate/
 %{tde_datadir}/services/locate.protocol
 %{tde_datadir}/services/locater.protocol
 %{tde_datadir}/services/rlocate.protocol
diff --git a/redhat/applications/tdeio-sword/tdeio-sword.spec b/redhat/applications/tdeio/tdeio-sword/tdeio-sword.spec
index 3986a87ce..6d0ca5158 100644
--- a/redhat/applications/tdeio-sword/tdeio-sword.spec
+++ b/redhat/applications/tdeio/tdeio-sword/tdeio-sword.spec
@@ -23,7 +23,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tdeio-sword
 %define tde_prefix /opt/trinity
@@ -66,7 +66,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -131,6 +131,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -154,20 +155,20 @@ fi
 %__rm -rf %{?buildroot}
 %__make install DESTDIR=%{buildroot} -C build
 
-%find_lang %{tde_pkg}
+%find_lang tdeio_sword
 
 
 %clean
 %__rm -rf %{?buildroot}
 
 
-%files -f %{tde_pkg}.lang
+%files -f tdeio_sword.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
+%doc AUTHORS ChangeLog COPYING README.md TODO
 %{tde_tdelibdir}/tdeio_sword.la
 %{tde_tdelibdir}/tdeio_sword.so
 %{tde_datadir}/apps/tdeio_sword/
-%{tde_tdedocdir}/HTML/en/tdeio_sword/
+%{tde_tdedocdir}/HTML/en/tdeioslave/sword/
 %{tde_datadir}/icons/hicolor/*/apps/tdeio_sword.png
 %{tde_datadir}/icons/hicolor/scalable/apps/tdeio_sword.svgz
 %{tde_datadir}/services/sword.protocol
diff --git a/redhat/applications/tdeio-umountwrapper/media_safelyremove.desktop b/redhat/applications/tdeio/tdeio-umountwrapper/media_safelyremove.desktop
index 22b716ad5..22b716ad5 100644
--- a/redhat/applications/tdeio-umountwrapper/media_safelyremove.desktop
+++ b/redhat/applications/tdeio/tdeio-umountwrapper/media_safelyremove.desktop
diff --git a/redhat/applications/tdeio-umountwrapper/media_safelyremove.desktop_tdeio b/redhat/applications/tdeio/tdeio-umountwrapper/media_safelyremove.desktop_tdeio
index 38fa25d92..38fa25d92 100644
--- a/redhat/applications/tdeio-umountwrapper/media_safelyremove.desktop_tdeio
+++ b/redhat/applications/tdeio/tdeio-umountwrapper/media_safelyremove.desktop_tdeio
diff --git a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper.spec b/redhat/applications/tdeio/tdeio-umountwrapper/tdeio-umountwrapper.spec
index 146dbd2c9..cfd75c0a6 100644
--- a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper.spec
+++ b/redhat/applications/tdeio/tdeio-umountwrapper/tdeio-umountwrapper.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tdeio-umountwrapper
 %define tde_prefix /opt/trinity
@@ -62,10 +62,10 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-Obsoletes:		trinity-kio-umountwrapper < %{version}-%{release}
-Provides:		trinity-kio-umountwrapper = %{version}-%{release}
+Obsoletes:		trinity-kio-umountwrapper < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kio-umountwrapper = %{?epoch:%{epoch}:}%{version}-%{release}
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -123,6 +123,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -179,7 +180,7 @@ fi
 
 %files -f tdeio_umountwrapper.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README
+%doc AUTHORS COPYING README.md
 %{tde_bindir}/tdeio_umountwrapper
 %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdeio-umountwrapper
 %dir %{tde_datadir}/apps/d3lphin
diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine.spec b/redhat/applications/themes/gtk-qt-engine/gtk-qt-engine.spec
index 64d3d96a2..8c42846fb 100644
--- a/redhat/applications/gtk-qt-engine/gtk-qt-engine.spec
+++ b/redhat/applications/themes/gtk-qt-engine/gtk-qt-engine.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg gtk-qt-engine
 %define tde_prefix /opt/trinity
@@ -56,9 +56,6 @@ Prefix:			%{_prefix}
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Source1:		gtk-qt-engine.rc.sh
-Source2:		gtkrc-2.0-kde4
-Source3:		gtkrc-2.0-kde-kde4
 
 
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
@@ -66,7 +63,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
-BuildRequires:	cmake
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -136,6 +133,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -154,29 +152,20 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot} -C build
 
-%find_lang gtkqtengine
-
-# Adds TDE's specific GTKRC
-%__install -D -m 644 "%{SOURCE1}" "%{buildroot}%{tde_datadir}/apps/kgtk/gtk-qt-engine.rc.sh"
-%__install -D -m 644 "%{SOURCE2}" "%{buildroot}%{tde_datadir}/apps/kgtk/.gtkrc-2.0-kde4"
-%__install -D -m 644 "%{SOURCE3}" "%{buildroot}%{tde_datadir}/apps/kgtk/.gtkrc-2.0-kde-kde4"
+%find_lang %{tde_pkg}
 
 
 %clean
 %__rm -rf %{buildroot}
 
 
-%files -f gtkqtengine.lang
+%files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%doc AUTHORS ChangeLog COPYING TODO
 %{tde_tdelibdir}/kcm_kcmgtk.la
 %{tde_tdelibdir}/kcm_kcmgtk.so
-%{tde_appdir}/kcmgtk.desktop
-%dir %{tde_datadir}/apps/kgtk
-%{tde_datadir}/apps/kgtk/gtk-qt-engine.rc.sh
-%{tde_datadir}/apps/kgtk/.gtkrc-2.0-kde4
-%{tde_datadir}/apps/kgtk/.gtkrc-2.0-kde-kde4
-%{tde_tdedocdir}/HTML/en/kcmgtk/
+%{tde_tdeappdir}/kcmgtk.desktop
+%{tde_tdedocdir}/HTML/en/kcontrol/gtk/
 
 # The following files are outside TDE's directory
 %dir %{_libdir}/gtk-2.0
diff --git a/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine.spec b/redhat/applications/themes/gtk3-tqt-engine/gtk3-tqt-engine.spec
index 7ddacc4fc..320480e0d 100644
--- a/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine.spec
+++ b/redhat/applications/themes/gtk3-tqt-engine/gtk3-tqt-engine.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg gtk3-tqt-engine
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/kgtk-qt3/kgtk-qt3.spec b/redhat/applications/themes/kgtk-qt3/kgtk-qt3.spec
index e86166a02..ec3311356 100644
--- a/redhat/applications/kgtk-qt3/kgtk-qt3.spec
+++ b/redhat/applications/themes/kgtk-qt3/kgtk-qt3.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kgtk-qt3
 %define tde_prefix /opt/trinity
@@ -62,7 +62,8 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	cmake libtool
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires: libtool
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -88,7 +89,7 @@ BuildRequires:	gtk+2.0-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gamin 1
 BuildRequires:	gamin-devel
 %endif
@@ -138,6 +139,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin.spec b/redhat/applications/themes/ksplash-engine-moodin/ksplash-engine-moodin.spec
index fecce0c55..be7398d7d 100644
--- a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin.spec
+++ b/redhat/applications/themes/ksplash-engine-moodin/ksplash-engine-moodin.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg ksplash-engine-moodin
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -129,6 +129,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine.spec b/redhat/applications/themes/qt4-tqt-theme-engine/qt4-tqt-theme-engine.spec
index 7c0b6df57..9fdca0ed1 100644
--- a/redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine.spec
+++ b/redhat/applications/themes/qt4-tqt-theme-engine/qt4-tqt-theme-engine.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg qt4-tqt-theme-engine
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/tde-style-baghira/tde-style-baghira.spec b/redhat/applications/themes/tde-style-baghira/tde-style-baghira.spec
index 60742bff6..e9ab3d09a 100644
--- a/redhat/applications/tde-style-baghira/tde-style-baghira.spec
+++ b/redhat/applications/themes/tde-style-baghira/tde-style-baghira.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tde-style-baghira
 %define tde_prefix /opt/trinity
@@ -62,7 +62,7 @@ Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 BuildRequires:          trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:          trinity-tdebase-devel >= %{tde_version}
 
-BuildRequires:	cmake
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -102,6 +102,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -143,6 +144,7 @@ export PATH="%{tde_bindir}:${PATH}"
 %{tde_tdelibdir}/twin_baghira_config.so
 %{tde_libdir}/usermanager_panelapplet.la
 %{tde_libdir}/usermanager_panelapplet.so
+%{tde_tdeappdir}/bab.desktop
 %{tde_datadir}/apps/baghira/
 %{tde_datadir}/apps/kicker/applets/baghira-starter.desktop
 %{tde_datadir}/apps/kicker/applets/baghira-usermanager.desktop
diff --git a/redhat/applications/tde-style-domino/tde-style-domino.spec b/redhat/applications/themes/tde-style-domino/tde-style-domino.spec
index 4578ccad2..ce45f8729 100644
--- a/redhat/applications/tde-style-domino/tde-style-domino.spec
+++ b/redhat/applications/themes/tde-style-domino/tde-style-domino.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tde-style-domino
 %define tde_prefix /opt/trinity
@@ -62,7 +62,7 @@ Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 BuildRequires:          trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:          trinity-tdebase-devel >= %{tde_version}
 
-BuildRequires:	cmake
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -98,6 +98,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/tde-style-ia-ora/tde-style-ia-ora.spec b/redhat/applications/themes/tde-style-ia-ora/tde-style-ia-ora.spec
index 9c564b2af..a93f4b5d6 100644
--- a/redhat/applications/tde-style-ia-ora/tde-style-ia-ora.spec
+++ b/redhat/applications/themes/tde-style-ia-ora/tde-style-ia-ora.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tde-style-ia-ora
 %define tde_prefix /opt/trinity
@@ -60,7 +60,7 @@ Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -76,8 +76,8 @@ BuildRequires:	openssl-devel
 
 Requires:	trinity-twin
 
-Obsoletes:	trinity-style-ia-ora < %{version}-%{release}
-Provides:	trinity-style-ia-ora = %{version}-%{release}
+Obsoletes:	trinity-style-ia-ora < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-style-ia-ora = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description
 Mandriva theme for Trinity
@@ -106,6 +106,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/tde-style-lipstik/tde-style-lipstik.spec b/redhat/applications/themes/tde-style-lipstik/tde-style-lipstik.spec
index f7d335b2e..a51a4451e 100644
--- a/redhat/applications/tde-style-lipstik/tde-style-lipstik.spec
+++ b/redhat/applications/themes/tde-style-lipstik/tde-style-lipstik.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tde-style-lipstik
 %define tde_prefix /opt/trinity
@@ -56,16 +56,16 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-Obsoletes:		trinity-kde-style-lipstik < %{version}-%{release}
-Provides:		trinity-kde-style-lipstik = %{version}-%{release}
-Obsoletes:		trinity-style-lipstik < %{version}-%{release}
-Provides:		trinity-style-lipstik = %{version}-%{release}
+Obsoletes:		trinity-kde-style-lipstik < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-style-lipstik = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-style-lipstik < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-style-lipstik = %{?epoch:%{epoch}:}%{version}-%{release}
 
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -121,6 +121,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
   \
diff --git a/redhat/applications/tde-style-qtcurve/tde-style-qtcurve.spec b/redhat/applications/themes/tde-style-qtcurve/tde-style-qtcurve.spec
index 3d8e85270..bbda03969 100644
--- a/redhat/applications/tde-style-qtcurve/tde-style-qtcurve.spec
+++ b/redhat/applications/themes/tde-style-qtcurve/tde-style-qtcurve.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tde-style-qtcurve
 %define tde_prefix /opt/trinity
@@ -61,7 +61,8 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	cmake libtool
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires: libtool
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -84,7 +85,7 @@ BuildRequires:	libacl-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gamin 1
 BuildRequires:	gamin-devel
 %endif
@@ -93,10 +94,10 @@ BuildRequires:	gamin-devel
 BuildRequires:	openssl-devel
 
 
-Obsoletes:		trinity-kde-style-qtcurve < %{version}-%{release}
-Provides:		trinity-kde-style-qtcurve = %{version}-%{release}
-Obsoletes:		trinity-style-qtcurve < %{version}-%{release}
-Provides:		trinity-style-qtcurve = %{version}-%{release}
+Obsoletes:		trinity-kde-style-qtcurve < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-style-qtcurve = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-style-qtcurve < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-style-qtcurve = %{?epoch:%{epoch}:}%{version}-%{release}
 
 
 %description
@@ -146,6 +147,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/tdmtheme/tdmtheme.spec b/redhat/applications/themes/tdmtheme/tdmtheme.spec
index 81cdf3fe7..4a257ea81 100644
--- a/redhat/applications/tdmtheme/tdmtheme.spec
+++ b/redhat/applications/themes/tdmtheme/tdmtheme.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tdmtheme
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -85,8 +85,8 @@ BuildRequires:	update-desktop-files
 BuildRequires:	brp-check-trinity
 %endif
 
-Obsoletes:		trinity-kdmtheme < %{version}-%{release}
-Provides:		trinity-kdmtheme = %{version}-%{release}
+Obsoletes:		trinity-kdmtheme < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kdmtheme = %{?epoch:%{epoch}:}%{version}-%{release}
 
 
 %description
@@ -120,6 +120,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/twin-style-crystal/twin-style-crystal.spec b/redhat/applications/themes/twin-style-crystal/twin-style-crystal.spec
index 83ded3f57..7993d0589 100644
--- a/redhat/applications/twin-style-crystal/twin-style-crystal.spec
+++ b/redhat/applications/themes/twin-style-crystal/twin-style-crystal.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg twin-style-crystal
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -76,8 +76,8 @@ BuildRequires:	update-desktop-files
 BuildRequires:	brp-check-trinity
 %endif
 
-Obsoletes:	trinity-kwin-style-crystal < %{version}-%{release}
-Provides:	trinity-kwin-style-crystal = %{version}-%{release}
+Obsoletes:	trinity-kwin-style-crystal < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kwin-style-crystal = %{?epoch:%{epoch}:}%{version}-%{release}
 
 
 %description
@@ -100,40 +100,41 @@ And it is of course nice to look at. Upstream says:
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
 
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 
-# Warning: --enable-gcc-visibility makes decoration unusable.
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
+  -DBUILD_ALL=ON \
+  -DWITH_ALL_OPTIONS=ON \
+  ..
 
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
 
 
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
 
 
 %clean
diff --git a/redhat/applications/themes/twin-style-dekorator/twin-style-dekorator.spec b/redhat/applications/themes/twin-style-dekorator/twin-style-dekorator.spec
new file mode 100644
index 000000000..342a881ba
--- /dev/null
+++ b/redhat/applications/themes/twin-style-dekorator/twin-style-dekorator.spec
@@ -0,0 +1,159 @@
+#
+# spec file for package twin-style-dekorator (version R14)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg twin-style-dekorator
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
+%define tde_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	1.0.5
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Semi transparant window decoration for Trinity
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
+%description
+Crystal offers you pseudo transparent titlebar, buttons and borders
+transparent, so you can see more of your lovely background image
+Transparancy and buttons can be costumized to match your wishes.
+Offers rounded corners as well
+
+And it is of course nice to look at. Upstream says:
+"- Don't forget to breathe, while drooling."
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+# Warning: GCC visibility causes FTBFS [Bug #1285]
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DBUILD_ALL=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{tde_tdelibdir}/twin3_deKorator.la
+%{tde_tdelibdir}/twin3_deKorator.so
+%{tde_tdelibdir}/twin_deKorator_config.la
+%{tde_tdelibdir}/twin_deKorator_config.so
+%{tde_datadir}/apps/deKorator/
+%{tde_datadir}/apps/twin/deKorator.desktop
+
+
+%changelog
diff --git a/redhat/applications/themes/twin-style-machbunt/twin-style-machbunt.spec b/redhat/applications/themes/twin-style-machbunt/twin-style-machbunt.spec
new file mode 100644
index 000000000..5d17ee631
--- /dev/null
+++ b/redhat/applications/themes/twin-style-machbunt/twin-style-machbunt.spec
@@ -0,0 +1,153 @@
+#
+# spec file for package twin-style-machbunt (version R14)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg twin-style-machbunt
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
+%define tde_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.1
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	TDE window decoration from SUSE 9.1/9.2
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
+%description
+This is a port of the KDE Window decoration extracted from SUSE 9.1/9.2.
+
+An example color scheme is provided too.
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+# Warning: GCC visibility causes FTBFS [Bug #1285]
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DBUILD_ALL=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{tde_tdelibdir}/twin3_MachBunt.la
+%{tde_tdelibdir}/twin3_MachBunt.so
+%{tde_datadir}/apps/tdedisplay/color-schemes/MachBunt.kcsrc
+%{tde_datadir}/apps/twin/MachBunt.desktop
+
+
+%changelog
diff --git a/redhat/applications/themes/twin-style-suse2/twin-style-suse2.spec b/redhat/applications/themes/twin-style-suse2/twin-style-suse2.spec
new file mode 100644
index 000000000..a7cb50bf4
--- /dev/null
+++ b/redhat/applications/themes/twin-style-suse2/twin-style-suse2.spec
@@ -0,0 +1,158 @@
+#
+# spec file for package twin-style-suse2 (version R14)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg twin-style-suse2
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
+%define tde_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	1.0.5
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	TDE window decoration from SUSE 9.3
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
+%description
+This is a port of the SUSE 9.3 KDE Window decoration extracted from SUSE.
+
+It features in additon to the original theme several new button
+styles and a changeable titlebar image.
+
+A color scheme for TDE is provided too.
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+  -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
+  -DLIB_INSTALL_DIR="%{tde_libdir}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  \
+  -DBUILD_ALL=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_TRANSLATIONS=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+%find_lang %{tde_pkg}
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING README TODO
+%{tde_tdelibdir}/twin3_SUSE2.la
+%{tde_tdelibdir}/twin3_SUSE2.so
+%{tde_tdelibdir}/twin_SUSE2_config.la
+%{tde_tdelibdir}/twin_SUSE2_config.so
+%{tde_datadir}/apps/tdedisplay/color-schemes/SUSE2.kcsrc
+%{tde_datadir}/apps/twin/SUSE2.desktop
+%{tde_datadir}/apps/twin/pics/SUSE2/
+
+
+%changelog
diff --git a/redhat/applications/abakus/abakus.spec b/redhat/applications/utilities/abakus/abakus.spec
index b913bc253..04c4b1aad 100644
--- a/redhat/applications/abakus/abakus.spec
+++ b/redhat/applications/utilities/abakus/abakus.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg abakus
 %define tde_prefix /opt/trinity
@@ -60,7 +60,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -75,7 +75,7 @@ BuildRequires:	libidn-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gamin 1
 BuildRequires:	gamin-devel
 %endif
@@ -131,6 +131,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -168,6 +169,7 @@ export PATH="%{tde_bindir}:${PATH}"
 %{tde_datadir}/icons/hicolor/*/apps/abakus.png
 %{tde_tdedocdir}/HTML/en/abakus/
 %{tde_tdeappdir}/abakus.desktop
+%{tde_mandir}/man1/abakus.1*
 
 
 %changelog
diff --git a/redhat/applications/filelight-l10n/filelight-l10n.spec b/redhat/applications/utilities/filelight-l10n/filelight-l10n.spec
index 1525e5eb3..1525e5eb3 100644
--- a/redhat/applications/filelight-l10n/filelight-l10n.spec
+++ b/redhat/applications/utilities/filelight-l10n/filelight-l10n.spec
diff --git a/redhat/applications/filelight/filelight.spec b/redhat/applications/utilities/filelight/filelight.spec
index 8b1766f3a..c89c62e87 100644
--- a/redhat/applications/filelight/filelight.spec
+++ b/redhat/applications/utilities/filelight/filelight.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg filelight
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -70,7 +70,7 @@ BuildRequires:	libidn-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gamin 1
 BuildRequires:	gamin-devel
 %endif
@@ -94,8 +94,8 @@ BuildRequires:	update-desktop-files
 BuildRequires:	brp-check-trinity
 %endif
 
-Obsoletes:	filelight-l10n < %{version}-%{release}
-Provides:	filelight-l10n = %{version}-%{release}
+Obsoletes:	filelight-l10n < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	filelight-l10n = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description
 Filelight creates a complex, but data-rich graphical representation of the files and
@@ -127,6 +127,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_NO_BUILTIN_CHRPATH=ON \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
diff --git a/redhat/applications/kbarcode/kbarcode.spec b/redhat/applications/utilities/kbarcode/kbarcode.spec
index fdff819b0..1fed32a1f 100644
--- a/redhat/applications/kbarcode/kbarcode.spec
+++ b/redhat/applications/utilities/kbarcode/kbarcode.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kbarcode
 %define tde_prefix /opt/trinity
@@ -64,7 +64,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -173,6 +173,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/kchmviewer/kchmviewer.spec b/redhat/applications/utilities/kchmviewer/kchmviewer.spec
index 8aa0a7c5d..148d5ec8a 100644
--- a/redhat/applications/kchmviewer/kchmviewer.spec
+++ b/redhat/applications/utilities/kchmviewer/kchmviewer.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kchmviewer
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -141,6 +141,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -192,7 +193,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kchmviewer.desktop"
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc ChangeLog COPYING FAQ README
+%doc ChangeLog COPYING FAQ README.md
 %{tde_bindir}/kchmviewer
 %{tde_tdelibdir}/tdeio_msits.la
 %{tde_tdelibdir}/tdeio_msits.so
diff --git a/redhat/applications/kcpuload/kcpuload.spec b/redhat/applications/utilities/kcpuload/kcpuload.spec
index 0f833a3d6..4b2a2340c 100644
--- a/redhat/applications/kcpuload/kcpuload.spec
+++ b/redhat/applications/utilities/kcpuload/kcpuload.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kcpuload
 %define tde_prefix /opt/trinity
@@ -62,7 +62,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -120,6 +120,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/kdirstat/kdirstat.spec b/redhat/applications/utilities/kdirstat/kdirstat.spec
index 3094078c1..dcd7f2598 100644
--- a/redhat/applications/kdirstat/kdirstat.spec
+++ b/redhat/applications/utilities/kdirstat/kdirstat.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kdirstat
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -125,6 +125,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/keep/keep.spec b/redhat/applications/utilities/keep/keep.spec
index d2714ab1a..c480e868b 100644
--- a/redhat/applications/keep/keep.spec
+++ b/redhat/applications/utilities/keep/keep.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg keep
 %define tde_prefix /opt/trinity
@@ -62,7 +62,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -124,6 +124,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/knutclient/knutclient.spec b/redhat/applications/utilities/knutclient/knutclient.spec
index 3cf793b58..d2b7c8399 100644
--- a/redhat/applications/knutclient/knutclient.spec
+++ b/redhat/applications/utilities/knutclient/knutclient.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg knutclient
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -106,7 +106,7 @@ stations using an UPS.
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
 # Fix permissions
-chmod 644 AUTHORS README COPYING ChangeLog
+chmod 644 AUTHORS README.md COPYING ChangeLog
 
 
 %build
@@ -124,6 +124,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -167,7 +168,7 @@ fi
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README
+%doc AUTHORS ChangeLog COPYING README.md
 %{tde_bindir}/knutclient
 %{tde_tdeappdir}/knutclient.desktop
 %{tde_datadir}/apps/knutclient/knutclientui.rc
diff --git a/redhat/applications/utilities/kompose/kompose.spec b/redhat/applications/utilities/kompose/kompose.spec
new file mode 100644
index 000000000..6e5f55137
--- /dev/null
+++ b/redhat/applications/utilities/kompose/kompose.spec
@@ -0,0 +1,157 @@
+#
+# spec file for package kompose (version R14)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg kompose
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+%define tde_tdeappdir %{tde_appdir}/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:			trinity-%{tde_pkg}
+Summary:		Full-Screen Task Manager for TDE
+Version:		0.5.3
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+
+License:		GPLv2+
+Group:			Applications/Utilities
+
+Vendor:			Trinity Project
+Packager:		Francois Andriot <francois.andriot@free.fr>
+URL:			http://www.trinitydesktop.org/
+
+Prefix:			%{_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	gettext
+
+# IMLIB2 support
+BuildRequires:	imlib2-devel
+
+# XCOMPOSITE support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} >= 4
+%define xcomposite_devel %{_lib}xcomposite-devel
+%else
+%define xcomposite_devel %{_lib}xcomposite%{?mgaversion:1}-devel
+%endif
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
+%define xcomposite_devel libXcomposite-devel
+%endif
+%{?xcomposite_devel:BuildRequires: %{xcomposite_devel}}
+
+# XDAMAGE support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}xdamage-devel
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
+BuildRequires:	libXdamage-devel
+%endif
+
+
+%description
+Kompose creates a full-screen view in which every window is represented
+by a scaled screen shot of it. It appears as a panel applet.
+
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DBUILD_ALL=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+%find_lang %{tde_pkg}
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc README AUTHORS ChangeLog COPYING
+%{tde_bindir}/kompose
+%{tde_tdeappdir}/kompose.desktop
+%{tde_datadir}/apps/kompose/
+%{tde_tdedocdir}/HTML/en/kompose/
+%{tde_datadir}/icons/hicolor/16x16/apps/kompose.png
+%{tde_datadir}/icons/hicolor/32x32/apps/kompose.png
+
+
+%changelog
diff --git a/redhat/applications/krename/krename.spec b/redhat/applications/utilities/krename/krename.spec
index ed55a1b94..29f70adc8 100644
--- a/redhat/applications/krename/krename.spec
+++ b/redhat/applications/utilities/krename/krename.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg krename
 %define tde_prefix /opt/trinity
@@ -60,7 +60,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -118,6 +118,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_NO_BUILTIN_CHRPATH=ON \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
diff --git a/redhat/applications/ksensors/ksensors.spec b/redhat/applications/utilities/ksensors/ksensors.spec
index 3ac9a261a..9786d45b2 100644
--- a/redhat/applications/ksensors/ksensors.spec
+++ b/redhat/applications/utilities/ksensors/ksensors.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg ksensors
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -126,6 +126,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -163,7 +164,7 @@ fi
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING FAQ README TODO
+%doc AUTHORS ChangeLog COPYING FAQ README.md TODO
 %{tde_bindir}/ksensors
 %{tde_tdeappdir}/ksensors.desktop
 %{tde_datadir}/apps/ksensors/
diff --git a/redhat/applications/mathemagics/mathemagics.spec b/redhat/applications/utilities/mathemagics/mathemagics.spec
index c968c721b..61421491f 100644
--- a/redhat/applications/mathemagics/mathemagics.spec
+++ b/redhat/applications/utilities/mathemagics/mathemagics.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg mathemagics
 %define tde_prefix /opt/trinity
@@ -59,7 +59,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	cmake
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -88,6 +88,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
@@ -107,17 +108,19 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot} -C build
 
+%find_lang %{tde_pkg}
+
 
 %clean
 %__rm -rf $RPM_BUILD_ROOT
 
 
-%files
+%files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README
+%doc AUTHORS COPYING README.md
 %{tde_bindir}/mathemagics
 %{tde_tdeappdir}/mathemagics.desktop
-%{tde_datadir}/apps/mathemagics/mathemagicsui.rc
+%{tde_datadir}/apps/mathemagics/
 %{tde_datadir}/icons/hicolor/22x22/apps/mathemagics.png
 %{tde_datadir}/icons/hicolor/32x32/apps/mathemagics.png
 %{tde_datadir}/icons/hicolor/48x48/apps/mathemagics.png
diff --git a/redhat/applications/qalculate-tde/qalculate-tde.spec b/redhat/applications/utilities/qalculate-tde/qalculate-tde.spec
index 21c581105..5e690b485 100644
--- a/redhat/applications/qalculate-tde/qalculate-tde.spec
+++ b/redhat/applications/utilities/qalculate-tde/qalculate-tde.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
 %endif
 %define tde_pkg qalculate-tde
 %define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -109,32 +109,33 @@ This package contains the TDE user interface of qalculate.
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
 
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
+  -DBUILD_ALL=ON \
+  -DWITH_ALL_OPTIONS=ON \
+  ..
 
 %__make %{?_smp_mflags} || %__make
 
@@ -142,7 +143,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
 
 %find_lang qalculate_tde
 
@@ -158,13 +159,13 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %files -f qalculate_tde.lang
 %defattr(-,root,root,-)
-%{tde_bindir}/qalculate
 %{tde_bindir}/qalculate-tde
 %{tde_datadir}/apps/qalculate_tde/
 %{tde_tdeappdir}/qalculate_tde.desktop
 %{tde_tdedocdir}/HTML/en/qalculate_tde/
 %{tde_datadir}/icons/hicolor/*/apps/qalculate_tde.png
 %{tde_datadir}/icons/hicolor/*/actions/qalculate_convert.png
+%{tde_mandir}/man1/qalculate-tde.1*
 
 
 %changelog