RPM Packaging: update R14 packages

27 files changed, 267 insertions, 242 deletions

diff --git a/redhat/applications/basket/basket-14.0.0.spec b/redhat/applications/basket/basket-14.0.0.spec
index 4a3b7a545..05fb36744 100644
--- a/redhat/applications/basket/basket-14.0.0.spec
+++ b/redhat/applications/basket/basket-14.0.0.spec
@@ -148,10 +148,10 @@ update-desktop-database %{tde_tdeappdir} -q &> /dev/null
 %{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_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.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/digikam/digikam-14.0.0.spec b/redhat/applications/digikam/digikam-14.0.0.spec
index c2f7d28ef..fd706604c 100644
--- a/redhat/applications/digikam/digikam-14.0.0.spec
+++ b/redhat/applications/digikam/digikam-14.0.0.spec
@@ -105,88 +105,6 @@ very useful extentions.
 
 digiKam is based in part on the work of the Independent JPEG Group.
 
-
-%package devel
-Group:			Development/Libraries
-Summary:		Development files for %{name}
-Requires:		%{name} = %{version}-%{release}
-
-%description devel
-%{summary}
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%if 0%{?rhel} == 4
-%patch1 -p1 -b .png12
-%endif
-
-%__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} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --enable-gcc-hidden-visibility
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%find_lang %{tde_pkg}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-/sbin/ldconfig
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-/sbin/ldconfig
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
@@ -304,14 +222,129 @@ update-desktop-database %{tde_appdir} 2> /dev/null || :
 %{tde_datadir}/servicetypes/digikamimageplugin.desktop
 %{tde_mandir}/man*/*
 #%{tde_tdedocdir}/HTML/en/digikam-apidocs/
+%{tde_tdedocdir}/HTML/en/digikam/
+%{tde_tdedocdir}/HTML/en/showfoto/
+
+%post
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
+/sbin/ldconfig
+update-desktop-database %{tde_appdir} 2> /dev/null || : 
 
+%postun
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
+/sbin/ldconfig
+update-desktop-database %{tde_appdir} 2> /dev/null || : 
+
+##########
+
+%package devel
+Group:			Development/Libraries
+Summary:		Development files for %{name}
+Requires:		%{name} = %{version}-%{release}
+
+%description devel
+%{summary}
 
 %files devel
+%defattr(-,root,root,-)
 %{tde_tdeincludedir}/digikam_export.h
 %{tde_tdeincludedir}/digikam/
 %{tde_libdir}/libdigikam.so
 %{tde_libdir}/libdigikam.la
 
+%post devel
+/sbin/ldconfig || :
+
+%postun devel
+/sbin/ldconfig || :
+
+##########
+
+%package i18n
+Summary:		Translation files for %{tde_pkg}
+Group:			Applications/Utilities
+Requires:		%{name} = %{version}-%{release}
+
+%description i18n
+%{summary}
+
+%files i18n
+%defattr(-,root,root,-)
+%lang(da) %{tde_tdedocdir}/HTML/da/digikam/
+%lang(da) %{tde_tdedocdir}/HTML/da/showfoto/
+%lang(de) %{tde_tdedocdir}/HTML/de/digikam/
+%lang(de) %{tde_tdedocdir}/HTML/de/showfoto/
+%lang(es) %{tde_tdedocdir}/HTML/es/digikam/
+%lang(es) %{tde_tdedocdir}/HTML/es/showfoto/
+%lang(et) %{tde_tdedocdir}/HTML/et/digikam/
+%lang(et) %{tde_tdedocdir}/HTML/et/showfoto/
+%lang(it) %{tde_tdedocdir}/HTML/it/digikam/
+%lang(it) %{tde_tdedocdir}/HTML/it/showfoto/
+%lang(nl) %{tde_tdedocdir}/HTML/nl/digikam/
+%lang(nl) %{tde_tdedocdir}/HTML/nl/showfoto/
+%lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/digikam/
+#%lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/showfoto/
+%lang(ru) %{tde_tdedocdir}/HTML/ru/digikam/
+#%lang(ru) %{tde_tdedocdir}/HTML/ru/showfoto/
+%lang(sv) %{tde_tdedocdir}/HTML/sv/digikam/
+%lang(sv) %{tde_tdedocdir}/HTML/sv/showfoto/
+
+##########
+
+%if 0%{?suse_version} || 0%{?pclinuxos}
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+%if 0%{?rhel} == 4
+%patch1 -p1 -b .png12
+%endif
+
+%__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} \
+  --bindir=%{tde_bindir} \
+  --libdir=%{tde_libdir} \
+  --datadir=%{tde_datadir} \
+  --mandir=%{tde_mandir} \
+  --includedir=%{tde_tdeincludedir} \
+  \
+  --disable-dependency-tracking \
+  --disable-debug \
+  --enable-new-ldflags \
+  --enable-final \
+  --enable-closure \
+  --enable-rpath \
+  --enable-gcc-hidden-visibility
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+%find_lang %{tde_pkg}
+
+
+%clean
+%__rm -rf %{buildroot}
+
 
 %changelog
 * Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.6-8
diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec b/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec
index 8c3b28dfb..351e03bc7 100644
--- a/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec
+++ b/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec
@@ -27,7 +27,7 @@
 Name:			trinity-%{tde_pkg}
 Summary:		theme engine using Qt for GTK+ 2.x and Trinity
 Version:		0.8
-Release:		%{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
+Release:		%{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant}
 
 License:		GPLv2+
 Group:			Applications/Utilities
diff --git a/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0.spec b/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0.spec
index f4b2b8073..95d954223 100644
--- a/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0.spec
+++ b/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0.spec
@@ -49,7 +49,12 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
+
+%if 0%{?fedora} || 0%{?suse_version}
+BuildRequires:	gtk3-devel
+%else
 BuildRequires:	gtk+3.0-devel
+%endif
 
 %description
 GTK3 style engine which uses the active TDE style to draw its widgets
@@ -101,15 +106,12 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
-%find_lang %{tde_pkg}
-
 
 %clean
 %__rm -rf %{buildroot}
 
 
-
-%files -f %{tde_pkg}.lang
+%files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
 %{tde_libdir}/libtqtcairo.la
diff --git a/redhat/applications/kaffeine/kaffeine-14.0.0.spec b/redhat/applications/kaffeine/kaffeine-14.0.0.spec
index 776e36730..e2711dd57 100644
--- a/redhat/applications/kaffeine/kaffeine-14.0.0.spec
+++ b/redhat/applications/kaffeine/kaffeine-14.0.0.spec
@@ -56,7 +56,7 @@ BuildRequires:	libcdda-devel
 BuildRequires:	cdparanoia
 BuildRequires:	cdparanoia-devel
 %endif
-%if 0%{?suse_version} >= 1220
+%if 0%{?suse_version} >= 1210 || 0%{?fedora} >= 19
 BuildRequires:	libcdio-paranoia-devel
 %endif
 
@@ -82,7 +82,7 @@ BuildRequires: libxcb-devel
 %if 0%{?rhel} >= 5 || 0%{?suse_version} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gstreamer 1
 %if 0%{?suse_version}
-BuildRequires:	gstreamer-devel
+BuildRequires:	gstreamer-0_10-devel
 BuildRequires:	gstreamer-0_10-plugins-base-devel
 %endif
 %if 0%{?rhel} == 4
diff --git a/redhat/applications/kbarcode/kbarcode-14.0.0.spec b/redhat/applications/kbarcode/kbarcode-14.0.0.spec
index 0eba22150..50e598529 100644
--- a/redhat/applications/kbarcode/kbarcode-14.0.0.spec
+++ b/redhat/applications/kbarcode/kbarcode-14.0.0.spec
@@ -144,9 +144,9 @@ update-desktop-database %{tde_appdir} &> /dev/null
 %{tde_tdelibdir}/tdefile_kbarcode.so
 %{tde_tdeappdir}/kbarcode-batch.desktop
 %{tde_tdeappdir}/kbarcode-editor.desktop
-%{tde_tdeappdir}/kbarcode-label.desktop
 %{tde_tdeappdir}/kbarcode-single.desktop
 %{tde_tdeappdir}/kbarcode.desktop
+%{tde_datadir}/mimelnk/application/kbarcode-label.desktop
 %{tde_datadir}/apps/kbarcode/
 %{tde_datadir}/icons/hicolor/*/actions/barcode.png
 %{tde_datadir}/icons/hicolor/*/actions/kbarcodeellipse.png
diff --git a/redhat/applications/kile/kile-14.0.0.spec b/redhat/applications/kile/kile-14.0.0.spec
index eaac1e766..f552e94a4 100644
--- a/redhat/applications/kile/kile-14.0.0.spec
+++ b/redhat/applications/kile/kile-14.0.0.spec
@@ -26,7 +26,7 @@
 
 Name:			trinity-%{tde_pkg}
 Summary:		TDE Integrated LaTeX Environment [Trinity]
-Version:		2.0.2
+Version:		2.0.3
 Release:		%{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant}
 
 License:		GPLv2+
@@ -160,6 +160,7 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %find_lang %{tde_pkg}
 
+
 %clean
 %__rm -rf %{buildroot}
 
diff --git a/redhat/applications/kkbswitch/kkbswitch-14.0.0.spec b/redhat/applications/kkbswitch/kkbswitch-14.0.0.spec
index d569b90f1..cec617887 100644
--- a/redhat/applications/kkbswitch/kkbswitch-14.0.0.spec
+++ b/redhat/applications/kkbswitch/kkbswitch-14.0.0.spec
@@ -132,6 +132,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 %{tde_datadir}/autostart/kkbswitch.desktop
 %{tde_tdedocdir}/HTML/en/kkbswitch/
 %{tde_mandir}/man1/kkbswitch.1
+%{tde_datadir}/icons/hicolor/*/apps/kkbswitch.png
 
 
 %changelog
