RPM: update spec files for TDE 14.0.7

211 files changed, 1656 insertions, 3004 deletions

diff --git a/redhat/applications/abakus/abakus.spec b/redhat/applications/abakus/abakus.spec
index fe63fd198..71221b2bc 100644
--- a/redhat/applications/abakus/abakus.spec
+++ b/redhat/applications/abakus/abakus.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg abakus
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/adept/adept-14.0.0.spec b/redhat/applications/adept/adept.spec
index 62e996ddf..f0ec36aff 100644
--- a/redhat/applications/adept/adept-14.0.0.spec
+++ b/redhat/applications/adept/adept.spec
@@ -18,7 +18,7 @@
 # Default version for this component
 %define tde_pkg adept
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 
 # TDE specific building variables
diff --git a/redhat/applications/amarok/amarok-14.0.0.spec b/redhat/applications/amarok/amarok.spec
index aa8f35067..852bba9ad 100644
--- a/redhat/applications/amarok/amarok-14.0.0.spec
+++ b/redhat/applications/amarok/amarok.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg amarok
 %define tde_prefix /opt/trinity
@@ -207,7 +207,7 @@ BuildRequires:	%{_lib}inotifytools-devel
 %endif
 
 # XINE support
-%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} == 18 || 0%{?fedora} == 19 || 0%{?rhel} >= 5
+%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} == 18 || 0%{?fedora} == 19 || 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7
 %define with_xine 1
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires: %{_lib}xine1.2-devel
@@ -343,8 +343,8 @@ Amarok is a multimedia player with:
 %{tde_tdelibdir}/libamarok_xine-engine.*
 %endif
 ## Gstreamer engine
-#%{tde_datadir}/services/amarok_gst10engine_plugin.desktop
-#%{tde_tdelibdir}/libamarok_gst10engine_plugin.*
+#{tde_datadir}/services/amarok_gst10engine_plugin.desktop
+#{tde_tdelibdir}/libamarok_gst10engine_plugin.*
 # YAUAP
 %if 0%{?with_yauap}
 %{tde_datadir}/services/amarok_yauap-engine_plugin.desktop
@@ -431,7 +431,7 @@ if ! ruby -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['MAJOR'] )"
          -e "s|Config\.|RbConfig\.|g"
 fi
 
-%if 0%{?fedora} >= 30
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8
 %__sed -i "amarok/src/scripts/playlist2html/playlist2html.py" \
           "amarok/src/scripts/playlist2html/PlaylistServer.py" \
           "amarok/src/scripts/webcontrol/WebControl.py" \
diff --git a/redhat/applications/basket/basket-14.0.0.spec b/redhat/applications/basket/basket.spec
index 66138fcdb..fbffbd753 100644
--- a/redhat/applications/basket/basket-14.0.0.spec
+++ b/redhat/applications/basket/basket.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg basket
 %define tde_prefix /opt/trinity
@@ -174,10 +174,8 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
 %{tde_datadir}/mimelnk/application/x-basket-template.desktop
 %{tde_datadir}/services/basket_config_apps.desktop
 %{tde_datadir}/services/basket_config_baskets.desktop
-#%{tde_datadir}/services/basket_config_features.desktop
 %{tde_datadir}/services/basket_config_general.desktop
 %{tde_datadir}/services/basket_config_new_notes.desktop
-#%{tde_datadir}/services/basket_config_notes.desktop
 %{tde_datadir}/services/basket_config_notes_appearance.desktop
 %{tde_datadir}/services/basket_part.desktop
 %{tde_datadir}/services/basketthumbcreator.desktop
diff --git a/redhat/applications/bibletime/bibletime-14.0.0.spec b/redhat/applications/bibletime/bibletime.spec
index c6a0991a1..5d18fa118 100644
--- a/redhat/applications/bibletime/bibletime-14.0.0.spec
+++ b/redhat/applications/bibletime/bibletime.spec
@@ -23,7 +23,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg bibletime
 %define tde_prefix /opt/trinity
@@ -124,6 +124,10 @@ unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
 
+%if 0%{?fedora} >= 31
+CXXFLAGS="${RPM_OPT_FLAGS} -std=c++11"
+%endif
+
 %configure \
   --prefix=%{tde_prefix} \
   --exec-prefix=%{tde_prefix} \
diff --git a/redhat/applications/digikam/digikam-14.0.0.spec b/redhat/applications/digikam/digikam.spec
index dc95cb8c7..73ec61a98 100644
--- a/redhat/applications/digikam/digikam-14.0.0.spec
+++ b/redhat/applications/digikam/digikam.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg digikam
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/dolphin/dolphin.spec b/redhat/applications/dolphin/dolphin.spec
index de4f5d627..eef8e8457 100644
--- a/redhat/applications/dolphin/dolphin.spec
+++ b/redhat/applications/dolphin/dolphin.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg dolphin
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/filelight/filelight-14.0.0.spec b/redhat/applications/filelight/filelight.spec
index 674b56560..e32a92e3d 100644
--- a/redhat/applications/filelight/filelight-14.0.0.spec
+++ b/redhat/applications/filelight/filelight.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg filelight
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/fusion-icon/fusion-icon-14.0.0.spec b/redhat/applications/fusion-icon/fusion-icon-14.0.0.spec
deleted file mode 100644
index 7b48df033..000000000
--- a/redhat/applications/fusion-icon/fusion-icon-14.0.0.spec
+++ /dev/null
@@ -1,92 +0,0 @@
-# Default version for this component
-%define tde_pkg fusion-icon
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.0
-%endif
-
-%if "%{?python2_sitelib}" == ""
-%define python2_sitelib    %(python2 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
-%endif
-
-
-# TDE specific building variables
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{tde_pkg}
-Summary:	tray icon to launch and manage Compiz Fusion [Trinity]
-Version:	0.0.0+git20071028
-Release:	2%{?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-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	python
-Requires:		python
-Requires:		trinity-compizconfig-backend-kconfig
-
-%description
-The OpenCompositing Project brings 3D desktop visual effects that
-improve the usability and eye candy of the X Window System and provide
-increased productivity.
-
-This package contains a tray icon that can launch Compiz and its
-decorators.
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-%__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install \
-  DESTDIR=%{buildroot} \
-  PREFIX=%{tde_prefix}
-
-# Removes 'egg-info'
-find "%{?buildroot}%{python2_sitelib}" -name "*.egg-info" -delete
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/fusion-icon
-%{python2_sitelib}/FusionIcon/
-%{tde_datadir}/applications/fusion-icon.desktop
-%{tde_datadir}/icons/hicolor/*/apps/fusion-icon.png
-%{tde_datadir}/icons/hicolor/scalable/apps/fusion-icon.svg
-
-
-%changelog
diff --git a/redhat/applications/fusion-icon/fusion-icon.spec b/redhat/applications/fusion-icon/fusion-icon.spec
index 99f8992ff..a11b2249f 100644
--- a/redhat/applications/fusion-icon/fusion-icon.spec
+++ b/redhat/applications/fusion-icon/fusion-icon.spec
@@ -1,6 +1,6 @@
 # Default version for this component
 %define tde_pkg fusion-icon
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 
 %if "%{?python2_sitelib}" == ""
 %define python2_sitelib    %(python2 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec b/redhat/applications/gtk-qt-engine/gtk-qt-engine.spec
index ef32736f0..bf5b5431b 100644
--- a/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec
+++ b/redhat/applications/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.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg gtk-qt-engine
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0.spec b/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine.spec
index be57d2f0e..37129b3c8 100644
--- a/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0.spec
+++ b/redhat/applications/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.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg gtk3-tqt-engine
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/gwenview-i18n/gwenview-i18n.spec b/redhat/applications/gwenview-i18n/gwenview-i18n.spec
index 59bbfaa5b..762d21a02 100644
--- a/redhat/applications/gwenview-i18n/gwenview-i18n.spec
+++ b/redhat/applications/gwenview-i18n/gwenview-i18n.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg gwenview-i18n
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/gwenview/gwenview-14.0.0.spec b/redhat/applications/gwenview/gwenview.spec
index 8f635bf08..ac8d7502e 100644
--- a/redhat/applications/gwenview/gwenview-14.0.0.spec
+++ b/redhat/applications/gwenview/gwenview.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg gwenview
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/k3b-i18n/k3b-i18n-14.0.0.spec b/redhat/applications/k3b-i18n/k3b-i18n.spec
index c641a739f..c4df86c32 100644
--- a/redhat/applications/k3b-i18n/k3b-i18n-14.0.0.spec
+++ b/redhat/applications/k3b-i18n/k3b-i18n.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg k3b-i18n
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/k3b/k3b-14.0.0.spec b/redhat/applications/k3b/k3b.spec
index fd33e5a7a..64ca33c12 100644
--- a/redhat/applications/k3b/k3b-14.0.0.spec
+++ b/redhat/applications/k3b/k3b.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg k3b
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/k9copy/k9copy-14.0.0.spec b/redhat/applications/k9copy/k9copy.spec
index f03137ba4..418bd3f47 100644
--- a/redhat/applications/k9copy/k9copy-14.0.0.spec
+++ b/redhat/applications/k9copy/k9copy.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg k9copy
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-14.0.0.spec b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla.spec
index 2f6e60e4a..90dc1042f 100644
--- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-14.0.0.spec
+++ b/redhat/applications/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.0
+%define tde_version 14.0.7
 %endif
 
 # TDE specific building variables
@@ -38,7 +38,7 @@
 
 %define _docdir %{tde_docdir}
 
-%if 0%{?fedora} >= 27 || 0%{?mgaversion} >= 7
+%if 0%{?fedora} >= 27 || 0%{?mgaversion} >= 7 || 0%{?rhel} >= 8
 %define debug_package %{nil}
 %endif
 
@@ -59,9 +59,6 @@ BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-# Fix 'nspr' includes location
-Patch1:		kaffeine-mozilla-3.5.13-fix_nspr_include.patch
-
 BuildRequires:	autoconf automake libtool m4
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
@@ -100,7 +97,6 @@ when a page containing a supported media format is loaded.
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch1 -p1 -b .nspr
 
 %__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"
diff --git a/redhat/applications/kaffeine/kaffeine-14.0.0.spec b/redhat/applications/kaffeine/kaffeine.spec
index d38e6a27d..dc5a939e4 100644
--- a/redhat/applications/kaffeine/kaffeine-14.0.0.spec
+++ b/redhat/applications/kaffeine/kaffeine.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg kaffeine
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/kasablanca/kasablanca-14.0.0.spec b/redhat/applications/kasablanca/kasablanca.spec
index 3a92fd87c..7174d4aa5 100644
--- a/redhat/applications/kasablanca/kasablanca-14.0.0.spec
+++ b/redhat/applications/kasablanca/kasablanca.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg kasablanca
 %define tde_prefix /opt/trinity
@@ -63,7 +63,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext 
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -117,43 +117,44 @@ Kasablanca is an ftp client, among its features are currently:
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
 
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
 
-## Needed(?) for older/legacy setups, harmless otherwise
-if pkg-config openssl ; then
-	export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags-only-I openssl)"
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
 fi
 
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --includedir=%{tde_tdeincludedir} \
-  --datadir=%{tde_datadir} \
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_SKIP_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}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GCC_VISIBILITY=ON \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
+  -DBUILD_ALL=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_TRANSLATIONS=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=$RPM_BUILD_ROOT -C build
 
 # locale's
 %find_lang %{tde_pkg}
@@ -177,6 +178,7 @@ export PATH="%{tde_bindir}:${PATH}"
 %{tde_datadir}/icons/hicolor/*/apps/kasablanca.png
 %{tde_tdedocdir}/HTML/en/kasablanca/
 %{tde_tdeappdir}/kasablanca.desktop
+%{tde_mandir}/man1/kasablanca.*
 
 
 %changelog
diff --git a/redhat/applications/katapult/katapult.spec b/redhat/applications/katapult/katapult.spec
index f0e281a27..985f668fb 100644
--- a/redhat/applications/katapult/katapult.spec
+++ b/redhat/applications/katapult/katapult.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg katapult
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/kbarcode/kbarcode.spec b/redhat/applications/kbarcode/kbarcode.spec
index a10cd0ab1..f551feb38 100644
--- a/redhat/applications/kbarcode/kbarcode.spec
+++ b/redhat/applications/kbarcode/kbarcode.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg kbarcode
 %define tde_prefix /opt/trinity
@@ -114,7 +114,7 @@ to use them in another application.
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%doc AUTHORS ChangeLog COPYING README TODO
 %{tde_bindir}/kbarcode
 %{tde_tdeappdir}/kbarcode-batch.desktop
 %{tde_tdeappdir}/kbarcode-editor.desktop
diff --git a/redhat/applications/kbfx/kbfx.spec b/redhat/applications/kbfx/kbfx.spec
index 50da69568..73337676d 100644
--- a/redhat/applications/kbfx/kbfx.spec
+++ b/redhat/applications/kbfx/kbfx.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg kbfx
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/kbibtex/kbibtex.spec b/redhat/applications/kbibtex/kbibtex.spec
index 9148c5f29..903e91f69 100644
--- a/redhat/applications/kbibtex/kbibtex.spec
+++ b/redhat/applications/kbibtex/kbibtex.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg kbibtex
 %define tde_prefix /opt/trinity
@@ -162,7 +162,7 @@ fi
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS BUGS COPYING NEWS README TODO ChangeLog
+%doc AUTHORS COPYING NEWS README TODO ChangeLog
 %{tde_bindir}/kbibtex
 %{tde_tdelibdir}/libkbibtexpart.la
 %{tde_tdelibdir}/libkbibtexpart.so
diff --git a/redhat/applications/kbiff/kbiff.spec b/redhat/applications/kbiff/kbiff.spec
index 52a298657..c2470dc42 100644
--- a/redhat/applications/kbiff/kbiff.spec
+++ b/redhat/applications/kbiff/kbiff.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg kbiff
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/kbookreader/kbookreader.spec b/redhat/applications/kbookreader/kbookreader.spec
index 90e316458..7757e2023 100644
--- a/redhat/applications/kbookreader/kbookreader.spec
+++ b/redhat/applications/kbookreader/kbookreader.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg kbookreader
 %define tde_prefix /opt/trinity
@@ -151,12 +151,14 @@ export PATH="%{tde_bindir}:${PATH}"
 %suse_update_desktop_file "%{?buildroot}%{tde_tdeappdir}/bookreader.desktop" Office Viewer
 %endif
 
+%find_lang %{tde_pkg}
+
 
 %clean
 %__rm -rf %{buildroot}
 
 
-%files
+%files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
 %{tde_bindir}/bookreader
diff --git a/redhat/applications/kchmviewer/kchmviewer-14.0.0.spec b/redhat/applications/kchmviewer/kchmviewer.spec
index dca19c1d4..277a3e96f 100644
--- a/redhat/applications/kchmviewer/kchmviewer-14.0.0.spec
+++ b/redhat/applications/kchmviewer/kchmviewer.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %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:	autoconf automake libtool m4
+BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -76,7 +76,12 @@ BuildRequires:	brp-check-trinity
 %endif
 
 # CHMLIB support
+%if 0%{?rhel} == 8
+%define with_chmlib 0
+%else
+%define with_chmlib 1
 BuildRequires:	chmlib-devel
+%endif
 
 
 %description
@@ -112,47 +117,47 @@ support. Correctly detects and shows encoding of any valid chm file.
 %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"
 
-# Specific path for RHEL4
-if [ -d /usr/X11R6 ]; then
-  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
 fi
 
-# Warning: --enable-final causes FTBFS !
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_SKIP_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}" \
+  -DPLUGIN_INSTALL_DIR="%{tde_tdelibdir}" \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --disable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  -DWITH_CHMLIB=%{?with_chmlib} \
   \
-  --with-x \
-  --with-kde
+  -DBUILD_ALL=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_TRANSLATIONS=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
 
 %find_lang %{tde_pkg}
 
@@ -185,6 +190,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kchmviewer.desktop"
 %{tde_datadir}/services/msits.protocol
 %{tde_tdedocdir}/HTML/en/kchmviewer/
 %{tde_tdedocdir}/HTML/en/tdeioslave/msits/
+%{tde_mandir}/man1/kchmviewer.*
 
 
 %changelog
diff --git a/redhat/applications/kcmautostart/kcmautostart.spec b/redhat/applications/kcmautostart/kcmautostart.spec
index 0006b6f31..5b43c73ed 100644
--- a/redhat/applications/kcmautostart/kcmautostart.spec
+++ b/redhat/applications/kcmautostart/kcmautostart.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg kcmautostart
 %define tde_prefix /opt/trinity
@@ -152,7 +152,7 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %files -f autostart.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING INSTALL NEWS README TODO
+%doc AUTHORS ChangeLog COPYING INSTALL README
 %{tde_tdelibdir}/kcm_autostart.la
 %{tde_tdelibdir}/kcm_autostart.so
 %{tde_tdeappdir}/autostart.desktop
diff --git a/redhat/applications/kcmldap/kcmldap.spec b/redhat/applications/kcmldap/kcmldap.spec
index 5fcf25a9b..29feb426a 100644
--- a/redhat/applications/kcmldap/kcmldap.spec
+++ b/redhat/applications/kcmldap/kcmldap.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg kcmldap
 %define tde_prefix /opt/trinity
@@ -101,13 +101,16 @@ BuildRequires:	openldap2-devel
 BuildRequires:	openldap24-libs-devel
 %endif
 
+# 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
+#%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
@@ -208,11 +211,6 @@ fi
   -DBUILD_DOC=ON \
   -DBUILD_TRANSLATIONS=ON \
   \
-%if 0%{?suse_version}
-  -DKRB5_FOUND=1 \
-  -DKRB5_LIBRARIES="-lkrb5" \
-  -DKRB5_INCLUDE_DIRS="/usr/include" \
-%endif
   ..
 
 %__make %{?_smp_mflags} || %__make
diff --git a/redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec b/redhat/applications/kcmldapcontroller/kcmldapcontroller.spec
index 88a889e4e..9885301cb 100644
--- a/redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec
+++ b/redhat/applications/kcmldapcontroller/kcmldapcontroller.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %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:	autoconf automake libtool m4
+BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -91,13 +91,16 @@ BuildRequires:	openldap2-devel
 BuildRequires:	openldap24-libs-devel
 %endif
 
+# 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
+#%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
@@ -134,7 +137,7 @@ This is a TDE control center module to manage users, groups, and machines in Ker
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING
 %{tde_bindir}/primaryrccertupdater
-%if 0%{?pclinuxos} == 0
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?rhel}
 %{tde_libdir}/slapi-acl-manager.la
 %{tde_libdir}/slapi-acl-manager.so
 %endif
@@ -161,55 +164,48 @@ This is a TDE control center module to manage users, groups, and machines in Ker
 %__rm -rf acl-updater
 %endif
 
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
 
 
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
 
-extra_includes="%{_includedir}"
-extra_libs="%{_libdir}"
-
-if [ -d "%{_includedir}/openldap24" ]; then
-  extra_includes="%{_includedir}/openldap24:${extra_includes}"
-  extra_libs="%{_libdir}/openldap24:${extra_libs}"
-fi
-
-if [ -d "%{_includedir}/heimdal" ]; then
-  extra_includes="%{_includedir}/heimdal:${extra_includes}"
-  extra_libs="%{_libdir}/heimdal:${extra_libs}"
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
 fi
 
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --docdir=%{tde_tdedocdir} \
-  --libdir=%{tde_libdir} \
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_SKIP_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}" \
+  -DPLUGIN_INSTALL_DIR="%{tde_tdelibdir}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GCC_VISIBILITY=ON \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility \
+  -DBUILD_ALL=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_TRANSLATIONS=ON \
   \
-  --with-extra-includes=${extra_includes} \
-  --with-extra-libs=${extra_libs} \
+  ..
 
-%__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/kcmldapmanager/kcmldapmanager-14.0.0.spec b/redhat/applications/kcmldapmanager/kcmldapmanager.spec
index 008da620d..583961bd6 100644
--- a/redhat/applications/kcmldapmanager/kcmldapmanager-14.0.0.spec
+++ b/redhat/applications/kcmldapmanager/kcmldapmanager.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %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:	autoconf automake libtool m4
+BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -88,13 +88,16 @@ BuildRequires:	openldap2-devel
 BuildRequires:	openldap24-libs-devel
 %endif
 
+# 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
+#%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
@@ -146,55 +149,47 @@ This is a TDE control center module to manage users, groups, and machines in Ker
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
 
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
 
-extra_includes="%{_includedir}"
-extra_libs="%{_libdir}"
-
-if [ -d "%{_includedir}/openldap24" ]; then
-  extra_includes="%{_includedir}/openldap24:${extra_includes}"
-  extra_libs="%{_libdir}/openldap24:${extra_libs}"
-fi
-
-if [ -d "%{_includedir}/heimdal" ]; then
-  extra_includes="%{_includedir}/heimdal:${extra_includes}"
-  extra_libs="%{_libdir}/heimdal:${extra_libs}"
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
 fi
 
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --docdir=%{tde_tdedocdir} \
-  --libdir=%{tde_libdir} \
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_SKIP_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}" \
+  -DPLUGIN_INSTALL_DIR="%{tde_tdelibdir}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GCC_VISIBILITY=ON \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility \
+  -DBUILD_ALL=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_TRANSLATIONS=ON \
   \
-  --with-extra-includes=${extra_includes} \
-  --with-extra-libs=${extra_libs} \
+  ..
 
-%__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/kcpuload/kcpuload.spec b/redhat/applications/kcpuload/kcpuload.spec
index cda688320..d38734cff 100644
--- a/redhat/applications/kcpuload/kcpuload.spec
+++ b/redhat/applications/kcpuload/kcpuload.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg kcpuload
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/kdbg/kdbg-14.0.0.spec b/redhat/applications/kdbg/kdbg.spec
index 0728d9ad7..feec59e6e 100644
--- a/redhat/applications/kdbg/kdbg-14.0.0.spec
+++ b/redhat/applications/kdbg/kdbg.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg kdbg
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/kdbusnotification/kdbusnotification-14.0.0.spec b/redhat/applications/kdbusnotification/kdbusnotification.spec
index 25fbabe11..040367aa6 100644
--- a/redhat/applications/kdbusnotification/kdbusnotification-14.0.0.spec
+++ b/redhat/applications/kdbusnotification/kdbusnotification.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %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:	autoconf automake libtool m4
+BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -102,38 +102,53 @@ DBUS notifications via unobtrusive, easily dismissed passive popups.
 %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} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+# Fix for Fedora 31
+if [ -r "/usr/include/harfbuzz/hb.h" ]; then
+  #export CMAKE_INCLUDE_PATH="/usr/include/harfbuzz"
+  RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/include/harfbuzz"
+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} -DNDEBUG" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_SKIP_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}" \
+  -DPLUGIN_INSTALL_DIR="%{tde_tdelibdir}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DBUILD_ALL=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_TRANSLATIONS=ON \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
+  ..
 
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
 
 
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
 
 
 
diff --git a/redhat/applications/kdiff3/kdiff3-14.0.0.spec b/redhat/applications/kdiff3/kdiff3.spec
index 50a13a04c..aa1a854a7 100644
--- a/redhat/applications/kdiff3/kdiff3-14.0.0.spec
+++ b/redhat/applications/kdiff3/kdiff3.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %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:	autoconf automake libtool m4
+BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -91,52 +91,61 @@ Unicode & UTF-8 support
 %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"
+
+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} -DNDEBUG" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_SKIP_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}" \
+  -DPLUGIN_INSTALL_DIR="%{tde_tdelibdir}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DBUILD_ALL=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_TRANSLATIONS=ON \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
+  ..
 
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
 
 
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
 
 # Unwanted files
 # These are not HTML files but weird files in wrong place ??
 %__rm -rf %{?buildroot}%{tde_tdedocdir}/HTML/kdiff3/
 
 %find_lang %{tde_pkg}
+%find_lang %{tde_pkg}_plugin
 
 
 %clean
 %__rm -rf %{buildroot}
 
 
-%files -f %{tde_pkg}.lang
+%files -f %{tde_pkg}.lang -f %{tde_pkg}_plugin.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
 %{tde_bindir}/kdiff3
@@ -144,10 +153,11 @@ export PATH="%{tde_bindir}:${PATH}"
 %{tde_datadir}/apps/kdiff3part/
 %{tde_datadir}/icons/hicolor/*/apps/kdiff3.png
 %{tde_datadir}/icons/locolor/*/apps/kdiff3.png
+%{tde_docdir}/kdiff3/
 %{tde_tdedocdir}/HTML/*/kdiff3/
 %{tde_datadir}/services/kdiff3_plugin.desktop
 %{tde_datadir}/services/kdiff3part.desktop
-%{tde_datadir}/applnk/Development/*.desktop
+%{tde_tdeappdir}/kdiff3.desktop
 %{tde_datadir}/applnk/.hidden/kdiff3plugin.desktop
 %{tde_mandir}/man*/*
 %{tde_tdelibdir}/libkdiff3part.la
diff --git a/redhat/applications/kdirstat/kdirstat.spec b/redhat/applications/kdirstat/kdirstat.spec
index bdb19ef5d..c2f2ce80c 100644
--- a/redhat/applications/kdirstat/kdirstat.spec
+++ b/redhat/applications/kdirstat/kdirstat.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg kdirstat
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/keep/keep-14.0.0.spec b/redhat/applications/keep/keep.spec
index 56557f0e5..2afb9b1ca 100644
--- a/redhat/applications/keep/keep-14.0.0.spec
+++ b/redhat/applications/keep/keep.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg keep
 %define tde_prefix /opt/trinity
@@ -62,7 +62,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -99,39 +99,47 @@ Homepage: http://jr.falleri.free.fr/keep
 %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"
+
+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} -DNDEBUG" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_SKIP_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}" \
+  -DPLUGIN_INSTALL_DIR="%{tde_tdelibdir}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DBUILD_ALL=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_TRANSLATIONS=ON \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
+  ..
 
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
 
 
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
 
 %find_lang %{tde_pkg}
 
