RPM packaging: update kmplayer, kmyfirewall, kmymoney, knemo

27 files changed, 450 insertions, 2523 deletions

diff --git a/redhat/applications/basket/basket-14.0.0.spec b/redhat/applications/basket/basket-14.0.0.spec
index a4e1a7b8a..2005d20e4 100644
--- a/redhat/applications/basket/basket-14.0.0.spec
+++ b/redhat/applications/basket/basket-14.0.0.spec
@@ -138,7 +138,6 @@ export PATH="%{tde_bindir}:${PATH}"
 %suse_update_desktop_file -G "Extended Clipboard" basket DesktopUtility
 %endif
 
-
 # Apps that should stay in TDE
 echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
 
diff --git a/redhat/applications/klcddimmer/klcddimmer-14.0.0.spec b/redhat/applications/klcddimmer/klcddimmer-14.0.0.spec
index 3872b21ce..5a321aba0 100644
--- a/redhat/applications/klcddimmer/klcddimmer-14.0.0.spec
+++ b/redhat/applications/klcddimmer/klcddimmer-14.0.0.spec
@@ -75,10 +75,7 @@ BuildRequires:	brp-check-trinity
 
 
 %description
-KKBSwitch displays an icon in the system tray that indicates which 
-layout is  KLcdDimmer is applet for simple adjust LCD brightness.
-Notice that this applet relies on an external program to get/set the 
-brightness.
+
 
 
 ##########