diff --git a/redhat/applications/koffice/koffice-14.0.0.spec b/redhat/applications/koffice/koffice-14.0.0.spec
index a9c8dc953..9e8548860 100644
--- a/redhat/applications/koffice/koffice-14.0.0.spec
+++ b/redhat/applications/koffice/koffice-14.0.0.spec
@@ -63,7 +63,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
 BuildRequires:	trinity-tdegraphics-devel >= %{tde_version}
-BuildRequires:	trinity-tdegraphics-libpoppler-tqt-devel >= %{tde_version}
+BuildRequires:	trinity-libpoppler-tqt-devel >= %{tde_version}
 BuildRequires:	automake libtool
 BuildRequires:	fontconfig-devel
 BuildRequires:	libart_lgpl-devel
diff --git a/redhat/applications/kscope/kscope-14.0.0.spec b/redhat/applications/kscope/kscope-14.0.0.spec
index fce6e9a26..c67a59c85 100644
--- a/redhat/applications/kscope/kscope-14.0.0.spec
+++ b/redhat/applications/kscope/kscope-14.0.0.spec
@@ -77,6 +77,7 @@ Main Features:
 %debug_package
 %endif
 
+
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
diff --git a/redhat/applications/kshowmail/kshowmail-14.0.0.spec b/redhat/applications/kshowmail/kshowmail-14.0.0.spec
index 2fb0a7ce9..c3b7a85eb 100644
--- a/redhat/applications/kshowmail/kshowmail-14.0.0.spec
+++ b/redhat/applications/kshowmail/kshowmail-14.0.0.spec
@@ -123,6 +123,7 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 %{tde_datadir}/apps/kshowmail/pics/tool.png
 %{tde_datadir}/apps/kshowmail/sounds/neuepost.wav
 %{tde_datadir}/apps/kshowmail/sounds/newmail.wav