@@ -156,6 +164,7 @@ export PATH="%{tde_bindir}:${PATH}"
 %{tde_datadir}/config.kcfg/keepsettings.kcfg
 %{tde_datadir}/icons/hicolor/*/apps/keep.png
 %{tde_datadir}/services/kded/keep.desktop
+%{tde_mandir}/man1/keep.*
 
 
 %changelog
diff --git a/redhat/applications/kerberostray/kerberostray-14.0.0.spec b/redhat/applications/kerberostray/kerberostray.spec
index de55e48e7..c73827101 100644
--- a/redhat/applications/kerberostray/kerberostray-14.0.0.spec
+++ b/redhat/applications/kerberostray/kerberostray.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %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:	autoconf automake libtool m4
+BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -88,13 +88,16 @@ BuildRequires:	openldap2-devel
 BuildRequires:	openldap24-libs-devel
 %endif
 
+# 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
+#%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
@@ -125,55 +128,47 @@ Kerberos ticket manager which sits in the system tray and allows viewing/control
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
 
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
 
-extra_includes="%{_includedir}"
-extra_libs="%{_libdir}"
-
-if [ -d "%{_includedir}/openldap24" ]; then
-  extra_includes="%{_includedir}/openldap24:${extra_includes}"
-  extra_libs="%{_libdir}/openldap24:${extra_libs}"
-fi
-
-if [ -d "%{_includedir}/heimdal" ]; then
-  extra_includes="%{_includedir}/heimdal:${extra_includes}"
-  extra_libs="%{_libdir}/heimdal:${extra_libs}"
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
 fi
 
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --docdir=%{tde_tdedocdir} \
-  --libdir=%{tde_libdir} \
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_SKIP_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}" \
+  -DPLUGIN_INSTALL_DIR="%{tde_tdelibdir}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GCC_VISIBILITY=ON \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility \
+  -DBUILD_ALL=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_TRANSLATIONS=ON \
   \
-  --with-extra-includes=${extra_includes} \
-  --with-extra-libs=${extra_libs} \
+  ..
 
-%__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
 
 # Apps that should stay in TDE
 echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
diff --git a/redhat/applications/kerry/kerry-14.0.0.spec b/redhat/applications/kerry/kerry.spec
index 8cb5a96fb..d1116ebde 100644
--- a/redhat/applications/kerry/kerry-14.0.0.spec
+++ b/redhat/applications/kerry/kerry.spec
@@ -18,7 +18,7 @@
 # Default version for this component
 %define tde_pkg kerry
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 
 # TDE specific building variables
@@ -54,7 +54,6 @@ Prefix:			%{tde_prefix}
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Source1:		kerry.1.docbook
 
 
 BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
@@ -63,6 +62,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
+BuildRequires:	cmake >= 2.8
 BuildRequires:	gettext
 BuildRequires:	libbeagle-devel >= 0.3.0
 
@@ -86,46 +86,46 @@ filesystems, chat logs, mail and data, RSS and other.
 
 
 %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 LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%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"
+
+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} -DNDEBUG" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_SKIP_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
-
-%__make %{?_smp_mflags}
+  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+  -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
+  -DLIB_INSTALL_DIR="%{tde_libdir}" \
+  -DPLUGIN_INSTALL_DIR="%{tde_tdelibdir}" \
+  \
+  -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}
+%__make install DESTDIR=%{buildroot} -C build
 
-#%__install -D -m 644 %{SOURCE1} %{buildroot}%{_mandir}/man1/kerry.1.docbook
-#docbook2man %{buildroot}%{_mandir}/man1/kerry.1.docbook
 
 %find_lang %{tde_pkg}
 
diff --git a/redhat/applications/keximdb/keximdb.spec b/redhat/applications/keximdb/keximdb.spec
index 70ea66b12..8cc9e37d3 100644
--- a/redhat/applications/keximdb/keximdb.spec
+++ b/redhat/applications/keximdb/keximdb.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg keximdb
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.patch b/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.patch
deleted file mode 100644
index f8e019e63..000000000
--- a/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/kftpgrabber/src/engine/ftpdirectoryparser.cpp b/kftpgrabber/src/engine/ftpdirectoryparser.cpp
-index 981d0b6..71e2cd2 100644
---- a/kftpgrabber/src/engine/ftpdirectoryparser.cpp
-+++ b/kftpgrabber/src/engine/ftpdirectoryparser.cpp
-@@ -421,6 +421,8 @@ bool FtpDirectoryParser::parseUnixPermissions(const TQString &permissions, Direc
-   if (permissions[9] == 't' || permissions[9] == 'T') p |= S_ISVTX;
-    
-    entry.setPermissions(p);
-+
-+  return(p);
- }
- 
- bool FtpDirectoryParser::parseLine(const TQString &line, DirectoryEntry &entry)
-diff --git a/kftpgrabber/src/misc/desencryptor.cpp b/kftpgrabber/src/misc/desencryptor.cpp
-index 126fad7..fac681f 100644
---- a/kftpgrabber/src/misc/desencryptor.cpp
-+++ b/kftpgrabber/src/misc/desencryptor.cpp
-@@ -65,8 +65,8 @@ void DESEncryptor::DESExec(const TQString &str, int mode)
-   char *o_message = (char*) malloc(8);
-   char *o_output = (char*) malloc(8);
-   
--  memset(o_message, 0, 9);
--  memset(o_output, 0, 9);
-+  memset(o_message, 0, sizeof o_message);
-+  memset(o_output, 0, sizeof o_output);
-   //out.resize(in.size() * 2);
-   
-   while (i < in.size()) {
-@@ -79,8 +79,8 @@ void DESEncryptor::DESExec(const TQString &str, int mode)
-     i += 8;
-     
-     // Clear everything
--    memset(o_message, 0, 9);
--    memset(o_output, 0, 9);
-+    memset(o_message, 0, sizeof o_message);
-+    memset(o_output, 0, sizeof o_output);
-   }
-   
-   free(o_message);
diff --git a/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.spec b/redhat/applications/kftpgrabber/kftpgrabber.spec
index 75cb03836..37bc55def 100644
--- a/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.spec
+++ b/redhat/applications/kftpgrabber/kftpgrabber.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg kftpgrabber
 %define tde_prefix /opt/trinity
@@ -55,7 +55,6 @@ Prefix:			%{_prefix}
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Patch0:			%{tde_pkg}-14.0.0.patch
 
 
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
@@ -124,7 +123,6 @@ Requires: 	%{name} = %{version}-%{release}
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch0 -p1 -b .orig
 
 %__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"
diff --git a/redhat/applications/kgtk-qt3/kgtk-qt3-14.0.0.spec b/redhat/applications/kgtk-qt3/kgtk-qt3.spec
index c78610f1c..98989ecc2 100644
--- a/redhat/applications/kgtk-qt3/kgtk-qt3-14.0.0.spec
+++ b/redhat/applications/kgtk-qt3/kgtk-qt3.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg kgtk-qt3
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/kile/kile-14.0.0.spec b/redhat/applications/kile/kile.spec
index 33bc88722..5a6c72149 100644
--- a/redhat/applications/kile/kile-14.0.0.spec
+++ b/redhat/applications/kile/kile.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg kile
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/kima/kima-14.0.0.spec b/redhat/applications/kima/kima.spec
index 8cbd7bce1..646b79704 100644
--- a/redhat/applications/kima/kima-14.0.0.spec
+++ b/redhat/applications/kima/kima.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg kima
 %define tde_prefix /opt/trinity
@@ -63,7 +63,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -102,40 +102,48 @@ panel.
 %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"
+
+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} -DNDEBUG" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_SKIP_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}" \
+  -DPLUGIN_INSTALL_DIR="%{tde_tdelibdir}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  -DWITH_NVCONTROL=OFF \
+  \
+  -DBUILD_ALL=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_TRANSLATIONS=ON \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
+  ..
 
-# SMP safe !
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
 
 
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
 
 
 %find_lang %{tde_pkg}
diff --git a/redhat/applications/kiosktool/kiosktool.spec b/redhat/applications/kiosktool/kiosktool.spec
index 3112132a4..f56b7b203 100644
--- a/redhat/applications/kiosktool/kiosktool.spec
+++ b/redhat/applications/kiosktool/kiosktool.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg kiosktool
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/kkbswitch/kkbswitch.spec b/redhat/applications/kkbswitch/kkbswitch.spec
index b4ef8ddb4..489fc406b 100644
--- a/redhat/applications/kkbswitch/kkbswitch.spec
+++ b/redhat/applications/kkbswitch/kkbswitch.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg kkbswitch
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/klcddimmer/klcddimmer.spec b/redhat/applications/klcddimmer/klcddimmer.spec
index b50b36d10..27bd3cebf 100644
--- a/redhat/applications/klcddimmer/klcddimmer.spec
+++ b/redhat/applications/klcddimmer/klcddimmer.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg klcddimmer
 %define tde_prefix /opt/trinity
@@ -138,12 +138,14 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot} -C build
 
+%find_lang %{tde_pkg}
+
 
 %clean
 %__rm -rf %{buildroot}
 
 
-%files
+%files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING LICENSE NEWS README
 %{tde_libdir}/libklcddimmer_panelapplet.la
diff --git a/redhat/applications/kmplayer/kmplayer-14.0.0.spec b/redhat/applications/kmplayer/kmplayer.spec
index f68698644..869ef88ec 100644
--- a/redhat/applications/kmplayer/kmplayer-14.0.0.spec
+++ b/redhat/applications/kmplayer/kmplayer.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg kmplayer
 %define tde_prefix /opt/trinity
@@ -160,7 +160,7 @@ KMPlayer can:
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog INSTALL README TODO kmplayer.lsm
+%doc AUTHORS COPYING ChangeLog INSTALL README TODO
 %{tde_bindir}/kmplayer
 %{tde_bindir}/knpplayer
 %{tde_bindir}/kxvplayer
diff --git a/redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec b/redhat/applications/kmyfirewall/kmyfirewall.spec
index a24777758..093d920ec 100644
--- a/redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec
+++ b/redhat/applications/kmyfirewall/kmyfirewall.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg kmyfirewall
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/kmymoney/kmymoney-14.0.0.spec b/redhat/applications/kmymoney/kmymoney.spec
index 7ad17a36b..b62aa5496 100644
--- a/redhat/applications/kmymoney/kmymoney-14.0.0.spec
+++ b/redhat/applications/kmymoney/kmymoney.spec
@@ -1,4 +1,4 @@
-%if 0%{?fedora} >= 23
+%if 0%{?fedora} >= 23 || 0%{?rhel} >= 8
 %define _configure_libtool_hardening_hack 0
 %endif
 
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg kmymoney
 %define tde_prefix /opt/trinity
@@ -207,7 +207,7 @@ unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
 
-%if 0%{?fedora} >= 29
+%if 0%{?fedora} >= 29 || 0%{?rhel} >= 8
 LDFLAGS="-Wl,--allow-shlib-undefined"
 %endif
 
diff --git a/redhat/applications/knemo/knemo-14.0.0.spec b/redhat/applications/knemo/knemo.spec
index 8ccd55fda..d3e474bf1 100644
--- a/redhat/applications/knemo/knemo-14.0.0.spec
+++ b/redhat/applications/knemo/knemo.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %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:	autoconf automake libtool m4
+BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -111,40 +111,45 @@ Homepage: http://extragear.kde.org/apps/knemo/
 %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
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_SKIP_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 \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
+  -DBUILD_ALL=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_TRANSLATIONS=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/knetload/knetload.spec b/redhat/applications/knetload/knetload.spec
index 13e71be7f..90b09ef5d 100644
--- a/redhat/applications/knetload/knetload.spec
+++ b/redhat/applications/knetload/knetload.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg knetload
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/knetstats/knetstats.spec b/redhat/applications/knetstats/knetstats.spec
index d519f2224..580809e4a 100644
--- a/redhat/applications/knetstats/knetstats.spec
+++ b/redhat/applications/knetstats/knetstats.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg knetstats
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec b/redhat/applications/knetworkmanager8/knetworkmanager8.spec
index f1434e905..0514f655f 100644
--- a/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec
+++ b/redhat/applications/knetworkmanager8/knetworkmanager8.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg knetworkmanager
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/knights/knights.spec b/redhat/applications/knights/knights.spec
index eb75677b9..9bde2f66b 100644
--- a/redhat/applications/knights/knights.spec
+++ b/redhat/applications/knights/knights.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg knights
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/knmap/knmap.spec b/redhat/applications/knmap/knmap.spec
index 76ac8c8c7..03145ddd5 100644
--- a/redhat/applications/knmap/knmap.spec
+++ b/redhat/applications/knmap/knmap.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg knmap
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/knowit/knowit.spec b/redhat/applications/knowit/knowit.spec
index 67cac8595..217fa7c70 100644
--- a/redhat/applications/knowit/knowit.spec
+++ b/redhat/applications/knowit/knowit.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg knowit
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/knutclient/knutclient.spec b/redhat/applications/knutclient/knutclient.spec
index 2c729fb71..e9dd116cb 100644
--- a/redhat/applications/knutclient/knutclient.spec
+++ b/redhat/applications/knutclient/knutclient.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg knutclient
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/koffice-i18n/koffice-i18n-14.0.0.spec b/redhat/applications/koffice-i18n/koffice-i18n.spec
index 479a72b5f..90358ea27 100644
--- a/redhat/applications/koffice-i18n/koffice-i18n-14.0.0.spec
+++ b/redhat/applications/koffice-i18n/koffice-i18n.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg koffice-i18n
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/koffice/koffice-14.0.0.spec b/redhat/applications/koffice/koffice.spec
index ce0cec112..49024b66a 100644
--- a/redhat/applications/koffice/koffice-14.0.0.spec
+++ b/redhat/applications/koffice/koffice.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg koffice
 %define tde_prefix /opt/trinity
@@ -101,7 +101,6 @@ BuildRequires:	libjpeg-devel
 BuildRequires:	ImageMagick-devel
 BuildRequires:	zlib-devel
 BuildRequires:	openssl-devel
-BuildRequires:	python-devel
 BuildRequires:	pcre-devel
 BuildRequires:	gettext-devel
 BuildRequires:	mysql-devel
@@ -113,6 +112,17 @@ BuildRequires:	OpenEXR-devel
 BuildRequires:	libexif-devel
 BuildRequires:	readline-devel
 
+# PYTHON support
+%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31
+%define python python2
+%define __python %__python2
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%else
+%define python python
+%endif
+BuildRequires:	%{python}
+BuildRequires:	%{python}-devel
+
 # LCMS support
 %if 0%{?suse_version} || 0%{?rhel} >= 7
 BuildRequires: liblcms-devel
@@ -712,6 +722,8 @@ Requires:		fonts-ttf-dejavu
 %else
 %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
 Requires:		dejavu-lgc-sans-fonts
+%endif
+%if 0%{?fedora} >= 11 || 0%{?rhel} == 6 || 0%{?rhel} == 7
 Requires:		lyx-cmex10-fonts
 %endif
 %if 0%{?rhel} == 5
diff --git a/redhat/applications/konversation/konversation.spec b/redhat/applications/konversation/konversation.spec
index 1c2629084..58421bc9e 100644
--- a/redhat/applications/konversation/konversation.spec
+++ b/redhat/applications/konversation/konversation.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg konversation
 %define tde_prefix /opt/trinity
@@ -109,7 +109,7 @@ 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%{?suse_version}
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?suse_version}
 %define with_xscreensaver 1
 
 %if 0%{?fedora} || 0%{?rhel} >= 5
@@ -176,7 +176,7 @@ and experienced users alike will appreciate its many features:
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%if 0%{?fedora} >= 30
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8
 %__sed -i "konversation/scripts/media" \
           "konversation/scripts/weather" \
   -e "s|/usr/bin/env python|/usr/bin/env python2|"
diff --git a/redhat/applications/kooldock/kooldock.spec b/redhat/applications/kooldock/kooldock.spec
index 3b0618ac0..41d368a91 100644
--- a/redhat/applications/kooldock/kooldock.spec
+++ b/redhat/applications/kooldock/kooldock.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.1
+%define tde_version 14.0.7
 %endif
 %define tde_pkg kooldock
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/kopete-otr/kopete-otr-14.0.0.spec b/redhat/applications/kopete-otr/kopete-otr.spec
index 602ab32c3..59f674a84 100644
--- a/redhat/applications/kopete-otr/kopete-otr-14.0.0.spec
+++ b/redhat/applications/kopete-otr/kopete-otr.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg kopete-otr
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/kpicosim/kpicosim.spec b/redhat/applications/kpicosim/kpicosim.spec
index a1623f95b..3f05e92af 100644
--- a/redhat/applications/kpicosim/kpicosim.spec
+++ b/redhat/applications/kpicosim/kpicosim.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg kpicosim
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/kpilot/kpilot.spec b/redhat/applications/kpilot/kpilot.spec
index 179e464d2..366c13087 100644
--- a/redhat/applications/kpilot/kpilot.spec
+++ b/redhat/applications/kpilot/kpilot.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg kpilot
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/kplayer/kplayer.spec b/redhat/applications/kplayer/kplayer.spec
index 45a4ae38f..66cd2977b 100644
--- a/redhat/applications/kplayer/kplayer.spec
+++ b/redhat/applications/kplayer/kplayer.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg kplayer
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/kpowersave/kpowersave-14.0.0.spec b/redhat/applications/kpowersave/kpowersave.spec
index 2bb9fe60a..d4913e9b6 100644
--- a/redhat/applications/kpowersave/kpowersave-14.0.0.spec
+++ b/redhat/applications/kpowersave/kpowersave.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg kpowersave
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/krecipes/krecipes-14.0.0.spec b/redhat/applications/krecipes/krecipes.spec
index b04652b96..6fdfdeeff 100644
--- a/redhat/applications/krecipes/krecipes-14.0.0.spec
+++ b/redhat/applications/krecipes/krecipes.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg krecipes
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/krename/krename.spec b/redhat/applications/krename/krename.spec
index c0f464690..a0c03ddb3 100644
--- a/redhat/applications/krename/krename.spec
+++ b/redhat/applications/krename/krename.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg krename
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/krusader/krusader-14.0.0.spec b/redhat/applications/krusader/krusader.spec
index 260c97e4a..83d76c8ea 100644
--- a/redhat/applications/krusader/krusader-14.0.0.spec
+++ b/redhat/applications/krusader/krusader.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg krusader
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/kscope/kscope-14.0.0.spec b/redhat/applications/kscope/kscope.spec
index c684c1e6e..df5fc6fe2 100644
--- a/redhat/applications/kscope/kscope-14.0.0.spec
+++ b/redhat/applications/kscope/kscope.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg kscope
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/ksensors/ksensors.spec b/redhat/applications/ksensors/ksensors.spec
index ba1b1f917..fdfc3faea 100644
--- a/redhat/applications/ksensors/ksensors.spec
+++ b/redhat/applications/ksensors/ksensors.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg ksensors
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/kshowmail/kshowmail-14.0.0.spec b/redhat/applications/kshowmail/kshowmail.spec
index 6fecd9bad..637ebf411 100644
--- a/redhat/applications/kshowmail/kshowmail-14.0.0.spec
+++ b/redhat/applications/kshowmail/kshowmail.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %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:	autoconf automake libtool m4
+BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -93,37 +93,45 @@ All without dragging any messages into your computer.
 %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} \
-  --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
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INCLUDE_PATH="%{tde_tdeincludedir}" \
+  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+  -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
+  -DLIB_INSTALL_DIR="%{tde_libdir}" \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
-  
-%__make %{?_smp_mflags}
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DBUILD_ALL=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_TRANSLATIONS=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}
 
@@ -182,6 +190,7 @@ install -D -m 644 "pics/kshowmail.png"          "$RPM_BUILD_ROOT%{tde_datadir}/i
 %lang(it) %{tde_tdedocdir}/HTML/it/kshowmail/
 %lang(ru) %{tde_tdedocdir}/HTML/ru/kshowmail/
 %lang(sv) %{tde_tdedocdir}/HTML/sv/kshowmail/
+%{tde_mandir}/man1/kshowmail.*
 
 
 %changelog
diff --git a/redhat/applications/kshutdown/kshutdown.spec b/redhat/applications/kshutdown/kshutdown.spec
index 3e8fe4ee1..3c10b2da0 100644
--- a/redhat/applications/kshutdown/kshutdown.spec
+++ b/redhat/applications/kshutdown/kshutdown.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg kshutdown
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin.spec b/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin.spec
index d22e32925..ad8371702 100644
--- a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin.spec
+++ b/redhat/applications/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.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg ksplash-engine-moodin
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/ksquirrel/ksquirrel-14.0.0.spec b/redhat/applications/ksquirrel/ksquirrel.spec
index 0a12ea867..73661a2fa 100644
--- a/redhat/applications/ksquirrel/ksquirrel-14.0.0.spec
+++ b/redhat/applications/ksquirrel/ksquirrel.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg ksquirrel
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec b/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec
index 4ab420ac3..9aefb467a 100644
--- a/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec
+++ b/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg kstreamripper
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/kstreamripper/kstreamripper.spec b/redhat/applications/kstreamripper/kstreamripper.spec
new file mode 100644
index 000000000..e4a98a26e
--- /dev/null
+++ b/redhat/applications/kstreamripper/kstreamripper.spec
@@ -0,0 +1,151 @@
+#
+# spec file for package kstreamripper (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/
+#
+
+%if 0%{?fedora} >= 28 || 0%{?mgaversion} >= 7 || 0%{?rhel} >= 8
+%global debug_package %{nil}
+%endif
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.7
+%endif
+%define tde_pkg kstreamripper
+%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.4
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	TDE frontend for streamripper
+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
+Source1:		scons-local-2.5.1.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	autoconf automake libtool m4
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+#BuildRequires:	scons
+
+# PYTHON support
+%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30
+%define python python2
+%define __python %__python2
+%else
+%define python python
+%endif
+BuildRequires:	%{python}
+
+
+%description
+KStreamRipper is a small frontend for the streamripper command
+line utility. Streamripper captures internet shoutcast radio streams
+on your harddisk and splits them up in mp3 files. KStreamRipper helps
+you with managing/ripping your preferred streams.
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -a 1
+%__rm -f kde.py
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+
+export QTDIR=/usr
+%__python ./scons.py configure prefix="%{_prefix}"
+%__python ./scons.py %{?_smp_mflags}
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+DESTDIR="%{?buildroot}" %__python ./scons.py install
+
+# Missing icon file will make this fail.
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file kstreamripper Audio Recorder
+%endif
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%{tde_bindir}/kstreamripper
+%{tde_tdeappdir}/kstreamripper.desktop
+%{tde_datadir}/apps/kstreamripper/
+%{tde_tdedocdir}/HTML/en/kstreamripper/
+
+
+%changelog
diff --git a/redhat/applications/kstreamripper/scons-local-2.5.1.tar.gz b/redhat/applications/kstreamripper/scons-local-2.5.1.tar.gz
new file mode 100644
index 000000000..ef63468b1
--- /dev/null
+++ b/redhat/applications/kstreamripper/scons-local-2.5.1.tar.gz
diff --git a/redhat/applications/ksystemlog/ksystemlog-14.0.0.spec b/redhat/applications/ksystemlog/ksystemlog.spec
index 874974b0b..c2f3f580d 100644
--- a/redhat/applications/ksystemlog/ksystemlog-14.0.0.spec
+++ b/redhat/applications/ksystemlog/ksystemlog.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg ksystemlog
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/ktechlab/ktechlab-14.0.0.spec b/redhat/applications/ktechlab/ktechlab.spec
index 9fec6ce5a..6b28f1294 100644
--- a/redhat/applications/ktechlab/ktechlab-14.0.0.spec
+++ b/redhat/applications/ktechlab/ktechlab.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg ktechlab
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/ktorrent/ktorrent-14.0.0.spec b/redhat/applications/ktorrent/ktorrent.spec
index 2ecf72dac..14f1f9c83 100644
--- a/redhat/applications/ktorrent/ktorrent-14.0.0.spec
+++ b/redhat/applications/ktorrent/ktorrent.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg ktorrent
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/kuickshow/kuickshow.spec b/redhat/applications/kuickshow/kuickshow.spec
new file mode 100644
index 000000000..56a8be81b
--- /dev/null
+++ b/redhat/applications/kuickshow/kuickshow.spec
@@ -0,0 +1,168 @@
+#
+# spec file for package kuickshow (version R14)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.7
+%endif
+%define tde_pkg kuickshow
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
+%define tde_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.8.13
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Quick picture viewer for TDE
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	autoconf automake libtool m4
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# IMLIB1 support
+%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?suse_version}
+BuildRequires:	imlib-devel
+%endif
+%if 0%{?mgaversion}
+BuildRequires:	imlib1-devel
+%endif
+
+# GIF support
+%if 0%{?suse_version} || 0%{?fedora} >= 28
+BuildRequires:	giflib-devel 
+%else
+BuildRequires:	libungif-devel 
+%endif
+
+
+%description
+Kuickshow is a picture viewer for TDE. It displays the directory structure,
+displaying images as thumbnails.
+Clicking on an image shows the image in its normal size. 
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+
+%configure \
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --includedir=%{tde_tdeincludedir} \
+  \
+  --disable-dependency-tracking \
+  --disable-debug \
+  --enable-final \
+  --enable-new-ldflags \
+  --enable-closure \
+  --enable-rpath \
+  --disable-gcc-hidden-visibility
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{?buildroot}
+
+# Missing category will make this fail.
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{tde_bindir}/kuickshow
+%{tde_datadir}/applications/*/*.desktop
+%{tde_datadir}/apps/kuickshow/
+%{tde_datadir}/icons/hicolor/*/*/*
+%{tde_libdir}/libtdeinit_%{tde_pkg}.so
+%{tde_libdir}/*.la
+%{tde_tdelibdir}/*.so
+%{tde_tdelibdir}/*.la
+%{tde_tdedocdir}/HTML/en/kuickshow/
+
+
+%changelog
diff --git a/redhat/applications/kvirc/kvirc-14.0.0.spec b/redhat/applications/kvirc/kvirc.spec
index 46d6a6d21..bdfc113fa 100644
--- a/redhat/applications/kvirc/kvirc-14.0.0.spec
+++ b/redhat/applications/kvirc/kvirc.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg kvirc
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/kvkbd/kvkbd.spec b/redhat/applications/kvkbd/kvkbd.spec
index a39ca1f22..89753f0a9 100644
--- a/redhat/applications/kvkbd/kvkbd.spec
+++ b/redhat/applications/kvkbd/kvkbd.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg kvkbd
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/kvpnc/kvpnc-14.0.0-fix_install.patch b/redhat/applications/kvpnc/kvpnc-14.0.0-fix_install.patch
deleted file mode 100644
index 1d5b6b300..000000000
--- a/redhat/applications/kvpnc/kvpnc-14.0.0-fix_install.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- trinity-kvpnc-14.0.0~pre118+1ae72fe0/src/Makefile.am.ORI	2013-07-20 12:35:51.155931996 +0200
-+++ trinity-kvpnc-14.0.0~pre118+1ae72fe0/src/Makefile.am	2013-07-20 12:37:49.601226585 +0200
-@@ -57,13 +57,13 @@
- 
- 
- install-data-local:
--	$(mkinstalldirs) $(kde_appsdir)/
--	$(INSTALL_DATA) $(srcdir)/kvpnc.desktop $(kde_appsdir)/kvpnc.desktop
-+	$(mkinstalldirs) $(xdg_appsdir)/
-+	$(INSTALL_DATA) $(srcdir)/kvpnc.desktop $(xdg_appsdir)/kvpnc.desktop
- 	$(mkinstalldirs) $(kde_datadir)/kvpnc/
- 	$(INSTALL_DATA) $(srcdir)/kvpncui.rc $(kde_datadir)/kvpnc/kvpncui.rc
- 	$(mkinstalldirs) $(kde_datadir)/kvpnc/
- 	$(INSTALL_DATA) $(srcdir)/eventsrc $(kde_datadir)/kvpnc/eventsrc
--	$(INSTALL_DATA) $(srcdir)/ping_check.sh $(kde_datadir)/kvpnc/ping_check.sh
-+	$(INSTALL_SCRIPT) $(srcdir)/ping_check.sh $(kde_datadir)/kvpnc/ping_check.sh
- 	$(INSTALL_DATA) $(srcdir)/newprofilewizard.png $(kde_datadir)/kvpnc/newprofilewizard.png
- 	$(INSTALL_DATA) $(srcdir)/newprofilewizard_final.png $(kde_datadir)/kvpnc/newprofilewizard_final.png
- #	$(INSTALL_DATA) $(srcdir)/x-cisco.desktop $(kde_mimedir)/application/x-cisco.desktop
diff --git a/redhat/applications/kvpnc/kvpnc-14.0.0.patch b/redhat/applications/kvpnc/kvpnc-14.0.0.patch
deleted file mode 100644
index 1d5b6b300..000000000
--- a/redhat/applications/kvpnc/kvpnc-14.0.0.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- trinity-kvpnc-14.0.0~pre118+1ae72fe0/src/Makefile.am.ORI	2013-07-20 12:35:51.155931996 +0200
-+++ trinity-kvpnc-14.0.0~pre118+1ae72fe0/src/Makefile.am	2013-07-20 12:37:49.601226585 +0200
-@@ -57,13 +57,13 @@
- 
- 
- install-data-local:
--	$(mkinstalldirs) $(kde_appsdir)/
--	$(INSTALL_DATA) $(srcdir)/kvpnc.desktop $(kde_appsdir)/kvpnc.desktop
-+	$(mkinstalldirs) $(xdg_appsdir)/
-+	$(INSTALL_DATA) $(srcdir)/kvpnc.desktop $(xdg_appsdir)/kvpnc.desktop
- 	$(mkinstalldirs) $(kde_datadir)/kvpnc/
- 	$(INSTALL_DATA) $(srcdir)/kvpncui.rc $(kde_datadir)/kvpnc/kvpncui.rc
- 	$(mkinstalldirs) $(kde_datadir)/kvpnc/
- 	$(INSTALL_DATA) $(srcdir)/eventsrc $(kde_datadir)/kvpnc/eventsrc
--	$(INSTALL_DATA) $(srcdir)/ping_check.sh $(kde_datadir)/kvpnc/ping_check.sh
-+	$(INSTALL_SCRIPT) $(srcdir)/ping_check.sh $(kde_datadir)/kvpnc/ping_check.sh
- 	$(INSTALL_DATA) $(srcdir)/newprofilewizard.png $(kde_datadir)/kvpnc/newprofilewizard.png
- 	$(INSTALL_DATA) $(srcdir)/newprofilewizard_final.png $(kde_datadir)/kvpnc/newprofilewizard_final.png
- #	$(INSTALL_DATA) $(srcdir)/x-cisco.desktop $(kde_mimedir)/application/x-cisco.desktop
diff --git a/redhat/applications/kvpnc/kvpnc.spec b/redhat/applications/kvpnc/kvpnc.spec
index d2d9fc81b..a1421fd20 100644
--- a/redhat/applications/kvpnc/kvpnc.spec
+++ b/redhat/applications/kvpnc/kvpnc.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg kvpnc
 %define tde_prefix /opt/trinity
@@ -56,8 +56,6 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-Patch0:			%{tde_pkg}-14.0.0.patch
-
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
@@ -111,7 +109,6 @@ It supports :
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch0 -p1 -b .installdir
 
 
 %build
diff --git a/redhat/applications/kxmleditor/kxmleditor.spec b/redhat/applications/kxmleditor/kxmleditor.spec
index c09858848..c77d964ab 100644
--- a/redhat/applications/kxmleditor/kxmleditor.spec
+++ b/redhat/applications/kxmleditor/kxmleditor.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg kxmleditor
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/mplayerthumbs/mplayerthumbs.spec b/redhat/applications/mplayerthumbs/mplayerthumbs.spec
index 625d7d810..6a932316b 100644
--- a/redhat/applications/mplayerthumbs/mplayerthumbs.spec
+++ b/redhat/applications/mplayerthumbs/mplayerthumbs.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg mplayerthumbs
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/piklab/piklab-14.0.0.spec b/redhat/applications/piklab/piklab.spec
index 7bcffe525..dec2928f2 100644
--- a/redhat/applications/piklab/piklab-14.0.0.spec
+++ b/redhat/applications/piklab/piklab.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg piklab
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/potracegui/potracegui.spec b/redhat/applications/potracegui/potracegui.spec
index 8b54c5611..083f43f67 100644
--- a/redhat/applications/potracegui/potracegui.spec
+++ b/redhat/applications/potracegui/potracegui.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg potracegui
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/qalculate-tde/qalculate-tde.spec b/redhat/applications/qalculate-tde/qalculate-tde.spec
index bf149cdc9..8316dc8e8 100644
--- a/redhat/applications/qalculate-tde/qalculate-tde.spec
+++ b/redhat/applications/qalculate-tde/qalculate-tde.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg qalculate-tde
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine-14.0.0.spec b/redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine.spec
index bced59322..d01e50fac 100644
--- a/redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine-14.0.0.spec
+++ b/redhat/applications/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.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg qt4-tqt-theme-engine
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/rosegarden/rosegarden-14.0.0.spec b/redhat/applications/rosegarden/rosegarden.spec
index ddc7115cd..cb27534ee 100644
--- a/redhat/applications/rosegarden/rosegarden-14.0.0.spec
+++ b/redhat/applications/rosegarden/rosegarden.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg rosegarden
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec b/redhat/applications/smartcardauth/smartcardauth.spec
index 8c9d3fc8c..072d5b6c7 100644
--- a/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec
+++ b/redhat/applications/smartcardauth/smartcardauth.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg smartcardauth
 %define tde_prefix /opt/trinity
@@ -37,6 +37,7 @@
 %define debug_package %{nil}
 %endif
 
+%define dont_check_desktop_files 1
 
 Name:		trinity-%{tde_pkg}
 Epoch:		%{tde_epoch}
@@ -65,7 +66,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -80,10 +81,8 @@ BuildRequires:	update-desktop-files
 BuildRequires:	brp-check-trinity
 %endif
 
-#BuildRequires:	perl-PAR-Packer
-
 # PCSC support
-%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} || 0%{?mdkversion} || 9%{?pclinuxos}
 Requires:	perl-pcsc-perl
 %endif
 %if 0%{?rhel} || 0%{?fedora}
@@ -105,11 +104,11 @@ BuildRequires:	pkcs11-helper-devel
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1220 || 0%{?mdkversion} || 0%{?mgaversion}
 %define with_db 1
 %if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos}
-BuildRequires:  db4-devel
-%else
+#%if 0%{?pclinuxos}
+#BuildRequires:  db4-devel
+#%else
 BuildRequires:  db5-devel
-%endif
+#%endif
 %endif
 %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
 BuildRequires:  libdb-devel
@@ -133,6 +132,9 @@ BuildRequires:	libgnutls-devel
 BuildRequires:	gnutls-devel
 %endif
 
+# The 'pp' utility
+BuildRequires:	perl-PAR-Packer
+
 
 %description
 This utility will allow you to set up your computer to accept a SmartCard as an authentication source for:
@@ -162,28 +164,50 @@ in addition to the PKCS certificate functionality
 
 
 %build
+unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 
-cd src
-make CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}"
+if [ -x "%{_libdir}/nss/unsupported-tools/pp" ]; then
+  PATH="%{_libdir}/nss/unsupported-tools:${PATH}"
+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} -DNDEBUG" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX="%{_prefix}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+%if 0%{?mgaversion} || 0%{?pclinuxos}
+  -DPERL_PAR_PACKER="pp.pl" \
+%endif
+%if 0%{?mgaversion} == 6 || 0%{?pclinuxos}
+  -DPERL_LIB_CHIPCARD="%{perl_sitearch}" \
+%endif
+  \
+  -DBUILD_ALL=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_TRANSLATIONS=ON \
+  \
+  ..
+
+%__make %{?_smp_mflags} || %__make
 
 
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-
-%if "%{tde_version}" == "14.1.0"
-%__make install DESTDIR="%{?buildroot}"
-%else
-%__install -D -m 755 "scriptor_standalone.pl" "%{buildroot}%{_bindir}/scriptor.pl"
-%__install -D -m 755 "src/ckpasswd" "%{buildroot}%{_bindir}/smartauthckpasswd"
-%__ln_s "smartauthckpasswd" "%{buildroot}%{_bindir}/smartauthmon"
-%__cp -Rp "usr/"*  "%{buildroot}%{_prefix}"
-
-sed -i "%{?buildroot}%{_datadir}/applications/"*".desktop" -e "/^Categories/ s|TDE|X-TDE|"
-echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{_datadir}/applications/smartcardauth.desktop"
-echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{_datadir}/applications/smartcardrestrict.desktop"
-%endif
+%__make install DESTDIR="%{?buildroot}" -C build
 
 
 %clean
@@ -195,10 +219,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{_datadir}/applications/smartcardrestric
 %doc gpl.txt
 %{_bindir}/cryptosmartcard.sh
 %{_datadir}/initramfs-tools/
-%if "%{tde_version}" == "14.1.0"
-%{_bindir}/cardpincheck
-%else
-%{_bindir}/scriptor.pl
+%{_bindir}/scriptor_standalone
 %{_bindir}/setupcard.sh
 %{_bindir}/setupslavecard.sh
 %{_bindir}/smartauth.sh
@@ -208,7 +229,8 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{_datadir}/applications/smartcardrestric
 %{_datadir}/applications/smartcardrestrict.desktop
 %{_datadir}/icons/hicolor/16x16/apps/smartcardauth.png
 %{_datadir}/icons/hicolor/32x32/apps/smartcardauth.png
-%endif
+%{_sysconfdir}/smartauth/
+%{_sysconfdir}/init/smartauthlogin.conf
 
 
 %changelog
diff --git a/redhat/applications/smb4k/smb4k-14.0.0.spec b/redhat/applications/smb4k/smb4k.spec
index 9e30a9b06..82918edd2 100644
--- a/redhat/applications/smb4k/smb4k-14.0.0.spec
+++ b/redhat/applications/smb4k/smb4k.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg smb4k
 %define tde_prefix /opt/trinity
@@ -160,6 +160,7 @@ export PATH="%{tde_bindir}:${PATH}"
   --libdir=%{tde_libdir} \
   --mandir=%{tde_mandir} \
   --includedir=%{tde_tdeincludedir} \
+  --program-prefix="" \
   \
   --disable-dependency-tracking \
   --disable-debug \
diff --git a/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec b/redhat/applications/soundkonverter/soundkonverter.spec
index 25ee3424d..1d2c3ffb9 100644
--- a/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec
+++ b/redhat/applications/soundkonverter/soundkonverter.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg soundkonverter
 %define tde_prefix /opt/trinity
@@ -146,6 +146,7 @@ export PATH="%{tde_bindir}:${PATH}"
   --libdir=%{tde_libdir} \
   --mandir=%{tde_mandir} \
   --includedir=%{tde_tdeincludedir} \
+  --program-prefix="" \
   \
   --disable-dependency-tracking \
   --disable-debug \
diff --git a/redhat/applications/tastymenu/tastymenu.spec b/redhat/applications/tastymenu/tastymenu.spec
index 984912246..d6fca44c5 100644
--- a/redhat/applications/tastymenu/tastymenu.spec
+++ b/redhat/applications/tastymenu/tastymenu.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg tastymenu
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec b/redhat/applications/tde-guidance/tde-guidance.spec
index ebf6e0021..0649514e9 100644
--- a/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec
+++ b/redhat/applications/tde-guidance/tde-guidance.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg tde-guidance
 %define tde_prefix /opt/trinity
@@ -105,7 +105,7 @@ 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%{?suse_version}
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?suse_version}
 %define with_xscreensaver 1
 
 %if 0%{?fedora} || 0%{?rhel} >= 5
@@ -140,10 +140,18 @@ BuildRequires:	xscreensaver-gl
 %endif
 %endif
 
+# PYTHON
+%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31
+%define python python2
+%define __python %__python2
+%else
+%define python python
+%endif
+BuildRequires:	%{python}
+
 Requires:		python-tqt
 Requires:		trinity-python-trinity
 Requires:		trinity-pytdeextensions
-Requires:		python
 %if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
 Requires:		hwdata
 %endif
@@ -212,7 +220,7 @@ Summary:		collection of system administration tools for GNU/Linux [Trinity]
 %if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
 Requires:		hwdata
 %endif
-Requires:		python
+Requires:		%{python}
 
 Obsoletes:		trinity-guidance-backends < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:		trinity-guidance-backends = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -307,7 +315,7 @@ if [ -d /usr/X11R6 ]; then
   %__sed -i "setup.py" -e "s|/usr/X11R6/lib|/usr/X11R6/%{_lib}|g"
 fi
 
-./setup.py build
+%__python ./setup.py build
 
 
 %install
@@ -324,7 +332,7 @@ export PYTHONPATH="%{python_sitearch}/sip4_tqt:${PYTHONPATH}"
 export PYTHONDONTWRITEBYTECODE=
 
 %__rm -rf %{buildroot}
-./setup.py install \
+%__python ./setup.py install \
 	--prefix=%{tde_prefix} \
 	--root=%{buildroot}
 
@@ -421,7 +429,7 @@ chmod 0755 %{buildroot}%{python_sitearch}/%{name}/gpmhelper.py
 
 # Replace all '#!' calls to python with /usr/bin/python
 # and make them executable
-%if 0%{?fedora} >= 30
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8
 %define python /usr/bin/python2
 %else
 %define python /usr/bin/python
diff --git a/redhat/applications/tde-style-baghira/tde-style-baghira.spec b/redhat/applications/tde-style-baghira/tde-style-baghira.spec
index 185110631..064270e53 100644
--- a/redhat/applications/tde-style-baghira/tde-style-baghira.spec
+++ b/redhat/applications/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.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg tde-style-baghira
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/tde-style-domino/tde-style-domino.spec b/redhat/applications/tde-style-domino/tde-style-domino.spec
index a2dfdd079..bac069fc2 100644
--- a/redhat/applications/tde-style-domino/tde-style-domino.spec
+++ b/redhat/applications/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.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg tde-style-domino
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/tde-style-ia-ora/tde-style-ia-ora.spec b/redhat/applications/tde-style-ia-ora/tde-style-ia-ora.spec
index bd89d6687..106f54d0b 100644
--- a/redhat/applications/tde-style-ia-ora/tde-style-ia-ora.spec
+++ b/redhat/applications/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.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg tde-style-ia-ora
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/tde-style-lipstik/tde-style-lipstik-14.0.0.spec b/redhat/applications/tde-style-lipstik/tde-style-lipstik.spec
index 055ca88d7..9b1d185a9 100644
--- a/redhat/applications/tde-style-lipstik/tde-style-lipstik-14.0.0.spec
+++ b/redhat/applications/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.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg tde-style-lipstik
 %define tde_prefix /opt/trinity
@@ -65,7 +65,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
@@ -100,37 +100,44 @@ Lipstik also provides Lipstik-color-schemes
 %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} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
+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} -DNDEBUG" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+  -DDATA_INSTALL_DIR="%{tde_datadir}" \
+  -DLIB_INSTALL_DIR="%{tde_libdir}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DBUILD_ALL=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_TRANSLATIONS=ON \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-final \
-  --enable-new-ldflags \
-  --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
 
 
 %clean
@@ -145,10 +152,10 @@ export PATH="%{tde_bindir}:${PATH}"
 %{tde_tdelibdir}/tdestyle_lipstik_config.so
 %{tde_tdelibdir}/plugins/styles/lipstik.la
 %{tde_tdelibdir}/plugins/styles/lipstik.so
-%{tde_datadir}/apps/tdedisplay/color-schemes/lipstiknoble.kcsrc
-%{tde_datadir}/apps/tdedisplay/color-schemes/lipstikstandard.kcsrc
-%{tde_datadir}/apps/tdedisplay/color-schemes/lipstikwhite.kcsrc
-%{tde_datadir}/apps/tdestyle/themes/lipstik.themerc
+%{tde_datadir}/tdedisplay/color-schemes/lipstiknoble.kcsrc
+%{tde_datadir}/tdedisplay/color-schemes/lipstikstandard.kcsrc
+%{tde_datadir}/tdedisplay/color-schemes/lipstikwhite.kcsrc
+%{tde_datadir}/tdestyle/themes/lipstik.themerc
 
 
 %changelog
diff --git a/redhat/applications/tde-style-qtcurve/tde-style-qtcurve-14.0.0.spec b/redhat/applications/tde-style-qtcurve/tde-style-qtcurve.spec
index 3bb94eadd..175438630 100644
--- a/redhat/applications/tde-style-qtcurve/tde-style-qtcurve-14.0.0.spec
+++ b/redhat/applications/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.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg tde-style-qtcurve
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/tde-systemsettings/tde-settings-laptops.directory b/redhat/applications/tde-systemsettings/tde-settings-laptops.directory
new file mode 100644
index 000000000..d37d9ba13
--- /dev/null
+++ b/redhat/applications/tde-systemsettings/tde-settings-laptops.directory
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Laptops & Power
+Name[br]=Gremm
+Name[el]=Ισχύς
+Name[it]=Energia
+Name[mt]=Elettriku
+Name[nl]=Energie
+Name[pa]=ਊਰਜਾ(power)
+Name[pt_BR]=Energia
+Name[ru]=Управление питанием
+Name[sv]=Effekt
+Icon=energy
+OnlyShowIn=TDE;
diff --git a/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec b/redhat/applications/tde-systemsettings/tde-systemsettings.spec
index 812b2329d..6b6a1fbb5 100644
--- a/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec
+++ b/redhat/applications/tde-systemsettings/tde-systemsettings.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg tde-systemsettings
 %define tde_prefix /opt/trinity
@@ -57,7 +57,7 @@ Prefix:		%{tde_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Source1:		kde-settings-laptops.directory
+Source1:		tde-settings-laptops.directory
 
 
 Provides:	trinity-kde-systemsettings = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -120,6 +120,7 @@ export kde_confdir="%{tde_confdir}"
   --datadir=%{tde_datadir} \
   --includedir=%{tde_tdeincludedir} \
   --sysconfdir=%{tde_sysconfdir} \
+  --program-prefix="" \
   \
   --disable-dependency-tracking \
   --disable-debug \
@@ -169,7 +170,6 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/systemsettings.desktop"
 %{tde_datadir}/applications/tde/audioencoding.desktop
 %{tde_datadir}/applications/tde/defaultapplication.desktop
 %{tde_datadir}/applications/tde/kcm_knetworkconfmodule_ss.desktop
-#%{tde_datadir}/applications/tde/laptop.desktop
 %{tde_datadir}/applications/tde/medianotifications.desktop
 %{tde_datadir}/applications/tde/systemsettings.desktop
 %{tde_datadir}/apps/systemsettings/
diff --git a/redhat/applications/tdedocker/tdedocker.spec b/redhat/applications/tdedocker/tdedocker.spec
index 5685e4075..73621093b 100644
--- a/redhat/applications/tdedocker/tdedocker.spec
+++ b/redhat/applications/tdedocker/tdedocker.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg tdedocker
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/tdeio-apt/tdeio-apt-14.0.0.spec b/redhat/applications/tdeio-apt/tdeio-apt.spec
index c405bfa07..041304b19 100644
--- a/redhat/applications/tdeio-apt/tdeio-apt-14.0.0.spec
+++ b/redhat/applications/tdeio-apt/tdeio-apt.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg tdeio-apt
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/tdeio-ftps/tdeio-ftps.spec b/redhat/applications/tdeio-ftps/tdeio-ftps.spec
index cd0b89d14..3fad6f963 100644
--- a/redhat/applications/tdeio-ftps/tdeio-ftps.spec
+++ b/redhat/applications/tdeio-ftps/tdeio-ftps.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg tdeio-ftps
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/tdeio-gopher/tdeio-gopher.spec b/redhat/applications/tdeio-gopher/tdeio-gopher.spec
index e13482992..d7c47f344 100644
--- a/redhat/applications/tdeio-gopher/tdeio-gopher.spec
+++ b/redhat/applications/tdeio-gopher/tdeio-gopher.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg tdeio-gopher
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/tdeio-locate/tdeio-locate-14.0.0.spec b/redhat/applications/tdeio-locate/tdeio-locate.spec
index 2c389bbee..3dad2ada0 100644
--- a/redhat/applications/tdeio-locate/tdeio-locate-14.0.0.spec
+++ b/redhat/applications/tdeio-locate/tdeio-locate.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg tdeio-locate
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/tdeio-sword/tdeio-sword.spec b/redhat/applications/tdeio-sword/tdeio-sword.spec
index bd1e3f003..bd78c8efa 100644
--- a/redhat/applications/tdeio-sword/tdeio-sword.spec
+++ b/redhat/applications/tdeio-sword/tdeio-sword.spec
@@ -23,7 +23,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg tdeio-sword
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper.spec b/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper.spec
index 81e416d4e..2167ad3ea 100644
--- a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper.spec
+++ b/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg tdeio-umountwrapper
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/tdenetworkmanager/tdenetworkmanager.spec b/redhat/applications/tdenetworkmanager/tdenetworkmanager.spec
index cf3edd2bb..048617263 100644
--- a/redhat/applications/tdenetworkmanager/tdenetworkmanager.spec
+++ b/redhat/applications/tdenetworkmanager/tdenetworkmanager.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg tdenetworkmanager
 %define tde_prefix /opt/trinity
@@ -84,7 +84,7 @@ Provides:		trinity-knetworkmanager = %{version}-%{release}
 %if 0%{?rhel} || 0%{?fedora}
 %if 0%{?fedora} >= 20 || 0%{?rhel} >= 7
 Requires:		NetworkManager
-%if 0%{?fedora} >= 29
+%if 0%{?fedora} >= 29 || 0%{?rhel} >= 8
 BuildRequires:	NetworkManager-libnm-devel
 %else
 BuildRequires:		NetworkManager-devel
@@ -98,7 +98,7 @@ Requires:		networkmanager
 %endif
 %if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
 %if 0%{?pclinuxos} == 0
-%if 0%{?fedora} >= 29
+%if 0%{?fedora} >= 29 || 0%{?rhel} >= 8
 BuildRequires:	NetworkManager-libnm-devel
 %else
 BuildRequires:	NetworkManager-glib-devel
@@ -151,7 +151,7 @@ if [ -r "/etc/xdg/autostart/nm-applet.desktop" ]; then
   fi
 fi
 
-%files -f %{tde_pkg}.lang
+%files
 %defattr(-,root,root,-)
 %{tde_bindir}/tdenetworkmanager
 %{tde_libdir}/*.la
@@ -163,11 +163,11 @@ fi
 %{tde_datadir}/servicetypes/tdenetworkmanager_plugin.desktop
 %{tde_datadir}/servicetypes/tdenetworkmanager_vpnplugin.desktop
 %{tde_datadir}/autostart/tdenetworkmanager.desktop
-%{tde_datadir}/services/tdenetman_openvpn.desktop
-%{tde_datadir}/services/tdenetman_pptp.desktop
-%{tde_datadir}/services/tdenetman_strongswan.desktop
-%{tde_datadir}/services/tdenetman_vpnc.desktop
-%{tde_tdedocdir}/HTML/en/tdenetworkmanager/
+#{tde_datadir}/services/tdenetman_openvpn.desktop
+#{tde_datadir}/services/tdenetman_pptp.desktop
+#{tde_datadir}/services/tdenetman_strongswan.desktop
+#{tde_datadir}/services/tdenetman_vpnc.desktop
+#{tde_tdedocdir}/HTML/en/tdenetworkmanager/
 
 ##########
 
@@ -231,8 +231,6 @@ fi
 %__rm -rf $RPM_BUILD_ROOT
 %__make install DESTDIR=%{?buildroot} -C build
 
-%find_lang %{tde_pkg}
-
 # Updates applications categories for openSUSE
 %if 0%{?suse_version}
 %suse_update_desktop_file -r %{tde_pkg} Utility TrayIcon System Applet
diff --git a/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec b/redhat/applications/tdepowersave/tdepowersave.spec
index 613e0ba2f..c69a1df22 100644
--- a/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec
+++ b/redhat/applications/tdepowersave/tdepowersave.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg tdepowersave
 %define tde_prefix /opt/trinity
@@ -241,6 +241,7 @@ fi
 %{tde_datadir}/icons/hicolor/*/*/*.png
 %{tde_datadir}/autostart/tdepowersave-autostart.desktop
 %{tde_confdir}/tdepowersaverc
+%{tde_mandir}/man1/tdepowersave.*
 
 %lang(cs) %{tde_tdedocdir}/HTML/cs/tdepowersave/
 %lang(de) %{tde_tdedocdir}/HTML/de/tdepowersave/
diff --git a/redhat/applications/tderadio/tderadio-14.0.0.spec b/redhat/applications/tderadio/tderadio.spec
index 7b15298df..317d3a715 100644
--- a/redhat/applications/tderadio/tderadio-14.0.0.spec
+++ b/redhat/applications/tderadio/tderadio.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg tderadio
 %define tde_prefix /opt/trinity
@@ -166,6 +166,7 @@ export PATH="%{tde_bindir}:${PATH}"
   --libdir=%{tde_libdir} \
   --mandir=%{tde_mandir} \
   --includedir=%{tde_tdeincludedir} \
+  --program-prefix="" \
   \
   --disable-dependency-tracking \
   --disable-debug \
diff --git a/redhat/applications/tdesudo/tdesudo.spec b/redhat/applications/tdesudo/tdesudo.spec
index 83e1bff8f..b60c7db84 100644
--- a/redhat/applications/tdesudo/tdesudo.spec
+++ b/redhat/applications/tdesudo/tdesudo.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg tdesudo
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/tdesvn/tdesvn-14.0.0.patch b/redhat/applications/tdesvn/tdesvn-14.0.0.patch
deleted file mode 100644
index b22e7f2e4..000000000
--- a/redhat/applications/tdesvn/tdesvn-14.0.0.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- trinity-tdesvn-14.0.0~pre185+fddfb277/src/svnqt/CMakeLists.txt.sqlite3	2013-12-30 17:57:05.867723485 +0100
-+++ trinity-tdesvn-14.0.0~pre185+fddfb277/src/svnqt/CMakeLists.txt	2014-09-16 21:49:29.774968683 +0200
-@@ -45,19 +45,6 @@
-     cache/DatabaseException.cpp
-     )
- 
--#     IF (SQLITE_FOUND)
--        MESSAGE(STATUS "Build own sqlite3 database modul")
--        SET(SOURCES
--            ${SOURCES}
--            cache/sqlite3/qsqlcachedresult.cpp
--            cache/sqlite3/qsql_sqlite3.cpp
--            cache/sqlite3/qsqlcachedresult.h
--            cache/sqlite3/qsql_sqlite3.h
--        )
--#     ELSE (SQLITE_FOUND)
--#         MESSAGE(SEND_ERROR "The QT3 version requires sqlite3 but could not found")
--#     ENDIF (SQLITE_FOUND)
--
- SET(CACHEINST_HEADERS
-     cache/LogCache.hpp
-     cache/ReposLog.hpp
-@@ -150,7 +137,7 @@
- 
- # IF (SQLITE_FOUND)
-     TARGET_LINK_LIBRARIES(${svnqt-name} ${SQLITE_LIBRARIES})
--    INCLUDE_DIRECTORIES(SQLITE_INCLUDE_DIR)
-+    INCLUDE_DIRECTORIES(${SQLITE_INCLUDE_DIR})
- # ELSE (SQLITE_FOUND)
- #     TARGET_LINK_LIBRARIES(${svnqt-name} ${QT_QTSQL_LIBRARY})
- # ENDIF (SQLITE_FOUND)
---- trinity-tdesvn-14.0.0~pre185+fddfb277/src/svnqt/cache/LogCache.cpp.sqlite3	2014-01-28 20:25:28.711539518 +0100
-+++ trinity-tdesvn-14.0.0~pre185+fddfb277/src/svnqt/cache/LogCache.cpp	2014-09-16 21:51:37.826387614 +0200
-@@ -10,9 +10,10 @@
- #include "svnqt/cache/DatabaseException.hpp"
- 
- #ifndef NO_SQLITE3
--#include "sqlite3/qsql_sqlite3.h"
-+#include <qsql_sqlite3.h>
- #define SQLTYPE "QSQLITE3"
- #else
-+#include <qsql_sqlite.h>
- #define SQLTYPE "QSQLITE"
- #endif
- 
-@@ -262,11 +263,6 @@
- 
- void LogCache::setupMainDb()
- {
--#ifndef NO_SQLITE3
--    if (!TQSqlDatabase::isDriverAvailable(SQLTYPE)) {
--        TQSqlDatabase::registerSqlDriver(SQLTYPE,new TQSqlDriverCreator<TQSQLite3Driver>);
--    }
--#endif
-     TQDataBase mainDB = m_CacheData->getMainDB();
-     if (!mainDB || !mainDB->open()) {
-         tqWarning("Failed to open main database: %s", (mainDB?mainDB->lastError().text().TOUTF8().data():"No database object."));
diff --git a/redhat/applications/tdesvn/tdesvn-14.0.0.spec b/redhat/applications/tdesvn/tdesvn.spec
index 675f25b7f..710da2f31 100644
--- a/redhat/applications/tdesvn/tdesvn-14.0.0.spec
+++ b/redhat/applications/tdesvn/tdesvn.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg tdesvn
 %define tde_prefix /opt/trinity
@@ -55,7 +55,6 @@ Prefix:		%{tde_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Patch0:			%{tde_pkg}-14.0.0.patch
 
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
@@ -247,7 +246,6 @@ fi
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch0 -p1
 
 rm -f src/svnqt/CMakeLists.txt.orig
 rm -fr src/svnqt/cache/sqlite3/
diff --git a/redhat/applications/tdmtheme/tdmtheme.spec b/redhat/applications/tdmtheme/tdmtheme.spec
index 5d44a1bbd..512eaef43 100644
--- a/redhat/applications/tdmtheme/tdmtheme.spec
+++ b/redhat/applications/tdmtheme/tdmtheme.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg tdmtheme
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/tellico/tellico-14.0.0.spec b/redhat/applications/tellico/tellico.spec
index fa1d1495f..341c7f82e 100644
--- a/redhat/applications/tellico/tellico-14.0.0.spec
+++ b/redhat/applications/tellico/tellico.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg tellico
 %define tde_prefix /opt/trinity
@@ -272,7 +272,7 @@ if [ -r /usr/include/libv4l1-videodev.h ]; then
 %__sed -i "src/barcode/barcode_v4l.h" -e "s|linux/videodev.h|libv4l1.h|"
 fi
 
-%if 0%{?fedora} >= 30
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8
 %__sed -i "src/fetch/scripts/dark_horse_comics.py" \
           "src/fetch/scripts/ministerio_de_cultura.py" \
           "src/fetch/scripts/fr.allocine.py" \
diff --git a/redhat/applications/tork/tork-14.0.0.spec b/redhat/applications/tork/tork.spec
index 4682ab764..8992ea31d 100644
--- a/redhat/applications/tork/tork-14.0.0.spec
+++ b/redhat/applications/tork/tork.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg tork
 %define tde_prefix /opt/trinity
@@ -117,6 +117,7 @@ export PATH="%{tde_bindir}:${PATH}"
   --datadir=%{tde_datadir} \
   --includedir=%{tde_tdeincludedir} \
   --mandir=%{tde_mandir} \
+  --program-prefix="" \
   \
   --disable-dependency-tracking \
   --disable-debug \
diff --git a/redhat/applications/twin-style-crystal/twin-style-crystal-14.0.0.spec b/redhat/applications/twin-style-crystal/twin-style-crystal.spec
index 9f22e2596..cdf1e4e92 100644
--- a/redhat/applications/twin-style-crystal/twin-style-crystal-14.0.0.spec
+++ b/redhat/applications/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.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg twin-style-crystal
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/wlassistant/wlassistant-14.0.0.spec b/redhat/applications/wlassistant/wlassistant.spec
index fdd4e9b31..ac0d47820 100644
--- a/redhat/applications/wlassistant/wlassistant-14.0.0.spec
+++ b/redhat/applications/wlassistant/wlassistant.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg wlassistant
 %define tde_prefix /opt/trinity
@@ -99,8 +99,15 @@ BuildRequires:	libidn-devel
 %define with_gamin 1
 BuildRequires:	gamin-devel
 %endif
-# PYTHON support
-BuildRequires:	python
+
+# PYTHON
+%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31
+%define python python2
+%define __python %__python2
+%else
+%define python python
+%endif
+BuildRequires:	%{python}
 
 # OPENSSL support
 BuildRequires:	openssl-devel
diff --git a/redhat/applications/yakuake/yakuake.spec b/redhat/applications/yakuake/yakuake.spec
index 165aedac1..be2a53720 100644
--- a/redhat/applications/yakuake/yakuake.spec
+++ b/redhat/applications/yakuake/yakuake.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg yakuake
 %define tde_prefix /opt/trinity
diff --git a/redhat/dependencies/akode/akode-14.0.0.spec b/redhat/dependencies/akode/akode.spec
index f4b24e33a..9bf70642b 100644
--- a/redhat/dependencies/akode/akode-14.0.0.spec
+++ b/redhat/dependencies/akode/akode.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/dependencies/arts/arts-14.0.0.spec b/redhat/dependencies/arts/arts.spec
index 765d14efa..15cfc1623 100644
--- a/redhat/dependencies/arts/arts-14.0.0.spec
+++ b/redhat/dependencies/arts/arts.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg arts
 %define tde_prefix /opt/trinity
diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec b/redhat/dependencies/avahi-tqt/avahi-tqt.spec
index 1989ceb7b..9c42233ee 100644
--- a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
+++ b/redhat/dependencies/avahi-tqt/avahi-tqt.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec
index 7f8d9f3cb..55364763f 100644
--- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
+++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec b/redhat/dependencies/dbus-tqt/dbus-tqt.spec
index 75ec11785..9d6268842 100644
--- a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
+++ b/redhat/dependencies/dbus-tqt/dbus-tqt.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
diff --git a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec b/redhat/dependencies/libart-lgpl/libart-lgpl.spec
index cd8a9ebc2..64d352a5a 100644
--- a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
+++ b/redhat/dependencies/libart-lgpl/libart-lgpl.spec
@@ -19,7 +19,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
@@ -51,6 +51,7 @@ BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
+BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -165,6 +166,7 @@ especially suitable for embedded applications.
 %{_includedir}/libart-2.0/libart_lgpl/libart-features.h
 %{_includedir}/libart-2.0/libart_lgpl/libart.h
 %{_libdir}/pkgconfig/libart-2.0.pc
+%{_mandir}/man1/libart2-config.*
 
 ##########
 
@@ -177,30 +179,42 @@ especially suitable for embedded applications.
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%__cp -f "/usr/share/aclocal/libtool.m4" "libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "ltmain.sh"
-autoreconf -fiv
-
 
 %build
 unset QTDIR QTINC QTLIB
-
-%configure \
-  --prefix=%{_prefix} \
-  --exec-prefix=%{_prefix} \
-  --bindir=%{_bindir} \
-  --libdir=%{_libdir} \
-  --datadir=%{_datadir} \
-  --includedir=%{_includedir} \
+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} -DNDEBUG" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX="%{_prefix}" \
+  -DSHARE_INSTALL_PREFIX="%{_datadir}" \
   \
-  --disable-dependency-tracking
-  
-%__make %{?_smp_mflags}
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DBUILD_ALL=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_TRANSLATIONS=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
 
 
 %clean
diff --git a/redhat/dependencies/libcaldav/libcaldav-14.0.1-rhel5.patch b/redhat/dependencies/libcaldav/libcaldav-14.0.1-rhel5.patch
deleted file mode 100644
index 0cf9f056b..000000000
--- a/redhat/dependencies/libcaldav/libcaldav-14.0.1-rhel5.patch
+++ /dev/null
@@ -1,193 +0,0 @@
-diff --git a/src/add-caldav-object.c b/src/add-caldav-object.c
-index 68a4377..35aef48 100644
---- a/src/add-caldav-object.c
-+++ b/src/add-caldav-object.c
-@@ -103,7 +103,6 @@ gboolean caldav_add(caldav_settings* settings, caldav_error* error) {
- 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PUT");
- 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
- 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
--	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
- 	res = curl_easy_perform(curl);
- 	if (res != 0) {
- 		error->code = -1;
-diff --git a/src/delete-caldav-object.c b/src/delete-caldav-object.c
-index 9a85168..ea5733f 100644
---- a/src/delete-caldav-object.c
-+++ b/src/delete-caldav-object.c
-@@ -150,7 +150,6 @@ gboolean caldav_delete(caldav_settings* settings, caldav_error* error) {
- 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
- 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
- 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
--	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
- 	res = curl_easy_perform(curl);
- 	g_free(search);
- 	curl_slist_free_all(http_header);
-@@ -249,7 +248,6 @@ gboolean caldav_delete(caldav_settings* settings, caldav_error* error) {
- 					curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "DELETE");
- 					curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
- 					curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
--					curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
- 					res = curl_easy_perform(curl);
- 					if (LOCKSUPPORT && lock_token) {
- 						caldav_unlock_object(
-@@ -380,7 +378,6 @@ gboolean caldav_tasks_delete(caldav_settings* settings, caldav_error* error) {
- 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
- 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
- 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
--	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
- 	res = curl_easy_perform(curl);
- 	g_free(search);
- 	curl_slist_free_all(http_header);
-@@ -479,7 +476,6 @@ gboolean caldav_tasks_delete(caldav_settings* settings, caldav_error* error) {
- 					curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "DELETE");
- 					curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
- 					curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
--					curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
- 					res = curl_easy_perform(curl);
- 					if (LOCKSUPPORT && lock_token) {
- 						caldav_unlock_object(
-diff --git a/src/get-caldav-report.c b/src/get-caldav-report.c
-index d916259..0021cb8 100644
---- a/src/get-caldav-report.c
-+++ b/src/get-caldav-report.c
-@@ -169,7 +169,6 @@ gboolean caldav_getall(caldav_settings* settings, caldav_error* error) {
- 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
- 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
- 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
--	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
- 	res = curl_easy_perform(curl);
- 	if (res != 0) {
- 		error->code = -1;
-@@ -266,7 +265,6 @@ gboolean caldav_getrange(caldav_settings* settings, caldav_error* error) {
- 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
- 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
- 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
--	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
- 	res = curl_easy_perform(curl);
- 	if (res != 0) {
- 		error->code = -1;
-@@ -349,7 +347,6 @@ gboolean caldav_tasks_getall(caldav_settings* settings, caldav_error* error) {
- 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
- 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
- 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
--	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
- 	res = curl_easy_perform(curl);
- 	if (res != 0) {
- 		error->code = -1;
-@@ -446,7 +443,6 @@ gboolean caldav_tasks_getrange(caldav_settings* settings, caldav_error* error) {
- 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
- 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
- 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
--	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
- 	res = curl_easy_perform(curl);
- 	if (res != 0) {
- 		error->code = -1;
-diff --git a/src/get-display-name.c b/src/get-display-name.c
-index 8fc0ff8..c205efd 100644
---- a/src/get-display-name.c
-+++ b/src/get-display-name.c
-@@ -99,7 +99,6 @@ gboolean caldav_getname(caldav_settings* settings, caldav_error* error) {
- 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PROPFIND");
- 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
- 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
--	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
- 	res = curl_easy_perform(curl);
- 	if (res != 0) {
- 		error->code = -1;
-diff --git a/src/get-freebusy-report.c b/src/get-freebusy-report.c
-index f75ab92..40a5a3c 100644
---- a/src/get-freebusy-report.c
-+++ b/src/get-freebusy-report.c
-@@ -104,7 +104,6 @@ gboolean caldav_freebusy(caldav_settings* settings, caldav_error* error) {
- 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
- 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
- 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
--	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
- 	res = curl_easy_perform(curl);
- 	if (res != 0) {
- 		error->code = -1;
-diff --git a/src/lock-caldav-object.c b/src/lock-caldav-object.c
-index 30f2d20..6845551 100644
---- a/src/lock-caldav-object.c
-+++ b/src/lock-caldav-object.c
-@@ -107,7 +107,6 @@ gchar* caldav_lock_object(
- 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "LOCK");
- 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
- 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
--	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
- 	res = curl_easy_perform(curl);
- 	curl_slist_free_all(http_header);
- 	if (res != 0) {
-@@ -211,7 +210,6 @@ gboolean caldav_unlock_object(gchar* lock_token, gchar* URI,
- 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "UNLOCK");
- 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
- 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
--	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
- 	res = curl_easy_perform(curl);
- 	curl_slist_free_all(http_header);
- 	if (res != 0) {
-diff --git a/src/modify-caldav-object.c b/src/modify-caldav-object.c
-index fb3a4d0..f3563d8 100644
---- a/src/modify-caldav-object.c
-+++ b/src/modify-caldav-object.c
-@@ -151,7 +151,6 @@ gboolean caldav_modify(caldav_settings* settings, caldav_error* error) {
- 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
- 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
- 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
--	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
- 	res = curl_easy_perform(curl);
- 	curl_slist_free_all(http_header);
- 	http_header = NULL;
-@@ -249,7 +248,6 @@ gboolean caldav_modify(caldav_settings* settings, caldav_error* error) {
- 									strlen(settings->file));
- 						curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
- 						curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
--						curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
- 						curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PUT");
- 						res = curl_easy_perform(curl);
- 						if (LOCKSUPPORT && lock_token) {
-@@ -391,7 +389,6 @@ gboolean caldav_tasks_modify(caldav_settings* settings, caldav_error* error) {
- 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
- 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
- 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
--	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
- 	res = curl_easy_perform(curl);
- 	curl_slist_free_all(http_header);
- 	http_header = NULL;
-@@ -489,7 +486,6 @@ gboolean caldav_tasks_modify(caldav_settings* settings, caldav_error* error) {
- 									strlen(settings->file));
- 						curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
- 						curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
--						curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
- 						curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PUT");
- 						res = curl_easy_perform(curl);
- 						if (LOCKSUPPORT && lock_token) {
-diff --git a/src/options-caldav-server.c b/src/options-caldav-server.c
-index 1d97d04..0045afe 100644
---- a/src/options-caldav-server.c
-+++ b/src/options-caldav-server.c
-@@ -74,7 +74,6 @@ gboolean caldav_getoptions(CURL* curl, caldav_settings* settings, response* resu
- 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "OPTIONS");
- 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
- 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
--	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
- 	res = curl_easy_perform(curl);
- 	if (res == 0) {
- 		gchar* head;
-@@ -102,15 +101,12 @@ gboolean caldav_getoptions(CURL* curl, caldav_settings* settings, response* resu
- 	}
- 	else if (
- 		(res == CURLE_SSL_CONNECT_ERROR ||
--		 CURLE_PEER_FAILED_VERIFICATION ||
- 		 CURLE_SSL_ENGINE_NOTFOUND ||
- 		 CURLE_SSL_ENGINE_SETFAILED ||
- 		 CURLE_SSL_CERTPROBLEM ||
- 		 CURLE_SSL_CIPHER ||
- 		 CURLE_SSL_CACERT ||
--		 CURLE_SSL_CACERT_BADFILE ||
--		 CURLE_SSL_CRL_BADFILE ||
--		 CURLE_SSL_ISSUER_ERROR) && settings->usehttps) {
-+		 CURLE_SSL_CRL_BADFILE ) && settings->usehttps) {
- 		error->code = -2;
- 		error->str = g_strdup(error_buf);
- 	}
diff --git a/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec b/redhat/dependencies/libcaldav/libcaldav.spec
index a4bf7ebb2..312221adf 100644
--- a/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec
+++ b/redhat/dependencies/libcaldav/libcaldav.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg libcaldav
 %define tde_prefix /opt/trinity
@@ -54,8 +54,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-Patch1:		libcaldav-14.0.1-rhel5.patch
-
+BuildRequires:	cmake >= 2.8
 BuildRequires:	make
 BuildRequires:	libtool
 BuildRequires:	fdupes
@@ -100,7 +99,7 @@ easy to integrate CalDAV support into any PIM application.
 %defattr(-,root,root,-)
 %{_libdir}/libcaldav.so.0
 %{_libdir}/libcaldav.so.0.0.6
-%{_docdir}/libcaldav-%{version}/
+%{_docdir}/libcaldav/
 
 %post -n %{libcaldav}0
 /sbin/ldconfig
@@ -151,45 +150,53 @@ This package includes the development files.
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%if 0%{?rhel} == 5
-%patch1 -p1 -b .ftbfs
-%endif
-autoreconf -fiv
 
 
 %build
-# CFLAGS required if CURL is installed on /opt/trinity, e.g. RHEL 5
-export CFLAGS="-I%{tde_includedir} -L%{tde_libdir} ${RPM_OPT_FLAGS}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
 
-# RHEL4 stuff
-if [ -d /usr/evolution28 ]; then
-  export PKG_CONFIG_PATH="/usr/evolution28/%{_lib}/pkgconfig:${PKG_CONFIG_PATH}"
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
 fi
 
-%configure \
-  --docdir=%{_docdir}/libcaldav \
-  --includedir=%{_includedir} \
-  --libdir=%{_libdir} \
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX="%{_prefix}" \
+  -DSHARE_INSTALL_PREFIX="%{_datadir}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DBUILD_ALL=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_TRANSLATIONS=ON \
   \
-  --disable-dependency-tracking
+  ..
 
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
 
 
 %install
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# Unwanted files
-%__rm -f %{buildroot}%{_libdir}/*.a
-
-# Fix doc dir
-mv -f %{?buildroot}%{_docdir}/libcaldav/ %{?buildroot}%{_docdir}/libcaldav-%{version}/
+%__make install DESTDIR=%{buildroot} -C build
 
 # Fix duplicate files
 %fdupes %{?buildroot}
 
+# Fix doc directory
+%if "%{_docdir}" != "%{_datadir}/doc"
+%__mkdir_p "%{?buildroot}/%{_docdir}"
+%__mv -f "%{?buildroot}/%{_datadir}/doc/libcaldav" "%{?buildroot}/%{_docdir}/libcaldav"
+%endif
+
 
 %clean
 %__rm -rf %{buildroot}
diff --git a/redhat/dependencies/libcarddav/libcarddav-14.0.1-rhel5.patch b/redhat/dependencies/libcarddav/libcarddav-14.0.1-rhel5.patch
deleted file mode 100644
index a6bf4e6e0..000000000
--- a/redhat/dependencies/libcarddav/libcarddav-14.0.1-rhel5.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-diff --git a/src/add-carddav-object.c b/src/add-carddav-object.c
-index 5574991..a1586d8 100644
---- a/src/add-carddav-object.c
-+++ b/src/add-carddav-object.c
-@@ -104,7 +104,6 @@ gboolean carddav_add(carddav_settings* settings, carddav_error* error) {
- 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PUT");
- 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
- 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
--	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
- 	res = curl_easy_perform(curl);
- 	if (res != 0) {
- 		error->code = -1;
-diff --git a/src/delete-carddav-object.c b/src/delete-carddav-object.c
-index 96b9033..6984a82 100644
---- a/src/delete-carddav-object.c
-+++ b/src/delete-carddav-object.c
-@@ -132,7 +132,6 @@ gboolean carddav_delete(carddav_settings* settings, carddav_error* error) {
- 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
- 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
- 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
--	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
- 	res = curl_easy_perform(curl);
- 	g_free(search);
- 	curl_slist_free_all(http_header);
-@@ -231,7 +230,6 @@ gboolean carddav_delete(carddav_settings* settings, carddav_error* error) {
- 					curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "DELETE");
- 					curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
- 					curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
--					curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
- 					res = curl_easy_perform(curl);
- 					if (LOCKSUPPORT && lock_token) {
- 						carddav_unlock_object(
-@@ -417,7 +415,6 @@ gboolean carddav_delete_by_uri(carddav_settings* settings, carddav_error* error)
- 			curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "DELETE");
- 			curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
- 			curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
--			curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
- 			res = curl_easy_perform(curl);
- 			if (LOCKSUPPORT && lock_token) {
- 				carddav_unlock_object(
-diff --git a/src/get-carddav-report.c b/src/get-carddav-report.c
-index b44fd2c..7655b29 100644
---- a/src/get-carddav-report.c
-+++ b/src/get-carddav-report.c
-@@ -117,7 +117,6 @@ static gchar* carddav_dirlist(carddav_settings* settings, carddav_error* error)
- 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PROPFIND");
- 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
- 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
--	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
- 	res = curl_easy_perform(curl);
- 	if (res != 0) {
- 		error->code = -1;
-@@ -243,7 +242,6 @@ gboolean carddav_getall(carddav_settings* settings, carddav_error* error) {
- 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
- 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
- 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
--	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
- 	res = curl_easy_perform(curl);
- 	if (res != 0) {
- 		error->code = -1;
-@@ -345,7 +343,6 @@ gboolean carddav_getall_by_uri(carddav_settings* settings, carddav_error* error)
- 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
- 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
- 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
--	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
- 	res = curl_easy_perform(curl);
- 	if (res != 0) {
- 		error->code = -1;
-@@ -378,4 +375,4 @@ gboolean carddav_getall_by_uri(carddav_settings* settings, carddav_error* error)
- 	curl_easy_cleanup(curl);
- 	g_free(dav_file_listing);
- 	return result;
--}
-\ No newline at end of file
-+}
-diff --git a/src/get-display-name.c b/src/get-display-name.c
-index 9e782e0..16c3e4b 100644
---- a/src/get-display-name.c
-+++ b/src/get-display-name.c
-@@ -100,7 +100,6 @@ gboolean carddav_getname(carddav_settings* settings, carddav_error* error) {
- 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PROPFIND");
- 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
- 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
--	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
- 	res = curl_easy_perform(curl);
- 	if (res != 0) {
- 		error->code = -1;
-diff --git a/src/lock-carddav-object.c b/src/lock-carddav-object.c
-index 163264c..2292cad 100644
---- a/src/lock-carddav-object.c
-+++ b/src/lock-carddav-object.c
-@@ -109,7 +109,6 @@ gchar* carddav_lock_object(
- 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "LOCK");
- 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
- 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
--	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
- 	res = curl_easy_perform(curl);
- 	curl_slist_free_all(http_header);
- 	if (res != 0) {
-@@ -214,7 +213,6 @@ gboolean carddav_unlock_object(gchar* lock_token, gchar* URI,
- 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "UNLOCK");
- 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
- 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
--	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
- 	res = curl_easy_perform(curl);
- 	curl_slist_free_all(http_header);
- 	if (res != 0) {
-diff --git a/src/modify-carddav-object.c b/src/modify-carddav-object.c
-index 1822068..a8b6de2 100644
---- a/src/modify-carddav-object.c
-+++ b/src/modify-carddav-object.c
-@@ -133,7 +133,6 @@ gboolean carddav_modify(carddav_settings* settings, carddav_error* error) {
- 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
- 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
- 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
--	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
- 	res = curl_easy_perform(curl);
- 	curl_slist_free_all(http_header);
- 	http_header = NULL;
-@@ -231,7 +230,6 @@ gboolean carddav_modify(carddav_settings* settings, carddav_error* error) {
- 									strlen(settings->file));
- 						curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
- 						curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
--						curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
- 						curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PUT");
- 						res = curl_easy_perform(curl);
- 						if (LOCKSUPPORT && lock_token) {
-@@ -430,7 +428,6 @@ gboolean carddav_modify_by_uri(carddav_settings* settings, carddav_error* error)
- 							strlen(settings->file));
- 				curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
- 				curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
--				curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
- 				curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PUT");
- 				res = curl_easy_perform(curl);
- 				if (LOCKSUPPORT && lock_token) {
-diff --git a/src/options-carddav-server.c b/src/options-carddav-server.c
-index b774401..b44aae2 100644
---- a/src/options-carddav-server.c
-+++ b/src/options-carddav-server.c
-@@ -75,7 +75,6 @@ gboolean carddav_getoptions(CURL* curl, carddav_settings* settings, response* re
- 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "OPTIONS");
- 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
- 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
--	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
- 	if (settings->debug) {
- 		curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
- 	}
-@@ -106,15 +105,12 @@ gboolean carddav_getoptions(CURL* curl, carddav_settings* settings, response* re
- 	}
- 	else if (
- 		(res == CURLE_SSL_CONNECT_ERROR ||
--		 CURLE_PEER_FAILED_VERIFICATION ||
- 		 CURLE_SSL_ENGINE_NOTFOUND ||
- 		 CURLE_SSL_ENGINE_SETFAILED ||
- 		 CURLE_SSL_CERTPROBLEM ||
- 		 CURLE_SSL_CIPHER ||
- 		 CURLE_SSL_CACERT ||
--		 CURLE_SSL_CACERT_BADFILE ||
--		 CURLE_SSL_CRL_BADFILE ||
--		 CURLE_SSL_ISSUER_ERROR) && settings->usehttps) {
-+		 CURLE_SSL_CRL_BADFILE ) && settings->usehttps) {
- 		error->code = -2;
- 		error->str = g_strdup(error_buf);
- 	}
diff --git a/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec b/redhat/dependencies/libcarddav/libcarddav.spec
index 27e23795e..de5d69bed 100644
--- a/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec
+++ b/redhat/dependencies/libcarddav/libcarddav.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg libcarddav
 %define tde_prefix /opt/trinity
@@ -54,8 +54,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-Patch1:		libcarddav-14.0.1-rhel5.patch
-
+BuildRequires:	cmake >= 2.8
 BuildRequires:	make
 BuildRequires:	libtool
 
@@ -100,6 +99,7 @@ Build dependencies are minimal, requiring only libcurl.
 %defattr(-,root,root,-)
 %{_libdir}/libcarddav.so.0
 %{_libdir}/libcarddav.so.0.0.6
+%{_docdir}/libcarddav/
 
 %post -n %{libcarddav}0
 /sbin/ldconfig
@@ -151,43 +151,49 @@ This package contains the development files.
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%if 0%{?rhel} == 5
-%patch1 -p1 -b .ftbfs
-%endif
-
-# Fix empty ChangeLog cause invalid macro in 'configure.ac'
-echo "%{name} (%{version})" >ChangeLog
-
-autoreconf -fiv
 
 
 %build
 unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
 
-# CFLAGS required if CURL is installed on /opt/trinity, e.g. RHEL 5
-export CFLAGS="-I%{tde_includedir} -L%{tde_libdir} ${RPM_OPT_FLAGS}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-
-# RHEL4 stuff
-if [ -d /usr/evolution28 ]; then
-  export PKG_CONFIG_PATH="/usr/evolution28/%{_lib}/pkgconfig:${PKG_CONFIG_PATH}"
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
 fi
 
-%configure \
-  --includedir=%{_includedir} \
-  --libdir=%{_libdir} \
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
   \
-  --disable-dependency-tracking
+  -DCMAKE_INSTALL_PREFIX="%{_prefix}" \
+  -DSHARE_INSTALL_PREFIX="%{_datadir}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DBUILD_ALL=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_TRANSLATIONS=ON \
+  \
+  ..
 
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
 
 
 %install
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
 
-# Unwanted files
-%__rm -f %{buildroot}%{_libdir}/libcarddav.a
+# Fix doc directory
+%if "%{_docdir}" != "%{_datadir}/doc"
+%__mkdir_p "%{?buildroot}/%{_docdir}"
+%__mv -f "%{?buildroot}/%{_datadir}/doc/libcarddav" "%{?buildroot}/%{_docdir}/libcarddav"
+%endif
 
 
 %clean
diff --git a/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec b/redhat/dependencies/python-tqt/python-tqt.spec
index 3b8b54d68..0a3731cc1 100644
--- a/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec
+++ b/redhat/dependencies/python-tqt/python-tqt.spec
@@ -19,12 +19,10 @@
 #  Remove qt-devel and qt3-devel and any kde*-devel on your system !
 #  Having KDE libraries may cause FTBFS here !
 
-%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg python-tqt
 %define tde_prefix /opt/trinity
@@ -71,8 +69,17 @@ BuildRequires:	sip4-tqt-devel >= %{?epoch:%{epoch}:}4.10.5
 BuildRequires:	libtqscintilla-devel >= %{?epoch:%{epoch}:}1.7.1
 
 BuildRequires:	gcc-c++
-BuildRequires:	python
-BuildRequires:	python-devel
+
+# PYTHON
+%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31
+%define python python2
+%define __python %__python2
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%else
+%define python python
+%endif
+BuildRequires:	%{python}
+BuildRequires:	%{python}-devel
 
 # MESA support
 %if 0%{?rhel} || 0%{?fedora}
diff --git a/redhat/dependencies/sip4-tqt/sip4-tqt-14.0.0.spec b/redhat/dependencies/sip4-tqt/sip4-tqt.spec
index 6432e8099..601659a5e 100644
--- a/redhat/dependencies/sip4-tqt/sip4-tqt-14.0.0.spec
+++ b/redhat/dependencies/sip4-tqt/sip4-tqt.spec
@@ -28,7 +28,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg sip4-tqt
 %define tde_prefix /opt/trinity
@@ -71,8 +71,15 @@ BuildRequires:	libtqt4-devel >= %{?epoch:%{epoch}:}4.2.0
 BuildRequires:	trinity-filesystem >= %{tde_version}
 
 BuildRequires:	gcc-c++
-BuildRequires:	python
-BuildRequires:	python-devel
+
+%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31
+%define python python2
+%define __python %__python2
+%else
+%define python python
+%endif
+BuildRequires:	%{python}
+BuildRequires:	%{python}-devel
 
 %description
 SIP is a tool for generating bindings for C++ classes with some ideas
@@ -85,7 +92,7 @@ specificity towards C++ and Python.
 Summary:	Python/C++ bindings generator (Runtime Library)
 Group:		Development/Tools/Building
 Requires:	trinity-filesystem >= %{tde_version}
-Requires:	python
+Requires:	%{python}
 
 %description -n sip4-tqt
 SIP is a tool for generating bindings for C++ classes with some ideas
@@ -94,11 +101,7 @@ specificity towards C++ and Python.
 
 %files -n sip4-tqt
 %defattr(-,root,root,-)
-%dir %{python_sitearch}/sip4_tqt
-%{python_sitearch}/sip4_tqt/sip.so
-%{python_sitearch}/sip4_tqt/sipconfig.py*
-%{python_sitearch}/sip4_tqt/sipdistutils.py*
-%{python_sitearch}/sip4_tqt/__init__.py*
+%{python_sitearch}/sip4_tqt/
 
 ##########
 
@@ -106,7 +109,7 @@ specificity towards C++ and Python.
 Summary:		Python/C++ bindings generator (Development Files)
 Group:			Development/Libraries/Python
 Requires:		sip4-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:		python-devel
+Requires:		%{python}-devel
 
 %description -n sip4-tqt-devel
 SIP is a tool for generating bindings for C++ classes with some ideas
diff --git a/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec b/redhat/dependencies/tqca-tls/tqca-tls.spec
index 0323731dc..a3a029de7 100644
--- a/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec
+++ b/redhat/dependencies/tqca-tls/tqca-tls.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg tqca-tls
 %define tde_prefix /opt/trinity
@@ -101,7 +101,7 @@ contains the TLS plugin.
 unset QTDIR QTINC QTLIB
 
 ./configure \
-  --qtdir=%{_prefix}
+  --tqtdir=%{_prefix}
 
 %__make %{?_smp_mflags}
 
diff --git a/redhat/dependencies/tqca/tqca-14.0.0.spec b/redhat/dependencies/tqca/tqca.spec
index a6e59e772..0ea095f6a 100644
--- a/redhat/dependencies/tqca/tqca-14.0.0.spec
+++ b/redhat/dependencies/tqca/tqca.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg tqca
 %define tde_prefix /opt/trinity
@@ -147,7 +147,7 @@ unset QTDIR QTINC QTLIB
 
 ./configure \
   --prefix=%{_prefix} \
-  --qtdir=/usr \
+  --tqtdir=/usr \
   --debug
 
 
diff --git a/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec b/redhat/dependencies/tqscintilla/tqscintilla.spec
index 2d5616cd9..4b200aa96 100644
--- a/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec
+++ b/redhat/dependencies/tqscintilla/tqscintilla.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg tqscintilla
 %define tde_prefix /opt/trinity
diff --git a/redhat/dependencies/tqt3/tqassistant.desktop b/redhat/dependencies/tqt3/tqassistant.desktop
deleted file mode 100644
index c178007d8..000000000
--- a/redhat/dependencies/tqt3/tqassistant.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Exec=tqassistant
-Name=TQt3 Assistant
-Name[de]=TQt3 Assistent
-GenericName=Document Browser
-Comment=TQt3 Helpcenter
-Comment[de]= TQt3 Hilfezentrum
-MimeType=application/x-assistant;
-Icon=tqassistant
-Terminal=false
-Type=Application
-Categories=Qt;Development;
diff --git a/redhat/dependencies/tqt3/tqdesigner.desktop b/redhat/dependencies/tqt3/tqdesigner.desktop
deleted file mode 100644
index 2152b777b..000000000
--- a/redhat/dependencies/tqt3/tqdesigner.desktop
+++ /dev/null
@@ -1,78 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Exec=tqdesigner
-Name=TQt3 Designer
-Name[bg]=TQt3 Дизайнер
-Name[br]=Ergrafer TQt3
-Name[ca]=Dissenyador TQt3
-Name[cs]=TQt3 designer
-Name[de]=TQt3-Designer
-Name[eo]=TQt3-Desegnilo
-Name[es]=Diseñador TQt3
-Name[et]=TQt3 disainer
-Name[eu]=TQt3 Diseinatzailea
-Name[gl]=Deseñador de TQt3
-Name[he]=TQt3 בצעמ
-Name[it]=Designer TQt3
-Name[ja]=TQt3デザイナー
-Name[ko]=TQt3 디자이너
-Name[lv]=TQt3 Dizainers
-Name[mk]=TQt3 дизајнер
-Name[no]=TQt3-designer
-Name[oc]=Dessinador TQt3
-Name[pl]=Projektant TQt3
-Name[sk]=TQt3 Dizajnér
-Name[sl]=Snovalnik TQt3
-Name[ta]=TQt3 À¨¼ôÀ¡Ç÷
-Name[uk]=Дизайнер TQt3
-Name[zh_CN.GB2312]=TQt3 设计者
-Name[zh_TW.Big5]=TQt3 設計器
-GenericName=Interface Designer
-Comment=TQt3 interface designer
-Comment[az]=TQt3 axtar üz dizayn proqramı
-Comment[bg]=TQt3 interface дизайнер
-Comment[br]=Ergrafer etrefas TQt3
-Comment[ca]=Dissenyador d'interfícies TQt3
-Comment[cs]=Editor UI pro TQt3
-Comment[da]=TQt3 grænseflade designer
-Comment[de]=Schnittstellen-Designer für TQt3
-Comment[el]=Σχεδιασμός περιβάλλοντων TQt3
-Comment[eo]=TQt3-Interfacdesegnilo
-Comment[es]=Diseñador de interfaces de TQt3
-Comment[et]=TQt3 dialoogide redaktor
-Comment[eu]=TQt3 interfaze diseinatzailea
-Comment[fi]=TQt3:n käyttöliittymäsuunnittelija
-Comment[fr]=Conception d'interfaces avec TQt3
-Comment[gl]=Editor de interfaces de TQt3
-Comment[he]=TQt3-ל םיקשממ בצעמ
-Comment[hu]=TQt3 felülettervező
-Comment[is]=Viðmótshönnunartól fyrir TQt3
-Comment[it]=Editor per le interfaccie TQt3
-Comment[ja]=TQt3インターフェースデザイナー
-Comment[ko]=TQt3 인터페이스 디자이너
-Comment[lt]=TQt3 sąsajos redaktorius
-Comment[lv]=TQt3 starsejas dizainers
-Comment[mk]=Дизајнер на TQt3 дијалози
-Comment[nl]=TQt3 interface-ontwerper
-Comment[no]=TQt3-grensesnittdesigner
-Comment[no_NY]=Redigering av TQt3-miljø
-Comment[oc]=Dessinador d'interfacies TQt3
-Comment[pl]=Projektant interfejsu TQt3
-Comment[pt]=Editor de interfaces do TQt3
-Comment[pt_BR]=Designer de interface TQt3
-Comment[ro]=Dezvoltator de interfeţe TQt3
-Comment[ru]=редактор интерфейсов приложений TQt3
-Comment[sk]=TQt3 dizajnér rozhrania
-Comment[sl]=Snovalnik vmesnikov za TQt3
-Comment[sr]=Dizajner TQt3 interfejsa
-Comment[sv]=Editor för gränssnitt till TQt3
-Comment[ta]=TQt3 À¨¼ôÀ¡Ç÷
-Comment[tr]=TQt3 arayüz tasarım programı
-Comment[uk]=Редактор інтерфейсу для TQt3
-Comment[zh_CN.GB2312]=TQt3 界面设计程序
-Comment[zh_TW.Big5]=TQt3 介面編輯器
-MimeType=application/x-designer;
-Icon=tqdesigner
-Terminal=false
-Type=Application
-Categories=Qt;Development;
diff --git a/redhat/dependencies/tqt3/tqlinguist.desktop b/redhat/dependencies/tqt3/tqlinguist.desktop
deleted file mode 100644
index 6cbbe713d..000000000
--- a/redhat/dependencies/tqt3/tqlinguist.desktop
+++ /dev/null
@@ -1,26 +0,0 @@
-[Desktop Entry]
-Exec=tqlinguist
-Name=TQt3 Linguist
-Name[de]=TQt3-Linguist
-Name[eo]=TQt3-Lingvisto
-Name[es]=Lingüista TQt3
-Name[ko]=TQt3 언어학자
-Name[lv]=TQt3 Lingvists
-GenericName=Translation Tool
-Comment=Tool for translating message catalogues of TQt3 based programs
-Comment[da]=Redskab til at oversætte TQt3 baserede programmer
-Comment[de]=Dienstprogramm zur Übersetzung von Programmen, die auf TQt3 basieren
-Comment[eo]=Ilo por tradukado de mesaĝaroj de TQt3-bazitaj programoj
-Comment[es]=Herramienta para la traducción de catálogos de mensajes de programas basados en TQt3
-Comment[he]=TQt3 תוססובמ תוינכות לש תועדוה יגולטק םוגרתל ילכ
-Comment[hu]=Segédprogram a TQt3-alapú programok üzenetfájljainak lefordításához
-Comment[ko]=TQt3를 바탕으로 하는 프로그램에서 쓸 번역된 메세지 목록을 관리하는 도구
-Comment[lv]=Rīks ziņojumu katalogu tulkošanai uz TQt3 bāzētās programmās
-Comment[pt]=Ferramenta para traduzir os catálogos de mensagens de programas do TQt3
-Comment[pt_BR]=Ferramenta para traduzir os catálogos de mensagens de programas do TQt3
-Comment[sv]=Verktyg för att översätta meddelandekataloger från TQt3-baserade program
-MimeType=application/x-linguist;
-Terminal=false
-Icon=tqlinguist
-Type=Application
-Categories=Qt;Development
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3.spec
index b7fc869e6..c1daea7b4 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3.spec
@@ -17,7 +17,7 @@
 
 # TDE variables
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
@@ -49,12 +49,6 @@ BuildRoot:	%{_tmppath}/%{name}-%{tde_version}-%{release}-root-%(%{__id_u} -n)
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 Source1:	build-examples.sh
 
-Source11:	tqassistant.desktop
-Source12:	tqdesigner.desktop
-Source13:	tqlinguist.desktop
-Source14:	tqtconfig.desktop
-
-
 BuildRequires: glibc-devel
 BuildRequires: gcc-c++
 BuildRequires: make
@@ -274,7 +268,7 @@ BuildRequires: sqlite3-devel
 
 # POSTGRESQL support
 BuildRequires: postgresql
-%if 0%{?fedora} >= 30
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8
 BuildRequires: postgresql-server-devel
 %else
 BuildRequires: postgresql-devel
@@ -295,12 +289,12 @@ BuildRequires:	%{_lib}fbclient-devel
 %define with_nis 1
 
 # RPC support
-%if 0%{?fedora} >= 28 || 0%{?suse_version} >= 1500
-%if 0%{?fedora}
+%if 0%{?rhel} >= 8 || 0%{?fedora} >= 28
 BuildRequires:		libnsl2-devel
-%else
-BuildRequires:		libnsl-devel
+BuildRequires:		libtirpc-devel
 %endif
+%if 0%{?suse_version} >= 1500
+BuildRequires:		libnsl-devel
 BuildRequires:		libtirpc-devel
 %endif
 
@@ -346,9 +340,6 @@ applications.
 %files -n %{libtqt3}-mt
 %defattr(-,root,root,-)
 %doc FAQ LICENSE* README* changes*
-%dir %{_datadir}/icons/hicolor
-%dir %{_datadir}/icons/hicolor/32x32
-%dir %{_datadir}/icons/hicolor/32x32/apps
 %dir %{_datadir}/tqt3/
 %dir %{_datadir}/tqt3/doc/
 %dir %{_datadir}/tqt3/doc/html/
@@ -1015,7 +1006,7 @@ or automake.
 %{_datadir}/tqt3/tools/tqtcreatecw/main.cpp
 %{_datadir}/tqt3/tools/tqtcreatecw/tqtcreatecw.pro
 %{_datadir}/applications/tqdesigner.desktop
-%{_datadir}/icons/hicolor/32x32/apps/tqdesigner.png
+%{_datadir}/pixmaps/tqdesigner.png
 
 ###########
 
@@ -1082,7 +1073,7 @@ development files by the translator.
 %dir %{_docdir}/tqt3-linguist
 %{_docdir}/tqt3-linguist/qt_untranslated.ts
 %{_datadir}/applications/tqlinguist.desktop
-%{_datadir}/icons/hicolor/32x32/apps/tqlinguist.png
+%{_datadir}/pixmaps/tqlinguist.png
 
 ##########
 
@@ -1107,11 +1098,10 @@ the package tqt3-apps-devel.
 %files -n tqt3-assistant
 %defattr(-,root,root,-)
 %{_bindir}/tqassistant
-%{_datadir}/icons/hicolor/32x32/apps/tqassistant.png
 %{_datadir}/tqt3/doc/html/assistant*html
 %{_datadir}/tqt3/doc/html/assistant*dcf
 %{_datadir}/applications/tqassistant.desktop
-%{_datadir}/icons/hicolor/32x32/apps/tqassistant.png
+%{_datadir}/pixmaps/tqassistant.png
 
 ##########
 
@@ -1134,7 +1124,7 @@ install this package.
 %defattr(-,root,root,-)
 %{_bindir}/tqtconfig
 %{_datadir}/applications/tqtconfig.desktop
-%{_datadir}/icons/hicolor/32x32/apps/tqtconfig.png
+%{_datadir}/pixmaps/tqtconfig.png
 
 ###########
 
@@ -1275,11 +1265,6 @@ things that are possible with TQt3.
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-# Fix strange FTBFS on RHEL5
-%if 0%{?rhel} == 5
-%__sed -i "src/kernel/ntqstyle.h" -e "s|#ifdef ENABLE_T*QSTYLECONTROLELEMENTDATA_SLOW_COPY|#if 1|"
-%endif
-
 %if 0%{?suse_version}
 echo "suse_version = %{?suse_version}"
 echo "sle_version = %{?sle_version}"
@@ -1355,6 +1340,7 @@ echo yes | ./configure \
 		-docdir		"%{_datadir}/tqt3/doc" \
 		-plugindir	"%{_libdir}/tqt3/plugins" \
 		-translationdir	"%{_datadir}/tqt3/translations" \
+		-sysshare "%{_datadir}" \
 		\
 		-thread \
 		-shared \
@@ -1471,12 +1457,6 @@ for i in designer/designer assistant linguist/linguist; do
   popd
 done
 
-# desktop lnk files
-%__install -m644 -D "%{SOURCE11}" "%{?buildroot}%{_datadir}/applications/tqassistant.desktop"
-%__install -m644 -D "%{SOURCE12}" "%{?buildroot}%{_datadir}/applications/tqdesigner.desktop"
-%__install -m644 -D "%{SOURCE13}" "%{?buildroot}%{_datadir}/applications/tqlinguist.desktop"
-%__install -m644 -D "%{SOURCE14}" "%{?buildroot}%{_datadir}/applications/tqtconfig.desktop"
-
 %if 0%{?suse_version}
 %suse_update_desktop_file tqassistant Documentation
 %suse_update_desktop_file tqdesigner GUIDesigner
@@ -1485,10 +1465,10 @@ done
 %endif
 
 # Install applications icons
-%__install -m644 -D "tools/assistant/images/appicon.png" "%{?buildroot}%{_datadir}/icons/hicolor/32x32/apps/tqassistant.png"
-%__install -m644 -D "tools/designer/designer/images/designer_appicon.png" "%{?buildroot}%{_datadir}/icons/hicolor/32x32/apps/tqdesigner.png"
-%__install -m644 -D "tools/linguist/linguist/images/appicon.png" "%{?buildroot}%{_datadir}/icons/hicolor/32x32/apps/tqlinguist.png"
-%__install -m644 -D "tools/qtconfig/images/appicon.png" "%{?buildroot}%{_datadir}/icons/hicolor/32x32/apps/tqtconfig.png"
+#__install -m644 -D "tools/assistant/images/appicon.png" "%{?buildroot}%{_datadir}/icons/hicolor/32x32/apps/tqassistant.png"
+#__install -m644 -D "tools/designer/designer/images/designer_appicon.png" "%{?buildroot}%{_datadir}/icons/hicolor/32x32/apps/tqdesigner.png"
+#__install -m644 -D "tools/linguist/linguist/images/appicon.png" "%{?buildroot}%{_datadir}/icons/hicolor/32x32/apps/tqlinguist.png"
+#__install -m644 -D "tools/qtconfig/images/appicon.png" "%{?buildroot}%{_datadir}/icons/hicolor/32x32/apps/tqtconfig.png"
 
 # build attic package and copy it to tqt3-compat-headers
 pushd src
diff --git a/redhat/dependencies/tqt3/tqtconfig.desktop b/redhat/dependencies/tqt3/tqtconfig.desktop
deleted file mode 100644
index d20d2191d..000000000
--- a/redhat/dependencies/tqt3/tqtconfig.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Exec=tqtconfig
-Name=TQt3 Configuration
-Name[de]=TQt3 Konfiguration
-GenericName=Configuration Utility
-Comment=A graphical configuration tool for programs using TQt 3
-Comment[de]=Ein grafisches Konfigurationstool für TQt3-Programme
-MimeType=application/x-qtconfig;
-Terminal=false
-Icon=tqtconfig
-Type=Application
-Categories=Qt;Settings;
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec b/redhat/dependencies/tqtinterface/tqtinterface.spec
index de6ad4622..392ca0bb6 100644
--- a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg tqtinterface
 %define cmake_modules_dir %{_datadir}/cmake/Modules
@@ -77,7 +77,7 @@ BuildRequires:	pkgconfig
 
 
 # PTHREAD support
-%if 0%{?rhel} >= 5 || 0%{?mdkversion} || 0%{?mgaversion}
+%if 0%{?mdkversion} || 0%{?mgaversion}
 %if 0%{?mgaversion} >= 7
 BuildRequires:	%{_lib}npth-devel
 %else
@@ -87,6 +87,9 @@ BuildRequires:	pth-devel
 %if 0%{?fedora} && 0%{?fedora} <= 26
 BuildRequires:	pth-devel
 %endif
+%if 0%{?rhel} >= 5 && 0%{?rhel} <= 7
+BuildRequires:	pth-devel
+%endif
 %if 0%{?suse_version} && 0%{?suse_version} < 1500
 BuildRequires:	libpth-devel
 %endif
diff --git a/redhat/extras/brp-check-trinity/brp-check-trinity-14.0.0.spec b/redhat/extras/brp-check-trinity/brp-check-trinity.spec
index a0abf2cf5..538376224 100644
--- a/redhat/extras/brp-check-trinity/brp-check-trinity-14.0.0.spec
+++ b/redhat/extras/brp-check-trinity/brp-check-trinity.spec
@@ -17,7 +17,7 @@
 
 # TDE variables
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_prefix /opt/trinity
 
diff --git a/redhat/extras/icons-nuvola/icons-nuvola-14.0.0.spec b/redhat/extras/icons-nuvola/icons-nuvola.spec
index f3547a475..eff4527e3 100644
--- a/redhat/extras/icons-nuvola/icons-nuvola-14.0.0.spec
+++ b/redhat/extras/icons-nuvola/icons-nuvola.spec
@@ -18,7 +18,7 @@
 # Default version for this component
 %define tde_pkg icons-nuvola
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 
 # TDE specific building variables
diff --git a/redhat/extras/kdevmon/kdevmon-14.0.0.spec b/redhat/extras/kdevmon/kdevmon.spec
index d06d0c0ea..b2aab09f9 100644
--- a/redhat/extras/kdevmon/kdevmon-14.0.0.spec
+++ b/redhat/extras/kdevmon/kdevmon.spec
@@ -18,7 +18,7 @@
 # Default version for this component
 %define tde_pkg kdevmon
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 
 # TDE specific building variables
diff --git a/redhat/extras/klibido/klibido-14.0.0.spec b/redhat/extras/klibido/klibido.spec
index be9338c85..86a8323cd 100644
--- a/redhat/extras/klibido/klibido-14.0.0.spec
+++ b/redhat/extras/klibido/klibido.spec
@@ -18,7 +18,7 @@
 # Default version for this component
 %define tde_pkg klibido
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 
 # TDE specific building variables
diff --git a/redhat/extras/kompose/kompose-14.0.0.spec b/redhat/extras/kompose/kompose.spec
index 74719a3bf..eb86cbeb7 100644
--- a/redhat/extras/kompose/kompose-14.0.0.spec
+++ b/redhat/extras/kompose/kompose.spec
@@ -18,7 +18,7 @@
 # Default version for this component
 %define tde_pkg kompose
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 
 # TDE specific building variables
diff --git a/redhat/extras/koverartist/koverartist-14.0.0.spec b/redhat/extras/koverartist/koverartist.spec
index d638d93a2..84c199bb2 100644
--- a/redhat/extras/koverartist/koverartist-14.0.0.spec
+++ b/redhat/extras/koverartist/koverartist.spec
@@ -18,7 +18,7 @@
 # Default version for this component
 %define tde_pkg koverartist
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 
 # TDE specific building variables
diff --git a/redhat/extras/kpacman/kpacman-14.0.0.spec b/redhat/extras/kpacman/kpacman.spec
index 64b54ba35..f52e1c076 100644
--- a/redhat/extras/kpacman/kpacman-14.0.0.spec
+++ b/redhat/extras/kpacman/kpacman.spec
@@ -18,7 +18,7 @@
 # Default version for this component
 %define tde_pkg kpacman
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 
 # TDE specific building variables
diff --git a/redhat/extras/style-ia-ora/style-ia-ora-14.0.0.spec b/redhat/extras/style-ia-ora/style-ia-ora.spec
index bdf009862..351771520 100644
--- a/redhat/extras/style-ia-ora/style-ia-ora-14.0.0.spec
+++ b/redhat/extras/style-ia-ora/style-ia-ora.spec
@@ -1,6 +1,6 @@
 # Default version for this component
 %define tde_pkg style-ia-ora
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?tde_prefix}" != "/usr"
@@ -112,5 +112,3 @@ export PATH="%{tde_bindir}:${PATH}"
 
 
 %changelog
-* Sat Jan 19 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.8-4
-- Initial release for TDE 14.0.0
diff --git a/redhat/extras/trinity-desktop/trinity-3.5.13-fedora.repo b/redhat/extras/trinity-desktop/trinity-3.5.13-fedora.repo
index 7a292aa39..05e45748c 100644
--- a/redhat/extras/trinity-desktop/trinity-3.5.13-fedora.repo
+++ b/redhat/extras/trinity-desktop/trinity-3.5.13-fedora.repo
@@ -1,23 +1,23 @@
 [trinity-3.5.13]
 name=trinity-3.5.13
-#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/f$releasever/trinity-3.5.13/RPMS/$basearch
-mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/f$releasever/trinity-3.5.13-$basearch.list
+#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/rpm/f$releasever/trinity-3.5.13/RPMS/$basearch
+mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/rpm/f$releasever/trinity-3.5.13-$basearch.list
 enabled=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity
 
 [trinity-3.5.13-noarch]
 name=trinity-3.5.13-noarch
-#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/f$releasever/trinity-3.5.13/RPMS/noarch
-mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/f$releasever/trinity-3.5.13-noarch.list
+#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/rpm/f$releasever/trinity-3.5.13/RPMS/noarch
+mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/rpm/f$releasever/trinity-3.5.13-noarch.list
 enabled=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity
 
 [trinity-3.5.13-source]
 name=trinity-3.5.13-source
-#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/f$releasever/trinity-3.5.13/SRPMS
-mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/f$releasever/trinity-3.5.13-SRPMS.list
+#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/rpm/f$releasever/trinity-3.5.13/SRPMS
+mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/rpm/f$releasever/trinity-3.5.13-SRPMS.list
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity
diff --git a/redhat/extras/trinity-desktop/trinity-3.5.13-rhel.repo b/redhat/extras/trinity-desktop/trinity-3.5.13-rhel.repo
index f415f006a..7ce5d3e31 100644
--- a/redhat/extras/trinity-desktop/trinity-3.5.13-rhel.repo
+++ b/redhat/extras/trinity-desktop/trinity-3.5.13-rhel.repo
@@ -1,23 +1,23 @@
 [trinity-3.5.13]
 name=trinity-3.5.13
-#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/el$releasever/trinity-3.5.13/RPMS/$basearch
-mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/el$releasever/trinity-3.5.13-$basearch.list
+#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/rpm/el$releasever/trinity-3.5.13/RPMS/$basearch
+mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/rpm/el$releasever/trinity-3.5.13-$basearch.list
 enabled=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity
 
 [trinity-3.5.13-noarch]
 name=trinity-3.5.13-noarch
-#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/el$releasever/trinity-3.5.13/RPMS/noarch
-mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/el$releasever/trinity-3.5.13-noarch.list
+#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/rpm/el$releasever/trinity-3.5.13/RPMS/noarch
+mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/rpm/el$releasever/trinity-3.5.13-noarch.list
 enabled=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity
 
 [trinity-3.5.13-source]
 name=trinity-3.5.13-noarch
-#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/el$releasever/trinity-3.5.13/SRPMS
-mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/el$releasever/trinity-3.5.13-SRPMS.list
+#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/rpm/el$releasever/trinity-3.5.13/SRPMS
+mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/rpm/el$releasever/trinity-3.5.13-SRPMS.list
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity
diff --git a/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec b/redhat/extras/trinity-desktop/trinity-desktop.spec
index 430a7168a..5766196c3 100644
--- a/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec
+++ b/redhat/extras/trinity-desktop/trinity-desktop.spec
@@ -15,11 +15,8 @@
 # Please submit bugfixes or comments via http://www.trinitydesktop.org/
 #
 
-# Starting with TDE R14.0.0, TDE is not intended to run in RHEL4 and older.
-# Minimum (oldest) distribution supported is RHEL5.
-
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
@@ -64,8 +61,8 @@ Requires:	trinity-tdegraphics >= %{version}
 Requires:	trinity-tdemultimedia >= %{version}
 Requires:	trinity-tdenetwork >= %{version}
 Requires:	trinity-tdepim >= %{version}
-Requires:	trinity-tdeutils >= %{version}
 Requires:	trinity-tdetoys >= %{version}
+Requires:	trinity-tdeutils >= %{version}
 
 %if 0%{?rhel} || 0%{?fedora}
 # YUM configuration file
@@ -89,9 +86,6 @@ authentication, and much more!
 Group:		User Interface/Desktops
 Summary:	Meta-package to install TDE development tools
 
-Obsoletes:	trinity-desktop-dev < %{version}-%{release}
-Provides:	trinity-desktop-dev = %{version}-%{release}
-
 Requires:	trinity-tdesdk >= %{version}
 Requires:	trinity-tdevelop >= %{version}
 Requires:	trinity-tdewebdev >= %{version}
@@ -108,7 +102,6 @@ Group:		User Interface/Desktops
 Summary:	Meta-package to install all TDE applications
 
 # Warning, k9copy requires ffmpeg
-# Warning, tderadio requires libmp3lame
 
 Requires: trinity-abakus
 Requires: trinity-amarok
@@ -118,6 +111,8 @@ Requires: trinity-digikam
 Requires: trinity-dolphin
 Requires: trinity-filelight
 Requires: trinity-gwenview
+Requires: trinity-k3b
+Requires: trinity-k9copy
 Requires: trinity-kaffeine
 Requires: trinity-kaffeine-mozilla
 Requires: trinity-kasablanca
@@ -129,15 +124,19 @@ Requires: trinity-kbiff
 Requires: trinity-kbookreader
 Requires: trinity-kchmviewer
 Requires: trinity-kcmautostart
+Requires: trinity-kcmldap
+Requires: trinity-kcmldapcontroller
+Requires: trinity-kcmldapmanager
 Requires: trinity-kcpuload
 Requires: trinity-kdbg
 Requires: trinity-kdbusnotification
 Requires: trinity-kdiff3
 Requires: trinity-kdirstat
 Requires: trinity-keep
-Requires: trinity-keximdb
+Requires: trinity-kerberostray
 Requires: trinity-kftpgrabber
 Requires: trinity-kile
+Requires: trinity-kima
 Requires: trinity-kiosktool
 Requires: trinity-kkbswitch
 Requires: trinity-klcddimmer
@@ -153,10 +152,9 @@ Requires: trinity-knmap
 Requires: trinity-knutclient
 Requires: trinity-koffice-suite
 Requires: trinity-konversation
-Requires: trinity-kooldock
 Requires: trinity-kopete-otr
 Requires: trinity-kpicosim
-Requires: trinity-kplayer
+Requires: trinity-kpilot
 Requires: trinity-krecipes
 Requires: trinity-krename
 Requires: trinity-krusader
@@ -170,22 +168,16 @@ Requires: trinity-kstreamripper
 Requires: trinity-ksystemlog
 Requires: trinity-ktechlab
 Requires: trinity-ktorrent
-Requires: trinity-kuickshow
 Requires: trinity-kvirc
 Requires: trinity-kvkbd
 Requires: trinity-kvpnc
-Requires: trinity-kxmleditor
 Requires: trinity-mplayerthumbs
 Requires: trinity-piklab
 Requires: trinity-potracegui
 Requires: trinity-smb4k
 Requires: trinity-smartcardauth
 Requires: trinity-soundkonverter
-Requires: trinity-tastymenu
 Requires: trinity-tde-guidance
-Requires: trinity-tde-style-baghira
-Requires: trinity-tde-style-domino
-Requires: trinity-tde-style-ia-ora
 Requires: trinity-tde-style-lipstik
 Requires: trinity-tde-style-qtcurve
 Requires: trinity-tde-systemsettings
@@ -194,39 +186,17 @@ Requires: trinity-tdeio-ftps
 Requires: trinity-tdeio-locate
 Requires: trinity-tdeio-sword
 Requires: trinity-tdeio-umountwrapper
+Requires: trinity-tdepowersave
 Requires: trinity-tderadio
+Requires: trinity-tdesudo
 Requires: trinity-tdesvn
+Requires: trinity-tellico
 Requires: trinity-tdmtheme
 Requires: trinity-tork
 Requires: trinity-twin-style-crystal
 Requires: trinity-wlassistant
 Requires: trinity-yakuake
 
-# PCLinuxOS does not have sudo ...
-%if 0%{?pclinuxos} == 0
-Requires: trinity-tdesudo
-%endif
-
-# PCLinuxOS and RHEL 5 don't have heimdal ...
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%if 0%{?pclinuxos} == 0
-Requires: trinity-kcmldap
-Requires: trinity-kcmldapcontroller
-Requires: trinity-kcmldapmanager
-Requires: trinity-kerberostray
-%endif
-%endif
-
-# RHEL5: UDEV is too old
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-Requires: trinity-k3b
-Requires: trinity-k9copy
-Requires: trinity-kima
-Requires: trinity-kpilot
-Requires: trinity-tellico
-Requires: trinity-tdepowersave
-%endif
-
 # Network management
 # RHEL 6 and openSUSE 11.x: knetworkmanager8
 %if 0%{?suse_version} && 0%{?suse_version} <= 1140 || 0%{?rhel} == 6
@@ -235,8 +205,6 @@ Requires: trinity-knetworkmanager
 # Other distros use tdenetworkmanager (since R14)
 %if 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora}
 Requires: trinity-tdenetworkmanager
-Obsoletes: trinity-knetworkmanager
-Obsoletes: trinity-knetworkmanager8
 %endif
 
 # Power management
@@ -248,11 +216,6 @@ Obsoletes: trinity-tde-guidance-powermanager
 #Requires: trinity-gtk3-tqt-engine
 #Requires: trinity-qt4-tqt-theme-engine
 
-# Missing qalculate on older RHEL ...
-%if 0%{?rhel} == 0 || 0%{?rhel} >= 7
-Requires: trinity-qalculate-tde
-%endif
-
 # On RHEL 5/7, lilypond is not available, so no rosegarden :'-(
 %if 0%{?rhel} == 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora}
 Requires: trinity-rosegarden
diff --git a/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec b/redhat/extras/trinity-filesystem/trinity-filesystem.spec
index dc4ab5cdb..3385dd5c0 100644
--- a/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec
+++ b/redhat/extras/trinity-filesystem/trinity-filesystem.spec
@@ -17,7 +17,7 @@
 
 # TDE variables
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
diff --git a/redhat/libraries/kipi-plugins/kipi-plugins.spec b/redhat/libraries/kipi-plugins/kipi-plugins.spec
index 6f953fb06..9ad0b5e3b 100644
--- a/redhat/libraries/kipi-plugins/kipi-plugins.spec
+++ b/redhat/libraries/kipi-plugins/kipi-plugins.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg kipi-plugins
 %define tde_prefix /opt/trinity
diff --git a/redhat/libraries/libkdcraw/libkdcraw-14.0.0.spec b/redhat/libraries/libkdcraw/libkdcraw.spec
index d3ad7ed60..daa7f5c39 100644
--- a/redhat/libraries/libkdcraw/libkdcraw-14.0.0.spec
+++ b/redhat/libraries/libkdcraw/libkdcraw.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg libkdcraw
 %define tde_prefix /opt/trinity
diff --git a/redhat/libraries/libkexiv2/libkexiv2-14.0.0.spec b/redhat/libraries/libkexiv2/libkexiv2.spec
index 26a35fb11..ce0ecd529 100644
--- a/redhat/libraries/libkexiv2/libkexiv2-14.0.0.spec
+++ b/redhat/libraries/libkexiv2/libkexiv2.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg libkexiv2
 %define tde_prefix /opt/trinity
@@ -67,18 +67,10 @@ Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
+BuildRequires:	cmake >= 2.8
 BuildRequires:	gettext
 BuildRequires:	gcc-c++
 
-# AUTOTOOLS
-BuildRequires: automake autoconf libtool
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}ltdl-devel
-%endif
-%if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version} >= 1220
-BuildRequires:	libtool-ltdl-devel
-%endif
-
 # EXIV2
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	%{_lib}exiv2-devel
@@ -145,41 +137,44 @@ Libkexif is a wrapper around Exiv2 library to manipulate pictures metadata.
 %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} \
-  --libdir=%{tde_libdir} \
-  --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} -DNDEBUG" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -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}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DBUILD_ALL=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_TRANSLATIONS=ON \
+  \
+  ..
 
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
 
 
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# RHEL4: pkgconfig files do not support 'URL' keyword .
-%if 0%{?rhel} == 4
-%__sed -i %{?buildroot}%{tde_libdir}/pkgconfig/*.pc -e "s/^URL: /#URL: /"
-%endif
+%__make install DESTDIR=%{buildroot} -C build
 
 
 %clean
diff --git a/redhat/libraries/libkipi/libkipi-14.0.0.spec b/redhat/libraries/libkipi/libkipi.spec
index 010aafa52..5c8e49c4f 100644
--- a/redhat/libraries/libkipi/libkipi-14.0.0.spec
+++ b/redhat/libraries/libkipi/libkipi.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg libkipi
 %define tde_prefix /opt/trinity
@@ -82,14 +82,8 @@ BuildRequires: lcms-devel
 # JPEG support
 BuildRequires: libjpeg-devel
 
-# AUTOTOOLS
-BuildRequires: automake autoconf libtool
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}ltdl-devel
-%endif
-%if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version} >= 1220
-BuildRequires:	libtool-ltdl-devel
-%endif
+# CMAKE
+BuildRequires:	cmake >= 2.8
 
 %description
 Libkipi is a library
@@ -120,7 +114,7 @@ Homepage: http://www.kipi-plugins.org/
 %defattr(-,root,root,-)
 %{tde_libdir}/libkipi.so.0
 %{tde_libdir}/libkipi.so.0.1.1
-%{tde_datadir}/apps/kipi/
+%{tde_datadir}/kipi/
 %{tde_datadir}/icons/hicolor/*/apps/kipi.png
 %{tde_datadir}/servicetypes/kipiplugin.desktop
 