diff --git a/redhat/applications/kmplayer/kmplayer-14.0.0.patch b/redhat/applications/kmplayer/kmplayer-14.0.0.patch
new file mode 100644
index 000000000..fba761b15
--- /dev/null
+++ b/redhat/applications/kmplayer/kmplayer-14.0.0.patch
@@ -0,0 +1,13 @@
+diff --git a/src/gstplayer.cpp b/src/gstplayer.cpp
+index c4bf580..0585ac9 100644
+--- a/src/gstplayer.cpp
++++ b/src/gstplayer.cpp
+@@ -750,7 +750,7 @@ void KGStreamerPlayer::seek (int val /*offset_in_deciseconds*/) {
+ void KGStreamerPlayer::volume (int val) {
+     //fprintf (stderr, "position %d\n", val);
+     if (gst_elm_play)
+-        g_object_set (G_OBJECT (gst_elm_play), "volume", 1.0*val/100, 0L);
++        g_object_set (G_OBJECT (gst_elm_play), "volume", 1.0*val/100, NULL);
+ }
+ 
+ void KGStreamerPlayer::updatePosition () {
diff --git a/redhat/applications/kmplayer/kmplayer-14.0.0.spec b/redhat/applications/kmplayer/kmplayer-14.0.0.spec
index 9425c3f6e..c958753b0 100644
--- a/redhat/applications/kmplayer/kmplayer-14.0.0.spec
+++ b/redhat/applications/kmplayer/kmplayer-14.0.0.spec
@@ -1,52 +1,80 @@
-# Default version for this component
-%define tde_pkg kmplayer
+#
+# spec file for package kmplayer (version R14.0.0)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# TDE variables
+%define tde_epoch 2
 %define tde_version 14.0.0
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE specific building variables
+%define tde_pkg kmplayer
+%define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
 %define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/tde
+%define tde_tdeappdir %{tde_datadir}/applications/tde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
-%define _docdir %{tde_docdir}
-
 
-Name:			trinity-%{tde_pkg}
-Summary:		media player for Trinity
-Version:		0.10.0c
-Release:		%{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant}
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.10.0c
+Release:	%{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant}
+Summary:	Media player for Trinity
+Group:		Applications/Multimedia
+URL:		http://www.trinitydesktop.org/
+#URL:		http://kmplayer.kde.org
 
-License:		GPLv2+
-Group:			Applications/Multimedia
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
 
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://kmplayer.kde.org
+#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}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Patch0:			%{tde_pkg}-%{tde_version}.patch
 
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
+BuildRequires:	autoconf automake libtool m4
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	libtool
+
+# 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
+
 # DBUS support
 %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
 BuildRequires:	trinity-dbus-tqt-devel >= %{tde_version}
@@ -119,6 +147,7 @@ BuildRequires:	dbus-glib-devel
 
 Requires:		%{name}-base = %{version}-%{release}
 
+
 %description
 A basic audio/video viewer application for Trinity.
 
@@ -135,6 +164,30 @@ KMPlayer can:
 * Lots of configurable shortcuts. Highly recommended for the VDR keys
   (if you have VDR) and volume increase/decrease
 
+%post
+/sbin/ldconfig || :
+
+%postun
+/sbin/ldconfig || :
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING ChangeLog INSTALL README TODO kmplayer.lsm
+%{tde_bindir}/kmplayer
+%{tde_bindir}/knpplayer
+%{tde_bindir}/kxvplayer
+%{tde_libdir}/libtdeinit_kmplayer.la
+%{tde_libdir}/libtdeinit_kmplayer.so
+%{tde_tdelibdir}/kmplayer.la
+%{tde_tdelibdir}/kmplayer.so
+%{tde_tdeappdir}/kmplayer.desktop
+%exclude %{tde_datadir}/apps/kmplayer/bookmarks.xml
+%exclude %{tde_datadir}/apps/kmplayer/kmplayerpartui.rc
+%exclude %{tde_datadir}/apps/kmplayer/noise.gif
+%exclude %{tde_datadir}/apps/kmplayer/pluginsinfo
+%{tde_datadir}/apps/kmplayer/
+
+##########
 
 %package base
 Group:			Applications/Multimedia
@@ -143,11 +196,36 @@ Summary:		Base files for KMPlayer [Trinity]
 %description base
 Core files needed for KMPlayer.
 
+%post base
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
+/sbin/ldconfig || :
+
+%postun base
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
+/sbin/ldconfig || :
+
+%files base
+%defattr(-,root,root,-)
+%{tde_libdir}/libkmplayercommon.la
+%{tde_libdir}/libkmplayercommon.so
+%{tde_bindir}/kgstplayer
+%{tde_bindir}/kxineplayer
+%{tde_datadir}/config/kmplayerrc
+%{tde_datadir}/apps/kmplayer/bookmarks.xml
+%{tde_datadir}/apps/kmplayer/noise.gif
+%{tde_datadir}/icons/hicolor/*/apps/kmplayer.png
+%{tde_datadir}/icons/hicolor/*/apps/kmplayer.svgz
+%{tde_datadir}/mimelnk/application/x-kmplayer.desktop
+%{tde_datadir}/mimelnk/video/x-ms-wmp.desktop
+
+##########
 
 %package konq-plugins
 Group:			Applications/Multimedia
 Requires:		%{name}-base = %{version}-%{release}
-Requires:		trinity-tdebase >= %{tde_version}
+Requires:		trinity-konqueror >= %{tde_version}
 Summary:		KMPlayer plugin for KHTML/Konqueror [Trinity]
 
 %description konq-plugins
@@ -156,6 +234,15 @@ This plugin enables audio/video playback inside konqueror, using Xine (with
 tv or radio. It mimics QuickTime, MS Media Player and RealPlayer plugin
 browser plugins.
 
+%files konq-plugins
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/libkmplayerpart.la
+%{tde_tdelibdir}/libkmplayerpart.so
+%{tde_datadir}/apps/kmplayer/kmplayerpartui.rc
+%{tde_datadir}/apps/kmplayer/pluginsinfo
+%{tde_datadir}/services/kmplayer_part.desktop
+
+##########
 
 %package doc
 Group:			Applications/Multimedia
@@ -165,14 +252,21 @@ Summary:		Handbook for KMPlayer [Trinity]
 %description doc
 Documention for KMPlayer, a basic audio/video viewer application for TDE.
 
+%files doc
+%defattr(-,root,root,-)
+%{tde_tdedocdir}/HTML/*/kmplayer
+
+##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
+##########
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+%patch0 -p1 -b .orig
 
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
 %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@@ -214,70 +308,16 @@ export PATH="%{tde_bindir}:${PATH}"
 # Removes unwanted files
 %__rm -f %{?buildroot}%{tde_datadir}/mimelnk/application/x-mplayer2.desktop
 
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -r "%{tde_pkg}" TDE AudioVideo Player Video
+%endif
+
 
 %clean
 %__rm -rf %{buildroot}
 
 
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-%post base
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-/sbin/ldconfig || :
-
-%postun base
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-/sbin/ldconfig || :
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog INSTALL README TODO kmplayer.lsm
-%{tde_bindir}/kmplayer
-%{tde_bindir}/knpplayer
-%{tde_bindir}/kxvplayer
-%{tde_libdir}/libtdeinit_kmplayer.la
-%{tde_libdir}/libtdeinit_kmplayer.so
-%{tde_tdelibdir}/kmplayer.la
-%{tde_tdelibdir}/kmplayer.so
-%{tde_tdeappdir}/kmplayer.desktop
-%{tde_datadir}/apps/kmplayer
-%{tde_datadir}/services/kmplayer_part.desktop
-
-%files base
-%defattr(-,root,root,-)
-%{tde_libdir}/libkmplayercommon.la
-%{tde_libdir}/libkmplayercommon.so
-%{tde_bindir}/kgstplayer
-%{tde_bindir}/kxineplayer
-%{tde_datadir}/config/kmplayerrc
-%{tde_datadir}/apps/kmplayer/bookmarks.xml
-%{tde_datadir}/apps/kmplayer/noise.gif
-%{tde_datadir}/apps/kmplayer/pluginsinfo
-%{tde_datadir}/icons/hicolor/*/apps/kmplayer.png
-%{tde_datadir}/icons/hicolor/*/apps/kmplayer.svgz
-%{tde_datadir}/mimelnk/application/x-kmplayer.desktop
-%{tde_datadir}/mimelnk/video/x-ms-wmp.desktop
-
-%files doc
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/*/kmplayer
-
-%files konq-plugins
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/libkmplayerpart.la
-%{tde_tdelibdir}/libkmplayerpart.so
-%{tde_datadir}/apps/kmplayer/kmplayerpartui.rc
-%{tde_datadir}/apps/kmplayer/pluginsinfo
-%{tde_datadir}/services/kmplayer_part.desktop
-
-
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-8
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.10.0c-1
 - Initial release for TDE 14.0.0
diff --git a/redhat/applications/kmplayer/kmplayer-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/kmplayer/kmplayer-3.5.13-fix_gcc47_compilation.patch
deleted file mode 100644
index 02962e256..000000000
--- a/redhat/applications/kmplayer/kmplayer-3.5.13-fix_gcc47_compilation.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-commit 5106117b5c1439d3fee08395c1a025f62d30a53e
-Author: Darrell Anderson <humanreadable@yahoo.com>
-Date:   1335631986 -0500
-
-    GCC 4.7 fixes.
-
-diff --git a/src/gstplayer.cpp b/src/gstplayer.cpp
-index ebf7b0d..c4bf580 100644
---- a/src/gstplayer.cpp
-+++ b/src/gstplayer.cpp
-@@ -1003,11 +1003,16 @@ int main(int argc, char **argv) {
-     gstapp->exec ();
- 
-     XLockDisplay(display);
--    XClientMessageEvent ev = {
--        ClientMessage, 0, true, display, wid, 
--        XInternAtom (display, "XVIDEO", false), 8, {b: "quit_now"}
--    };
--    XSendEvent (display, wid, false, StructureNotifyMask, (XEvent *) & ev);
-+    XEvent ev;
-+    ev.xclient.type = ClientMessage;
-+    ev.xclient.serial = 0;
-+    ev.xclient.send_event = true;
-+    ev.xclient.display = display;
-+    ev.xclient.window = wid;
-+    ev.xclient.message_type = XInternAtom (display, "XVIDEO", false);
-+    ev.xclient.format = 8;
-+    strcpy(ev.xclient.data.b, "quit_now");
-+    XSendEvent (display, wid, false, StructureNotifyMask, &ev);
-     XFlush (display);
-     XUnlockDisplay(display);
-     eventThread->wait (500);
-diff --git a/src/kmplayerapp.cpp b/src/kmplayerapp.cpp
-index 27b26cd..bdeac91 100644
---- a/src/kmplayerapp.cpp
-+++ b/src/kmplayerapp.cpp
-@@ -17,6 +17,8 @@
- 
- #undef Always
- 
-+#include <unistd.h>
-+
- // include files for QT
- #include <tqdatastream.h>
- #include <tqregexp.h>
diff --git a/redhat/applications/kmplayer/kmplayer-3.5.13-missing_ldflags.patch b/redhat/applications/kmplayer/kmplayer-3.5.13-missing_ldflags.patch
deleted file mode 100644
index ba6c16cb9..000000000
--- a/redhat/applications/kmplayer/kmplayer-3.5.13-missing_ldflags.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- kmplayer/src/Makefile.am.ORI	2012-08-05 17:09:59.963896862 +0200
-+++ kmplayer/src/Makefile.am	2012-08-05 17:10:16.667563785 +0200
-@@ -6,7 +6,7 @@
- 
- libkmplayercommon_la_SOURCES = viewarea.cpp kmplayerview.cpp playlistview.cpp kmplayercontrolpanel.cpp kmplayerconfig.cpp pref.cpp kmplayerprocess.cpp kmplayer_callback.skel kmplayer_backend.stub kmplayerpartbase.cpp kmplayerplaylist.cpp kmplayer_asx.cpp kmplayer_smil.cpp kmplayer_rp.cpp kmplayer_rss.cpp kmplayer_atom.cpp kmplayer_xspf.cpp triestring.cpp kmplayerpartbase.skel
- libkmplayercommon_la_LDFLAGS = -avoid-version $(all_libraries)
--libkmplayercommon_la_LIBADD = -lkmediaplayer $(LIB_KPARTS) $(LIB_KUTILS) $(LIB_EXPAT) -lm $(LIBCAIRO_LIBS) $(LIBQTDBUS)
-+libkmplayercommon_la_LIBADD = -lkmediaplayer $(LIB_KPARTS) $(LIB_KUTILS) $(LIB_EXPAT) -lm $(LIBCAIRO_LIBS) $(LIBQTDBUS) $(LIB_QT) -lDCOP $(LIB_KDECORE) -lkdefx $(LIB_KDEUI) $(LIB_KIO)
- 
- if include_koffice_support
- kofficeplugin_lib= libkmplayerkofficepart.la
---- kmplayer/src/Makefile.am.ORI	2011-12-03 23:22:01.601981533 +0100
-+++ kmplayer/src/Makefile.am	2011-12-03 23:22:44.469655046 +0100
-@@ -58,6 +58,7 @@
- kgstplayer_SOURCES= gstplayer.cpp
- 
- knpplayer_LDADD= $(LIBNSPR_LIBS)
-+knpplayer_LDFLAGS= -lX11 -lgmodule-2.0
- knpplayer_SOURCES= npplayer.c
- 
- xdg_apps_DATA = kmplayer.desktop
diff --git a/redhat/applications/kmplayer/kmplayer-3.5.13.1-fix_xine12_support.patch b/redhat/applications/kmplayer/kmplayer-3.5.13.1-fix_xine12_support.patch
deleted file mode 100644
index 1dd604c1a..000000000
--- a/redhat/applications/kmplayer/kmplayer-3.5.13.1-fix_xine12_support.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-Index: b/src/xineplayer.cpp
-===================================================================
---- a/src/xineplayer.cpp	2012-10-30 18:39:16.000000000 +0000
-+++ b/src/xineplayer.cpp	2012-11-03 17:56:01.760234144 +0000
-@@ -528,7 +528,11 @@
-     xine_event_create_listener_thread (event_queue, event_listener, NULL);
-     if (mrl == "cdda:/") {
-         int nr;
-+#if XINE_MAJOR_VERSION > 1 || ( XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION >= 2 )
-+        const char * const* mrls = xine_get_autoplay_mrls (xine, "CD", &nr);
-+#else
-         char ** mrls = xine_get_autoplay_mrls (xine, "CD", &nr);
-+#endif
-         running = 1;
-         for (int i = 0; i < nr; i++) {
-             TQString m (mrls[i]);
-@@ -863,10 +867,10 @@
-                             case XK_p: // previous
-                                 mutex.lock ();
-                                 if (stream) {
--                                    xine_event_t xine_event =  { 
--                                        XINE_EVENT_INPUT_PREVIOUS,
--                                        stream, 0L, 0, { 0, 0 }
--                                    };
-+                                    xine_event_t xine_event;
-+                                    memset(&xine_event, 0, sizeof(xine_event));
-+                                    xine_event.type = XINE_EVENT_INPUT_PREVIOUS;
-+                                    xine_event.stream = stream;
-                                     xine_event_send (stream, &xine_event);
-                                 } 
-                                 mutex.unlock ();
-@@ -875,10 +879,10 @@
-                             case XK_n: // next
-                                 mutex.lock ();
-                                 if (stream) {
--                                    xine_event_t xine_event =  { 
--                                        XINE_EVENT_INPUT_NEXT,
--                                        stream, 0L, 0, { 0, 0 }
--                                    };
-+                                    xine_event_t xine_event;
-+                                    memset(&xine_event, 0, sizeof(xine_event));
-+                                    xine_event.type = XINE_EVENT_INPUT_NEXT;
-+                                    xine_event.stream = stream;
-                                     xine_event_send (stream, &xine_event);
-                                 } 
-                                 mutex.unlock ();
-@@ -887,10 +891,10 @@
-                             case XK_u: // up menu
-                                 mutex.lock ();
-                                 if (stream) {
--                                    xine_event_t xine_event =  { 
--                                        XINE_EVENT_INPUT_MENU1,
--                                        stream, 0L, 0, { 0, 0 }
--                                    };
-+                                    xine_event_t xine_event;
-+                                    memset(&xine_event, 0, sizeof(xine_event));
-+                                    xine_event.type = XINE_EVENT_INPUT_MENU1;
-+                                    xine_event.stream = stream;
-                                     xine_event_send (stream, &xine_event);
-                                 } 
-                                 mutex.unlock ();
-@@ -899,10 +903,10 @@
-                             case XK_r: // root menu
-                                 mutex.lock ();
-                                 if (stream) {
--                                    xine_event_t xine_event =  { 
--                                        XINE_EVENT_INPUT_MENU3,
--                                        stream, 0L, 0, { 0, 0 }
--                                    };
-+                                    xine_event_t xine_event;
-+                                    memset(&xine_event, 0, sizeof(xine_event));
-+                                    xine_event.type = XINE_EVENT_INPUT_MENU3;
-+                                    xine_event.stream = stream;
-                                     xine_event_send (stream, &xine_event);
-                                 } 
-                                 mutex.unlock ();
-@@ -985,11 +989,12 @@
-                         data.x = rect.x;
-                         data.y = rect.y;
-                         data.button = 0;
--                        xine_event_t xine_event =  { 
--                                XINE_EVENT_INPUT_MOUSE_MOVE,
--                                stream, &data, sizeof (xine_input_data_t),
--                                { 0 , 0 }
--                        };
-+                        xine_event_t xine_event;
-+                        memset(&xine_event, 0, sizeof(xine_event));
-+                        xine_event.type = XINE_EVENT_INPUT_MOUSE_MOVE;
-+                        xine_event.stream = stream;
-+                        xine_event.data = &data;
-+                        xine_event.data_length = sizeof (xine_input_data_t);
-                         mutex.lock ();
-                         xine_event_send (stream, &xine_event);
-                         mutex.unlock ();
-@@ -1023,11 +1028,12 @@
-                         data.x = rect.x;
-                         data.y = rect.y;
-                         data.button = 1;
--                        xine_event_t xine_event =  { 
--                                XINE_EVENT_INPUT_MOUSE_BUTTON,
--                                stream, &data, sizeof (xine_input_data_t),
--                                { 0, 0 }
--                        };
-+                        xine_event_t xine_event;
-+                        memset(&xine_event, 0, sizeof(xine_event));
-+                        xine_event.type = XINE_EVENT_INPUT_MOUSE_BUTTON;
-+                        xine_event.stream = stream;
-+                        xine_event.data = &data;
-+                        xine_event.data_length = sizeof (xine_input_data_t);
-                         mutex.lock ();
-                         xine_event_send (stream, &xine_event);
-                         mutex.unlock ();
diff --git a/redhat/applications/kmplayer/kmplayer-3.5.13.1.spec b/redhat/applications/kmplayer/kmplayer-3.5.13.1.spec
deleted file mode 100644
index e01ee9a36..000000000
--- a/redhat/applications/kmplayer/kmplayer-3.5.13.1.spec
+++ /dev/null
@@ -1,247 +0,0 @@
-# Default version for this component
-%define kdecomp kmplayer
-
-# 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
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/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-%{kdecomp}
-Summary:	media player for Trinity
-Version:	0.10.0c
-Release:	4%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Multimedia
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://kmplayer.kde.org
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-# [kmplayer] Fix xine 1.2 support
-Patch1:		kmplayer-3.5.13.1-fix_xine12_support.patch
-
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-dbus-tqt-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}gstreamer0.10-devel
-BuildRequires:	%{_lib}gstreamer-plugins-base0.10-devel
-BuildRequires:	libxv-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires:	gstreamer-devel
-BuildRequires:	gstreamer-plugins-base-devel
-BuildRequires:	libXv-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:	gstreamer-devel
-BuildRequires:	gstreamer-0_10-plugins-base-devel
-BuildRequires:	libXv-devel
-%endif
-
-Requires:	%{name}-base
-
-%description
-A basic audio/video viewer application for Trinity.
-
-KMPlayer can:
-* play DVD (DVDNav only with the Xine player)
-* play VCD
-* let the backend players play from a pipe (read from stdin)
-* play from a TV device (experimental)
-* show backend player's console output
-* launch ffserver (only 0.4.8 works) when viewing from a v4l device
-* DCOP KMediaPlayer interface support
-* VDR viewer frontend (with *kxvplayer), configure VDR keys with standard KDE
-  shortcut configure window
-* Lots of configurable shortcuts. Highly recommended for the VDR keys
-  (if you have VDR) and volume increase/decrease
-
-
-%package base
-Group:			Applications/Multimedia
-Summary:		Base files for KMPlayer [Trinity]
-
-%description base
-Core files needed for KMPlayer.
-
-
-%package konq-plugins
-Group:			Applications/Multimedia
-Requires:		trinity-kmplayer-base, trinity-kdebase
-Summary:		KMPlayer plugin for KHTML/Konqueror [Trinity]
-
-%description konq-plugins
-This plugin enables audio/video playback inside konqueror, using Xine (with
-*kxineplayer) or GStreamer (with *kgstplayer), such as movie trailers, web
-tv or radio. It mimics QuickTime, MS Media Player and RealPlayer plugin
-browser plugins.
-
-
-%package doc
-Group:			Applications/Multimedia
-Requires:		%{name} = %{version}-%{release}
-Summary:		Handbook for KMPlayer [Trinity]
-
-%description doc
-Documention for KMPlayer, a basic audio/video viewer application for KDE.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-%patch1 -p1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt:%{tde_includedir}/dbus-1.0 \
-  --enable-closure
-
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-# Removes unwanted files
-%__rm -f %{?buildroot}%{tde_datadir}/mimelnk/application/x-mplayer2.desktop
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-%post base
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-/sbin/ldconfig || :
-
-%postun base
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-/sbin/ldconfig || :
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog INSTALL README TODO kmplayer.lsm
-%{tde_bindir}/kmplayer
-%{tde_bindir}/knpplayer
-%{tde_bindir}/kxvplayer
-%{tde_libdir}/libkdeinit_kmplayer.la
-%{tde_libdir}/libkdeinit_kmplayer.so
-%{tde_tdelibdir}/kmplayer.la
-%{tde_tdelibdir}/kmplayer.so
-%{tde_tdeappdir}/kmplayer.desktop
-%{tde_datadir}/apps/kmplayer
-%{tde_datadir}/services/kmplayer_part.desktop
-
-%files base
-%defattr(-,root,root,-)
-%{tde_libdir}/libkmplayercommon.la
-%{tde_libdir}/libkmplayercommon.so
-%{tde_bindir}/kgstplayer
-%{tde_bindir}/kxineplayer
-%{tde_datadir}/config/kmplayerrc
-%{tde_datadir}/apps/kmplayer/bookmarks.xml
-%{tde_datadir}/apps/kmplayer/noise.gif
-%{tde_datadir}/apps/kmplayer/pluginsinfo
-%{tde_datadir}/icons/hicolor/*/apps/kmplayer.png
-%{tde_datadir}/icons/hicolor/*/apps/kmplayer.svgz
-%{tde_datadir}/mimelnk/application/x-kmplayer.desktop
-%{tde_datadir}/mimelnk/video/x-ms-wmp.desktop
-
-
-%files doc
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/*/kmplayer
-
-%files konq-plugins
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/libkmplayerpart.la
-%{tde_tdelibdir}/libkmplayerpart.so
-%{tde_datadir}/apps/kmplayer/kmplayerpartui.rc
-%{tde_datadir}/apps/kmplayer/pluginsinfo
-%{tde_datadir}/services/kmplayer_part.desktop
-
-
-%changelog
-* Sat Nov 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-4
-- Fix xine 1.2 support (openSUSE 12.2 only)
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-3
-- Initial release for TDE 3.5.13.1
-
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-2
-- Fix compilation with GCC 4.7 [Commit #5106117b]
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/kmplayer/kmplayer-3.5.13.spec b/redhat/applications/kmplayer/kmplayer-3.5.13.spec
deleted file mode 100644
index 47248bc5d..000000000
--- a/redhat/applications/kmplayer/kmplayer-3.5.13.spec
+++ /dev/null
@@ -1,232 +0,0 @@
-# Default version for this component
-%define kdecomp kmplayer
-
-# 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
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	media player for Trinity
-Version:	0.10.0c
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Multimedia
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://kmplayer.kde.org
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-# [kmplayer] Fix compilation with GCC 4.7 [Commit #5106117b]
-Patch1:		kmplayer-3.5.13-fix_gcc47_compilation.patch
-
-# [kmplayer] Missing LDLFLAGS cause FTBFS
-Patch2:		kmplayer-3.5.13-missing_ldflags.patch
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-
-BuildRequires:	dbus-tqt-devel
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}gstreamer0.10-devel
-BuildRequires:	%{_lib}gstreamer-plugins-base0.10-devel
-BuildRequires:	libxv-devel
-%else
-BuildRequires:	gstreamer-devel
-BuildRequires:	gstreamer-plugins-base-devel
-BuildRequires:	libXv-devel
-%endif
-
-Requires:	%{name}-base
-
-%description
-A basic audio/video viewer application for Trinity.
-
-KMPlayer can:
-* play DVD (DVDNav only with the Xine player)
-* play VCD
-* let the backend players play from a pipe (read from stdin)
-* play from a TV device (experimental)
-* show backend player's console output
-* launch ffserver (only 0.4.8 works) when viewing from a v4l device
-* DCOP KMediaPlayer interface support
-* VDR viewer frontend (with *kxvplayer), configure VDR keys with standard KDE
-  shortcut configure window
-* Lots of configurable shortcuts. Highly recommended for the VDR keys
-  (if you have VDR) and volume increase/decrease
-
-
-%package base
-Group:			Applications/Multimedia
-Summary:		Base files for KMPlayer [Trinity]
-
-%description base
-Core files needed for KMPlayer.
-
-
-%package konq-plugins
-Group:			Applications/Multimedia
-Requires:		trinity-kmplayer-base, trinity-kdebase
-Summary:		KMPlayer plugin for KHTML/Konqueror [Trinity]
-
-%description konq-plugins
-This plugin enables audio/video playback inside konqueror, using Xine (with
-*kxineplayer) or GStreamer (with *kgstplayer), such as movie trailers, web
-tv or radio. It mimics QuickTime, MS Media Player and RealPlayer plugin
-browser plugins.
-
-
-%package doc
-Group:			Applications/Multimedia
-Requires:		%{name} = %{version}-%{release}
-Summary:		Handbook for KMPlayer [Trinity]
-
-%description doc
-Documention for KMPlayer, a basic audio/video viewer application for KDE.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%patch1 -p1
-%patch2 -p1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt:%{tde_includedir}/dbus-1.0 \
-  --enable-closure
-
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-# Removes unwanted files
-%__rm -f %{?buildroot}%{tde_datadir}/mimelnk/application/x-mplayer2.desktop
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-%post base
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-/sbin/ldconfig || :
-
-%postun base
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-/sbin/ldconfig || :
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog INSTALL README TODO kmplayer.lsm
-%{tde_bindir}/kmplayer
-%{tde_bindir}/knpplayer
-%{tde_bindir}/kxvplayer
-%{tde_libdir}/libkdeinit_kmplayer.la
-%{tde_libdir}/libkdeinit_kmplayer.so
-%{tde_tdelibdir}/kmplayer.la
-%{tde_tdelibdir}/kmplayer.so
-%{tde_tdeappdir}/kmplayer.desktop
-%{tde_datadir}/apps/kmplayer
-%{tde_datadir}/services/kmplayer_part.desktop
-
-%files base
-%defattr(-,root,root,-)
-%{tde_libdir}/libkmplayercommon.la
-%{tde_libdir}/libkmplayercommon.so
-%{tde_bindir}/kgstplayer
-%{tde_bindir}/kxineplayer
-%{tde_datadir}/config/kmplayerrc
-%{tde_datadir}/apps/kmplayer/bookmarks.xml
-%{tde_datadir}/apps/kmplayer/noise.gif
-%{tde_datadir}/apps/kmplayer/pluginsinfo
-%{tde_datadir}/icons/hicolor/*/apps/kmplayer.png
-%{tde_datadir}/icons/hicolor/*/apps/kmplayer.svgz
-%{tde_datadir}/mimelnk/application/x-kmplayer.desktop
-%{tde_datadir}/mimelnk/video/x-ms-wmp.desktop
-
-
-%files doc
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/*/kmplayer
-
-%files konq-plugins
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/libkmplayerpart.la
-%{tde_tdelibdir}/libkmplayerpart.so
-%{tde_datadir}/apps/kmplayer/kmplayerpartui.rc
-%{tde_datadir}/apps/kmplayer/pluginsinfo
-%{tde_datadir}/services/kmplayer_part.desktop
-
-
-%Changelog
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-2
-- Fix compilation with GCC 4.7 [Commit #5106117b]
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec b/redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec
index 2b74b4528..ddb5d72a0 100644
--- a/redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec
+++ b/redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec
@@ -1,52 +1,78 @@
-# Default version for this component
-%define tde_pkg kmyfirewall
+#
+# spec file for package kmyfirewall (version R14.0.0)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# TDE variables
+%define tde_epoch 2
 %define tde_version 14.0.0
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE specific building variables
+%define tde_pkg kmyfirewall
+%define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
 %define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/tde
+%define tde_tdeappdir %{tde_datadir}/applications/tde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
-%define _docdir %{tde_docdir}
 
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	1.1.1
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary:	Iptables based firewall configuration tool for TDE
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org/
 
-Name:			trinity-%{tde_pkg}
-Summary:		iptables based firewall configuration tool for TDE [Trinity]
-Version:		1.1.1
-Release:		%{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
-
-License:		GPLv2+
-Group:			Applications/Utilities
+%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 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}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
+BuildRequires:	autoconf automake libtool m4
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	libtool
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
 
 %description
 KMyFirewall attempts to make it easier to setup iptables based firewalls on
@@ -60,63 +86,8 @@ configure your rule set one time and then you can use it on several computers
 giving each of them a similar configuration (p.e. school networks, office,
 university etc.)
 
-%package devel
-Summary:		Development files for %{name}
-Group:			Development/Libraries
-Requires:		%{name} = %{version}-%{release}
-
-%description devel
-%{summary}
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
-
-%__make %{?_smp_mflags}
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
 %post
-update-desktop-database %{tde_appdir} > /dev/null
+update-desktop-database %{tde_tdeappdir} > /dev/null
 for f in hicolor locolor; do
   touch --no-create %{tde_datadir}/icons/${f} || :
   gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
@@ -124,14 +95,13 @@ done
 /sbin/ldconfig || :
 
 %postun
-update-desktop-database %{tde_appdir} > /dev/null
+update-desktop-database %{tde_tdeappdir} > /dev/null
 for f in hicolor locolor; do
   touch --no-create %{tde_datadir}/icons/${f} || :
   gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
 done
 /sbin/ldconfig || :
 
-
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING COPYING-DOCS README TODO
@@ -173,10 +143,10 @@ done
 %{tde_tdelibdir}/libkmfruletargetoptionedit_tos.la
 %{tde_tdelibdir}/libkmfruletargetoptionedit_tos.so
 %{tde_tdeappdir}/kmyfirewall.desktop
-%{tde_datadir}/apps/kmfgenericinterfacepart/kmfgenericinterfacepartui.rc
-%{tde_datadir}/apps/kmfipteditorpart/kmfipteditorpartui.rc
-%{tde_datadir}/apps/kmfsystray
-%{tde_datadir}/apps/kmyfirewall
+%{tde_datadir}/apps/kmfgenericinterfacepart/
+%{tde_datadir}/apps/kmfipteditorpart/
+%{tde_datadir}/apps/kmfsystray/
+%{tde_datadir}/apps/kmyfirewall/
 %{tde_datadir}/config.kcfg/kmfconfig.kcfg
 %{tde_datadir}/config/kmyfirewallrc
 %{tde_tdedocdir}/HTML/en/kmyfirewall/
@@ -189,6 +159,16 @@ done
 %{tde_datadir}/services/kmf*.desktop
 %{tde_datadir}/servicetypes/kmf*.desktop
 
+##########
+
+%package devel
+Summary:		Development files for %{name}
+Group:			Development/Libraries
+Requires:		%{name} = %{version}-%{release}
+
+%description devel
+%{summary}
+
 %files devel
 %{tde_tdeincludedir}/kmyfirewall
 %{tde_libdir}/libkmfcore.la
@@ -196,6 +176,62 @@ done
 %{tde_libdir}/libkmfwidgets.la
 %{tde_libdir}/libkmfwidgets.so
 
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+
+%configure \
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --includedir=%{tde_tdeincludedir} \
+  \
+  --disable-dependency-tracking \
+  --disable-debug \
+  --enable-new-ldflags \
+  --enable-final \
+  --enable-closure \
+  --enable-rpath \
+  --disable-gcc-hidden-visibility
+
+%__make %{?_smp_mflags}
+
+
+%install
+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 "%{tde_pkg}" System Network
+%endif
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.1.1-6
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:1.1.1-1
 - Initial release for TDE 14.0.0
diff --git a/redhat/applications/kmyfirewall/kmyfirewall-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/kmyfirewall/kmyfirewall-3.5.13-fix_gcc47_compilation.patch
deleted file mode 100644
index 4daf67e9b..000000000
--- a/redhat/applications/kmyfirewall/kmyfirewall-3.5.13-fix_gcc47_compilation.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- ./kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp.orig	2012-05-02 04:58:04.051212974 -0400
-+++ ./kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp	2012-05-02 05:07:11.093803088 -0400
-@@ -305,14 +305,15 @@
- 	if ( m_zone && ! m_host ) {
- 		if ( onOff ) {
- 			m_protocolUsage = 0;
--			if ( KMFProtocolUsage* pro = m_zone->findProtocolUsageByProtocolUuid( protUsage->protocol()->uuid() ) ) {
-+			KMFProtocolUsage* pro;
-+			if ( pro = m_zone->findProtocolUsageByProtocolUuid( protUsage->protocol()->uuid() ) ) {
- 				m_protocolUsage = pro;
- 			} else { 
- 					KMFUndoEngine::instance()->startTransaction(
- 					m_zone,
- 					i18n("Add protocol %1 to zone %2.").tqarg( protUsage->protocol()->name() ).tqarg( m_zone->guiName() )
- 					);
--					KMFProtocolUsage * pro = m_zone->addProtocolUsage( protUsage->protocol()->uuid(), protUsage->protocol()->getDOMTree() );
-+					pro = m_zone->addProtocolUsage( protUsage->protocol()->uuid(), protUsage->protocol()->getDOMTree() );
- 			
- 				if ( pro ) {
- 					kdDebug() << "Added Protocol to zone: " << m_zone-> name()  << endl;
-@@ -341,15 +342,16 @@
- 	} else if ( m_host ) {
- 		if ( onOff ) {
- 			m_protocolUsage = 0;
-+			KMFProtocolUsage* pro;
- 			
--				if ( KMFProtocolUsage* pro = m_host->findProtocolUsageByProtocolUuid( protUsage->protocol()->uuid() ) ) {
-+				if ( pro = m_host->findProtocolUsageByProtocolUuid( protUsage->protocol()->uuid() ) ) {
- 				m_protocolUsage = pro;
- 			} else {
- 				KMFUndoEngine::instance()->startTransaction(
- 					m_host,
- 					i18n("Add protocol %1 to host %2.").tqarg( protUsage->protocol()->name() ).tqarg( m_host->guiName() )
- 					);
--					KMFProtocolUsage * pro = m_host->addProtocolUsage( protUsage->protocol()->uuid(), protUsage->protocol() ->getDOMTree() );
-+					pro = m_host->addProtocolUsage( protUsage->protocol()->uuid(), protUsage->protocol() ->getDOMTree() );
- 			
- 				if ( pro ) {
- 					kdDebug() << "Added Protocol to host: " << m_host-> name()  << endl;
diff --git a/redhat/applications/kmyfirewall/kmyfirewall-3.5.13-missing_ldflags.patch b/redhat/applications/kmyfirewall/kmyfirewall-3.5.13-missing_ldflags.patch
deleted file mode 100644
index f2d236faa..000000000
--- a/redhat/applications/kmyfirewall/kmyfirewall-3.5.13-missing_ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kmyfirewall/kmyfirewall/core/Makefile.am.ROI	2012-08-05 17:28:28.006801940 +0200
-+++ kmyfirewall/kmyfirewall/core/Makefile.am	2012-08-05 17:28:40.878545270 +0200
-@@ -53,7 +53,7 @@
- 
- libkmfcoreincludedir = $(includedir)/kmyfirewall/core/
- 
--libkmfcore_la_LIBADD = $(LIB_KPARTS) $(LIB_KIO)
-+libkmfcore_la_LIBADD = $(LIB_KPARTS) $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
- 
- libkmfcoreinclude_HEADERS = ipaddress.h \
- 	iptable.h \
diff --git a/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.1.spec b/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.1.spec
deleted file mode 100644
index 22037de91..000000000
--- a/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.1.spec
+++ /dev/null
@@ -1,208 +0,0 @@
-# Default version for this component
-%define kdecomp kmyfirewall
-
-# 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
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/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-%{kdecomp}
-Summary:	iptables based firewall configuration tool for KDE [Trinity]
-Version:	1.1.1
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires: desktop-file-utils
-
-
-%description
-KMyFirewall attempts to make it easier to setup iptables based firewalls on
-Linux systems. It will be the right tool if you like to have a so called
-"Personal Firewall" running on your Linux box, but don't have the time and/or
-the interest to spend hours in front of the iptables manual just to setup a 
-Firewall that keeps the "bad" people out.
-
-There is also the possibility to save entire rule sets, so you only have to
-configure your rule set one time and then you can use it on several computers
-giving each of them a similar configuration (p.e. school networks, office,
-university etc.)
-
-%package devel
-Summary:		Development files for %{name}
-Group:			Development/Libraries
-Requires:		%{name} = %{version}-%{release}
-
-%description devel
-%{summary}
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure
-
-%__make %{?_smp_mflags}
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-for f in hicolor Locolor; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-for f in hicolor Locolor; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING COPYING-DOCS README TODO
-%{tde_bindir}/kmyfirewall
-%{tde_libdir}/libkmfcore.so.*
-%{tde_libdir}/libkmfwidgets.so.*
-%{tde_tdelibdir}/libkmfcompiler_ipt.la
-%{tde_tdelibdir}/libkmfcompiler_ipt.so
-%{tde_tdelibdir}/libkmfgenericinterfacepart.la
-%{tde_tdelibdir}/libkmfgenericinterfacepart.so
-%{tde_tdelibdir}/libkmfinstaller_linux.la
-%{tde_tdelibdir}/libkmfinstaller_linux.so
-%{tde_tdelibdir}/libkmfinstallerplugin.la
-%{tde_tdelibdir}/libkmfinstallerplugin.so
-%{tde_tdelibdir}/libkmfipteditorpart.la
-%{tde_tdelibdir}/libkmfipteditorpart.so
-%{tde_tdelibdir}/libkmfruleoptionedit_custom.la
-%{tde_tdelibdir}/libkmfruleoptionedit_custom.so
-%{tde_tdelibdir}/libkmfruleoptionedit_interface.la
-%{tde_tdelibdir}/libkmfruleoptionedit_interface.so
-%{tde_tdelibdir}/libkmfruleoptionedit_ip.la
-%{tde_tdelibdir}/libkmfruleoptionedit_ip.so
-%{tde_tdelibdir}/libkmfruleoptionedit_limit.la
-%{tde_tdelibdir}/libkmfruleoptionedit_limit.so
-%{tde_tdelibdir}/libkmfruleoptionedit_mac.la
-%{tde_tdelibdir}/libkmfruleoptionedit_mac.so
-%{tde_tdelibdir}/libkmfruleoptionedit_protocol.la
-%{tde_tdelibdir}/libkmfruleoptionedit_protocol.so
-%{tde_tdelibdir}/libkmfruleoptionedit_state.la
-%{tde_tdelibdir}/libkmfruleoptionedit_state.so
-%{tde_tdelibdir}/libkmfruleoptionedit_tos.la
-%{tde_tdelibdir}/libkmfruleoptionedit_tos.so
-%{tde_tdelibdir}/libkmfruletargetoptionedit_log.la
-%{tde_tdelibdir}/libkmfruletargetoptionedit_log.so
-%{tde_tdelibdir}/libkmfruletargetoptionedit_mark.la
-%{tde_tdelibdir}/libkmfruletargetoptionedit_mark.so
-%{tde_tdelibdir}/libkmfruletargetoptionedit_nat.la
-%{tde_tdelibdir}/libkmfruletargetoptionedit_nat.so
-%{tde_tdelibdir}/libkmfruletargetoptionedit_tos.la
-%{tde_tdelibdir}/libkmfruletargetoptionedit_tos.so
-%{tde_tdeappdir}/kmyfirewall.desktop
-%{tde_datadir}/apps/kmfgenericinterfacepart/kmfgenericinterfacepartui.rc
-%{tde_datadir}/apps/kmfipteditorpart/kmfipteditorpartui.rc
-%{tde_datadir}/apps/kmfsystray
-%{tde_datadir}/apps/kmyfirewall
-%{tde_datadir}/config.kcfg/kmfconfig.kcfg
-%{tde_datadir}/config/kmyfirewallrc
-%{tde_tdedocdir}/HTML/en/kmyfirewall/
-%{tde_datadir}/icons/hicolor/*/apps/kmyfirewall.png
-%{tde_datadir}/icons/Locolor/*/apps/kmyfirewall.png
-%{tde_datadir}/mimelnk/application/kmfgrs.desktop
-%{tde_datadir}/mimelnk/application/kmfnet.desktop
-%{tde_datadir}/mimelnk/application/kmfpkg.desktop
-%{tde_datadir}/mimelnk/application/kmfrs.desktop
-%{tde_datadir}/services/kmf*.desktop
-%{tde_datadir}/servicetypes/kmf*.desktop
-
-%files devel
-%{tde_tdeincludedir}/kmyfirewall
-%{tde_libdir}/libkmfcore.la
-%{tde_libdir}/libkmfcore.so
-%{tde_libdir}/libkmfwidgets.la
-%{tde_libdir}/libkmfwidgets.so
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.1.1-3
-- Initial release for TDE 3.5.13.1
-
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.1.1-2
-- GCC 4.7 fixes. [Commit #88d2d2a7]
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.1.1-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.spec b/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.spec
deleted file mode 100644
index 0414eddca..000000000
--- a/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.spec
+++ /dev/null
@@ -1,207 +0,0 @@
-# Default version for this component
-%define kdecomp kmyfirewall
-
-# 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
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	iptables based firewall configuration tool for KDE [Trinity]
-Version:	1.1.1
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-# [kmyfirewall] GCC 4.7 fixes. [Commit #88d2d2a7]
-Patch1:		kmyfirewall-3.5.13-fix_gcc47_compilation.patch
-# [kmyfirefall] Missing LDFLAGS cause FTBFS
-Patch2:		kmyfirewall-3.5.13-missing_ldflags.patch
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-
-
-%description
-KMyFirewall attempts to make it easier to setup iptables based firewalls on
-Linux systems. It will be the right tool if you like to have a so called
-"Personal Firewall" running on your Linux box, but don't have the time and/or
-the interest to spend hours in front of the iptables manual just to setup a 
-Firewall that keeps the "bad" people out.
-
-There is also the possibility to save entire rule sets, so you only have to
-configure your rule set one time and then you can use it on several computers
-giving each of them a similar configuration (p.e. school networks, office,
-university etc.)
-
-%package devel
-Summary:		Development files for %{name}
-Group:			Development/Libraries
-Requires:		%{name} = %{version}-%{release}
-
-%description devel
-%{summary}
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%patch1 -p1
-%patch2 -p1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure
-
-%__make %{?_smp_mflags}
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-for f in hicolor Locolor; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-for f in hicolor Locolor; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING COPYING-DOCS README TODO
-%{tde_bindir}/kmyfirewall
-%{tde_libdir}/libkmfcore.so.*
-%{tde_libdir}/libkmfwidgets.so.*
-%{tde_tdelibdir}/libkmfcompiler_ipt.la
-%{tde_tdelibdir}/libkmfcompiler_ipt.so
-%{tde_tdelibdir}/libkmfgenericinterfacepart.la
-%{tde_tdelibdir}/libkmfgenericinterfacepart.so
-%{tde_tdelibdir}/libkmfinstaller_linux.la
-%{tde_tdelibdir}/libkmfinstaller_linux.so
-%{tde_tdelibdir}/libkmfinstallerplugin.la
-%{tde_tdelibdir}/libkmfinstallerplugin.so
-%{tde_tdelibdir}/libkmfipteditorpart.la
-%{tde_tdelibdir}/libkmfipteditorpart.so
-%{tde_tdelibdir}/libkmfruleoptionedit_custom.la
-%{tde_tdelibdir}/libkmfruleoptionedit_custom.so
-%{tde_tdelibdir}/libkmfruleoptionedit_interface.la
-%{tde_tdelibdir}/libkmfruleoptionedit_interface.so
-%{tde_tdelibdir}/libkmfruleoptionedit_ip.la
-%{tde_tdelibdir}/libkmfruleoptionedit_ip.so
-%{tde_tdelibdir}/libkmfruleoptionedit_limit.la
-%{tde_tdelibdir}/libkmfruleoptionedit_limit.so
-%{tde_tdelibdir}/libkmfruleoptionedit_mac.la
-%{tde_tdelibdir}/libkmfruleoptionedit_mac.so
-%{tde_tdelibdir}/libkmfruleoptionedit_protocol.la
-%{tde_tdelibdir}/libkmfruleoptionedit_protocol.so
-%{tde_tdelibdir}/libkmfruleoptionedit_state.la
-%{tde_tdelibdir}/libkmfruleoptionedit_state.so
-%{tde_tdelibdir}/libkmfruleoptionedit_tos.la
-%{tde_tdelibdir}/libkmfruleoptionedit_tos.so
-%{tde_tdelibdir}/libkmfruletargetoptionedit_log.la
-%{tde_tdelibdir}/libkmfruletargetoptionedit_log.so
-%{tde_tdelibdir}/libkmfruletargetoptionedit_mark.la
-%{tde_tdelibdir}/libkmfruletargetoptionedit_mark.so
-%{tde_tdelibdir}/libkmfruletargetoptionedit_nat.la
-%{tde_tdelibdir}/libkmfruletargetoptionedit_nat.so
-%{tde_tdelibdir}/libkmfruletargetoptionedit_tos.la
-%{tde_tdelibdir}/libkmfruletargetoptionedit_tos.so
-%{tde_tdeappdir}/kmyfirewall.desktop
-%{tde_datadir}/apps/kmfgenericinterfacepart/kmfgenericinterfacepartui.rc
-%{tde_datadir}/apps/kmfipteditorpart/kmfipteditorpartui.rc
-%{tde_datadir}/apps/kmfsystray
-%{tde_datadir}/apps/kmyfirewall
-%{tde_datadir}/config.kcfg/kmfconfig.kcfg
-%{tde_datadir}/config/kmyfirewallrc
-%{tde_tdedocdir}/HTML/en/kmyfirewall/
-%{tde_datadir}/icons/hicolor/*/apps/kmyfirewall.png
-%{tde_datadir}/icons/Locolor/*/apps/kmyfirewall.png
-%{tde_datadir}/mimelnk/application/kmfgrs.desktop
-%{tde_datadir}/mimelnk/application/kmfnet.desktop
-%{tde_datadir}/mimelnk/application/kmfpkg.desktop
-%{tde_datadir}/mimelnk/application/kmfrs.desktop
-%{tde_datadir}/services/kmf*.desktop
-%{tde_datadir}/servicetypes/kmf*.desktop
-
-%files devel
-%{tde_tdeincludedir}/kmyfirewall
-%{tde_libdir}/libkmfcore.la
-%{tde_libdir}/libkmfcore.so
-%{tde_libdir}/libkmfwidgets.la
-%{tde_libdir}/libkmfwidgets.so
-
-%Changelog
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.1.1-2
-- GCC 4.7 fixes. [Commit #88d2d2a7]
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.1.1-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/kmymoney/23011-qt-sqlite3-0.2.tar.gz b/redhat/applications/kmymoney/23011-qt-sqlite3-0.2.tar.gz
deleted file mode 100644
index 2d81662a6..000000000
--- a/redhat/applications/kmymoney/23011-qt-sqlite3-0.2.tar.gz
+++ /dev/null
diff --git a/redhat/applications/kmymoney/kmymoney-14.0.0.spec b/redhat/applications/kmymoney/kmymoney-14.0.0.spec
index 0a169c4c1..b529c8547 100644
--- a/redhat/applications/kmymoney/kmymoney-14.0.0.spec
+++ b/redhat/applications/kmymoney/kmymoney-14.0.0.spec
@@ -1,57 +1,79 @@
-# Default version for this component
-%define tde_pkg kmymoney
+#
+# spec file for package kmymoney (version R14.0.0)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# TDE variables
+%define tde_epoch 2
 %define tde_version 14.0.0
-
-# Required for Mageia 2: removes the ldflag '--no-undefined'
-%define _disable_ld_no_undefined 1
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE specific building variables
+%define tde_pkg kmymoney
+%define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
 %define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/tde
+%define tde_tdeappdir %{tde_datadir}/applications/tde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
-%define _docdir %{tde_docdir}
-
 
-Name:			trinity-%{tde_pkg}
-Summary:		personal finance manager for TDE
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	1.0.5
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary:	Personal finance manager for TDE
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org/
 
-Version:		1.0.5
-Release:		%{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
-
-License:		GPLv2+
-Group:			Applications/Utilities
+%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 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}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 Source1:		kmymoneytitlelabel.png
 
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
+BuildRequires:	autoconf automake libtool m4
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	libtool
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
 BuildRequires:	recode
 BuildRequires:	libofx-devel
 
@@ -80,12 +102,42 @@ Requires:		libtqt3-mt-sqlite3
 
 Requires:		%{name}-common == %{version}-%{release}
 
+
 %description
 KMyMoney is the Personal Finance Manager for TDE. It operates similar to
 MS-Money and Quicken, supports different account types, categorisation of
 expenses, QIF import/export, multiple currencies and initial online banking
 support.
 
+%post
+update-desktop-database %{tde_tdeappdir} > /dev/null
+/sbin/ldconfig
+for f in hicolor locolor Tango oxygen; do
+  touch --no-create %{tde_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
+done
+
+%postun
+update-desktop-database %{tde_tdeappdir} > /dev/null
+/sbin/ldconfig
+for f in hicolor locolor Tango oxygen; do
+  touch --no-create %{tde_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
+done
+
+%files
+%defattr(-,root,root,-)
+%{tde_bindir}/kmymoney
+%{tde_bindir}/kmymoney2
+%{tde_tdeappdir}/kmymoney2.desktop
+%{tde_datadir}/mimelnk/application/x-kmymoney2.desktop
+%{tde_datadir}/servicetypes/kmymoneyimporterplugin.desktop
+%{tde_datadir}/servicetypes/kmymoneyplugin.desktop
+%{tde_libdir}/*.so.*
+%{tde_tdelibdir}/kmm_ofximport.la
+%{tde_tdelibdir}/kmm_ofximport.so
+
+##########
 
 %package common
 Summary:		KMyMoney architecture independent files
@@ -97,6 +149,28 @@ This package contains architecture independent files needed for KMyMoney to
 run properly. It also provides KMyMoney documentation. Therefore, unless you
 have '%{name}' package installed, you will hardly find this package useful.
 
+%files common -f kmymoney2.lang
+%defattr(-,root,root,-)
+%{tde_datadir}/apps/kmymoney2/
+%{tde_datadir}/config.kcfg/kmymoney2.kcfg
+%{tde_datadir}/icons/hicolor/*/*/*.png
+%dir %{tde_datadir}/icons/Tango/
+%dir %{tde_datadir}/icons/Tango/*/
+%dir %{tde_datadir}/icons/Tango/*/*/
+%{tde_datadir}/icons/Tango/*/*/*.png
+%{tde_datadir}/icons/Tango/scalable/*.svgz
+%{tde_datadir}/icons/locolor/*/*/*.png
+%dir %{tde_datadir}/icons/oxygen/
+%dir %{tde_datadir}/icons/oxygen/*/
+%dir %{tde_datadir}/icons/oxygen/*/*/
+%{tde_datadir}/icons/oxygen/*/*/*.png
+%{tde_datadir}/icons/oxygen/scalable/*.svgz
+%{tde_tdedocdir}/HTML/en/kmymoney2/
+%{tde_mandir}/man1/kmymoney2.*
+%{tde_datadir}/apps/kmm_ofximport/
+%{tde_datadir}/services/kmm_ofximport.desktop
+
+##########
 
 %package devel
 Summary:		KMyMoney development files
@@ -106,11 +180,23 @@ Requires:		%{name} == %{version}-%{release}
 %description devel
 This package contains development files needed for KMyMoney plugins.
 
+%files devel
+%defattr(-,root,root,-)
+%{tde_tdeincludedir}/kmymoney/
+%{tde_libdir}/libkmm_kdchart.la
+%{tde_libdir}/libkmm_mymoney.la
+%{tde_libdir}/libkmm_plugin.la
+%{tde_libdir}/*.so
+%{_libdir}/tqt3/plugins/designer/libkmymoney.so
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
+##########
+
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
@@ -173,66 +259,6 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 
 
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-/sbin/ldconfig
-for f in hicolor locolor Tango oxygen; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-/sbin/ldconfig
-for f in hicolor locolor Tango oxygen; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/kmymoney
-%{tde_bindir}/kmymoney2
-%{tde_tdeappdir}/kmymoney2.desktop
-%{tde_datadir}/mimelnk/application/x-kmymoney2.desktop
-%{tde_datadir}/servicetypes/kmymoneyimporterplugin.desktop
-%{tde_datadir}/servicetypes/kmymoneyplugin.desktop
-%{tde_libdir}/*.so.*
-%{tde_tdelibdir}/kmm_ofximport.la
-%{tde_tdelibdir}/kmm_ofximport.so
-
-%files common -f kmymoney2.lang
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/kmymoney2/html/
-%{tde_datadir}/apps/kmymoney2/icons/*/*/*/*.png
-%{tde_datadir}/apps/kmymoney2/kmymoney2ui.rc
-%{tde_datadir}/apps/kmymoney2/misc/financequote.pl
-%{tde_datadir}/apps/kmymoney2/pics/*.png
-%{tde_datadir}/apps/kmymoney2/templates/*/*.kmt
-%{tde_datadir}/apps/kmymoney2/tips
-%{tde_datadir}/config.kcfg/kmymoney2.kcfg
-%{tde_datadir}/icons/hicolor/*/*/*.png
-%{tde_datadir}/icons/Tango/*/*/*.png
-%{tde_datadir}/icons/Tango/scalable/*.svgz
-%{tde_datadir}/icons/locolor/*/*/*.png
-%{tde_datadir}/icons/oxygen/*/*/*.png
-%{tde_datadir}/icons/oxygen/scalable/*.svgz
-%{tde_tdedocdir}/HTML/en/kmymoney2/
-%{tde_mandir}/man1/kmymoney2.*
-%{tde_datadir}/apps/kmm_ofximport/kmm_ofximport.rc
-%{tde_datadir}/services/kmm_ofximport.desktop
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/kmymoney/*.h
-%{tde_libdir}/libkmm_kdchart.la
-%{tde_libdir}/libkmm_mymoney.la
-%{tde_libdir}/libkmm_plugin.la
-%{tde_libdir}/*.so
-%{_libdir}/tqt3/plugins/designer/libkmymoney.so
-
-
 %changelog
-* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.5-7
+* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 2:1.0.5-1
 - Initial release for TDE 14.0.0
diff --git a/redhat/applications/kmymoney/kmymoney-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/kmymoney/kmymoney-3.5.13-fix_gcc47_compilation.patch
deleted file mode 100644
index f9c6cb62e..000000000
--- a/redhat/applications/kmymoney/kmymoney-3.5.13-fix_gcc47_compilation.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kmymoney/kmymoney2/plugins/ofximport/ofxpartner.cpp.ORI	2012-05-02 05:22:43.788349181 -0400
-+++ kmymoney/kmymoney2/plugins/ofximport/ofxpartner.cpp	2012-05-02 05:23:01.910909490 -0400
-@@ -20,6 +20,8 @@
- #include <config.h>
- #endif
- 
-+#include <unistd.h>
-+
- // ----------------------------------------------------------------------------
- // QT Includes
- 
diff --git a/redhat/applications/kmymoney/kmymoney-3.5.13-lots_of_crash.patch b/redhat/applications/kmymoney/kmymoney-3.5.13-lots_of_crash.patch
deleted file mode 100644
index 83bfec920..000000000
--- a/redhat/applications/kmymoney/kmymoney-3.5.13-lots_of_crash.patch
+++ /dev/null
@@ -1,238 +0,0 @@
-commit 2a54aa58cfe166f48d6f1395cbc6c9bfd5e31bfc
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1326525051 -0600
-
-    Fix a number of crashes
-
-diff --git a/kmymoney2/converter/mymoneyqifprofile.cpp b/kmymoney2/converter/mymoneyqifprofile.cpp
-index 52ef770..880b1c2 100644
---- a/kmymoney2/converter/mymoneyqifprofile.cpp
-+++ b/kmymoney2/converter/mymoneyqifprofile.cpp
-@@ -769,7 +769,7 @@ TQString MyMoneyQifProfile::inputDateFormat(void) const
-   possibleDateFormats(list);
-   if(list.count() == 1)
-     return list.first();
--  return TQString();
-+  return TQString::null;
- }
- 
- void MyMoneyQifProfile::possibleDateFormats(TQStringList& list) const
-diff --git a/kmymoney2/converter/mymoneyqifreader.cpp b/kmymoney2/converter/mymoneyqifreader.cpp
-index 9390429..a974e8f 100644
---- a/kmymoney2/converter/mymoneyqifreader.cpp
-+++ b/kmymoney2/converter/mymoneyqifreader.cpp
-@@ -714,7 +714,7 @@ const TQString MyMoneyQifReader::extractLine(const TQChar id, int cnt)
-     }
-   }
-   m_extractedLine = -1;
--  return TQString();
-+  return TQString::null;
- }
- 
- void MyMoneyQifReader::extractSplits(TQValueList<qSplit>& listqSplits) const
-diff --git a/kmymoney2/dialogs/kcategoryreassigndlg.cpp b/kmymoney2/dialogs/kcategoryreassigndlg.cpp
-index 4de99f6..beb8e98 100644
---- a/kmymoney2/dialogs/kcategoryreassigndlg.cpp
-+++ b/kmymoney2/dialogs/kcategoryreassigndlg.cpp
-@@ -53,7 +53,7 @@ KCategoryReassignDlg::~KCategoryReassignDlg()
- TQString KCategoryReassignDlg::show(const MyMoneyAccount& category)
- {
-   if (category.id().isEmpty())
--   return TQString(); // no payee available? nothing can be selected...
-+   return TQString::null; // no payee available? nothing can be selected...
- 
-   AccountSet set;
-   set.addAccountGroup(MyMoneyAccount::Income);
-@@ -79,12 +79,12 @@ TQString KCategoryReassignDlg::show(const MyMoneyAccount& category)
-   // if there is no category for reassignment left, we bail out
-   if(list.isEmpty()) {
-     KMessageBox::sorry(this, TQString("<qt>")+i18n("At least one transaction/schedule still references the category <b>%1</b>.  However, at least one category with the same currency must exist so that the transactions/schedules can be reassigned.").tqarg(category.name())+TQString("</qt>"));
--    return TQString();
-+    return TQString::null;
-   }
- 
-   // execute dialog and if aborted, return empty string
-   if (this->exec() == TQDialog::Rejected)
--    return TQString();
-+    return TQString::null;
- 
-   // otherwise return index of selected payee
-   return m_category->selectedItem();
-diff --git a/kmymoney2/dialogs/knewloanwizard.cpp b/kmymoney2/dialogs/knewloanwizard.cpp
-index 884807f..87baaf9 100644
---- a/kmymoney2/dialogs/knewloanwizard.cpp
-+++ b/kmymoney2/dialogs/knewloanwizard.cpp
-@@ -1072,7 +1072,7 @@ int KNewLoanWizard::term(void) const
- TQString KNewLoanWizard::initialPaymentAccount(void) const
- {
-   if(m_dontCreatePayoutCheckBox->isChecked()) {
--    return TQString();
-+    return TQString::null;
-   }
-   return m_assetAccountEdit->selectedItems().first();
- }
-diff --git a/kmymoney2/dialogs/kpayeereassigndlg.cpp b/kmymoney2/dialogs/kpayeereassigndlg.cpp
-index 0c3c0cf..1db13f1 100644
---- a/kmymoney2/dialogs/kpayeereassigndlg.cpp
-+++ b/kmymoney2/dialogs/kpayeereassigndlg.cpp
-@@ -53,13 +53,13 @@ KPayeeReassignDlg::~KPayeeReassignDlg()
- TQString KPayeeReassignDlg::show(const TQValueList<MyMoneyPayee>& payeeslist)
- {
-   if (payeeslist.isEmpty())
--   return TQString(); // no payee available? nothing can be selected...
-+   return TQString::null; // no payee available? nothing can be selected...
- 
-   payeeCombo->loadPayees(payeeslist);
- 
-   // execute dialog and if aborted, return empty string
-   if (this->exec() == TQDialog::Rejected)
--    return TQString();
-+    return TQString::null;
- 
-   // otherwise return index of selected payee
-   return payeeCombo->selectedItem();
-diff --git a/kmymoney2/mymoney/mymoneyaccount.cpp b/kmymoney2/mymoney/mymoneyaccount.cpp
-index 6ef1f9c..c83e834 100644
---- a/kmymoney2/mymoney/mymoneyaccount.cpp
-+++ b/kmymoney2/mymoney/mymoneyaccount.cpp
-@@ -450,7 +450,7 @@ void MyMoneyAccountLoan::setPayee(const TQString& payee)
- 
- const TQString MyMoneyAccountLoan::interestAccountId(void) const
- {
--  return TQString();
-+  return TQString::null;
- }
- 
- void MyMoneyAccountLoan::setInterestAccountId(const TQString& /* id */)
-diff --git a/kmymoney2/mymoney/mymoneyfile.cpp b/kmymoney2/mymoney/mymoneyfile.cpp
-index 4809b28..c59d577 100644
---- a/kmymoney2/mymoney/mymoneyfile.cpp
-+++ b/kmymoney2/mymoney/mymoneyfile.cpp
-@@ -1230,7 +1230,7 @@ TQString MyMoneyFile::locateSubAccount(const MyMoneyAccount& base, const TQStrin
-       return locateSubAccount(nextBase, remainder);
-     }
-   }
--  return TQString();
-+  return TQString::null;
- }
- 
- TQString MyMoneyFile::value(const TQString& key) const
-diff --git a/kmymoney2/mymoney/mymoneykeyvaluecontainer.cpp b/kmymoney2/mymoney/mymoneykeyvaluecontainer.cpp
-index 22fa1ac..cabf772 100644
---- a/kmymoney2/mymoney/mymoneykeyvaluecontainer.cpp
-+++ b/kmymoney2/mymoney/mymoneykeyvaluecontainer.cpp
-@@ -55,7 +55,7 @@ const TQString& MyMoneyKeyValueContainer::value(const TQString& key) const
-   it = m_kvp.find(key);
-   if(it != m_kvp.end())
-     return (*it);
--  return TQString();
-+  return TQString::null;
- }
- 
- void MyMoneyKeyValueContainer::setValue(const TQString& key, const TQString& value)
-diff --git a/kmymoney2/mymoney/mymoneyutils.cpp b/kmymoney2/mymoney/mymoneyutils.cpp
-index 08ffff4..8012200 100644
---- a/kmymoney2/mymoney/mymoneyutils.cpp
-+++ b/kmymoney2/mymoney/mymoneyutils.cpp
-@@ -305,7 +305,7 @@ TQString dateToString(const TQDate& date)
-   if(!date.isNull() && date.isValid())
-     return date.toString(Qt::ISODate);
- 
--  return TQString();
-+  return TQString::null;
- }
- 
- TQDate stringToDate(const TQString& str)
-@@ -323,7 +323,7 @@ TQString TQStringEmpty(const TQString& val)
-   if(!val.isEmpty())
-     return TQString(val);
- 
--  return TQString();
-+  return TQString::null;
- }
- 
- unsigned long extractId(const TQString& txt)
-diff --git a/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp b/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp
-index 084d73c..ec2d4a0 100644
---- a/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp
-+++ b/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp
-@@ -98,14 +98,14 @@ const TQString& KOnlineBankingtqStatus::appId(void) const
- {
-   if(m_appId)
-     return m_appId->appId();
--  return TQString();
-+  return TQString::null;
- }
- 
- TQString KOnlineBankingtqStatus::headerVersion(void) const
- {
-   if(m_headerVersion)
-     return m_headerVersion->headerVersion();
--  return TQString();
-+  return TQString::null;
- }
- 
- #include "konlinebankingstatus.moc"
-diff --git a/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp b/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp
-index 36a05b5..7408a38 100644
---- a/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp
-+++ b/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp
-@@ -125,7 +125,7 @@ const TQString& OfxAppVersion::appId(void) const
-   TQString app = m_combo->currentText();
-   if(m_appMap[app] != defaultAppId)
-     return m_appMap[app];
--  return TQString();
-+  return TQString::null;
- }
- 
- MyMoneyOfxConnector::MyMoneyOfxConnector(const MyMoneyAccount& _account):
-diff --git a/kmymoney2/widgets/kmymoneycombo.cpp b/kmymoney2/widgets/kmymoneycombo.cpp
-index f8b6489..761b537 100644
---- a/kmymoney2/widgets/kmymoneycombo.cpp
-+++ b/kmymoney2/widgets/kmymoneycombo.cpp
-@@ -588,7 +588,7 @@ public:
-         return it.key();
-       }
-     }
--    return TQString();
-+    return TQString::null;
-   }
- };
- 
-diff --git a/kmymoney2/widgets/kmymoneywizard.cpp b/kmymoney2/widgets/kmymoneywizard.cpp
-index ff00c78..f446acf 100644
---- a/kmymoney2/widgets/kmymoneywizard.cpp
-+++ b/kmymoney2/widgets/kmymoneywizard.cpp
-@@ -106,7 +106,7 @@ bool KMyMoneyWizardPage::isComplete(void) const
- 
- const TQString& KMyMoneyWizardPage::helpContext(void) const
- {
--  return TQString();
-+  return TQString::null;
- }
- 
- KMyMoneyWizard::KMyMoneyWizard(TQWidget *parent, const char *name, bool modal, WFlags f) :
-diff --git a/kmymoney2/widgets/registeritem.h b/kmymoney2/widgets/registeritem.h
-index e9c21d3..83b9a04 100644
---- a/kmymoney2/widgets/registeritem.h
-+++ b/kmymoney2/widgets/registeritem.h
-@@ -88,14 +88,14 @@ public:
-   virtual const TQDate& sortPostDate(void) const { return nullDate; }
-   virtual int sortSamePostDate(void) const = 0;
-   virtual const TQDate& sortEntryDate(void) const { return nullDate; }
--  virtual const TQString& sortPayee(void) const { return TQString(); }
-+  virtual const TQString& sortPayee(void) const { return TQString::null; }
-   virtual const MyMoneyMoney& sortValue(void) const { return nullValue; }
--  virtual const TQString& sortNumber(void) const { return TQString(); }
--  virtual const TQString& sortEntryOrder(void) const { return TQString(); }
-+  virtual const TQString& sortNumber(void) const { return TQString::null; }
-+  virtual const TQString& sortEntryOrder(void) const { return TQString::null; }
-   virtual CashFlowDirection sortType(void) const { return Deposit; }
--  virtual const TQString& sortCategory(void) const { return TQString(); }
-+  virtual const TQString& sortCategory(void) const { return TQString::null; }
-   virtual MyMoneySplit::reconcileFlagE sortReconcileState(void) const { return MyMoneySplit::MaxReconcileState; }
--  virtual const TQString& sortSecurity(void) const { return TQString(); }
-+  virtual const TQString& sortSecurity(void) const { return TQString::null; }
- 
-   /**
-     * This method sets the row offset of the item in the register
diff --git a/redhat/applications/kmymoney/kmymoney-3.5.13-recode_ftbfs.patch b/redhat/applications/kmymoney/kmymoney-3.5.13-recode_ftbfs.patch
deleted file mode 100644
index 522329f19..000000000
--- a/redhat/applications/kmymoney/kmymoney-3.5.13-recode_ftbfs.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- kmymoney/doc/en/Makefile.am.ORI	2011-11-26 17:57:22.473298551 +0100
-+++ kmymoney/doc/en/Makefile.am	2011-11-26 17:58:18.611423284 +0100
-@@ -111,7 +111,7 @@
- kmymoney-user.pdf: $(DOCBOOK_FILES) $(SCREENSHOT_FILES)
- 	$(MAKE) get-files
- 	$(MEINPROC) --check --stylesheet `dirname $(KDE_XSL_STYLESHEET)`/kde-nochunk.xsl  $(srcdir)/index.docbook -o index.html;
--	recode utf8..latin1 index.html
-+	recode utf8..latin1 index.html || :
- 	html2ps -o kmymoney-user.ps -n index.html
- 	ps2pdf kmymoney-user.ps kmymoney-user.pdf
- 	rm index.html kmymoney-user.ps
---- kmymoney/developer-doc/phb/Makefile.am.ORI	2011-11-26 12:00:54.708855347 -0500
-+++ kmymoney/developer-doc/phb/Makefile.am	2011-11-26 12:01:01.683692300 -0500
-@@ -106,7 +106,7 @@
- kmymoney-phb.pdf: $(DOCBOOK_FILES)
- 	$(MAKE) get-files
- 	$(MEINPROC) --stylesheet `dirname $(KDE_XSL_STYLESHEET)`/kde-nochunk.xsl $(srcdir)/phb.docbook -o index.html
--	recode utf8..latin1 index.html
-+	recode utf8..latin1 index.html || :
- 	html2ps -o kmymoney-phb.ps -n index.html
- 	ps2pdf kmymoney-phb.ps kmymoney-phb.pdf
- 	rm index.html kmymoney-phb.ps
diff --git a/redhat/applications/kmymoney/kmymoney-3.5.13-update_to_1.0.5.patch b/redhat/applications/kmymoney/kmymoney-3.5.13-update_to_1.0.5.patch
deleted file mode 100644
index 7aefe2026..000000000
--- a/redhat/applications/kmymoney/kmymoney-3.5.13-update_to_1.0.5.patch
+++ /dev/null
@@ -1,264 +0,0 @@
-commit 8654cea10f6902719006d5975db7dc07b2fcc713
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1326571732 -0600
-
-    Update to upstream stable version 1.0.5
-
-diff --git a/ChangeLog b/ChangeLog
-index d250496..c996acb 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,7 +1,40 @@
- 
-+2010-05-15 Thomas Baumgart <ipwizard@users.sourceforge.net>
-+  * Released 1.0.5
-+
-+2010-05-12 Thomas Baumgart <ipwizard@users.sourceforge.net>
-+  * Fixed the way to calculate balance variation for the linear regression
-+    forecast method (backported from KDE4)
-+
-+2010-05-09 Alvaro Soliverez <asoliverez@gmail.com>
-+  * Fixed a crash when a budget selected for a report is no longer present
-+
-+2010-05-04 Thomas Baumgart <ipwizard@users.sourceforge.net>
-+  * replace all new line characters because we only have one line
-+    available for the displayed data (backported from KDE4)
-+  * Don't allow import of investment transactions that don't have a share
-+    amount. This used to end in a div by zero when calculating the price.
-+    (Backported from KDE4)
-+
-+2010-05-03 Alvaro Soliverez <asoliverez@gmail.com>
-+  * Add all overdue schedules when calculating forecast
-+  * Do not show accounts of institutions if it has been selected
-+    in the general settings to Do not show closed accounts
-+  * Do not show an institution if it has no visible accounts and
-+    it has been selected to not show closed accounts
-+
-+2010-04-20 Thomas Baumgart <ipwizard@users.sourceforge.net>
-+  * Backported fix from Ian Neal to solve problems when opening the ledger
-+    with specific scheduled transactions
-+
-+2010-04-03 Alvaro Soliverez <asoliverez@gmail.com>
-+  * Fixed loop in payments of the home page when a schedule is set to
-+    end by date
-+
- 2010-03-30 Thomas Baumgart <ipwizard@users.sourceforge.net>
-   * Backported encoding patch from KDE4 version
-   * Bumped version number
-+  * Released 1.0.4
- 
- 2010-03-29 Thomas Baumgart <ipwizard@users.sourceforge.net>
-   * Updated Finnish translation by Mikael Kujanpaa
-diff --git a/configure.in b/configure.in
-index 8a6c1b8..1a8dd02 100644
---- a/configure.in
-+++ b/configure.in
-@@ -40,7 +40,7 @@ dnl Perform program name transformation
- AC_ARG_PROGRAM
- 
- dnl Automake doc recommends to do this only here. (Janos)
--AM_INIT_AUTOMAKE(kmymoney2, 1.0.4) dnl searches for some needed programs
-+AM_INIT_AUTOMAKE(kmymoney2, 1.0.5) dnl searches for some needed programs
- 
- KDE_SET_PREFIX
- 
-diff --git a/configure.in.in b/configure.in.in
-index 3f82103..a90f40f 100644
---- a/configure.in.in
-+++ b/configure.in.in
-@@ -1,6 +1,6 @@
- #MIN_CONFIG(3.3.1)
- 
--AM_INIT_AUTOMAKE(kmymoney2,1.0.4)
-+AM_INIT_AUTOMAKE(kmymoney2,1.0.5)
- 
- KDE_ENABLE_HIDDEN_VISIBILITY
- 
-diff --git a/kmymoney2/converter/mymoneystatementreader.cpp b/kmymoney2/converter/mymoneystatementreader.cpp
-index 6756767..c08dcff 100644
---- a/kmymoney2/converter/mymoneystatementreader.cpp
-+++ b/kmymoney2/converter/mymoneystatementreader.cpp
-@@ -664,6 +664,10 @@ void MyMoneyStatementReader::processTransactionEntry(const MyMoneyStatement::Tra
-       if(!t_in.m_price.isZero()) {
-         s1.setPrice(t_in.m_price);
-       } else {
-+        if(t_in.m_shares.isZero()) {
-+          KMessageBox::information(0, i18n("This imported statement contains investment transactions with no share amount.  These transactions will be ignored."), i18n("No share amount provided"), TQString("BlankAmount"));
-+          return;
-+        }
-         s1.setPrice(((t_in.m_amount - t_in.m_fees) / t_in.m_shares).convert(MyMoneyMoney::precToDenom(KMyMoneyGlobalSettings::pricePrecision())));
-       }
- 
-diff --git a/kmymoney2/mymoney/mymoneyforecast.cpp b/kmymoney2/mymoney/mymoneyforecast.cpp
-index bfecce0..c1c88c7 100644
---- a/kmymoney2/mymoney/mymoneyforecast.cpp
-+++ b/kmymoney2/mymoney/mymoneyforecast.cpp
-@@ -651,7 +651,7 @@ void MyMoneyForecast::addScheduledTransactions (void)
-   TQValueList<MyMoneySchedule> schedule;
- 
-   schedule = file->scheduleList("", MyMoneySchedule::TYPE_ANY, MyMoneySchedule::OCCUR_ANY, MyMoneySchedule::STYPE_ANY,
--                                TQDate::tqcurrentDate(), forecastEndDate());
-+                                TQDate(), forecastEndDate());
-   if(schedule.count() > 0) {
-     TQValueList<MyMoneySchedule>::Iterator it;
-     do {
-@@ -871,8 +871,21 @@ MyMoneyMoney MyMoneyForecast::accountCycleVariation(const MyMoneyAccount& acc)
-   MyMoneyMoney cycleVariation;
- 
-   if (forecastMethod() == eHistoric) {
--    for(int t_day = 1; t_day <= accountsCycle() ; ++t_day) {
--      cycleVariation += m_accountTrendList[acc.id()][t_day];
-+    switch(historyMethod()) {
-+      case 0:
-+      case 1:
-+        {
-+          for(int t_day = 1; t_day <= accountsCycle() ; ++t_day) {
-+            cycleVariation += m_accountTrendList[acc.id()][t_day];
-+          }
-+        }
-+        break;
-+
-+      case 2:
-+        {
-+          cycleVariation = m_accountList[acc.id()][TQDate::currentDate().addDays(accountsCycle())] - m_accountList[acc.id()][TQDate::currentDate()];
-+        }
-+        break;
-     }
-   }
-   return cycleVariation;
-diff --git a/kmymoney2/reports/pivottable.cpp b/kmymoney2/reports/pivottable.cpp
-index db73062..b75ffb9 100644
---- a/kmymoney2/reports/pivottable.cpp
-+++ b/kmymoney2/reports/pivottable.cpp
-@@ -825,9 +825,27 @@ void PivotTable::calculateBudgetMapping( void )
-     //
-     // It will choose the first budget in the list for the start year of the report if no budget is select
-     MyMoneyBudget budget = MyMoneyBudget();
-+    
-+    TQValueList<MyMoneyBudget> budgets = file->budgetList();
-+    bool validBudget = false;
-+    
-+    //check that the selected budget is valid
-+    if (m_config_f.budget() != "Any") {
-+      TQValueList<MyMoneyBudget>::const_iterator budgets_it = budgets.begin();
-+      while( budgets_it != budgets.end() ) {
-+        //pick the budget by id
-+        if ((*budgets_it).id() == m_config_f.budget()) {
-+          budget = file->budget((*budgets_it).id());
-+          validBudget = true;
-+          break;
-+        }
-+        ++budgets_it;
-+      }
-+    }
-+    
-     //if no budget has been selected
--    if (m_config_f.budget() == "Any" ) {
--      TQValueList<MyMoneyBudget> budgets = file->budgetList();
-+    if (!validBudget ) {
-+      
-       TQValueList<MyMoneyBudget>::const_iterator budgets_it = budgets.begin();
-       while( budgets_it != budgets.end() ) {
-         //pick the first budget that matches the report start year
-@@ -843,9 +861,6 @@ void PivotTable::calculateBudgetMapping( void )
- 
-       //assign the budget to the report
-       m_config_f.setBudget(budget.id(), m_config_f.isIncludingBudgetActuals());
--    } else {
--      //pick the budget selected by the user
--      budget = file->budget( m_config_f.budget());
-     }
- 
-     // Dump the budget
-diff --git a/kmymoney2/views/kgloballedgerview.cpp b/kmymoney2/views/kgloballedgerview.cpp
-index 8209d3f..e82459a 100644
---- a/kmymoney2/views/kgloballedgerview.cpp
-+++ b/kmymoney2/views/kgloballedgerview.cpp
-@@ -485,7 +485,12 @@ void KGlobalLedgerView::loadView(void)
-             break;
- 
-           // for all others, we check if the next payment date is still 'in range'
--          s.setNextDueDate(s.nextPayment(s.nextDueDate()));
-+          TQDate nextDueDate = s.nextPayment(s.nextDueDate());
-+          if (nextDueDate.isValid()) {
-+            s.setNextDueDate(nextDueDate);
-+          } else {
-+            break;
-+          }
-         }
-         scheduleList.pop_front();
-       }
-diff --git a/kmymoney2/views/khomeview.cpp b/kmymoney2/views/khomeview.cpp
-index 60bb173..8745d64 100644
---- a/kmymoney2/views/khomeview.cpp
-+++ b/kmymoney2/views/khomeview.cpp
-@@ -595,6 +595,13 @@ void KHomeView::showPayments(void)
-           schedule.remove(it);
-           continue;
-         }
-+        
-+        //if nextPayment returns an invalid date, setNextDueDate will just skip it, resulting in a loop
-+        //we check the resulting date and erase the schedule if invalid
-+        if(!((*it).nextPayment((*it).nextDueDate())).isValid()) {
-+          schedule.remove(it);
-+          continue;
-+        }
- 
-         (*it).setNextDueDate((*it).nextPayment((*it).nextDueDate()));
-         qBubbleSort(schedule);
-diff --git a/kmymoney2/views/kinstitutionsview.cpp b/kmymoney2/views/kinstitutionsview.cpp
-index 0b9258f..87c0fc1 100644
---- a/kmymoney2/views/kinstitutionsview.cpp
-+++ b/kmymoney2/views/kinstitutionsview.cpp
-@@ -161,6 +161,9 @@ void KInstitutionsView::loadAccounts(void)
- 
-     // hide it, if unused
-     noInstitutionItem->setVisible(noInstitutionItem->childCount() != 0);
-+    
-+    bool showClosedAccounts = kmymoney2->toggleAction("view_show_all_accounts")->isChecked()
-+      || !KMyMoneyGlobalSettings::hideClosedAccounts();
- 
-     TQValueList<MyMoneyInstitution> list = file->institutionList();
-     TQValueList<MyMoneyInstitution>::const_iterator it_i;
-@@ -168,6 +171,8 @@ void KInstitutionsView::loadAccounts(void)
-       KMyMoneyAccountTreeItem* item = new KMyMoneyAccountTreeItem(m_accountTree, *it_i);
-       item->setPixmap(0, none.pixmap());
-       loadSubAccounts(item, (*it_i).id());
-+      if(!showClosedAccounts)
-+        item->setVisible(item->childCount() != 0);
-     }
- 
-   } catch(MyMoneyException *e) {
-@@ -201,7 +206,8 @@ void KInstitutionsView::loadAccounts(void)
- 
- void KInstitutionsView::loadSubAccounts(KMyMoneyAccountTreeItem* parent)
- {
--  bool showClosedAccounts = kmymoney2->toggleAction("view_show_all_accounts")->isChecked();
-+  bool showClosedAccounts = kmymoney2->toggleAction("view_show_all_accounts")->isChecked()
-+      || !KMyMoneyGlobalSettings::hideClosedAccounts();
-   const MyMoneyAccount& account = dynamic_cast<const MyMoneyAccount&>(parent->itemObject());
-   TQValueList<TQString>::const_iterator it_a;
-   MyMoneyFile* file = MyMoneyFile::instance();
-@@ -230,7 +236,8 @@ void KInstitutionsView::loadSubAccounts(KMyMoneyAccountTreeItem* parent, const T
- 
-   TQMap<TQString, MyMoneyAccount>::const_iterator it_a;
-   MyMoneyMoney  value;
--  bool showClosedAccounts = kmymoney2->toggleAction("view_show_all_accounts")->isChecked();
-+  bool showClosedAccounts = kmymoney2->toggleAction("view_show_all_accounts")->isChecked()
-+      || !KMyMoneyGlobalSettings::hideClosedAccounts();
- 
-   for(it_a = m_accountMap.begin(); it_a != m_accountMap.end(); ++it_a) {
-     const MyMoneyAccount& acc = *it_a;
-diff --git a/kmymoney2/widgets/stdtransactionmatched.cpp b/kmymoney2/widgets/stdtransactionmatched.cpp
-index 833c88e..9900c3c 100644
---- a/kmymoney2/widgets/stdtransactionmatched.cpp
-+++ b/kmymoney2/widgets/stdtransactionmatched.cpp
-@@ -179,6 +179,8 @@
-                 memo = memo.left(pos);
-                 if(memo.endsWith("\n"))
-                   memo = memo.left(pos-1);
-+                // replace all new line characters because we only have one line available for the displayed data
-+                memo.replace('\n', " ");
-               }
-             }
-             txt = TQString("%1 %2").tqarg(postDate.toString(Qt::ISODate)).tqarg(memo);
diff --git a/redhat/applications/kmymoney/kmymoney-3.5.13.1.spec b/redhat/applications/kmymoney/kmymoney-3.5.13.1.spec
deleted file mode 100644
index 9cc8c496b..000000000
--- a/redhat/applications/kmymoney/kmymoney-3.5.13.1.spec
+++ /dev/null
@@ -1,277 +0,0 @@
-# Default version for this component
-%define kdecomp kmymoney
-
-# Required for Mageia 2: removes the ldflag '--no-undefined'
-%define _disable_ld_no_undefined 1
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%define qt3pluginsdir %{_libdir}/qt3/plugins
-%endif
-%if 0%{?rhel} || 0%{?fedora}
-%define qt3pluginsdir %{_libdir}/qt-3.3/plugins
-%endif
-%if 0%{?suse_version}
-%define qt3pluginsdir /usr/lib/qt3/plugins
-%endif
-
-# 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
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/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-%{kdecomp}
-Summary:	personal finance manager for TDE
-
-Version:	1.0.5
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-Source1:	kmymoneytitlelabel.png
-
-# [kmymoney] Missing LDFLAGS causing FTBFS
-Patch4:		kmymoney-3.5.13-missing_ldflags.patch
-
-# [kmymoney] Fix QT3 plugins directory location
-Patch5:		kmymoney-3.5.13-fix_qt3_plugins_location.patch
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-arts-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires: desktop-file-utils
-
-BuildRequires: recode
-BuildRequires: html2ps
-BuildRequires: libofx-devel
-
-%if 0%{?mgaversion} || 0%{?pclinuxos}
-BuildRequires: %{_lib}OpenSP5-devel
-%else
-BuildRequires: opensp-devel
-%endif
-
-Requires:		%{name}-common == %{version}
-
-%description
-KMyMoney is the Personal Finance Manager for TDE. It operates similar to
-MS-Money and Quicken, supports different account types, categorisation of
-expenses, QIF import/export, multiple currencies and initial online banking
-support.
-
-
-%package common
-Summary:	KMyMoney architecture independent files
-Group:		Applications/Utilities
-Requires:	%{name} == %{version}
-
-%description common
-This package contains architecture independent files needed for KMyMoney to
-run properly. It also provides KMyMoney documentation. Therefore, unless you
-have '%{name}' package installed, you will hardly find this package useful.
-
-
-%package devel
-Summary:	KMyMoney development files
-Group:		Development/Libraries
-Requires:	%{name} == %{version}
-
-%description devel
-This package contains development files needed for KMyMoney plugins.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%patch5 -p1 -b .qtpluginsdir
-%endif
-
-%__install -m644 %{SOURCE1} kmymoney2/widgets/
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-export KDEDIR=%{tde_prefix}
-
-# Required to find the QT3 plugins directory
-%if 0%{?mgaversion} || 0%{?mdkversion}
-export QTPLUGINS=%{_libdir}/qt3/plugins
-%endif
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure \
-  --enable-pdf-docs \
-  --enable-ofxplugin \
-  --enable-ofxbanking \
-  --enable-qtdesigner \
-  --enable-sqlite3
-
-# Fix FTBFS inside sqlite3 archive
-patch -p1 < %{PATCH4}
-
-%__make %{?_smp_mflags}
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-
-# Required to find the QT3 plugins directory
-%if 0%{?mgaversion} || 0%{?mdkversion}
-export QTPLUGINS=%{_libdir}/qt3/plugins
-%endif
-
-%__make install DESTDIR=%{buildroot}
-
-
-
-
-## File lists
-# HTML (1.0)
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}$HTML_DIR ]; then
-	for lang_dir in %{buildroot}$HTML_DIR/* ; do
-	  if [ -d $lang_dir ]; then
-		lang=$(basename $lang_dir)
-		echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-		# replace absolute symlinks with relative ones
-		pushd $lang_dir
-		  for i in *; do
-			[ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
-		  done
-		popd
-	  fi
-	done
-fi
-
-%find_lang kmymoney2
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-/sbin/ldconfig
-for f in hicolor locolor Tango oxygen; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-/sbin/ldconfig
-for f in hicolor locolor Tango oxygen; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/kmymoney
-%{tde_bindir}/kmymoney2
-%{tde_tdeappdir}/kmymoney2.desktop
-%{tde_datadir}/mimelnk/application/x-kmymoney2.desktop
-%{tde_datadir}/servicetypes/kmymoneyimporterplugin.desktop
-%{tde_datadir}/servicetypes/kmymoneyplugin.desktop
-%{tde_libdir}/*.so.*
-%{tde_tdelibdir}/kmm_ofximport.la
-%{tde_tdelibdir}/kmm_ofximport.so
-
-%files common -f kmymoney2.lang
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/kmymoney2/html/
-%{tde_datadir}/apps/kmymoney2/icons/*/*/*/*.png
-%{tde_datadir}/apps/kmymoney2/kmymoney2ui.rc
-%{tde_datadir}/apps/kmymoney2/misc/financequote.pl
-%{tde_datadir}/apps/kmymoney2/pics/*.png
-%{tde_datadir}/apps/kmymoney2/templates/*/*.kmt
-%{tde_datadir}/apps/kmymoney2/tips
-%{tde_datadir}/config.kcfg/kmymoney2.kcfg
-%{tde_datadir}/icons/hicolor/*/*/*.png
-%{tde_datadir}/icons/Tango/*/*/*.png
-%{tde_datadir}/icons/Tango/scalable/*.svgz
-%{tde_datadir}/icons/locolor/*/*/*.png
-%{tde_datadir}/icons/oxygen/*/*/*.png
-%{tde_datadir}/icons/oxygen/scalable/*.svgz
-%{tde_tdedocdir}/HTML/en/kmymoney2/
-%{tde_mandir}/man1/kmymoney2.*
-%{tde_datadir}/apps/kmm_ofximport/kmm_ofximport.rc
-%{tde_datadir}/services/kmm_ofximport.desktop
-
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/kmymoney/*.h
-%{tde_libdir}/libkmm_kdchart.la
-%{tde_libdir}/libkmm_mymoney.la
-%{tde_libdir}/libkmm_plugin.la
-%{tde_libdir}/*.so
-%{qt3pluginsdir}/sqldrivers/libsqlite3*.so
-%{qt3pluginsdir}/designer/libkmymoney.so
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.5-3
-- Initial release for TDE 3.5.13.1
-
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.5-2
-- Rebuild for Fedora 17
-- Fix compilation with GCC 4.7 [Bug #958]
-
-* Sun Jan 15 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.5-1
-- Updates to upstream 1.0.5
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 1.0.4-1
-- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
diff --git a/redhat/applications/kmymoney/kmymoney-3.5.13.spec b/redhat/applications/kmymoney/kmymoney-3.5.13.spec
deleted file mode 100644
index dfe995a5f..000000000
--- a/redhat/applications/kmymoney/kmymoney-3.5.13.spec
+++ /dev/null
@@ -1,278 +0,0 @@
-# Default version for this component
-%define kdecomp kmymoney
-
-# Required for Mageia 2: removes the ldflag '--no-undefined'
-%define _disable_ld_no_undefined 1
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%define qt3pluginsdir %{_libdir}/qt3/plugins
-%else
-%define qt3pluginsdir %{_libdir}/qt-3.3/plugins
-%endif
-
-# 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
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	personal finance manager for TDE
-
-Version:	1.0.5
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-Source1:	kmymoneytitlelabel.png
-Patch0:		kmymoney-3.5.13-recode_ftbfs.patch
-
-# TDE Commit: 2a54aa58cfe166f48d6f1395cbc6c9bfd5e31bfc
-Patch1:		kmymoney-3.5.13-lots_of_crash.patch
-
-# TDE Commit: 8654cea10f6902719006d5975db7dc07b2fcc713
-Patch2:		kmymoney-3.5.13-update_to_1.0.5.patch
-
-# [kmymoney] Fix compilation with GCC 4.7 [Bug #958]
-Patch3:		kmymoney-3.5.13-fix_gcc47_compilation.patch
-
-# [kmymoney] Missing LDFLAGS causing FTBFS
-Patch4:		kmymoney-3.5.13-missing_ldflags.patch
-
-# [kmymoney] Fix QT3 plugins directory location
-Patch5:		kmymoney-3.5.13-fix_qt3_plugins_location.patch
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-arts-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-
-BuildRequires: recode
-BuildRequires: html2ps
-BuildRequires: libofx-devel
-
-%if 0%{?mgaversion}
-BuildRequires: %{_lib}OpenSP5-devel
-%else
-BuildRequires: opensp-devel
-%endif
-
-Requires:		%{name}-common == %{version}
-
-%description
-KMyMoney is the Personal Finance Manager for TDE. It operates similar to
-MS-Money and Quicken, supports different account types, categorisation of
-expenses, QIF import/export, multiple currencies and initial online banking
-support.
-
-
-%package common
-Summary:	KMyMoney architecture independent files
-Group:		Applications/Utilities
-Requires:	%{name} == %{version}
-
-%description common
-This package contains architecture independent files needed for KMyMoney to
-run properly. It also provides KMyMoney documentation. Therefore, unless you
-have '%{name}' package installed, you will hardly find this package useful.
-
-
-%package devel
-Summary:	KMyMoney development files
-Group:		Development/Libraries
-Requires:	%{name} == %{version}
-
-%description devel
-This package contains development files needed for KMyMoney plugins.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%patch5 -p1 -b .qtpluginsdir
-%endif
-
-%__install -m644 %{SOURCE1} kmymoney2/widgets/
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-
-# Required to find the QT3 plugins directory
-%if 0%{?mgaversion} || 0%{?mdkversion}
-export QTPLUGINS=%{_libdir}/qt3/plugins
-%endif
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure \
-  --enable-pdf-docs \
-  --enable-ofxplugin \
-  --enable-ofxbanking \
-  --enable-qtdesigner \
-  --enable-sqlite3
-
-# Fix FTBFS inside sqlite3 archive
-patch -p1 < %{PATCH4}
-
-%__make %{?_smp_mflags}
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-
-# Required to find the QT3 plugins directory
-%if 0%{?mgaversion} || 0%{?mdkversion}
-export QTPLUGINS=%{_libdir}/qt3/plugins
-%endif
-
-%__make install DESTDIR=%{buildroot}
-
-
-
-
-## File lists
-# HTML (1.0)
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}$HTML_DIR ]; then
-	for lang_dir in %{buildroot}$HTML_DIR/* ; do
-	  if [ -d $lang_dir ]; then
-		lang=$(basename $lang_dir)
-		echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-		# replace absolute symlinks with relative ones
-		pushd $lang_dir
-		  for i in *; do
-			[ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
-		  done
-		popd
-	  fi
-	done
-fi
-
-%find_lang kmymoney2
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-/sbin/ldconfig
-for f in hicolor locolor Tango oxygen; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-/sbin/ldconfig
-for f in hicolor locolor Tango oxygen; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/kmymoney
-%{tde_bindir}/kmymoney2
-%{tde_tdeappdir}/kmymoney2.desktop
-%{tde_datadir}/mimelnk/application/x-kmymoney2.desktop
-%{tde_datadir}/servicetypes/kmymoneyimporterplugin.desktop
-%{tde_datadir}/servicetypes/kmymoneyplugin.desktop
-%{tde_libdir}/*.so.*
-%{tde_tdelibdir}/kmm_ofximport.la
-%{tde_tdelibdir}/kmm_ofximport.so
-
-%files common -f kmymoney2.lang
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/kmymoney2/html/
-%{tde_datadir}/apps/kmymoney2/icons/*/*/*/*.png
-%{tde_datadir}/apps/kmymoney2/kmymoney2ui.rc
-%{tde_datadir}/apps/kmymoney2/misc/financequote.pl
-%{tde_datadir}/apps/kmymoney2/pics/*.png
-%{tde_datadir}/apps/kmymoney2/templates/*/*.kmt
-%{tde_datadir}/apps/kmymoney2/tips
-%{tde_datadir}/config.kcfg/kmymoney2.kcfg
-%{tde_datadir}/icons/hicolor/*/*/*.png
-%{tde_datadir}/icons/Tango/*/*/*.png
-%{tde_datadir}/icons/Tango/scalable/*.svgz
-%{tde_datadir}/icons/locolor/*/*/*.png
-%{tde_datadir}/icons/oxygen/*/*/*.png
-%{tde_datadir}/icons/oxygen/scalable/*.svgz
-%{tde_tdedocdir}/HTML/en/kmymoney2/
-%{tde_mandir}/man1/kmymoney2.*
-%{tde_datadir}/apps/kmm_ofximport/kmm_ofximport.rc
-%{tde_datadir}/services/kmm_ofximport.desktop
-
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/kmymoney/*.h
-%{tde_libdir}/libkmm_kdchart.la
-%{tde_libdir}/libkmm_mymoney.la
-%{tde_libdir}/libkmm_plugin.la
-%{tde_libdir}/*.so
-%{qt3pluginsdir}/sqldrivers/libsqlite3*.so
-%{qt3pluginsdir}/designer/libkmymoney.so
-
-%Changelog
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.5-2
-- Rebuild for Fedora 17
-- Fix compilation with GCC 4.7 [Bug #958]
-
-* Sun Jan 15 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.5-1
-- Updates to upstream 1.0.5
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 1.0.4-1
-- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
diff --git a/redhat/applications/kmymoney/admin-fix-parallel-test.diff b/redhat/applications/kmymoney/patches/3.5.13.2/admin-fix-parallel-test.diff
index 9f6f46ba8..9f6f46ba8 100644
--- a/redhat/applications/kmymoney/admin-fix-parallel-test.diff
+++ b/redhat/applications/kmymoney/patches/3.5.13.2/admin-fix-parallel-test.diff
diff --git a/redhat/applications/kmymoney/kmymoney-3.5.13-fix_qt3_plugins_location.patch b/redhat/applications/kmymoney/patches/3.5.13.2/kmymoney-3.5.13-fix_qt3_plugins_location.patch
index 8a6754fb5..8a6754fb5 100644
--- a/redhat/applications/kmymoney/kmymoney-3.5.13-fix_qt3_plugins_location.patch
+++ b/redhat/applications/kmymoney/patches/3.5.13.2/kmymoney-3.5.13-fix_qt3_plugins_location.patch
diff --git a/redhat/applications/kmymoney/kmymoney-3.5.13-missing_ldflags.patch b/redhat/applications/kmymoney/patches/3.5.13.2/kmymoney-3.5.13-missing_ldflags.patch
index c80007000..c80007000 100644
--- a/redhat/applications/kmymoney/kmymoney-3.5.13-missing_ldflags.patch
+++ b/redhat/applications/kmymoney/patches/3.5.13.2/kmymoney-3.5.13-missing_ldflags.patch
diff --git a/redhat/applications/kmymoney/kmymoney-3.5.13.2-ftbfs.patch b/redhat/applications/kmymoney/patches/3.5.13.2/kmymoney-3.5.13.2-ftbfs.patch
index 87e022f0f..87e022f0f 100644
--- a/redhat/applications/kmymoney/kmymoney-3.5.13.2-ftbfs.patch
+++ b/redhat/applications/kmymoney/patches/3.5.13.2/kmymoney-3.5.13.2-ftbfs.patch
diff --git a/redhat/applications/knemo/knemo-14.0.0.spec b/redhat/applications/knemo/knemo-14.0.0.spec
index ad3228a19..d70925435 100644
--- a/redhat/applications/knemo/knemo-14.0.0.spec
+++ b/redhat/applications/knemo/knemo-14.0.0.spec
@@ -1,52 +1,79 @@
-# Default version for this component
-%define tde_pkg knemo
+#
+# spec file for package knemo (version R14.0.0)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# TDE variables
+%define tde_epoch 2
 %define tde_version 14.0.0
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE specific building variables
+%define tde_pkg knemo
+%define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
 %define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/tde
+%define tde_tdeappdir %{tde_datadir}/applications/tde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
-%define _docdir %{tde_docdir}
 
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.4.8
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary:	Network interfaces monitor for the Trinity systray
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org/
+#URL:		http://beta.smileaf.org/projects
 
-Name:			trinity-%{tde_pkg}
-Summary:		network interfaces monitor for the Trinity systray
-Version:		0.4.8
-Release:		%{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
-
-License:		GPLv2+
-Group:			Applications/Utilities
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
 
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://beta.smileaf.org/projects
+#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}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
+BuildRequires:	autoconf automake libtool m4
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	libtool
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
 BuildRequires:	gettext
 
 %if 0%{?fedora} >= 18
@@ -65,12 +92,14 @@ ifconfig, route and iwconfig tools.
 
 Homepage: http://extragear.kde.org/apps/knemo/
 
+##########
 
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
+##########
+
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
@@ -83,7 +112,6 @@ Homepage: http://extragear.kde.org/apps/knemo/
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
   --prefix=%{tde_prefix} \
@@ -115,12 +143,12 @@ export PATH="%{tde_bindir}:${PATH}"
 
 
 %post
-update-desktop-database %{tde_appdir} > /dev/null
+update-desktop-database %{tde_tdeappdir} > /dev/null
 touch --no-create %{tde_datadir}/icons/crystalsvg || :
 gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
 
 %postun
-update-desktop-database %{tde_appdir} > /dev/null
+update-desktop-database %{tde_tdeappdir} > /dev/null
 touch --no-create %{tde_datadir}/icons/crystalsvg || :
 gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
 
@@ -132,7 +160,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
 %{tde_tdelibdir}/kded_knemod.la
 %{tde_tdelibdir}/kded_knemod.so
 %{tde_tdeappdir}/kcm_knemo.desktop
-%{tde_datadir}/apps/knemo/eventsrc
+%{tde_datadir}/apps/knemo/
 %{tde_datadir}/icons/crystalsvg/*/*/*.png
 %{tde_datadir}/locale/*/LC_MESSAGES/knemod.mo
 %{tde_datadir}/locale/*/LC_MESSAGES/kcm_knemo.mo
@@ -141,5 +169,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.8-6
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.4.8-1
 - Initial release for TDE 14.0.0