+%{tde_datadir}/icons/crystalsvg/16x16/apps/kshowmail.png
 %{tde_datadir}/services/kshowmailconfigaccounts.desktop
 %{tde_datadir}/services/kshowmailconfigactions.desktop
 %{tde_datadir}/services/kshowmailconfigdisplay.desktop
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-14.0.0.spec
index 8eb2b24a0..1726c0611 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-14.0.0.spec
@@ -1,3 +1,7 @@
+%if "%{?_qt4_plugindir}" == ""
+%define _qt4_plugindir %{_libdir}/qt4/plugins
+%endif
+
 # Default version for this component
 %define tde_pkg qt4-tqt-theme-engine
 %define tde_version 14.0.0
@@ -48,7 +52,13 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
+
+# QT4 support
+%if 0%{?suse_version}
+BuildRequires:	qt-devel
+%else
 BuildRequires:	qt4-devel
+%endif
 
 %description
 TDE theme engine for Qt4
diff --git a/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec b/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec
index 3b4aa2dc0..7f81e757e 100644
--- a/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec
+++ b/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec
@@ -46,8 +46,6 @@ BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-Patch1:			tde-guidance-14.0.0-userconfig.patch
-
 BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
 BuildRequires:	trinity-arts-devel >= 1:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
@@ -258,7 +256,6 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch1 -p1 -b .userconfig
 
 %if 0%{?rhel} || 0%{?mgaversion} || 0%{?mdkversion}
 %__sed -i "userconfig/unixauthdb.py" \
@@ -270,7 +267,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
-export PYTHONPATH=%{python_sitearch}/python-tqt
+#export PYTHONPATH=%{python_sitearch}/python-tqt
 
 # Avoids 'error: byte-compiling is disabled.' on Mandriva/Mageia
 export PYTHONDONTWRITEBYTECODE=
@@ -336,19 +333,12 @@ chrpath -r %{tde_libdir} %{buildroot}%{tde_tdelibdir}/kcm_*.so
 
 # Generates the startup scripts
 %__rm -f %{buildroot}%{tde_bindir}/*
+%__ln_s -f %{python_sitearch}/%{name}/userconfig.py %{buildroot}%{tde_bindir}/userconfig
 %__ln_s -f %{python_sitearch}/%{name}/mountconfig.py %{buildroot}%{tde_bindir}/mountconfig
 %__ln_s -f %{python_sitearch}/%{name}/serviceconfig.py %{buildroot}%{tde_bindir}/serviceconfig
 %__ln_s -f %{python_sitearch}/%{name}/wineconfig.py %{buildroot}%{tde_bindir}/wineconfig
 %__ln_s -f %{python_sitearch}/%{name}/grubconfig.py %{buildroot}%{tde_bindir}/grubconfig
 
-cat <<EOF >%{?buildroot}%{tde_bindir}/userconfig
-#!/bin/sh
-export PYTHONPATH=%{python_sitearch}/%{name}:%{python_sitearch}/sip4-tqt
-exec %{python_sitearch}/%{name}/userconfig.py
-EOF
-chmod +x %{buildroot}%{tde_bindir}/userconfig
-
-
 # (obsolete)  put this here since gnome people probably don't want it by default
 #%__ln_s -f %{_python_sitearch}/%{name}/displayconfig-restore.py %{buildroot}%{tde_bindir}/displayconfig-restore
 
@@ -402,6 +392,7 @@ chmod 0755 %{buildroot}%{python_sitearch}/%{name}/gpmhelper.py
 %__rm -f %{buildroot}%{python_sitearch}/%{name}/guidance_power_manager_ui.py*
 %__rm -f %{buildroot}%{python_sitearch}/%{name}/powermanage.py*
 %__rm -f %{buildroot}%{python_sitearch}/%{name}/powermanager_ui.py*
+%__rm -f %{buildroot}%{tde_datadir}/apps/guidance/powermanager_ui.ui
 
 %endif
 
@@ -423,6 +414,9 @@ chmod 0755 %{buildroot}%{python_sitearch}/%{name}/gpmhelper.py
 %__rm -f %{?buildroot}%{tde_tdelibdir}/kcm_displayconfig.*
 %__rm -f %{?buildroot}%{python_sitearch}/%{name}/displayconfig.py*
 %__rm -f %{?buildroot}%{python_sitearch}/%{name}/displayconfigwidgets.py*
+%__rm -f %{buildroot}%{tde_tdeappdir}/displayconfig.desktop
+%__rm -f %{buildroot}%{tde_datadir}/icons/*/*/apps/displayconfig.png
+%__rm -fr %{buildroot}%{tde_datadir}/apps/guidance/pics/displayconfig
 %endif
 
 
diff --git a/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec b/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec
index 4a2db9e9f..ab9c61b45 100644
--- a/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec
+++ b/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec
@@ -53,8 +53,13 @@ Provides:		trinity-knetworkmanager = %{version}-%{release}
 
 # NETWORKMANAGER support
 %if 0%{?rhel} || 0%{?fedora}