@@ -161,37 +155,45 @@ Homepage: http://www.kipi-plugins.org/
 %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} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --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} -DNDEBUG" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -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
-
-%__make %{?_smp_mflags}
+  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+  -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
+  -DLIB_INSTALL_DIR="%{tde_libdir}" \
+  -DDATA_INSTALL_DIR="%{tde_datadir}" \
+  -DSERVICETYPES_INSTALL_DIR="%{tde_datadir}/servicetypes" \
+  -DICON_INSTALL_DIR="%{tde_datadir}/icons" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DBUILD_ALL=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_TRANSLATIONS=ON \
+  \
+  ..
 
 
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
 
 %find_lang %{tde_pkg}
 
diff --git a/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec b/redhat/libraries/libksquirrel/libksquirrel.spec
index 9254f1700..f2476bc2c 100644
--- a/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec
+++ b/redhat/libraries/libksquirrel/libksquirrel.spec
@@ -1,4 +1,4 @@
-%if 0%{?fedora} >= 23
+%if 0%{?fedora} >= 23 || 0%{?rhel} >= 8
 %define _hardened_ldflags %nil
 %endif
 
@@ -26,7 +26,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg libksquirrel
 %define tde_prefix /opt/trinity
@@ -97,7 +97,7 @@ BuildRequires:	OpenEXR-devel
 BuildRequires:	libtiff-devel
 
 # GIF support
