RPM: updates for future 14.0.9 release

30 files changed, 669 insertions, 275 deletions

diff --git a/redhat/Makefile b/redhat/Makefile
index 5b4d90654..70e485959 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -27,7 +27,7 @@ all:	dependencies main libraries applications i18n meta
 dependencies:	tqt3 tqtinterface akode arts libart_lgpl libcaldav libcarddav sip4-tqt tqca tqca-tls avahi-tqt dbus-tqt dbus-1-tqt
 main:	tdelibs tdebase tdeaccessibility tdeadmin tdegames tdemultimedia tdepim tdetoys tdevelop tdeaddons tdeartwork tdebindings tdeedu tdegraphics tdenetwork tdesdk tdeutils tdewebdev
 libraries:	kipi-plugins libkdcraw libkexiv2 libkipi libksquirrel libtdeldap libtqt-perl pytdeextensions python-trinity
-applications:	abakus amarok basket bibletime codeine digikam dolphin filelight gtk3-tqt-engine gtk-qt-engine gwenview k3b k9copy kaffeine kaffeine-mozilla kasablanca katapult kbarcode kbfx kbibtex kbiff kbookreader kchmviewer kcmautostart kcmldap kcmldapcontroller kcmldapmanager kcpuload kdbg kdbusnotification kdiff3 kdirstat keep kerberostray keximdb kftpgrabber kile kima kiosktool kkbswitch klcddimmer kmplayer kmyfirewall kmymoney knemo knetload knetstats knetworkmanager8 knights knmap knowit knutclient koffice konversation kooldock kopete-otr kpicosim kpilot krecipes krename krusader kscope ksensors kshowmail kshutdown ksplash-engine-moodin ksquirrel kstreamripper ksystemlog ktechlab ktorrent kvirc kvkbd kvpnc kxmleditor mathemagics mplayerthumbs piklab potracegui qt4-tqt-theme-engine rosegarden smartcardauth smb4k soundkonverter tde-guidance tdeio-apt tdeio-ftps tastymenu tdeio-locate tdeio-sword tdeio-umountwrapper tdenetworkmanager tdepowersave tderadio tde-style-baghira tde-style-domino tde-style-ia-ora tde-style-lipstik tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico tork twin-style-crystal wlassistant yakuake
+applications:	abakus amarok basket bibletime codeine digikam dolphin filelight gtk3-tqt-engine gtk-qt-engine gwenview k3b k9copy kaffeine kaffeine-mozilla kasablanca katapult kbarcode kbfx kbibtex kbiff kbookreader kchmviewer kcmautostart kcmldap kcmldapcontroller kcmldapmanager kcpuload kdbg kdbusnotification kdiff3 kdirstat keep kerberostray keximdb kftpgrabber kile kima kiosktool kkbswitch klcddimmer kmplayer kmyfirewall kmymoney knemo knetload knetstats knetworkmanager8 knights knmap knowit knutclient koffice konversation kooldock kopete-otr kpicosim kpilot krecipes krename krusader kscope ksensors kshowmail kshutdown ksplash-engine-moodin ksquirrel kstreamripper ksystemlog ktechlab ktorrent kvirc kvkbd kvpnc kxmleditor mathemagics mplayerthumbs piklab potracegui qt4-tqt-theme-engine rosegarden smartcardauth smb4k soundkonverter tde-guidance tdeio-apt tdeio-ftps tastymenu tdedocker tdeio-locate tdeio-sword tdeio-umountwrapper tdenetworkmanager tdepacman tdepowersave tderadio tde-style-baghira tde-style-domino tde-style-ia-ora tde-style-lipstik tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico tork twin-style-crystal wlassistant yakuake
 i18n:	gwenview-i18n k3b-i18n koffice-i18n tde-i18n
 extras:	icons-crystalsvg-updated icons-kfaenza icons-nuvola icons-oxygen kdevmon kdissert klibido kmpose koverartist kpacman png2qrgb
 
@@ -106,7 +106,7 @@ tdegames:	tdebase tdemultimedia
 tdegraphics:	tdebase lcms
 	$(call buildpkg,main/tdegraphics)
 
-tdelibs:	tqt3 tqtinterface arts dbus-tqt dbus-1-tqt avahi-tqt fileshareset trinity-filesystem libart_lgpl
+tdelibs:	brp-check-trinity tqt3 tqtinterface arts dbus-tqt dbus-1-tqt avahi-tqt fileshareset trinity-filesystem libart_lgpl
 	$(call buildpkg,main/tdelibs)
 
 tdemultimedia:	tdebase akode
@@ -134,6 +134,11 @@ tdewebdev:	tdebase tdesdk
 	$(call buildpkg,main/tdewebdev)
 
 ### 3rd party libraries and tools
+brp-check-trinity:
+ifneq (,$(filter $(DIST), .oss151 .oss152 .osstw ))
+	$(call buildpkg,3rdparty/brp-check-trinity)
+endif
+
 esound:
 ifneq (,$(filter $(DIST), .el8 .mga6 .mga7 .oss151 .oss152 .osstw ))
 	$(call buildpkg,3rdparty/esound)
@@ -233,7 +238,7 @@ bibletime:	tdebase
 	$(call buildpkg,applications/bibletime)
 
 codeine:	tdebase
-#	$(call buildpkg,applications/codeine)
+	$(call buildpkg,applications/codeine)
 
 compizconfig-backend-kconfig:	tdebase
 	$(call buildpkg,applications/compizconfig-backend-kconfig)
@@ -340,7 +345,7 @@ kerberostray:	tdebase
 	$(call buildpkg,applications/kerberostray)
 
 keximdb:	tdebase
-#	$(call buildpkg,applications/keximdb)
+	$(call buildpkg,applications/keximdb)
 
 kftpgrabber:	tdebase
 	$(call buildpkg,applications/kftpgrabber)
@@ -382,7 +387,6 @@ knetstats:	tdebase
 	$(call buildpkg,applications/knetstats)
 
 knetworkmanager8:	tdebase
-# RHEL6 only
 ifneq (,$(filter $(DIST),.el6))
 	$(call buildpkg,applications/knetworkmanager8)
 endif
@@ -406,7 +410,7 @@ konversation:	tdebase
 	$(call buildpkg,applications/konversation)
 
 kooldock:	tdebase
-#	$(call buildpkg,applications/kooldock)
+	$(call buildpkg,applications/kooldock)
 
 kopete-otr:	tdebase tdenetwork
 	$(call buildpkg,applications/kopete-otr)
@@ -469,10 +473,10 @@ kvpnc:	tdebase
 	$(call buildpkg,applications/kvpnc)
 
 kxmleditor:	tdebase