+%if 0%{?fedora} >= 20
+BuildRequires:	NetworkManager-devel
+Requires:		NetworkManager
+%else
 Requires:		NetworkManager-gnome
 %endif
+%endif
 %if 0%{?mdkversion} || 0%{?mgaversion}
 Requires:		networkmanager
 %endif
diff --git a/redhat/applications/tdesvn/tdesvn-14.0.0.spec b/redhat/applications/tdesvn/tdesvn-14.0.0.spec
index 940099c17..bff026e15 100644
--- a/redhat/applications/tdesvn/tdesvn-14.0.0.spec
+++ b/redhat/applications/tdesvn/tdesvn-14.0.0.spec
@@ -49,6 +49,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	subversion-devel
 Requires:		%{name}-tdeio-plugins = %{version}-%{release}
+Requires:		trinity-libsvnqt = %{version}-%{release}
 
 Obsoletes:	trinity-kdesvn < %{version}-%{release}
 Provides:	trinity-kdesvn = %{version}-%{release}
@@ -238,8 +239,8 @@ fi
 %{tde_libdir}/libtdesvnevents.so
 %{tde_libdir}/libtdesvnhelpers.la
 %{tde_libdir}/libtdesvnhelpers.so
-%{tde_datadir}/tdesvn/icons/hicolor/*/apps/tdesvn.png
-%{tde_datadir}/tdesvn/icons/hicolor/scalable/apps/tdesvn.svgz
+#%{tde_datadir}/tdesvn/icons/hicolor/*/apps/tdesvn.png
+#%{tde_datadir}/tdesvn/icons/hicolor/scalable/apps/tdesvn.svgz
 
 %files -n trinity-libsvnqt
 %defattr(-,root,root,-)
diff --git a/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec b/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec
index 8aa495772..567f9cf62 100644
--- a/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec
+++ b/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec
@@ -26,8 +26,6 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-Patch1:		python-tqt-14.0.0-sip4_tqt.patch
-
 BuildRequires:	gcc-c++
 BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
 BuildRequires:	trinity-tqscintilla-devel
@@ -139,7 +137,6 @@ packages based on them, like PyTDE.
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch1 -p1 -b .sip4tqt
 
 
 %build
diff --git a/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec b/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec
index a9c083d18..99c52e199 100644
--- a/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec
+++ b/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec
@@ -41,14 +41,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-# [pytdeextensions] Port to TQT3
-Patch1:		pytdeextensions-14.0.0-tqt.patch
-Patch2:		pytdeextensions-14.0.0-python_tqt.patch
-# [pykdeextensions] Fix hardcoded path to Guidance python libraries [Bug #999]
-Patch3:		pytdeextensions-14.0.0-fix_extra_module_dir.patch
-# [pykdeextensions] Fix include directory search location
-Patch5:		pytdeextensions-14.0.0-fix_include_dir.patch
-
 BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
 BuildRequires:	trinity-arts-devel >= 1:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