-%if 0%{?suse_version} || 0%{?fedora} >= 28
+%if 0%{?suse_version} || 0%{?fedora} >= 28 || 0%{?rhel} >= 8
 BuildRequires:	giflib-devel
 %else
 BuildRequires:	libungif-devel
@@ -107,7 +107,7 @@ BuildRequires:	libungif-devel
 BuildRequires: libmng-devel
 
 # DJVU support
-%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%if 0%{?fedora} || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
 %define with_djvu 1
 BuildRequires:	djvulibre
 %endif
@@ -135,7 +135,11 @@ BuildRequires:	librsvg2-tools
 BuildRequires:	librsvg
 %endif
 %if 0%{?suse_version}
+%if 0%{?suse_version} >= 1550
+BuildRequires:	rsvg-convert
+%else
 BuildRequires:	rsvg-view
+%endif
 BuildRequires:	librsvg-devel
 %endif
 %endif
diff --git a/redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec b/redhat/libraries/libtdeldap/libtdeldap.spec
index c13dbe2ae..57207a80c 100644
--- a/redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec
+++ b/redhat/libraries/libtdeldap/libtdeldap.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg libtdeldap
 %define tde_prefix /opt/trinity
@@ -94,12 +94,12 @@ BuildRequires:	openldap24-libs-devel
 %endif
 
 # HEIMDAL support
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires:	heimdal-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:	libheimdal-devel
-%endif
+#%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
+#BuildRequires:	heimdal-devel
+#%endif
+#%if 0%{?suse_version}
+#BuildRequires:	libheimdal-devel
+#%endif
 
 # UDEV support
 %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