-#	$(call buildpkg,applications/kxmleditor)
+	$(call buildpkg,applications/kxmleditor)
 
 mathemagics: tdebase
-#	$(call buildpkg,applications/mathemagics)
+	$(call buildpkg,applications/mathemagics)
 
 mplayerthumbs:	tdebase
 	$(call buildpkg,applications/mplayerthumbs)
@@ -503,7 +507,10 @@ soundkonverter:	tdebase
 	$(call buildpkg,applications/soundkonverter)
 
 tastymenu:
-#	$(call buildpkg,applications/tastymenu)
+	$(call buildpkg,applications/tastymenu)
+
+tdedocker:	tdebase
+#	$(call buildpkg,applications/tdedocker)
 
 tde-guidance:	tdebase pytdeextensions
 	$(call buildpkg,applications/tde-guidance)
@@ -528,6 +535,9 @@ ifeq (,$(filter $(DIST),.el6))
 	$(call buildpkg,applications/tdenetworkmanager)
 endif
 
+tdepacman:	tdebase
+	$(call buildpkg,applications/tdepacman)
+
 tdepowersave:	tdebase
 	$(call buildpkg,applications/tdepowersave)
 
@@ -535,13 +545,13 @@ tderadio:	tdebase
 	$(call buildpkg,applications/tderadio)
 
 tde-style-baghira:	tdebase
-#	$(call buildpkg,applications/tde-style-baghira)
+	$(call buildpkg,applications/tde-style-baghira)
 
 tde-style-domino:	tdebase
-#	$(call buildpkg,applications/tde-style-domino)
+	$(call buildpkg,applications/tde-style-domino)
 
 tde-style-ia-ora:	tdebase
-#	$(call buildpkg,applications/tde-style-ia-ora)
+	$(call buildpkg,applications/tde-style-ia-ora)
 
 tde-style-lipstik:	tdebase
 	$(call buildpkg,applications/tde-style-lipstik)
diff --git a/redhat/applications/abakus/abakus.spec b/redhat/applications/abakus/abakus.spec
index bb53dd562..5c5b38497 100644
--- a/redhat/applications/abakus/abakus.spec
+++ b/redhat/applications/abakus/abakus.spec
@@ -140,6 +140,11 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %find_lang %{tde_pkg}
 
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/abakus.desktop" Utility Calculator
+%endif
+
 
 %clean
 %__rm -rf %{buildroot}