@@ -154,19 +146,17 @@ Requires:		trinity-libpythonize0-devel = %{version}-%{release}
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch1 -p1 -b .tqt3
-%patch2 -p1 -b .pythontqt
-%patch3 -p1 -b .extramodule
-%patch5 -p1 -b .incdir
 
 # Changes library directory to 'lib64'
 # Also other fixes for distributions ...
 for f in src/*.py; do
   %__sed -i "${f}" \
-    -e "s|'pyqt-dir='.*'|'pyqt-dir=','%{python_sitearch}/python_tqt'|g" \
-    -e "s|self.pyqt_dir = .*|self.pyqt_dir = \"%{python_sitearch}/python_tqt\"|g" \
     -e "s|'pytde-dir=',None,|'pytde-dir=','%{python_sitearch}',|g" \
     -e "s|self.pytde_dir = None|self.pytde_dir = \"%{python_sitearch}\"|g" \
+    -e "s|'kde-lib-dir=',None,|'kde-lib-dir=','%{tde_libdir}',|g" \
+    -e "s|self.kde_lib_dir = None|self.kde_lib_dir = \"%{tde_libdir}\"|g" \
+    -e "s|'kde-kcm-lib-dir=',None,|'kde-kcm-lib-dir=','%{tde_libdir}/trinity',|g" \
+    -e "s|self.kde_kcm_lib_dir = None|self.kde_kcm_lib_dir = \"%{tde_libdir}/trinity\"|g" \
     -e "s|%{tde_includedir}/tde|%{tde_tdeincludedir}|g" \
     -e 's|"/kde"|"/tde"|' \
     -e 's|"-I" + self.kde_inc_dir + "/tde"|"-I/opt/trinity/include"|' \
@@ -177,7 +167,7 @@ done
 # Instead look for versioned runtime library.
 LIBPYTHON="$(readlink %{_libdir}/libpython2.*.so)"
 if [ -f "%{_libdir}/${LIBPYTHON}" ]; then
-  %__sed -i "src/kdedistutils.py" \
+  %__sed -i "src/tdedistutils.py" \
     -e "s|#define LIB_PYTHON \".*\"|#define LIB_PYTHON \"%{_libdir}/${LIBPYTHON}\"|"
 fi
 
@@ -193,10 +183,6 @@ export PATH="%{tde_bindir}:${PATH}"
 %install
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
-#export PYTHONPATH=%{python_sitearch}/python-tqt
-
-# Support for 'sip4-tqt'
-#export PYTHONPATH=%{python_sitearch}/sip4_tqt:${PYTHONPATH}
 
 # Avoids 'error: byte-compiling is disabled.' on Mandriva/Mageia
 export PYTHONDONTWRITEBYTECODE=
diff --git a/redhat/libraries/python-trinity/python-trinity-14.0.0.spec b/redhat/libraries/python-trinity/python-trinity-14.0.0.spec
index 0b2b65586..4b248ac3b 100644
--- a/redhat/libraries/python-trinity/python-trinity-14.0.0.spec
+++ b/redhat/libraries/python-trinity/python-trinity-14.0.0.spec
@@ -43,9 +43,6 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-Patch1:			python-trinity-14.0.0-sip4_tqt.patch
-Patch2:			python-trinity-14.0.0-python_tqt.patch
-
 BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
 BuildRequires:	trinity-arts-devel >= 1:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
@@ -105,8 +102,6 @@ tips and working code you can use to learn from.
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch1 -p1 -b .sip4tqt
-%patch2 -p1 -b .pythontqt
 
 
 %build
@@ -138,7 +133,6 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 
 
-
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
@@ -148,7 +142,7 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %files devel
 %defattr(-,root,root,-)
-%{tde_bindir}/kdepyuic
+%{tde_bindir}/tdepyuic
 # The SIP files are outside TDE's prefix
 %{_datadir}/sip/trinity/
 
diff --git a/redhat/tde-i18n/tde-i18n-14.0.0.spec b/redhat/tde-i18n/tde-i18n-14.0.0.spec
index 29a236193..ac3889419 100644
--- a/redhat/tde-i18n/tde-i18n-14.0.0.spec
+++ b/redhat/tde-i18n/tde-i18n-14.0.0.spec
@@ -697,38 +697,50 @@ pushd tde-i18n-fr
 %patch3 -p1
 popd
 
-%__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"
-
 
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 
-export kde_htmldir="%{tde_tdedocdir}/HTML"
-
 (
 for l in %{TDE_LANGS}; do
   for f in tde-i18n-${l}/; do
     if [ -d "${f}" ]; then 
       pushd ${f}
-      (
-      %__sed -i "configure.in" -e "s|AM_CONFIG_HEADER|AC_CONFIG_HEADER|g"
-      %__make -f "admin/Makefile.common"
-      %configure \
-        --prefix=%{tde_prefix} \
-        --datadir=%{tde_datadir} \
-        --docdir=%{tde_tdedocdir}
-      %__make %{?_smp_mflags} || %__make || echo Error
-      ) &
-      sleep 3
+      if ! rpm -E %%cmake|grep -q "cd build"; then
+        %__mkdir_p build
+        cd build
+      fi
+      
+      %cmake \
+        -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+        -DCMAKE_VERBOSE_MAKEFILE=ON \
+        \
+        -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+        -DBIN_INSTALL_DIR="%{tde_bindir}" \
+        -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
+        -DLIB_INSTALL_DIR="%{tde_libdir}" \
+        -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
+        -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
+        \
+        -DBUILD_ALL=ON \
+        -DBUILD_DOC=ON \
+        -DBUILD_DATA=ON \
+        -DBUILD_MESSAGES=ON \
+      ..
+
+      # Run the build process in background
+      ( %__make -j4 || %__make || echo Error ) &
+      
+      # Do not build more than 4 languages at the same time
+      while [ $(jobs | wc -l) -ge 4 ]; do sleep 3; done
       popd
     fi
   done
 done
 ) 2>&1 | tee /tmp/rpmbuild.$$
 
-if grep -q Error /tmp/rpmbuild.$$; then
+if grep -qw Error /tmp/rpmbuild.$$; then
   echo Error while building. See '/tmp/rpmbuild.$$'
   exit 1
 fi
@@ -743,60 +755,18 @@ export PATH="%{tde_bindir}:${PATH}"
 
 for l in %{TDE_LANGS}; do
   for f in tde-i18n-${l}/; do
-    if [ -d "${f}" ] && [ -r "${f}/Makefile" ] ; then 
-      %__make install DESTDIR="%{?buildroot}" -C "${f}"
-    fi
+    %__make install DESTDIR="%{?buildroot}" -C "${f}/build"
   done
 done
 
 
-# make symlinks relative
-%if "%{tde_prefix}" == "/usr"
-pushd "%{buildroot}%{tde_tdedocdir}/HTML"
-for lang in *; do
-  if [ -d "$lang" ]; then
-    pushd "$lang"
-    for i in */*/*; do
-      if [ -d $i -a -L $i/common ]; then
-        rm -f $i/common
-        ln -sf ../../../docs/common $i
-      fi
-    done
-
-    for i in */*; do
-      if [ -d $i -a -L $i/common ]; then
-        rm -f $i/common
-        ln -sf ../../docs/common $i
-      fi
-    done
-
-    for i in *; do
-      if [ -d $i -a -L $i/common ]; then
-        rm -f $i/common
-        ln -sf ../docs/common $i
-      fi
-    done
-
-    popd
-  fi
-done
-popd   
-%endif
-
 # remove zero-length file
 find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \;
 
-# See http://fedoraproject.org/wiki/Languages (???)
-%__rm -f %{buildroot}%{tde_datadir}/locale/*/flag.png
-
-# Removes conflict with KDE4
-%if "%{?tde_prefix}" == "/usr"
-%__rm -f %{buildroot}%{tde_datadir}/locale/*/entry.desktop
-%endif
-
 # remove obsolete KDE 3 application data translations
 %__rm -rf "%{buildroot}%{tde_datadir}/apps"
 
