RPM Packaging: updates for 3.5.13.2 packages build on OBS

23 files changed, 1796 insertions, 1114 deletions

diff --git a/redhat/dependencies/arts/arts-3.5.13.2.spec b/redhat/dependencies/arts/arts-3.5.13.2.spec
index ad8473da4..57de8c17f 100644
--- a/redhat/dependencies/arts/arts-3.5.13.2.spec
+++ b/redhat/dependencies/arts/arts-3.5.13.2.spec
@@ -29,6 +29,7 @@
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_sbindir %{tde_prefix}/sbin
 %define tde_tdeappdir %{tde_datadir}/applications/kde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
@@ -43,7 +44,7 @@
 Name:		trinity-%{tde_pkg}
 Epoch:		%{tde_epoch}
 Version:	1.5.10
-Release:	%{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
+Release:	%{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
 Summary:	ARTS (analog realtime synthesizer) - the TDE sound system
 Group:		System Environment/Daemons 
 URL:		http://www.trinitydesktop.org/
@@ -62,6 +63,8 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
+%{?tde_patch:Patch1:			%{tde_pkg}-%{tde_version}.patch}
+
 BuildRequires:	libtqt4-devel >= %{tde_epoch}:4.2.0
 BuildRequires:	trinity-filesystem >= %{tde_version}
 Requires:		trinity-filesystem >= %{tde_version}
@@ -83,25 +86,22 @@ BuildRequires:	esound-devel
 # JACK support
 %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?with_jack}
 %define with_jack 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%define jack_devel %{_lib}jack-devel
-%endif
 %if 0%{?rhel} >= 5 || 0%{?fedora}
 %define jack_devel jack-audio-connection-kit-devel
 %endif
-%if 0%{?suse_version}
+%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
 %define jack_devel libjack-devel
 %endif
 BuildRequires:	%{jack_devel}
 %endif
 
 # LIBTOOL
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}ltdl-devel
-%endif
 %if 0%{?rhel} >= 5 || 0%{?fedora}
 BuildRequires:	libtool-ltdl-devel
 %endif
+%if  0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	libltdl-devel
+%endif
 %if 0%{?suse_version}
 %if 0%{?suse_version} >= 1220
 BuildRequires:	libltdl-devel
@@ -110,16 +110,14 @@ BuildRequires:	libtool
 %endif
 %endif
 
+# UUID support
+BuildRequires: libuuid-devel
+
 # MAD support
 %ifarch %{ix86} x86_64
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} 
 %define with_libmad 1
-%if 0%{?mdkversion} || 0%{?mgaversion}
-%define mad_devel %{_lib}mad-devel
-%endif
-%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
 %define mad_devel libmad-devel
-%endif
 BuildRequires:		%{mad_devel}
 %endif
 %endif
@@ -250,6 +248,7 @@ intended for systems running the Pulseaudio server.
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+%{?tde_patch:%patch1 -p1}
 
 
 %build
diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.2.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.2.spec
index 8ecd7f82c..674781e66 100644
--- a/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.2.spec
+++ b/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.2.spec
@@ -29,7 +29,7 @@
 Name:		trinity-avahi-tqt
 Epoch:		%{tde_epoch}
 Version:	0.6.30