diff --git a/redhat/applications/codeine/codeine.spec b/redhat/applications/codeine/codeine.spec
new file mode 100644
index 000000000..fbccf6421
--- /dev/null
+++ b/redhat/applications/codeine/codeine.spec
@@ -0,0 +1,165 @@
+#
+# spec file for package kaffeine (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.8
+%endif
+%define tde_pkg codeine
+%define tde_prefix /opt/trinity
+%define tde_appdir %{tde_datadir}/applications
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
+%define tde_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:			trinity-%{tde_pkg}
+Epoch:			%{tde_epoch}
+Version:		1.0.1
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:		Simple TDE video player
+Group:			Applications/Multimedia
+URL:			http://kaffeine.sourceforge.net/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:			%{_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	gettext
+
+BuildRequires:	cmake
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+
+# 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
+
+# XINE support
+%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version}
+%define with_xine 1
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
+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
+
+
+%description
+A video player with a different philosophy: simple, uncluttered interface
+
+Features:
+- Plays DVDs, VCDs, all video formats supported by Xine
+- Bundled with a simple web-page KPart
+- Starts quickly
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -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} \
+  -DBUILD_ALL=ON \
+  ..
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root,-)
+%doc COPYING FAQ README TODO
+%{tde_bindir}/codeine
+%{tde_tdeappdir}/codeine.desktop
+%{tde_datadir}/apps/codeine/
+%{tde_datadir}/apps/konqueror/servicemenus/codeine_play_dvd.desktop
+%{tde_tdedocdir}/HTML/en/codeine/
+%{tde_datadir}/icons/hicolor/*/apps/codeine.png
+%{tde_mandir}/man1/codeine.1*
+%{tde_datadir}/services/codeine_part.desktop
+%{tde_tdelibdir}/libcodeine.la
+%{tde_tdelibdir}/libcodeine.so
+
+
+%changelog
diff --git a/redhat/applications/kdiff3/kdiff3.spec b/redhat/applications/kdiff3/kdiff3.spec
index 5251ba96e..bc35e2e2d 100644
--- a/redhat/applications/kdiff3/kdiff3.spec
+++ b/redhat/applications/kdiff3/kdiff3.spec
@@ -142,6 +142,11 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot} -C build
 
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/kdiff3.desktop" Development RevisionControl
+%endif
+
 # Unwanted files
 # These are not HTML files but weird files in wrong place ??
 %__rm -rf %{?buildroot}%{tde_tdedocdir}/HTML/kdiff3/
diff --git a/redhat/applications/knights/knights.spec b/redhat/applications/knights/knights.spec
index ad7bf843e..e65f7e49a 100644
--- a/redhat/applications/knights/knights.spec
+++ b/redhat/applications/knights/knights.spec
@@ -164,6 +164,11 @@ if [ -d "%{?buildroot}%{tde_datadir}/applnk" ]; then
   %__rm -r "%{buildroot}%{tde_datadir}/applnk"
 fi
 
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/knights.desktop" Game BoardGame
+%endif
+
 
 %clean
 %__rm -rf %{buildroot}
diff --git a/redhat/applications/kpicosim/kpicosim.spec b/redhat/applications/kpicosim/kpicosim.spec
index 5f67d98d5..8b7936c8e 100644
--- a/redhat/applications/kpicosim/kpicosim.spec
+++ b/redhat/applications/kpicosim/kpicosim.spec
@@ -147,6 +147,12 @@ if [ -d "%{buildroot}%{tde_datadir}/applnk" ]; then
 fi
 
 
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -D kpicosim -C "%summary" kpicosim Development IDE
+%endif
+
+
 %clean
 %__rm -rf %{buildroot}
 
diff --git a/redhat/applications/kshutdown/kshutdown.spec b/redhat/applications/kshutdown/kshutdown.spec
index a11d42ec3..ba6d44fb4 100644
--- a/redhat/applications/kshutdown/kshutdown.spec
+++ b/redhat/applications/kshutdown/kshutdown.spec
@@ -152,7 +152,7 @@ fi
 
 # Updates applications categories for openSUSE
 %if 0%{?suse_version}
-echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_datadir}/applications/kshutdown.desktop"
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kshutdown.desktop"
 %suse_update_desktop_file %{tde_pkg} Utility DesktopUtility
 %endif
 
@@ -168,7 +168,6 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_datadir}/applications/kshutdown.des
 %{tde_tdelibdir}/kshutdownlockout_panelapplet.la
 %{tde_tdelibdir}/kshutdownlockout_panelapplet.so
 %{tde_tdeappdir}/kshutdown.desktop
-%{tde_datadir}/applications/kshutdown.desktop
 %{tde_datadir}/apps/kicker/applets/kshutdownlockout.desktop
 %{tde_datadir}/apps/kshutdown/
 %{tde_datadir}/apps/tdeconf_update/kshutdown.upd
diff --git a/redhat/applications/kxmleditor/kxmleditor.spec b/redhat/applications/kxmleditor/kxmleditor.spec
index c77d964ab..8a5b09b80 100644
--- a/redhat/applications/kxmleditor/kxmleditor.spec
+++ b/redhat/applications/kxmleditor/kxmleditor.spec
@@ -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
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -98,43 +98,36 @@ contents.
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-# Fix build on r14.0.x
-%__sed -i *"/Makefile.am" -e "s|\$(LIB_TQT)|-ltqt-mt|"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
 
 %build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -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
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  -DDATA_INSTALL_DIR=%{tde_datadir}/apps \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DBUILD_ALL=ON \
+  ..
 
-%__make %{?_smp_mflags} || %__make
+%__make %{?_smp_mflags}
 
 
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
 
 %find_lang %{tde_pkg}
 
@@ -155,16 +148,17 @@ export PATH="%{tde_bindir}:${PATH}"
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
 %{tde_bindir}/kxmleditor
-%{tde_tdelibdir}/libkxmleditorpart.la
-%{tde_tdelibdir}/libkxmleditorpart.so
-%{tde_tdelibdir}/libkxmleditorpart.so.1
-%{tde_tdelibdir}/libkxmleditorpart.so.1.0.0
+%{tde_libdir}/libkxmleditorpart.la
+%{tde_libdir}/libkxmleditorpart.so
+%{tde_libdir}/libkxmleditorpart.so.1
+%{tde_libdir}/libkxmleditorpart.so.1.0.0
 %{tde_tdeappdir}/kxmleditor.desktop
 %{tde_datadir}/apps/kxmleditor/
 %{tde_tdedocdir}/HTML/en/kxmleditor/
 %{tde_datadir}/icons/hicolor/*/apps/kxmleditor.png
 %{tde_datadir}/icons/locolor/*/apps/kxmleditor.png
 %{tde_datadir}/services/kxmleditorpart.desktop
+%{tde_mandir}/man1/kxmleditor.1*
 
 
 %post
diff --git a/redhat/applications/mathemagics/mathemagics.spec b/redhat/applications/mathemagics/mathemagics.spec
new file mode 100644
index 000000000..92904c6f7
--- /dev/null
+++ b/redhat/applications/mathemagics/mathemagics.spec
@@ -0,0 +1,130 @@
+#
+# spec file for package mathemagics (version R14.0.0)
+#
+# 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.0
+%endif
+%define tde_pkg mathemagics
+%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_mandir %{tde_datadir}/man
+%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:		Mathemagics is a RPN Calculator.
+Version:		1.1
+Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+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:			%{_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:	cmake
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	libtool
+
+
+%description
+Mathemagics is a RPN Calculator.
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -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} \
+  -DDATA_INSTALL_DIR=%{tde_datadir}/apps \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DBUILD_ALL=ON \
+  ..
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+
+%clean
+%__rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING README
+%{tde_bindir}/mathemagics
+%{tde_tdeappdir}/mathemagics.desktop
+%{tde_datadir}/apps/mathemagics/mathemagicsui.rc
+%{tde_datadir}/icons/hicolor/22x22/apps/mathemagics.png
+%{tde_datadir}/icons/hicolor/32x32/apps/mathemagics.png
+%{tde_datadir}/icons/hicolor/48x48/apps/mathemagics.png
+%{tde_datadir}/icons/locolor/16x16/apps/mathemagics.png
+%{tde_datadir}/icons/locolor/32x32/apps/mathemagics.png
+%{tde_tdedocdir}/HTML/en/mathemagics/
+%{tde_mandir}/man1/mathemagics.1*
+
+
+%changelog
diff --git a/redhat/applications/tde-style-baghira/tde-style-baghira.spec b/redhat/applications/tde-style-baghira/tde-style-baghira.spec
index 064270e53..5dec19d4e 100644
--- a/redhat/applications/tde-style-baghira/tde-style-baghira.spec
+++ b/redhat/applications/tde-style-baghira/tde-style-baghira.spec
@@ -62,7 +62,7 @@ Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 BuildRequires:          trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:          trinity-tdebase-devel >= %{tde_version}
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	cmake
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -90,42 +90,36 @@ Panther and Jaguar looks, and also includes its own 'Baghira' look
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-# Fix build on r14.0.x
-%__sed -i *"/Makefile.am" -e "s|\$(LIB_TQT)|-ltqt-mt|"
-%__sed -i "configure.in.in" -e "/^KDE_USE_TQT/d"
-
-%__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} \
+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
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  -DDATA_INSTALL_DIR=%{tde_datadir}/apps \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DBUILD_ALL=ON \
+  ..
 
 %__make %{?_smp_mflags}
 
 
 %install
-%__rm -rf $RPM_BUILD_ROOT
-%__make install DESTDIR=$RPM_BUILD_ROOT
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
 
 
 %clean
@@ -150,9 +144,8 @@ export PATH="%{tde_bindir}:${PATH}"
 %{tde_libdir}/usermanager_panelapplet.la
 %{tde_libdir}/usermanager_panelapplet.so
 %{tde_datadir}/apps/baghira/
-%{tde_datadir}/apps/kicker/applets/b_menuapplet.desktop
-%{tde_datadir}/apps/kicker/applets/starter.desktop
-%{tde_datadir}/apps/kicker/applets/usermanager.desktop
+%{tde_datadir}/apps/kicker/applets/baghira-starter.desktop
+%{tde_datadir}/apps/kicker/applets/baghira-usermanager.desktop
 %{tde_datadir}/apps/tdedisplay/color-schemes/AquaBlue.kcsrc
 %{tde_datadir}/apps/tdedisplay/color-schemes/AquaGraphite.kcsrc
 %{tde_datadir}/apps/tdestyle/themes/baghira.themerc
@@ -195,6 +188,8 @@ export PATH="%{tde_bindir}:${PATH}"
 %{tde_datadir}/icons/crystalsvg/64x64/apps/baghira_grey.png
 %{tde_datadir}/icons/crystalsvg/64x64/apps/baghira_white.png
 %{tde_datadir}/icons/crystalsvg/64x64/apps/baghira_yellow.png
+%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/baghira-starter.mo
+%{tde_mandir}/man1/bab.1*
 
 
 %changelog
diff --git a/redhat/applications/tde-style-domino/tde-style-domino.spec b/redhat/applications/tde-style-domino/tde-style-domino.spec
index bac069fc2..27eb73e00 100644
--- a/redhat/applications/tde-style-domino/tde-style-domino.spec
+++ b/redhat/applications/tde-style-domino/tde-style-domino.spec
@@ -62,7 +62,7 @@ Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 BuildRequires:          trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:          trinity-tdebase-devel >= %{tde_version}
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	cmake
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -86,38 +86,36 @@ of the widgets by customizable color gradients.
 %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} \
+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
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  -DDATA_INSTALL_DIR=%{tde_datadir}/apps \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DBUILD_ALL=ON \
+  ..
 
 %__make %{?_smp_mflags}
 
 
 %install
-%__rm -rf $RPM_BUILD_ROOT
-%__make install DESTDIR=$RPM_BUILD_ROOT
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
 
 
 %clean
@@ -137,6 +135,7 @@ export PATH="%{tde_bindir}:${PATH}"
 %{tde_datadir}/apps/tdedisplay/color-schemes/Domino.kcsrc
 %{tde_datadir}/apps/tdestyle/themes/domino.themerc
 %{tde_datadir}/apps/twin/domino.desktop
+%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/tdestyle_domino_config.mo
 
 
 %changelog
diff --git a/redhat/applications/tdepacman/tdepacman.spec b/redhat/applications/tdepacman/tdepacman.spec
new file mode 100644
index 000000000..3046e74f4
--- /dev/null
+++ b/redhat/applications/tdepacman/tdepacman.spec
@@ -0,0 +1,144 @@
+#
+# spec file for package tdepacman (version R14)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# Default version for this component
+%define tde_pkg tdepacman
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.9
+%endif
+
+# TDE specific building variables
+%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
+%define tde_datadir %{tde_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_docdir}
+
+
+Name:			trinity-%{tde_pkg}
+Summary:		A pacman game for the Trinity Desktop.
+Version:		0.3.2
+Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+
+License:		GPLv2+
+Group:			Applications/Utilities
+
+Vendor:			Trinity Project
+Packager:		Francois Andriot <francois.andriot@free.fr>
+URL:			http://www.trinitydesktop.org/
+
+Prefix:			%{_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires:	trinity-arts-devel >= 1:1.5.10
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	trinity-libtdegames-devel >= %{tde_version}
+
+BuildRequires:	gettext
+
+BuildRequires:	cmake
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	libtool
+
+
+%description
+Pacman is a legendary game with an enthusiastic following from around 
+the world. Since its introduction in 1980, Pacman's image has been 
+splashed across magazine covers, television screens, T-shirts, and 
+bumper stickers. Created by Japan's Namco, and distributed in the 
+United States by Bally, Pacman is an icon of 1980's popular culture
+
+%if 0%{?suse_version} || 0%{?pclinuxos}
+%debug_package
+%endif
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -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} \
+  -DDATA_INSTALL_DIR=%{tde_datadir}/apps \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DBUILD_ALL=ON \
+  ..
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+%find_lang %{tde_pkg}
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING README TODO
+%{tde_bindir}/tdepacman
+%{tde_tdeappdir}/tdepacman.desktop
+%{tde_datadir}/apps/tdepacman/   
+%{tde_datadir}/config/tdepacmanrc
+%lang(de) %{tde_tdedocdir}/HTML/de/tdepacman/
+%{tde_tdedocdir}/HTML/en/tdepacman/
+%{tde_datadir}/icons/hicolor/16x16/apps/tdepacman.png
+%{tde_datadir}/icons/hicolor/32x32/apps/tdepacman.png
+%{tde_datadir}/icons/locolor/16x16/apps/tdepacman.png
+%{tde_datadir}/icons/locolor/32x32/apps/tdepacman.png
+%{tde_mandir}/man1/tdepacman.1*
+
+
+%changelog
diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh
index 75c377d4e..d0945f13b 100755
--- a/redhat/build/get_rpm_package_name.sh
+++ b/redhat/build/get_rpm_package_name.sh
@@ -24,7 +24,7 @@ case "${PKGNAME}" in
   # 3rd party dependencies
   "cscope"|"dirmngr"|"esound"|"exempi"|"exiv2"|"file"|"fileshareset"|"gmime"|"hk_classes"|"intltool"|"lcms"|"libbeagle"|"mp4v2"|"python-qt3"|"rdesktop"|"recode"|"rdiff-backup"|"sword"|"tar") PREFIX="";;
   # Extra build stuff
-  "autoconf"|"automake"|"cmake"|"gnuchess"|"htdig"|"imlib1"|"libconfig"|"libotr3"|"libr"|"libtool2"|"lilypond"|"m4"|"mftrace"|"pan"|"pcsc-perl"|"torsocks"|"wv2"|"yaz") PREFIX="";;
+  "autoconf"|"automake"|"brp-check-trinity"|"cmake"|"gnuchess"|"htdig"|"imlib1"|"libconfig"|"libotr3"|"libr"|"libtool2"|"lilypond"|"m4"|"mftrace"|"pan"|"pcsc-perl"|"torsocks"|"wv2"|"yaz") PREFIX="";;
   # Other
   "curl") PREFIX="trinity-lib";;
   # Default case: add prefix
diff --git a/redhat/docker/el6/Dockerfile.x86_64 b/redhat/docker/el6/Dockerfile.x86_64
index c133b4122..3836529c2 100644
--- a/redhat/docker/el6/Dockerfile.x86_64
+++ b/redhat/docker/el6/Dockerfile.x86_64
@@ -4,23 +4,20 @@ ARG TDE_VERSION=14.0.8
 ARG ARCH=x86_64
 
 # Enable proxy
-RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf"
-
 # Add EPEL repository
 # Add RPMFUSION repository
-RUN rpm -Uvh \
-  https://fr2.rpmfind.net/linux/epel/6/x86_64/Packages/e/epel-release-6-8.noarch.rpm \
-  https://download1.rpmfusion.org/free/el/rpmfusion-free-release-6.noarch.rpm
-
 # Install Trinity build dependencies
-ADD packages /packages
-RUN yum -y clean all \
+COPY packages /packages
+RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf" \
+ && yum -y clean all \
  && yum -y update \
+ && yum -y install epel-release \
+ && rpm -Uvh https://download1.rpmfusion.org/free/el/rpmfusion-free-release-6.noarch.rpm \
  && yum -y install $(</packages)
 
 # Add YUM repository for locally built packages
 WORKDIR /etc/yum.repos.d
-ADD rpmbuild.repo rpmbuild.repo
+COPY rpmbuild.repo rpmbuild.repo
 RUN sed -i "rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
 
 # Fix utempter detection
@@ -34,7 +31,7 @@ RUN useradd -m -s /bin/bash -u 1000 trinity \
  && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers"
 
 USER trinity
-ADD rpmmacros /home/trinity/.rpmmacros
+COPY rpmmacros /home/trinity/.rpmmacros
 
 # Build supplementary development tools
 
diff --git a/redhat/docker/el6/packages b/redhat/docker/el6/packages
index 2b9fa4b07..beeba9fff 100644
--- a/redhat/docker/el6/packages
+++ b/redhat/docker/el6/packages
@@ -29,7 +29,7 @@ db4-devel
 dbus-glib-devel
 djvulibre
 djvulibre-devel
-docbook2x
+docbook2X
 doxygen
 e2fsprogs-devel
 emacs
@@ -224,6 +224,7 @@ wireless-tools-devel
 xine-lib-devel
 xmlto
 xorg-x11-font-utils
+xorg-x11-server-utils
 xscreensaver
 xscreensaver-extras
 xulrunner-devel
diff --git a/redhat/docker/el7/Dockerfile.x86_64 b/redhat/docker/el7/Dockerfile.x86_64
index 7693ded63..5d1a2e4cd 100644
--- a/redhat/docker/el7/Dockerfile.x86_64
+++ b/redhat/docker/el7/Dockerfile.x86_64
@@ -4,23 +4,20 @@ ARG TDE_VERSION=14.0.8
 ARG ARCH=x86_64
 
 # Enable proxy
-RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf"
-
 # Add EPEL repository
 # Add RPMFUSION repository
-RUN rpm -Uvh \
-  https://fr2.rpmfind.net/linux/epel/7/x86_64/Packages/e/epel-release-7-12.noarch.rpm \
-  https://download1.rpmfusion.org/free/el/rpmfusion-free-release-7.noarch.rpm
-
 # Install Trinity build dependencies
-ADD packages /packages
-RUN yum -y clean all \
+COPY packages /packages
+RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf" \
+ && yum -y install epel-release \
+ && rpm -Uvh https://download1.rpmfusion.org/free/el/rpmfusion-free-release-7.noarch.rpm \
+ && yum -y clean all \
  && yum -y update \
  && yum -y install $(</packages)
 
 # Add YUM repository for locally built packages
 WORKDIR /etc/yum.repos.d
-ADD rpmbuild.repo rpmbuild.repo
+COPY rpmbuild.repo rpmbuild.repo
 RUN sed -i "rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
 
 # Fix utempter detection
@@ -34,7 +31,7 @@ RUN useradd -m -s /bin/bash -u 1000 trinity \
  && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers"
 
 USER trinity
-ADD rpmmacros /home/trinity/.rpmmacros
+COPY rpmmacros /home/trinity/.rpmmacros
 
 # Build supplementary development tools
 
diff --git a/redhat/docker/el7/packages b/redhat/docker/el7/packages
index efc202d44..7368877e2 100644
--- a/redhat/docker/el7/packages
+++ b/redhat/docker/el7/packages
@@ -174,6 +174,7 @@ pkcs11-helper-devel
 pkgconfig(pygtk-2.0)
 poppler-devel
 postgresql-devel
+ppp
 pth-devel
 pulseaudio-libs-devel
 qt-devel
diff --git a/redhat/docker/el8/Dockerfile.x86_64 b/redhat/docker/el8/Dockerfile.x86_64
index 11d0bc58e..43f6b7191 100644
--- a/redhat/docker/el8/Dockerfile.x86_64
+++ b/redhat/docker/el8/Dockerfile.x86_64
@@ -3,31 +3,29 @@ FROM centos:8
 ARG TDE_VERSION=14.0.8
 ARG ARCH=x86_64
 
-# Enable proxy
-RUN echo "proxy=http://proxy:3128" >>"/etc/dnf/dnf.conf"
+# Enable custom repository
+COPY centos-devel.repo /etc/yum.repos.d/centos-devel.repo
 
+# Enable proxy
 # Install OVL plugin for DNF
 # Update distribution packages
 # Add EPEL repository
 # Add RPMFUSION repository
 # Enable supplementary repositories
-RUN curl -o /usr/lib/python3.6/site-packages/dnf-plugins/ovl.py https://raw.githubusercontent.com/FlorianLudwig/dnf-plugin-ovl/master/ovl.py \
+# Install Trinity build dependencies
+COPY packages /packages
+RUN echo "proxy=http://proxy:3128" >>"/etc/dnf/dnf.conf" \
+ && curl -o /usr/lib/python3.6/site-packages/dnf-plugins/ovl.py https://raw.githubusercontent.com/FlorianLudwig/dnf-plugin-ovl/master/ovl.py \
  && dnf -y update \
  && dnf -y install epel-release \
  && dnf -y install https://download1.rpmfusion.org/free/el/updates/8/x86_64/r/rpmfusion-free-release-8-0.1.noarch.rpm \
  && dnf -y install dnf-plugins-core \
- && dnf config-manager --enable PowerTools
-
-# Enable custom repository
-ADD centos-devel.repo /etc/yum.repos.d/centos-devel.repo
-
-# Install Trinity build dependencies
-ADD packages /packages
-RUN dnf -y --enableplugin=ovl install $(</packages)
+ && dnf config-manager --enable PowerTools \
+ && dnf -y --enableplugin=ovl install $(</packages)
 
 # Add YUM repository for locally built packages
 WORKDIR /etc/yum.repos.d
-ADD rpmbuild.repo rpmbuild.repo
+COPY rpmbuild.repo rpmbuild.repo
 RUN sed -i "rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
 
 # Fix utempter detection
@@ -38,13 +36,10 @@ RUN useradd -m -s /bin/bash -u 1000 trinity \
  && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers"
 
 USER trinity
-ADD rpmmacros /home/trinity/.rpmmacros
+COPY rpmmacros /home/trinity/.rpmmacros
 
 # Build supplementary development tools
 
-RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/l/libxml%2b%2b-2.40.1-8.fc30.src.rpm \
- && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libxml++{,-devel}-2*.rpm
-
 RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/l/libofx-0.9.13-2.fc30.src.rpm \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libofx{,-devel}-0*.rpm
 
@@ -57,7 +52,7 @@ RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux
 RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/pylibacl-0.5.2-11.fc30.src.rpm \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pylibacl-0*.rpm --nodeps
 
-RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/pyxattr-0.5.6-3.fc30.src.rpm \
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/pyxattr-0.5.6-3.fc30.src.rpm --nocheck \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/python2-pyxattr-0*.rpm --nodeps
 
 RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/r/rdiff-backup-1.2.8-31.fc30.src.rpm \
@@ -87,9 +82,7 @@ RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux
 RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/r/rdesktop-1.8.4-3.fc30.src.rpm \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdesktop-1*.rpm
 
-RUN cd ${HOME}/rpmbuild/RPMS \
- && wget http://rpms.remirepo.net/enterprise/8/remi/x86_64/hiredis-0.13.3-9.el8.remi.x86_64.rpm http://rpms.remirepo.net/enterprise/8/remi/x86_64/libyaz{,-devel}-5.14.11-14.el8.remi.x86_64.rpm \
- && sudo rpm -Uvh hiredis-0.13.3-9.el8.remi.x86_64.rpm libyaz{,-devel}-5.14.11-14.el8.remi.x86_64.rpm
+RUN sudo rpm -Uvh http://rpms.remirepo.net/enterprise/8/remi/x86_64/hiredis-0.13.3-9.el8.remi.x86_64.rpm http://rpms.remirepo.net/enterprise/8/remi/x86_64/libyaz{,-devel}-5.14.11-14.el8.remi.x86_64.rpm
 
 RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/perl-PAR-1.015-8.fc30.src.rpm \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm
@@ -100,5 +93,5 @@ RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux
 RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/perl-Getopt-ArgvFile-1.11-28.fc30.src.rpm \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Getopt-ArgvFile-1*.rpm
 
-RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/perl-PAR-Packer-1.047-4.fc30.src.rpm \
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/perl-PAR-Packer-1.047-4.fc30.src.rpm --nocheck \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm
diff --git a/redhat/docker/el8/packages b/redhat/docker/el8/packages
index 7eafa7d52..a9018237e 100644
--- a/redhat/docker/el8/packages
+++ b/redhat/docker/el8/packages
@@ -121,6 +121,7 @@ libXcomposite-devel
 libXdamage-devel
 libXdmcp-devel
 libxkbfile-devel
+libxml++-devel
 libXScrnSaver-devel
 libxslt-devel
 libXtst-devel
@@ -165,6 +166,7 @@ poppler-devel
 postgresql
 postgresql-devel
 postgresql-server-devel
+ppp
 pulseaudio-libs-devel
 python2
 python2-devel
@@ -195,6 +197,7 @@ transfig
 unixODBC-devel
 usbutils
 valgrind
+wget
 wireless-tools-devel
 xine-lib-devel
 xmlto
diff --git a/redhat/docker/mga6/packages.i686 b/redhat/docker/mga6/packages.i686
index 3e88f77a7..24079d712 100644
--- a/redhat/docker/mga6/packages.i686
+++ b/redhat/docker/mga6/packages.i686
@@ -56,6 +56,7 @@ gtk+3.0-devel
 gtk-doc
 hspell-devel
 hunspell-en
+iceauth
 ImageMagick-devel
 imake
 imlib2-devel
@@ -194,6 +195,7 @@ openldap-servers-devel
 opensc
 openslp-devel
 opensp-devel
+openssh-clients
 optipng
 pam-devel
 pciutils-devel
@@ -212,6 +214,7 @@ pkgconfig(pygtk-2.0)
 polkit-agent-none
 postgresql9.4
 postgresql9.4-devel
+ppp
 pth-devel
 python-devel
 python-sip
@@ -226,6 +229,7 @@ SDL-devel
 speex-devel
 sqlite3-devel
 sqlite-devel
+sshfs-fuse
 subversion-devel
 sudo
 sword-devel
diff --git a/redhat/docker/mga6/packages.x86_64 b/redhat/docker/mga6/packages.x86_64
index f77944bae..edf18316c 100644
--- a/redhat/docker/mga6/packages.x86_64
+++ b/redhat/docker/mga6/packages.x86_64
@@ -56,6 +56,7 @@ gtk+3.0-devel
 gtk-doc
 hspell-devel
 hunspell-en
+iceauth
 ImageMagick-devel
 imake
 imlib2-devel
@@ -194,6 +195,7 @@ openldap-servers-devel
 opensc
 openslp-devel
 opensp-devel
+openssh-clients
 optipng
 pam-devel
 pciutils-devel
@@ -212,6 +214,7 @@ pkgconfig(pygtk-2.0)
 polkit-agent-none
 postgresql9.4
 postgresql9.4-devel
+ppp
 pth-devel
 python-devel
 python-sip
@@ -226,6 +229,7 @@ SDL-devel
 speex-devel
 sqlite3-devel
 sqlite-devel
+sshfs-fuse
 subversion-devel
 sudo
 sword-devel
diff --git a/redhat/docker/mga7/packages.i686 b/redhat/docker/mga7/packages.i686
index 4cc4376ae..cc695fb73 100644
--- a/redhat/docker/mga7/packages.i686
+++ b/redhat/docker/mga7/packages.i686
@@ -55,6 +55,7 @@ gtk+3.0-devel
 gtk-doc
 hspell-devel
 hunspell-en
+iceauth
 ImageMagick-devel
 imake
 imlib2-devel
@@ -91,6 +92,7 @@ libflac-devel
 libflac-devel
 libfontenc-devel
 libgadu-devel
+libgeoip-devel
 libgmime2.6-devel
 libgpod-devel
 libgsf-devel
@@ -194,6 +196,7 @@ openldap-servers-devel
 opensc
 openslp-devel
 opensp-devel
+openssh-clients
 optipng
 pam-devel
 pciutils-devel
@@ -210,6 +213,7 @@ pkgconfig(pygtk-2.0)
 polkit-agent-none
 postgresql9.6
 postgresql9.6-devel
+ppp
 python-devel
 python-sip
 qt4-devel
@@ -223,6 +227,7 @@ SDL-devel
 speex-devel
 sqlite3-devel
 sqlite-devel
+sshfs-fuse
 subversion-devel
 sudo
 swig
diff --git a/redhat/docker/mga7/packages.x86_64 b/redhat/docker/mga7/packages.x86_64
index 3b6878579..9c8f92ea0 100644
--- a/redhat/docker/mga7/packages.x86_64
+++ b/redhat/docker/mga7/packages.x86_64
@@ -55,6 +55,7 @@ gtk+3.0-devel
 gtk-doc
 hspell-devel
 hunspell-en
+iceauth
 ImageMagick-devel
 imake
 imlib2-devel
@@ -81,6 +82,7 @@ lib64ffmpeg-devel
 lib64flac++-devel
 lib64flac-devel
 lib64fontenc-devel
+lib64geoip-devel
 lib64gmime2.6-devel
 lib64gstreamer1.0-devel
 lib64gstreamer-plugins-base1.0-devel
@@ -197,6 +199,7 @@ openldap-servers-devel
 opensc
 openslp-devel
 opensp-devel
+openssh-clients
 optipng
 pam-devel
 pciutils-devel
@@ -213,6 +216,7 @@ pkgconfig(pygtk-2.0)
 polkit-agent-none
 postgresql9.6
 postgresql9.6-devel
+ppp
 python-devel
 python-sip
 qt4-devel
@@ -226,6 +230,7 @@ SDL-devel
 speex-devel
 sqlite3-devel
 sqlite-devel
+sshfs-fuse
 subversion-devel
 sudo
 swig
diff --git a/redhat/docker/oss152/packages b/redhat/docker/oss152/packages
index 87a9788ae..e3359a007 100644
--- a/redhat/docker/oss152/packages
+++ b/redhat/docker/oss152/packages
@@ -8,6 +8,8 @@ bind-devel
 binutils-devel
 bison
 boost-devel
+brp-check-suse
+brp-extract-appdata
 ccache
 cdparanoia
 cdparanoia-devel
@@ -56,6 +58,7 @@ gtk-doc
 htdig
 html2ps
 hunspell-devel
+iceauth
 ImageMagick-devel
 imlib2-devel
 intltool
@@ -191,6 +194,7 @@ wireless-tools
 wv2-devel
 xbase-devel
 xcb-proto-devel
+xorg-x11
 xscreensaver
 xscreensaver-data
 xscreensaver-data-extra
diff --git a/redhat/docker/pclinuxos.pkg b/redhat/docker/pclinuxos.pkg
index d1ad003ed..cdfd0cf21 100644
--- a/redhat/docker/pclinuxos.pkg
+++ b/redhat/docker/pclinuxos.pkg
@@ -17,7 +17,9 @@ file
 filesystem
 findutils
 fuse
+fuse-common
 gawk
+gcrypt
 gdk-pixbuf2.0
 glibc
 glibc-devel
@@ -25,7 +27,8 @@ gnupg
 gnutls
 grep
 gzip
-icu56-data
+icu
+icu65-data
 info-install
 kernel-userspace-headers
 krb5
@@ -33,10 +36,13 @@ ldetect-lst
 less
 lib64acl1
 lib64apt-pkg0
+lib64assuan0
 lib64attr1
 lib64audit1
 lib64audit-devel
 lib64blkid1
+lib64brotlicommon1
+lib64brotlidec1
 lib64bsd0
 lib64bzip2_1
 lib64cap2
@@ -46,26 +52,32 @@ lib64curl4
 lib64db4.8
 lib64dbnss4.8
 lib64elfutils1
+lib64expat1
 lib64ext2fs2
 lib64fdisk1
 lib64ffi6
 lib64fuse2
+lib64fuse3_3
+lib64gcrypt20
 lib64gdbm3
 lib64gdk_pixbuf2.0_0
 lib64gio2.0_0
 lib64glib2.0_0
 lib64gmp10
 lib64gnutls30
-lib64icu56
+lib64gpg-error0
+lib64gudev1.0_0
+lib64icu65
 lib64idn2_0
 lib64intl8
 lib64iso9660_7
-lib64jasper1
+lib64jasper4
 lib64jbig1
 lib64jpeg62
 lib64jpeg8
 lib64keyutils1
 lib64krb53
+lib64ksba8
 lib64ldap2.4_2
 lib64libcap-ng0
 lib64lua5.1
@@ -76,12 +88,12 @@ lib64mpfr4
 lib64ncurses5
 lib64ncurses6
 lib64ncursesw6
-lib64nettle6
+lib64nettle7
 lib64notify4
+lib64npth0
 lib64nspr4
 lib64nss3
-lib64openssl1.0.0
-lib64openssl1.1
+lib64openssl1.1.0
 lib64opts25
 lib64pam0
 lib64pam-devel
@@ -93,10 +105,12 @@ lib64png16_16
 lib64png3
 lib64popt0
 lib64psl5
+lib64python3.6
 lib64readline7
 lib64rpm1
 lib64rtmp1
 lib64sasl2
+lib64secret1_0
 lib64sigsegv2
 lib64smartcols1
 lib64sqlite3_0
@@ -105,23 +119,30 @@ lib64tasn1_6
 lib64tcb0
 lib64tiff3
 lib64tiff5
+lib64tirpc3
 lib64udev0
 lib64unistring2
 lib64usb1.0_0
 lib64usb-compat0.1_4
 lib64uuid1
 lib64verto1
+lib64webp7
 lib64x11_6
 lib64xau6
+lib64xcrypt1
+lib64xcrypt-devel
 lib64xdmcp6
 lib64xml2_2
+lib64zstd1
 libgcc1
 libidn2-i18n
 libnotify
 libstdc++6
+libtirpc
 libxcb
 makedev
 mktemp
+multiarch-utils
 ncurses
 nss
 nss_tcb
@@ -134,10 +155,13 @@ perl
 perl-base
 perl-File-Sync
 perl-MDK-Common
+perl-Module-ScanDeps
+pinentry
 pkgconfig
 popt-data
 procps
 publicsuffix-list-dafsa
+python3
 rmt
 rootcerts
 rpm
@@ -145,6 +169,7 @@ rpm-helper
 rpm-pclinuxos-setup
 rpm-rambo-setup
 run-parts
+sd
 sed
 setup
 shadow-utils
diff --git a/redhat/docker/pclinuxos.sh b/redhat/docker/pclinuxos.sh
index e4ed68567..837e4c86f 100755
--- a/redhat/docker/pclinuxos.sh
+++ b/redhat/docker/pclinuxos.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -ex
 
 NAME="pclinuxos"
-VERSION="$1" # E.g: '26'
+VERSION="${1:-2020}" # E.g: '26'
 IMAGE="${NAME}:${VERSION}"
 INSTALLROOT="/dev/shm/${IMAGE}"
 
@@ -17,7 +17,7 @@ curl "${MIRROR}/RPMS.x86_64/" | sed -n "/a href/ s|.*href=\"\(.*\)\.rpm\".*|\1.r
 
 mkdir -p "/dev/shm/packages"
 while read pkg; do
-  file="$(grep "^$pkg-[0-9]" /dev/shm/pkg.list)"
+  file="$(grep "^${pkg}[0-9]*-[0-9]" /dev/shm/pkg.list | sort | tail -n 1)"
   [ -z "${file}" ] && exit 1
   wget -nv -c "${MIRROR}/RPMS.x86_64/${file}" -O "/dev/shm/packages/${file}" || exit 2
 done < "pclinuxos.pkg"
@@ -46,7 +46,7 @@ sudo umount "${INSTALLROOT}/dev/shm"
 sudo umount "${INSTALLROOT}/dev"
 
 sudo tar -C "${INSTALLROOT}" -c . >"${IMAGE}.tar"
-sudo rm -rf "${INSTALLROOT}"
+#sudo rm -rf "${INSTALLROOT}"
 
 docker rmi -f "${IMAGE}"
 docker import "${IMAGE}.tar" "${IMAGE}"
diff --git a/redhat/docker/pclinuxos/Dockerfile.x86_64 b/redhat/docker/pclinuxos/Dockerfile.x86_64
index a0fa770a1..2cd400aba 100644
--- a/redhat/docker/pclinuxos/Dockerfile.x86_64
+++ b/redhat/docker/pclinuxos/Dockerfile.x86_64
@@ -1,4 +1,4 @@
-FROM pclinuxos:2018
+FROM pclinuxos:2020
 
 ARG TDE_VERSION=14.0.8
 ARG ARCH=x86_64
diff --git a/redhat/docker/pclinuxos/packages.x86_64 b/redhat/docker/pclinuxos/packages.x86_64
index e2dfbeec1..800b9989a 100644
--- a/redhat/docker/pclinuxos/packages.x86_64
+++ b/redhat/docker/pclinuxos/packages.x86_64
@@ -31,7 +31,6 @@ gamin-devel
 gcc-c++
 gettext-devel
 glib2-devel
-gnokii-devel
 gnutls-devel
 gpgme-devel
 gphoto2-devel
@@ -41,9 +40,11 @@ gtk2-devel
 gtk+3.0-devel
 hspell-devel
 htdig
+iceauth
 ImageMagick-devel
 imake
 imlib2-devel
+intltool
 java-devel
 java-sun
 lcms-devel
@@ -53,6 +54,7 @@ lib64db4.8-devel
 lib64dvdread-devel
 lib64exiv2-devel
 lib64fbclient-devel
+lib64geoip-devel
 lib64gif-devel
 lib64gpod4
 lib64gpod-devel
@@ -86,7 +88,7 @@ libfontenc-devel
 libgadu-devel
 libgstreamer0.10-devel
 libice-devel
-libjasper-devel
+lib64jasper-devel
 libjpeg-devel
 liblame-devel
 liblo-devel
diff --git a/redhat/extras/style-ia-ora/style-ia-ora.spec b/redhat/extras/style-ia-ora/style-ia-ora.spec
deleted file mode 100644
index 351771520..000000000
--- a/redhat/extras/style-ia-ora/style-ia-ora.spec
+++ /dev/null
@@ -1,114 +0,0 @@
-# Default version for this component
-%define tde_pkg style-ia-ora
-%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"
-%define _variant .opt
-%endif
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:        Mandriva theme for TDE - Widget design
-Version:        1.0.8
-Release:		%{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant}
-
-License:        GPL
-Group:          Environment/Desktop
-URL:            http://www.mandrivalinux.com/
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:        %{tde_pkg}-%{tde_version}.tar.gz
-
-Prefix:		%{_prefix}
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-
-Requires:	trinity-twin
-
-%description
-Mandriva theme for Trinity
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n ia_ora-kde-%{version}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/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} \
-  \
-  --enable-rpath \
-  --enable-closure \
-  --disable-dependency-tracking \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-shared \
-  --disable-static
-
-%__make %{?_smp_mflags}
-
-
-%install
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{?buildroot}
-
-# Removes useless files
-%__rm -f %{?buildroot}%{tde_tdelibdir}/*.a
-%__rm -f %{?buildroot}%{tde_tdelibdir}/plugins/styles/*.a
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/twin3_iaora.la
-%{tde_tdelibdir}/twin3_iaora.so
-%{tde_tdelibdir}/twin_iaora_config.la
-%{tde_tdelibdir}/twin_iaora_config.so
-%{tde_tdelibdir}/plugins/styles/ia_ora.la
-%{tde_tdelibdir}/plugins/styles/ia_ora.so
-%{tde_datadir}/apps/kstyle/themes/ia_ora.themerc
-%{tde_datadir}/apps/twin/iaora.desktop
-
-
-
-
-%changelog
diff --git a/redhat/extras/trinity-desktop/trinity-desktop.spec b/redhat/extras/trinity-desktop/trinity-desktop.spec
index 024c38cad..a22540fd1 100644
--- a/redhat/extras/trinity-desktop/trinity-desktop.spec
+++ b/redhat/extras/trinity-desktop/trinity-desktop.spec
@@ -107,6 +107,7 @@ Requires: trinity-abakus
 Requires: trinity-amarok
 Requires: trinity-basket
 Requires: trinity-bibletime
+Requires: trinity-codeine
 Requires: trinity-digikam
 Requires: trinity-dolphin
 Requires: trinity-filelight
@@ -134,6 +135,8 @@ Requires: trinity-kdiff3
 Requires: trinity-kdirstat
 Requires: trinity-keep
 Requires: trinity-kerberostray
+#Requires: trinity-kerry
+Requires: trinity-keximdb
 Requires: trinity-kftpgrabber
 Requires: trinity-kile
 Requires: trinity-kima
@@ -151,6 +154,7 @@ Requires: trinity-knowit
 Requires: trinity-knmap
 Requires: trinity-knutclient
 Requires: trinity-koffice-suite
+Requires: trinity-kooldock
 Requires: trinity-konversation
 Requires: trinity-kopete-otr
 Requires: trinity-kpicosim
@@ -160,10 +164,10 @@ Requires: trinity-krename
 Requires: trinity-krusader
 Requires: trinity-kscope
 Requires: trinity-ksensors
-Requires: trinity-ksplash-engine-moodin
-Requires: trinity-ksquirrel
 Requires: trinity-kshowmail
 Requires: trinity-kshutdown
+Requires: trinity-ksplash-engine-moodin
+Requires: trinity-ksquirrel
 Requires: trinity-kstreamripper
 Requires: trinity-ksystemlog
 Requires: trinity-ktechlab
@@ -171,13 +175,18 @@ Requires: trinity-ktorrent
 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
@@ -186,6 +195,7 @@ Requires: trinity-tdeio-ftps
 Requires: trinity-tdeio-locate
 Requires: trinity-tdeio-sword
 Requires: trinity-tdeio-umountwrapper
+Requires: trinity-tdepacman
 Requires: trinity-tdepowersave
 Requires: trinity-tderadio
 Requires: trinity-tdesudo