+
 %clean
 %__rm -rf %{buildroot}
 
diff --git a/redhat/tdeadmin/tdeadmin-14.0.0.spec b/redhat/tdeadmin/tdeadmin-14.0.0.spec
index e5d2e8d17..f1f7b6764 100644
--- a/redhat/tdeadmin/tdeadmin-14.0.0.spec
+++ b/redhat/tdeadmin/tdeadmin-14.0.0.spec
@@ -52,7 +52,12 @@ BuildRequires: trinity-arts-devel >= 1:1.5.10
 BuildRequires: trinity-tdelibs-devel >= %{tde_version}
 BuildRequires: rpm-devel
 BuildRequires: pam-devel
+
 %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+#define with_lilo 1
+%endif
+
+%if 0%{?with_lilo}
 BuildRequires:	lilo
 %endif
 
@@ -64,8 +69,10 @@ Requires: trinity-knetworkconf = %{version}-%{release}
 Requires: trinity-kpackage = %{version}-%{release}
 Requires: trinity-ksysv = %{version}-%{release}
 Requires: trinity-kuser = %{version}-%{release}
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%if 0%{?with_lilo}
 Requires: trinity-lilo-config = %{version}-%{release}
+%else
+Obsoletes: trinity-lilo-config
 %endif
 
 # CONSOLEHELPER (usermode) support
@@ -83,10 +90,6 @@ kcron, kdat, knetworkconf, kpackage, ksysv, kuser.
 
 %files
 %defattr(-,root,root,-)
-# LILO is not provided in RHEL or Fedora
-%if 0%{?rhel} || 0%{?fedora}
-%exclude %{tde_tdedocdir}/HTML/en/lilo-config/
-%endif
 
 ##########
 
@@ -340,7 +343,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 ##########
 
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%if 0%{?with_lilo}
 %package -n trinity-lilo-config
 Summary:	Trinity frontend for lilo configuration
 Group:		Applications/Utilities
@@ -388,7 +391,7 @@ export PATH="%{tde_bindir}:${PATH}"
 
 # Specific path for RHEL4
 if [ -d /usr/X11R6 ]; then
-  export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
+  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
 fi
 
 %configure \
@@ -461,6 +464,14 @@ done
 #  * Removed useless program secpolicy. (Closes: #399426)
 %__rm -f %{?buildroot}%{tde_bindir}/secpolicy
 
+# Remove lilo related files, if unwanted.
+%if 0%{?with_lilo} == 0
+%__rm -rf %{?buildroot}%{tde_tdedocdir}/HTML/en/lilo-config/
+%__rm -f %{?buildroot}%{tde_tdelibdir}/kcm_lilo.la
+%__rm -f %{?buildroot}%{tde_tdelibdir}/kcm_lilo.so
+%__rm -f %{?buildroot}%{tde_tdeappdir}/lilo.desktop
+%endif
+
 
 %clean
 %__rm -rf %{buildroot}
diff --git a/redhat/tdeartwork/tdeartwork-14.0.0.spec b/redhat/tdeartwork/tdeartwork-14.0.0.spec
index 6955d197d..dedd1d1e2 100644
--- a/redhat/tdeartwork/tdeartwork-14.0.0.spec
+++ b/redhat/tdeartwork/tdeartwork-14.0.0.spec
@@ -653,6 +653,10 @@ This package is part of Trinity, and a component of the TDE artwork module.
 %{tde_datadir}/applnk/System/ScreenSavers/unknownpleasures.desktop
 %endif
 
+%if 0%{?fedora} >= 20
+%{tde_datadir}/applnk/System/ScreenSavers/geodesic.desktop
+%endif
+
 %endif
 
 ##########
diff --git a/redhat/tdebase/tdebase-14.0.0-displayconfig_translation.patch b/redhat/tdebase/tdebase-14.0.0-displayconfig_translation.patch
index 8440308ec..76fd104ba 100644
--- a/redhat/tdebase/tdebase-14.0.0-displayconfig_translation.patch
+++ b/redhat/tdebase/tdebase-14.0.0-displayconfig_translation.patch
@@ -5,10 +5,10 @@
  Comment=Configure display
  Comment[en_US]=Configure display
 +Comment[fr]=Configuration de l'affichage
- DocPath=kcontrol/displayconfig.html
- Exec=tdecmshell displayconfig
- GenericName=
-@@ -11,6 +12,7 @@
+ # Restore the following key and remove this comment when a help handbook
+ # is written. Disabling this key prevents populating the main handbook
+ # table of contents with a non-existent document, which results in a
+@@ -17,6 +18,7 @@
  MimeType=
  Name=Monitor & Display
  Name[en_US]=Monitor & Display
@@ -18,15 +18,15 @@
  StartupNotify=true
 --- trinity-tdebase-3.5.13.2~pre100+073a32f9/kcontrol/iccconfig/iccconfig.desktop.ORI	2013-05-11 21:21:04.241337141 +0200
 +++ trinity-tdebase-3.5.13.2~pre100+073a32f9/kcontrol/iccconfig/iccconfig.desktop	2013-05-11 21:21:44.782537929 +0200
-@@ -12,6 +12,7 @@
+@@ -18,6 +18,7 @@
  Categories=Qt;TDE;X-TDE-settings-hardware;
  Comment=Configure display ICC profile
  Comment[en_US]=Configure display ICC profile
 +Comment[fr]=Configurer les profils de couleurs ICC
- DocPath=kcontrol/iccconfig.html
  GenericName=
  GenericName[en_US]=