diff --git a/redhat/libraries/libtqt-perl/libtqt-perl-14.0.0.spec b/redhat/libraries/libtqt-perl/libtqt-perl.spec
index ab21298c0..36577a66c 100644
--- a/redhat/libraries/libtqt-perl/libtqt-perl-14.0.0.spec
+++ b/redhat/libraries/libtqt-perl/libtqt-perl.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg libtqt-perl
 %define tde_prefix /opt/trinity
diff --git a/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec b/redhat/libraries/pytdeextensions/pytdeextensions.spec
index b8835c6d2..7a1919d30 100644
--- a/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec
+++ b/redhat/libraries/pytdeextensions/pytdeextensions.spec
@@ -15,12 +15,11 @@
 # Please submit bugfixes or comments via http://www.trinitydesktop.org/
 #
 
-%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg pytdeextensions
 %define tde_prefix /opt/trinity
@@ -76,6 +75,15 @@ Requires:		trinity-libpythonize0 = %{?epoch:%{epoch}:}%{version}-%{release}
 BuildRequires:	sip4-tqt-devel >= 4.10.5
 Requires:		sip4-tqt >= 4.10.5
 
+# PYTHON support
+%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31
+%define python python2
+%define __python %__python2
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%else
+%define python python
+%endif
+
 
 Obsoletes:		trinity-pykdeextensions < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:		trinity-pykdeextensions = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -185,7 +193,7 @@ fi
 %__sed -i "src/pythonize."* -e "s|const char \*object|char \*object|g"
 %endif
 
-%if 0%{?fedora} >= 30
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8
 %__sed -i "app_templates/kcontrol_module/setup.py" \
           "app_templates/kcontrol_module/src/kcontrol_module.py" \
           "app_templates/kdeapp/setup.py" \
@@ -203,7 +211,7 @@ unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 
 %__mkdir_p build
-./setup.py build_libpythonize
+%__python ./setup.py build_libpythonize
 
 
 %install
@@ -215,7 +223,7 @@ export PYTHONDONTWRITEBYTECODE=
 
 %__rm -rf %{buildroot}
 
-./setup.py install \
+%__python ./setup.py install \
 	--root=%{buildroot} \
 	--prefix=%{tde_prefix} \
 	--install-clib=%{tde_libdir} \
diff --git a/redhat/libraries/python-trinity/python-trinity-14.0.0.spec b/redhat/libraries/python-trinity/python-trinity.spec
index 51edd425b..30ed147c1 100644
--- a/redhat/libraries/python-trinity/python-trinity-14.0.0.spec
+++ b/redhat/libraries/python-trinity/python-trinity.spec
@@ -15,12 +15,10 @@
 # Please submit bugfixes or comments via http://www.trinitydesktop.org/
 #
 
-%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg python-trinity
 %define tde_prefix /opt/trinity
@@ -65,7 +63,16 @@ BuildRequires:	autoconf automake libtool m4
 BuildRequires:	gcc-c++
 
 # PYTHON support
-BuildRequires:	python
+%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31
+%define python python2
+%define __python %__python2
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%else
+%define python python
+%endif
+BuildRequires:	%{python}
+BuildRequires:	%{python}-devel
+
 BuildRequires:	python-tqt-devel
 Requires:		python-tqt
 
@@ -139,7 +146,7 @@ tips and working code you can use to learn from.
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%if 0%{?fedora} >= 30
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8
 %__sed -i "contrib/tdepyuic" -e "s|/usr/bin/env python|/usr/bin/env python2|"
 %endif
 
diff --git a/redhat/main/tde-i18n/tde-i18n-14.0.0.spec b/redhat/main/tde-i18n/tde-i18n.spec
index bad847a91..6cf838bc5 100644
--- a/redhat/main/tde-i18n/tde-i18n-14.0.0.spec
+++ b/redhat/main/tde-i18n/tde-i18n.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg tde-i18n
 %define tde_prefix /opt/trinity
diff --git a/redhat/main/tdeaccessibility/tdeaccessibility-14.0.0.spec b/redhat/main/tdeaccessibility/tdeaccessibility.spec
index 3e8d02cf6..96ee80e2d 100644
--- a/redhat/main/tdeaccessibility/tdeaccessibility-14.0.0.spec
+++ b/redhat/main/tdeaccessibility/tdeaccessibility.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg tdeaccessibility
 %define tde_prefix /opt/trinity
diff --git a/redhat/main/tdeaddons/tdeaddons-14.0.0.spec b/redhat/main/tdeaddons/tdeaddons.spec
index 90ddfe3e6..8a048cf08 100644
--- a/redhat/main/tdeaddons/tdeaddons-14.0.0.spec
+++ b/redhat/main/tdeaddons/tdeaddons.spec
@@ -21,7 +21,7 @@
 
 # TDE variables
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg tdeaddons
 %define tde_prefix /opt/trinity
@@ -116,13 +116,9 @@ BuildRequires:	libacl-devel
 # DB4/DB5 support
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1220 || 0%{?mdkversion} || 0%{?mgaversion}
 %define with_db 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos}
-BuildRequires:	db4-devel
-%else
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
 BuildRequires:	db5-devel
 %endif
-%endif
 %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
 BuildRequires:	libdb-devel
 BuildRequires:	libdb-cxx-devel
@@ -141,6 +137,13 @@ BuildRequires:	db4-devel
 #BuildRequires:	xmms-devel
 #%endif
 
+# PYTHON support
+%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30
+%define python python3
+%else
+%define python python
+%endif
+
 Requires: trinity-atlantikdesigner = %{version}-%{release}
 Requires: trinity-kaddressbook-plugins = %{version}-%{release}
 Requires: trinity-kate-plugins = %{version}-%{release}
@@ -391,7 +394,7 @@ controls XMMS, install the xmms-kde-trinity package.
 Summary: scripts for KNewsTicker, the Trinity news ticker
 Group:		Applications/Utilities
 Requires:	perl
-Requires:	python
+Requires:	%{python}
 #Requires:	libfinance-quote-perl
 #Requires:	libmime-perl
 #Requires:	libnews-nntpclient-perl
@@ -432,12 +435,12 @@ Requires:	%{_lib}jpeg62
 %if 0%{?suse_version} == 1230
 Requires:	libjpeg8
 %endif
-Requires:	python
+Requires:	%{python}
 Requires:	rsync
 #Requires:	unison
 Requires:	trinity-konqueror
 %if 0%{?fedora}
-Requires:	python-exif
+Requires:	%{python}-exif
 %endif
 
 %description -n trinity-konq-plugins
@@ -664,12 +667,12 @@ of user interfaces, playlists and visualisation plugins.
 %prep
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
 
-%if 0%{?fedora} >= 30
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8
 # Fix shebangs
 sed -i "knewsticker-scripts/sportscores.py" \
        "konq-plugins/imagerotation/orient.py" \
        "konq-plugins/imagerotation/exif.py" \
-    -e "s|env python|env python3|"
+    -e "s|env python|env %{python}|"
 %endif
 
 
diff --git a/redhat/main/tdeadmin/tdeadmin.spec b/redhat/main/tdeadmin/tdeadmin.spec
index 3e7a33ef6..11420b963 100644
--- a/redhat/main/tdeadmin/tdeadmin.spec
+++ b/redhat/main/tdeadmin/tdeadmin.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg tdeadmin
 %define tde_prefix /opt/trinity
diff --git a/redhat/main/tdeartwork/tdeartwork-14.0.0.spec b/redhat/main/tdeartwork/tdeartwork.spec
index 3d31f7233..7c47950a3 100644
--- a/redhat/main/tdeartwork/tdeartwork-14.0.0.spec
+++ b/redhat/main/tdeartwork/tdeartwork.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg tdeartwork
 %define tde_prefix /opt/trinity
@@ -103,7 +103,7 @@ BuildRequires:	libart_lgpl-devel
 #  RHEL 4: disabled
 #  RHEL 6: available in EPEL
 #  RHEL 7: available in NUX
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || (0%{?rhel} >= 5 && 0%{?rhel} <= 7) || 0%{?suse_version}
 %define with_xscreensaver 1
 
 %if 0%{?fedora} || 0%{?rhel} >= 5
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.el8 b/redhat/main/tdebase/pamd.kcheckpass-trinity.el8
new file mode 120000
index 000000000..dab729b22
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.el8
@@ -0,0 +1 @@
+pamd.kcheckpass-trinity.el7
\ No newline at end of file
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc31 b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc31
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc31
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth       include	system-auth
+account    include	system-auth
+password   include	system-auth
+session    include	system-auth
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos b/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos
new file mode 120000
index 000000000..ad0fc6da6
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos
@@ -0,0 +1 @@
+pamd.kcheckpass-trinity.pclos2018
\ No newline at end of file
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.el8 b/redhat/main/tdebase/pamd.kdm-trinity-np.el8
new file mode 120000
index 000000000..3415e7d55
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity-np.el8
@@ -0,0 +1 @@
+pamd.kdm-trinity-np.el7
\ No newline at end of file
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc31 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc31
new file mode 100644
index 000000000..0616e66f6
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity-np.fc31
@@ -0,0 +1,16 @@
+ #%PAM-1.0
+auth       required    pam_env.so
+auth       required    pam_permit.so
+auth       include     postlogin
+account    required    pam_nologin.so
+account    include     system-auth
+password   include     system-auth
+session    required    pam_selinux.so close
+session    required    pam_loginuid.so
+session    optional    pam_console.so
+-session    optional    pam_ck_connector.so
+session    required    pam_selinux.so open
+session    optional    pam_keyinit.so force revoke
+session    required    pam_namespace.so
+session    include     system-auth
+session    include     postlogin
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos b/redhat/main/tdebase/pamd.kdm-trinity-np.pclos
new file mode 120000
index 000000000..5cde6e2c5
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity-np.pclos
@@ -0,0 +1 @@
+pamd.kdm-trinity-np.pclos2018
\ No newline at end of file
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.el8 b/redhat/main/tdebase/pamd.kdm-trinity.el8
new file mode 120000
index 000000000..f85413ec6
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity.el8
@@ -0,0 +1 @@
+pamd.kdm-trinity.el7
\ No newline at end of file
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc31 b/redhat/main/tdebase/pamd.kdm-trinity.fc31
new file mode 100644
index 000000000..4e760760f
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity.fc31
@@ -0,0 +1,23 @@
+#%PAM-1.0
+auth     [success=done ignore=ignore default=bad] pam_selinux_permit.so
+auth       required    pam_env.so
+auth       substack    system-auth
+-auth       optional    pam_gnome_keyring.so
+-auth       optional    pam_kwallet.so
+-auth       optional    pam_kwallet5.so
+auth       include     postlogin
+account    required    pam_nologin.so
+account    include     system-auth
+password   include     system-auth
+session    required    pam_selinux.so close
+session    required    pam_loginuid.so
+session    optional    pam_console.so
+-session    optional    pam_ck_connector.so
+session    required    pam_selinux.so open
+session    optional    pam_keyinit.so force revoke
+session    required    pam_namespace.so
+session    include     system-auth
+-session    optional    pam_gnome_keyring.so auto_start
+-session    optional    pam_kwallet.so
+-session    optional    pam_kwallet5.so
+session    include     postlogin
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.pclos b/redhat/main/tdebase/pamd.kdm-trinity.pclos
new file mode 120000
index 000000000..fcc6957f7
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity.pclos
@@ -0,0 +1 @@
+pamd.kdm-trinity.pclos2018
\ No newline at end of file
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.el8 b/redhat/main/tdebase/pamd.kscreensaver-trinity.el8
new file mode 120000
index 000000000..a5fab9e3e
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.el8
@@ -0,0 +1 @@
+pamd.kscreensaver-trinity.el7
\ No newline at end of file
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc31 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc31
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc31
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth       include	system-auth
+account    include	system-auth
+password   include	system-auth
+session    include	system-auth
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos b/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos
new file mode 120000
index 000000000..31d43e302
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos
@@ -0,0 +1 @@
+pamd.kscreensaver-trinity.pclos2018
\ No newline at end of file
diff --git a/redhat/main/tdebase/tdebase.spec b/redhat/main/tdebase/tdebase.spec
index e8e3dbe50..a4c5fe6a0 100644
--- a/redhat/main/tdebase/tdebase.spec
+++ b/redhat/main/tdebase/tdebase.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg tdebase
 %define tde_prefix /opt/trinity
@@ -74,7 +74,7 @@ Source6:		suse-displaymanagers-tdm
 %endif
 
 # Fedora 18: use SYSTEMD for TDM startup
-%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
+%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 6
 Source7:		tdm.service%{?dist}
 %endif
 
@@ -229,7 +229,31 @@ Requires:	fedora-logos
 # Fedora 28 Theme
 %if 0%{?fedora} == 28
 Requires:	f28-backgrounds-base
-%define tde_bg /usr/share/backgrounds/f27/default/standard/f28.png
+%define tde_bg /usr/share/backgrounds/f28/default/standard/f28.png
+Requires:	fedora-logos
+%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
+%endif
+
+# Fedora 29 Theme
+%if 0%{?fedora} == 29
+Requires:	f29-backgrounds-base
+%define tde_bg /usr/share/backgrounds/f29/default/standard/f29.png
+Requires:	fedora-logos
+%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
+%endif
+
+# Fedora 30 Theme
+%if 0%{?fedora} == 30
+Requires:	f30-backgrounds-base
+%define tde_bg /usr/share/backgrounds/f30/default/standard/f30.png
+Requires:	fedora-logos
+%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
+%endif
+
+# Fedora 31 Theme
+%if 0%{?fedora} == 31
+Requires:	f28-backgrounds-base
+%define tde_bg /usr/share/backgrounds/f31/default/standard/f31.png
 Requires:	fedora-logos
 %define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
 %endif
@@ -263,6 +287,13 @@ Requires:	redhat-logos
 %define tde_starticon /usr/share/icons/hicolor/96x96/apps/system-logo-icon.png
 %endif
 
+# RHEL 8 Theme
+%if 0%{?rhel} == 8
+Requires:	redhat-logos
+%define tde_bg /usr/share/backgrounds/day.jpg
+%define tde_starticon /usr/share/icons/hicolor/96x96/apps/system-logo-icon.png
+%endif
+
 # Mageia 2 Theme
 %if 0%{?mgaversion} == 2
 Requires:	mageia-theme-Default
@@ -298,6 +329,13 @@ Requires:	mageia-theme-Default
 %define tde_starticon %{tde_datadir}/oxygen/scalable/mgabutton.svg
 %endif
 
+# Mageia 7 Theme
+%if 0%{?mgaversion} == 7
+Requires:	mageia-theme-Default
+%define tde_bg /usr/share/mga/backgrounds/default.jpg
+%define tde_starticon %{tde_datadir}/oxygen/scalable/mgabutton.svg
+%endif
+
 # Mandriva 2011 Theme: "rosa"
 %if "%{distribution}" == "Mandriva Linux" && "%{?mdkversion}" == "201100"
 Requires:	mandriva-theme
@@ -381,6 +419,22 @@ Requires:	hicolor-icon-theme-branding
 %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
 %endif
 
+# OpenSuse 15.1 Theme
+%if "%{?suse_version}" == "1510"
+Requires:	wallpaper-branding
+%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
+Requires:	hicolor-icon-theme-branding
+%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
+%endif
+
+# OpenSuse TW Theme
+%if "%{?suse_version}" == "1550"
+Requires:	wallpaper-branding
+%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
+Requires:	hicolor-icon-theme-branding
+%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
+%endif
+
 BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 