-Release:	%{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
+Release:	%{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
 Summary:	Avahi TQt integration library
 Group:		System/Libraries
 URL:		http://www.trinitydesktop.org/
@@ -54,9 +54,26 @@ BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
 
+# GLIB2 support
+BuildRequires:	glib2-devel
+
 # GETTEXT support
 BuildRequires:	gettext-devel
 
+# Xi support
+%if 0%{?rhel} == 4
+BuildRequires:	xorg-x11-devel
+%endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	libxi-devel
+%endif
+%if 0%{?suse_version} >= 1220 || 0%{?rhel} >= 5 || 0%{?fedora}
+BuildRequires:	libXi-devel
+%endif
+%if 0%{?suse_version} == 1140
+BuildRequires:	libXi6-devel
+%endif
+
 # DBUS support
 %if 0%{?suse_version}
 BuildRequires:	dbus-1-devel
@@ -70,7 +87,7 @@ BuildRequires:	libcap-devel
 
 # AVAHI support
 %if 0%{?mgaversion} || 0%{?mdkversion}
-%define avahi_devel %{_lib}avahi-client-devel
+%define avahi_devel libavahi-client-devel
 %endif
 %if 0%{?suse_version} || 0%{?rhel} || 0%{?fedora}
 %define avahi_devel avahi-devel
@@ -176,7 +193,7 @@ into a TQt main loop application.
 
 ##########
 
-%if 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.2.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.2.spec
index ce1fa478c..e5cec6116 100644
--- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.2.spec
+++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.2.spec
@@ -29,8 +29,8 @@
 Name:		trinity-dbus-1-tqt
 Epoch:		%{tde_epoch}
 Version:	0.9
-Release:	%{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
-Summary:	dbus bindings for the Trinity Qt [TQt] interface
+Release:	%{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary:	Dbus bindings for the Trinity Qt [TQt] interface
 Group:		System/Libraries
 URL:		http://www.trinitydesktop.org/
 
@@ -74,7 +74,7 @@ See the dbus description for more information about D-BUS in general.
 ###########
 
 %package -n %{libdbus}-1-tqt0
-Summary:		dbus bindings for the Trinity Qt [TQt] interface
+Summary:		Dbus bindings for the Trinity Qt [TQt] interface
 Group:			System/Libraries
 Provides:		libdbus-1-tqt0 = %{?epoch:%{epoch}:}%{version}-%{release}
 
@@ -104,7 +104,7 @@ See the dbus description for more information about D-BUS in general.
 ##########
 
 %package -n %{libdbus}-1-tqt-devel
-Summary:		dbus bindings for the Trinity Qt [TQt] interface (Development Files)
+Summary:		Dbus bindings for the Trinity Qt [TQt] interface (Development Files)
 Group:			Development/Libraries/C and C++
 Provides:		libdbus-1-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:		%{libdbus}-1-tqt0 = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -137,7 +137,7 @@ See the dbus description for more information about D-BUS in general.
 
 ##########
 
-%if 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.2.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.2.spec
index f61010da4..016c35b90 100644
--- a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.2.spec
+++ b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.2.spec
@@ -29,7 +29,7 @@
 Name:		trinity-dbus-tqt
 Epoch:		%{tde_epoch}
 Version:	0.63
-Release:	%{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
+Release:	%{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
 Summary:	Simple inter-process messaging system
 Group:		System/Libraries
 URL:		http://www.trinitydesktop.org/
diff --git a/redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec b/redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec
index 4ff94304e..22289d865 100644
--- a/redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec
+++ b/redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec
@@ -65,15 +65,11 @@ BuildRequires:	gtk2-devel
 %endif
 
 # CURL support
-%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version}
+%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
 %define libcurl_devel libcurl-devel
 %else
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%define libcurl_devel %{_lib}curl-devel
-%else
 # Specific CURL version for TDE on RHEL 5 (and older)
-#define libcurl_devel trinity-libcurl-devel
-%endif
+%define libcurl_devel trinity-libcurl-devel
 %endif
 %{?libcurl_devel:BuildRequires: %{libcurl_devel}}
 
diff --git a/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec b/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec
index d09b0fed7..e83dfa9eb 100644
--- a/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec
+++ b/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec
@@ -56,15 +56,11 @@ BuildRequires:	make
 BuildRequires:	libtool
 
 # CURL support
-%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version}
+%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
 %define libcurl_devel libcurl-devel
 %else
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%define libcurl_devel %{_lib}curl-devel
-%else
 # Specific CURL version for TDE on RHEL 5 (and older)
-#define libcurl_devel trinity-libcurl-devel
-%endif
+%define libcurl_devel trinity-libcurl-devel
 %endif
 %{?libcurl_devel:BuildRequires: %{libcurl_devel}}
 
@@ -151,6 +147,7 @@ This package contains the development files.
 
 %prep
 %setup -q -n libcarddav-%{version}
+%__sed -i "src/get-carddav-report.c" -e "89s/return TRUE/return NULL/"
 autoreconf --force --install --symlink
 
 
diff --git a/redhat/dependencies/qt3/qt3-3.5.13.2.spec b/redhat/dependencies/qt3/qt3-3.5.13.2.spec
index 0c4d25c81..981f78f2c 100644
--- a/redhat/dependencies/qt3/qt3-3.5.13.2.spec
+++ b/redhat/dependencies/qt3/qt3-3.5.13.2.spec
@@ -10,7 +10,12 @@
 #  qt-devel
 # ...maybe others !!!!
 
+%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
+Name:			qt
+%else
 Name:			qt3
+%endif
+
 Epoch:			1
 Version:		3.3.8.d%{?preversion:_%{preversion}}
 Release:		10%{?dist}
@@ -20,13 +25,10 @@ License:		QPL or GPLv2 or GPLv3
 Group:			System Environment/Libraries
 URL:			http://www.trinitydesktop.org/
 
-%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
-Obsoletes:		qt < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		qt = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Provides:		qt3 = %{?epoch:%{epoch}:}%{version}-%{release}
+
 Source0: trinity-qt3-3.5.13.2%{?preversion:~%{preversion}}.tar.gz
 Source2: qt.sh
 Source3: qt.csh
@@ -48,7 +50,7 @@ Patch27: qt-3.3.6-fontrendering-ml_IN-209097.patch
 Patch29: qt-3.3.8-fontrendering-as_IN-209972.patch
 Patch31: qt-3.3.6-fontrendering-te_IN-211259.patch
 Patch32: qt-3.3.6-fontrendering-214371.patch
-Patch33: qt-3.3.8-fontrendering-#214570.patch
+Patch33: qt-3.3.8-fontrendering-214570.patch
 Patch34: qt-3.3.6-fontrendering-ml_IN-209974.patch
 Patch35: qt-3.3.6-fontrendering-ml_IN-217657.patch
 Patch37: qt-3.3.6-fontrendering-gu-228452.patch
@@ -135,21 +137,71 @@ BuildRequires: mesa-libGL-devel
 BuildRequires: mesa-libGLU-devel
 %endif
 
+%description
+Qt is a GUI software toolkit which simplifies the task of writing and
+maintaining GUI (Graphical User Interface) applications
+for the X Window System.
+
+Qt is written in C++ and is fully object-oriented.
+
+This package contains the shared library needed to run Qt 3
+applications, as well as the README files for Qt 3.
+
+%post
+/sbin/ldconfig
+
+%postun
+/sbin/ldconfig
+
+%files
+%defattr(-,root,root,-)
+%doc FAQ LICENSE* README* changes*
+%dir %{qtdir}
+%dir %{qtdir}/bin
+%dir %{qtdir}/lib
+%dir %{qtdir}/plugins
+%dir %{qtdir}/plugins/sqldrivers
+%dir %{qtdir}/plugins/styles
+%{qtdir}/translations
+%{qtdir}/plugins/designer/
+%if %{immodule}
+%{qtdir}/plugins/inputmethods
+%endif
+%config /etc/profile.d/*
+/etc/ld.so.conf.d/*
+%{qtdir}/lib/libqui.so.*
+%{qtdir}/lib/libqt*.so.*
+
+##########
 
 %package config
 Summary: Graphical configuration tool for programs using Qt 3
 Group: User Interface/Desktops
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
-Obsoletes: qt-config < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:  qt-config = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
+Requires:	qt3 = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	qt3-config = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description config
+Qt is a GUI software toolkit which simplifies the task of writing and
+maintaining GUI (Graphical User Interface) applications
+for the X Window System.
+
+Qt is written in C++ and is fully object-oriented.
+
+This package contains a graphical configuration tool for programs using Qt 3.
+
+%files config
+%defattr(-,root,root,-)
+%{qtdir}/bin/qtconfig
+%{_datadir}/applications/*qtconfig*.desktop
+%{_datadir}/pixmaps/qtconfig3.png
 
+##########
 
 %package devel
 Summary: Development files for the Qt 3 GUI toolkit
 Group: Development/Libraries
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	qt3 = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	qt3-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: freetype-devel
 Requires: fontconfig-devel
 Requires: libpng-devel
@@ -172,87 +224,6 @@ Requires: xorg-x11-proto-devel
 Requires: mesa-libGL-devel
 Requires: mesa-libGLU-devel
 %endif
-%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
-Obsoletes: qt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:  qt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-
-%package devel-docs
-Summary: Documentation for the Qt 3 GUI toolkit
-Group: Development/Libraries
-Requires: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
-Obsoletes: qt-devel-docs < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:  qt-devel-docs = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-
-%package ODBC
-Summary: ODBC drivers for Qt 3's SQL classes
-Group: System Environment/Libraries
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
-Obsoletes: qt-ODBC < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:  qt-ODBC = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-
-%package MySQL
-Summary: MySQL drivers for Qt 3's SQL classes
-Group: System Environment/Libraries
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
-Obsoletes: qt-MySQL < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:  qt-MySQL = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-
-%package PostgreSQL
-Summary: PostgreSQL drivers for Qt 3's SQL classes
-Group: System Environment/Libraries
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
-Obsoletes: qt-PostgreSQL < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:  qt-PostgreSQL = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-
-%package sqlite
-Summary: sqlite drivers for Qt 3's SQL classes
-Group: System Environment/Libraries
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
-Obsoletes: qt-sqlite < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:  qt-sqlite = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-
-
-%package designer
-Summary: Interface designer (IDE) for the Qt 3 toolkit
-Group: Development/Tools
-Requires: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
-Obsoletes: qt-designer < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:  qt-designer = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-
-
-%description
-Qt is a GUI software toolkit which simplifies the task of writing and
-maintaining GUI (Graphical User Interface) applications
-for the X Window System.
-
-Qt is written in C++ and is fully object-oriented.
-
-This package contains the shared library needed to run Qt 3
-applications, as well as the README files for Qt 3.
-
-
-%description config
-Qt is a GUI software toolkit which simplifies the task of writing and
-maintaining GUI (Graphical User Interface) applications
-for the X Window System.
-
-Qt is written in C++ and is fully object-oriented.
-
-This package contains a graphical configuration tool for programs using Qt 3.
-
 
 %description devel
 The %{name}-devel package contains the files necessary to develop
@@ -262,32 +233,143 @@ object compiler.
 Install %{name}-devel if you want to develop GUI applications using the Qt 3
 toolkit.
 
+%files devel
+%defattr(-,root,root,-)
+%{qt_docdir}/
+%{qtdir}/bin/moc
+%{qtdir}/bin/uic
+%{qtdir}/bin/findtr
+%{qtdir}/bin/qt20fix
+%{qtdir}/bin/qtrename140
+%{qtdir}/bin/assistant
+%{qtdir}/bin/qm2ts
+%{qtdir}/bin/qmake
+%{qtdir}/bin/qembed
+%{qtdir}/bin/linguist
+%{qtdir}/bin/lupdate
+%{qtdir}/bin/lrelease
+%{qtdir}/include
+%{qtdir}/mkspecs
+%{qtdir}/lib/libqt*.so
+%{qtdir}/lib/libqui.so
+%{qtdir}/lib/libeditor.a
+%{qtdir}/lib/libdesigner*.a
+%{qtdir}/lib/libqassistantclient.a
+%{qtdir}/lib/*.prl
+%{qtdir}/phrasebooks
+%{_libdir}/pkgconfig/*
+%{_datadir}/applications/*linguist*.desktop
+%{_datadir}/applications/*assistant*.desktop
+%{_datadir}/pixmaps/linguist3.png
+%{_datadir}/pixmaps/assistant3.png
+
+# QT 3.3.8.D (TDE): 4 binaries have appeared
+%{qtdir}/bin/createcw
+%{qtdir}/bin/makeqpf
+%{qtdir}/bin/mergetr
+%{qtdir}/bin/msg2qm
+
+##########
+
+%package devel-docs
+Summary: Documentation for the Qt 3 GUI toolkit
+Group: Development/Libraries
+Requires: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
+Obsoletes: qt-devel-docs < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:  qt-devel-docs = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
 
 %description devel-docs
 The %{name}-devel-docs package contains the man pages, the HTML documentation and
 example programs for Qt 3.
 
+%files devel-docs
+%defattr(-,root,root,-)
+%doc examples
+%doc tutorial
+%{_mandir}/*/*
+
+##########
+
+%package ODBC
+Summary: ODBC drivers for Qt 3's SQL classes
+Group: System Environment/Libraries
+Requires:	qt3 = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	qt3-ODBC = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description ODBC
 ODBC driver for Qt 3's SQL classes (QSQL)
 
+%files ODBC
+%defattr(-,root,root,-)
+%{qtdir}/plugins/sqldrivers/libqsqlodbc.so
+
+##########
+
+%package MySQL
+Summary: MySQL drivers for Qt 3's SQL classes
+Group: System Environment/Libraries
+Requires:	qt3 = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	qt3-MySQL = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description MySQL
 MySQL driver for Qt 3's SQL classes (QSQL)
 
+%files MySQL
+%defattr(-,root,root,-)
+%{qtdir}/plugins/sqldrivers/libqsqlmysql.so
+
+##########
+
+%package PostgreSQL
+Summary: PostgreSQL drivers for Qt 3's SQL classes
+Group: System Environment/Libraries
+Requires:	qt3 = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	qt3-PostgreSQL = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description PostgreSQL
 PostgreSQL driver for Qt 3's SQL classes (QSQL)
 
+%files PostgreSQL
+%defattr(-,root,root,-)
+%{qtdir}/plugins/sqldrivers/libqsqlpsql.so
+
+##########
+
+%package sqlite
+Summary: sqlite drivers for Qt 3's SQL classes
+Group: System Environment/Libraries
+Requires:	qt3 = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	qt3-sqlite = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description sqlite
 sqlite driver for Qt 3's SQL classes (QSQL)
 
+%files sqlite
+%defattr(-,root,root,-)
+%{qtdir}/plugins/sqldrivers/libqsqlite.so
+
+##########
+
+%package designer
+Summary: Interface designer (IDE) for the Qt 3 toolkit
+Group: Development/Tools
+Requires:	qt3 = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	qt3-designer = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description designer
 The %{name}-designer package contains an User Interface designer tool
 for the Qt 3 toolkit.
 
+%files designer
+%defattr(-,root,root,-)
+%{qtdir}/templates
+%{qtdir}/bin/designer
+%{_datadir}/applications/*designer*.desktop
+%{_datadir}/pixmaps/designer3.png
+
+##########
 
 %prep
 %setup -q -n trinity-qt3-3.5.13.2%{?preversion:~%{preversion}}
@@ -523,106 +605,10 @@ install -m 644 tools/assistant/images/linguist.png %{buildroot}%{_datadir}/pixma
 # own style directory
 mkdir -p %{buildroot}%{qtdir}/plugins/styles
 
+
 %clean
 rm -rf %{buildroot}
 
-%post
-/sbin/ldconfig
-
-%postun
-/sbin/ldconfig
-
-%files
-%defattr(-,root,root,-)
-%doc FAQ LICENSE* README* changes*
-%dir %{qtdir}
-%dir %{qtdir}/bin
-%dir %{qtdir}/lib
-%dir %{qtdir}/plugins
-%dir %{qtdir}/plugins/sqldrivers
-%dir %{qtdir}/plugins/styles
-%{qtdir}/translations
-%{qtdir}/plugins/designer/
-%if %{immodule}
-%{qtdir}/plugins/inputmethods
-%endif
-%config /etc/profile.d/*
-/etc/ld.so.conf.d/*
-%{qtdir}/lib/libqui.so.*
-%{qtdir}/lib/libqt*.so.*
-
-%files config
-%defattr(-,root,root,-)
-%{qtdir}/bin/qtconfig
-%{_datadir}/applications/*qtconfig*.desktop
-%{_datadir}/pixmaps/qtconfig3.png
-
-%files devel
-%defattr(-,root,root,-)
-%{qt_docdir}/
-%{qtdir}/bin/moc
-%{qtdir}/bin/uic
-%{qtdir}/bin/findtr
-%{qtdir}/bin/qt20fix
-%{qtdir}/bin/qtrename140
-%{qtdir}/bin/assistant
-%{qtdir}/bin/qm2ts
-%{qtdir}/bin/qmake
-%{qtdir}/bin/qembed
-%{qtdir}/bin/linguist
-%{qtdir}/bin/lupdate
-%{qtdir}/bin/lrelease
-%{qtdir}/include
-%{qtdir}/mkspecs
-%{qtdir}/lib/libqt*.so
-%{qtdir}/lib/libqui.so
-%{qtdir}/lib/libeditor.a
-%{qtdir}/lib/libdesigner*.a
-%{qtdir}/lib/libqassistantclient.a
-%{qtdir}/lib/*.prl
-%{qtdir}/phrasebooks
-%{_libdir}/pkgconfig/*
-%{_datadir}/applications/*linguist*.desktop
-%{_datadir}/applications/*assistant*.desktop
-%{_datadir}/pixmaps/linguist3.png
-%{_datadir}/pixmaps/assistant3.png
-
-# QT 3.3.8.D (TDE): 4 binaries have appeared
-%{qtdir}/bin/createcw
-%{qtdir}/bin/makeqpf
-%{qtdir}/bin/mergetr
-%{qtdir}/bin/msg2qm
-
-
-%files devel-docs
-%defattr(-,root,root,-)
-%doc examples
-%doc tutorial
-%{_mandir}/*/*
-
-%files sqlite
-%defattr(-,root,root,-)
-%{qtdir}/plugins/sqldrivers/libqsqlite.so
-
-%files ODBC
-%defattr(-,root,root,-)
-%{qtdir}/plugins/sqldrivers/libqsqlodbc.so
-
-%files PostgreSQL
-%defattr(-,root,root,-)
-%{qtdir}/plugins/sqldrivers/libqsqlpsql.so
-
-%files MySQL
-%defattr(-,root,root,-)
-%{qtdir}/plugins/sqldrivers/libqsqlmysql.so
-
-%files designer
-%defattr(-,root,root,-)
-%{qtdir}/templates
-%{qtdir}/bin/designer
-%{_datadir}/applications/*designer*.desktop
-%{_datadir}/pixmaps/designer3.png
-
 
 %changelog
 * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-10
diff --git a/redhat/dependencies/tqca-tls/tqca-tls-3.5.13.2.spec b/redhat/dependencies/tqca-tls/tqca-tls-3.5.13.2.spec
index 808415d93..ab21ff875 100644
--- a/redhat/dependencies/tqca-tls/tqca-tls-3.5.13.2.spec
+++ b/redhat/dependencies/tqca-tls/tqca-tls-3.5.13.2.spec
@@ -24,9 +24,9 @@
 %define tde_libdir %{tde_prefix}/%{_lib}
 
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
-%define libtqt3 %{_lib}tqt3
+%define libtqt3 %{_lib}qt3
 %else
-%define libtqt3 libtqt3
+%define libtqt3 libqt3
 %endif
 
 
diff --git a/redhat/dependencies/tqca/tqca-3.5.13.2.spec b/redhat/dependencies/tqca/tqca-3.5.13.2.spec
index 2c6567fd3..4f8d1f9d3 100644
--- a/redhat/dependencies/tqca/tqca-3.5.13.2.spec
+++ b/redhat/dependencies/tqca/tqca-3.5.13.2.spec
@@ -33,7 +33,7 @@
 Name:		trinity-%{tde_pkg}
 Epoch:		%{tde_epoch}
 Version:	1.0
-Release:	%{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant}
+Release:	%{?!preversion:4}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
 Summary:	TQt Cryptographic Architecture
 Group:		Development/Libraries/C and C++
 URL:		http://www.trinitydesktop.org/
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec
index dd8704c7d..8ab653efa 100755
--- a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec
@@ -39,7 +39,7 @@
 Name:		trinity-%{tde_pkg}
 Epoch:		%{tde_epoch}
 Version:	4.2.0
-Release:	%{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant}
+Release:	%{?!preversion:3}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
 Summary:	The Trinity Qt Interface Libraries
 Group:		System/GUI/Other
 URL:		http://www.trinitydesktop.org/
@@ -69,6 +69,9 @@ BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
+# UUID support
+BuildRequires: libuuid-devel
+
 # PTHREAD support
 %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
 BuildRequires:	pth-devel
@@ -92,7 +95,7 @@ BuildRequires: Mesa-libGLU-devel
 BuildRequires:	xorg-x11-devel
 %endif
 %if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}xi-devel
+BuildRequires:	libxi-devel
 %endif
 %if 0%{?suse_version} >= 1220 || 0%{?rhel} >= 5 || 0%{?fedora}
 BuildRequires:	libXi-devel
@@ -152,6 +155,7 @@ Provides:	libtqt4-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 Requires:	%{libtqt4} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	qt3-devel >= 3.3.8d
+Requires:	libuuid-devel
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1300
 Requires:		trinity-cmake-macros
diff --git a/redhat/extras/akode/akode-3.5.13.2.spec b/redhat/extras/akode/akode-3.5.13.2.spec
index 725a75a26..1dd9b5da3 100644
--- a/redhat/extras/akode/akode-3.5.13.2.spec
+++ b/redhat/extras/akode/akode-3.5.13.2.spec
@@ -1,49 +1,61 @@
-# 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 3.5.13 specific building variables
+#
+# spec file for package akode (version 3.5.13-SRU)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
+#
+
+# BUILD WARNING:
+#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
+#  Having KDE libraries may cause FTBFS here !
+
+# TDE variables
+%define tde_epoch 1
+%define tde_version 3.5.13.2
+%define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
 %define tde_mandir %{tde_datadir}/man
-
 %define tde_tdeappdir %{tde_datadir}/applications/kde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
-%define _docdir %{tde_docdir}
+# 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
 
-Summary: 	Audio-decoding framework 
 Name:		trinity-akode 
+Summary: 	Audio-decoding framework 
+Group: 		System Environment/Libraries
+Epoch:		%{tde_epoch}
 Version:	2.0.2
-Release:	5%{?dist}%{?_variant}
+Release:	1%{?dist}%{?_variant}
+URL:		http://www.kde-apps.org/content/show.php?content=30375
 
 License:	LGPLv2+
-Group: 		System Environment/Libraries
 #URL:		http://carewolf.com/akode/  
-URL:		http://www.kde-apps.org/content/show.php?content=30375
 
-Source0:	akode-2.0.2.tar.bz2
+Source0:	akode-%{tde_version}.tar.gz
 
 Prefix:		%{tde_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
-# Legacy Fedora 9 patches
-Patch1: akode-pulseaudio.patch
-Patch2: akode-2.0.2-multilib.patch
-Patch3: akode-2.0.2-flac113-portable.patch
-Patch4: akode-2.0.2-gcc43.patch
-
-# New patches
-Patch10: akode-autotools.patch
-Patch11: akode-2.0.2-fix_ffmpeg_include.patch
-
 # FLAC support
 %define _with_flac --with-flac
 %if 0%{?mgaversion} || 0%{?mdkversion}
@@ -145,15 +157,15 @@ aKode also has the following audio outputs:
 %package devel
 Summary: Headers for developing programs that will use %{name} 
 Group:   Development/Libraries
-Requires: %{name} = %{version}-%{release}
-%{?_with_jack:Requires: %{name}-jack = %{version}-%{release}}
-%{?_with_pulseaudio:Requires: %{name}-pulseaudio = %{version}-%{release}}
-%{?_with_libsamplerate:Requires: %{name}-libsamplerate = %{version}-%{release}}
-%{?_with_libmad:Requires: %{name}-libmad = %{version}-%{release}}
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+%{?_with_jack:Requires: %{name}-jack = %{?epoch:%{epoch}:}%{version}-%{release}}
+%{?_with_pulseaudio:Requires: %{name}-pulseaudio = %{?epoch:%{epoch}:}%{version}-%{release}}
+%{?_with_libsamplerate:Requires: %{name}-libsamplerate = %{?epoch:%{epoch}:}%{version}-%{release}}
+%{?_with_libmad:Requires: %{name}-libmad = %{?epoch:%{epoch}:}%{version}-%{release}}
 Requires: pkgconfig
 
 %description devel
-%{summary}.
+This package contains the development files for Akode.
 
 %files devel
 %defattr(-,root,root,-)
@@ -176,10 +188,10 @@ Requires: pkgconfig
 %package jack 
 Summary: Jack audio output backend for %{name}
 Group:   Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description jack 
-%{summary}.
+This package contains the Jack audio output backend for Akode.
 
 %files jack 
 %defattr(-,root,root,-)
@@ -201,10 +213,10 @@ Requires: %{name} = %{version}-%{release}
 %package pulseaudio
 Summary: Pulseaudio output backend for %{name}
 Group:   Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description pulseaudio
-%{summary}.
+This package contains the pulseaudio backend for Akode.
 Recommended for network transparent audio.
 
 %files pulseaudio
@@ -229,10 +241,10 @@ Recommended for network transparent audio.
 Summary: Resampler based on libsamplerate for %{name}
 Group:   Development/Libraries
 License: GPLv2+
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description libsamplerate 
-%{summary}.
+This package contains the samplerate decoder for Akode.
 
 # License: GPLv2+
 %files libsamplerate
@@ -255,10 +267,10 @@ Requires: %{name} = %{version}-%{release}
 %package libmad
 Summary: Decoder based on libmad for %{name}
 Group:   Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description libmad 
-%{summary}.
+This package contains the mad decoder for Akode.
 
 %files libmad
 %{tde_libdir}/libakode_mpeg_decoder.la
@@ -274,28 +286,23 @@ Requires: %{name} = %{version}-%{release}
 
 ##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
 ##########
 
 %prep
-%setup -q -n akode-%{version}
-
-%patch1 -p1 -b .pulseaudio
-%patch2 -p1 -b .multilib
-%patch3 -p4 -b .flac113_portable
-%patch4 -p1 -b .gcc43
-
-%patch10 -p1 -b .autotools
-%patch11 -p1 -b .ffmpeg
+%setup -q -n akode-2.0.2
 
 %__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 cvs
+%__make -f admin/Makefile.common
+
 
 %build
+export CXXFLAGS="${RPM_OPT_FLAGS} -DHAVE_STDINT_H"
+
 %configure \
   --bindir=%{tde_bindir} \
   --libdir=%{tde_libdir} \
@@ -342,7 +349,7 @@ done
 
 
 %changelog
-* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 2.0.2-5
+* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1:2.0.2-1
 - Build for Fedora 19
 
 * Sat Jan 19 2013 Francois Andriot <francois.andriot@free.fr> - 2.0.2-4
diff --git a/redhat/extras/brp-check-trinity/brp-check-trinity-3.5.13.2.spec b/redhat/extras/brp-check-trinity/brp-check-trinity-3.5.13.2.spec
new file mode 100644
index 000000000..ad424e496
--- /dev/null
+++ b/redhat/extras/brp-check-trinity/brp-check-trinity-3.5.13.2.spec
@@ -0,0 +1,107 @@
+#
+# spec file for package brp-check-trinity (version 3.5.13-SRU)
+#
+# 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_version 3.5.13.2
+%define tde_prefix /opt/trinity
+
+Name:		brp-check-trinity
+Version:	1.0
+Release:	1%{?dist}
+Summary:	Build root policy check scripts for Trinity
+Group:		System Environment/Daemons 
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Project
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:	noarch
+
+BuildRequires:	update-desktop-files
+BuildRequires:	brp-check-suse
+BuildRequires:	brp-extract-appdata
+Requires:	update-desktop-files
+Requires:	brp-check-suse
+Requires:	brp-extract-appdata
+Requires:	sed
+
+
+
+%description
+This package dynamically patches the openSUSE brp script to allow
+building of Trinity Desktop Environment (TDE) instead of KDE3.
+It should not be installed on runtime computer.
+
+
+%files
+
+%post
+for i in \
+	brp-desktop.data/applications.menu \
+	brp-desktop.data/kde-settings.menu \
+	brp-desktop.data/xdg_menu \
+	brp-suse.d/brp-25-symlink \
+	brp-suse.d/brp-72-extract-appdata \
+	suse_update_desktop_file.sh \
+; do
+	echo "Patching file '/usr/lib/rpm/${i}' ..."
+	install -D "/usr/lib/rpm/${i}" "/usr/lib/rpm.orig/${i}"
+	sed -i "/usr/lib/rpm/${i}" \
+		-e "s|opt/kde3|opt/trinity|g" \
+		-e "s|kde-settings-|tde-settings-|g" \
+		-e "s|doc/kde|doc/tde|g" \
+		-e "s|kde_xdgdata|tde_xdgdata|g" \
+done
+
+
+%postun
+for i in \
+	brp-desktop.data/applications.menu \
+	brp-desktop.data/kde-settings.menu \
+	brp-desktop.data/xdg_menu \
+	brp-suse.d/brp-25-symlink \
+	brp-suse.d/brp-72-extract-appdata \
+	suse_update_desktop_file.sh \
+; do
+	echo "Restoring file '/usr/lib/rpm/${i}' ..."
+	install "/usr/lib/rpm.orig/${i}" "/usr/lib/rpm/${i}"
+done
+rm -rf "/usr/lib/rpm.orig"
+
+##########
+
+%prep
+
+%build
+
+%install
+
+%clean
+%__rm -rf %{?buildroot}
+
+
+%changelog
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-1
+- Initial release for TDE R14.0.0
diff --git a/redhat/extras/trinity-desktop/trinity-desktop-3.5.13.2.spec b/redhat/extras/trinity-desktop/trinity-desktop-3.5.13.2.spec
index 3ebb6f2a1..0aa92d42d 100644
--- a/redhat/extras/trinity-desktop/trinity-desktop-3.5.13.2.spec
+++ b/redhat/extras/trinity-desktop/trinity-desktop-3.5.13.2.spec
@@ -80,27 +80,9 @@ Requires:	trinity-tdewebdev >= %{version}
 Group:		User Interface/Desktops
 Summary:	Meta-package to install all TDE applications
 
-# Some applications are disabled for now ...
-# Compiz-related stuff does not work (obsolete)
-#Requires: trinity-compizconfig-backend-kconfig
-#Requires: trinity-desktop-effects-kde
-#Requires: trinity-fusion-icon
-
-# Obsolete l10n package
-#Requires: trinity-filelight-l10n
-
-# Not even an RPM package ...
-#Requires: trinity-konstruct
-
-# Debian/Ubuntu specific ...
-#Requires: trinity-adept
-
-# Future R14 packages
-#Requires: trinity-kvpnc
-#Requires: trinity-qt4-tqt-theme-engine
-
 # Warning, k9copy requires ffmpeg
 # Warning, tderadio requires libmp3lame
+
 Requires: trinity-abakus
 Requires: trinity-amarok
 Requires: trinity-basket
@@ -109,8 +91,8 @@ Requires: trinity-digikam
 Requires: trinity-dolphin
 Requires: trinity-filelight
 Requires: trinity-gwenview
-#Requires: trinity-gwenview-i18n
 Requires: trinity-k3b
+Requires: trinity-k9copy
 Requires: trinity-kaffeine
 Requires: trinity-kaffeine-mozilla
 Requires: trinity-katapult
@@ -119,7 +101,6 @@ Requires: trinity-kbfx
 Requires: trinity-kbookreader
 Requires: trinity-kchmviewer
 Requires: trinity-kcpuload
-Requires: trinity-k9copy
 Requires: trinity-kdiff3
 Requires: trinity-kdirstat
 Requires: trinity-keep
@@ -147,22 +128,22 @@ Requires: trinity-ktorrent
 Requires: trinity-kuickshow
 Requires: trinity-kvirc
 Requires: trinity-kvkbd
-Requires: trinity-twin-style-crystal
 Requires: trinity-piklab
 Requires: trinity-potracegui
 Requires: trinity-smb4k
 Requires: trinity-smartcardauth
 Requires: trinity-soundkonverter
 Requires: trinity-tde-guidance
-Requires: trinity-tde-guidance-powermanager
 Requires: trinity-tde-style-lipstik
 Requires: trinity-tde-style-qtcurve
 Requires: trinity-tde-systemsettings
 Requires: trinity-tdeio-apt
 Requires: trinity-tdeio-locate
 Requires: trinity-tdeio-umountwrapper
+Requires: trinity-tderadio
 Requires: trinity-tdmtheme
 Requires: trinity-tellico
+Requires: trinity-twin-style-crystal
 Requires: trinity-wlassistant
 Requires: trinity-yakuake
 
@@ -171,42 +152,46 @@ Requires: trinity-yakuake
 Requires: trinity-tdesudo
 %endif
 
-# Disabled applications for RHEL5
+# RHEL5: pilot library is too old
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+Requires: trinity-kpilot
+%endif
+
+# Network management
+# RHEL 6 and openSUSE 11.x: knetworkmanager8
+%if 0%{?rhel} == 6
+Requires: trinity-knetworkmanager
+%endif
+%if 0%{?suse_version} && 0%{?suse_version} <= 1140
+Requires: trinity-knetworkmanager
+%endif
+
+# Power management
+Requires: trinity-tde-guidance-powermanager
 %if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
 # On RHEL 5, HAL version is too old for kpowersave .
 Requires: trinity-kpowersave
-# On RHEL 5, GTK2 version is too old for GTK stuff ...
-Requires: trinity-gtk-qt-engine
-# RHEL5: kpilot library is too old
-Requires: trinity-kpilot
 %endif
 
+# Decoration-related stuff (not installed by default)
+#Requires: trinity-kgtk-qt3
+#Requires: trinity-gtk-qt-engine
+#Requires: trinity-gtk3-tqt-engine
+#Requires: trinity-qt4-tqt-theme-engine
+
 # On RHEL 5/7, lilypond is not available, so no rosegarden :'-(
 %if 0%{?rhel} == 5 || 0%{?rhel} == 7
 %else
 Requires: trinity-rosegarden
 %endif
 
-# On RHEL 7, lirc is not available, so not tderaiod :'-(
-%if 0%{?rhel} != 7
-Requires: trinity-tderadio
-%endif
-
-# This one causes several crashes . Obsolete.
-#Requires: trinity-kgtk-qt3
-#Obsoletes: trinity-kgtk-qt3
-
-# OBSOLETE: beagle does not exist anymore. Kerry is now useless.
-# RHEL, openSUSE 12: no Beagle library
-Obsoletes: trinity-kerry
+# Compiz-related stuff does not work (obsolete)
+#Requires: trinity-compizconfig-backend-kconfig
+#Requires: trinity-desktop-effects-kde
+#Requires: trinity-fusion-icon
 
-# RHEL 6 and openSUSE 11.x: knetworkmanager8
-%if 0%{?rhel} == 6
-Requires: trinity-knetworkmanager
-%endif
-%if 0%{?suse_version} && 0%{?suse_version} <= 1140
-Requires: trinity-knetworkmanager
-%endif
+# Useless l10n package
+#Requires: trinity-filelight-l10n
 
 # RHEL 4
 %if 0%{?rhel} >= 5 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
@@ -216,7 +201,7 @@ Requires: trinity-kmplayer
 # No OTR support
 Requires: trinity-kopete-otr
 # No DBUS support
-Requires: trinity-kdbusnotification
+Requires: trinity-kdbusfnotification
 # Subversion 1.1 is too old
 Requires: trinity-tdesvn
 %endif
diff --git a/redhat/main/tdeaccessibility/tdeaccessibility-3.5.13.2.spec b/redhat/main/tdeaccessibility/tdeaccessibility-3.5.13.2.spec
index 3f28a0b96..783b2adfd 100644
--- a/redhat/main/tdeaccessibility/tdeaccessibility-3.5.13.2.spec
+++ b/redhat/main/tdeaccessibility/tdeaccessibility-3.5.13.2.spec
@@ -1,56 +1,98 @@
-# 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
-
+#
+# spec file for package tdeaccessibility (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/
+#
+
+# BUILD WARNING:
+#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
+#  Having KDE libraries may cause FTBFS here !
+
+# TDE variables
+%define tde_epoch 1
 %define tde_version 3.5.13.2
-
-# TDE specific building variables
+%define tde_pkg tdeaccessibility
+%define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
-
 %define tde_tdeappdir %{tde_datadir}/applications/kde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
-%define _docdir %{tde_docdir}
+# 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
 
 
-Summary:		Trinity Desktop Environment - Accessibility
 Name:			trinity-tdeaccessibility
+Summary:		Trinity Desktop Environment - Accessibility
 Version:		%{tde_version}
-Release:		%{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
-
-License:		GPLv2
-Group:			User Interface/Desktops
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
+Release:		%{?!preversion:3}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Group:			System/GUI/Other
 URL:			http://www.trinitydesktop.org/
 
-Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Project
+#Packager:	Francois Andriot <francois.andriot@free.fr>
 
 Prefix:			%{tde_prefix}
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	desktop-file-utils
-BuildRequires:	trinity-akode-devel
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
+Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	trinity-tdemultimedia-devel >= %{tde_version}
 
-BuildRequires:	alsa-lib-devel
+BuildRequires:	autoconf automake libtool m4
+BuildRequires:	gcc-c++
+BuildRequires:	desktop-file-utils
+BuildRequires:	fdupes
 
-# X11 Libraries
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
-BuildRequires: libXtst-devel
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
 %endif
 
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# AUDIOFILE support
+BuildRequires:	audiofile-devel
+
+# AKODE support
+%if 0%{?with_akode}
+BuildRequires: trinity-akode-devel
+%{?with_mad:BuildRequires: trinity-akode-libmad}
+%endif
+
+# ALSA support
+BuildRequires:	alsa-lib-devel
+
 # XCB support
 %if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?pclinuxos}
 BuildRequires:	libxcb-devel
@@ -61,35 +103,24 @@ BuildRequires:	%{_lib}xcb-devel
 %endif
 %endif
 
-# X11 stuff
+# XAU support
 %if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}xi-devel
 %if 0%{?mgaversion} >= 4
-BuildRequires:	%{_lib}xext-devel
-BuildRequires:	%{_lib}x11-devel
 BuildRequires:	%{_lib}xau-devel
 %else
-BuildRequires:	%{_lib}xext%{?mgaversion:6}-devel
-BuildRequires:	%{_lib}x11%{?mgaversion:_6}-devel
 BuildRequires:	%{_lib}xau%{?mgaversion:6}-devel
 %endif
 %endif
 %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
-BuildRequires:	libXi-devel
-BuildRequires:	libXext-devel
-BuildRequires:	libX11-devel
 BuildRequires:	libXau-devel
 %endif
-%if 0%{?rhel} == 4 || 0%{?suse_version} == 1140
-BuildRequires:	xorg-x11-devel
-%endif
 
 Obsoletes:		trinity-kdeaccessibility < %{version}-%{release}
 Provides:		trinity-kdeaccessibility = %{version}-%{release}
 Obsoletes:		trinity-kdeaccessibility-libs < %{version}-%{release}
 Provides:		trinity-kdeaccessibility-libs = %{version}-%{release}
 
-Requires: trinity-kde-icons-mono = %{version}-%{release}
+Requires: trinity-tde-icons-mono = %{version}-%{release}
 Requires: trinity-kbstate = %{version}-%{release}
 Requires: trinity-kmag = %{version}-%{release}
 Requires: trinity-kmousetool = %{version}-%{release}
@@ -111,7 +142,7 @@ Included with this package are:
 
 %package -n trinity-tde-icons-mono
 Summary:	A monochromatic icons theme for TDE
-Group:		User Interface/Desktops
+Group:		System/GUI/Other
 
 Obsoletes:	trinity-kde-icons-mono < %{version}-%{release}
 Provides:	trinity-kde-icons-mono = %{version}-%{release}
@@ -123,14 +154,21 @@ This package is part of Trinity, as a component of the TDE accessibility module.
 
 %files -n trinity-tde-icons-mono
 %defattr(-,root,root,-)
+%dir %{tde_datadir}/icons/mono
+%dir %{tde_datadir}/icons/mono/scalable
+%dir %{tde_datadir}/icons/mono/scalable/actions
+%dir %{tde_datadir}/icons/mono/scalable/apps
+%dir %{tde_datadir}/icons/mono/scalable/devices
+%dir %{tde_datadir}/icons/mono/scalable/filesystems
+%dir %{tde_datadir}/icons/mono/scalable/mimetypes
 %{tde_datadir}/icons/mono/index.theme
 %{tde_datadir}/icons/mono/scalable/*/*.svgz
 
 ##########
 
 %package -n trinity-kbstate
-Summary:	a keyboard status applet for TDE
-Group:		User Interface/Desktops
+Summary:	A keyboard status applet for TDE
+Group:		System/GUI/Other
 
 %description -n trinity-kbstate
 A panel applet that displays the keyboard status.
@@ -148,7 +186,7 @@ This package is part of Trinity, as a component of the TDE accessibility module.
 
 %package -n trinity-kmag
 Summary:	A screen magnifier for TDE
-Group:		User Interface/Desktops
+Group:		System/GUI/Other
 
 %description -n trinity-kmag
 TDE's screen magnifier tool.
@@ -163,7 +201,7 @@ This package is part of Trinity, as a component of the TDE accessibility module.
 %files -n trinity-kmag
 %defattr(-,root,root,-)
 %{tde_bindir}/kmag
-%{tde_datadir}/applnk/Applications/kmag.desktop
+%{tde_tdeappdir}/kmag.desktop
 %{tde_datadir}/apps/kmag/
 %{tde_datadir}/icons/hicolor/*/apps/kmag.png
 %{tde_datadir}/icons/locolor/*/apps/kmag.png
@@ -187,7 +225,7 @@ done
 
 %package -n trinity-kmousetool
 Summary:	TDE mouse manipulation tool for the disabled
-Group:		User Interface/Desktops
+Group:		System/GUI/Other
 
 %description -n trinity-kmousetool
 KMouseTool clicks the mouse whenever the mouse cursor pauses briefly. It was
@@ -199,7 +237,7 @@ This package is part of Trinity, as a component of the TDE accessibility module.
 %files -n trinity-kmousetool
 %defattr(-,root,root,-)
 %{tde_bindir}/kmousetool
-%{tde_datadir}/applnk/Applications/kmousetool.desktop
+%{tde_tdeappdir}/kmousetool.desktop
 %{tde_datadir}/apps/kmousetool/
 %{tde_datadir}/icons/hicolor/*/apps/kmousetool.png
 %{tde_tdedocdir}/HTML/en/kmousetool/
@@ -220,7 +258,7 @@ done
 
 %package -n trinity-kmouth
 Summary:	A type-and-say KDE frontend for speech synthesizers
-Group:		User Interface/Desktops
+Group:		System/GUI/Other
 
 %description -n trinity-kmouth
 KDE's type-and-say frontend for speech synthesizers.
@@ -234,7 +272,7 @@ This package is part of Trinity, as a component of the TDE accessibility module.
 %defattr(-,root,root,-)
 %{tde_datadir}/config/kmouthrc
 %{tde_bindir}/kmouth
-%{tde_datadir}/applnk/Applications/kmouth.desktop
+%{tde_tdeappdir}/kmouth.desktop
 %{tde_datadir}/apps/kmouth/
 %{tde_datadir}/icons/hicolor/*/actions/speak.png
 %{tde_datadir}/icons/hicolor/*/actions/nospeak.png
@@ -259,7 +297,7 @@ done
 
 %package -n trinity-ksayit
 Summary:	A frontend for the TDE Text-to-Speech system
-Group:		User Interface/Desktops
+Group:		System/GUI/Other
 
 %description -n trinity-ksayit
 Text-to-speech front-end to kttsd.
@@ -269,7 +307,6 @@ This package is part of Trinity, as a component of the TDE accessibility module.
 %files -n trinity-ksayit
 %defattr(-,root,root,-)
 %{tde_bindir}/ksayit
-%{tde_tdeincludedir}/ksayit_fxplugin.h
 %{tde_tdelibdir}/libFreeverb_plugin.la
 %{tde_tdelibdir}/libFreeverb_plugin.so
 %{tde_libdir}/libKTTSD_Lib.so.*
@@ -301,7 +338,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-kttsd
 Summary:	A Text-to-Speech system for TDE
-Group:		User Interface/Desktops
+Group:		System/GUI/Other
 
 %description -n trinity-kttsd
 The KDE Text-to-Speech system is a plugin based service that allows any KDE
@@ -322,8 +359,10 @@ Homepage: http://accessibility.kde.org/developer/kttsd
 %{tde_tdelibdir}/kcm_kttsd.so
 %{tde_tdelibdir}/ktexteditor_kttsd.la
 %{tde_tdelibdir}/ktexteditor_kttsd.so
+%if 0%{?with_akode}
 %{tde_tdelibdir}/libkttsd_akodeplugin.la
 %{tde_tdelibdir}/libkttsd_akodeplugin.so
+%endif
 %{tde_tdelibdir}/libkttsd_alsaplugin.la
 %{tde_tdelibdir}/libkttsd_alsaplugin.so
 %{tde_tdelibdir}/libkttsd_artsplugin.la
@@ -349,14 +388,18 @@ Homepage: http://accessibility.kde.org/developer/kttsd
 %{tde_libdir}/libkttsd.so.*
 %{tde_tdeappdir}/kcmkttsd.desktop
 %{tde_tdeappdir}/kttsmgr.desktop
-%{tde_datadir}/apps/ktexteditor_kttsd/ktexteditor_kttsdui.rc
+%{tde_datadir}/apps/ktexteditor_kttsd/
 %exclude %{tde_datadir}/apps/kttsd/hadifix/xslt/SSMLtoTxt2pho.xsl
 %{tde_datadir}/apps/kttsd/
 %{tde_datadir}/icons/hicolor/16x16/actions/female.png
 %{tde_datadir}/icons/hicolor/16x16/actions/male.png
+%{tde_datadir}/icons/hicolor/*/apps/kttsd.png
+%{tde_datadir}/icons/hicolor/*/apps/kcmkttsd.png
 %{tde_datadir}/services/ktexteditor_kttsd.desktop
 %{tde_datadir}/services/kttsd.desktop
+%if 0%{?with_akode}
 %{tde_datadir}/services/kttsd_akodeplugin.desktop
+%endif
 %{tde_datadir}/services/kttsd_alsaplugin.desktop
 %{tde_datadir}/services/kttsd_artsplugin.desktop
 %{tde_datadir}/services/kttsd_commandplugin.desktop
@@ -371,8 +414,6 @@ Homepage: http://accessibility.kde.org/developer/kttsd
 %{tde_datadir}/servicetypes/kttsd_audioplugin.desktop
 %{tde_datadir}/servicetypes/kttsd_filterplugin.desktop
 %{tde_datadir}/servicetypes/kttsd_synthplugin.desktop
-%{tde_datadir}/icons/crystalsvg/*/apps/kttsd.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kttsd.svgz
 %{tde_tdedocdir}/HTML/en/kttsd/
 
 %post -n trinity-kttsd
@@ -394,8 +435,8 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 ##########
 
 %package -n trinity-kttsd-contrib-plugins
-Summary:	the TDE Text-to-Speech system
-Group:		User Interface/Desktops
+Summary:	The TDE Text-to-Speech system
+Group:		System/GUI/Other
 Requires:	trinity-kttsd = %{version}-%{release}
 
 %description -n trinity-kttsd-contrib-plugins
@@ -420,16 +461,19 @@ This package is part of Trinity, as a component of the TDE accessibility module.
 ##########
 
 %package devel
-Summary:	Development files for %{name}
-Group:		Development/Libraries
+Summary:	Development files for tdeaccessibility
+Group:		Development/Libraries/X11
 Requires:	%{name} = %{version}-%{release}
 Requires:	trinity-tdelibs-devel >= %{version}
+Requires:	libjpeg-devel
+Requires:	libpng-devel
 
 Obsoletes:		trinity-kdeaccessibility-devel < %{version}-%{release}
 Provides:		trinity-kdeaccessibility-devel = %{version}-%{release}
 
 %description devel
-%{summary}.
+This package contains the development file for TDE accessibility 
+programs.
 
 %files devel
 %defattr(-,root,root,-)
@@ -437,6 +481,7 @@ Provides:		trinity-kdeaccessibility-devel = %{version}-%{release}
 %{tde_libdir}/libkttsd.so
 %{tde_libdir}/libKTTSD_Lib.la
 %{tde_libdir}/libKTTSD_Lib.so
+%{tde_tdeincludedir}/ksayit_fxplugin.h
 
 %post devel
 /sbin/ldconfig ||:
@@ -446,7 +491,7 @@ Provides:		trinity-kdeaccessibility-devel = %{version}-%{release}
 
 ##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
@@ -455,6 +500,9 @@ Provides:		trinity-kdeaccessibility-devel = %{version}-%{release}
 %prep
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
 
+# Update icons for some control center modules
+%__sed -i "kttsd/kcmkttsmgr/kcmkttsd.desktop" -e "s|^Icon=.*|Icon=kcmkttsd|"
+
 %__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"
@@ -492,7 +540,7 @@ fi
   --enable-rpath \
   \
   --enable-ksayit-audio-plugins \
-  --with-akode
+  %{?with_akode:--with-akode} %{?!with_akode:--without-akode}
   
 %__make %{?_smp_mflags}
 
@@ -502,6 +550,36 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
+# Move desktop files to correct XDG location
+%__mv -f "%{?buildroot}%{tde_datadir}/applnk/Applications/kmag.desktop" "%{?buildroot}%{tde_tdeappdir}"
+%__mv -f "%{?buildroot}%{tde_datadir}/applnk/Applications/kmousetool.desktop" "%{?buildroot}%{tde_tdeappdir}"
+%__mv -f "%{?buildroot}%{tde_datadir}/applnk/Applications/kmouth.desktop" "%{?buildroot}%{tde_tdeappdir}"
+
+# Adds missing icons in 'hicolor' theme
+# These icons are copied from 'crystalsvg' theme, provided by 'tdelibs'.
+%__mkdir_p "%{?buildroot}%{tde_datadir}/icons/hicolor/"{16x16,22x22,32x32,48x48,64x64,128x128}"/apps/"
+pushd "%{?buildroot}%{tde_datadir}/icons"
+for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/kttsd.png  hicolor/"$i"x"$i"/apps/kttsd.png    ;done
+for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/kttsd.png  hicolor/"$i"x"$i"/apps/kcmkttsd.png ;done
+popd
+
+# Avoid conflict with tdelibs
+%__rm -f %{?buildroot}%{tde_datadir}/icons/crystalsvg/*/apps/kttsd.png
+%__rm -f %{?buildroot}%{tde_datadir}/icons/crystalsvg/scalable/apps/kttsd.svgz
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -r kmag         Utility Accessibility
+%suse_update_desktop_file    kmousetool   Utility Accessibility
+%suse_update_desktop_file    kmouth       Utility Accessibility
+%suse_update_desktop_file    kttsmgr      Utility Accessibility
+%suse_update_desktop_file    ksayit       Utility Accessibility
+%suse_update_desktop_file    kcmkttsd     Utility Accessibility
+%endif
+
+# Links duplicate files
+%fdupes "%{?buildroot}%{tde_datadir}"
+
 
 %clean
 %__rm -rf %{buildroot}
diff --git a/redhat/main/tdebase/tdebase-3.5.13.2.spec b/redhat/main/tdebase/tdebase-3.5.13.2.spec
index c349bc37e..43f044c3d 100644
--- a/redhat/main/tdebase/tdebase-3.5.13.2.spec
+++ b/redhat/main/tdebase/tdebase-3.5.13.2.spec
@@ -42,9 +42,9 @@
 
 Name:			trinity-%{tde_pkg}
 Version:		%{tde_version}
-Release:		%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
+Release:		%{?!preversion:5}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
 Summary:		Trinity Base Programs
-Group:			User Interface/Desktops
+Group:			System/GUI/Other
 URL:			http://www.trinitydesktop.org/
 
 %if 0%{?suse_version}
@@ -99,6 +99,8 @@ Source8:	tdm%{?dist}.pp
 Source9:	mgabutton.svg
 %endif
 
+%{?tde_patch:Patch1:			%{tde_pkg}-%{tde_version}.patch}
+
 Obsoletes:	trinity-kdebase < %{version}-%{release}
 Provides:	trinity-kdebase = %{version}-%{release}
 Obsoletes:	trinity-kdebase-libs < %{version}-%{release}
@@ -108,9 +110,17 @@ Provides:	trinity-kdebase-extras = %{version}-%{release}
 Obsoletes:	tdebase < %{version}-%{release}
 Provides:	tdebase = %{version}-%{release}
 
-%if 0%{?suse_version}
 # for set_permissions macro
+%if 0%{?suse_version}
 PreReq: permissions
+%endif
+
+# 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
@@ -287,7 +297,7 @@ Requires:	indexhtml
 
 # OpenSuse 11.4 Theme
 %if "%{?suse_version}" == "1140"
-Requires:	hicolor-icon-theme-branding
+Requires:	hicolor-icon-theme-branding = 11.4
 %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
 
 Requires:	opensuse-manuals_en
@@ -297,9 +307,9 @@ Requires:	opensuse-manuals_en
 
 # OpenSuse 12.2 Theme
 %if "%{?suse_version}" == "1220"
-Requires:	wallpaper-branding
+Requires:	wallpaper-branding = 12.2
 %define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
-Requires:	hicolor-icon-theme-branding
+Requires:	hicolor-icon-theme-branding = 12.2
 %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
 
 Requires:	opensuse-manuals_en
@@ -309,7 +319,7 @@ Requires:	opensuse-manuals_en
 
 # OpenSuse 12.3 Theme
 %if "%{?suse_version}" == "1230"
-Requires:	wallpaper-branding
+Requires:	wallpaper-branding = 12.3
 %define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
 Requires:	hicolor-icon-theme-branding
 %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
@@ -321,14 +331,26 @@ Requires:	opensuse-manuals_en
 
 # OpenSuse 13.1 Theme
 %if "%{?suse_version}" == "1310"
-Requires:	wallpaper-branding
+Requires:	wallpaper-branding = 13.1
 %define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
-Requires:	hicolor-icon-theme-branding
+Requires:	hicolor-icon-theme-branding = 13.1
 %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
 
 Requires:	opensuse-manuals_en
 %define tde_aboutlabel OpenSuse 13.1
-%define tde_aboutpage /usr/share/doc/manual/opensuse-manuals_en/book.opensuse.startup.html
+%define tde_aboutpage /usr/share/do%endif
+%endif
+
+# OpenSuse 13.2 Theme
+%if "%{?suse_version}" == "1320"
+Requires:	wallpaper-branding = 13.2
+%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
+Requires:	hicolor-icon-theme-branding
+%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
+
+Requires:	release-notes-openSUSE
+%define tde_aboutlabel OpenSuse 13.2
+%define tde_aboutpage /usr/share/doc/release-notes/openSUSE/RELEASE-NOTES.en.html
 %endif
 
 BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
@@ -337,6 +359,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
 BuildRequires:	make
+BuildRequires:	fdupes
 
 # HTDIG support
 BuildRequires:	htdig
@@ -444,13 +467,10 @@ BuildRequires:	OpenEXR-devel
 %endif
 
 # XSCREENSAVER support
-#  Disabled on RHEL4, RHEL >= 7
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 7 || 0%{?suse_version} || 0%{?with_xscreensaver}
-%if 0%{?rhel} == 0 || 0%{?rhel} <= 6
+%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} || 0%{?with_xscreensaver}
 %define with_xscreensaver 1
-%if 0%{?rhel} == 5
-BuildRequires:	xorg-x11-proto-devel
-BuildRequires:	gnome-screensaver
+%if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version}
+BuildRequires:	libXScrnSaver-devel
 %endif
 %if 0%{?mgaversion} || 0%{?mdkversion}
 %if 0%{?mgaversion} >= 4
@@ -459,17 +479,6 @@ BuildRequires:	%{_lib}xscrnsaver-devel
 BuildRequires:	%{_lib}xscrnsaver%{?mgaversion:1}-devel
 %endif
 %endif
-%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} >= 1220
-BuildRequires:	xscreensaver
-BuildRequires:	libXScrnSaver-devel
-%if 0%{?suse_version}
-BuildRequires:	xscreensaver-data-extra
-%endif
-%endif
-%if 0%{?suse_version} == 1140
-BuildRequires:	xscreensaver
-%endif
-%endif
 %endif
 
 # AVAHI support
@@ -560,14 +569,15 @@ BuildRequires:	libXdmcp-devel
 # XTST support
 %if 0%{?mgaversion} || 0%{?mdkversion}
 %if 0%{?mgaversion} >= 4
-BuildRequires:	%{_lib}xtst-devel
+%define xtst_devel %{_lib}xtst-devel
 %else
-BuildRequires:	%{_lib}xtst%{?mgaversion:6}-devel
+%define xtst_devel %{_lib}xtst%{?mgaversion:6}-devel
 %endif
 %endif
 %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
-BuildRequires:	libXtst-devel
+%define xtst_devel libXtst-devel
 %endif
+%{?xtst_devel:BuildRequires: %{xtst_devel}}
 
 # XDAMAGE support
 %if 0%{?mgaversion} || 0%{?mdkversion}
@@ -682,7 +692,7 @@ web browser, X terminal emulator, and many other programs and components.
 
 %package devel
 Summary:	%{summary} - Development files
-Group:		Development/Libraries
+Group:		Development/Libraries/Other
 Requires:	%{name} = %{version}-%{release}
 Requires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
 Requires:	trinity-tdelibs-devel >= %{tde_version}
@@ -722,7 +732,7 @@ Kate plugins or TWin styles.
 
 %package tdeio-pim-plugins
 Summary:	PIM TDEIOslaves from %{name}
-Group:		Environment/Libraries
+Group:		System/GUI/Other
 
 Provides:	trinity-kdebase-pim-ioslaves = %{version}-%{release}
 Obsoletes:	trinity-kdebase-pim-ioslaves < %{version}-%{release}
@@ -761,7 +771,7 @@ Protocol handlers (TDEIOslaves) for personal information management, including:
 
 %package runtime-data-common
 Summary:	Shared common files for Trinity and KDE4
-Group:		Environment/Libraries
+Group:		System/GUI/Other
 
 Provides:	tdebase-runtime-data-common = %{version}-%{release}
 Obsoletes:	tdebase-runtime-data-common < %{version}-%{release}
@@ -802,7 +812,7 @@ done
 
 %package -n trinity-kappfinder
 Summary:	Non-TDE application finder for TDE
-Group:		Applications/Utilities
+Group:		System/GUI/Other
 Requires:	%{name}-data = %{version}-%{release}
 
 %description -n trinity-kappfinder
@@ -835,10 +845,10 @@ update-desktop-database %{tde_appdir} 2> /dev/null || :
 
 %package -n trinity-libkateinterfaces
 Summary:	Common libraries used by kwrite and kate
-Group:		Environment/Libraries
+Group:		System/GUI/Other
 
 %description -n trinity-libkateinterfaces
-%{summary}
+This package contains the kateinterface library.
 
 %files -n trinity-libkateinterfaces
 %defattr(-,root,root,-)
@@ -854,7 +864,7 @@ Group:		Environment/Libraries
 
 %package -n trinity-kate
 Summary:	Advanced text editor for TDE
-Group:		Applications/Text
+Group:		System/GUI/Other
 Requires:	%{name}-data = %{version}-%{release}
 Requires:	trinity-kwrite = %{version}-%{release}
 Requires:	trinity-libkateinterfaces = %{version}-%{release}
@@ -915,11 +925,11 @@ update-desktop-database %{tde_appdir} 2> /dev/null || :
 
 %package -n trinity-kate-devel
 Summary:	Development files for kate
-Group:		Development/Libraries
+Group:		Development/Libraries/Other
 Requires:	trinity-kate = %{version}-%{release}
 
 %description -n trinity-kate-devel
-%{summary}
+This package contains the development files fare Kate.
 
 %files -n trinity-kate-devel
 %defattr(-,root,root,-)
@@ -939,12 +949,12 @@ Requires:	trinity-kate = %{version}-%{release}
 
 %package -n trinity-kwrite
 Summary:	Advanced text editor for TDE
-Group:		Applications/Utilities
+Group:		System/GUI/Other
 Requires:	%{name}-data = %{version}-%{release}
 Requires:	trinity-libkateinterfaces = %{version}-%{release}
 
 %description -n trinity-kwrite
-Kwrite is a text editor for TDE.
+Kwrite is an advanced text editor for TDE.
 
 %files -n trinity-kwrite
 %defattr(-,root,root,-)
@@ -978,7 +988,7 @@ update-desktop-database %{tde_appdir} 2> /dev/null || :
 
 %package -n trinity-kcontrol
 Summary:	Control center for TDE
-Group:		Applications/Utilities
+Group:		System/GUI/Other
 Requires:	%{name}-data = %{version}-%{release}
 
 # Requires 'usb.ids'
@@ -1191,7 +1201,6 @@ plugdev group.
 %{tde_tdeappdir}/sound.desktop
 %{tde_tdeappdir}/spellchecking.desktop
 %{tde_tdeappdir}/style.desktop
-%{tde_tdeappdir}/tde-kcontrol.desktop
 %{tde_tdeappdir}/useragent.desktop
 %{tde_tdeappdir}/xserver.desktop
 %{tde_datadir}/applnk/.hidden/energy.desktop
@@ -1278,11 +1287,11 @@ update-desktop-database %{tde_appdir} 2> /dev/null || :
 
 %package -n trinity-kcontrol-devel
 Summary:	Development files for kcontrol
-Group:		Development/Libraries
+Group:		Development/Languages/Other
 Requires:	trinity-kcontrol = %{version}-%{release}
 
 %description -n trinity-kcontrol-devel
-%{summary}
+This package contains the development files for Kcontrol.
 
 %files -n trinity-kcontrol-devel
 %defattr(-,root,root,-)
@@ -1299,9 +1308,14 @@ Requires:	trinity-kcontrol = %{version}-%{release}
 
 %package bin
 Summary:	Core binaries for the TDE base module
-Group:		Applications/Utilities
+Group:		System/GUI/Other
 Requires:	%{name}-data = %{version}-%{release}
 Requires:	pam
+%if 0%{?rhel} >= 7
+Requires:	xorg-x11-server-Xorg
+Requires:	xorg-x11-drv-evdev
+Requires:	dejavu-sans-fonts
+%endif
 
 Provides:	tdebase-bin = %{version}-%{release}
 Obsoletes:	tdebase-bin < %{version}-%{release}
@@ -1409,6 +1423,13 @@ TDE applications, particularly those in the TDE base module.
 %post bin
 /sbin/ldconfig || :
 update-desktop-database %{tde_appdir} 2> /dev/null || : 
+# Sets permissions on setuid files (openSUSE specific)
+%if 0%{?suse_version}
+%if 0%{?with_tsak}
+%set_permissions %{tde_bindir}/%{tdm}tsak
+%endif
+%set_permissions %{tde_bindir}/kcheckpass
+%endif
 
 %postun bin
 /sbin/ldconfig || :
@@ -1418,14 +1439,16 @@ update-desktop-database %{tde_appdir} 2> /dev/null || :
 
 %package bin-devel
 Summary:	Development files for core binaries for the TDE base module
-Group:		Development/Libraries
+Group:		Development/Libraries/Other
 Requires:	%{name}-bin = %{version}-%{release}
+%{?xtst_devel:Requires: %{xtst_devel}}
 
 Obsoletes:	tdebase-bin-devel < %{version}-%{release}
 Provides:	tdebase-bin-devel = %{version}-%{release}
 
 %description bin-devel
-%{summary}
+This package contains the development files for core binaries for 
+the TDE base module
 
 %files bin-devel
 %defattr(-,root,root,-)
@@ -1442,7 +1465,7 @@ Provides:	tdebase-bin-devel = %{version}-%{release}
 
 %package data
 Summary:	Shared data files for the TDE base module
-Group:		Environment/Libraries
+Group:		System/GUI/Other
 Requires:	%{name}-runtime-data-common = %{version}-%{release}
 
 Obsoletes:	tdebase-data < %{version}-%{release}
@@ -1711,6 +1734,7 @@ needed for a basic TDE desktop installation.
 %{tde_datadir}/wallpapers/*
 
 # XDG directories information
+%dir %{_sysconfdir}/xdg/menus/applications-merged
 %config(noreplace) %{_sysconfdir}/xdg/menus/applications-merged/tde-essential.menu
 %config(noreplace) %{_sysconfdir}/xdg/menus/tde-information.menu
 %config(noreplace) %{_sysconfdir}/xdg/menus/tde-screensavers.menu
@@ -1752,7 +1776,7 @@ done
 
 %package tdeio-plugins
 Summary:	Core I/O slaves for TDE
-Group:		Applications/Utilities
+Group:		System/GUI/Other
 Requires:	trinity-kdesktop = %{version}-%{release}
 Requires:	cyrus-sasl
 Requires:	psmisc
@@ -1926,7 +1950,7 @@ update-desktop-database %{tde_appdir} 2> /dev/null || :
 
 %package -n trinity-tdepasswd
 Summary:	Password changer for TDE
-Group:		Applications/Utilities
+Group:		System/GUI/Other
 
 Obsoletes:	trinity-kdepasswd < %{version}-%{release}
 Provides:	trinity-kdepasswd = %{version}-%{release}
@@ -1983,7 +2007,7 @@ update-desktop-database %{tde_tdeappdir} 2> /dev/null || :
 
 %package -n trinity-tdeprint
 Summary:	Print system for TDE
-Group:		Applications/Utilities
+Group:		System/GUI/Other
 Requires:	%{name}-data = %{version}-%{release}
 Requires:	psutils
 
@@ -2058,7 +2082,7 @@ done
 
 %package -n trinity-kdesktop
 Summary:	Miscellaneous binaries and files for the TDE desktop
-Group:		Applications/Utilities
+Group:		System/GUI/Other
 Requires:	%{name}-bin = %{version}-%{release}
 Requires:	%{name}-data = %{version}-%{release}
 Requires:	trinity-libkonq = %{version}-%{release}
@@ -2111,11 +2135,11 @@ done
 
 %package -n trinity-kdesktop-devel
 Summary:	Development files for kdesktop
-Group:		Development/Libraries
+Group:		Development/Libraries/Other
 Requires:	trinity-kdesktop = %{version}-%{release}
 
 %description -n trinity-kdesktop-devel
-%{summary}
+This package contains the development files for kdesktop.
 
 %files -n trinity-kdesktop-devel
 %defattr(-,root,root,-)
@@ -2127,7 +2151,7 @@ Requires:	trinity-kdesktop = %{version}-%{release}
 
 %package -n trinity-tdm
 Summary:	X Display manager for TDE
-Group:		Applications/Utilities
+Group:		System/GUI/Other
 Requires:	%{name}-bin = %{version}-%{release}
 Requires:	%{name}-data = %{version}-%{release}
 Requires:	pam
@@ -2237,13 +2261,13 @@ already. Most users won't need this.
 %endif
 
 # Logrotate configuration
-%config %{_sysconfdir}/logrotate.d/tdm
+%config %{_sysconfdir}/logrotate.d/trinity-tdm
 
 %pre -n trinity-tdm
 # Make sure that TDM configuration files are now under '/etc/trinity/tdm'
 if [ -d "%{tde_datadir}/config/%{tdm}" ] && [ ! -L "%{tde_datadir}/config/%{tdm}" ]; then
   if [ -d "%{_sysconfdir}/trinity/%{tdm}" ]; then
-    # If there is already something under '/etc/trinity/%{tdm}', simply delete old configuration
+    # If there is already something under '/etc/trinity/tdm', simply delete old configuration
     echo "Deleting TDM configuration under '%{tde_datadir}/config/%{tdm}'"
     rm -rf "%{tde_datadir}/config/%{tdm}"
   else
@@ -2306,11 +2330,12 @@ fi
 
 %package -n trinity-tdm-devel
 Summary:	Development files for tdm
-Group:		Development/Libraries
+Group:		Development/Libraries/Other
 Requires:	trinity-tdm = %{version}-%{release}
+%{?xtst_devel:Requires: %{xtst_devel}}
 
 %description -n trinity-tdm-devel
-%{summary}
+This package contains the development files for TDM.
 
 %files -n trinity-tdm-devel
 %defattr(-,root,root,-)
@@ -2320,7 +2345,7 @@ Requires:	trinity-tdm = %{version}-%{release}
 
 %package -n trinity-kfind
 Summary:	File-find utility for TDE
-Group:		Applications/Utilities
+Group:		System/GUI/Other
 Requires:	%{name}-data = %{version}-%{release}
 
 %description -n trinity-kfind
@@ -2357,7 +2382,7 @@ done
 
 %package -n trinity-khelpcenter
 Summary:	Help center for TDE
-Group:		Applications/Utilities
+Group:		System/GUI/Other
 Requires:	%{name}-data = %{version}-%{release}
 Requires:	htdig
 
@@ -2406,7 +2431,7 @@ done
 
 %package -n trinity-kicker
 Summary:	Desktop panel for TDE
-Group:		Applications/Utilities
+Group:		System/GUI/Other
 Requires:	%{name}-data = %{version}-%{release}
 
 %description -n trinity-kicker
@@ -2540,11 +2565,12 @@ done
 
 %package -n trinity-kicker-devel
 Summary:	Development files for kicker
-Group:		Development/Libraries
+Group:		Development/Libraries/Other
 Requires:	trinity-kicker = %{version}-%{release}
+%{?xtst_devel:Requires: %{xtst_devel}}
 
 %description -n trinity-kicker-devel
-%{summary}
+This package contains the development files for kicker.
 
 %files -n trinity-kicker-devel
 %defattr(-,root,root,-)
@@ -2571,7 +2597,7 @@ Requires:	trinity-kicker = %{version}-%{release}
 
 %package -n trinity-klipper
 Summary:	Clipboard utility for Trinity
-Group:		Applications/Utilities
+Group:		System/GUI/Other
 Requires:	%{name}-data = %{version}-%{release}
 
 %description -n trinity-klipper
@@ -2620,7 +2646,7 @@ done
 
 %package -n trinity-kmenuedit
 Summary:	Menu editor for TDE
-Group:		Applications/Utilities
+Group:		System/GUI/Other
 Requires:	%{name}-data = %{version}-%{release}
 
 %description -n trinity-kmenuedit
@@ -2657,7 +2683,7 @@ update-desktop-database %{tde_appdir} 2> /dev/null || :
 
 %package -n trinity-konqueror
 Summary:	TDE's advanced file manager, web browser and document viewer
-Group:		Applications/Utilities
+Group:		System/GUI/Other
 Requires:	%{name}-data = %{version}-%{release}
 Requires:	trinity-kcontrol = %{version}-%{release}
 Requires:	%{name}-tdeio-plugins = %{version}-%{release}
@@ -2769,6 +2795,7 @@ ever launching another application.
 %exclude %{tde_datadir}/apps/konqueror/servicemenus/konsolehere.desktop
 %exclude %{tde_datadir}/apps/konqueror/servicemenus/installfont.desktop
 %{tde_datadir}/apps/konqueror/servicemenus/*.desktop
+%ghost %{_sysconfdir}/alternatives/media_safelyremove.desktop
 %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase
 %{tde_datadir}/apps/konqueror/tiles/
 %{tde_datadir}/autostart/konqy_preload.desktop
@@ -2818,11 +2845,11 @@ fi
 
 %package -n trinity-konqueror-devel
 Summary:	Development files for konqueror
-Group:		Development/Libraries
+Group:		Development/Libraries/Other
 Requires:	trinity-konqueror = %{version}-%{release}
 
 %description -n trinity-konqueror-devel
-%{summary}
+This package contains the development files for konqueror.
 
 %files -n trinity-konqueror-devel
 %defattr(-,root,root,-)
@@ -2841,7 +2868,7 @@ Requires:	trinity-konqueror = %{version}-%{release}
 
 %package -n trinity-konqueror-nsplugins
 Summary:	Netscape plugin support for Konqueror
-Group:		Applications/Utilities
+Group:		System/GUI/Other
 Requires:	trinity-konqueror = %{version}-%{release}
 
 %description -n trinity-konqueror-nsplugins
@@ -2868,7 +2895,7 @@ update-desktop-database %{tde_appdir} 2> /dev/null || :
 
 %package -n trinity-konsole
 Summary:	X terminal emulator for TDE
-Group:		Applications/Utilities
+Group:		System/GUI/Other
 Requires:	%{name}-data = %{version}-%{release}
 
 %description -n trinity-konsole
@@ -2937,7 +2964,7 @@ done
 
 %package -n trinity-kpager
 Summary:	Desktop pager for TDE
-Group:		Applications/Utilities
+Group:		System/GUI/Other
 Requires:	%{name}-data = %{version}-%{release}
 
 %description -n trinity-kpager
@@ -2971,7 +2998,7 @@ done
 
 %package -n trinity-kpersonalizer
 Summary:	Installation personalizer for TDE
-Group:		Applications/Utilities
+Group:		System/GUI/Other
 Requires:	%{name}-data = %{version}-%{release}
 
 %description -n trinity-kpersonalizer
@@ -3006,7 +3033,7 @@ done
 
 %package -n trinity-ksmserver
 Summary:	Session manager for TDE
-Group:		Applications/Utilities
+Group:		System/GUI/Other
 Requires:	%{name}-data = %{version}-%{release}
 Requires:	trinity-twin = %{version}-%{release}
 
@@ -3032,7 +3059,7 @@ TDE will start, but many good defaults will not be set.
 %{tde_libdir}/libkdeinit_ksmserver.so
 %{tde_datadir}/apps/kconf_update/ksmserver.upd
 %{tde_datadir}/apps/kconf_update/move_session_config.sh
-%{tde_datadir}/apps/ksmserver/pics/shutdownkonq.png
+%{tde_datadir}/apps/ksmserver/
 
 # Workaround conflict with KDE4
 %if "%{?tde_prefix}" != "/usr"
@@ -3055,7 +3082,7 @@ fndSession
 
 %package -n trinity-ksplash
 Summary:	The TDE splash screen
-Group:		Applications/Utilities
+Group:		System/GUI/Other
 Requires:	%{name}-data = %{version}-%{release}
 
 %description -n trinity-ksplash
@@ -3099,11 +3126,11 @@ update-desktop-database %{tde_appdir} 2> /dev/null || :
 
 %package -n trinity-ksplash-devel
 Summary:	Development files for ksplash
-Group:		Development/Libraries
+Group:		Development/Libraries/Other
 Requires:	trinity-ksplash = %{version}-%{release}
 
 %description -n trinity-ksplash-devel
-%{summary}
+This package contains the development files for ksplash.
 
 %files -n trinity-ksplash-devel
 %defattr(-,root,root,-)
@@ -3121,7 +3148,7 @@ Requires:	trinity-ksplash = %{version}-%{release}
 
 %package -n trinity-ksysguard
 Summary:	System guard for TDE
-Group:		Applications/Utilities
+Group:		System/GUI/Other
 Requires:	%{name}-data = %{version}-%{release}
 Requires:	trinity-ksysguardd = %{version}-%{release}
 
@@ -3163,11 +3190,11 @@ done
 
 %package -n trinity-ksysguard-devel
 Summary:	Development files for ksysguard
-Group:		Development/Libraries
+Group:		Development/Libraries/Other
 Requires:	trinity-ksysguard = %{version}-%{release}
 
 %description -n trinity-ksysguard-devel
-%{summary}
+This package contains the development files for ksysguard.
 
 %files -n trinity-ksysguard-devel
 %defattr(-,root,root,-)
@@ -3185,7 +3212,7 @@ Requires:	trinity-ksysguard = %{version}-%{release}
 
 %package -n trinity-ksysguardd
 Summary:	System guard daemon for TDE
-Group:		Applications/Utilities
+Group:		System/GUI/Other
 Requires:	%{name}-data = %{version}-%{release}
 
 %description -n trinity-ksysguardd
@@ -3201,8 +3228,8 @@ to monitor it through the daemon running there.
 ##########
 
 %package -n trinity-ktip
-Summary:	useful tips for TDE
-Group:		Applications/Utilities
+Summary:	Useful tips for TDE
+Group:		System/GUI/Other
 Requires:	%{name}-data = %{version}-%{release}
 
 %description -n trinity-ktip
@@ -3235,7 +3262,7 @@ done
 
 %package -n trinity-twin
 Summary:	The TDE window manager
-Group:		Applications/Utilities
+Group:		System/GUI/Other
 Requires:	%{name}-data = %{version}-%{release}
 
 %description -n trinity-twin
@@ -3304,11 +3331,11 @@ done
 
 %package -n trinity-twin-devel
 Summary:	Development files for twin
-Group:		Development/Libraries
+Group:		Development/Libraries/Other
 Requires:	trinity-twin = %{version}-%{release}
 
 %description -n trinity-twin-devel
-%{summary}
+This package contains the development files for twin.
 
 %files -n trinity-twin-devel
 %defattr(-,root,root,-)
@@ -3332,7 +3359,7 @@ Requires:	trinity-twin = %{version}-%{release}
 
 %package -n trinity-libkonq
 Summary:	Core libraries for Konqueror
-Group:		Environment/Libraries
+Group:		System/GUI/Other
 
 %description -n trinity-libkonq
 These libraries are used by several TDE applications, most notably
@@ -3367,7 +3394,7 @@ Konqueror and the kdesktop package.
 
 %package libtqt3-integration
 Summary:	Integration library between TQt3 and TDE
-Group:		Environment/Libraries
+Group:		System/GUI/Other
 
 Obsoletes:	tdebase-libtqt3-integration < %{version}-%{release}
 Provides:	tdebase-libtqt3-integration = %{version}-%{release}
@@ -3389,8 +3416,9 @@ These libraries allow you to use TDE dialogs in native TQt3 applications.
 
 %package -n trinity-libkonq-devel
 Summary:	Development files for Konqueror's core libraries
-Group:		Development/Libraries
+Group:		Development/Libraries/Other
 Requires:	trinity-libkonq = %{version}-%{release}
+%{?xtst_devel:Requires: %{xtst_devel}}
 
 %description -n trinity-libkonq-devel
 This package contains headers and other development files for the core
@@ -3416,8 +3444,8 @@ Konqueror libraries.
 ##########
 
 %package tdeio-smb-plugin
-Summary:        Windows Connection Module for TDE
-Group:          Environment/Libraries
+Summary:	Windows Connection Module for TDE
+Group:		System/GUI/Other
 
 %description tdeio-smb-plugin
 This package provides the "smb://" protocol, to connect to and from
@@ -3437,7 +3465,7 @@ Windows and Samba shares.
 
 ##########
 
-%if 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
@@ -3445,6 +3473,7 @@ Windows and Samba shares.
 
 %prep
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
+%{?tde_patch:%patch1 -p1}
 
 # Applies an optional distro-specific graphical theme
 %if "%{?tde_bg}" != ""
@@ -3474,8 +3503,13 @@ Windows and Samba shares.
 
 # TDE default directory and icon in startup script
 %__sed -i "%{starttde}" \
-	-e "s|/opt/trinity|%{tde_prefix}|g" \
-	-e "s|%%{tde_starticon}|%{tde_starticon}|g"
+	-e "s|/opt/trinity|%{tde_prefix}|g"
+
+# Sets default TDE menu icon
+%if "%{tde_starticon}" != ""
+%__sed -i "kicker/libkicker/kickerSettings.kcfg" \
+	-e "s|QString(\"kmenu\")|QString(\"%{tde_starticon}\")|"
+%endif
 
 # Xsession script location may vary on some distro
 %if 0%{?rhel} || 0%{?fedora}
@@ -3695,6 +3729,8 @@ chmod 755 "%{?buildroot}%{tde_bindir}/plasma-desktop"
 # Makes 'media_safelyremove.desktop' an alternative.
 # This allows the use of 'tdeio-umountwrapper' package.
 %__mv -f "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop" "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase"
+%__mkdir_p "%{buildroot}%{_sysconfdir}/alternatives"
+%__ln_s "media_safelyremove.desktop_tdebase" "%{buildroot}%{_sysconfdir}/alternatives/media_safelyremove.desktop"
 
 # SUSE >= 12 : creates DM config file, used by '/etc/init.d/xdm'
 #  You must set 'DISPLAYMANAGER=tdm' in '/etc/sysconfig/displaymanager'
@@ -3740,7 +3776,7 @@ EOF
 
 # logrotate configuration
 mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
-cat << EOF > "%{buildroot}%{_sysconfdir}/logrotate.d/tdm"
+cat << EOF > "%{buildroot}%{_sysconfdir}/logrotate.d/trinity-tdm"
 /var/log/tdm.log {
     weekly
     notifempty
@@ -3759,56 +3795,55 @@ fi
 
 # Adds missing icons in 'hicolor' theme
 # These icons are copied from 'crystalsvg' theme, provided by 'tdelibs'.
-mkdir -p "%{?buildroot}%{tde_datadir}/icons/hicolor/{16x16,22x22,32x32,48x48,64x64,128x128}/apps/"
+%__mkdir_p "%{?buildroot}%{tde_datadir}/icons/hicolor/"{16x16,22x22,32x32,48x48,64x64,128x128}"/apps/"
 pushd "%{?buildroot}%{tde_datadir}/icons"
-for i in {16,32,48,64,128};    do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/mimetypes/misc.png              hicolor/"$i"x"$i"/apps/kcmcomponentchooser.png  ;done
-for i in {16,22,32,48,128};    do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/launch.png              hicolor/"$i"x"$i"/apps/kcmperformance.png       ;done
-for i in 16;                   do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/services.png            hicolor/"$i"x"$i"/apps/kcmkded.png              ;done
-for i in {16,22,32,48};        do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/exit.png                hicolor/"$i"x"$i"/apps/kcmsmserver.png          ;done
-for i in {16,22,32};           do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/spellcheck.png          hicolor/"$i"x"$i"/apps/kcmspellchecking.png     ;done
-for i in {16,22,32,48,64,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/filesystems/desktop.png         hicolor/"$i"x"$i"/apps/kcmdesktopbehavior.png   ;done
-for i in {16,22,32,48,64,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/filesystems/desktop.png         hicolor/"$i"x"$i"/apps/kcmdesktop.png           ;done
-for i in {16,22,32,48,64,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/kmenu.png                  hicolor/"$i"x"$i"/apps/kcmtaskbar.png           ;done
-for i in {16,22,32,48,64,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/mimetypes/colorscm.png          hicolor/"$i"x"$i"/apps/kcmcolors.png            ;done
-for i in {16,22,32,48,128};    do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/launch.png              hicolor/"$i"x"$i"/apps/kcmlaunch.png            ;done
-for i in {16,22,32};           do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/filter.png              hicolor/"$i"x"$i"/apps/kcmkhtml_filter.png      ;done
-for i in {16,22,32};           do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/run.png                 hicolor/"$i"x"$i"/apps/kcmcgi.png               ;done
-for i in {16,22};              do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/history.png             hicolor/"$i"x"$i"/apps/kcmhistory.png           ;done
-for i in {16,22,32,48,64,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/filesystems/network.png         hicolor/"$i"x"$i"/apps/kcmnetpref.png           ;done
-for i in {16,32,48,64,128};    do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/blockdevice.png         hicolor/"$i"x"$i"/apps/kcmkdnssd.png            ;done
-for i in {16,22,32,48,64};     do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/joystick.png            hicolor/"$i"x"$i"/apps/kcmjoystick.png          ;done
-for i in {16,32,48,64,128};    do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/mouse.png               hicolor/"$i"x"$i"/apps/kcmmouse.png             ;done
-for i in {16,22,32,48,64,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/system.png              hicolor/"$i"x"$i"/apps/kcmmedia.png             ;done
-for i in {16,22,32};           do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/encrypted.png           hicolor/"$i"x"$i"/apps/kcmcrypto.png            ;done
-for i in {16,22,32,48,64,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/filesystems/trashcan_empty.png  hicolor/"$i"x"$i"/apps/kcmprivacy.png           ;done
-for i in {16,22,32,48,64,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/filesystems/network.png         hicolor/"$i"x"$i"/apps/kcmnic.png               ;done
+for i in {16,32,48,64,128};    do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/mimetypes/misc.png                      hicolor/"$i"x"$i"/apps/kcmcomponentchooser.png  ;done
+for i in {16,22,32,48,128};    do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/launch.png                      hicolor/"$i"x"$i"/apps/kcmperformance.png       ;done
+for i in 16;                   do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/services.png                    hicolor/"$i"x"$i"/apps/kcmkded.png              ;done
+for i in {16,22,32,48};        do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/exit.png                        hicolor/"$i"x"$i"/apps/kcmsmserver.png          ;done
+for i in {16,22,32};           do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/spellcheck.png                  hicolor/"$i"x"$i"/apps/kcmspellchecking.png     ;done
+for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/filesystems/desktop.png                 hicolor/"$i"x"$i"/apps/kcmdesktopbehavior.png   ;done
+for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/filesystems/desktop.png                 hicolor/"$i"x"$i"/apps/kcmdesktop.png           ;done
+for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/kmenu.png                          hicolor/"$i"x"$i"/apps/kcmtaskbar.png           ;done
+for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/mimetypes/colorscm.png                  hicolor/"$i"x"$i"/apps/kcmcolors.png            ;done
+for i in {16,22,32,48,128};    do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/launch.png                      hicolor/"$i"x"$i"/apps/kcmlaunch.png            ;done
+for i in {16,22,32};           do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/filter.png                      hicolor/"$i"x"$i"/apps/kcmkhtml_filter.png      ;done
+for i in {16,22,32};           do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/run.png                         hicolor/"$i"x"$i"/apps/kcmcgi.png               ;done
+for i in {16,22};              do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/history.png                     hicolor/"$i"x"$i"/apps/kcmhistory.png           ;done
+for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/filesystems/network.png                 hicolor/"$i"x"$i"/apps/kcmnetpref.png           ;done
+for i in {16,32,48,64,128};    do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/blockdevice.png                 hicolor/"$i"x"$i"/apps/kcmkdnssd.png            ;done
+for i in {16,22,32,48,64};     do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/joystick.png                    hicolor/"$i"x"$i"/apps/kcmjoystick.png          ;done
+for i in {16,32,48,64,128};    do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/mouse.png                       hicolor/"$i"x"$i"/apps/kcmmouse.png             ;done
+for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/system.png                      hicolor/"$i"x"$i"/apps/kcmmedia.png             ;done
+for i in {16,22,32};           do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/encrypted.png                   hicolor/"$i"x"$i"/apps/kcmcrypto.png            ;done
+for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/filesystems/trashcan_empty.png          hicolor/"$i"x"$i"/apps/kcmprivacy.png           ;done
+for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/filesystems/network.png                 hicolor/"$i"x"$i"/apps/kcmnic.png               ;done
 popd
 
 # Updates applications categories for openSUSE
 %if 0%{?suse_version}
-# Other applications
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/Help.desktop             Documentation Viewer
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/Home.desktop             System FileManager core
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kate.desktop             TextEditor
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/KControl.desktop         X-SuSE-core
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/Kfind.desktop            System Filesystem core
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kjobviewer.desktop       PrintingUtility
-%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/klipper.desktop          System TrayIcon
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kmenuedit.desktop        Core-Configuration
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/knetattach.desktop       System Network
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/konqbrowser.desktop      WebBrowser
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/konquerorsu.desktop      System FileManager
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/konsole.desktop          TerminalEmulator
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/konsolesu.desktop        TerminalEmulator
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kpager.desktop           Utility  DesktopUtility
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kpersonalizer.desktop    DesktopUtility
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/ksysguard.desktop        System Monitor
-%suse_update_desktop_file -u %{?buildroot}%{tde_tdeappdir}/ktip.desktop             System Utility
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kwrite.desktop           TextEditor
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kprintfax.desktop        PrintingUtility
-%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/kfontview.desktop        Graphics Viewer
-%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/krandrtray.desktop       Applet X-KDE-settings-desktop
-%suse_update_desktop_file    %{?buildroot}%{tde_datadir}/applnk/.hidden/konqfilemgr.desktop      System FileManager
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/Help.desktop                       Documentation Viewer
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/Home.desktop                       System FileManager core
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kate.desktop                       TextEditor
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/KControl.desktop                   X-SuSE-core
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/Kfind.desktop                      System Filesystem core
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kjobviewer.desktop                 PrintingUtility
+%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/klipper.desktop                    System TrayIcon
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kmenuedit.desktop                  Core-Configuration
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/knetattach.desktop                 System Network
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/konqbrowser.desktop                WebBrowser
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/konquerorsu.desktop                System FileManager
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/konsole.desktop                    TerminalEmulator
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/konsolesu.desktop                  TerminalEmulator
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kpager.desktop                     Utility  DesktopUtility
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kpersonalizer.desktop              DesktopUtility
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/ksysguard.desktop                  System Monitor
+%suse_update_desktop_file -u %{?buildroot}%{tde_tdeappdir}/ktip.desktop                       System Utility
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kwrite.desktop                     TextEditor
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kdeprintfax.desktop                PrintingUtility
+%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/kfontview.desktop                  Graphics Viewer
+%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/krandrtray.desktop                 Applet X-KDE-settings-desktop
+%suse_update_desktop_file    %{?buildroot}%{tde_datadir}/applnk/.hidden/konqfilemgr.desktop   System FileManager
 %endif
 
 # Icons from TDE Control Center should only be displayed in TDE
@@ -3821,7 +3856,7 @@ for i in %{?buildroot}%{tde_tdeappdir}/*.desktop ; do
 done
 
 # Other apps that should stay in TDE
-for i in ksysguard tde-kcontrol kfontview showdesktop; do
+for i in ksysguard kfontview showdesktop; do
   echo "OnlyShowIn=KDE;" >>"%{?buildroot}%{tde_tdeappdir}/${i}.desktop"
 done
 
@@ -3831,6 +3866,12 @@ chmod 0511 "%{?buildroot}%{tde_bindir}/%{tdm}tsak"
 %endif
 chmod 0755 "%{?buildroot}%{tde_bindir}/kcheckpass"
 
+# Fix permissions on shell scripts
+chmod 0755 "%{?buildroot}%{tde_datadir}/apps/kconf_update/move_session_config.sh"
+chmod 0755 "%{?buildroot}%{tde_tdedocdir}/HTML/en/khelpcenter/glossary/checkxrefs"
+
+# Links duplicate files
+%fdupes "%{?buildroot}%{tde_datadir}"
 
 
 %clean
diff --git a/redhat/main/tdebindings/tdebindings-3.5.13.2.spec b/redhat/main/tdebindings/tdebindings-3.5.13.2.spec
index 3627cac01..dc48f7040 100644
--- a/redhat/main/tdebindings/tdebindings-3.5.13.2.spec
+++ b/redhat/main/tdebindings/tdebindings-3.5.13.2.spec
@@ -50,7 +50,7 @@
 Name:			trinity-%{tde_pkg}
 Summary:		TDE bindings to non-C++ languages
 Version:		%{tde_version}
-Release:		%{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release:		%{?!preversion:3}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
 Group:			System/GUI/Other
 URL:			http://www.trinitydesktop.org/
 
@@ -68,20 +68,7 @@ BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
 
-# [tdebindings] Fix RUBY path ending with '/' causing fail to install
-Patch1:			tdebindings-3.5.13.2-fix_ruby_path.patch
-
-# [tdebindings] Fix ruby 2.x detection
-Patch2:			tdebindings-3.5.13.2-fix_ruby2_detection.patch
-
-# [tdebindings] Fix automake 1.13 build issue
-Patch3:			admin-fix-parallel-test.diff
-
-# [kdebindings] Fix FTBFS in dcopjava/bindings
-Patch4:			kdebindings-3.5.13.1-fix_dcopjava_ldflags.patch
-
-# [tdebindings] Function 'rb_frame_this_func' does not exist in RHEL5
-Patch5:		kdebindings-3.5.13.1-fix_rhel5_ftbfs.patch
+%{?tde_patch:Patch1:			%{tde_pkg}-%{tde_version}.patch}
 
 BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
@@ -139,7 +126,7 @@ BuildRequires:	openssl-devel
 BuildRequires: glib-devel
 BuildRequires: gtk+-devel
 %endif
-%if 0%{?with_rhel} && 0%{?with_gtk1}
+%if 0%{?rhel} == 5
 %define with_gtk1 1
 BuildRequires: glib-devel
 BuildRequires: gtk+-devel
@@ -270,12 +257,13 @@ Requires: trinity-libqt0-ruby = %{version}-%{release}
 TDE/DCOP bindings to non-C++ languages
 
 %files
+%defattr(-,root,root,-)
 
 ##########
 
 %package java
 Summary:	TDE Java bindings metapackage [Trinity]
-Group:		Environment/Libraries
+Group:		System/Libraries
 Requires:	trinity-libdcop3-java = %{version}-%{release}
 Requires:	trinity-libdcop3-jni = %{version}-%{release}
 Requires:	trinity-libqt3-java = %{version}-%{release}
@@ -296,7 +284,7 @@ This package is part of the official TDE bindings module.
 
 %package -n trinity-libdcop3-java
 Summary:	DCOP bindings for Java [Trinity]
-Group:		Environment/Libraries
+Group:		System/Libraries
 
 Requires:	trinity-libdcop3-jni = %{version}-%{release}
 
@@ -315,7 +303,7 @@ This package is part of the official TDE bindings module.
 
 %package -n trinity-libdcop3-java-devel
 Summary:	DCOP bindings for Java (dcopidl2java program) [Trinity]
-Group:		Development/Libraries
+Group:		Development/Languages/Java
 Requires:	trinity-libdcop3-java = %{version}-%{release}
 
 %description -n trinity-libdcop3-java-devel
@@ -334,7 +322,7 @@ This package is part of the official TDE bindings module.
 
 %package -n trinity-libdcop3-jni
 Summary:	DCOP bindings for Java ( Native libraries ) [Trinity]
-Group:		Environment/Libraries
+Group:		System/Libraries
 
 %description -n trinity-libdcop3-jni
 This package contains the shared libraries and scripts necessary to
@@ -359,7 +347,7 @@ This package is part of the official TDE bindings module.
 
 %package -n trinity-libqt3-java
 Summary:	Java bindings for Qt [Trinity]
-Group:		Environment/Libraries
+Group:		System/Libraries
 Requires:	trinity-libdcop3-jni = %{version}-%{release}
 Requires:	trinity-libqt3-jni = %{version}-%{release}
 Requires:	trinity-juic = %{version}-%{release}
@@ -383,7 +371,7 @@ This package is part of the official TDE bindings module.
 
 %package -n trinity-libqt3-jni
 Summary:	Java bindings for Qt ( Native libraries ) [Trinity]
-Group:		Environment/Libraries
+Group:		System/Libraries
 
 %description -n trinity-libqt3-jni
 This package contains the shared libraries necessary to run Java
@@ -400,11 +388,17 @@ This package is part of the official TDE bindings module.
 %{tde_libdir}/jni/libqtjava.so.*
 %doc qtjava/ChangeLog
 
+%post -n trinity-libqt3-jni
+/sbin/ldconfig || :
+
+%postun -n trinity-libqt3-jni
+/sbin/ldconfig || :
+
 ##########
 
 %package -n trinity-libqt3-jni-devel
 Summary:	Development files fo Java bindings for Qt ( Native libraries ) [Trinity]
-Group:		Development/Libraries
+Group:		Development/Languages/Java
 Requires:	trinity-libqt3-jni = %{version}-%{release}
 
 %description -n trinity-libqt3-jni-devel
@@ -420,8 +414,8 @@ This package is part of the official TDE bindings module.
 ##########
 
 %package -n trinity-libtrinity-java
-Summary:	tdelibs bindings for Java [Trinity]
-Group:		Environment/Libraries
+Summary:	Tdelibs bindings for Java [Trinity]
+Group:		System/Libraries
 
 Requires:	trinity-libtrinity-jni = %{version}-%{release}
 
@@ -442,8 +436,8 @@ This package is part of the official TDE bindings module.
 ##########
 
 %package -n trinity-libtrinity-jni
-Summary:	tdelibs bindings for java ( Native libraries ) [Trinity]
-Group:		Environment/Libraries
+Summary:	Tdelibs bindings for java ( Native libraries ) [Trinity]
+Group:		System/Libraries
 
 %description -n trinity-libtrinity-jni
 This package contains the shared libraries necessary to run Java
@@ -462,7 +456,7 @@ This package is part of the official TDE bindings module.
 
 %package -n trinity-libtrinity-jni-devel
 Summary:	Development files for tdelibs bindings for java ( Native libraries ) [Trinity]
-Group:		Development/Libraries
+Group:		Development/Languages/Java
 Requires:	trinity-libtrinity-jni = %{version}-%{release}
 
 %description -n trinity-libtrinity-jni-devel
@@ -478,7 +472,7 @@ This package is part of the official TDE bindings module.
 
 %package -n trinity-libsmokeqt1
 Summary:	SMOKE Binding Library to Qt
-Group:		Environment/Libraries
+Group:		System/Libraries
 
 %description -n trinity-libsmokeqt1
 The "Scripting Meta Object Kompiler Engine" library is used by
@@ -501,7 +495,7 @@ This package is part of the official TDE bindings module.
 
 %package -n trinity-libsmokeqt-devel
 Summary:	SMOKE Binding Library to Qt - Development Files
-Group:		Development/Libraries
+Group:		Development/Languages/Other
 Requires:	trinity-libsmokeqt1 = %{version}-%{release}
 
 %description -n trinity-libsmokeqt-devel
@@ -531,7 +525,7 @@ This package is part of the official TDE bindings module.
 
 %package -n trinity-libsmoketde
 Summary:	SMOKE Binding Library to TDE
-Group:		Environment/Libraries
+Group:		System/Libraries
 
 Obsoletes:	trinity-libsmokekde1 < %{version}-%{release}
 Provides:	trinity-libsmokekde1 = %{version}-%{release}
@@ -557,7 +551,7 @@ This package is part of the official TDE bindings module.
 
 %package -n trinity-libsmoketde-devel
 Summary:	SMOKE Binding Library to TDE - Development Files
-Group:		Development/Libraries
+Group:		Development/Languages/Other
 Requires:	trinity-libsmoketde = %{version}-%{release}
 
 Obsoletes:	trinity-libsmokekde-devel < %{version}-%{release}
@@ -587,17 +581,25 @@ This package is part of the official TDE bindings module.
 
 ##########
 
-%package -n trinity-perl-dcop
+%package -n perl-dcop
 Summary:	DCOP Bindings for Perl 
-Group:		Development/Libraries/Perl
+Group:		System/Libraries
+%if 0%{?suse_version}
+Requires:	perl-base
+%else
+Requires:	perl
+%endif
 
 Obsoletes:	trinity-kdebindings-dcopperl < %{version}-%{release}
 Provides:	trinity-kdebindings-dcopperl = %{version}-%{release}
 
-%description -n trinity-perl-dcop
+Obsoletes:	trinity-perl-dcop < %{version}-%{release}
+Provides:	trinity-perl-dcop = %{version}-%{release}
+
+%description -n perl-dcop
 Perl bindings to the DCOP interprocess communication protocol used by TDE
 
-%files -n trinity-perl-dcop
+%files -n perl-dcop
 %defattr(-,root,root,-)
 %{perl_vendorarch}/auto/DCOP/
 %{perl_vendorarch}/DCOP.pm
@@ -607,13 +609,15 @@ Perl bindings to the DCOP interprocess communication protocol used by TDE
 
 ##########
 
-%package -n trinity-python-dcop
+%package -n python-dcop
 Summary:	DCOP bindings for Python
-Group:		Environment/Libraries
+Group:		System/Libraries
 Requires:	python
-#Provides:	%{name}-dcoppython = %{version}-%{release}
 
-%description -n trinity-python-dcop
+Obsoletes:	trinity-python-dcop < %{version}-%{release}
+Provides:	trinity-python-dcop = %{version}-%{release}
+
+%description -n python-dcop
 This package contains the shared libraries necessary to run and
 develop Python programs using the Python DCOP bindings
 libraries. DCOP is the TDE Desktop COmmunications Protocol, used for
@@ -621,7 +625,7 @@ communicating with running TDE applications.
 
 This package is part of the official TDE bindings module.
 
-%files -n trinity-python-dcop
+%files -n python-dcop
 %defattr(-,root,root,-)
 %{python_sitearch}/pcop.la
 %{python_sitearch}/pcop.so
@@ -631,7 +635,7 @@ This package is part of the official TDE bindings module.
 
 %package -n trinity-libkjsembed1
 Summary:	Embedded JavaScript library
-Group:		Environment/Libraries
+Group:		System/Libraries
 
 %description -n trinity-libkjsembed1
 This package contains the shared libraries necessary to run programs
@@ -685,7 +689,7 @@ update-desktop-database >& /dev/null ||:
 
 %package -n trinity-libkjsembed-devel
 Summary:	Embedded JavaScript library (Development files)
-Group:		Development/Libraries
+Group:		Development/Libraries/Other
 Requires:	trinity-libkjsembed1 = %{version}-%{release}
 
 %description -n trinity-libkjsembed-devel
@@ -716,7 +720,7 @@ This package is part of the official TDE bindings module.
 
 %package -n trinity-kjscmd
 Summary:	A script interpreter using the TDE JavaScript library
-Group:		Environment/Libraries
+Group:		System/Libraries
 
 %description -n trinity-kjscmd
 This package contains the kjscmd program, which is a standalone
@@ -742,7 +746,7 @@ update-desktop-database >& /dev/null ||:
 
 %package -n trinity-juic
 Summary:	The Qt Java UI Compiler
-Group:		Environment/Libraries
+Group:		Development/Languages/Java
 Requires:	trinity-libqt3-java = %{version}-%{release}
 
 %description -n trinity-juic
@@ -763,7 +767,7 @@ This package is part of the official TDE bindings module.
 
 %package -n trinity-libkorundum0-ruby
 Summary:	TDE bindings for Ruby [Trinity]
-Group:		Environment/Libraries
+Group:		System/Libraries
 Requires:	trinity-libqt0-ruby = %{version}-%{release}
 
 %description -n trinity-libkorundum0-ruby
@@ -782,6 +786,7 @@ This package is part of the official TDE bindings module.
 %{tde_bindir}/krubyinit
 %{tde_bindir}/rbkconfig_compiler
 %{ruby_rubylibdir}/Korundum.rb
+%dir %{ruby_rubylibdir}/KDE
 %{ruby_rubylibdir}/KDE/korundum.rb
 %{ruby_arch}/korundum.la
 %{ruby_arch}/korundum.so*
@@ -797,7 +802,7 @@ This package is part of the official TDE bindings module.
 
 %package -n trinity-libqt0-ruby
 Summary:	Qt bindings for Ruby [Trinity]
-Group:		Development/Languages/Other
+Group:		System/Libraries
 Requires:	ruby
 
 %description -n trinity-libqt0-ruby
@@ -835,10 +840,10 @@ This package is part of the official TDE bindings module.
 %if 0
 %package -n trinity-kmozilla
 Summary:	Kmozilla for TDE
-Group:		Development/Languages/Other
+Group:		System/Libraries
 
 %description -n trinity-kmozilla
-%{summary}
+This package contains the kmozilla library fro TDE.
 
 %files -n trinity-kmozilla
 %defattr(-,root,root,-)
@@ -853,7 +858,7 @@ Group:		Development/Languages/Other
 
 %package -n trinity-xpart-notepad
 Summary:	A small XPart editor
-Group:		Development/Languages/Other
+Group:		Productivity/Scientific/Math
 
 %description -n trinity-xpart-notepad
 xpart_notepad is a small XPart editor. Use it to understand how to use XPart.
@@ -882,7 +887,7 @@ Summary:	Xparts library for GTK
 Group:		Development/Languages/Other
 
 %description -n trinity-libgtkxparts1
-%{summary}
+This package contains the xparts library for GTK.
 
 %files -n trinity-libgtkxparts1
 %defattr(-,root,root,-)
@@ -906,7 +911,7 @@ Obsoletes:	trinity-libkdexparts1 < %{version}-%{release}
 Provides:	trinity-libkdexparts1 = %{version}-%{release}
 
 %description -n trinity-libtdexparts
-%{summary}
+This package contains the xparts library for TDE.
 
 %files -n trinity-libtdexparts
 %defattr(-,root,root,-)
@@ -930,7 +935,7 @@ Requires:	trinity-libgtkxparts1 = %{version}-%{release}
 Requires:	trinity-libtdexparts = %{version}-%{release}
 
 %description -n trinity-libxparts-devel
-%{summary}
+This package contains the development files for Xparts library.
 
 %files -n trinity-libxparts-devel
 %defattr(-,root,root,-)
@@ -973,10 +978,10 @@ This package is part of the official TDE bindings module.
 
 %package -n trinity-libdcop-c
 Summary:	DCOP bindings for C [Trinity]
-Group:		Development/Languages/Other
+Group:		System/Libraries
 
 %description -n trinity-libdcop-c
-%{summary}
+This package contains the DCOP bindings for C.
 
 %files -n trinity-libdcop-c
 %defattr(-,root,root,-)
@@ -992,11 +997,11 @@ Group:		Development/Languages/Other
 
 %package -n trinity-libdcop-c-devel
 Summary:	DCOP bindings for C, development files [Trinity]
-Group:		Development/Languages/Other
+Group:		Development/Languages/C and C++
 Requires:	trinity-libdcop-c = %{version}-%{release}
 
 %description -n trinity-libdcop-c-devel
-%{summary}
+This package contains the development files for DCOP bindings for C.
 
 %files -n trinity-libdcop-c-devel
 %defattr(-,root,root,-)
@@ -1033,9 +1038,10 @@ Requires:	trinity-libqt3-jni-devel = %{version}-%{release}
 Requires:	trinity-libtrinity-jni-devel = %{version}-%{release}
 
 %description devel
-Development files for the TDE bindings.
+This package contains the development files for the TDE bindings.
 
 %files devel
+%defattr(-,root,root,-)
 
 ##########
 
@@ -1047,10 +1053,7 @@ Development files for the TDE bindings.
 
 %prep
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-%patch1 -p1 -b .rubypath
-%patch2 -p1 -b .ruby2
-%patch3 -p1 -b .automake113
-%patch4 -p1 -b .dcopjavaldflags
+%{?tde_patch:%patch1 -p1}
 
 %if "%{?perl_vendorarch}" == ""
 exit 1
@@ -1157,21 +1160,21 @@ find $RPM_BUILD_ROOT -type f -a \( -name perllocal.pod -o -name .packlist \
 # Installs juic
 %__install -D -m 755 qtjava/designer/juic/bin/juic	%{?buildroot}%{tde_bindir}/juic
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/juic/common
-%__install qtjava/designer/juic/common/*.xml %{?buildroot}%{tde_datadir}/juic/common
-%__install qtjava/designer/juic/common/*.xsl %{?buildroot}%{tde_datadir}/juic/common
+%__install -m 644 qtjava/designer/juic/common/*.xml %{?buildroot}%{tde_datadir}/juic/common
+%__install -m 644 qtjava/designer/juic/common/*.xsl %{?buildroot}%{tde_datadir}/juic/common
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/juic/java
-%__install qtjava/designer/juic/java/*.xml %{?buildroot}%{tde_datadir}/juic/java
-%__install qtjava/designer/juic/java/*.xsl %{?buildroot}%{tde_datadir}/juic/java
-%__install qtjava/designer/juic/juic.xsl  %{?buildroot}%{tde_datadir}/juic
+%__install -m 644 qtjava/designer/juic/java/*.xml %{?buildroot}%{tde_datadir}/juic/java
+%__install -m 644 qtjava/designer/juic/java/*.xsl %{?buildroot}%{tde_datadir}/juic/java
+%__install -m 644 qtjava/designer/juic/juic.xsl  %{?buildroot}%{tde_datadir}/juic
 
 # kjsembed sample files
 %__install -d -m 755 %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
-%__install kjsembed/plugins/customobject_plugin.cpp %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
-%__install kjsembed/plugins/customobject_plugin.h %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
-%__install kjsembed/plugins/customobject_plugin.desktop %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
-%__install kjsembed/plugins/customqobject_plugin.cpp %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
-%__install kjsembed/plugins/customqobject_plugin.h %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
-%__install kjsembed/plugins/customqobject_plugin.desktop %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
+%__install -m 644 kjsembed/plugins/customobject_plugin.cpp %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
+%__install -m 644 kjsembed/plugins/customobject_plugin.h %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
+%__install -m 644 kjsembed/plugins/customobject_plugin.desktop %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
+%__install -m 644 kjsembed/plugins/customqobject_plugin.cpp %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
+%__install -m 644 kjsembed/plugins/customqobject_plugin.h %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
+%__install -m 644 kjsembed/plugins/customqobject_plugin.desktop %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
 
 # Man installation location is wrong on RHEL4...
 if [ -d "%{buildroot}%{_mandir}/man3" ]; then
diff --git a/redhat/main/tdegames/tdegames-3.5.13.2.spec b/redhat/main/tdegames/tdegames-3.5.13.2.spec
index a362c1407..3d3cd4e7d 100644
--- a/redhat/main/tdegames/tdegames-3.5.13.2.spec
+++ b/redhat/main/tdegames/tdegames-3.5.13.2.spec
@@ -1,50 +1,86 @@
-# 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
-
+#
+# spec file for package tdegames (version 3.5.13-SRU)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
+#
+
+# BUILD WARNING:
+#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
+#  Having KDE libraries may cause FTBFS here !
+
+# TDE variables
+%define tde_epoch 1
 %define tde_version 3.5.13.2
-
-# TDE specific building variables
+%define tde_pkg tdegames
+%define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
-
 %define tde_tdeappdir %{tde_datadir}/applications/kde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
-%define _docdir %{tde_docdir}
+# 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
 
 
-Name:			trinity-tdegames
+Name:			trinity-%{tde_pkg}
 Summary:		Trinity Desktop Environment - Games
 Version:		%{tde_version}
-Release:		%{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant}
+Release:		%{?!preversion:4}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Group:			System/GUI/Other
+URL:			http://www.trinitydesktop.org/
 
-License:		GPLv2
-Group:			Amusements/Games
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
 
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
+#Vendor:		Trinity Project
+#Packager:	Francois Andriot <francois.andriot@free.fr>
 
 Prefix:			%{tde_prefix}
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
 
+BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	trinity-tdemultimedia-devel >= %{tde_version}
+
 BuildRequires:	autoconf automake libtool m4
+BuildRequires:	gcc-c++
+BuildRequires:	desktop-file-utils
+BuildRequires:	fdupes
 BuildRequires:	libtool
 
-BuildRequires:	qt3-devel >= 3.3.8.d
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdemultimedia-devel >= %{tde_version}
+# 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
 
 Obsoletes:		trinity-kdegames < %{version}-%{release}
 Provides:		trinity-kdegames = %{version}-%{release}
@@ -99,8 +135,7 @@ ksnake, ksirtet, katomic, kjumpingcube, ktuberling.
 
 %package devel
 Summary:	Development files for %{name} 
-Group:		Development/Libraries
-License:	LGPLv2
+Group:		Amusements/Games/Other
 
 Requires:	%{name} = %{version}-%{release}
 Requires:	trinity-tdelibs-devel >= %{tde_version}
@@ -112,8 +147,6 @@ Obsoletes:		trinity-kdegames-devel < %{version}-%{release}
 Provides:		trinity-kdegames-devel = %{version}-%{release}
 
 %description devel
-%{summary}.
-
 Install %{name}-devel if you wish to develop or compile games for the
 TDE desktop.
 
@@ -124,7 +157,7 @@ TDE desktop.
 
 %package -n trinity-libtdegames1
 Summary:	Trinity games library and common files
-Group:		Amusements/Games
+Group:		Amusements/Games/Other
 
 %description -n trinity-libtdegames1
 This library provides a common infrastructure for several of the
@@ -137,10 +170,11 @@ This package is part of TDE, and a component of the TDE games module.
 %files -n trinity-libtdegames1
 %defattr(-,root,root,-)
 %{tde_libdir}/libkdegames.so.*
+%dir %{tde_datadir}/apps/kdegames
+%dir %{tde_datadir}/apps/kdegames/pics
 %{tde_datadir}/apps/kdegames/pics/star.png
 %{tde_datadir}/icons/crystalsvg/*/actions/roll.png
 %{tde_datadir}/icons/crystalsvg/*/actions/highscore.png
-#%{tde_tdedocdir}/HTML/en/%{name}-%{version}-apidocs/
 
 %post -n trinity-libtdegames1
 for f in crystalsvg ; do
@@ -160,7 +194,7 @@ done
 
 %package -n trinity-libtdegames-devel
 Summary:	Trinity games library headers
-Group:		Development/Libraries
+Group:		Development/Libraries/Other
 Requires:	trinity-libtdegames1 = %{version}-%{release}
 
 %description -n trinity-libtdegames-devel
@@ -180,7 +214,7 @@ This package is part of Trinity, and a component of the TDE games module.
 
 %package card-data
 Summary:	Card decks for Trinity games
-Group:		Amusements/Games
+Group:		Amusements/Games/Other
 
 %description card-data
 Several different collections of card images for use by TDE games.
@@ -189,13 +223,13 @@ This package is part of Trinity, and a component of the TDE games module.
 
 %files card-data
 %defattr(-,root,root,-)
-%{tde_datadir}/apps/carddecks/*
+%{tde_datadir}/apps/carddecks/
 
 ##########
 
 %package -n trinity-atlantik
 Summary:	TDE client for Monopoly-like network games
-Group:		Amusements/Games
+Group:		Amusements/Games/Board/Other
 
 %description -n trinity-atlantik
 This is a TDE client for playing Monopoly-like boardgames on the
@@ -240,7 +274,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-atlantik-devel
 Summary:	Development files for Atlantik
-Group:		Development/Libraries
+Group:		Development/Libraries/Other
 Requires:	trinity-atlantik = %{version}-%{release}
 
 %description -n trinity-atlantik-devel
@@ -270,7 +304,7 @@ This package is part of Trinity, and a component of the TDE games module.
 
 %package -n trinity-kasteroids
 Summary:	Asteroids for Trinity
-Group:		Amusements/Games
+Group:		Amusements/Games/Action/Arcade
 
 %description -n trinity-kasteroids
 You know this game.  It is based on Warwick Allison's QwSpriteField
@@ -309,7 +343,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-katomic
 Summary:	Atomic Entertainment game for Trinity
-Group:		Amusements/Games
+Group:		Amusements/Games/Strategy/Other
 
 %description -n trinity-katomic
 This is a puzzle game, in which the object is to assemble a molecule
@@ -345,7 +379,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-kbackgammon
 Summary:	A Backgammon game for Trinity
-Group:		Amusements/Games
+Group:		Amusements/Games/Board/Other
 
 %description -n trinity-kbackgammon
 KBackgammon is a backgammon program for Trinity. It is based on the
@@ -383,7 +417,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-kbattleship
 Summary:	Battleship game for Trinity
-Group:		Amusements/Games
+Group:		Amusements/Games/Board/Other
 
 %description -n trinity-kbattleship
 This is an implementation of the Battleship game.  Each player tries
@@ -420,7 +454,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-kblackbox
 Summary:	A simple logical game for the Trinity project
-Group:		Amusements/Games
+Group:		Amusements/Games/Board/Other
 
 %description -n trinity-kblackbox
 KBlackBox is a game of hide and seek played on an grid of boxes. Your
@@ -458,7 +492,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-kbounce
 Summary:	Jezzball clone for the K Desktop Environment
-Group:		Amusements/Games
+Group:		Amusements/Games/Action/Arcade
 
 %description -n trinity-kbounce
 This is a clone of the popular Jezzball game originally created by
@@ -506,7 +540,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-kenolaba
 Summary:	Enolaba board game for Trinity
-Group:		Amusements/Games
+Group:		Amusements/Games/Board/Other
 
 %description -n trinity-kenolaba
 kenolaba is a simple board strategy game that is played by two
@@ -546,7 +580,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-kfouleggs
 Summary:	A TDE clone of the Japanese PuyoPuyo game
-Group:		Amusements/Games
+Group:		Amusements/Games/Action/Arcade
 
 %description -n trinity-kfouleggs
 KFouleggs is a clone of the Japanese PuyoPuyo game, with advanced
@@ -583,7 +617,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-kgoldrunner
 Summary:	A Trinity clone of the Loderunner arcade game
-Group:		Amusements/Games
+Group:		Amusements/Games/Action/Arcade
 
 %description -n trinity-kgoldrunner
 KGoldrunner, a game of action and puzzle solving.  Run through the
@@ -629,7 +663,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-kjumpingcube
 Summary:	Tactical one or two player game
-Group:		Amusements/Games
+Group:		Amusements/Games/Strategy/Other
 
 %description -n trinity-kjumpingcube
 KJumpingCube is a simple tactical game. You can play it against the
@@ -668,7 +702,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-klickety
 Summary:	A Clickomania-like game for Trinity
-Group:		Amusements/Games
+Group:		Amusements/Games/Board/Other
 
 %description -n trinity-klickety
 Klickety is an adaptation of the (perhaps) well-known Clickomania
@@ -682,8 +716,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_tdeappdir}/klickety.desktop
 %{tde_datadir}/icons/hicolor/*/apps/klickety.png
 %{tde_datadir}/icons/crystalsvg/*/actions/endturn.png
-%{tde_datadir}/apps/klickety/klicketyui.rc
-%{tde_datadir}/apps/klickety/eventsrc
+%{tde_datadir}/apps/klickety/
 %{tde_tdedocdir}/HTML/en/klickety/
 
 %post -n trinity-klickety
@@ -704,7 +737,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-klines
 Summary:	Color lines for Trinity
-Group:		Amusements/Games
+Group:		Amusements/Games/Strategy/Other
 
 %description -n trinity-klines
 KLines is a simple game. It is played by one player, so there is only
@@ -747,8 +780,8 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 ##########
 
 %package -n trinity-kmahjongg
-Summary:	the classic mahjongg game for Trinity project
-Group:		Amusements/Games
+Summary:	The classic mahjongg game for Trinity project
+Group:		Amusements/Games/Board/Other
 
 %description -n trinity-kmahjongg
 Your mission in this game is to remove all tiles from the game board. A
@@ -784,7 +817,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-kmines
 Summary:	Minesweeper for Trinity
-Group:		Amusements/Games
+Group:		Amusements/Games/Board/Other
 
 %description -n trinity-kmines
 KMines is the classic Minesweeper game. You must uncover all the
@@ -824,7 +857,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-knetwalk
 Summary:	A game for system administrators
-Group:		Amusements/Games
+Group:		Amusements/Games/Board/Other
 
 %description -n trinity-knetwalk
 This game presents the player with a rectangular field consisting of
@@ -859,7 +892,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-kolf
 Summary:	Minigolf game for TDE
-Group:		Amusements/Games
+Group:		Amusements/Games/Action/Arcade
 
 %description -n trinity-kolf
 This is a minigolf game for TDE that allows you to go through different
@@ -904,7 +937,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-kolf-devel
 Summary:	Development files for Kolf
-Group:		Development/Libraries
+Group:		Development/Libraries/Other
 Requires:	trinity-kolf = %{version}-%{release}
 
 %description -n trinity-kolf-devel
@@ -929,7 +962,7 @@ This package is part of Trinity, and a component of the TDE games module.
 
 %package -n trinity-konquest
 Summary:	TDE based GNU-Lactic Konquest game
-Group:		Amusements/Games
+Group:		Amusements/Games/Strategy/Other
 
 %description -n trinity-konquest
 This the TDE version of Gnu-Lactic Konquest, a multi-player strategy
@@ -964,7 +997,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-kpat
 Summary:	Trinity solitaire patience game
-Group:		Amusements/Games
+Group:		Amusements/Games/Board/Card
 
 %description -n trinity-kpat
 KPatience is a collection of 14 card games. All the games are single
@@ -998,7 +1031,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-kpoker
 Summary:	Trinity based Poker clone
-Group:		Amusements/Games
+Group:		Amusements/Games/Board/Card
 
 %description -n trinity-kpoker
 KPoker is a TDE compliant clone of those highly addictive pocket
@@ -1032,7 +1065,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-kreversi
 Summary:	Reversi for Trinity
-Group:		Amusements/Games
+Group:		Amusements/Games/Board/Other
 
 %description -n trinity-kreversi
 Reversi is a simple strategy game that is played by two
@@ -1075,7 +1108,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-ksame
 Summary:	SameGame for Trinity
-Group:		Amusements/Games
+Group:		Amusements/Games/Strategy/Other
 
 %description -n trinity-ksame
 KSame is a simple game. It's played by one player, so there is only
@@ -1089,7 +1122,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %defattr(-,root,root,-)
 %{tde_bindir}/ksame
 %{tde_datadir}/icons/hicolor/*/apps/ksame.png
-%{tde_datadir}/apps/ksame/*
+%{tde_datadir}/apps/ksame/
 %{tde_tdeappdir}/ksame.desktop
 %{tde_tdedocdir}/HTML/en/ksame/
 
@@ -1111,7 +1144,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-kshisen
 Summary:	Shisen-Sho for Trinity
-Group:		Amusements/Games
+Group:		Amusements/Games/Board/Other
 
 %description -n trinity-kshisen
 KShisen-Sho is a single-player-game similar to Mahjongg and uses the
@@ -1148,7 +1181,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-ksirtet
 Summary:	Tetris and Puyo-Puyo games for Trinity
-Group:		Amusements/Games
+Group:		Amusements/Games/Board/Other
 
 %description -n trinity-ksirtet
 This program is a clone of the well known game Tetris. You must fit
@@ -1189,7 +1222,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-ksmiletris
 Summary:	Tetris like game for Trinity
-Group:		Amusements/Games
+Group:		Amusements/Games/Action/Arcade
 
 %description -n trinity-ksmiletris
 This is a game with falling blocks composed of different types of
@@ -1224,7 +1257,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-ksnake
 Summary:	Snake Race for Trinity
-Group:		Amusements/Games
+Group:		Amusements/Games/Action/Arcade
 
 %description -n trinity-ksnake
 Snake Race is a game of speed and agility. You are a hungry snake and
@@ -1259,7 +1292,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-ksokoban
 Summary:	Sokoban game for Trinity
-Group:		Amusements/Games
+Group:		Amusements/Games/Strategy/Other
 
 %description -n trinity-ksokoban
 The first sokoban game was created in 1982 by Hiroyuki Imabayashi at
@@ -1308,7 +1341,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-kspaceduel
 Summary:	Arcade two-player space game for Trinity
-Group:		Amusements/Games
+Group:		Amusements/Games/Action/Arcade
 
 %description -n trinity-kspaceduel
 KSpaceduel is an space arcade game for two players.
@@ -1347,7 +1380,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-ktron
 Summary:	Tron clone for the K Desktop Environment
-Group:		Amusements/Games
+Group:		Amusements/Games/Action/Arcade
 
 %description -n trinity-ktron
 The object of the game is to avoid running into walls, your own tail,
@@ -1382,7 +1415,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-ktuberling
 Summary:	Potato Guy for Trinity
-Group:		Amusements/Games
+Group:		Amusements/Games/Action/Arcade
 
 %description -n trinity-ktuberling
 KTuberling is a game intended for small children. Of course, it may
@@ -1430,7 +1463,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-twin4
 Summary:	Connect Four clone for Trinity
-Group:		Amusements/Games
+Group:		Amusements/Games/Board/Other
 
 %description -n trinity-twin4
 Four wins is a game for two players. Each player is represented by a
@@ -1474,7 +1507,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-lskat
 Summary:	Lieutnant Skat card game for Trinity
-Group:		Amusements/Games
+Group:		Amusements/Games/Board/Card
 
 %description -n trinity-lskat
 Lieutnant Skat (from German Offiziersskat) is a card game for two
@@ -1513,7 +1546,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 ##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
@@ -1529,7 +1562,8 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 
 %build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
+unset QTDIR QTINC QTLIB
+. /etc/profile.d/qt3.sh
 export PATH="%{tde_bindir}:${PATH}"
 
 # Do not build against any "/usr" installed KDE
@@ -1537,7 +1571,7 @@ export KDEDIR="%{tde_prefix}"
 
 # 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 \
@@ -1571,6 +1605,45 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -r kasteroids      Game ArcadeGame
+%suse_update_desktop_file -r KGoldrunner     Game ArcadeGame
+%suse_update_desktop_file -r ksnake          Game ArcadeGame
+%suse_update_desktop_file -r kspaceduel      Game ArcadeGame
+%suse_update_desktop_file -r ktron           Game ArcadeGame
+%suse_update_desktop_file -r kfouleggs       Game BlocksGame
+%suse_update_desktop_file -r ksirtet         Game BlocksGame
+%suse_update_desktop_file -r klickety        Game BoardGame
+%suse_update_desktop_file -r ksmiletris      Game BlocksGame
+%suse_update_desktop_file -r ktuberling      Game KidsGame
+%suse_update_desktop_file -r atlantik        Game BoardGame
+%suse_update_desktop_file -r kbackgammon     Game BoardGame
+%suse_update_desktop_file -r kbattleship     Game BoardGame
+%suse_update_desktop_file -r kblackbox       Game BoardGame
+%suse_update_desktop_file -r kenolaba        Game BoardGame
+%suse_update_desktop_file -r kmahjongg       Game BoardGame
+%suse_update_desktop_file -r kreversi        Game BoardGame
+%suse_update_desktop_file -r kshisen         Game BoardGame
+%suse_update_desktop_file -r kwin4           Game BoardGame
+%suse_update_desktop_file -r kpat            Game CardGame
+%suse_update_desktop_file -r kpoker          Game CardGame
+%suse_update_desktop_file -r lskat           Game CardGame
+%suse_update_desktop_file -r katomic         Game LogicGame
+%suse_update_desktop_file -r kjumpingcube    Game LogicGame
+%suse_update_desktop_file -r klines          Game LogicGame
+%suse_update_desktop_file -r -G "Tactical Game" knetwalk Game LogicGame
+%suse_update_desktop_file -r kmines          Game LogicGame
+%suse_update_desktop_file -r konquest        Game LogicGame
+%suse_update_desktop_file -r ksame           Game LogicGame
+%suse_update_desktop_file -r ksokoban        Game LogicGame
+%suse_update_desktop_file -r kbounce         Game LogicGame
+%suse_update_desktop_file -r kolf            Game SportsGame
+%endif
+
+# Links duplicate files
+%fdupes "%{?buildroot}"
+
 
 %clean
 %__rm -rf %{buildroot}
diff --git a/redhat/main/tdelibs/tdelibs-3.5.13.2.spec b/redhat/main/tdelibs/tdelibs-3.5.13.2.spec
index 61cbf5344..5f2f18756 100644
--- a/redhat/main/tdelibs/tdelibs-3.5.13.2.spec
+++ b/redhat/main/tdelibs/tdelibs-3.5.13.2.spec
@@ -29,6 +29,8 @@
 %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_sbindir %{tde_prefix}/sbin
 %define tde_tdeappdir %{tde_datadir}/applications/kde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
@@ -41,8 +43,9 @@
 
 
 Name:			trinity-%{tde_pkg}
+Epoch:			%{tde_epoch}
 Version:		%{tde_version}
-Release:		%{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant}
+Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
 Summary:		TDE Libraries
 Group:			System/GUI/Other
 URL:			http://www.trinitydesktop.org/
@@ -62,6 +65,8 @@ BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
 Source1:		trinity-tdelibs-rpmlintrc
 
+%{?tde_patch:Patch1:			%{tde_pkg}-%{tde_version}.patch}
+
 Obsoletes:		tdelibs < %{version}-%{release}
 Provides:		tdelibs = %{version}-%{release}
 Obsoletes:		trinity-kdelibs < %{version}-%{release}
@@ -95,6 +100,11 @@ BuildRequires:	fdupes
 BuildRequires:	update-desktop-files
 %endif
 
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
 # KRB5 support
 BuildRequires:	krb5-devel
 
@@ -166,21 +176,18 @@ BuildRequires:	utempter-devel
 %endif
 
 # HSPELL support
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_hspell 1
 BuildRequires:	hspell-devel
 %endif
 
 # JASPER support
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
 %define with_jasper 1
 %if 0%{?suse_version}
 BuildRequires:	libjasper-devel
 %endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}jasper-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora}
+%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	jasper-devel
 %endif
 %endif
@@ -190,7 +197,7 @@ BuildRequires:	jasper-devel
 %define with_avahi 1
 BuildRequires:	libavahi-tqt-devel >= 1:0.6.30
 %if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}avahi-client-devel
+BuildRequires:	avahi-client-devel
 Requires:		%{_lib}avahi-client3
 %endif
 %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
@@ -200,7 +207,7 @@ Requires:		avahi
 %endif
 
 # OPENEXR support
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
 %define with_openexr 1
 BuildRequires:	OpenEXR-devel
 %endif
@@ -208,7 +215,7 @@ BuildRequires:	OpenEXR-devel
 # LIBTOOL
 BuildRequires:	libtool
 %if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}ltdl-devel
+BuildRequires:	libltdl-devel
 %endif
 %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
 BuildRequires:	libtool-ltdl-devel
@@ -240,7 +247,7 @@ Requires:		xorg-x11
 %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
 %define with_lzma 1
 %if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}lzma-devel
+BuildRequires:	liblzma-devel
 %endif
 %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
 BuildRequires:	xz-devel
@@ -248,12 +255,12 @@ BuildRequires:	xz-devel
 %endif
 
 # Certificates support
-%if 0%{?rhel} >= 6 || 0%{?fedora}
+%if 0%{?fedora} == 18 || 0%{?fedora} == 19
 %define	cacert	%{_sysconfdir}/ssl/certs/ca-certificates.crt
 BuildRequires:	ca-certificates
 Requires:		ca-certificates
 %endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?fedora} >= 20
 %define	cacert	%{_sysconfdir}/ssl/certs/ca-bundle.crt
 Requires:		openssl
 %endif
@@ -266,6 +273,9 @@ Requires:		openssl
 BuildRequires:	ca-certificates
 Requires:		ca-certificates
 %endif
+%if "%{cacert}" != ""
+Requires:		%{cacert}
+%endif
 
 # XRANDR support
 #  On RHEL5, xrandr library is too old.
@@ -276,7 +286,7 @@ Requires:		ca-certificates
 # XCOMPOSITE support
 %if 0%{?mgaversion} || 0%{?mdkversion}
 %if 0%{?mgaversion} >= 4
-%define xcomposite_devel %{_lib}xcomposite-devel
+%define xcomposite_devel libxcomposite-devel
 %else
 %define xcomposite_devel %{_lib}xcomposite%{?mgaversion:1}-devel
 %endif
@@ -290,10 +300,12 @@ Requires:		ca-certificates
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
 %define xt_devel libXt-devel
 %endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%define xt_devel libxt-devel
+%endif
 %{?xt_devel:BuildRequires: %{xt_devel}}
 
 
-
 %description
 Libraries for the Trinity Desktop Environment:
 TDE Libraries included: tdecore (TDE core library), tdeui (user interface),
@@ -419,12 +431,12 @@ fi
 %package devel
 Summary:	TDE Libraries (Development files)
 Group:		Development/Libraries/X11
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name} = %{tde_epoch}:%{version}-%{release}
 
-Obsoletes:	tdelibs-devel < %{version}-%{release}
-Provides:	tdelibs-devel = %{version}-%{release}
-Obsoletes:	trinity-kdelibs-devel < %{version}-%{release}
-Provides:	trinity-kdelibs-devel = %{version}-%{release}
+Obsoletes:	tdelibs-devel < %{tde_epoch}:%{version}-%{release}
+Provides:	tdelibs-devel = %{tde_epoch}:%{version}-%{release}
+Obsoletes:	trinity-kdelibs-devel < %{tde_epoch}:%{version}-%{release}
+Provides:	trinity-kdelibs-devel = %{tde_epoch}:%{version}-%{release}
 
 Requires:	qt3-devel >= 3.3.8d
 Requires:	libtqt4-devel = %{tde_epoch}:4.2.0
@@ -459,7 +471,7 @@ applications for TDE.
 
 ##########
 
-%if 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
@@ -467,6 +479,7 @@ applications for TDE.
 
 %prep
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
+%{?tde_patch:%patch1 -p1}
 
 
 %build
@@ -544,7 +557,7 @@ fi
 
 # Fix 'tderesources.desktop' (openSUSE only)
 %if 0%{?suse_version}
-%suse_update_desktop_file -r tderesources Qt X-TDE-settings-desktop
+%suse_update_desktop_file -r kresources Qt X-TDE-settings-desktop
 %endif
 
 # Remove setuid bit on some binaries.
@@ -571,16 +584,5 @@ chmod 0755 "%{?buildroot}%{tde_bindir}/start_kdeinit"
 
 
 %changelog
-* Sat Oct 11 2014 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-4
-- Remove integrated fileshareset.
-- Update dependencies.
-
-* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-3
-- Build for Fedora 19
-
-* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2
-- Rebuild with NDEBUG option
-- Fix XDG menu
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
-- Initial release for TDE 3.5.13.2
+* Mon Nov 10 2014 Francois Andriot <francois.andriot@free.fr> - 1:3.5.13.2-1
+- Initial TDE 3.5.13.2 for openSUSE Build Service
diff --git a/redhat/main/tdemultimedia/tdemultimedia-3.5.13.2.spec b/redhat/main/tdemultimedia/tdemultimedia-3.5.13.2.spec
index 21a6019f3..3b2d4060d 100644
--- a/redhat/main/tdemultimedia/tdemultimedia-3.5.13.2.spec
+++ b/redhat/main/tdemultimedia/tdemultimedia-3.5.13.2.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package tdemultimedia (version 3.5.13.2)
+# spec file for package tdemultimedia (version 3.5.13-SRU)
 #
 # Copyright (c) 2014 Trinity Desktop Environment
 #
@@ -43,8 +43,8 @@
 Name:		trinity-%{tde_pkg}
 Summary:	Multimedia applications for the Trinity Desktop Environment (TDE)
 Version:	%{tde_version}
-Release:	%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
-Group:		Applications/Multimedia
+Release:	%{?!preversion:6}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Group:		Productivity/Multimedia/Sound/Utilities
 URL:		http://www.trinitydesktop.org/
 
 %if 0%{?suse_version}
@@ -70,21 +70,21 @@ Provides:	trinity-kdemultimedia-extras = %{version}-%{release}
 Obsoletes:	trinity-kdemultimedia-extras-libs < %{version}-%{release}
 Provides:	trinity-kdemultimedia-extras-libs = %{version}-%{release}
 
-
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
+BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 
 BuildRequires:	autoconf automake libtool m4
 BuildRequires:	gcc-c++
 BuildRequires:	fdupes
+BuildRequires:	desktop-file-utils
 
 # SUSE desktop files utility
 %if 0%{?suse_version}
 BuildRequires:	update-desktop-files
 %endif
 
-%if 0%{?opensuse_bs}
+%if 0%{?opensuse_bs} && 0%{?suse_version}
 # for xdg-menu script
 BuildRequires:	brp-check-trinity
 %endif
@@ -99,7 +99,7 @@ BuildRequires: trinity-akode-devel
 %{?with_mad:BuildRequires: trinity-akode-libmad}
 %endif
 
-BuildRequires:	desktop-file-utils
+# ZLIB support
 BuildRequires:	zlib-devel
 
 # MUSICBRAINZ support
@@ -173,7 +173,7 @@ BuildRequires:	libXxf86vm-devel
 %endif
 
 # XINE support
-%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?with_xine}
+%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} == 18 || 0%{?fedora} == 19 || 0%{?with_xine}
 %define with_xine 1
 %if 0%{?mgaversion} || 0%{?mdkversion}
 %if 0%{?pclinuxos}
@@ -230,7 +230,7 @@ Requires: trinity-libarts-audiofile = %{version}-%{release}
 %{?with_mpeg:Requires: trinity-libarts-mpeglib = %{version}-%{release}}
 %{?with_xine:Requires: trinity-libarts-xine = %{version}-%{release}}
 Requires: trinity-libkcddb = %{version}-%{release}
-Requires: trinity-mpeglib = %{version}-%{release}
+%{?with_mpeg:Requires: trinity-mpeglib = %{version}-%{release}}
 Requires: trinity-noatun = %{version}-%{release}
 
 
@@ -255,7 +255,7 @@ TDE, including:
 
 %package -n trinity-artsbuilder
 Summary:	Synthesizer designer for aRts
-Group:		Applications/Multimedia
+Group:		Productivity/Multimedia/Sound/Mixers
 Requires:	trinity-kicker >= %{tde_version}
 
 %description -n trinity-artsbuilder
@@ -436,7 +436,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-juk
 Summary:	Music organizer and player for Trinity
-Group:		Applications/Multimedia
+Group:		Productivity/Multimedia/Sound/Players
 
 %description -n trinity-juk
 JuK (pronounced "jook") is a jukebox and music manager for the TDE
@@ -484,7 +484,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-kaboodle
 Summary:	Light, embedded media player for Trinity
-Group:		Applications/Multimedia
+Group:		System/GUI/Other
 
 %if 0%{?with_xine}
 Requires:	trinity-libarts-xine = %{version}-%{release}
@@ -524,7 +524,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-kaudiocreator
 Summary:	CD ripper and audio encoder frontend for Trinity
-Group:		Applications/Multimedia
+Group:		Productivity/Multimedia/CD/Grabbers
 
 Requires:	%{name}-tdeio-plugins = %{version}-%{release}
 Requires:	vorbis-tools
@@ -568,7 +568,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package kfile-plugins
 Summary:	An au/avi/m3u/mp3/ogg/wav plugins for kfile
-Group:		Applications/Multimedia
+Group:		Productivity/Multimedia/Sound/Utilities
 
 %description kfile-plugins
 au/avi/m3u/mp3/ogg/wav file metainformation plugins for Trinity.
@@ -613,7 +613,7 @@ au/avi/m3u/mp3/ogg/wav file metainformation plugins for Trinity.
 
 %package kappfinder-data
 Summary:	Multimedia data for kappfinder
-Group:		Applications/Multimedia
+Group:		Productivity/Multimedia/Sound/Utilities
 
 Requires: 	trinity-kappfinder >= %{tde_version}
 Requires:	trinity-tdebase-runtime-data-common >= %{tde_version}
@@ -631,7 +631,7 @@ This package provides data on multimedia applications for kappfinder.
 
 %package tdeio-plugins
 Summary:	Enables the browsing of audio CDs under Konqueror
-Group:		Applications/Multimedia
+Group:		Productivity/Multimedia/Sound/Utilities
 Requires:	trinity-tdebase-tdeio-plugins >= %{tde_version}
 
 Obsoletes:	trinity-tdemultimedia-kio-plugins < %{version}-%{release}
@@ -662,7 +662,8 @@ Konqueror and the audiocd:/ URL.
 %{tde_datadir}/config.kcfg/audiocd_lame_encoder.kcfg
 %{tde_datadir}/config.kcfg/audiocd_vorbis_encoder.kcfg
 %{tde_datadir}/services/audiocd.protocol
-%{tde_tdedocdir}/HTML/en/kioslave/audiocd.docbook
+%{tde_tdedocdir}/HTML/en/kioslave/
+%{tde_datadir}/icons/hicolor/*/apps/kcmaudiocd.png
 
 %post tdeio-plugins
 /sbin/ldconfig
@@ -676,7 +677,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-tdemid
 Summary:	MIDI/karaoke player for Trinity
-Group:		Applications/Multimedia
+Group:		Productivity/Multimedia/Sound/Midi
 
 Obsoletes:	trinity-kmid < %{version}-%{release}
 Provides:	trinity-kmid = %{version}-%{release}
@@ -717,7 +718,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-kmix
 Summary:	Sound mixer applet for Trinity
-Group:		Applications/Multimedia
+Group:		Productivity/Multimedia/Sound/Mixers
 Requires:	trinity-kicker >= %{tde_version}
 
 %description -n trinity-kmix
@@ -764,7 +765,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-krec
 Summary:	Sound recorder utility for Trinity
-Group:		Applications/Multimedia
+Group:		Productivity/Multimedia/CD/Record
 
 %description -n trinity-krec
 This is a sound recording utility for Trinity.
@@ -818,7 +819,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-kscd
 Summary:	Audio CD player for Trinity
-Group:		Applications/Multimedia
+Group:		Productivity/Multimedia/CD/Players
 
 %description -n trinity-kscd
 This is Trinity's audio CD player.
@@ -855,7 +856,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 %if 0%{?with_akode}
 %package -n trinity-libarts-akode
 Summary:	Akode plugin for aRts
-Group:		Environment/Libraries
+Group:		Productivity/Multimedia/Other
 
 %description -n trinity-libarts-akode
 This package contains akode plugins for aRts.
@@ -886,7 +887,7 @@ This package contains akode plugins for aRts.
 
 %package -n trinity-libarts-audiofile
 Summary:	Audiofile plugin for aRts
-Group:		Environment/Libraries
+Group:		Productivity/Multimedia/Other
 
 %description -n trinity-libarts-audiofile
 This package contains audiofile plugins for aRts.
@@ -910,7 +911,7 @@ This package contains audiofile plugins for aRts.
 %if 0%{?with_mpeg}
 %package -n trinity-libarts-mpeglib
 Summary:	Mpeglib plugin for aRts, supporting mp3 and mpeg audio/video
-Group:		Environment/Libraries
+Group:		Productivity/Multimedia/Other
 
 %description -n trinity-libarts-mpeglib
 This package contains the mpeglib aRts plugin, supporting mp3 and mpeg
@@ -944,7 +945,7 @@ This is the arts (TDE Sound daemon) plugin.
 %if 0%{?with_xine}
 %package -n trinity-libarts-xine
 Summary:	ARTS plugin enabling xine support
-Group:		Environment/Libraries
+Group:		Productivity/Multimedia/Other
 
 %description -n trinity-libarts-xine
 This package contains aRts' xine plugin, allowing the use of the xine
@@ -974,7 +975,7 @@ multimedia engine though aRts.
 
 %package -n trinity-libkcddb
 Summary:	CDDB library for Trinity
-Group:		Environment/Libraries
+Group:		Productivity/Multimedia/Other
 Requires:	trinity-kcontrol >= %{tde_version}
 
 %description -n trinity-libkcddb
@@ -1001,10 +1002,14 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 ##########
 
+%if 0%{?with_mpeg}
+
 %package -n trinity-mpeglib
 Summary:	MP3 and MPEG-1 audio and video library
-Group:		Environment/Libraries
+Group:		Productivity/Multimedia/Other
+%if 0%{?with_mpeg}
 Requires:	trinity-libarts-mpeglib = %{version}-%{release}
+%endif
 
 %description -n trinity-mpeglib
 mpeglib is a MPEG-1 and MP3 audio and video library. It supports
@@ -1019,9 +1024,7 @@ and WAV playback
 %{tde_bindir}/yaf-tplay
 %{tde_bindir}/yaf-vorbis
 %{tde_bindir}/yaf-yuv
-%if 0%{?with_mpeg}
 %{tde_libdir}/libmpeg-0.3.0.so
-%endif
 %{tde_libdir}/libyafcore.so
 %{tde_libdir}/libyafxplayer.so
 
@@ -1031,11 +1034,13 @@ and WAV playback
 %postun -n trinity-mpeglib
 /sbin/ldconfig
 
+%endif
+
 ##########
 
 %package -n trinity-noatun
 Summary:	Media player for Trinity
-Group:		Applications/Multimedia
+Group:		Productivity/Multimedia/Video/Players
 Requires:	trinity-tdebase-bin >= %{tde_version}
 
 # 20120802: Hack to avoid dependency issue on MGA2 and MDV2011
@@ -1136,7 +1141,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package devel
 Summary:	Development files for %{name}, aRts and noatun plugins
-Group:		Development/Libraries
+Group:		Development/Libraries/Other
 Requires:	%{name} = %{version}-%{release}
 Requires:	trinity-tdelibs-devel >= %{tde_version}
 
@@ -1197,8 +1202,10 @@ noatun plugins.
 %{tde_libdir}/libnoatuncontrols.so
 %{tde_libdir}/libnoatuntags.la
 %{tde_libdir}/libnoatuntags.so
+%if 0%{?with_mpeg}
 %{tde_libdir}/libyafcore.la
 %{tde_libdir}/libyafxplayer.la
+%endif
 
 %post devel
 /sbin/ldconfig
@@ -1208,7 +1215,7 @@ noatun plugins.
 
 ##########
 
-%if 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
@@ -1229,7 +1236,7 @@ noatun plugins.
 %__make -f "admin/Makefile.common"
 
 # Update icons for some control center modules
-%__sed -i "tdeioslave/audiocd/kcmaudiocd/audiocd.desktop" -e "s|^Icon=.*|Icon=kcmaudio|"
+%__sed -i "kioslave/audiocd/kcmaudiocd/audiocd.desktop" -e "s|^Icon=.*|Icon=kcmaudio|"
 
 
 %build
@@ -1263,16 +1270,19 @@ fi
   \
   --with-extra-includes="%{_includedir}/cdda:%{_includedir}/cddb:%{tde_tdeincludedir}/arts:%{tde_includedir}/artsc" \
   \
-  --with-cdparanoia \
-  --with-flac \
-  --with-theora \
   --with-vorbis \
+  --without-ossaudio \
   --with-alsa \
-  --with-gstreamer \
+  --with-cdparanoia \
   %{?with_lame:--with-lame} %{!?with_lame:--without-lame} \
+  %{?with_taglib:--with-taglib} %{!?with_taglib:--without-taglib} \
   %{?with_akode:--with-akode} %{!?with_akode:--without-akode} \
+  --with-audiofile \
   %{?with_musicbrainz:--with-musicbrainz} %{!?with_musicbrainz:--without-musicbrainz} \
-  %{?with_taglib:--with-taglib} %{!?with_taglib:--without-taglib} \
+  --with-gstreamer \
+  --with-kscd-cdda \
+  --with-theora \
+  --with-flac \
   %{?with_xine:--with-xine} %{!?with_xine:--without-xine}
 
 %__make %{?_smp_mflags} || %__make
@@ -1285,28 +1295,30 @@ export PATH="%{tde_bindir}:${PATH}"
 
 # Disable MPEG support entirely
 %if 0%{?with_mpeg} == 0
-  %__rm %{?buildroot}%{tde_bindir}/mpeglibartsplay
-  %__rm %{?buildroot}%{tde_libdir}/libarts_mpeglib*
-  %__rm %{?buildroot}%{tde_libdir}/libarts_splay.*
-  %__rm %{?buildroot}%{tde_libdir}/libmpeg*
-  %__rm %{?buildroot}%{tde_libdir}/mcop/MP3PlayObject.mcopclass
-  %__rm %{?buildroot}%{tde_libdir}/mcop/CDDAPlayObject.mcopclass
-  %__rm %{?buildroot}%{tde_libdir}/mcop/NULLPlayObject.mcopclass
-  %__rm %{?buildroot}%{tde_libdir}/mcop/OGGPlayObject.mcopclass
-  %__rm %{?buildroot}%{tde_libdir}/mcop/SplayPlayObject.mcopclass
-  %__rm %{?buildroot}%{tde_libdir}/mcop/WAVPlayObject.mcopclass
+%__rm %{?buildroot}%{tde_bindir}/mpeglibartsplay
+%__rm %{?buildroot}%{tde_bindir}/yaf-*
+%__rm %{?buildroot}%{tde_libdir}/libarts_mpeglib*
+%__rm %{?buildroot}%{tde_libdir}/libarts_splay.*
+%__rm %{?buildroot}%{tde_libdir}/libmpeg*
+%__rm %{?buildroot}%{tde_libdir}/libyaf*
+%__rm %{?buildroot}%{tde_libdir}/mcop/MP3PlayObject.mcopclass
+%__rm %{?buildroot}%{tde_libdir}/mcop/CDDAPlayObject.mcopclass
+%__rm %{?buildroot}%{tde_libdir}/mcop/NULLPlayObject.mcopclass
+%__rm %{?buildroot}%{tde_libdir}/mcop/OGGPlayObject.mcopclass
+%__rm %{?buildroot}%{tde_libdir}/mcop/SplayPlayObject.mcopclass
+%__rm %{?buildroot}%{tde_libdir}/mcop/WAVPlayObject.mcopclass
 %endif
 
 # Copy missing icons from 'crystalsvg' theme (tdelibs)
-mkdir -p $RPM_BUILD_ROOT%{tde_datadir}/icons/hicolor/{16x16,22x22,32x32,48x48,64x64}/apps/
+%__mkdir_p "%{?buildroot}{tde_datadir}/icons/hicolor/"{16x16,22x22,32x32,48x48,64x64}"/apps/"
 pushd $RPM_BUILD_ROOT%{tde_datadir}/icons/
-for i in {16,22,32,48,64}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/cdaudio_unmount.png hicolor/"$i"x"$i"/apps/kcmaudiocd.png;done
+for i in {16,22,32,48,64}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/cdaudio_unmount.png hicolor/"$i"x"$i"/apps/kcmaudiocd.png; done
 popd
 
 # Updates applications categories for openSUSE
 %if 0%{?suse_version}
 %suse_update_desktop_file krec           AudioVideo Recorder
-%suse_update_desktop_file tdemid         AudioVideo Midi
+%suse_update_desktop_file kmid           AudioVideo Midi
 %suse_update_desktop_file artsbuilder    AudioVideo AudioVideoEditing
 %suse_update_desktop_file artscontrol    AudioVideo AudioVideoEditing
 %suse_update_desktop_file kmix           AudioVideo Mixer
@@ -1318,8 +1330,8 @@ popd
 %suse_update_desktop_file audiocd
 %endif
 
-# Symlinks duplicate files
-%fdupes -s "%{?buildroot}%{tde_datadir}"
+# Links duplicate files
+%fdupes "%{?buildroot}%{tde_datadir}"
 
 
 %clean
diff --git a/redhat/main/tdenetwork/tdenetwork-3.5.13.2.spec b/redhat/main/tdenetwork/tdenetwork-3.5.13.2.spec
index 35dcfa815..fd4882459 100644
--- a/redhat/main/tdenetwork/tdenetwork-3.5.13.2.spec
+++ b/redhat/main/tdenetwork/tdenetwork-3.5.13.2.spec
@@ -1,63 +1,104 @@
-# Avoids relinking, which breaks consolehelper
-%define dont_relink 1
-
-# If TDE is built iwn a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
+#
+# spec file for package tdenetwork (version 3.5.13-SRU)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
+#
+
+# BUILD WARNING:
+#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
+#  Having KDE libraries may cause FTBFS here !
+
+# TDE variables
+%define tde_epoch 1
 %define tde_version 3.5.13.2
-
-# TDE specific building variables
+%define tde_pkg tdenetwork
+%define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
 %define tde_sbindir %{tde_prefix}/sbin
-
 %define tde_tdeappdir %{tde_datadir}/applications/kde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
-%define _docdir %{tde_docdir}
-
+# 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
 
-# Fedora review:  http://bugzilla.redhat.com/195486
+# Avoids relinking, which breaks consolehelper
+%define dont_relink 1
 
-## Conditional build:
-# RHEL6: xmms is outdated !
-#define _with_xmms --with-xmms
-%ifnarch s390 s390x
-%define _with_wifi --with-wifi
-%endif
 
-Name:    	trinity-tdenetwork
-Version:	%{tde_version}
-Release:	%{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant}
-Summary:	Trinity Desktop Environment - Network Applications
+Name:			trinity-%{tde_pkg}
+Summary:		Trinity Desktop Environment - Network Applications
+Group:			Applications/Internet
+Version:		%{tde_version}
+Release:		%{?!preversion:4}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+URL:			http://www.trinitydesktop.org/
 
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
 
-License:	GPLv2
-Group:		Applications/Internet
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
 
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Prefix:			%{tde_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
 Source1:	kppp.pamd
 Source2:	ktalk
 
+%{?tde_patch:Patch1:			%{tde_pkg}-%{tde_version}.patch}
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+
 BuildRequires:	cmake >= 2.8
 BuildRequires:	gettext
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	coreutils 
+BuildRequires:	gcc-c++
+BuildRequires:	desktop-file-utils
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# for set_permissions macro
+%if 0%{?suse_version}
+PreReq: permissions
+%endif
+
+# OPENSSL support
 BuildRequires:	openssl-devel
+
+# TLS support
 BuildRequires:	gnutls-devel
 
 # SQLITE support
@@ -73,6 +114,16 @@ BuildRequires:	sqlite-devel
 BuildRequires:	libgadu-devel
 %endif
 
+# PCRE support
+BuildRequires:	pcre-devel
+
+# GAMIN support
+#  Not on openSUSE.
+%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_gamin 1
+BuildRequires:	gamin-devel
+%endif
+
 # XTST support
 %if 0%{?fedora} >= 5 || 0%{?rhel} >= 5 || 0%{?suse_version} >= 1210
 BuildRequires:	libXtst-devel
@@ -81,13 +132,34 @@ BuildRequires:	libXtst-devel
 BuildRequires:	libxtst-devel
 %endif
 
+# XMU support
+%if 0%{?suse_version} == 1140
+BuildRequires:	xorg-x11-libXmu-devel
+%endif
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1210
+BuildRequires: libXmu-devel
+%endif
+%if 0%{?mdkversion} || 0%{?mgaversion} >= 4
+BuildRequires: libxmu-devel
+%endif
+%if 0%{?mgaversion} == 2 || 0%{?mgaversion} == 3
+BuildRequires:	%{_lib}xmu%{?mgaversion:6}-devel
+%endif
+
 # Other stuff
 %if 0%{?fedora} >= 5 || 0%{?rhel} >= 5
-BuildRequires:	libXmu-devel
 BuildRequires:	libXScrnSaver-devel
 BuildRequires:	libXxf86vm-devel
 %endif
 
+# Fedora review:  http://bugzilla.redhat.com/195486
+
+## Conditional build:
+# RHEL6: xmms is outdated !
+#define _with_xmms --with-xmms
+%ifnarch s390 s390x
+%define _with_wifi --with-wifi
+%endif
 
 # Wifi support
 %if "%{?_with_wifi:1}" == "1"
@@ -97,7 +169,7 @@ BuildRequires: wireless-tools-devel
 %if 0%{?mgaversion} == 2 || 0%{?mdkversion}
 BuildRequires:	%{_lib}iw29-devel
 %endif
-%if 0%{?rhel} == 5
+%if 0%{?rhel} == 5 || 0%{?suse_version}
 BuildRequires: wireless-tools
 %endif
 %if 0%{?suse_version} || 0%{?mgaversion} >= 3
@@ -112,7 +184,7 @@ BuildRequires: openslp-devel
 %endif
 
 %ifarch %{ix86}
-# BR: %{tde_includedir}/valgrind/valgrind.h
+# BR: /usr/include/valgrind/valgrind.h
 BuildRequires: valgrind
 %endif
 
@@ -151,9 +223,9 @@ BuildRequires:	meanwhile-devel
 %endif
 
 # ORTP support
-#%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
+#if 0%{?rhel} >= 6 || 0#{?fedora} >= 15
 #BuildRequires:	ortp-devel
-#%endif
+#endif
 
 # SPEEX support
 %if 0%{?rhel} >= 5 || 0%{?fedora} >= 15 || 0%{?suse_version} || 0%{?mdkversion} || 0%{?mgaversion}
@@ -181,7 +253,7 @@ Provides:	tdenetwork = %{version}-%{release}
 Requires: trinity-dcoprss = %{version}-%{release}
 Requires: %{name}-filesharing = %{version}-%{release}
 Requires: trinity-kdict = %{version}-%{release}
-Requires: %{name}-kfile-plugins = %{version}-%{release}
+Requires: %{name}-tdefile-plugins = %{version}-%{release}
 Requires: trinity-kget = %{version}-%{release}
 Requires: trinity-knewsticker = %{version}-%{release}
 Requires: trinity-kopete = %{version}-%{release}
@@ -204,7 +276,7 @@ Networking applications, including:
 * dcoprss: RSS utilities for Trinity
 * filesharing: Network filesharing configuration module for Trinity
 * kdict: Dictionary client for Trinity
-* kfile-plugins: Torrent metainfo plugin for Trinity
+* tdefile-plugins: Torrent metainfo plugin for Trinity
 * kget: downloader manager
 * knewsticker: RDF newsticker applet
 * kopete: chat client
@@ -268,17 +340,14 @@ Obsoletes:	tdenetwork-devel < %{version}-%{release}
 Provides:	tdenetwork-devel = %{version}-%{release}
 
 %description devel
-This is the development package which contains the headers for the KDE RSS
+This is the development package which contains the headers for the TDE RSS
 library as well as the Kopete chat client, as well as miscellaneous
 development-related files for the TDE network module.
 
 %files devel
 %defattr(-,root,root,-)
-%{tde_tdeincludedir}/kopete/*.h
-%{tde_tdeincludedir}/kopete/ui/*.h
-%{tde_tdeincludedir}/rss/*.h
-%{tde_libdir}/libkdeinit_kdict.la
-%{tde_libdir}/libkdeinit_ksirc.la
+%{tde_tdeincludedir}/kopete/
+%{tde_tdeincludedir}/rss/
 %{tde_libdir}/libkopete.la
 %{tde_libdir}/libkopete.so
 %{tde_libdir}/libkopete_msn_shared.la
@@ -320,6 +389,7 @@ NFS and Samba.
 %{tde_tdelibdir}/kcm_kcmsambaconf.so
 %{tde_tdeappdir}/fileshare.desktop
 %{tde_tdeappdir}/kcmsambaconf.desktop
+%{tde_datadir}/icons/hicolor/*/apps/kcmfileshare.png
 %{tde_datadir}/icons/hicolor/*/apps/kcmsambaconf.png
 %{tde_datadir}/services/fileshare_propsdlgplugin.desktop
 
@@ -340,6 +410,7 @@ update-desktop-database 2> /dev/null || :
 %package -n trinity-kdict
 Summary:		Dictionary client for Trinity
 Group:			Applications/Internet
+Requires:		trinity-kicker >= %{tde_version}
 
 %description -n trinity-kdict
 KDict is an advanced TDE graphical client for the DICT Protocol, with full
@@ -373,35 +444,39 @@ update-desktop-database 2> /dev/null || :
 
 ##########
 
-%package kfile-plugins
+%package tdefile-plugins
 Summary:		Torrent metainfo plugin for Trinity
 Group:			Applications/Internet
 
 Obsoletes:		tdenetwork-kfile-plugins < %{version}-%{release}
 Provides:		tdenetwork-kfile-plugins = %{version}-%{release}
+Obsoletes:		trinity-tdenetwork-kfile-plugins < %{version}-%{release}
+Provides:		trinity-tdenetwork-kfile-plugins = %{version}-%{release}
 
-%description kfile-plugins
+%description tdefile-plugins
 This package provides a metainformation plugin for bittorrent files.
-TDE uses kfile-plugins to provide metainfo tab in the files properties
+TDE uses tdefile-plugins to provide metainfo tab in the files properties
 dialog in konqueror and other file-handling applications.
 
-%files kfile-plugins
+%files tdefile-plugins
 %defattr(-,root,root,-)
 %{tde_tdelibdir}/kfile_torrent.la
 %{tde_tdelibdir}/kfile_torrent.so
 %{tde_datadir}/services/kfile_torrent.desktop
 
-%post kfile-plugins
+%post tdefile-plugins
 update-desktop-database 2> /dev/null || : 
 
-%postun kfile-plugins
+%postun tdefile-plugins
 update-desktop-database 2> /dev/null || : 
 
 ##########
 
 %package -n trinity-kget
-Summary:		download manager for Trinity
+Summary:		Download manager for Trinity
 Group:			Applications/Internet
+Requires:		trinity-tdebase-data >= %{tde_version}
+Requires:		trinity-konqueror >= %{tde_version}
 
 %description -n trinity-kget
 KGet is a a download manager similar to GetRight or Go!zilla. It keeps
@@ -424,6 +499,7 @@ applications and Netscape.
 %{tde_datadir}/icons/crystalsvg/*/actions/khtml_kget.png
 %{tde_datadir}/icons/crystalsvg/*/apps/kget.png
 %{tde_datadir}/icons/crystalsvg/*/mimetypes/kget_list.png
+%{tde_datadir}/icons/hicolor/*/apps/kget.png
 %{tde_datadir}/mimelnk/application/x-kgetlist.desktop
 %{tde_datadir}/sounds/KGet_Added.ogg
 %{tde_datadir}/sounds/KGet_Finished.ogg
@@ -432,13 +508,13 @@ applications and Netscape.
 %{tde_tdedocdir}/HTML/en/kget
 
 %post -n trinity-kget
-for f in crystalsvg ; do
+for f in crystalsvg hicolor ; do
   gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 update-desktop-database 2> /dev/null || : 
 
 %postun -n trinity-kget
-for f in crystalsvg ; do
+for f in crystalsvg hicolor ; do
   gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 update-desktop-database 2> /dev/null || : 
@@ -446,8 +522,9 @@ update-desktop-database 2> /dev/null || :
 ##########
 
 %package -n trinity-knewsticker
-Summary:		news ticker applet for Trinity
+Summary:		News ticker applet for Trinity
 Group:			Applications/Internet
+Requires:		trinity-kicker >= %{tde_version}
 
 %description -n trinity-knewsticker
 This is a news ticker applet for the Trinity panel. It can scroll news from
@@ -468,7 +545,7 @@ good news sources which provide such files.
 %{tde_datadir}/apps/kconf_update/knewsticker.upd
 %{tde_datadir}/apps/kconf_update/knt-0.1-0.2.pl
 %{tde_datadir}/apps/kicker/applets/knewsticker.desktop
-%{tde_datadir}/apps/knewsticker/eventsrc
+%{tde_datadir}/apps/knewsticker/
 %{tde_datadir}/icons/hicolor/*/apps/knewsticker.png
 %{tde_datadir}/services/kntsrcfilepropsdlg.desktop
 %{tde_tdedocdir}/HTML/en/knewsticker
@@ -488,13 +565,15 @@ update-desktop-database 2> /dev/null || :
 ##########
 
 %package -n trinity-kopete
-Summary:		instant messenger for Trinity
+Summary:		Instant messenger for Trinity
 Group:			Applications/Internet
-URL:			http://kopete.kde.org
+Requires:		trinity-tdebase-bin >= %{tde_version}
+Requires:		trinity-tdebase-data >= %{tde_version}
+Requires:		trinity-filesystem >= %{tde_version}
 
 %description -n trinity-kopete
 Kopete is an instant messenger program which can communicate with a variety
-of IM systems, such as Yahoo, ICQ, MSN, IRC and Jabber.
+of IM systems, such as Yahoo, ICQ, IRC and Jabber.
 
 Support for more IM protocols can be added through a plugin system.
 
@@ -527,9 +606,9 @@ Support for more IM protocols can be added through a plugin system.
 %{tde_libdir}/libkopete_videodevice.so.*
 %{tde_tdeappdir}/kopete.desktop
 %{tde_datadir}/apps/kconf_update/kopete-*
-%{tde_datadir}/apps/kopete
-%{tde_datadir}/apps/kopete_*/*.rc
-%{tde_datadir}/apps/kopeterichtexteditpart/kopeterichtexteditpartfull.rc
+%{tde_datadir}/apps/kopete/
+%{tde_datadir}/apps/kopete_*/
+%{tde_datadir}/apps/kopeterichtexteditpart/
 %{tde_datadir}/config.kcfg/historyconfig.kcfg
 %{tde_datadir}/config.kcfg/kopeteidentityconfigpreferences.kcfg
 %{tde_datadir}/config.kcfg/kopete.kcfg
@@ -656,8 +735,10 @@ update-desktop-database 2> /dev/null || :
 ##########
 
 %package -n trinity-kopete-nowlistening
-Summary:		Nowlistening (xmms) plugin for Kopete.
+Summary:		Nowlistening (xmms) plugin for Kopete
 Group:			Applications/Internet
+Requires:		trinity-kopete = %{tde_version}-%{tde_release}
+Requires:		trinity-filesystem >= %{tde_version}
 
 %description -n trinity-kopete-nowlistening
 Kopete includes the "Now Listening" plug-in that can report what music you
@@ -678,6 +759,7 @@ noatun, kscd, juk, kaffeine and amarok.
 %package -n trinity-kpf
 Summary:		Public fileserver for Trinity
 Group:			Applications/Internet
+Requires:		trinity-kicker >= %{tde_version}
 
 %description -n trinity-kpf
 kpf provides simple file sharing using HTTP. kpf is strictly a public
@@ -708,7 +790,7 @@ update-desktop-database 2> /dev/null || :
 ##########
 
 %package -n trinity-kppp
-Summary:		modem dialer and ppp frontend for Trinity
+Summary:		Modem dialer and ppp frontend for Trinity
 Group:			Applications/Internet
 Requires:		ppp
 
@@ -733,7 +815,14 @@ track of the time spent online for you.
 
 %files -n trinity-kppp
 %defattr(-,root,root,-)
-%{?!with_consolehelper:%{tde_bindir}/kppp}
+%if 0%{?with_consolehelper} == 0
+# Some setuid binaries need special care
+%if 0%{?suse_version}
+%verify(not mode) %{tde_bindir}/kppp
+%else
+%attr(4711,root,root) %{tde_bindir}/kppp
+%endif
+%endif
 %{tde_bindir}/kppplogview
 %{tde_tdeappdir}/Kppp.desktop
 %{tde_tdeappdir}/kppplogview.desktop
@@ -754,6 +843,10 @@ for f in hicolor ; do
   gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 update-desktop-database 2> /dev/null || : 
+%if 0%{?suse_version}
+# Sets permissions on setuid files (openSUSE specific)
+%set_permissions %{tde_bindir}/kppp
+%endif
 
 %postun -n trinity-kppp
 for f in hicolor ; do
@@ -780,18 +873,19 @@ Servers using RDP.
 %{tde_datadir}/apps/konqueror/servicemenus/smb2rdc.desktop
 %{tde_datadir}/apps/krdc/
 %{tde_datadir}/icons/crystalsvg/*/apps/krdc.png
+%{tde_datadir}/icons/hicolor/*/apps/krdc.png
 %{tde_datadir}/services/rdp.protocol
 %{tde_datadir}/services/vnc.protocol
 %{tde_tdedocdir}/HTML/en/krdc/
 
 %post -n trinity-krdc
-for f in crystalsvg ; do
+for f in crystalsvg hicolor ; do
   gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 update-desktop-database 2> /dev/null || : 
 
 %postun -n trinity-krdc
-for f in crystalsvg ; do
+for f in crystalsvg hicolor ; do
   gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 update-desktop-database 2> /dev/null || : 
@@ -820,9 +914,10 @@ task.
 %{tde_tdelibdir}/kded_kinetd.so
 %{tde_tdeappdir}/kcmkrfb.desktop
 %{tde_tdeappdir}/krfb.desktop
-%{tde_datadir}/apps/kinetd/eventsrc
+%{tde_datadir}/apps/kinetd/
 %{tde_datadir}/apps/krfb
 %{tde_datadir}/icons/crystalsvg/*/apps/krfb.png
+%{tde_datadir}/icons/hicolor/*/apps/krfb.png
 %{tde_datadir}/icons/locolor/*/apps/krfb.png
 %{tde_datadir}/services/kded/kinetd.desktop
 %{tde_datadir}/services/kinetd_krfb.desktop
@@ -831,13 +926,13 @@ task.
 %{tde_tdedocdir}/HTML/en/krfb/
 
 %post -n trinity-krfb
-for f in crystalsvg locolor ; do
+for f in crystalsvg hicolor locolor ; do
   gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 update-desktop-database 2> /dev/null || : 
 
 %postun -n trinity-krfb
-for f in crystalsvg locolor ; do
+for f in crystalsvg hicolor locolor ; do
   gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 update-desktop-database 2> /dev/null || : 
@@ -849,7 +944,7 @@ Summary:		IRC client for Trinity
 Group:			Applications/Internet
 
 %description -n trinity-ksirc
-KSirc is an IRC chat client for KDE. It supports scripting with Perl and has a
+KSirc is an IRC chat client for TDE. It supports scripting with Perl and has a
 lot of compatibility with mIRC for general use.
 
 If you want to connect to an IRC server via SSL, you will need to install the
@@ -887,6 +982,8 @@ update-desktop-database 2> /dev/null || :
 %package -n trinity-ktalkd
 Summary:		Talk daemon for Trinity
 Group:			Applications/Internet
+Requires:		trinity-kcontrol >= %{tde_version}
+Requires:		trinity-tdebase-data >= %{tde_version}
 
 %description -n trinity-ktalkd
 KTalkd is an enhanced talk daemon - a program to handle incoming talk
@@ -901,20 +998,21 @@ and shouldn't be run on a multi-user machine.
 %{tde_tdelibdir}/kcm_ktalkd.*
 %{tde_tdeappdir}/kcmktalkd.desktop
 %config(noreplace) %{tde_datadir}/config/ktalkdrc
-%{tde_datadir}/icons/crystalsvg/*/apps/ktalkd.*
+%{tde_datadir}/icons/crystalsvg/*/apps/ktalkd.png
+%{tde_datadir}/icons/hicolor/*/apps/ktalkd.png
 %{tde_datadir}/sounds/ktalkd.wav
 %config(noreplace) %{_sysconfdir}/xinetd.d/ktalk
 %{tde_tdedocdir}/HTML/en/kcontrol/kcmtalkd
 %{tde_tdedocdir}/HTML/en/ktalkd
 
 %post -n trinity-ktalkd
-for f in crystalsvg ; do
+for f in crystalsvg hicolor ; do
   gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 update-desktop-database 2> /dev/null || : 
 
 %postun -n trinity-ktalkd
-for f in crystalsvg ; do
+for f in crystalsvg hicolor ; do
   gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
 done
 update-desktop-database 2> /dev/null || : 
@@ -925,6 +1023,7 @@ update-desktop-database 2> /dev/null || :
 %package -n trinity-kwifimanager
 Summary:		Wireless lan manager for Trinity
 Group:			Applications/Internet
+Requires:		trinity-kicker >= %{tde_version}
 
 %description -n trinity-kwifimanager
 KWiFiManager suite is a set of tools which allows you to manage your
@@ -944,7 +1043,7 @@ wavelan card that uses the wireless extensions interface.
 %{tde_datadir}/apps/kwifimanager
 %{tde_datadir}/icons/hicolor/*/apps/kwifimanager.png
 %{tde_datadir}/icons/hicolor/*/apps/kwifimanager.svgz
-%doc %{tde_tdedocdir}/HTML/en/kwifimanager
+%{tde_tdedocdir}/HTML/en/kwifimanager/
 
 %post -n trinity-kwifimanager
 for f in hicolor ; do
@@ -986,6 +1085,8 @@ automatically when needed.
 %package -n trinity-lisa
 Summary:			LAN information server for Trinity
 Group:				Applications/Internet
+Requires:		trinity-konqueror >= %{tde_version}
+Requires:		trinity-tdebase-data >= %{tde_version}
 
 %description -n trinity-lisa
 LISa is intended to provide TDE with a kind of "network neighborhood"
@@ -1002,7 +1103,7 @@ but relying only on the TCP/IP protocol.
 %{tde_datadir}/applnk/.hidden/kcmreslisa.desktop
 %{tde_datadir}/apps/konqsidebartng/virtual_folders/services/lisa.desktop
 %{tde_datadir}/apps/konqueror/dirtree/remote/lan.desktop
-%{tde_datadir}/apps/lisa/README
+%{tde_datadir}/apps/lisa/
 %{tde_datadir}/apps/remoteview/lan.desktop
 %{tde_tdedocdir}/HTML/en/kcontrol/lanbrowser/
 %{tde_tdedocdir}/HTML/en/lisa/
@@ -1024,7 +1125,7 @@ Summary: Zeroconf support for TDE
 Group:			Applications/Internet
 
 %description -n trinity-kdnssd
-A kioslave and kded module that provide Zeroconf support. Try
+A tdeioslave and tded module that provide Zeroconf support. Try
 "zeroconf:/" in Konqueror.
 
 %files -n trinity-kdnssd
@@ -1053,7 +1154,7 @@ update-desktop-database 2> /dev/null || :
 
 ##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
@@ -1061,6 +1162,15 @@ update-desktop-database 2> /dev/null || :
 
 %prep
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
+%{?tde_patch:%patch1 -p1}
+
+# Workaround libiw detection failure on opensuse
+%if 0%{?suse_version}
+%__sed -i "wifi/ConfigureChecks.cmake" -e "s|^check_library_exists.*|set( HAVE_IW 1 )|"
+%endif
+
+# Update icons for some control center modules
+%__sed -i "filesharing/simple/fileshare.desktop" -e "s|^Icon=.*|Icon=kcmfileshare|"
 
 
 %build
@@ -1085,6 +1195,7 @@ fi
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
   -DCMAKE_SKIP_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   \
   -DBIN_INSTALL_DIR=%{tde_bindir} \
@@ -1115,6 +1226,17 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot} -C build
 
+# Adds missing icons in 'hicolor' theme
+# These icons are copied from 'crystalsvg' theme, provided by 'tdelibs'.
+%__mkdir_p %{buildroot}%{tde_datadir}/icons/hicolor/{16x16,22x22,32x32,48x48,64x64,128x128}/apps/
+pushd %{buildroot}%{tde_datadir}/icons
+for i in {16,22,32,48}; do        %__cp %{?buildroot}%{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/kget.png    hicolor/"$i"x"$i"/apps/kget.png          ;done
+for i in {32,48}; do              %__cp %{?buildroot}%{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/krdc.png    hicolor/"$i"x"$i"/apps/krdc.png          ;done
+for i in {16,32,48}; do           %__cp %{?buildroot}%{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/krfb.png    hicolor/"$i"x"$i"/apps/krfb.png          ;done
+for i in {16,22,32,48,128}; do    %__cp %{?buildroot}%{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/ktalkd.png  hicolor/"$i"x"$i"/apps/ktalkd.png        ;done
+for i in {16,22,32,48,64,128}; do %__cp $BUILD_ROOT%{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/share.png  hicolor/"$i"x"$i"/apps/kcmfileshare.png  ;done
+popd
+
 %if 0%{?with_consolehelper}
 # Run kppp through consolehelper, and rename it to 'kppp3'
 %__install -p -m644 -D %{SOURCE1} %{buildroot}/etc/pam.d/kppp3
@@ -1130,21 +1252,64 @@ USER=root
 PROGRAM=%{tde_sbindir}/kppp3
 SESSION=true
 EOF
+
 # Renames 'kppp' as 'kppp3' in launch icon
 %__sed -i %{buildroot}%{tde_tdeappdir}/Kppp.desktop -e "/Exec=/ s|kppp|kppp3|"
 %endif
 
+# Remove setuid bit on some binaries.
+if [ -r "%{?buildroot}%{tde_bindir}/kppp" ]; then
+  chmod 0755 "%{?buildroot}%{tde_bindir}/kppp"
+fi
+
 # ktalk
 %__install -p -m 0644 -D  %{SOURCE2} %{buildroot}%{_sysconfdir}/xinetd.d/ktalk
 
 # Avoids conflict with trinity-kvirc
 %__mv -f %{buildroot}%{tde_datadir}/services/irc.protocol %{buildroot}%{tde_datadir}/apps/kopete/
 
+# Icons from TDE Control Center should only be displayed in TDE
+for i in %{?buildroot}%{tde_tdeappdir}/*.desktop ; do
+  if grep -q "^Categories=.*X-KDE-settings" "${i}"; then
+    if ! grep -q "OnlyShowIn=KDE" "${i}" ; then
+      echo "OnlyShowIn=KDE;" >>"${i}"
+    fi
+  fi
+done
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file    kcmkrfb
+%suse_update_desktop_file    fileshare
+%suse_update_desktop_file    kopete        Network  InstantMessaging
+%suse_update_desktop_file    ksirc         Network  IRCClient
+%suse_update_desktop_file    Kppp          Network  Dialup
+%suse_update_desktop_file -r kppplogview   System   Monitor
+%suse_update_desktop_file    kdict         Office   Dictionary
+%suse_update_desktop_file -r krdc          System   RemoteAccess
+%suse_update_desktop_file -r krfb          System   RemoteAccess
+%suse_update_desktop_file -r kget          System   TrayIcon
+%suse_update_desktop_file -r kwifimanager  System   Network
+%suse_update_desktop_file    kcmwifi
+%suse_update_desktop_file -u knewsticker-standalone Network  News
+%suse_update_desktop_file %{buildroot}%{tde_datadir}/apps/remoteview/zeroconf.desktop
+%endif
+
+# Links duplicate files
+%fdupes "%{?buildroot}%{tde_datadir}"
+
 
 %clean
 %__rm -rf %{buildroot}
 
 
+%if 0%{?suse_version}
+# Check permissions on setuid files (openSUSE specific)
+%verifyscript
+%verify_permissions -e %{tde_bindir}/kppp
+%endif
+
+
 %changelog
 * Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-3
 - Build for Fedora 19
diff --git a/redhat/main/tdepim/tdepim-3.5.13.2.spec b/redhat/main/tdepim/tdepim-3.5.13.2.spec
index 193d5d800..dc7ec4cff 100644
--- a/redhat/main/tdepim/tdepim-3.5.13.2.spec
+++ b/redhat/main/tdepim/tdepim-3.5.13.2.spec
@@ -1,23 +1,44 @@
-# 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
-
+#
+# spec file for package tdepim (version 3.5.13-SRU)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
+#
+
+# BUILD WARNING:
+#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
+#  Having KDE libraries may cause FTBFS here !
+
+# TDE variables
+%define tde_epoch 1
 %define tde_version 3.5.13.2
-
-# TDE specific building variables
+%define tde_pkg tdepim
+%define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
-
 %define tde_tdeappdir %{tde_datadir}/applications/kde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
-%define _docdir %{tde_docdir}
+# 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
+
 
 # KDEPIM specific features
 %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
@@ -26,46 +47,67 @@ BuildRequires:	gnokii-devel
 %endif
 
 # TDEPIM optional features
-#define		with_kitchensync 0
+#define		with_kitchensync 1
 
 
-Name:		trinity-tdepim
+Name:		trinity-%{tde_pkg}
+Summary:	Personal Information Management apps from the official Trinity release
 Version:	%{tde_version}
-Release:	%{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant}
-License:	GPL
+Release:	%{?!preversion:4}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
 Group:		Applications/Productivity
+URL:		http://www.trinitydesktop.org/
 
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-Summary:	Personal Information Management apps from the official Trinity release
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
 
 Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
 
-# [tdepim] Missing LDFLAGS cause FTBFS on MGA2/MDV2011
-Patch14:	kdepim-3.5.13-missing_ldflags.patch
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
+BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-libcaldav-devel
-BuildRequires:	trinity-libcarddav-devel
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	libcaldav-devel >= %{tde_epoch}:0.6.5
+BuildRequires:	libcarddav-devel >= %{tde_epoch}:0.6.2
 
 BuildRequires:	cmake >= 2.8
+BuildRequires:	gcc-c++
+BuildRequires:	fdupes
+BuildRequires:	desktop-file-utils
+BuildRequires:	make
+
 BuildRequires:	gpgme-devel
 BuildRequires:	libgpg-error-devel
 BuildRequires:	flex
 BuildRequires:	libical-devel
 BuildRequires:	boost-devel
 BuildRequires:	pcre-devel
-BuildRequires:	glib2-devel
-BuildRequires:	gcc-c++
-BuildRequires:	make
 BuildRequires:	libidn-devel
 
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# GAMIN support
+#  Not on openSUSE.
+%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_gamin 1
+BuildRequires:	gamin-devel
+%endif
+
 # CURL support
 %if 0%{?fedora} >= 15
 BuildRequires:	flex-static
@@ -76,6 +118,9 @@ BuildRequires:	trinity-libcurl-devel
 BuildRequires:	curl-devel
 %endif
 
+# GLIB2 support
+BuildRequires:	glib2-devel
+
 # SASL support
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	%{_lib}sasl2-devel
@@ -162,12 +207,13 @@ This metapackage includes a collection of Personal Information Management
 (PIM) applications provided with the official release of Trinity.
 
 %files
+%defattr(-,root,root,-)
 
 ##########
 
 %package devel
 Summary:	Development files for %{name}
-Group:		Development/Libraries
+Group:		Development/Libraries/Other
 
 Obsoletes:	tdepim-cmake < %{version}-%{release}
 
@@ -263,7 +309,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-akregator-devel
 Summary:	Development files for trinity-akregator
-Group:		Development/Libraries
+Group:		Development/Libraries/Other
 Requires:	trinity-akregator = %{version}-%{release}
 
 %description -n trinity-akregator-devel
@@ -355,7 +401,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-kaddressbook-devel
 Summary:	Development files for trinity-kaddressbook
-Group:		Development/Libraries
+Group:		Development/Libraries/Other
 Requires:	trinity-kaddressbook = %{version}-%{release}
 
 %description -n trinity-kaddressbook-devel
@@ -446,6 +492,7 @@ Kandy is aimed at mobile phones with integrated (GSM) modems.
 %{tde_datadir}/applnk/Utilities/kandy.desktop
 %{tde_datadir}/apps/kandy/
 %{tde_datadir}/icons/crystalsvg/*/apps/kandy.png
+%{tde_datadir}/icons/hicolor/*/apps/kandy.png
 %{tde_datadir}/config.kcfg/kandy.kcfg
 %{tde_tdedocdir}/HTML/en/kandy/
 
@@ -508,7 +555,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-karm-devel
 Summary:	Development files for karm
-Group:		Development/Libraries
+Group:		Development/Libraries/Other
 
 %description -n trinity-karm-devel
 %{summary}
@@ -671,6 +718,7 @@ tracking feature plans.
 %{tde_datadir}/services/kresources/kcal/kcal_xmlrpc.desktop
 %{tde_datadir}/services/kresources/kcal/kolab.desktop
 %{tde_datadir}/services/kresources/kcal/scalix.desktop
+%dir %{tde_datadir}/services/kresources/knotes
 %{tde_datadir}/services/kresources/knotes/knotes_xmlrpc.desktop
 %{tde_datadir}/services/kresources/knotes/kolabresource.desktop
 %{tde_datadir}/services/kresources/knotes/scalix.desktop
@@ -705,7 +753,7 @@ tracking feature plans.
 
 %package tderesources-devel
 Summary:	Development files for tderesources
-Group:		Development/Libraries
+Group:		Development/Libraries/Other
 Requires:	%{name}-tderesources = %{version}-%{release}
 Requires:	libcaldav
 Requires:	libcarddav
@@ -894,12 +942,21 @@ keybox and for retrieving certificates from LDAP servers.
 %{tde_datadir}/services/kleopatra_config_*.desktop
 %{tde_tdedocdir}/HTML/en/kleopatra/
 %{tde_tdedocdir}/HTML/en/kwatchgnupg/
+%{tde_datadir}/icons/hicolor/*/apps/kleopatra.png
 
 %post -n trinity-kleopatra
 update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
+for f in hicolor ; do
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
+done
 
 %postun -n trinity-kleopatra
 update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
+for f in hicolor ; do
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
+done
 
 ##########
 
@@ -1019,7 +1076,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-kmail-devel
 Summary:	Development files for kmail
-Group:		Development/Libraries
+Group:		Development/Libraries/Other
 
 %description -n trinity-kmail-devel
 %{summary}
@@ -1115,7 +1172,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-knode-devel
 Summary:	Development files for trinity-knode
-Group:		Development/Libraries
+Group:		Development/Libraries/Other
 Requires:	trinity-knode = %{version}-%{release}
 
 %description -n trinity-knode-devel
@@ -1155,6 +1212,7 @@ program.  The program supports printing and mailing your notes.
 %{tde_datadir}/config.kcfg/knoteconfig.kcfg
 %{tde_datadir}/config.kcfg/knotesglobalconfig.kcfg
 %{tde_datadir}/icons/hicolor/*/apps/knotes.png
+%dir %{tde_datadir}/services/kresources/knotes
 %{tde_datadir}/services/kresources/knotes/imap.desktop
 %{tde_datadir}/services/kresources/knotes/local.desktop
 %{tde_datadir}/services/kresources/knotes_manager.desktop
@@ -1181,7 +1239,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-knotes-devel
 Summary:	Development files for knots
-Group:		Development/Libraries
+Group:		Development/Libraries/Other
 Requires:	trinity-knotes = %{version}-%{release}
 Requires:	%{name}-tderesources-devel = %{version}-%{release}
 
@@ -1228,7 +1286,7 @@ described by RelaxNG schemes.
 
 %package -n trinity-kode-devel
 Summary:	Development files for trinity-kode
-Group:		Development/Libraries
+Group:		Development/Libraries/Other
 Requires:	trinity-kode = %{version}-%{release}
 
 %description -n trinity-kode-devel
@@ -1316,8 +1374,8 @@ scheduling, address book and other PIM functionality.
 %{tde_libdir}/libkpinterfaces.so.*
 %{tde_tdeappdir}/Kontact.desktop
 %{tde_tdeappdir}/kontactdcop.desktop
-%{tde_datadir}/apps/kontact
-%{tde_datadir}/apps/kontactsummary/kontactsummary_part.rc
+%{tde_datadir}/apps/kontact/
+%{tde_datadir}/apps/kontactsummary/
 %{tde_datadir}/config.kcfg/kontact.kcfg
 %{tde_datadir}/icons/hicolor/*/apps/kontact.png
 %{tde_datadir}/icons/crystalsvg/*/actions/kontact_*.png
@@ -1326,6 +1384,7 @@ scheduling, address book and other PIM functionality.
 %{tde_datadir}/services/kcmkontactsummary.desktop
 %{tde_datadir}/services/kcmkorgsummary.desktop
 %{tde_datadir}/services/kcmsdsummary.desktop
+%dir %{tde_datadir}/services/kontact
 %{tde_datadir}/services/kontact/newstickerplugin.desktop
 %{tde_datadir}/services/kontact/specialdatesplugin.desktop
 %{tde_datadir}/services/kontact/summaryplugin.desktop
@@ -1355,7 +1414,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-kontact-devel
 Summary:	Development files for kontact
-Group:		Development/Libraries
+Group:		Development/Libraries/Other
 Requires:	trinity-kontact = %{version}-%{release}
 
 %description -n trinity-kontact-devel
@@ -1420,6 +1479,7 @@ installed.
 %{tde_datadir}/autostart/korgac.desktop
 %{tde_datadir}/config.kcfg/korganizer.kcfg
 %{tde_datadir}/icons/hicolor/*/apps/korganizer.png
+%dir %{tde_datadir}/services/kontact
 %{tde_datadir}/services/kontact/korganizerplugin.desktop
 %{tde_datadir}/services/kontact/journalplugin.desktop
 %{tde_datadir}/services/kontact/todoplugin.desktop
@@ -1453,7 +1513,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-korganizer-devel
 Summary:	Development files for korganizer
-Group:		Development/Libraries
+Group:		Development/Libraries/Other
 Requires:	trinity-korganizer = %{version}-%{release}
 
 %description -n trinity-korganizer-devel
@@ -1584,7 +1644,7 @@ This is the runtime package for programs that use the libindex library.
 
 %package -n trinity-libindex-devel
 Summary:	Trinity indexing library [development]
-Group:		Development/Libraries
+Group:		Development/Libraries/Other
 Requires:	trinity-libindex = %{version}-%{release}
 
 %description -n trinity-libindex-devel
@@ -1613,6 +1673,7 @@ library.
 Summary:	Trinity calendaring library
 Group:		Environment/Libraries
 #Requires:	%{name}-tderesources = %{version}-%{release}
+Requires:	trinity-libkmime = %{version}-%{release}
 
 %description -n trinity-libkcal
 This library provides a C++ API for handling the vCalendar and iCalendar
@@ -1633,7 +1694,8 @@ This is the runtime package for programs that use the libkcal-trinity library.
 %{tde_libdir}/libkcal.so.*
 %{tde_libdir}/libkcal_resourceremote.so.*
 %{tde_libdir}/libkholidays.so.*
-%{tde_datadir}/apps/libkholidays
+%{tde_datadir}/apps/libkholidays/
+%dir %{tde_datadir}/services/kresources/kcal
 %{tde_datadir}/services/kresources/kcal/imap.desktop
 %{tde_datadir}/services/kresources/kcal/kabc.desktop
 %{tde_datadir}/services/kresources/kcal/local.desktop
@@ -1651,7 +1713,7 @@ This is the runtime package for programs that use the libkcal-trinity library.
 
 %package -n trinity-libkcal-devel
 Summary:	Trinity calendaring library [development]
-Group:		Development/Libraries
+Group:		Development/Libraries/Other
 Requires:	trinity-libkcal = %{version}-%{release}
 Requires:	trinity-libtdepim-devel = %{version}-%{release}
 Requires:	trinity-libktnef-devel = %{version}-%{release}
@@ -1665,7 +1727,7 @@ library.
 
 %files -n trinity-libkcal-devel
 %defattr(-,root,root,-)
-%{tde_tdeincludedir}/libemailfunctions/idmapper.h
+%{tde_tdeincludedir}/libemailfunctions/
 %{tde_tdeincludedir}/libkcal
 %{tde_libdir}/libkcal.la
 %{tde_libdir}/libkcal.so
@@ -1686,6 +1748,7 @@ library.
 Summary:	Trinity PIM library
 Group:		Environment/Libraries
 Requires:	trinity-libkcal = %{version}-%{release}
+Requires:	trinity-libktnef = %{version}-%{release}
 
 Obsoletes:	libtdepim < %{version}-%{release}
 Provides:	libtdepim = %{version}-%{release}
@@ -1695,14 +1758,14 @@ This is the runtime package for programs that use the trinity-libtdepim library.
 
 %files -n trinity-libtdepim
 %defattr(-,root,root,-)
-%{tde_tdelibdir}/plugins/designer/[kt]depimwidgets.la
-%{tde_tdelibdir}/plugins/designer/[kt]depimwidgets.so
+%{tde_tdelibdir}/plugins/designer/kdepimwidgets.la
+%{tde_tdelibdir}/plugins/designer/kdepimwidgets.so
 %{tde_tdelibdir}/plugins/designer/kpartsdesignerplugin.la
 %{tde_tdelibdir}/plugins/designer/kpartsdesignerplugin.so
-%{tde_libdir}/lib[kt]depim.so.*
-%{tde_datadir}/apps/[kt]depimwidgets
-%{tde_datadir}/apps/lib[kt]depim
-%{tde_datadir}/apps/[kt]depim
+%{tde_libdir}/libkdepim.so.*
+%{tde_datadir}/apps/kdepimwidgets
+%{tde_datadir}/apps/libkdepim
+%{tde_datadir}/apps/kdepim
 %{tde_datadir}/config.kcfg/pimemoticons.kcfg
 %{tde_datadir}/icons/crystalsvg/22x22/actions/button_fewer.png
 %{tde_datadir}/icons/crystalsvg/22x22/actions/button_more.png
@@ -1725,7 +1788,7 @@ done
 
 %package -n trinity-libtdepim-devel
 Summary:	Trinity PIM library [development]
-Group:		Development/Libraries
+Group:		Development/Libraries/Other
 Requires:	trinity-libtdepim = %{version}-%{release}
 Requires:	trinity-tdelibs-devel >= %{version}
 
@@ -1772,7 +1835,7 @@ This is the runtime package for programs that use the libkgantt-trinity library.
 
 %package -n trinity-libkgantt-devel
 Summary:	Trinity gantt charting library [development]
-Group:		Development/Libraries
+Group:		Development/Libraries/Other
 Requires:	trinity-libkgantt = %{version}-%{release}
 Requires:	trinity-libtdepim-devel = %{version}-%{release}
 
@@ -1836,7 +1899,7 @@ done
 
 %package -n trinity-libkleopatra-devel
 Summary:	Trinity GnuPG interface libraries [development]
-Group:		Development/Libraries
+Group:		Development/Libraries/Other
 Requires:	trinity-libkleopatra = %{version}-%{release}
 Requires:	trinity-libtdepim-devel = %{version}-%{release}
 
@@ -1892,7 +1955,7 @@ an object tree.
 
 %package -n trinity-libkmime-devel
 Summary:	Development files for libkmime
-Group:		Development/Libraries
+Group:		Development/Libraries/Other
 Requires:	trinity-libkmime = %{version}-%{release}
 
 %description -n trinity-libkmime-devel
@@ -1913,7 +1976,7 @@ Requires:	trinity-libkmime = %{version}-%{release}
 
 %package -n trinity-libkpimexchange
 Summary:	Trinity PIM Exchange library
-Group:		Environment/Libraries
+Group:		Development/Libraries/Other
 
 %description -n trinity-libkpimexchange
 This is the runtime package for programs that use the libkpimexchange-trinity
@@ -1935,7 +1998,7 @@ library.
 
 %package -n trinity-libkpimexchange-devel
 Summary:	Trinity PIM Exchange library [development]
-Group:		Development/Libraries
+Group:		Development/Libraries/Other
 Requires:	trinity-libkpimexchange = %{version}-%{release}
 Requires:	trinity-libkcal-devel = %{version}-%{release}
 Requires:	trinity-libtdepim-devel = %{version}-%{release}
@@ -1946,6 +2009,7 @@ libkpimexchange-trinity library.
 
 %files -n trinity-libkpimexchange-devel
 %defattr(-,root,root,-)
+%dir %{tde_tdeincludedir}/kdepim
 %{tde_tdeincludedir}/kdepim/exchangeaccount.h
 %{tde_tdeincludedir}/kdepim/exchangeclient.h
 %{tde_libdir}/libkpimexchange.la
@@ -1984,7 +2048,7 @@ library.
 
 %package -n trinity-libkpimidentities-devel
 Summary:	Development files for libkpimidentities
-Group:		Development/Libraries
+Group:		Development/Libraries/Other
 Requires:	trinity-libkpimidentities = %{version}-%{release}
 
 %description -n trinity-libkpimidentities-devel
@@ -2024,7 +2088,7 @@ This is the runtime package for programs that use the libksieve-trinity library.
 
 %package -n trinity-libksieve-devel
 Summary:	Trinity mail/news message filtering library [development]
-Group:		Development/Libraries
+Group:		Development/Libraries/Other
 Requires:	trinity-libksieve = %{version}-%{release}
 Requires:	trinity-libtdepim-devel = %{version}-%{release}
 
@@ -2072,7 +2136,7 @@ This is the runtime library for packages using the ktnef-trinity library.
 
 %package -n trinity-libktnef-devel
 Summary:	KTNEF handler library [development]
-Group:		Development/Libraries
+Group:		Development/Libraries/Other
 Requires:	trinity-libktnef = %{version}-%{release}
 Requires:	trinity-libtdepim-devel = %{version}-%{release}
 
@@ -2122,7 +2186,7 @@ This is the runtime package for programs that use the libmimelib-trinity library
 
 %package -n trinity-libmimelib-devel
 Summary:	Trinity mime library [development]
-Group:		Development/Libraries
+Group:		Development/Libraries/Other
 Requires:	trinity-libmimelib = %{version}-%{release}
 
 %description -n trinity-libmimelib-devel
@@ -2167,7 +2231,7 @@ dialing calls, phonebook, and phone status monitoring.
 %{tde_datadir}/services/libkmobile_gammu.desktop
 %{tde_datadir}/services/libkmobile_skeleton.desktop
 %{tde_datadir}/servicetypes/libkmobile.desktop
-%{tde_datadir}/apps/kmobile/kmobileui.rc
+%{tde_datadir}/apps/kmobile/
 %{tde_tdeappdir}/kmobile.desktop
 %{tde_tdelibdir}/libkmobile_skeleton.la
 %{tde_tdelibdir}/libkmobile_skeleton.so
@@ -2192,7 +2256,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 ##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
@@ -2200,7 +2264,6 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %prep
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-%patch14 -p1 -b .ldflags
 
 # Fix 'ical2vcal' contains '/bin/perl' instead of '/usr/bin/perl'
 if [ -x /usr/bin/perl ]; then
@@ -2230,6 +2293,7 @@ fi
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
   -DCMAKE_SKIP_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DCMAKE_PROGRAM_PATH="%{tde_bindir}" \
   \
@@ -2269,6 +2333,36 @@ 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}/akregator.desktop       Network  RSS-News
+%suse_update_desktop_file -r    %{?buildroot}%{tde_tdeappdir}/groupwarewizard.desktop Utility  DesktopSettings X-TDE-Utilities-PIM
+%suse_update_desktop_file       %{?buildroot}%{tde_tdeappdir}/kaddressbook.desktop
+%suse_update_desktop_file -r    %{?buildroot}%{tde_tdeappdir}/kalarm.desktop          Utility  TimeUtility X-TDE-Utilities-PIM
+%suse_update_desktop_file -r    %{?buildroot}%{tde_tdeappdir}/kandy.desktop           Utility  Telephony X-TDE-Utilities-Peripherals
+%suse_update_desktop_file -r    %{?buildroot}%{tde_tdeappdir}/karm.desktop            Utility  TimeUtility X-TDE-Utilities-PIM
+%suse_update_desktop_file       %{?buildroot}%{tde_tdeappdir}/KNode.desktop
+%suse_update_desktop_file -r    %{?buildroot}%{tde_tdeappdir}/knotes.desktop          Utility  DesktopUtility X-TDE-Utilities-Desktop
+%suse_update_desktop_file       %{?buildroot}%{tde_tdeappdir}/KMail.desktop
+%suse_update_desktop_file -r    %{?buildroot}%{tde_tdeappdir}/Kontact.desktop         Office   Core-Office
+%suse_update_desktop_file -r    %{?buildroot}%{tde_tdeappdir}/korganizer.desktop      Office   Calendar
+%suse_update_desktop_file -r    %{?buildroot}%{tde_tdeappdir}/KOrn.desktop            Utility  Applet X-TDE-More
+%suse_update_desktop_file -u    %{?buildroot}%{tde_tdeappdir}/ktnef.desktop           Network  Email
+%suse_update_desktop_file       %{?buildroot}%{tde_tdeappdir}/kmobile.desktop         Utility  Telephony X-TDE-Utilities-Peripherals
+%if 0%{?with_kitchensync}
+%suse_update_desktop_file       %{?buildroot}%{tde_tdeappdir}/kitchensync.desktop     Utility  X-SuSE-SyncUtility
+%endif
+%endif
+
+# Adds missing icons in 'hicolor' theme
+pushd "%{?buildroot}%{tde_datadir}/icons"
+for i in {16,32,48};           do %__cp crystalsvg/"$i"x"$i"/apps/kandy.png                                hicolor/"$i"x"$i"/apps/kandy.png      ;done
+for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/filesystems/network.png  hicolor/"$i"x"$i"/apps/kleopatra.png  ;done
+popd
+
+# Links duplicate files
+%fdupes "%{?buildroot}%{tde_datadir}"
+
 
 %clean
 %__rm -rf %{?buildroot}
diff --git a/redhat/main/tdesdk/tdesdk-3.5.13.2.spec b/redhat/main/tdesdk/tdesdk-3.5.13.2.spec
index 75172f4f7..9c38f90fd 100644
--- a/redhat/main/tdesdk/tdesdk-3.5.13.2.spec
+++ b/redhat/main/tdesdk/tdesdk-3.5.13.2.spec
@@ -1,49 +1,105 @@
-# 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
-
+#
+# spec file for package tdesdk (version 3.5.13-SRU)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
+#
+
+# BUILD WARNING:
+#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
+#  Having KDE libraries may cause FTBFS here !
+
+# TDE variables
+%define tde_epoch 1
 %define tde_version 3.5.13.2
-
-# TDE specific building variables
+%define tde_pkg tdesdk
+%define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
 %define tde_mandir %{tde_datadir}/man
-
 %define tde_tdeappdir %{tde_datadir}/applications/kde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
+# 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
+
 
-Name:			trinity-tdesdk
+Name:			trinity-%{tde_pkg}
 Summary:		The Trinity Software Development Kit (SDK)
+Group:			Development/Tools/Other
 Version:		%{tde_version}
-Release:		%{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant}
-
-License:		GPLv2
-Group:			User Interface/Desktops
+Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
 URL:			http://www.trinitydesktop.org/
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
+
+%if 0%{?suse_version}
+License:		GPL-2.0+
+%else
+License:		GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:		Francois Andriot <francois.andriot@free.fr>
 
 Prefix:			%{tde_prefix}
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
 
-Patch1:			tdesdk-3.5.13.2-fix_cervisia_pod.patch
+%{?tde_patch:Patch1:			%{tde_pkg}-%{tde_version}.patch}
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-perl-dcop >= %{tde_version}
+BuildRequires:	trinity-tdepim-devel >= %{tde_version}
 
 BuildRequires:	cmake >= 2.8
+BuildRequires:	gcc-c++
 BuildRequires:	libtool
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# GAMIN support
+#  Not on openSUSE.
+%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_gamin 1
+BuildRequires:	gamin-devel
+%endif
+
+# PCRE support
 BuildRequires:	pcre-devel
-BuildRequires:	trinity-tqtinterface-devel >= %{version}
-BuildRequires:	trinity-tdelibs-devel >= %{version}
+
 # for kbugbuster/libkcal
-BuildRequires:	trinity-tdepim-devel >= %{version}
+BuildRequires:	desktop-file-utils
+
+# DB4 support
 %if 0%{?mgaversion} || 0%{?mdkversion}
 #BuildRequires:	%{_lib}db4.8-devel
 %endif
@@ -53,16 +109,21 @@ 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
 BuildRequires:	libxslt-devel
 BuildRequires:	libxml2-devel
-BuildRequires:	perl
 BuildRequires:	subversion-devel
 BuildRequires:	neon-devel
 
+# PERL support
+BuildRequires:	perl
+%if 0%{?fedora} >= 19
+BuildRequires:	perl-podlators
+%endif
+
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	%{_lib}ltdl-devel
 BuildRequires:	%{_lib}binutils-devel
@@ -99,11 +160,10 @@ Requires: trinity-kompare = %{version}-%{release}
 Requires: trinity-kspy = %{version}-%{release}
 Requires: trinity-kuiviewer = %{version}-%{release}
 Requires: trinity-libcvsservice0 = %{version}-%{release}
-Requires: trinity-libcvsservice-devel = %{version}-%{release}
 Requires: trinity-poxml = %{version}-%{release}
 Requires: trinity-umbrello = %{version}-%{release}
 %{?build_kioslave:Requires: %{name}-tdeio-plugins = %{version}-%{release}}
-Requires: trinity-kunittest = %{version}-%{release}
+Requires: trinity-tdeunittest = %{version}-%{release}
 
 
 %description
@@ -111,7 +171,7 @@ A collection of applications and tools used by developers, including:
 * cervisia: a CVS frontend
 * kbabel: PO file management
 * kbugbuster: a tool to manage the TDE bug report system
-* kcachegrind: a browser for data produced by profiling tools (e.g. cachegrind)
+* tdecachegrind: a browser for data produced by profiling tools (e.g. cachegrind)
 * kompare: diff tool
 * kuiviewer: displays designer's UI files
 * umbrello: UML modeller and UML diagram tool
@@ -123,7 +183,7 @@ A collection of applications and tools used by developers, including:
 
 %package -n trinity-cervisia
 Summary:	A graphical CVS front end for Trinity
-Group:		Development/Utilities
+Group:		Development/Tools/Version Control
 
 %description -n trinity-cervisia
 Cervisia is a TDE-based graphical front end for the CVS client.
@@ -147,7 +207,7 @@ This package is part of Trinity, and a component of the TDE SDK module.
 %{tde_tdelibdir}/libcervisiapart.so
 %{tde_tdeappdir}/cervisia.desktop
 %{tde_datadir}/apps/cervisia/
-%{tde_datadir}/apps/cervisiapart/cervisiaui.rc
+%{tde_datadir}/apps/cervisiapart/
 %{tde_datadir}/apps/kconf_update/cervisia.upd
 %{tde_datadir}/apps/kconf_update/cervisia-change_repos_list.pl
 %{tde_datadir}/apps/kconf_update/cervisia-normalize_cvsroot.pl
@@ -180,7 +240,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-kapptemplate
 Summary:	Creates a framework to develop a Trinity application
-Group:		Development/Utilities
+Group:		Development/Languages/Other
 
 %description -n trinity-kapptemplate
 KAppTemplate is a shell script that will create the necessary
@@ -204,7 +264,7 @@ fi
 
 %package -n trinity-kbabel
 Summary:	PO-file editing suite for Trinity
-Group:		Development/Utilities
+Group:		Development/Languages/Other
 
 %description -n trinity-kbabel
 This is a suite of programs for editing gettext message files (PO-files).
@@ -277,7 +337,7 @@ This package is part of Trinity, and a component of the TDE SDK module.
 %{tde_tdeappdir}/catalogmanager.desktop
 %{tde_tdeappdir}/kbabel.desktop
 %{tde_tdeappdir}/kbabeldict.desktop
-%{tde_datadir}/apps/catalogmanager/catalogmanagerui.rc
+%{tde_datadir}/apps/catalogmanager/
 %{tde_datadir}/apps/kbabel/
 %{tde_datadir}/apps/kconf_update/kbabel-difftoproject.upd
 %{tde_datadir}/apps/kconf_update/kbabel-project.upd
@@ -340,7 +400,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-kbabel-devel
 Summary:	PO-file editing suite for Trinity (development files)
-Group:		Development/Libraries
+Group:		Development/Libraries/Other
 Requires:	trinity-kbabel = %{version}-%{release}
 
 %description -n trinity-kbabel-devel
@@ -375,8 +435,9 @@ This package is part of Trinity, and a component of the TDE SDK module.
 ##########
 
 %package -n trinity-kbugbuster
-Summary:	a front end for the Trinity bug tracking system
-Group:		Development/Utilities
+Summary:	A front end for the Trinity bug tracking system
+Group:		Development/Languages/Other
+Requires:	trinity-libkcal >= %{tde_version}
 
 %description -n trinity-kbugbuster
 KBugBuster is a GUI front end for the TDE bug tracking system.
@@ -414,11 +475,11 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 ##########
 
 %package -n trinity-tdecachegrind
-Summary:	visualisation tool for valgrind profiling output
-Group:		Development/Utilities
+Summary:	Visualisation tool for valgrind profiling output
+Group:		Development/Languages/Other
 
 %description -n trinity-tdecachegrind
-KCachegrind is a visualisation tool for the profiling data generated
+tdecachegrind is a visualisation tool for the profiling data generated
 by calltree, a profiling skin for valgrind.  Applications can be
 profiled using calltree without being recompiled, and shared libraries
 and plugin architectures are supported.
@@ -455,8 +516,8 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 ##########
 
 %package -n trinity-tdecachegrind-converters
-Summary:	format converters for KCachegrind profiling visualisation tool
-Group:		Development/Utilities
+Summary:	Format converters for tdecachegrind profiling visualisation tool
+Group:		Development/Languages/Other
 Requires:	python
 %if 0%{?suse_version} || 0%{?rhel} == 4
 Requires:	php
@@ -466,9 +527,9 @@ Requires:	php-cli
 
 %description -n trinity-tdecachegrind-converters
 This is a collection of scripts for converting the output from
-different profiling tools into a format that KCachegrind can use.
+different profiling tools into a format that tdecachegrind can use.
 
-KCachegrind is a visualisation tool for the profiling data generated
+tdecachegrind is a visualisation tool for the profiling data generated
 by calltree, a profiling skin for valgrind.  Applications can be
 profiled using calltree without being recompiled, and shared libraries
 and plugin architectures are supported.
@@ -487,7 +548,7 @@ This package is part of Trinity, and a component of the TDE SDK module.
 
 %package kfile-plugins
 Summary:	Trinity file dialog plugins for software development files
-Group:		Environment/Libraries
+Group:		Development/Languages/Other
 
 %description kfile-plugins
 This is a collection of plugins for the TDE file dialog.  These plugins
@@ -512,8 +573,8 @@ This package is part of Trinity, and a component of the TDE SDK module.
 ##########
 
 %package misc
-Summary:	various goodies from the Trinity Software Development Kit
-Group:		Development/Libraries
+Summary:	Various goodies from the Trinity Software Development Kit
+Group:		Development/Languages/Other
 
 %description misc
 This package contains miscellaneous goodies provided with the official
@@ -529,7 +590,6 @@ This package is part of Trinity, and a component of the TDE SDK module.
 
 %files misc
 %defattr(-,root,root,-)
-%{tde_tdeincludedir}/kprofilemethod.h
 %{tde_tdelibdir}/kabcformat_kdeaccounts.la
 %{tde_tdelibdir}/kabcformat_kdeaccounts.so
 %{tde_tdelibdir}/plugins/styles/scheck.so
@@ -539,7 +599,6 @@ This package is part of Trinity, and a component of the TDE SDK module.
 %{tde_datadir}/kdepalettes/
 
 %{tde_libdir}/libkstartperf.so.*
-%{tde_libdir}/libkstartperf.so
 %{tde_libdir}/libkstartperf.la
 %{tde_bindir}/kstartperf
 
@@ -553,7 +612,7 @@ This package is part of Trinity, and a component of the TDE SDK module.
 
 %package scripts
 Summary:	a set of useful development scripts for Trinity
-Group:		Development/Utilities
+Group:		Development/Languages/Other
 Requires:	python
 
 %description scripts
@@ -651,8 +710,8 @@ This package is part of Trinity, and a component of the TDE SDK module.
 ##########
 
 %package -n trinity-kmtrace
-Summary:	a Trinity memory leak tracer
-Group:		Development/Utilities
+Summary:	A Trinity memory leak tracer
+Group:		Development/Languages/Other
 Requires:	less
 
 %description -n trinity-kmtrace
@@ -667,17 +726,16 @@ This package is part of Trinity, and a component of the TDE SDK module.
 %{tde_bindir}/kminspector
 %{tde_bindir}/kmmatch
 %{tde_bindir}/kmtrace
-%{tde_tdeincludedir}/ktrace.h
+%dir %{tde_libdir}/kmtrace
 %{tde_libdir}/kmtrace/libktrace.la
 %{tde_libdir}/kmtrace/libktrace.so
-%{tde_libdir}/kmtrace/libktrace_s.a
-%{tde_datadir}/apps/kmtrace/kde.excludes
+%{tde_datadir}/apps/kmtrace/
 
 ##########
 
 %package -n trinity-kompare
-Summary:	a Trinity GUI for viewing differences between files
-Group:		Development/Utilities
+Summary:	A Trinity GUI for viewing differences between files
+Group:		Development/Languages/Other
 
 %description -n trinity-kompare
 Kompare is a graphical user interface for viewing the differences between
@@ -690,15 +748,13 @@ This package is part of Trinity, and a component of the TDE SDK module.
 %defattr(-,root,root,-)
 %{tde_bindir}/kompare
 %{tde_libdir}/libkompareinterface.la
-%{tde_libdir}/libkompareinterface.so
 %{tde_libdir}/libkompareinterface.so.*
 %{tde_tdelibdir}/libkomparenavtreepart.la
 %{tde_tdelibdir}/libkomparenavtreepart.so
 %{tde_tdelibdir}/libkomparepart.la
 %{tde_tdelibdir}/libkomparepart.so
 %{tde_tdeappdir}/kompare.desktop
-%{tde_datadir}/apps/kompare/komparepartui.rc
-%{tde_datadir}/apps/kompare/kompareui.rc
+%{tde_datadir}/apps/kompare/
 %{tde_datadir}/services/komparenavtreepart.desktop
 %{tde_datadir}/services/komparepart.desktop
 %{tde_datadir}/servicetypes/komparenavigationpart.desktop
@@ -726,8 +782,8 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 ##########
 
 %package -n trinity-kspy
-Summary:	examines the internal state of a Qt/TDE app
-Group:		Environment/Libraries
+Summary:	Examines the internal state of a Qt/TDE app
+Group:		Development/Languages/Other
 Requires:	trinity-tdelibs-devel
 
 %description -n trinity-kspy
@@ -744,9 +800,7 @@ This package is part of Trinity, and a component of the TDE SDK module.
 
 %files -n trinity-kspy
 %defattr(-,root,root,-)
-%{tde_tdeincludedir}/kspy.h
 %{tde_libdir}/libkspy.la
-%{tde_libdir}/libkspy.so
 %{tde_libdir}/libkspy.so.*
 
 %post -n trinity-kspy
@@ -758,8 +812,8 @@ This package is part of Trinity, and a component of the TDE SDK module.
 ##########
 
 %package -n trinity-kuiviewer
-Summary:	viewer for Qt Designer user interface files
-Group:		Development/Utilities
+Summary:	Viewer for Qt Designer user interface files
+Group:		Development/Languages/Other
 
 %description -n trinity-kuiviewer
 KUIViewer is a utility to display and test the user interface (.ui) files
@@ -778,8 +832,8 @@ This package is part of Trinity, and a component of the TDE SDK module.
 %{tde_tdelibdir}/quithumbnail.so
 %{tde_tdelibdir}/quithumbnail.la
 %{tde_tdeappdir}/kuiviewer.desktop
-%{tde_datadir}/apps/kuiviewer/kuiviewerui.rc
-%{tde_datadir}/apps/kuiviewerpart/kuiviewer_part.rc
+%{tde_datadir}/apps/kuiviewer/
+%{tde_datadir}/apps/kuiviewerpart/
 %{tde_datadir}/icons/hicolor/*/apps/kuiviewer.png
 %{tde_datadir}/icons/locolor/*/apps/kuiviewer.png
 %{tde_datadir}/services/designerthumbnail.desktop
@@ -801,7 +855,7 @@ done
 
 %package -n trinity-libcvsservice0
 Summary:	DCOP service for accessing CVS repositories
-Group:		Environment/Libraries
+Group:		Development/Languages/Other
 Requires:	cvs
 
 %description -n trinity-libcvsservice0
@@ -836,8 +890,8 @@ This package is part of Trinity, and a component of the TDE SDK module.
 ##########
 
 %package -n trinity-libcvsservice-devel
-Summary:	development files for CVS DCOP service
-Group:		Development/Libraries
+Summary:	Development files for CVS DCOP service
+Group:		Development/Libraries/Other
 Requires:	trinity-libcvsservice0 = %{version}-%{release}
 
 %description -n trinity-libcvsservice-devel
@@ -871,8 +925,8 @@ This package is part of Trinity, and a component of the TDE SDK module.
 ##########
 
 %package -n trinity-poxml
-Summary:	tools for using PO-files to translate DocBook XML files
-Group:		Development/Utilities
+Summary:	Tools for using PO-files to translate DocBook XML files
+Group:		Development/Languages/Other
 
 %description -n trinity-poxml
 This is a collection of tools that facilitate translating DocBook XML
@@ -895,7 +949,7 @@ This package is part of Trinity, and a component of the TDE SDK module.
 
 %package -n trinity-umbrello
 Summary:	UML modelling tool and code generator
-Group:		Development/Utilities
+Group:		Development/Languages/Other
 
 %description -n trinity-umbrello
 Umbrello UML Modeller is a Unified Modelling Language editor for TDE.
@@ -943,8 +997,8 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 %if 0%{?build_kioslave}
 
 %package tdeio-plugins
-Summary:	subversion ioslave for Trinity
-Group:		Environment/Libraries
+Summary:	Subversion ioslave for Trinity
+Group:		Development/Languages/Other
 Requires:	subversion
 
 Obsoletes:	trinity-tdesdk-kio-plugins < %{version}-%{release}
@@ -1018,57 +1072,78 @@ fi
 
 ##########
 
-%package -n trinity-kunittest
-Summary:	unit testing library for Trinity
-Group:		Development/Utilities
+%package -n trinity-tdeunittest
+Summary:	Unit testing library for Trinity
+Group:		Development/Languages/Other
+
+Obsoletes:	trinity-kunittest < %{version}-%{release}
+Provides:	trinity-kunittest = %{version}-%{release}
 
-%description -n trinity-kunittest
-KUnitTest is a small library that facilitates the writing of tests for
-TDE developers. There are two ways to use the KUnitTest library. One is
-to create dynamically loadable modules and use the kunittestmodrunner or
-kunittestguimodrunner programs to run the tests. The other is to use the
+%description -n trinity-tdeunittest
+tdeunittest is a small library that facilitates the writing of tests for
+TDE developers. There are two ways to use the tdeunittest library. One is
+to create dynamically loadable modules and use the tdeunittestmodrunner or
+tdeunittestguimodrunner programs to run the tests. The other is to use the
 libraries to create your own testing application.
 
 This package is part of Trinity, and a component of the TDE SDK module.
 
-%files -n trinity-kunittest
+%files -n trinity-tdeunittest
 %defattr(-,root,root,-)
 %{tde_bindir}/kunittest
 %{tde_bindir}/kunittest_debughelper
 %{tde_bindir}/kunittestmod
 %{tde_bindir}/kunittestguimodrunner
 %{tde_libdir}/libkunittestgui.la
-%{tde_libdir}/libkunittestgui.so
 %{tde_libdir}/libkunittestgui.so.*
-%{tde_tdeincludedir}/kunittest/runnergui.h
 
-%post -n trinity-kunittest
+%post -n trinity-tdeunittest
 /sbin/ldconfig || :
 
-%postun -n trinity-kunittest
+%postun -n trinity-tdeunittest
 /sbin/ldconfig || :
 
 ##########
 
 %package devel
 Summary:	Development files for %{name}
-Group:		Development/Libraries
+Group:		Development/Libraries/Other
 
 Requires:	%{name} = %{version}-%{release}
 Requires:	trinity-kbabel-devel = %{version}-%{release}
+Requires:	%{name}-misc = %{version}-%{release}
+Requires:	trinity-kspy = %{version}-%{release}
+Requires:	trinity-kmtrace = %{version}-%{release}
+Requires:	trinity-tdeunittest = %{version}-%{release}
+Requires:	trinity-libcvsservice-devel = %{version}-%{release}
+Requires:	trinity-kompare = %{version}-%{release}
 
 Obsoletes:	trinity-kdesdk-devel < %{version}-%{release}
 Provides:	trinity-kdesdk-devel = %{version}-%{release}
 
 %description devel
-%{summary}.
+This package contains the development files for tdesdk.
 
 %files devel
 %defattr(-,root,root,-)
+# misc
+%{tde_tdeincludedir}/kprofilemethod.h
+%{tde_libdir}/libkstartperf.so
+# kspy
+%{tde_tdeincludedir}/kspy.h
+%{tde_libdir}/libkspy.so
+# kmtrace
+%{tde_libdir}/kmtrace/libktrace_s.a
+%{tde_tdeincludedir}/ktrace.h
+# tdeunittest
+%{tde_libdir}/libkunittestgui.so
+%{tde_tdeincludedir}/kunittest/runnergui.h
+# kompare
+%{tde_libdir}/libkompareinterface.so
 
 ##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
@@ -1077,7 +1152,7 @@ Provides:	trinity-kdesdk-devel = %{version}-%{release}
 
 %prep
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-%patch1 -p1 -b .cervisiapod
+%{?tde_patch:%patch1 -p1}
 
 
 %build
@@ -1101,6 +1176,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   \
@@ -1144,6 +1220,33 @@ export PATH="%{tde_bindir}:${PATH}"
 # Removes useless stuff
 %__rm -f %{?buildroot}%{tde_datadir}/apps/kapptemplate/admin/debianrules
 
+# Fix permissions
+chmod 644 %{?buildroot}%{tde_datadir}/apps/kapptemplate/admin/Doxyfile.global
+
+# Make kapptemplate archive
+pushd  %{?buildroot}%{tde_datadir}/apps/kapptemplate
+mkdir kapptemplate
+mv admin appframework bin existing include kapp kpartapp kpartplugin kapptemplate/
+tar cfz kapptemplate.tar.gz kapptemplate
+rm -rf kapptemplate
+popd
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file    kuiviewer      Development GUIDesigner
+%suse_update_desktop_file    umbrello       Development Design
+%suse_update_desktop_file    kbugbuster     Development Debugger
+%suse_update_desktop_file -u catalogmanager Development Translation
+%suse_update_desktop_file    kbabel         Development Translation
+%suse_update_desktop_file -u kbabeldict     Development Translation
+%suse_update_desktop_file    cervisia       Development RevisionControl
+%suse_update_desktop_file    kompare        Development RevisionControl
+%suse_update_desktop_file    kcachegrind    Development Profiling
+%endif
+
+# Links duplicate files
+%fdupes "%{?buildroot}%{tde_datadir}"
+
 
 %clean
 %__rm -rf %{buildroot}
diff --git a/redhat/main/tdevelop/tdevelop-3.5.13.2.spec b/redhat/main/tdevelop/tdevelop-3.5.13.2.spec
index 0a2cd496c..cfb70732a 100644
--- a/redhat/main/tdevelop/tdevelop-3.5.13.2.spec
+++ b/redhat/main/tdevelop/tdevelop-3.5.13.2.spec
@@ -1,77 +1,121 @@
-# 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
-
+#
+# spec file for package tdevelop (version 3.5.13-SRU)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
+#
+
+# BUILD WARNING:
+#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
+#  Having KDE libraries may cause FTBFS here !
+
+# TDE variables
+%define tde_epoch 1
 %define tde_version 3.5.13.2
-
-# TDE specific building variables
+%define tde_pkg tdevelop
+%define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
-
 %define tde_tdeappdir %{tde_datadir}/applications/kde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
-%define _docdir %{tde_docdir}
 
-Name:		trinity-tdevelop
+Name:		trinity-%{tde_pkg}
 Summary:	Integrated Development Environment for C++/C
 Version:	%{tde_version}
-Release:	%{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant}
-
-License:	GPLv2
+Release:	%{?!preversion:4}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
 Group:		Development/Tools
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.trinitydesktop.org/
 
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Project
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
 Prefix:		%{tde_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-Source1:	ftp://129.187.206.68/pub/unix/ide/KDevelop/c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2
 
-# [c_cpp_ref] Fix library directories detection
-Patch1: 	c_cpp_reference-2.0.2-config.patch
-# [c_cpp_ref] Fix installation of 'asm' files
-Patch4:		c_cpp_reference-2.0.2-install.patch
+Requires:	%{name}-libs = %{version}-%{release}
 
-Requires: %{name}-libs = %{version}-%{release}
+BuildRequires:	tqt3-apps-devel >= 3.5.0
+BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	trinity-tdesdk-devel >= %{tde_version}
 
+Obsoletes:	trinity-kdevelop < %{version}-%{release}
+Provides:	trinity-kdevelop = %{version}-%{release}
 
-Requires: make
-Requires: perl
-Requires: flex >= 2.5.4
-%if 0%{?rhel} || 0%{?fedora}
-Requires:	qt3-designer >= 3.3.8.d
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
 %endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-Requires:	%{_lib}qt3-devel >= 3.3.8.d
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
 %endif
-%if 0%{?suse_version}
+
+BuildRequires:	cmake >= 2.8
+BuildRequires:	gcc-c++
+BuildRequires:	fdupes
+BuildRequires:	desktop-file-utils
+BuildRequires:	make
+
+Requires:	make
+Requires:	perl
 Requires:	qt3-devel >= 3.3.8.d
+Requires:	gettext
+Requires:	ctags
+
+
+# LIBIDN support
+BuildRequires:	libidn-devel
+
+# GAMIN support
+#  Not on openSUSE.
+%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_gamin 1
+BuildRequires:	gamin-devel
 %endif
-Requires: gettext
-Requires: ctags
 
-BuildRequires:	cmake >= 2.8
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdesdk-devel >= %{tde_version}
+# PCRE support
+BuildRequires:	pcre-devel
+
+# DB4 support
 %if 0%{?rhel} || 0%{?fedora}
 BuildRequires:	db4-devel
 %endif
+
+# FLEX support
 BuildRequires:	flex
-# FIXME: No CVS support in tdevelop? This is going to suck...
-# Requires kdesdk3.
+Requires: flex >= 2.5.4
+
+# SVN support
 BuildRequires:	subversion-devel
+
+# NEON support
 BuildRequires:	neon-devel
 
 # LDAP support
@@ -86,9 +130,6 @@ BuildRequires:	openldap-devel
 BuildRequires:	libacl-devel
 %endif
 
-Obsoletes:	trinity-tdevelop < %{version}-%{release}
-Provides:	trinity-tdevelop = %{version}-%{release}
-
 %description
 The TDevelop Integrated Development Environment provides many features
 that developers need as well as providing a unified interface to programs
@@ -283,15 +324,15 @@ individual needs.
 %{tde_tdelibdir}/libkdevvcsmanager.so
 %{tde_datadir}/apps/kconf_update/
 %{tde_datadir}/apps/kdevabbrev/
-%{tde_datadir}/apps/kdevadaproject/kdevadaproject.rc
-%{tde_datadir}/apps/kdevadasupport/kdevadasupport.rc
-%{tde_datadir}/apps/kdevantproject/kdevantproject.rc
-%{tde_datadir}/apps/kdevappoutputview/kdevmakeview.rc
+%{tde_datadir}/apps/kdevadaproject/
+%{tde_datadir}/apps/kdevadasupport/
+%{tde_datadir}/apps/kdevantproject/
+%{tde_datadir}/apps/kdevappoutputview/
 %{tde_datadir}/apps/kdevappwizard/
-%{tde_datadir}/apps/kdevassistant/kdevassistantui.rc
-%{tde_datadir}/apps/kdevastyle/kdevpart_astyle.rc
-%{tde_datadir}/apps/kdevautoproject/kdevautoproject.rc
-%{tde_datadir}/apps/kdevbashsupport/kdevbashsupport.rc
+%{tde_datadir}/apps/kdevassistant/
+%{tde_datadir}/apps/kdevastyle/
+%{tde_datadir}/apps/kdevautoproject/
+%{tde_datadir}/apps/kdevbashsupport/
 %{tde_datadir}/apps/kdevclassview/
 %{tde_datadir}/apps/kdevcppsupport/
 %{tde_datadir}/icons/hicolor/*/actions/breakpoint_add.png
@@ -401,50 +442,46 @@ individual needs.
 %{tde_datadir}/servicetypes/kdevelopsourceformatter.desktop
 %{tde_datadir}/servicetypes/kdevelopvcsintegrator.desktop
 %{tde_datadir}/servicetypes/kdevelopversioncontrol.desktop
-%{tde_datadir}/apps/kdevcsharpsupport/kdevcsharpsupport.rc
-%{tde_datadir}/apps/kdevctags2/kdevpart_ctags2.rc
-%{tde_datadir}/apps/kdevcustomproject/kdevcustomproject.rc
+%{tde_datadir}/apps/kdevcsharpsupport/
+%{tde_datadir}/apps/kdevctags2/
+%{tde_datadir}/apps/kdevcustomproject/
 %{tde_datadir}/apps/kdevdebugger/
-%{tde_datadir}/apps/kdevdesigner/kdevdesigner_shell.rc
-%{tde_datadir}/apps/kdevdesignerpart/kdevdesigner_part.rc
-%{tde_datadir}/apps/kdevdesignerpart/kdevdesigner_part_sh.rc
-%{tde_datadir}/apps/kdevdiff/kdevdiff.rc
-%{tde_datadir}/apps/kdevdistpart/kdevpart_distpart.rc
+%{tde_datadir}/apps/kdevdesigner/
+%{tde_datadir}/apps/kdevdesignerpart/
+%{tde_datadir}/apps/kdevdesignerpart/
+%{tde_datadir}/apps/kdevdiff/
+%{tde_datadir}/apps/kdevdistpart/
 %{tde_datadir}/apps/kdevdocumentation/
-%{tde_datadir}/apps/kdevdoxygen/kdevdoxygen.rc
+%{tde_datadir}/apps/kdevdoxygen/
 %{tde_datadir}/apps/kdevelop/
 %{tde_datadir}/apps/kdevfilecreate/
-%{tde_datadir}/apps/kdevfilelist/kdevfilelist.rc
-%{tde_datadir}/apps/kdevfilter/kdevfilter.rc
-%{tde_datadir}/apps/kdevfortransupport/kdevfortransupport.rc
-%{tde_datadir}/apps/kdevfullscreen/kdevpart_fullscreen.rc
+%{tde_datadir}/apps/kdevfilelist/
+%{tde_datadir}/apps/kdevfilter/
+%{tde_datadir}/apps/kdevfortransupport/
+%{tde_datadir}/apps/kdevfullscreen/
 %{tde_datadir}/apps/kdevgrepview/
-%{tde_datadir}/apps/kdevjavasupport/kdevjavasupport.rc
-%{tde_datadir}/apps/kdevmakeview/kdevmakeview.rc
-%{tde_datadir}/apps/kdevpartexplorer/kdevpartexplorer.rc
-%{tde_datadir}/apps/kdevpascalproject/kdevpascalproject.rc
-%{tde_datadir}/apps/kdevpascalsupport/kdevpascalsupport.rc
-%{tde_datadir}/apps/kdevperlsupport/kdevperlsupport.rc
-%{tde_datadir}/apps/kdevphpsupport/kdevphpsupport.rc
-%{tde_datadir}/apps/kdevphpsupport/phpfunctions
-%{tde_datadir}/apps/kdevpythonsupport/kdevpythonsupport.rc
-%{tde_datadir}/apps/kdevquickopen/kdevpart_quickopen.rc
+%{tde_datadir}/apps/kdevjavasupport/
+%{tde_datadir}/apps/kdevmakeview/
+%{tde_datadir}/apps/kdevpartexplorer/
+%{tde_datadir}/apps/kdevpascalproject/
+%{tde_datadir}/apps/kdevpascalsupport/
+%{tde_datadir}/apps/kdevperlsupport/
+%{tde_datadir}/apps/kdevphpsupport/
+%{tde_datadir}/apps/kdevpythonsupport/
+%{tde_datadir}/apps/kdevquickopen/
 %{tde_datadir}/apps/kdevrbdebugger/
-%{tde_datadir}/apps/kdevregexptest/kdevregexptest.rc
-%{tde_datadir}/apps/kdevreplace/kdevpart_replace.rc
-%{tde_datadir}/apps/kdevrubysupport/kdevrubysupport.rc
-%{tde_datadir}/apps/kdevrubysupport/pics/ruby_config.png
-%{tde_datadir}/apps/kdevrubysupport/pics/ruby_run.png
-%{tde_datadir}/apps/kdevscripting/kdevscripting.rc
-%{tde_datadir}/apps/kdevscriptproject/kdevscriptproject.rc
-%{tde_datadir}/apps/kdevsnippet/kdevpart_snippet.rc
-%{tde_datadir}/apps/kdevsqlsupport/kdevsqlsupport.rc
-%{tde_datadir}/apps/kdevtipofday/kdevpart_tipofday.rc
-%{tde_datadir}/apps/kdevtipofday/tips
-%{tde_datadir}/apps/kdevtools/kdevpart_tools.rc
-%{tde_datadir}/apps/kdevtrollproject/kdevtrollproject.rc
-%{tde_datadir}/apps/kdevvalgrind/kdevpart_valgrind.rc
-%{tde_datadir}/apps/kio_pydoc/kde_pydoc.py*
+%{tde_datadir}/apps/kdevregexptest/
+%{tde_datadir}/apps/kdevreplace/
+%{tde_datadir}/apps/kdevrubysupport/
+%{tde_datadir}/apps/kdevscripting/
+%{tde_datadir}/apps/kdevscriptproject/
+%{tde_datadir}/apps/kdevsnippet/
+%{tde_datadir}/apps/kdevsqlsupport
+%{tde_datadir}/apps/kdevtipofday/
+%{tde_datadir}/apps/kdevtools/
+%{tde_datadir}/apps/kdevtrollproject/
+%{tde_datadir}/apps/kdevvalgrind/
+%{tde_datadir}/apps/kio_pydoc/
 %{tde_datadir}/config/kdevassistantrc
 %{tde_datadir}/config/kdeveloprc
 %{tde_datadir}/desktop-directories/tde-development-kdevelop.directory
@@ -456,12 +493,11 @@ individual needs.
 %{tde_tdelibdir}/libkdevvisualboyadvance.la
 %{tde_tdelibdir}/libkdevvisualboyadvance.so
 %{tde_datadir}/apps/kdevdesignerpart/pics/
-%{tde_datadir}/apps/kdevvisualboyadvance/kdevpart_visualboyadvance.rc
+%{tde_datadir}/apps/kdevvisualboyadvance/
 %{tde_tdedocdir}/HTML/en/kde_app_devel/
 %{tde_datadir}/mimelnk/text/x-fortran.desktop
 %{tde_datadir}/services/kdevvisualboyadvance.desktop
 
-
 %post
 for f in hicolor locolor ; do
   touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
@@ -480,14 +516,14 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package devel
 Summary: Development files for %{name}
-Group: Development/Libraries
+Group:		Development/Libraries/Other
 Requires: %{name}-libs = %{version}-%{release}
 
 Obsoletes:	trinity-kdevelop-devel < %{version}-%{release}
 Provides:	trinity-kdevelop-devel = %{version}-%{release}
 
 %description devel
-%{summary}.
+This package contains the development files for tdevelop.
 
 %files devel
 %defattr(-,root,root,-)
@@ -514,7 +550,7 @@ Obsoletes:	trinity-kdevelop-libs < %{version}-%{release}
 Provides:	trinity-kdevelop-libs = %{version}-%{release}
 
 %description libs
-%{summary}.
+This package contains the libraries needed for the tdevelop programs.
 
 %files libs
 %defattr(-,root,root,-)
@@ -566,16 +602,7 @@ Provides:	trinity-kdevelop-libs = %{version}-%{release}
 ##########
 
 %prep
-%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} -a 1
-%patch1 -p0 -b .config
-%patch4 -p1
-
-%__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"
-
-%__rm -rf c_cpp_reference-2.0.2_for_KDE_3.0/admin
-%__cp -ar admin c_cpp_reference-2.0.2_for_KDE_3.0/
-%__make -C c_cpp_reference-2.0.2_for_KDE_3.0 -f admin/Makefile.common cvs
+%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
 
 
 %build
@@ -589,20 +616,6 @@ if [ -d /usr/X11R6 ]; then
   export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
 fi
 
-# c references
-pushd c_cpp_reference-2.0.2_for_KDE_3.0
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --with-qt-libraries=${QTLIB:-${QTDIR}/%{_lib}} \
-  --with-qt-includes=${QTINC:-${QTDIR}/include} \
-  --with-extra-libs=%{tde_libdir}
-popd
-
 if ! rpm -E %%cmake|grep -q "cd build"; then
   %__mkdir_p build
   cd build
@@ -614,6 +627,7 @@ fi
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
   -DCMAKE_SKIP_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   \
   -DBIN_INSTALL_DIR=%{tde_bindir} \
@@ -629,14 +643,13 @@ fi
 
 %__make %{?_smp_mflags} || %__make
 
-# c references
-cd ..
-%__make %{?_smp_mflags} -C c_cpp_reference-2.0.2_for_KDE_3.0
 
 %install
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot} -C build
-%__make install DESTDIR=%{buildroot} -C c_cpp_reference-2.0.2_for_KDE_3.0
+
+# Links duplicate files
+%fdupes "%{?buildroot}%{tde_datadir}"
 
 
 %clean