-@@ -19,5 +20,6 @@
+ Keywords=ICC,display,color,profile
+@@ -24,5 +25,6 @@
  MimeType=
  Name=ICC Color Profile
  Name[en_US]=ICC Color Profile
diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec
index 57433ec89..e71cb7aaf 100644
--- a/redhat/tdebase/tdebase-14.0.0.spec
+++ b/redhat/tdebase/tdebase-14.0.0.spec
@@ -581,6 +581,8 @@ web browser, X terminal emulator, and many other programs and components.
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYING-DOCS README README.pam
+%{tde_bindir}/release_notes
+%{tde_datadir}/autostart/release_notes.desktop
 
 ##########
 
@@ -1203,7 +1205,7 @@ TDE applications, particularly those in the TDE base module.
 %attr(4511,root,root) %{tde_bindir}/tdmtsak
 %{tde_bindir}/tsak
 %endif
-%{tde_bindir}/kdebugdialog
+%{tde_bindir}/tdedebugdialog
 %{tde_bindir}/kreadconfig
 %{tde_bindir}/kwriteconfig
 %{tde_bindir}/kstart
@@ -1275,7 +1277,7 @@ TDE applications, particularly those in the TDE base module.
 %config(noreplace) %{_sysconfdir}/pam.d/tdescreensaver-trinity
 %endif
 %{tde_tdedocdir}/HTML/en/kdcop/
-%{tde_tdedocdir}/HTML/en/kdebugdialog//
+%{tde_tdedocdir}/HTML/en/tdedebugdialog//
 %{tde_tdedocdir}/HTML/en/tdesu/
 %{tde_tdedocdir}/HTML/en/knetattach/
 %{tde_tdedocdir}/HTML/en/kxkb/
@@ -1926,7 +1928,7 @@ the TDE desktop.
 %config(noreplace) %{_sysconfdir}/trinity/kdesktop_custom_menu2
 %{tde_bindir}/kcheckrunning
 %{tde_bindir}/kxdglauncher
-%{tde_bindir}/kdeeject
+%{tde_bindir}/tdeeject
 %{tde_bindir}/kdesktop
 %{tde_bindir}/kdesktop_lock
 %{tde_bindir}/kwebdesktop
diff --git a/redhat/tdebindings/tdebindings-14.0.0.spec b/redhat/tdebindings/tdebindings-14.0.0.spec
index 16e82a54a..92492b4d2 100644
--- a/redhat/tdebindings/tdebindings-14.0.0.spec
+++ b/redhat/tdebindings/tdebindings-14.0.0.spec
@@ -235,7 +235,7 @@ This package is part of the official TDE bindings module.
 %files -n trinity-libdcop3-java
 %defattr(-,root,root,-)
 #%{tde_datadir}/java/dcopjava*.jar