@@ -956,7 +1010,7 @@ Some random features:
 %{tde_tdeappdir}/kate.desktop
 %{tde_datadir}/apps/kate/
 %{tde_datadir}/apps/tdeconf_update/kate-2.4.upd
-%config(noreplace) %{_sysconfdir}/trinity/katerc
+%config(noreplace) %{tde_confdir}/katerc
 %{tde_datadir}/icons/hicolor/*/apps/kate.png
 %{tde_datadir}/icons/hicolor/*/apps/kate2.svgz
 %{tde_datadir}/servicetypes/kateplugin.desktop
@@ -1357,7 +1411,7 @@ TDE applications, particularly those in the TDE base module.
 %{tde_bindir}/kreadconfig
 %{tde_bindir}/kwriteconfig
 %{tde_bindir}/kstart
-%config(noreplace) %{_sysconfdir}/trinity/kxkb_groups
+%config(noreplace) %{tde_confdir}/kxkb_groups
 %{tde_bindir}/drkonqi
 %{tde_bindir}/crashtest
 %{tde_bindir}/kapplymousetheme
@@ -1497,7 +1551,7 @@ needed for a basic TDE desktop installation.
 
 %files data
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/trinity/tdeshorturifilterrc
+%config(noreplace) %{tde_confdir}/tdeshorturifilterrc
 %{tde_datadir}/applnk/.hidden/battery.desktop
 %{tde_datadir}/applnk/.hidden/bwarning.desktop
 %{tde_datadir}/applnk/.hidden/cwarning.desktop
@@ -1755,7 +1809,6 @@ needed for a basic TDE desktop installation.
 # XDG directories information
 %dir %{_sysconfdir}/xdg/menus/applications-merged
 %config(noreplace) %{_sysconfdir}/xdg/menus/applications-merged/tde-essential.menu
-%config(noreplace) %{_sysconfdir}/xdg/menus/tde-information.menu
 %config(noreplace) %{_sysconfdir}/xdg/menus/tde-screensavers.menu
 %config(noreplace) %{_sysconfdir}/xdg/menus/tde-settings.menu
 
@@ -2087,8 +2140,8 @@ the TDE desktop.
 
 %files -n trinity-kdesktop
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/trinity/kdesktop_custom_menu1
-%config(noreplace) %{_sysconfdir}/trinity/kdesktop_custom_menu2
+%config(noreplace) %{tde_confdir}/kdesktop_custom_menu1
+%config(noreplace) %{tde_confdir}/kdesktop_custom_menu2
 %{tde_bindir}/kcheckrunning
 %{tde_bindir}/kxdglauncher
 %{tde_bindir}/tdeeject
@@ -2192,6 +2245,9 @@ already. Most users won't need this.
 %{tdm_datadir}/sessions/*.desktop
 %{tdm_datadir}/themes/
 %{tde_confdir}/%{tdm}
+%if 0%{?with_selinux_policy}
+%exclude %{tde_confdir}/%{tdm}/tdm.pp
+%endif
 %{tde_tdedocdir}/HTML/en/%{tdm}/
 %if 0%{?suse_version} == 0
 %config(noreplace) %{_sysconfdir}/pam.d/tdm-trinity
@@ -2232,7 +2288,7 @@ already. Most users won't need this.
 
 # SELINUX policy
 %if 0%{?with_selinux_policy}
-%{?_sysconfdir}/trinity/%{tdm}/tdm.pp
+%{tde_confdir}/%{tdm}/tdm.pp
 %endif
 
 # Logrotate configuration
@@ -2241,17 +2297,17 @@ already. Most users won't need this.
 %pre -n trinity-tdm
 # Make sure that TDM configuration files are now under '/etc/trinity/tdm'
 if [ -d "%{tde_datadir}/config/%{tdm}" ] && [ ! -L "%{tde_datadir}/config/%{tdm}" ]; then
-  if [ -d "%{_sysconfdir}/trinity/%{tdm}" ]; then
+  if [ -d "%{tde_confdir}/%{tdm}" ]; then
     # If there is already something under '/etc/trinity/tdm', simply delete old configuration
     echo "Deleting TDM configuration under '%{tde_datadir}/config/%{tdm}'"
     rm -rf "%{tde_datadir}/config/%{tdm}"
   else
     # Else, move '/opt/trinity/share/config/tdm' to '/etc/trinity/tdm'
-    if [ ! -d "%{_sysconfdir}/trinity" ]; then
-      mkdir -p "%{_sysconfdir}/trinity"
+    if [ ! -d "%{tde_confdir}" ]; then
+      mkdir -p "%{tde_confdir}"
     fi
-    echo "Migrating TDM configuration from '%{tde_datadir}/config/%{tdm}' to '%{_sysconfdir}/trinity/%{tdm}'"
-    mv -f "%{tde_datadir}/config/%{tdm}" "%{_sysconfdir}/trinity/%{tdm}.migr"
+    echo "Migrating TDM configuration from '%{tde_datadir}/config/%{tdm}' to '%{tde_confdir}/%{tdm}'"
+    mv -f "%{tde_datadir}/config/%{tdm}" "%{tde_confdir}/%{tdm}.migr"
   fi
 fi
 
@@ -2269,7 +2325,7 @@ fi
 
 # SELINUX context for tdm
 %if 0%{?with_selinux_policy}
-/usr/sbin/semodule -i "%{?_sysconfdir}/trinity/%{tdm}/tdm.pp"
+/usr/sbin/semodule -i "%{tde_confdir}/%{tdm}/tdm.pp"
 %endif
 
 %if 0%{?fedora} == 21 || 0%{?rhel} >= 7
@@ -2288,7 +2344,7 @@ fi
 # Sets default language for TDM
 if [ "$1" = "1" ]; then
   if [ -n "${LANG}" ] && [ "${LANG}" != "C" ]; then
-    sed -i "%{_sysconfdir}/trinity/%{tdm}/%{tdm}rc" -e "s|^#*Language=.*|Language=${LANG}|"
+    sed -i "%{tde_confdir}/%{tdm}/%{tdm}rc" -e "s|^#*Language=.*|Language=${LANG}|"
   fi
 fi
 
@@ -2304,9 +2360,9 @@ update-alternatives --install /usr/lib/X11/displaymanagers/default-displaymanage
 
 %posttrans -n trinity-tdm
 # Make sure that TDM configuration files are now under '/etc/trinity/tdm'
-if [ -d "%{_sysconfdir}/trinity/%{tdm}.migr" ] && [ -d "%{_sysconfdir}/trinity/%{tdm}" ]; then
-  mv -f "%{_sysconfdir}/trinity/%{tdm}.migr/"* "%{_sysconfdir}/trinity/%{tdm}/"
-  rmdir "%{_sysconfdir}/trinity/%{tdm}.migr/"
+if [ -d "%{tde_confdir}/%{tdm}.migr" ] && [ -d "%{tde_confdir}/%{tdm}" ]; then
+  mv -f "%{tde_confdir}/%{tdm}.migr/"* "%{tde_confdir}/%{tdm}/"
+  rmdir "%{tde_confdir}/%{tdm}.migr/"
 fi
 
 %postun -n trinity-tdm
@@ -2549,7 +2605,7 @@ web browser if the clipboard contains a URL.
 %files -n trinity-klipper
 %defattr(-,root,root,-)
 %{tde_bindir}/klipper
-%config(noreplace) %{_sysconfdir}/trinity/klipperrc
+%config(noreplace) %{tde_confdir}/klipperrc
 %{tde_tdelibdir}/klipper.la
 %{tde_tdelibdir}/klipper.so
 %{tde_tdelibdir}/klipper_panelapplet.la
@@ -2628,7 +2684,7 @@ ever launching another application.
 
 %files -n trinity-konqueror
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/trinity/konqsidebartng.rc
+%config(noreplace) %{tde_confdir}/konqsidebartng.rc
 %{tde_bindir}/kbookmarkmerger
 %{tde_bindir}/keditbookmarks
 %{tde_bindir}/kfmclient
@@ -3040,7 +3096,7 @@ to monitor it through the daemon running there.
 %files -n trinity-ksysguardd
 %defattr(-,root,root,-)
 %{tde_bindir}/ksysguardd
-%config(noreplace) %{_sysconfdir}/trinity/ksysguarddrc
+%config(noreplace) %{tde_confdir}/ksysguarddrc
 
 ##########
 
@@ -3179,7 +3235,7 @@ These libraries allow you to use TDE dialogs in native TQt3 applications.
 
 %files libtqt3-integration
 %defattr(-,root,root,-)
-%{tde_tdelibdir}/plugins/integration/
+%{_libdir}/tqt3/plugins/integration/
 %{tde_tdelibdir}/kded_kdeintegration.la
 %{tde_tdelibdir}/kded_kdeintegration.so
 %{tde_datadir}/services/kded/kdeintegration.desktop
@@ -3357,8 +3413,8 @@ fi
   -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
   -DLIB_INSTALL_DIR="%{tde_libdir}" \
   -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-  -DCONFIG_INSTALL_DIR="%{_sysconfdir}/trinity" \
-  -DSYSCONF_INSTALL_DIR="%{_sysconfdir}/trinity" \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+  -DSYSCONF_INSTALL_DIR="%{tde_confdir}" \
   -DXDG_MENU_INSTALL_DIR="%{_sysconfdir}/xdg/menus" \
   \
   -DWITH_ALL_OPTIONS=ON \
@@ -3470,7 +3526,7 @@ EOF
 %endif
 
 # TDM configuration
-%__sed -i "%{?buildroot}%{_sysconfdir}/trinity/%{tdm}/%{tdm}rc" \
+%__sed -i "%{?buildroot}%{tde_confdir}/%{tdm}/%{tdm}rc" \
 %if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?mageia} >= 4
 	-e "s/^#*MinShowUID=.*/MinShowUID=1000/"
 %else
@@ -3507,7 +3563,7 @@ fi
 
 # SELINUX policy for RHEL / Fedora
 %if 0%{?with_selinux_policy}
-%__install -D -m 644 "%{SOURCE8}" "%{?buildroot}%{?_sysconfdir}/trinity/%{tdm}/tdm.pp"
+%__install -D -m 644 "%{SOURCE8}" "%{?buildroot}%{tde_confdir}/%{tdm}/tdm.pp"
 %endif
 
 # Mageia icon for TDE menu
diff --git a/redhat/main/tdebase/tdm.el8.pp b/redhat/main/tdebase/tdm.el8.pp
new file mode 120000
index 000000000..3d25dc4f0
--- /dev/null
+++ b/redhat/main/tdebase/tdm.el8.pp
@@ -0,0 +1 @@
+tdm.el7.pp
\ No newline at end of file
diff --git a/redhat/main/tdebase/tdm.fc31.pp b/redhat/main/tdebase/tdm.fc31.pp
new file mode 100644
index 000000000..d0c0d4be8
--- /dev/null
+++ b/redhat/main/tdebase/tdm.fc31.pp
diff --git a/redhat/main/tdebase/tdm.service.el8 b/redhat/main/tdebase/tdm.service.el8
new file mode 120000
index 000000000..87f56ea08
--- /dev/null
+++ b/redhat/main/tdebase/tdm.service.el8
@@ -0,0 +1 @@
+tdm.service.el7
\ No newline at end of file
diff --git a/redhat/main/tdebase/tdm.service.fc31 b/redhat/main/tdebase/tdm.service.fc31
new file mode 100644
index 000000000..4c6136d94
--- /dev/null
+++ b/redhat/main/tdebase/tdm.service.fc31
@@ -0,0 +1,12 @@
+[Unit]
+Description=The Trinity login manager
+Conflicts=getty@tty1.service
+After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service
+
+[Service]
+ExecStart=/opt/trinity/bin/kdm
+Restart=always
+IgnoreSIGPIPE=no
+
+[Install]
+Alias=display-manager.service
diff --git a/redhat/main/tdebase/tdm.service.mga6 b/redhat/main/tdebase/tdm.service.mga6
new file mode 100644
index 000000000..eda2906e2
--- /dev/null
+++ b/redhat/main/tdebase/tdm.service.mga6
@@ -0,0 +1,12 @@
+[Unit]
+Description=Trinity Display Manager
+Documentation=man:tdm(1)
+Conflicts=getty@tty1.service
+After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service systemd-logind.service
+
+[Service]
+ExecStart=/opt/trinity/bin/tdm
+Restart=always
+
+[Install]
+Alias=display-manager.service
diff --git a/redhat/main/tdebase/tdm.service.mga7 b/redhat/main/tdebase/tdm.service.mga7
new file mode 100644
index 000000000..eda2906e2
--- /dev/null
+++ b/redhat/main/tdebase/tdm.service.mga7
@@ -0,0 +1,12 @@
+[Unit]
+Description=Trinity Display Manager
+Documentation=man:tdm(1)
+Conflicts=getty@tty1.service
+After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service systemd-logind.service
+
+[Service]
+ExecStart=/opt/trinity/bin/tdm
+Restart=always
+
+[Install]
+Alias=display-manager.service
diff --git a/redhat/main/tdebindings/tdebindings-14.0.0.spec b/redhat/main/tdebindings/tdebindings.spec
index 4b9de5a75..141c1d8aa 100644
--- a/redhat/main/tdebindings/tdebindings-14.0.0.spec
+++ b/redhat/main/tdebindings/tdebindings.spec
@@ -27,7 +27,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg tdebindings
 %define tde_prefix /opt/trinity
@@ -122,7 +122,7 @@ BuildRequires: mozilla-xulrunner20-devel
 BuildRequires:	openssl-devel
 
 # GTK1 support
-%if 0%{?fedora} || 0%{?rhel} >= 5
+%if 0%{?fedora} || (0%{?rhel} >= 5 && 0%{?rhel} <= 7)
 %define with_gtk1 1
 BuildRequires: glib-devel
 BuildRequires: gtk+-devel
@@ -170,7 +170,14 @@ BuildRequires: Mesa-libGLU-devel
 
 
 ## Python
-BuildRequires: python-devel
+%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31
+%define python python2
+%define __python %__python2
+%else
+%define python python
+%endif
+BuildRequires:	%{python}
+BuildRequires:	%{python}-devel
 %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 
 ## ruby
@@ -234,10 +241,10 @@ BuildRequires: java-devel >= 1.4.2
 %if 0%{?suse_version} >= 1320
 BuildRequires:	java-1_8_0-openjdk-devel
 %endif
-%if 0%{?fedora} >= 21 || 0%{?mgaversion} >= 5
+%if 0%{?fedora} >= 21 || 0%{?mgaversion} >= 5 || 0%{?rhel} >= 8
 BuildRequires: java-1.8.0-openjdk-devel
 %endif
-%if 0%{?fedora} == 17 ||  0%{?fedora} == 18 ||  0%{?fedora} == 19 || 0%{?fedora} == 20 || 0%{?suse_version} == 1230 || 0%{?suse_version} == 1310 || 0%{?mgaversion} == 3 || 0%{?mgaversion} == 4 || 0%{?rhel} >= 7
+%if 0%{?fedora} == 17 ||  0%{?fedora} == 18 ||  0%{?fedora} == 19 || 0%{?fedora} == 20 || 0%{?suse_version} == 1230 || 0%{?suse_version} == 1310 || 0%{?mgaversion} == 3 || 0%{?mgaversion} == 4 || 0%{?rhel} == 7
 BuildRequires: java-1.7.0-openjdk-devel
 %endif
 %if 0%{?rhel} == 5 || 0%{?rhel} == 6
@@ -256,7 +263,9 @@ BuildRequires: java-1.6.0-openjdk-devel
 %define java_home %{_usr}/lib/jvm/java
 %endif
 %endif
+%if 0%{?pclinuxos} == 0
 %define _with_java --with-java=%{java_home}
+%endif
 
 ## Perl
 # There is no 'perl-devel' package on RHEL5
@@ -273,14 +282,18 @@ Obsoletes:	trinity-kdebindings < %{version}-%{release}
 Provides:	trinity-kdebindings = %{version}-%{release}
 
 # Metapackage requires
+%if "%{?_with_java}" != ""
 Requires: trinity-tdebindings-java = %{version}-%{release}
+%endif
 Requires: trinity-libsmoketqt = %{version}-%{release}
 Requires: trinity-libsmoketde = %{version}-%{release}
 Requires: perl-dcop = %{version}-%{release}
 Requires: python-dcop = %{version}-%{release}
 Requires: trinity-libkjsembed1 = %{version}-%{release}
 Requires: trinity-kjscmd = %{version}-%{release}
+%if "%{?_with_java}" != ""
 Requires: trinity-juic = %{version}-%{release}
+%endif
 Requires: trinity-libkorundum0-ruby = %{version}-%{release}
 Requires: trinity-libqt0-ruby = %{version}-%{release}
 
@@ -314,6 +327,7 @@ This package is part of the official TDE bindings module.
 
 ##########
 
+%if "%{?_with_java}" != ""
 %package -n trinity-libdcop3-java
 Summary:	DCOP bindings for Java [Trinity]
 Group:		System/Libraries
@@ -330,9 +344,11 @@ This package is part of the official TDE bindings module.
 %files -n trinity-libdcop3-java
 %defattr(-,root,root,-)
 %{tde_libdir}/java/org/
+%endif
 
 ##########
 
+%if "%{?_with_java}" != ""
 %package -n trinity-libdcop3-java-devel
 Summary:	DCOP bindings for Java (dcopidl2java program) [Trinity]
 Group:		Development/Languages/Java
@@ -349,9 +365,11 @@ This package is part of the official TDE bindings module.
 %files -n trinity-libdcop3-java-devel
 %defattr(-,root,root,-)
 %{tde_bindir}/dcopidl2java
+%endif
 
 ##########
 
+%if "%{?_with_java}" != ""
 %package -n trinity-libdcop3-jni
 Summary:	DCOP bindings for Java ( Native libraries ) [Trinity]
 Group:		System/Libraries
@@ -368,9 +386,11 @@ This package is part of the official TDE bindings module.
 %defattr(-,root,root,-)
 %{tde_libdir}/libjavadcop.la
 %{tde_libdir}/libjavadcop.so
+%endif
 
 ##########
 
+%if "%{?_with_java}" != ""
 %package -n trinity-libqt3-java
 Summary:	Java bindings for Qt [Trinity]
 Group:		System/Libraries
@@ -392,9 +412,11 @@ This package is part of the official TDE bindings module.
 %defattr(-,root,root,-)
 %{tde_libdir}/java/qtjava*.jar
 %{tde_tdedocdir}/HTML/en/javalib/
+%endif
 
 ##########
 
+%if "%{?_with_java}" != ""
 %package -n trinity-libtqt3-jni
 Summary:	Java bindings for TQt ( Native libraries ) [Trinity]
 Group:		System/Libraries
@@ -416,9 +438,11 @@ This package is part of the official TDE bindings module.
 %{tde_libdir}/jni/lib*qtjava.la
 %{tde_libdir}/jni/lib*qtjava.so.*
 %doc qtjava/ChangeLog
+%endif
 
 ##########
 
+%if "%{?_with_java}" != ""
 %package -n trinity-libtqt3-jni-devel
 Summary:	Development files fo Java bindings for TQt ( Native libraries ) [Trinity]
 Group:		Development/Languages/Java
@@ -436,9 +460,11 @@ This package is part of the official TDE bindings module.
 %defattr(-,root,root,-)
 %{tde_libdir}/lib*qtjavasupport.so
 %{tde_libdir}/jni/lib*qtjava.so
+%endif
 
 ##########
 
+%if "%{?_with_java}" != ""
 %package -n trinity-libtrinity-java
 Summary:	Tdelibs bindings for Java [Trinity]
 Group:		System/Libraries
@@ -458,9 +484,11 @@ This package is part of the official TDE bindings module.
 %files -n trinity-libtrinity-java
 %defattr(-,root,root,-)
 %{tde_libdir}/java/koala*.jar
+%endif
 
 ##########
 
+%if "%{?_with_java}" != ""
 %package -n trinity-libtrinity-jni
 Summary:	Tdelibs bindings for java ( Native libraries ) [Trinity]
 Group:		System/Libraries
@@ -477,9 +505,11 @@ This package is part of the official TDE bindings module.
 %{tde_libdir}/jni/libtdejava.la
 %{tde_libdir}/jni/libtdejava.so.*
 %doc tdejava/ChangeLog
+%endif
 
 ##########
 
+%if "%{?_with_java}" != ""
 %package -n trinity-libtrinity-jni-devel
 Summary:	Development files for tdelibs bindings for java ( Native libraries ) [Trinity]
 Group:		Development/Languages/Java
@@ -493,6 +523,7 @@ This package is part of the official TDE bindings module.
 %files -n trinity-libtrinity-jni-devel
 %defattr(-,root,root,-)
 %{tde_libdir}/jni/libtdejava.so
+%endif
 
 ##########
 
@@ -620,7 +651,7 @@ Perl bindings to the DCOP interprocess communication protocol used by TDE
 %package -n python-dcop
 Summary:	DCOP bindings for Python
 Group:		System/Libraries
-Requires:	python
+Requires:	%{python}
 
 Obsoletes:	trinity-python-dcop < %{version}-%{release}
 Provides:	trinity-python-dcop = %{version}-%{release}
@@ -729,6 +760,7 @@ This package is part of the official TDE bindings module.
 
 ##########
 
+%if "%{?_with_java}" != ""
 %package -n trinity-juic
 Summary:	The Qt Java UI Compiler
 Group:		Development/Languages/Java
@@ -747,6 +779,7 @@ This package is part of the official TDE bindings module.
 %defattr(-,root,root,-)
 %{tde_bindir}/juic
 %{tde_datadir}/juic/
+%endif
 
 ##########
 
@@ -967,13 +1000,17 @@ Provides:	trinity-kdebindings-devel = %{version}-%{release}
 
 # Metapackage
 Requires:	trinity-libsmoketqt-devel = %{version}-%{release}
+%if "%{?_with_java}" != ""
 Requires:	trinity-libdcop3-java-devel = %{version}-%{release}
+%endif
 Requires:	trinity-libsmoketde-devel = %{version}-%{release}
 Requires:	trinity-libkjsembed-devel = %{version}-%{release}
 Requires:	trinity-libxparts-devel = %{version}-%{release}
 Requires:	trinity-libdcop-c-devel = %{version}-%{release}
+%if "%{?_with_java}" != ""
 Requires:	trinity-libtqt3-jni-devel = %{version}-%{release}
 Requires:	trinity-libtrinity-jni-devel = %{version}-%{release}
+%endif
 
 %description devel
 This package contains the development files for the TDE bindings.
@@ -1023,7 +1060,7 @@ exit 3
        -e "s|SUBDIRS = .*|SUBDIRS = src xpart_notepad|"
 
 # Fix Fedora >= 28 automatic invalid dependency to '/usr/bin/kjscmd'
-%if 0%{?fedora} >= 28 || 0%{?mgaversion} >= 7
+%if 0%{?fedora} >= 28 || 0%{?mgaversion} >= 7 || 0%{?rhel} >= 8
 %__sed -i "kjsembed/tdescript/swaptabs.js" \
        -i "kjsembed/stdlib/cmdline.js" \
        -e "s|/usr/bin/env kjscmd|%{tde_bindir}/kjscmd|"
@@ -1095,11 +1132,7 @@ EXTRA_INCLUDES="/usr/include/ruby-%{rb_ver}:/usr/include/ruby-%{rb_ver}/%{_targe
 
 # Build dcopperl with specific options
 pushd dcopperl
-CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL INSTALLDIRS=vendor
-
-# [Bug #348] Ugly hack to modify the man pages directory
-sed -i "Makefile" -e "s|/usr/share/man|%{tde_mandir}|g"
-
+CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL INSTALLDIRS=vendor INSTALLVENDORMAN3DIR=%{tde_mandir}/man3
 %__make OPTIMIZE="$RPM_OPT_FLAGS" ||:
 popd
 