-%{tde_libdir}/java/org/kde/DCOP/*.class
+%{tde_libdir}/java/org/*/DCOP/*.class
 
 ##########
 
@@ -380,9 +380,9 @@ This package is part of the official TDE bindings module.
 
 %files -n trinity-libtrinity-jni
 %defattr(-,root,root,-)
-%{tde_libdir}/jni/libkdejava.la
-%{tde_libdir}/jni/libkdejava.so.*
-%doc kdejava/ChangeLog
+%{tde_libdir}/jni/libtdejava.la
+%{tde_libdir}/jni/libtdejava.so.*
+%doc tdejava/ChangeLog
 
 ##########
 
@@ -398,7 +398,7 @@ This package is part of the official TDE bindings module.
 
 %files -n trinity-libtrinity-jni-devel
 %defattr(-,root,root,-)
-%{tde_libdir}/jni/libkdejava.so
+%{tde_libdir}/jni/libtdejava.so
 
 ##########
 
@@ -707,12 +707,12 @@ This package is part of the official TDE bindings module.
 
 %files -n trinity-libkorundum0-ruby
 %defattr(-,root,root,-)
-%{tde_bindir}/rbkdesh
-%{tde_bindir}/rbkdeapi
+%{tde_bindir}/rbtdesh
+%{tde_bindir}/rbtdeapi
 %{tde_bindir}/krubyinit
 %{tde_bindir}/rbtdeconfig_compiler
 %{ruby_rubylibdir}/Korundum.rb
-%{ruby_rubylibdir}/KDE/korundum.rb
+%{ruby_rubylibdir}/TDE/korundum.rb
 %{ruby_arch}/korundum.la
 %{ruby_arch}/korundum.so*
 %doc korundum/ChangeLog
@@ -827,22 +827,25 @@ Group:		Environment/Libraries
 
 ##########
 
-%package -n trinity-libkdexparts1
-Summary:	Xparts library for KDE
+%package -n trinity-libtdexparts
+Summary:	Xparts library for TDE
 Group:		Environment/Libraries
 
-%description -n trinity-libkdexparts1
+Obsoletes:	trinity-libkdexparts1 < %{version}-%{release}
+Provides:	trinity-libkdexparts1 = %{version}-%{release}
+
+%description -n trinity-libtdexparts
 %{summary}
 
-%files -n trinity-libkdexparts1
+%files -n trinity-libtdexparts
 %defattr(-,root,root,-)
-%{tde_libdir}/libkdexparts.so.*
-%{tde_libdir}/libkdexparts.la
+%{tde_libdir}/libtdexparts.so.*
+%{tde_libdir}/libtdexparts.la
 
-%post -n trinity-libkdexparts1
+%post -n trinity-libtdexparts
 /sbin/ldconfig || :
 
-%postun -n trinity-libkdexparts1
+%postun -n trinity-libtdexparts
 /sbin/ldconfig || :
 
 ##########
@@ -853,7 +856,7 @@ Group:		Development/Libraries
 %if 0%{?with_gtk1}
 Requires:	trinity-libgtkxparts1 = %{version}-%{release}
 %endif
-Requires:	trinity-libkdexparts1 = %{version}-%{release}
+Requires:	trinity-libtdexparts = %{version}-%{release}
 
 %description -n trinity-libxparts-devel
 %{summary}
@@ -864,7 +867,7 @@ Requires:	trinity-libkdexparts1 = %{version}-%{release}
 %if 0%{?with_gtk1}
 %{tde_libdir}/libgtkxparts.so
 %endif
-%{tde_libdir}/libkdexparts.so
+%{tde_libdir}/libtdexparts.so
 
 %post -n trinity-libxparts-devel
 /sbin/ldconfig || :
@@ -883,7 +886,7 @@ Requires:	trinity-xpart-notepad = %{version}-%{release}
 %if 0%{?with_gtk1}
 Requires:	trinity-libgtkxparts1 = %{version}-%{release}
 %endif
-Requires:	trinity-libkdexparts1 = %{version}-%{release}
+Requires:	trinity-libtdexparts = %{version}-%{release}
 Requires:	trinity-libdcop-c = %{version}-%{release}
 
 %description xparts-extras
diff --git a/redhat/tdegraphics/tdegraphics-14.0.0.spec b/redhat/tdegraphics/tdegraphics-14.0.0.spec
index 585b0e717..dd74fb9b8 100644
--- a/redhat/tdegraphics/tdegraphics-14.0.0.spec
+++ b/redhat/tdegraphics/tdegraphics-14.0.0.spec
@@ -1130,8 +1130,8 @@ Summary:	TQt support for Poppler
 Group:		Environment/Libraries
 Obsoletes:	poppler-tqt < %{version}-%{release}
 Provides:	poppler-tqt = %{version}-%{release}
-Obsoletes:	%{name}-poppler-tqt < %{version}-%{release}
-Provides:	%{name}-poppler-tqt = %{version}-%{release}
+Obsoletes:	%{name}-libpoppler-tqt < %{version}-%{release}
+Provides:	%{name}-libpoppler-tqt = %{version}-%{release}
 
 %description -n trinity-libpoppler-tqt
 TQt support library for Poppler.
@@ -1155,8 +1155,8 @@ Group:		Development/Libraries
 Requires:	trinity-libpoppler-tqt = %{version}-%{release}
 Obsoletes:	poppler-tqt-devel < %{version}-%{release}
 Provides:	poppler-tqt-devel = %{version}-%{release}
-Obsoletes:	%{name}-poppler-tqt-devel < %{version}-%{release}
-Provides:	%{name}-poppler-tqt-devel = %{version}-%{release}
+Obsoletes:	%{name}-libpoppler-tqt-devel < %{version}-%{release}
+Provides:	%{name}-libpoppler-tqt-devel = %{version}-%{release}
 
 %description -n trinity-libpoppler-tqt-devel
 Development files of TQt support library for Poppler.
diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec
index 028aaa031..151b0dfcd 100644
--- a/redhat/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/tdelibs/tdelibs-14.0.0.spec
@@ -36,6 +36,8 @@ BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
 
+Patch1:			tdelibs-14.0.0-fix_icon_path.patch
+
 # Patches from Mandriva
 Patch101:		tdelibs-14.0.0-xdg_dirs_set_path.patch
 Patch102:		tdelibs-14.0.0-cups_by_default.patch
@@ -446,6 +448,8 @@ applications for TDE.
 %prep
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
 
+%patch1 -p1 -b .icons
+
 %patch101 -p1 -b .xdg_path
 %patch102 -p1 -b .cups_by_default
 
diff --git a/redhat/tdesdk/tdesdk-14.0.0.spec b/redhat/tdesdk/tdesdk-14.0.0.spec
index 87f1bda6d..01d561bbd 100644
--- a/redhat/tdesdk/tdesdk-14.0.0.spec
+++ b/redhat/tdesdk/tdesdk-14.0.0.spec
@@ -38,10 +38,15 @@ Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
 BuildRequires:	cmake >= 2.8
 BuildRequires:	libtool
 BuildRequires:	pcre-devel
-BuildRequires:	trinity-tqtinterface-devel >= %{version}
-BuildRequires:	trinity-tdelibs-devel >= %{version}
+
+BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-perl-dcop >= %{tde_version}
 # for kbugbuster/libkcal
-BuildRequires:	trinity-tdepim-devel >= %{version}
+BuildRequires:	trinity-tdepim-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+# DB4 support
 %if 0%{?mgaversion} || 0%{?mdkversion}
 #BuildRequires:	%{_lib}db4.8-devel
 %endif
@@ -51,7 +56,7 @@ BuildRequires:	db4-devel
 %if 0%{?suse_version}
 BuildRequires:	libdb-4_8-devel
 %endif
-BuildRequires:	desktop-file-utils
+
 # kbabel,  F-7+: flex >= 2.5.33-9
 BuildRequires:	flex
 # umbrello
@@ -596,7 +601,7 @@ This package is part of Trinity, and a component of the TDE SDK module.
 %{tde_bindir}/includemocs
 %{tde_bindir}/kde-build
 %{tde_bindir}/kdedoc
-%{tde_bindir}/kdekillall
+%{tde_bindir}/tdekillall
 %{tde_bindir}/kdelnk2desktop.py*
 %{tde_bindir}/kdemangen.pl
 %{tde_bindir}/makeobj