@@ -1121,6 +1154,7 @@ export PATH="%{tde_bindir}:${PATH}"
 find $RPM_BUILD_ROOT -type f -a \( -name perllocal.pod -o -name .packlist \
   -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
 
+%if "%{?_with_java}" != ""
 # Installs juic
 %__install -D -m 755 qtjava/designer/juic/bin/juic	%{?buildroot}%{tde_bindir}/juic
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/juic/common
@@ -1130,6 +1164,7 @@ find $RPM_BUILD_ROOT -type f -a \( -name perllocal.pod -o -name .packlist \
 %__install -m 644 qtjava/designer/juic/java/*.xml %{?buildroot}%{tde_datadir}/juic/java
 %__install -m 644 qtjava/designer/juic/java/*.xsl %{?buildroot}%{tde_datadir}/juic/java
 %__install -m 644 qtjava/designer/juic/juic.xsl  %{?buildroot}%{tde_datadir}/juic
+%endif
 
 # kjsembed sample files
 %__install -d -m 755 %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
@@ -1140,12 +1175,6 @@ find $RPM_BUILD_ROOT -type f -a \( -name perllocal.pod -o -name .packlist \
 %__install -m 644 kjsembed/plugins/customqobject_plugin.h %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
 %__install -m 644 kjsembed/plugins/customqobject_plugin.desktop %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
 
-# Man installation location is wrong on RHEL4...
-if [ -d "%{buildroot}%{_mandir}/man3" ]; then
-  mv -f %{buildroot}%{_mandir}/man3 %{buildroot}%{tde_mandir}/man3/
-  rm -rf %{buildroot}%{_mandir}
-fi
-
 # Move 'embedjs.desktop' to correct location
 %__mv -f "%{?buildroot}%{tde_datadir}/applnk/Utilities/embedjs.desktop" "%{?buildroot}%{tde_tdeappdir}/embedjs.desktop"
 %__rm -rf "%{?buildroot}%{tde_datadir}/applnk"
diff --git a/redhat/main/tdeedu/tdeedu-14.0.0.spec b/redhat/main/tdeedu/tdeedu.spec
index af7343097..aaf41572f 100644
--- a/redhat/main/tdeedu/tdeedu-14.0.0.spec
+++ b/redhat/main/tdeedu/tdeedu.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg tdeedu
 %define tde_prefix /opt/trinity
@@ -63,7 +63,7 @@ Source1:		%{name}-rpmlintrc
 
 BuildRequires: trinity-tdelibs-devel >= %{tde_version}
 
-BuildRequires: autoconf automake libtool m4
+BuildRequires:	cmake >= 2.8
 BuildRequires: desktop-file-utils
 
 # SUSE desktop files utility
@@ -80,8 +80,14 @@ BuildRequires:	gcc-c++
 BuildRequires:	fdupes
 
 # PYTHON support
-BuildRequires:	python-devel
-BuildRequires:	python
+%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30 || 0%{?suse_version} >= 1500
+%define python python3
+%define __python %__python2
+%else
+%define python python
+%endif
+BuildRequires:	%{python}
+BuildRequires:	%{python}-devel
 
 # BOOST support
 BuildRequires:	boost-devel
@@ -89,18 +95,14 @@ BuildRequires:	boost-devel
 # OCAML support
 %if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
 BuildRequires: ocaml(compiler)
+#BuildRequires: ocaml-facile-devel
 %else
 BuildRequires: ocaml
+#BuildRequires: ocaml-facile-devel
 %endif
 
 # KIG python scripting support
-%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%if 0%{?suse_version} == 1330 || 0%{?suse_version} >= 1500 || 0%{?fedora} >= 29
-%define with_kig 0
-%else
 %define with_kig 1
-%endif
-%endif
 
 Obsoletes:		trinity-kdeedu < %{version}-%{release}
 Provides:		trinity-kdeedu = %{version}-%{release}
@@ -212,6 +214,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %{tde_datadir}/icons/hicolor/*/apps/blinken.png
 %{tde_datadir}/icons/hicolor/scalable/apps/blinken.svgz
 %{tde_tdedocdir}/HTML/en/blinken/
+%{tde_mandir}/man1/blinken*
 
 ##########
 
@@ -248,6 +251,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %{tde_datadir}/icons/hicolor/*/apps/kalzium.png
 %{tde_datadir}/icons/hicolor/scalable/apps/kalzium.svgz
 %{tde_tdedocdir}/HTML/en/kalzium/
+%{tde_mandir}/man1/kalzium*
 
 ##########
 
@@ -300,6 +304,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %{tde_datadir}/icons/hicolor/*/apps/kanagram.png
 %{tde_datadir}/icons/hicolor/scalable/apps/kanagram.svgz
 %{tde_tdedocdir}/HTML/en/kanagram/
+%{tde_mandir}/man1/kanagram*
 
 ##########
 
@@ -325,6 +330,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %{tde_datadir}/icons/hicolor/scalable/apps/kbruch.svgz
 %{tde_datadir}/icons/crystalsvg/*/actions/kbruch_*.png
 %{tde_tdedocdir}/HTML/en/kbruch/
+%{tde_mandir}/man1/kbruch*
 
 ##########
 
@@ -343,6 +349,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %defattr(-,root,root,-)
 %{tde_bindir}/keduca
 %{tde_bindir}/keducabuilder
+%{tde_bindir}/keduca-shrinker
 %{tde_tdelibdir}/libkeducapart.la
 %{tde_tdelibdir}/libkeducapart.so
 %{tde_tdeappdir}/keduca.desktop
@@ -354,6 +361,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %{tde_datadir}/mimelnk/application/x-edugallery.desktop
 %{tde_datadir}/services/keduca_part.desktop
 %{tde_tdedocdir}/HTML/en/keduca/
+%{tde_mandir}/man1/keduca*
 
 ##########
 
@@ -374,12 +382,14 @@ This package is part of Trinity, as a component of the TDE education module.
 %files -n trinity-kgeography
 %defattr(-,root,root,-)
 %{tde_bindir}/kgeography
+%{tde_bindir}/kgeography_gen_map.pl
 %{tde_tdeappdir}/kgeography.desktop
 %{tde_datadir}/config.kcfg/kgeography.kcfg
 %{tde_datadir}/icons/crystalsvg/*/apps/kgeography.png
 %{tde_datadir}/icons/crystalsvg/scalable/apps/kgeography.svgz
 %{tde_datadir}/icons/hicolor/*/apps/kgeography.png
 %{tde_tdedocdir}/HTML/en/kgeography
+%{tde_mandir}/man1/kgeography*
 
 ##########
 
@@ -430,6 +440,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %{tde_datadir}/icons/hicolor/*/apps/khangman.png
 %{tde_datadir}/icons/hicolor/scalable/apps/khangman.svgz
 %{tde_tdedocdir}/HTML/en/khangman/
+%{tde_mandir}/man1/khangman*
 
 ##########
 
@@ -490,6 +501,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %{tde_tdedocdir}/HTML/en/kig/
 %{tde_confdir}/magic/cabri.magic.mgc
 %{tde_confdir}/magic/drgeo.magic.mgc
+%{tde_mandir}/man1/kig*
 
 ##########
 
@@ -516,6 +528,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %{tde_tdedocdir}/HTML/en/kiten/
 %{tde_datadir}/icons/hicolor/*/apps/kiten.png
 %{tde_datadir}/icons/hicolor/scalable/apps/kiten.svgz
+%{tde_mandir}/man1/kiten*
 
 ##########
 
@@ -550,6 +563,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %{tde_datadir}/icons/hicolor/*/apps/klatin.png
 %{tde_datadir}/icons/hicolor/scalable/apps/klatin.svgz
 %{tde_tdedocdir}/HTML/en/klatin/
+%{tde_mandir}/man1/klatin*
 
 ##########
 
@@ -579,6 +593,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %{tde_datadir}/icons/hicolor/*/apps/klettres.png
 %{tde_datadir}/icons/hicolor/scalable/apps/klettres.svgz
 %{tde_tdedocdir}/HTML/en/klettres/
+%{tde_mandir}/man1/klettres*
 
 ##########
 
@@ -635,6 +650,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %{tde_datadir}/mimelnk/application/x-kmplot.desktop
 %{tde_datadir}/services/kmplot_part.desktop
 %{tde_tdedocdir}/HTML/en/kmplot/
+%{tde_mandir}/man1/kmplot*
 
 ##########
 
@@ -661,6 +677,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %{tde_datadir}/icons/hicolor/*/apps/kpercentage.png
 %{tde_datadir}/icons/hicolor/scalable/apps/kpercentage.svgz
 %{tde_tdedocdir}/HTML/en/kpercentage/
+%{tde_mandir}/man1/kpercentage*
 
 ##########
 
@@ -695,6 +712,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %{tde_datadir}/icons/hicolor/*/apps/kstars.png
 %{tde_datadir}/icons/hicolor/scalable/apps/kstars.svgz
 %{tde_tdedocdir}/HTML/en/kstars/
+%{tde_mandir}/man1/kstars*
 
 ##########
 
@@ -743,6 +761,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %{tde_datadir}/icons/hicolor/*/apps/ktouch.png
 %{tde_datadir}/icons/hicolor/scalable/apps/ktouch.svgz
 %{tde_tdedocdir}/HTML/en/ktouch/
+%{tde_mandir}/man1/ktouch*
 
 ##########
 
@@ -780,6 +799,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %{tde_datadir}/config.kcfg/kturtle.kcfg
 %{tde_datadir}/icons/hicolor/*/apps/kturtle.png
 %{tde_tdedocdir}/HTML/en/kturtle/
+%{tde_mandir}/man1/kturtle*
 
 ##########
 
@@ -809,6 +829,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %{tde_datadir}/icons/hicolor/*/apps/kverbos.png
 %{tde_datadir}/icons/hicolor/scalable/apps/kverbos.svgz
 %{tde_tdedocdir}/HTML/en/kverbos/
+%{tde_mandir}/man1/kverbos*
 
 ##########
 
@@ -851,6 +872,8 @@ This package is part of Trinity, as a component of the TDE education module.
 %{tde_datadir}/config.kcfg/presettings.kcfg
 %{tde_datadir}/icons/hicolor/*/apps/kvoctrain.png
 %{tde_tdedocdir}/HTML/en/kvoctrain/
+%{tde_mandir}/man1/kvoctrain*
+%{tde_mandir}/man1/spotlight2kvtml*
 
 ##########
 
@@ -883,6 +906,8 @@ This package is part of Trinity, as a component of the TDE education module.
 %{tde_datadir}/icons/crystalsvg/scalable/mimetypes/kwordquiz_doc.svg
 %{tde_datadir}/mimelnk/application/x-kwordquiz.desktop
 %{tde_tdedocdir}/HTML/en/kwordquiz/
+%{tde_mandir}/man1/kwordquiz*
+%{tde_mandir}/man1/langen*
 
 ##########
 
@@ -1024,6 +1049,12 @@ This package is part of Trinity, as a component of the TDE education module.
 %{tde_bindir}/temma
 %{tde_bindir}/v4ldriver
 %{tde_bindir}/v4lphilips
+%{tde_mandir}/man1/celestrongps*
+%{tde_mandir}/man1/fliccd*
+%{tde_mandir}/man1/indi*
+%{tde_mandir}/man1/lx200*
+%{tde_mandir}/man1/temma*
+%{tde_mandir}/man1/v4l*
 
 ##########
 
@@ -1062,66 +1093,52 @@ This package contains the development files for tdeedu.
 %prep
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
 
-%if 0%{?fedora} >= 30
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8
 # Fix shebangs
 sed -i "kig/pykig/pykig.py" \
-    -e "s|env python|env python3|"
+    -e "s|env python|env %{python}|"
 %endif
 
-# RHEL5 strange FTBFS on V4L stuff
-%if 0%{?rhel} == 5
-%__sed -i "admin/acinclude.m4.in" -e "s|-ansi||"
-%endif
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
 
 %build
-unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
-export kde_confdir="%{tde_confdir}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
 
-# Specific path for RHEL4
-if [ -d "/usr/X11R6" ]; then
-  export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-  export CFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
 fi
 
-# Warning: GCC visibility causes FTBFS [Bug #1285]
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=ON \
   \
-  --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}" \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+  -DSYSCONF_INSTALL_DIR="%{tde_confdir}" \
+  -DXDG_MENU_INSTALL_DIR="%{_sysconfdir}/xdg/menus" \
   \
-%if 0%{?with_kig}
-   --enable-kig-python-scripting \
-%else
-   --disable-kig-python-scripting \
-%endif
-   --enable-ocamlsolver
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_OCAML_SOLVER=OFF \
+  ..
 
-%__make %{_smp_mflags} \
-  OCAMLLIB=$(ocamlc -where) \
-  FACILELIB=$(ocamlc -where)
+%__make %{?_smp_mflags} || %__make
 
 
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
 
 # Updates applications categories for openSUSE
 %if 0%{?suse_version}
diff --git a/redhat/main/tdegames/tdegames-14.0.0.spec b/redhat/main/tdegames/tdegames.spec
index 993f41a18..f1d8a06ee 100644
--- a/redhat/main/tdegames/tdegames-14.0.0.spec
+++ b/redhat/main/tdegames/tdegames.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg tdegames
 %define tde_prefix /opt/trinity
diff --git a/redhat/main/tdegraphics/tdegraphics-14.0.0.spec b/redhat/main/tdegraphics/tdegraphics.spec
index 5206a11b8..2905481b3 100644
--- a/redhat/main/tdegraphics/tdegraphics-14.0.0.spec
+++ b/redhat/main/tdegraphics/tdegraphics.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg tdegraphics
 %define tde_prefix /opt/trinity
@@ -101,7 +101,7 @@ BuildRequires: pcre-devel
 BuildRequires:	libacl-devel
 
 # GIF support
-%if 0%{?suse_version} || 0%{?fedora} >= 28
+%if 0%{?suse_version} || 0%{?fedora} >= 28 || 0%{?rhel} >= 8
 BuildRequires: giflib-devel
 %else
 BuildRequires: libungif-devel
@@ -130,7 +130,7 @@ BuildRequires:	libpaper-devel
 %define with_t1lib 1
 BuildRequires:	t1lib-devel
 %endif
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora}
+%if 0%{?mgaversion} || 0%{?mdkversion} || (0%{?rhel} >= 5 && 0%{?rhel} <= 7) || 0%{?fedora}
 %define with_t1lib 1
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	%{_lib}t1lib-devel
diff --git a/redhat/main/tdelibs/tdelibs-14.0.1.patch b/redhat/main/tdelibs/tdelibs-14.0.1.patch
deleted file mode 100644
index ab309f841..000000000
--- a/redhat/main/tdelibs/tdelibs-14.0.1.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/tdecore/tdeglobal.h b/tdecore/tdeglobal.h
-index b5fddb8..1269c36 100644
---- a/tdecore/tdeglobal.h
-+++ b/tdecore/tdeglobal.h
-@@ -25,8 +25,10 @@ class KCharsets;
- class TDEConfig;
- class TDESharedConfig;
- class TDEIconLoader;
-+#ifdef __TDE_HAVE_TDEHWLIB
- class TDEHardwareDevices;
- class TDEGlobalNetworkManager;
-+#endif
- class TDELocale;
- class TDEStandardDirs;
- class KStaticDeleterBase;
-@@ -79,6 +81,7 @@ public:
-      */
-     static TDEIconLoader	        *iconLoader();
- 
-+#ifdef __TDE_HAVE_TDEHWLIB
-     /**
-      *  Returns a TDEHardwareDevices object.
-      * @return the global hardware devices object
-@@ -90,6 +93,7 @@ public:
-      * @return the global network manager object
-      */
-     static TDEGlobalNetworkManager   *networkManager();
-+#endif
- 
-     /**
-      * Returns the global locale object.
diff --git a/redhat/main/tdelibs/tdelibs-14.1.0.patch b/redhat/main/tdelibs/tdelibs-14.1.0.patch
deleted file mode 100644
index c4812b447..000000000
--- a/redhat/main/tdelibs/tdelibs-14.1.0.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/tdecore/CMakeLists.txt b/tdecore/CMakeLists.txt
-index 4d9c4a4..fed951b 100644
---- a/tdecore/CMakeLists.txt
-+++ b/tdecore/CMakeLists.txt
-@@ -137,7 +137,7 @@ tde_add_library( ${target} SHARED AUTOMOC
-   EMBED tdecorenetwork-static ${TDEHW_LIB}
-   LINK ltdlc-static ${KDESVGICONS} DCOP-shared tdefx-shared ${ZLIB_LIBRARIES}
-     ${LIBIDN_LIBRARIES} ${XCOMPOSITE_LIBRARIES} ICE SM ${GAMIN_LIBRARIES}
--    ${LIBBFD_LIBRARIES} ${LIB_UTIL}
-+    ${LIBBFD_LIBRARIES} ${LIB_UTIL} ${SSL_LIBRARIES}
-   DEPENDENCIES dcopidl dcopidl2cpp
-   DESTINATION ${LIB_INSTALL_DIR}
- )
diff --git a/redhat/main/tdelibs/tdelibs.spec b/redhat/main/tdelibs/tdelibs.spec
index 0afe618fe..f38c171de 100644
--- a/redhat/main/tdelibs/tdelibs.spec
+++ b/redhat/main/tdelibs/tdelibs.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg tdelibs
 %define tde_prefix /opt/trinity
@@ -60,9 +60,6 @@ BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
 Source1:		%{name}-rpmlintrc
 
-Patch0:			tdelibs-14.0.1.patch
-Patch1:			tdelibs-14.1.0.patch
-
 Obsoletes:		tdelibs < %{version}-%{release}
 Provides:		tdelibs = %{version}-%{release}
 Obsoletes:		trinity-kdelibs < %{version}-%{release}
@@ -622,8 +619,6 @@ applications for TDE.
 
 %prep
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-%patch0 -p1 -b .ftbfs
-%patch1 -p1 -b .ftbfs
 
 # RHEL 5: remove tdehwlib stuff from include files, to avoid FTBFS in tdebindings
 %if 0%{?rhel} == 5
diff --git a/redhat/main/tdemultimedia/tdemultimedia-14.0.0-autotools.spec b/redhat/main/tdemultimedia/tdemultimedia-14.0.0-autotools.spec
deleted file mode 100644
index 44fd60fab..000000000
--- a/redhat/main/tdemultimedia/tdemultimedia-14.0.0-autotools.spec
+++ /dev/null
@@ -1,1145 +0,0 @@
-#
-# spec file for package tdemultimedia (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/
-#
-
-# BUILD WARNING:
-#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
-#  Having KDE libraries may cause FTBFS here !
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.0
-%endif
-%define tde_pkg tdemultimedia
-%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_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}
-Summary:	Multimedia applications for the Trinity Desktop Environment
-Version:	%{tde_version}
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Group:		Productivity/Multimedia/Sound/Utilities
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Project
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-
-Obsoletes:	trinity-kdemultimedia < %{version}-%{release}
-Provides:	trinity-kdemultimedia = %{version}-%{release}
-Obsoletes:	trinity-kdemultimedia-libs < %{version}-%{release}
-Provides:	trinity-kdemultimedia-libs = %{version}-%{release}
-Obsoletes:	trinity-kdemultimedia-extras < %{version}-%{release}
-Provides:	trinity-kdemultimedia-extras = %{version}-%{release}
-Obsoletes:	trinity-kdemultimedia-extras-libs < %{version}-%{release}
-Provides:	trinity-kdemultimedia-extras-libs = %{version}-%{release}
-
-BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	gcc-c++
-BuildRequires:	fdupes
-BuildRequires:	desktop-file-utils
-
-# 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
-
-# TAGLIB support
-%define with_taglib 1
-BuildRequires: taglib-devel
-
-# AKODE support
-%define with_akode 1
-BuildRequires: trinity-akode-devel
-
-# MAD support
-%ifarch %{ix86} x86_64
-%define with_libmad 1
-%{?with_libmad:BuildRequires: libakode_mpeg_decoder}
-%endif
-
-# ZLIB support
-BuildRequires:	zlib-devel
-
-# MUSICBRAINZ support
-## not currently compatible with libtunepimp-0.5 (only libtunepimp-0.4)
-#define with_musicbrainz 1
-#BuildRequires: libmusicbrainz-devel libtunepimp-devel
-
-# Audio libraries
-BuildRequires:	libvorbis-devel
-BuildRequires:	audiofile-devel
-BuildRequires:	libtheora-devel
-BuildRequires:	alsa-lib-devel 
-BuildRequires:	cdparanoia
-#BuildRequires:	libmpg123-devel
-
-# CDDA support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	libcdda-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-BuildRequires:	cdparanoia-devel
-%endif
-
-# FLAC support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos}
-BuildRequires:	libflac-devel
-%else
-BuildRequires:	%{_lib}flac-devel
-%endif
-%endif
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-BuildRequires:	flac-devel
-%endif
-
-# GSTREAMER support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}gstreamer1.0-devel
-BuildRequires:	%{_lib}gstreamer-plugins-base1.0-devel
-%endif
-%if 0%{?rhel} == 4
-BuildRequires:	gstreamer-devel
-BuildRequires:	gstreamer-plugins-devel
-%endif
-%if 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?suse_version}
-BuildRequires:	gstreamer-devel
-BuildRequires:	gstreamer-plugins-base-devel
-%endif
-%if 0%{?rhel} >= 7 || 0%{?fedora}
-BuildRequires:	gstreamer1-devel >= 1.0
-BuildRequires:	gstreamer1-plugins-base-devel >= 1.0
-%endif
-
-# X11 Libraries
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}xxf86dga-devel
-BuildRequires:	%{_lib}xxf86vm-devel
-%if 0%{?mgaversion} >= 4
-BuildRequires:	%{_lib}xtst-devel
-%else
-BuildRequires:	%{_lib}xtst%{?mgaversion:6}-devel
-%endif
-%endif
-%if 0%{?rhel} == 4
-BuildRequires:	xorg-x11-devel
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
-BuildRequires:	libXxf86dga-devel
-BuildRequires:	libXxf86vm-devel
-%endif
-
-# XINE support
-%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?rhel} >= 5
-%define with_xine 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}xine1.2-devel
-%endif
-%if 0%{?fedora} || 0%{?rhel}
-BuildRequires: xine-lib-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires: libxine-devel
-%endif
-%endif
-
-# LAME support
-%define with_lame 1
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos}
-BuildRequires:		liblame-devel
-%else
-%if 0%{?mgaversion} >= 6
-BuildRequires:		%{_lib}mp3lame-devel
-%else
-BuildRequires:		%{_lib}lame-devel
-%endif
-%endif
-%endif
-
-%if 0%{?suse_version}
-BuildRequires:		libmp3lame-devel
-%endif
-
-%if 0%{?fedora} || 0%{?rhel}
-BuildRequires:		lame-devel
-%endif
-
-
-Requires: trinity-artsbuilder = %{version}-%{release}
-Requires: trinity-juk = %{version}-%{release}
-Requires: trinity-kaboodle = %{version}-%{release}
-Requires: trinity-kaudiocreator = %{version}-%{release}
-Requires: %{name}-kfile-plugins = %{version}-%{release}
-Requires: %{name}-kappfinder-data = %{version}-%{release}
-Requires: %{name}-tdeio-plugins = %{version}-%{release}
-Requires: trinity-tdemid = %{version}-%{release}
-Requires: trinity-kmix = %{version}-%{release}
-Requires: trinity-krec = %{version}-%{release}
-Requires: trinity-kscd = %{version}-%{release}
-%{?with_akode:Requires: trinity-libarts-akode = %{version}-%{release}}
-Requires: trinity-libarts-audiofile = %{version}-%{release}
-%{?with_mpeg:Requires: trinity-libarts-mpeglib = %{version}-%{release}}
-%{?with_xine:Requires: trinity-libarts-xine = %{version}-%{release}}
-Requires: trinity-libkcddb = %{version}-%{release}
-%{?with_mpeg:Requires: trinity-mpeglib = %{version}-%{release}}
-Requires: trinity-noatun = %{version}-%{release}
-
-
-%description
-The Trinity Desktop Environment (TDE) is a GUI desktop for the X Window
-System. The tdemultimedia package contains multimedia applications for
-TDE, including:
-  artsbuilder, Synthesizer designer for aRts
-  juk, a media player
-  tdemid, a midi player
-  kmix, an audio mixer
-  arts, additional functionality for the aRts sound system
-  krec, a recording tool
-  kscd, an Audio-CD player
-  kaudiocreator, a graphical frontend for audio file creation 
-  kaboodle, a media player
-  noatun, a media player
-
-%files
-
-##########
-
-%package -n trinity-artsbuilder
-Summary:	Synthesizer designer for aRts
-Group:		Productivity/Multimedia/Sound/Mixers
-Requires:	trinity-kicker >= %{tde_version}
-
-%description -n trinity-artsbuilder
-This is the analog Realtime synthesizer's graphical design tool.
-
-%files -n trinity-artsbuilder
-%defattr(-,root,root,-)
-%{tde_bindir}/artsbuilder
-%{tde_bindir}/artscontrol
-%{tde_bindir}/midisend
-%{tde_libdir}/libartsbuilder.la
-%{tde_libdir}/libartsbuilder.so.*
-%{tde_libdir}/libartscontrolapplet.la
-%{tde_libdir}/libartscontrolapplet.so.*
-%{tde_libdir}/libartscontrolsupport.la
-%{tde_libdir}/libartscontrolsupport.so.*
-%{tde_libdir}/libartsgui_idl.la
-%{tde_libdir}/libartsgui_idl.so.*
-%{tde_libdir}/libartsgui_kde.la
-%{tde_libdir}/libartsgui_kde.so.*
-%{tde_libdir}/libartsgui.la
-%{tde_libdir}/libartsgui.so.*
-%{tde_libdir}/libartsmidi_idl.la
-%{tde_libdir}/libartsmidi_idl.so.*
-%{tde_libdir}/libartsmidi.la
-%{tde_libdir}/libartsmidi.so.*
-%{tde_libdir}/libartsmodulescommon.la
-%{tde_libdir}/libartsmodulescommon.so.*
-%{tde_libdir}/libartsmoduleseffects.la
-%{tde_libdir}/libartsmoduleseffects.so.*
-%{tde_libdir}/libartsmodulesmixers.la
-%{tde_libdir}/libartsmodulesmixers.so.*
-%{tde_libdir}/libartsmodules.la
-%{tde_libdir}/libartsmodules.so.*
-%{tde_libdir}/libartsmodulessynth.la
-%{tde_libdir}/libartsmodulessynth.so.*
-%{tde_libdir}/mcop/Arts/ArtsBuilderLoader.mcopclass
-%{tde_libdir}/mcop/artsbuilder.mcopclass
-%{tde_libdir}/mcop/artsbuilder.mcoptype
-%{tde_libdir}/mcop/Arts/Button.mcopclass
-%{tde_libdir}/mcop/Arts/EffectRackGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/Effect_WAVECAPTURE.mcopclass
-%{tde_libdir}/mcop/Arts/Environment/Container.mcopclass
-%{tde_libdir}/mcop/Arts/Environment/EffectRackItem.mcopclass
-%{tde_libdir}/mcop/Arts/Environment/InstrumentItemGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/Environment/InstrumentItem.mcopclass
-%{tde_libdir}/mcop/Arts/Environment/MixerItem.mcopclass
-%{tde_libdir}/mcop/Arts/Fader.mcopclass
-%{tde_libdir}/mcop/Arts/FiveBandMonoComplexEQGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/FiveBandMonoComplexEQ.mcopclass
-%{tde_libdir}/mcop/Arts/FreeverbGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/GenericGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/GraphLine.mcopclass
-%{tde_libdir}/mcop/artsgui.mcopclass
-%{tde_libdir}/mcop/artsgui.mcoptype
-%{tde_libdir}/mcop/Arts/HBox.mcopclass
-%{tde_libdir}/mcop/Arts/Label.mcopclass
-%{tde_libdir}/mcop/Arts/LayoutBox.mcopclass
-%{tde_libdir}/mcop/Arts/LevelMeter.mcopclass
-%{tde_libdir}/mcop/Arts/LineEdit.mcopclass
-%{tde_libdir}/mcop/Arts/LittleStereoMixerChannelGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/LittleStereoMixerChannel.mcopclass
-%{tde_libdir}/mcop/Arts/LocalFactory.mcopclass
-%{tde_libdir}/mcop/Arts/MidiManager.mcopclass
-%{tde_libdir}/mcop/artsmidi.mcopclass
-%{tde_libdir}/mcop/artsmidi.mcoptype
-%{tde_libdir}/mcop/Arts/MixerGuiFactory.mcopclass
-%{tde_libdir}/mcop/artsmodulescommon.mcopclass
-%{tde_libdir}/mcop/artsmodulescommon.mcoptype
-%{tde_libdir}/mcop/artsmoduleseffects.mcopclass
-%{tde_libdir}/mcop/artsmoduleseffects.mcoptype
-%{tde_libdir}/mcop/artsmodules.mcopclass
-%{tde_libdir}/mcop/artsmodules.mcoptype
-%{tde_libdir}/mcop/artsmodulesmixers.mcopclass
-%{tde_libdir}/mcop/artsmodulesmixers.mcoptype
-%{tde_libdir}/mcop/artsmodulessynth.mcopclass
-%{tde_libdir}/mcop/artsmodulessynth.mcoptype
-%{tde_libdir}/mcop/Arts/MonoSimpleMixerChannelGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/MonoSimpleMixerChannel.mcopclass
-%{tde_libdir}/mcop/Arts/MonoToStereo.mcopclass
-%{tde_libdir}/mcop/Arts/PopupBox.mcopclass
-%{tde_libdir}/mcop/Arts/Poti.mcopclass
-%{tde_libdir}/mcop/Arts/SimpleMixerChannelGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/SimpleMixerChannel.mcopclass
-%{tde_libdir}/mcop/Arts/SpinBox.mcopclass
-%{tde_libdir}/mcop/Arts/StereoBalanceGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/StereoBalance.mcopclass
-%{tde_libdir}/mcop/Arts/StereoCompressorGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/StereoFirEqualizerGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/StereoToMono.mcopclass
-%{tde_libdir}/mcop/Arts/StereoVolumeControlGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/StereoVolumeControlGui.mcopclass
-%{tde_libdir}/mcop/Arts/StructureBuilder.mcopclass
-%{tde_libdir}/mcop/Arts/StructureDesc.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_ATAN_SATURATE.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_AUTOPANNER.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_BRICKWALL_LIMITER.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_CAPTURE_WAV.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_CDELAY.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_COMPRESSOR.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_DATA.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_DEBUG.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_DELAY.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_DIV.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_ENVELOPE_ADSR.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_FM_SOURCE.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_FREEVERB.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_FX_CFLANGER.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_MIDI_DEBUG.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_MIDI_TEST.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_MOOG_VCF.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_NIL.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_NOISE.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_OSC.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_PITCH_SHIFT_FFT.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_PITCH_SHIFT.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_PLAY_PAT.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_PSCALE.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_RC.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_SEQUENCE_FREQ.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_SEQUENCE.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_SHELVE_CUTOFF.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_STD_EQUALIZER.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_STEREO_COMPRESSOR.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_STEREO_FIR_EQUALIZER.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_STEREO_PITCH_SHIFT_FFT.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_STEREO_PITCH_SHIFT.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_TREMOLO.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_VOICE_REMOVAL.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_WAVE_PULSE.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_WAVE_SOFTSAW.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_WAVE_SQUARE.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_WAVE_TRI.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_XFADE.mcopclass
-%{tde_libdir}/mcop/Arts/VBox.mcopclass
-%{tde_libdir}/mcop/Arts/VoiceRemovalGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/Widget.mcopclass
-%{tde_tdeappdir}/artsbuilder.desktop
-%{tde_tdeappdir}/artscontrol.desktop
-%{tde_datadir}/apps/artsbuilder/
-%{tde_datadir}/apps/artscontrol/
-%{tde_datadir}/apps/kicker/applets/artscontrolapplet.desktop
-%{tde_datadir}/icons/crystalsvg/*/actions/artsaudiomanager.png
-%{tde_datadir}/icons/crystalsvg/*/actions/artsbuilderexecute.png
-%{tde_datadir}/icons/crystalsvg/*/actions/artsenvironment.png
-%{tde_datadir}/icons/crystalsvg/*/actions/artsfftscope.png
-%{tde_datadir}/icons/crystalsvg/*/actions/artsmediatypes.png
-%{tde_datadir}/icons/crystalsvg/*/actions/artsmidimanager.png
-%{tde_datadir}/icons/crystalsvg/scalable/actions/artsaudiomanager.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/actions/artsenvironment.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/actions/artsfftscope.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/actions/artsmediatypes.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/actions/artsmidimanager.svgz
-%{tde_datadir}/icons/hicolor/*/apps/artsbuilder.png
-%{tde_datadir}/icons/hicolor/*/apps/artscontrol.png
-%{tde_datadir}/icons/hicolor/scalable/apps/artsbuilder.svgz
-%{tde_datadir}/icons/hicolor/scalable/apps/artscontrol.svgz
-%{tde_datadir}/mimelnk/application/x-artsbuilder.desktop
-%{tde_tdedocdir}/HTML/en/artsbuilder/
-
-##########
-
-%package -n trinity-juk
-Summary:	Music organizer and player for Trinity
-Group:		Productivity/Multimedia/Sound/Players
-
-%description -n trinity-juk
-JuK (pronounced "jook") is a jukebox and music manager for the TDE
-desktop similar to jukebox software on other platforms such as
-iTunes or RealOne.
-
-Some of JuK's features include:
-* Support for Ogg Vorbis and MP3 formats
-* Tag editing support for both formats, including ID3v2 for MP3 files.
-  Multitagging or editing a selection of multiple files at once is also
-  supported
-* Output to either the aRts, default KDE sound system, or GStreamer
-* Management of your "collection" and multiple playlists
-* Import and export to m3u playlists
-* Binary caching of audio meta-data and playlist information for faster
-  load times (starting with the second time you run JuK)
-* Integration into TDE that allows drag-and-drop and clipboard usage
-  with other TDE and X apps
-
-%files -n trinity-juk
-%defattr(-,root,root,-)
-%{tde_bindir}/juk
-%{tde_tdeappdir}/juk.desktop
-%{tde_datadir}/apps/juk/
-%{tde_datadir}/apps/konqueror/servicemenus/jukservicemenu.desktop
-%{tde_datadir}/icons/crystalsvg/*/actions/juk_dock.png
-%{tde_datadir}/icons/hicolor/*/apps/juk.png
-%{tde_tdedocdir}/HTML/en/juk/
-
-##########
-
-%package -n trinity-kaboodle
-Summary:	Light, embedded media player for Trinity
-Group:		System/GUI/Other
-
-%if 0%{?with_xine}
-Requires:	trinity-libarts-xine = %{version}-%{release}
-%endif
-
-%description -n trinity-kaboodle
-Kaboodle is a light, embedded media player, supporting both video and audio,
-for TDE. It uses the aRts framework for playing media files.
-
-%files -n trinity-kaboodle
-%defattr(-,root,root,-)
-%{tde_bindir}/kaboodle
-%{tde_tdelibdir}/libkaboodlepart.la
-%{tde_tdelibdir}/libkaboodlepart.so
-%{tde_tdeappdir}/kaboodle.desktop
-%{tde_datadir}/apps/kaboodle/
-%{tde_datadir}/icons/hicolor/*/apps/kaboodle.png
-%{tde_datadir}/services/kaboodle_component.desktop
-%{tde_datadir}/services/kaboodleengine.desktop
-%{tde_tdedocdir}/HTML/en/kaboodle/
-
-##########
-
-%package -n trinity-kaudiocreator
-Summary:	CD ripper and audio encoder frontend for Trinity
-Group:		Productivity/Multimedia/CD/Grabbers
-
-Requires:	%{name}-tdeio-plugins = %{version}-%{release}
-Requires:	vorbis-tools
-Requires:	flac
-
-%description -n trinity-kaudiocreator
-KAudioCreator is a tool for audio extraction (ripping) and encoding. It can
-keep your WAV files, or convert them to Ogg/Vorbis, MP3, or FLAC. It also
-searches CDDB to retrieve the information of the disk.
-
-%files -n trinity-kaudiocreator
-%defattr(-,root,root,-)
-%{tde_bindir}/kaudiocreator
-%{tde_tdeappdir}/kaudiocreator.desktop
-%{tde_datadir}/apps/kaudiocreator/
-%{tde_datadir}/apps/tdeconf_update/kaudiocreator-libkcddb.upd
-%{tde_datadir}/apps/tdeconf_update/kaudiocreator-meta.upd
-%{tde_datadir}/apps/tdeconf_update/upgrade-kaudiocreator-metadata.sh
-%{tde_datadir}/apps/konqueror/servicemenus/audiocd_extract.desktop
-%{tde_datadir}/config.kcfg/kaudiocreator.kcfg
-%{tde_datadir}/config.kcfg/kaudiocreator_encoders.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kaudiocreator.png
-%{tde_datadir}/icons/locolor/*/apps/kaudiocreator.png
-%{tde_tdedocdir}/HTML/en/kaudiocreator/
-
-##########
-
-%package kfile-plugins
-Summary:	An au/avi/m3u/mp3/ogg/wav plugins for kfile
-Group:		Productivity/Multimedia/Sound/Utilities
-
-%description kfile-plugins
-au/avi/m3u/mp3/ogg/wav file metainformation plugins for Trinity.
-
-%files kfile-plugins
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/tdefile_au.la
-%{tde_tdelibdir}/tdefile_au.so
-%{tde_tdelibdir}/tdefile_avi.la
-%{tde_tdelibdir}/tdefile_avi.so
-%{tde_tdelibdir}/tdefile_flac.la
-%{tde_tdelibdir}/tdefile_flac.so
-%{tde_tdelibdir}/tdefile_m3u.la
-%{tde_tdelibdir}/tdefile_m3u.so
-%{tde_tdelibdir}/tdefile_mp3.la
-%{tde_tdelibdir}/tdefile_mp3.so
-%{tde_tdelibdir}/tdefile_mpc.la
-%{tde_tdelibdir}/tdefile_mpc.so
-%{tde_tdelibdir}/tdefile_mpeg.la
-%{tde_tdelibdir}/tdefile_mpeg.so
-%{tde_tdelibdir}/tdefile_ogg.la
-%{tde_tdelibdir}/tdefile_ogg.so
-%{tde_tdelibdir}/tdefile_sid.la
-%{tde_tdelibdir}/tdefile_sid.so
-%{tde_tdelibdir}/tdefile_theora.la
-%{tde_tdelibdir}/tdefile_theora.so
-%{tde_tdelibdir}/tdefile_wav.la
-%{tde_tdelibdir}/tdefile_wav.so
-%{tde_datadir}/services/tdefile_au.desktop
-%{tde_datadir}/services/tdefile_avi.desktop
-%{tde_datadir}/services/tdefile_flac.desktop
-%{tde_datadir}/services/tdefile_m3u.desktop
-%{tde_datadir}/services/tdefile_mp3.desktop
-%{tde_datadir}/services/tdefile_mpc.desktop
-%{tde_datadir}/services/tdefile_mpeg.desktop
-%{tde_datadir}/services/tdefile_ogg.desktop
-%{tde_datadir}/services/tdefile_sid.desktop
-%{tde_datadir}/services/tdefile_theora.desktop
-%{tde_datadir}/services/tdefile_wav.desktop
-
-##########
-
-%package kappfinder-data
-Summary:	Multimedia data for kappfinder
-Group:		Productivity/Multimedia/Sound/Utilities
-
-Requires: 	trinity-kappfinder >= %{tde_version}
-Requires:	trinity-tdebase-runtime-data-common >= %{tde_version}
-
-%description kappfinder-data
-This package provides data on multimedia applications for kappfinder.
-
-%files kappfinder-data
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/kappfinder/
-%{tde_datadir}/desktop-directories/tde-multimedia-music.directory
-%config %{_sysconfdir}/xdg/menus/applications-merged/tde-multimedia-music.menu
-
-##########
-
-%package tdeio-plugins
-Summary:	Enables the browsing of audio CDs under Konqueror
-Group:		Productivity/Multimedia/Sound/Utilities
-Requires:	trinity-tdebase-tdeio-plugins >= %{tde_version}
-
-Obsoletes:	trinity-tdemultimedia-kio-plugins < %{version}-%{release}
-Provides:	trinity-tdemultimedia-kio-plugins = %{version}-%{release}
-
-%description tdeio-plugins
-This package allow audio CDs to be browsed like a file system using
-Konqueror and the audiocd:/ URL.
-
-%files tdeio-plugins
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kcm_audiocd.la
-%{tde_tdelibdir}/kcm_audiocd.so
-%{tde_tdelibdir}/tdeio_audiocd.la
-%{tde_tdelibdir}/tdeio_audiocd.so
-%{tde_tdelibdir}/libaudiocd_encoder_flac.la
-%{tde_tdelibdir}/libaudiocd_encoder_flac.so
-%{tde_tdelibdir}/libaudiocd_encoder_lame.la
-%{tde_tdelibdir}/libaudiocd_encoder_lame.so
-%{tde_tdelibdir}/libaudiocd_encoder_vorbis.la
-%{tde_tdelibdir}/libaudiocd_encoder_vorbis.so
-%{tde_tdelibdir}/libaudiocd_encoder_wav.la
-%{tde_tdelibdir}/libaudiocd_encoder_wav.so
-%{tde_libdir}/libaudiocdplugins.so.*
-%{tde_tdeappdir}/audiocd.desktop
-%{tde_datadir}/apps/tdeconf_update/audiocd.upd
-%{tde_datadir}/apps/tdeconf_update/upgrade-metadata.sh
-%{tde_datadir}/config.kcfg/audiocd_lame_encoder.kcfg
-%{tde_datadir}/config.kcfg/audiocd_vorbis_encoder.kcfg
-%{tde_datadir}/services/audiocd.protocol
-%{tde_tdedocdir}/HTML/en/tdeioslave/audiocd/
-%{tde_tdedocdir}/HTML/en/kcontrol/audiocd/
-%{tde_datadir}/icons/hicolor/*/apps/kcmaudiocd.png
-
-##########
-
-%package -n trinity-tdemid
-Summary:	MIDI/karaoke player for Trinity
-Group:		Productivity/Multimedia/Sound/Midi
-
-Obsoletes:	trinity-kmid < %{version}-%{release}
-Provides:	trinity-kmid = %{version}-%{release}
-
-%description -n trinity-tdemid
-This package provides a MIDI and karaoke player for TDE.
-
-%files -n trinity-tdemid
-%defattr(-,root,root,-)
-%{tde_bindir}/tdemid
-%{tde_tdelibdir}/libtdemidpart.la
-%{tde_tdelibdir}/libtdemidpart.so
-%{tde_libdir}/libtdemidlib.so.*
-%{tde_tdeappdir}/tdemid.desktop
-%{tde_datadir}/apps/tdemid/
-%{tde_datadir}/icons/hicolor/*/apps/tdemid.png
-%{tde_datadir}/mimelnk/audio/x-karaoke.desktop
-%{tde_datadir}/servicetypes/audiomidi.desktop
-%{tde_tdedocdir}/HTML/en/tdemid/
-
-##########
-
-%package -n trinity-kmix
-Summary:	Sound mixer applet for Trinity
-Group:		Productivity/Multimedia/Sound/Mixers
-Requires:	trinity-kicker >= %{tde_version}
-
-%description -n trinity-kmix
-This package includes TDE's dockable sound mixer applet.
-
-%files -n trinity-kmix
-%defattr(-,root,root,-)
-%{tde_bindir}/kmix
-%{tde_bindir}/kmixctrl
-%{tde_tdelibdir}/kmix.la
-%{tde_tdelibdir}/kmix.so
-%{tde_tdelibdir}/kmix_panelapplet.la
-%{tde_tdelibdir}/kmix_panelapplet.so
-%{tde_tdelibdir}/kmixctrl.la
-%{tde_tdelibdir}/kmixctrl.so
-%{tde_libdir}/libtdeinit_kmix.so
-%{tde_libdir}/libtdeinit_kmixctrl.so
-%{tde_tdeappdir}/kmix.desktop
-%{tde_datadir}/apps/kicker/applets/kmixapplet.desktop
-%{tde_datadir}/apps/kmix/
-%{tde_datadir}/autostart/kmix.desktop
-%{tde_datadir}/autostart/restore_kmix_volumes.desktop
-%{tde_datadir}/icons/hicolor/*/apps/kmix.png
-%{tde_datadir}/services/kmixctrl_restore.desktop
-%{tde_tdedocdir}/HTML/en/kmix/
-
-##########
-
-%package -n trinity-krec
-Summary:	Sound recorder utility for Trinity
-Group:		Productivity/Multimedia/CD/Record
-
-%description -n trinity-krec
-This is a sound recording utility for Trinity.
-
-%files -n trinity-krec
-%defattr(-,root,root,-)
-%{tde_bindir}/krec
-%{tde_tdelibdir}/kcm_krec.la
-%{tde_tdelibdir}/kcm_krec.so
-%{tde_tdelibdir}/kcm_krec_files.la
-%{tde_tdelibdir}/kcm_krec_files.so
-%{tde_tdelibdir}/krec.la
-%{tde_tdelibdir}/krec.so
-%if 0%{?with_lame}
-%{tde_tdelibdir}/libkrecexport_mp3.la
-%{tde_tdelibdir}/libkrecexport_mp3.so
-%{tde_datadir}/services/krec_exportmp3.desktop
-%endif
-%{tde_tdelibdir}/libkrecexport_ogg.la
-%{tde_tdelibdir}/libkrecexport_ogg.so
-%{tde_tdelibdir}/libkrecexport_wave.la
-%{tde_tdelibdir}/libkrecexport_wave.so
-%{tde_libdir}/libtdeinit_krec.so
-%{tde_tdeappdir}/krec.desktop
-%{tde_datadir}/apps/krec/
-%{tde_datadir}/icons/hicolor/*/apps/krec.png
-%{tde_datadir}/services/kcm_krec.desktop
-%{tde_datadir}/services/kcm_krec_files.desktop
-%{tde_datadir}/services/krec_exportogg.desktop
-%{tde_datadir}/services/krec_exportwave.desktop
-%{tde_datadir}/servicetypes/krec_exportitem.desktop
-%{tde_tdedocdir}/HTML/en/krec/
-
-##########
-
-%package -n trinity-kscd
-Summary:	Audio CD player for Trinity
-Group:		Productivity/Multimedia/CD/Players
-
-%description -n trinity-kscd
-This is Trinity's audio CD player.
-
-%files -n trinity-kscd
-%defattr(-,root,root,-)
-%{tde_bindir}/kscd
-%{tde_bindir}/workman2cddb.pl
-%{tde_tdeappdir}/kscd.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/audiocd_play.desktop
-%{tde_datadir}/apps/kscd/
-%{tde_datadir}/apps/profiles/kscd.profile.xml
-%{tde_datadir}/config.kcfg/kscd.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kscd.png
-%{tde_datadir}/mimelnk/text/xmcd.desktop
-%{tde_tdedocdir}/HTML/en/kscd/
-
-##########
-
-%if 0%{?with_akode}
-%package -n trinity-libarts-akode
-Summary:	Akode plugin for aRts
-Group:		Productivity/Multimedia/Other
-
-%description -n trinity-libarts-akode
-This package contains akode plugins for aRts.
-
-%files -n trinity-libarts-akode
-%defattr(-,root,root,-)
-%{tde_libdir}/libarts_akode.so.*
-%{tde_libdir}/libarts_akode.la
-%{tde_libdir}/mcop/akodearts.mcoptype
-%{tde_libdir}/mcop/akodearts.mcopclass
-%{tde_libdir}/mcop/akodeMPCPlayObject.mcopclass
-%{tde_libdir}/mcop/akodePlayObject.mcopclass
-%{tde_libdir}/mcop/akodeSpeexStreamPlayObject.mcopclass
-%{tde_libdir}/mcop/akodeVorbisStreamPlayObject.mcopclass
-%{tde_libdir}/mcop/akodeXiphPlayObject.mcopclass
-
-# Requires MAD support
-%{?with_libmad:%{tde_libdir}/mcop/akodeMPEGPlayObject.mcopclass}
-
-%endif
-
-##########
-
-%package -n trinity-libarts-audiofile
-Summary:	Audiofile plugin for aRts
-Group:		Productivity/Multimedia/Other
-
-%description -n trinity-libarts-audiofile
-This package contains audiofile plugins for aRts.
-
-%files -n trinity-libarts-audiofile
-%defattr(-,root,root,-)
-%{tde_libdir}/libarts_audiofile.so.*
-%{tde_libdir}/libarts_audiofile.la
-%{tde_libdir}/mcop/Arts/audiofilePlayObject.mcopclass
-%{tde_libdir}/mcop/audiofilearts.mcopclass
-%{tde_libdir}/mcop/audiofilearts.mcoptype
-
-##########
-
-%if 0%{?with_mpeg}
-%package -n trinity-libarts-mpeglib
-Summary:	Mpeglib plugin for aRts, supporting mp3 and mpeg audio/video
-Group:		Productivity/Multimedia/Other
-
-%description -n trinity-libarts-mpeglib
-This package contains the mpeglib aRts plugin, supporting mp3 and mpeg
-audio and video.
-
-This is the arts (TDE Sound daemon) plugin.
-
-%files -n trinity-libarts-mpeglib
-%defattr(-,root,root,-)
-%{tde_bindir}/mpeglibartsplay
-%{tde_libdir}/libarts_mpeglib-0.3.0.so.*
-%{tde_libdir}/libarts_mpeglib.la
-%{tde_libdir}/libarts_splay.so.*
-%{tde_libdir}/libarts_splay.la
-%{tde_libdir}/mcop/CDDAPlayObject.mcopclass
-%{tde_libdir}/mcop/MP3PlayObject.mcopclass
-%{tde_libdir}/mcop/NULLPlayObject.mcopclass
-%{tde_libdir}/mcop/OGGPlayObject.mcopclass
-%{tde_libdir}/mcop/SplayPlayObject.mcopclass
-%{tde_libdir}/mcop/WAVPlayObject.mcopclass
-
-%endif
-
-##########
-
-%if 0%{?with_xine}
-%package -n trinity-libarts-xine
-Summary:	ARTS plugin enabling xine support
-Group:		Productivity/Multimedia/Other
-
-%description -n trinity-libarts-xine
-This package contains aRts' xine plugin, allowing the use of the xine
-multimedia engine though aRts.
-
-%files -n trinity-libarts-xine
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/videothumbnail.la
-%{tde_tdelibdir}/videothumbnail.so
-%{tde_libdir}/libarts_xine.so.*
-%{tde_libdir}/libarts_xine.la
-%{tde_libdir}/mcop/xineAudioPlayObject.mcopclass
-%{tde_libdir}/mcop/xineVideoPlayObject.mcopclass
-%{tde_datadir}/apps/videothumbnail/sprocket-large.png
-%{tde_datadir}/apps/videothumbnail/sprocket-medium.png
-%{tde_datadir}/apps/videothumbnail/sprocket-small.png
-%{tde_datadir}/services/videothumbnail.desktop
-
-%endif
-
-##########
-
-%package -n trinity-libkcddb
-Summary:	CDDB library for Trinity
-Group:		Productivity/Multimedia/Other
-Requires:	trinity-kcontrol >= %{tde_version}
-
-%description -n trinity-libkcddb
-The Trinity native CDDB (CD Data Base) library, providing easy access to Audio
-CD meta-information (track titles, artist information, etc.) from on-line
-databases, for TDE applications.
-
-%files -n trinity-libkcddb
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kcm_cddb.la
-%{tde_tdelibdir}/kcm_cddb.so
-%{tde_libdir}/libkcddb.so.*
-%{tde_tdeappdir}/libkcddb.desktop
-%{tde_datadir}/apps/tdeconf_update/kcmcddb-emailsettings.upd
-%{tde_datadir}/config.kcfg/libkcddb.kcfg
-%{tde_tdedocdir}/HTML/en/kcontrol/cddb/
-
-##########
-
-%if 0%{?with_mpeg}
-
-%package -n trinity-mpeglib
-Summary:	MP3 and MPEG-1 audio and video library
-Group:		Productivity/Multimedia/Other
-%if 0%{?with_mpeg}
-Requires:	trinity-libarts-mpeglib = %{version}-%{release}
-%endif
-
-%description -n trinity-mpeglib
-mpeglib is a MPEG-1 and MP3 audio and video library. It supports
-MPEG-1 audio (layers 1, 2, 3), MPEG-1 video, MPEG-1 system layer,
-and WAV playback
-
-%files -n trinity-mpeglib
-%defattr(-,root,root,-)
-%{tde_bindir}/yaf-cdda
-%{tde_bindir}/yaf-mpgplay
-%{tde_bindir}/yaf-splay
-%{tde_bindir}/yaf-tplay
-%{tde_bindir}/yaf-vorbis
-%{tde_bindir}/yaf-yuv
-%{tde_libdir}/libmpeg-0.3.0.so
-%{tde_libdir}/libyafcore.so
-%{tde_libdir}/libyafxplayer.so
-
-%endif
-
-##########
-
-%package -n trinity-noatun
-Summary:	Media player for Trinity
-Group:		Productivity/Multimedia/Video/Players
-Requires:	trinity-tdebase-bin >= %{tde_version}
-
-# 20120802: Hack to avoid dependency issue on MGA2 and MDV2011
-%if 0%{?mgaversion} || 0%{?mdkversion}
-Provides:	devel(libnoatunarts)
-Provides:	devel(libnoatunarts(64bit))
-%endif
-
-%description -n trinity-noatun
-Noatun is an aRts-based audio and video player for Trinity. It supports all
-formats supported by your installation of aRts (including aRts plugins).
-
-%files -n trinity-noatun
-%defattr(-,root,root,-)
-%{tde_bindir}/noatun
-%{tde_libdir}/tdeconf_update_bin/noatun20update
-%{tde_tdelibdir}/noatun.la
-%{tde_tdelibdir}/noatun.so
-%{tde_tdelibdir}/noatun_dcopiface.la
-%{tde_tdelibdir}/noatun_dcopiface.so
-%{tde_tdelibdir}/noatun_excellent.la
-%{tde_tdelibdir}/noatun_excellent.so
-%{tde_tdelibdir}/noatun_htmlexport.la
-%{tde_tdelibdir}/noatun_htmlexport.so
-%{tde_tdelibdir}/noatun_infrared.la
-%{tde_tdelibdir}/noatun_infrared.so
-%{tde_tdelibdir}/noatun_kaiman.la
-%{tde_tdelibdir}/noatun_kaiman.so
-%{tde_tdelibdir}/noatun_keyz.la
-%{tde_tdelibdir}/noatun_keyz.so
-%{tde_tdelibdir}/noatun_kjofol.la
-%{tde_tdelibdir}/noatun_kjofol.so
-%{tde_tdelibdir}/noatun_marquis.la
-%{tde_tdelibdir}/noatun_marquis.so
-%{tde_tdelibdir}/noatun_metatag.la
-%{tde_tdelibdir}/noatun_metatag.so
-%{tde_tdelibdir}/noatun_monoscope.la
-%{tde_tdelibdir}/noatun_monoscope.so
-%{tde_tdelibdir}/noatun_net.la
-%{tde_tdelibdir}/noatun_net.so
-%{tde_tdelibdir}/noatun_splitplaylist.la
-%{tde_tdelibdir}/noatun_splitplaylist.so
-%{tde_tdelibdir}/noatun_systray.la
-%{tde_tdelibdir}/noatun_systray.so
-%{tde_tdelibdir}/noatun_ui.la
-%{tde_tdelibdir}/noatun_ui.so
-%{tde_tdelibdir}/noatun_voiceprint.la
-%{tde_tdelibdir}/noatun_voiceprint.so
-%{tde_tdelibdir}/noatun_winskin.la
-%{tde_tdelibdir}/noatun_winskin.so
-%{tde_tdelibdir}/noatunsimple.la
-%{tde_tdelibdir}/noatunsimple.so
-%{tde_libdir}/libartseffects.la
-%{tde_libdir}/libartseffects.so
-%{tde_libdir}/libtdeinit_noatun.so
-%{tde_libdir}/libnoatun.so.*
-%{tde_libdir}/libnoatunarts.la
-%{tde_libdir}/libnoatunarts.so
-%{tde_libdir}/libnoatuncontrols.so.*
-%{tde_libdir}/libnoatuntags.so.*
-%{tde_libdir}/libwinskinvis.la
-%{tde_libdir}/libwinskinvis.so
-%{tde_libdir}/mcop/ExtraStereo.mcopclass
-%{tde_libdir}/mcop/ExtraStereoGuiFactory.mcopclass
-%{tde_libdir}/mcop/Noatun/
-%{tde_libdir}/mcop/RawWriter.mcopclass
-%{tde_libdir}/mcop/VoiceRemoval.mcopclass
-%{tde_libdir}/mcop/artseffects.mcopclass
-%{tde_libdir}/mcop/artseffects.mcoptype
-%{tde_libdir}/mcop/noatunarts.mcopclass
-%{tde_libdir}/mcop/noatunarts.mcoptype
-%{tde_libdir}/mcop/winskinvis.mcopclass
-%{tde_libdir}/mcop/winskinvis.mcoptype
-%{tde_tdeappdir}/noatun.desktop
-%{tde_datadir}/apps/tdeconf_update/noatun.upd
-%{tde_datadir}/apps/noatun/
-%{tde_datadir}/icons/hicolor/*/apps/noatun.png
-%{tde_datadir}/mimelnk/interface/x-winamp-skin.desktop
-%{tde_tdedocdir}/HTML/en/noatun/
-
-##########
-
-%package devel
-Summary:	Development files for %{name}, aRts and noatun plugins
-Group:		Development/Libraries/Other
-Requires:	%{name} = %{version}-%{release}
-Requires:	trinity-tdelibs-devel >= %{tde_version}
-
-Obsoletes:	trinity-kdemultimedia-devel < %{version}-%{release}
-Provides:	trinity-kdemultimedia-devel = %{version}-%{release}
-
-%description devel
-{summary}.
-
-Install %{name}-devel if you wish to develop or compile any
-applications using aRtsbuilder, aRtsmidi, aRtskde, aRts modules or
-noatun plugins.
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_includedir}/*
-%if 0%{?with_akode}
-%{tde_libdir}/libarts_akode.so
-%endif
-%{tde_libdir}/libarts_audiofile.so
-%if 0%{?with_mpeg}
-%{tde_libdir}/libarts_mpeglib.so
-%{tde_libdir}/libarts_splay.so
-%endif
-%if 0%{?with_xine}
-%{tde_libdir}/libarts_xine.so
-%endif
-%{tde_libdir}/libartsbuilder.so
-%{tde_libdir}/libartscontrolapplet.so
-%{tde_libdir}/libartscontrolsupport.so
-%{tde_libdir}/libartsgui.so
-%{tde_libdir}/libartsgui_idl.so
-%{tde_libdir}/libartsgui_kde.so
-%{tde_libdir}/libartsmidi.so
-%{tde_libdir}/libartsmidi_idl.so
-%{tde_libdir}/libartsmodules.so
-%{tde_libdir}/libartsmodulescommon.so
-%{tde_libdir}/libartsmoduleseffects.so
-%{tde_libdir}/libartsmodulesmixers.so
-%{tde_libdir}/libartsmodulessynth.so
-%{tde_libdir}/libaudiocdplugins.la
-%{tde_libdir}/libaudiocdplugins.so
-%{tde_libdir}/libkcddb.la
-%{tde_libdir}/libkcddb.so
-%{tde_libdir}/libtdeinit_kmix.la
-%{tde_libdir}/libtdeinit_kmixctrl.la
-%{tde_libdir}/libtdeinit_krec.la
-%{tde_libdir}/libtdeinit_noatun.la
-%{tde_libdir}/libtdemidlib.la
-%{tde_libdir}/libtdemidlib.so
-%if 0%{?with_mpeg}
-%{tde_libdir}/libmpeg.la
-%{tde_libdir}/libmpeg.so
-%endif
-%{tde_libdir}/libnoatun.la
-%{tde_libdir}/libnoatun.so
-%{tde_libdir}/libnoatuncontrols.la
-%{tde_libdir}/libnoatuncontrols.so
-%{tde_libdir}/libnoatuntags.la
-%{tde_libdir}/libnoatuntags.so
-%if 0%{?with_mpeg}
-%{tde_libdir}/libyafcore.la
-%{tde_libdir}/libyafxplayer.la
-%endif
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{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"
-
-# Update icons for some control center modules
-%__sed -i "tdeioslave/audiocd/kcmaudiocd/audiocd.desktop" -e "s|^Icon=.*|Icon=kcmaudio|"
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-
-# Warning: GCC visibility causes FTBFS [Bug #1285]
-%configure  \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --includedir=%{tde_tdeincludedir} \
-  --datadir=%{tde_datadir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility \
-  \
-  --with-extra-includes="%{_includedir}/cdda:%{_includedir}/cddb:%{tde_tdeincludedir}/arts:%{tde_includedir}/artsc" \
-  \
-  --with-vorbis \
-  --without-ossaudio \
-  --with-alsa \
-  --with-cdparanoia \
-  %{?with_lame:--with-lame} %{!?with_lame:--without-lame} \
-  %{?with_taglib:--with-taglib} %{!?with_taglib:--without-taglib} \
-  %{?with_akode:--with-akode} %{!?with_akode:--without-akode} \
-  --with-audiofile \
-  %{?with_musicbrainz:--with-musicbrainz} %{!?with_musicbrainz:--without-musicbrainz} \
-  --with-gstreamer \
-  --with-kscd-cdda \
-  --with-theora \
-  --with-flac \
-  %{?with_xine:--with-xine} %{!?with_xine:--without-xine}
-
-# Fix unexplained "undefined reference to `__stack_chk_fail'"
-%if 0%{?mgaversion} >= 4 || 0%{?pclinuxos}
-%__sed -i "noatun/app/Makefile" -e "/^libtdeinit_noatun_la_LDFLAGS/ s/$/ -Wl,-lc/"
-%endif
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{?buildroot} 
-%__make install DESTDIR=%{buildroot}
-
-# Disable MPEG support entirely
-%if 0%{?with_mpeg} == 0
-%__rm %{?buildroot}%{tde_bindir}/mpeglibartsplay
-%__rm %{?buildroot}%{tde_bindir}/yaf-*
-%__rm %{?buildroot}%{tde_libdir}/libarts_mpeglib*
-%__rm %{?buildroot}%{tde_libdir}/libarts_splay.*
-%__rm %{?buildroot}%{tde_libdir}/libmpeg*
-%__rm %{?buildroot}%{tde_libdir}/libyaf*
-%__rm %{?buildroot}%{tde_libdir}/mcop/MP3PlayObject.mcopclass
-%__rm %{?buildroot}%{tde_libdir}/mcop/CDDAPlayObject.mcopclass
-%__rm %{?buildroot}%{tde_libdir}/mcop/NULLPlayObject.mcopclass
-%__rm %{?buildroot}%{tde_libdir}/mcop/OGGPlayObject.mcopclass
-%__rm %{?buildroot}%{tde_libdir}/mcop/SplayPlayObject.mcopclass
-%__rm %{?buildroot}%{tde_libdir}/mcop/WAVPlayObject.mcopclass
-%endif
-
-# Copy missing icons from 'crystalsvg' theme (tdelibs)
-%__mkdir_p "%{?buildroot}%{tde_datadir}/icons/hicolor/"{16x16,22x22,32x32,48x48,64x64}"/apps/"
-pushd $RPM_BUILD_ROOT%{tde_datadir}/icons/
-for i in {16,22,32,48,64}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/media-optical-cdaudio.png hicolor/"$i"x"$i"/apps/kcmaudiocd.png; done
-popd
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file krec           AudioVideo Recorder
-%suse_update_desktop_file tdemid         AudioVideo Midi
-%suse_update_desktop_file artsbuilder    AudioVideo AudioVideoEditing
-%suse_update_desktop_file artscontrol    AudioVideo AudioVideoEditing
-%suse_update_desktop_file kmix           AudioVideo Mixer
-%suse_update_desktop_file kaboodle       AudioVideo Player
-%suse_update_desktop_file kaudiocreator  AudioVideo CD
-%suse_update_desktop_file kscd           AudioVideo Player CD
-%suse_update_desktop_file noatun         AudioVideo Player Video
-%suse_update_desktop_file juk            AudioVideo Player Jukebox
-%suse_update_desktop_file audiocd
-%endif
-
-# Links duplicate files
-%fdupes "%{?buildroot}%{tde_datadir}"
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/main/tdemultimedia/tdemultimedia-14.0.0.spec b/redhat/main/tdemultimedia/tdemultimedia-14.0.0.spec
deleted file mode 120000
index 90fb9141a..000000000
--- a/redhat/main/tdemultimedia/tdemultimedia-14.0.0.spec
+++ /dev/null
@@ -1 +0,0 @@
-tdemultimedia-14.0.0-cmake.spec
\ No newline at end of file
diff --git a/redhat/main/tdemultimedia/tdemultimedia-14.0.0-cmake.spec b/redhat/main/tdemultimedia/tdemultimedia.spec
index 086f7ec9f..263ada4e8 100644
--- a/redhat/main/tdemultimedia/tdemultimedia-14.0.0-cmake.spec
+++ b/redhat/main/tdemultimedia/tdemultimedia.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg tdemultimedia
 %define tde_prefix /opt/trinity
diff --git a/redhat/main/tdenetwork/tdenetwork-14.0.0.spec b/redhat/main/tdenetwork/tdenetwork.spec
index 28717c158..94345b490 100644
--- a/redhat/main/tdenetwork/tdenetwork-14.0.0.spec
+++ b/redhat/main/tdenetwork/tdenetwork.spec
@@ -26,7 +26,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg tdenetwork
 %define tde_prefix /opt/trinity
@@ -46,11 +46,8 @@
 # Avoids relinking, which breaks consolehelper
 %define dont_relink 1
 
-%if "%{?tde_version}" == "14.0.4"
-%define with_aim 1
-%else
+# Disable AIM support
 %define with_aim 0
-%endif
 
 Name:			trinity-%{tde_pkg}
 Summary:		Trinity Desktop Environment - Network Applications
@@ -184,7 +181,7 @@ BuildRequires:	libiw-devel
 %endif
 
 # OpenSLP support
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
+%if 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
 %define with_openslp 1
 BuildRequires: openslp-devel
 %endif
@@ -229,7 +226,7 @@ Requires:		jasper
 BuildRequires:	libacl-devel
 
 # MEANWHILE support
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?suse_version}
+%if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?fedora} >= 15 || 0%{?suse_version}
 %define with_meanwhile 1
 BuildRequires:	meanwhile-devel
 %endif
@@ -915,7 +912,9 @@ and shouldn't be run on a multi-user machine.
 %{tde_datadir}/icons/crystalsvg/*/apps/ktalkd.png
 %{tde_datadir}/icons/hicolor/*/apps/ktalkd.png
 %{tde_datadir}/sounds/ktalkd.wav
+%if 0%{?fedora} == 0 || 0%{?fedora} <= 30
 %dir %{_sysconfdir}/xinetd.d
+%endif
 %config(noreplace) %{_sysconfdir}/xinetd.d/ktalk
 %{tde_tdedocdir}/HTML/en/kcontrol/kcmtalkd
 %{tde_tdedocdir}/HTML/en/ktalkd
diff --git a/redhat/main/tdepim/tdepim-14.0.0.patch b/redhat/main/tdepim/tdepim-14.0.0.patch
deleted file mode 100644
index 0770a8af9..000000000
--- a/redhat/main/tdepim/tdepim-14.0.0.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
-index aa01c96..d27f041 100644
---- a/kmail/kmkernel.cpp
-+++ b/kmail/kmkernel.cpp
-@@ -170,17 +170,8 @@ KMKernel::KMKernel (TQObject *parent, const char *name) :
-   connectDCOPSignal( 0, 0, "kmailSelectFolder(TQString)",
-                      "selectFolder(TQString)", false );
- 
--  mNetworkManager = TDEGlobal::networkManager();
--  if (mNetworkManager) {
--    connect( mNetworkManager, TQT_SIGNAL( networkDeviceStateChanged( TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString ) ),
--        this, TQT_SLOT( slotNetworkStateChanged( TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString ) ) );
--    if (networkStateConnected()) {
--      resumeNetworkJobs();
--    }
--    else {
--      stopNetworkJobs();
--    }
--  }
-+  // Assume connected
-+  resumeNetworkJobs();
- }
- 
- KMKernel::~KMKernel ()
-@@ -2470,34 +2461,8 @@ int KMKernel::timeOfLastMessageCountChange() const
- 
- bool KMKernel::networkStateConnected()
- {
--  if (mNetworkManager) {
--    TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags networkStatus = mNetworkManager->backendStatus();
--    if ((networkStatus & TDENetworkGlobalManagerFlags::Connected)
--        || (networkStatus & TDENetworkGlobalManagerFlags::BackendUnavailable)
--        || (networkStatus == TDENetworkGlobalManagerFlags::Unknown)
--        ){
--      // Connected or no backend available
--      return true;
--    }
--    else {
--      // Not connected
--      return false;
--    }
--  }
--  else {
--    // Assume connected
--    return true;
--  }
--}
--
--void KMKernel::slotNetworkStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)
--{
--  if (networkStateConnected()) {
--    resumeNetworkJobs();
--  }
--  else {
--    stopNetworkJobs();
--  }
-+  // Assume connected
-+  return true;
- }
- 
- Wallet *KMKernel::wallet() {
-diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h
-index 0dc4644..37a3eec 100644
---- a/kmail/kmkernel.h
-+++ b/kmail/kmkernel.h
-@@ -14,8 +14,6 @@
- #include <tdeimproxy.h>
- #include <tdepimmacros.h>
- 
--#include <tdenetworkconnections.h>
--
- #include "kmailIface.h"
- #include "kmmsgbase.h"
- #include "globalsettings.h"
-@@ -436,7 +434,6 @@ public slots:
- protected slots:
-   void slotDataReq(TDEIO::Job*,TQByteArray&);
-   void slotResult(TDEIO::Job*);
--  void slotNetworkStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString);
- 
- signals:
-   void configChanged();
-@@ -527,7 +524,6 @@ private:
-   TQString     mAddMessageLastFolder;
-   KMFolder    *mAddMsgCurrentFolder;
- 
--  TDEGlobalNetworkManager *mNetworkManager;
- };
- 
- #endif
diff --git a/redhat/main/tdepim/tdepim.spec b/redhat/main/tdepim/tdepim.spec
index c5341e7c5..5a22f1ed3 100644
--- a/redhat/main/tdepim/tdepim.spec
+++ b/redhat/main/tdepim/tdepim.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg tdepim
 %define tde_prefix /opt/trinity
diff --git a/redhat/main/tdesdk/tdesdk-14.0.0.spec b/redhat/main/tdesdk/tdesdk.spec
index dac97e526..91ba8f601 100644
--- a/redhat/main/tdesdk/tdesdk-14.0.0.spec
+++ b/redhat/main/tdesdk/tdesdk.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg tdesdk
 %define tde_prefix /opt/trinity
@@ -98,7 +98,12 @@ BuildRequires:	pcre-devel
 # for kbugbuster/libkcal
 BuildRequires:	desktop-file-utils
 
+# DB5 support
+%if 0%{?rhel} >= 8
+BuildRequires:	libdb-devel
+
 # DB4 support
+%else
 %if 0%{?mgaversion} || 0%{?mdkversion}
 #BuildRequires:	%{_lib}db4.8-devel
 %endif
@@ -108,6 +113,7 @@ BuildRequires:	db4-devel
 %if 0%{?suse_version}
 BuildRequires:	libdb-4_8-devel
 %endif
+%endif
 
 # kbabel,  F-7+: flex >= 2.5.33-9
 BuildRequires:	flex
@@ -126,6 +132,13 @@ BuildRequires:	perl-podlators
 # OPENSSL support
 BuildRequires:	openssl-devel
 
+# PYTHON support
+%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30
+%define python python3
+%else
+%define python python
+%endif
+
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	%{_lib}ltdl-devel
 BuildRequires:	%{_lib}binutils-devel
@@ -454,7 +467,7 @@ This package is part of Trinity, and a component of the TDE SDK module.
 %package -n trinity-tdecachegrind-converters
 Summary:	Format converters for tdecachegrind profiling visualisation tool
 Group:		Development/Languages/Other
-Requires:	python
+Requires:	%{python}
 %if 0%{?suse_version} || 0%{?rhel} == 4
 Requires:	php
 %else
@@ -543,7 +556,7 @@ This package is part of Trinity, and a component of the TDE SDK module.
 %package scripts
 Summary:	a set of useful development scripts for Trinity
 Group:		Development/Languages/Other
-Requires:	python
+Requires:	%{python}
 
 %description scripts
 This package contains a number of scripts which can be used to help in
@@ -1007,13 +1020,13 @@ This package contains the development files for tdesdk.
 %prep
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
 
-%if 0%{?fedora} >= 30
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8
 # Fix shebangs
 sed -i "scripts/kdelnk2desktop.py" \
        "scripts/zonetab2pot.py" \
        "tdecachegrind/converters/hotshot2calltree" \
        "umbrello/umbrello/headings/heading.py" \
-    -e "s|env python|env python3|"
+    -e "s|env python|env %{python}|"
 %endif
 
 
diff --git a/redhat/main/tdetoys/tdetoys.spec b/redhat/main/tdetoys/tdetoys.spec
index dcc317623..8f58aac06 100644
--- a/redhat/main/tdetoys/tdetoys.spec
+++ b/redhat/main/tdetoys/tdetoys.spec
@@ -21,7 +21,7 @@
 
 # TDE variables
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg tdetoys
 %define tde_prefix /opt/trinity
diff --git a/redhat/main/tdeutils/tdeutils.spec b/redhat/main/tdeutils/tdeutils.spec
index 2eafa51b3..693adb10d 100644
--- a/redhat/main/tdeutils/tdeutils.spec
+++ b/redhat/main/tdeutils/tdeutils.spec
@@ -21,7 +21,7 @@
 
 # TDE variables
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg tdeutils
 %define tde_prefix /opt/trinity
diff --git a/redhat/main/tdevelop/tdevelop-14.0.0.spec b/redhat/main/tdevelop/tdevelop.spec
index e958532c8..cf2ad252e 100644
--- a/redhat/main/tdevelop/tdevelop-14.0.0.spec
+++ b/redhat/main/tdevelop/tdevelop.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg tdevelop
 %define tde_prefix /opt/trinity
@@ -108,10 +108,16 @@ BuildRequires:	gamin-devel
 # PCRE support
 BuildRequires:	pcre-devel
 
+# DB5 support
+%if 0%{?rhel} >= 8
+BuildRequires:	libdb-devel
+
+%else
 # DB4 support
 %if 0%{?rhel} || 0%{?fedora}
 BuildRequires:	db4-devel
 %endif
+%endif
 
 # FLEX support
 BuildRequires:	flex
diff --git a/redhat/main/tdewebdev/tdewebdev-14.0.0.spec b/redhat/main/tdewebdev/tdewebdev.spec
index 4ddcde0b9..b48ab894d 100644
--- a/redhat/main/tdewebdev/tdewebdev-14.0.0.spec
+++ b/redhat/main/tdewebdev/tdewebdev.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg tdewebdev
 %define tde_prefix /opt/trinity