RPM packaging: update knetload, knetstats, knetworkmanager, knights, kmap, knowit

20 files changed, 430 insertions, 2017 deletions

diff --git a/redhat/applications/knemo/knemo-14.0.0.spec b/redhat/applications/knemo/knemo-14.0.0.spec
index d70925435..fb4970ed2 100644
--- a/redhat/applications/knemo/knemo-14.0.0.spec
+++ b/redhat/applications/knemo/knemo-14.0.0.spec
@@ -100,7 +100,6 @@ Homepage: http://extragear.kde.org/apps/knemo/
 
 ##########
 
-
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
diff --git a/redhat/applications/knemo/knemo-3.5.13.1.spec b/redhat/applications/knemo/knemo-3.5.13.1.spec
deleted file mode 100644
index 4072c693b..000000000
--- a/redhat/applications/knemo/knemo-3.5.13.1.spec
+++ /dev/null
@@ -1,143 +0,0 @@
-# Default version for this component
-%define kdecomp knemo
-
-# 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:	network interfaces monitor for the Trinity systray
-Version:	0.4.8
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://beta.smileaf.org/projects
-
-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
-BuildRequires:	gettext
-
-
-%description
-KNemo displays an icon in the systray for every network interface.
-Tooltips and an info dialog provide further information about the
-interface.  Passive popups inform about interface changes.
-A traffic plotter is also integrated.
-
-knemo polls the network interface status every second using the
-ifconfig, route and iwconfig tools. 
-
-Homepage: http://extragear.kde.org/apps/knemo/
-
-
-
-%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
-
-%__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
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kcm_knemo.la
-%{tde_tdelibdir}/kcm_knemo.so
-%{tde_tdelibdir}/kded_knemod.la
-%{tde_tdelibdir}/kded_knemod.so
-%{tde_tdeappdir}/kcm_knemo.desktop
-%{tde_datadir}/apps/knemo/eventsrc
-%{tde_datadir}/icons/crystalsvg/*/*/*.png
-%{tde_datadir}/locale/*/LC_MESSAGES/knemod.mo
-%{tde_datadir}/locale/*/LC_MESSAGES/kcm_knemo.mo
-%{tde_datadir}/services/kded/knemod.desktop
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.8-3
-- Initial release for TDE 3.5.13.1
-
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.8-2
-- Rebuild for Fedora 17
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.8-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/knemo/knemo-3.5.13.spec b/redhat/applications/knemo/knemo-3.5.13.spec
deleted file mode 100644
index b316cf6b5..000000000
--- a/redhat/applications/knemo/knemo-3.5.13.spec
+++ /dev/null
@@ -1,135 +0,0 @@
-# Default version for this component
-%define kdecomp knemo
-
-# 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:	network interfaces monitor for the Trinity systray
-Version:	0.4.8
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://beta.smileaf.org/projects
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-KNemo displays an icon in the systray for every network interface.
-Tooltips and an info dialog provide further information about the
-interface.  Passive popups inform about interface changes.
-A traffic plotter is also integrated.
-
-knemo polls the network interface status every second using the
-ifconfig, route and iwconfig tools. 
-
-Homepage: http://extragear.kde.org/apps/knemo/
-
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-# 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
-
-%__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
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kcm_knemo.la
-%{tde_tdelibdir}/kcm_knemo.so
-%{tde_tdelibdir}/kded_knemod.la
-%{tde_tdelibdir}/kded_knemod.so
-%{tde_tdeappdir}/kcm_knemo.desktop
-%{tde_datadir}/apps/knemo/eventsrc
-%{tde_datadir}/icons/crystalsvg/*/*/*.png
-%{tde_datadir}/locale/*/LC_MESSAGES/knemod.mo
-%{tde_datadir}/locale/*/LC_MESSAGES/kcm_knemo.mo
-%{tde_datadir}/services/kded/knemod.desktop
-
-
-%Changelog
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.8-2
-- Rebuild for Fedora 17
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.8-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/knetload/knetload-14.0.0.spec b/redhat/applications/knetload/knetload-14.0.0.spec
index bfbc9d10c..95a3f1522 100644
--- a/redhat/applications/knetload/knetload-14.0.0.spec
+++ b/redhat/applications/knetload/knetload-14.0.0.spec
@@ -1,54 +1,79 @@
-# Default version for this component
-%define tde_pkg knetload
+#
+# spec file for package knetload (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 knetload
+%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:		a network meter for Kicker [Trinity]
-Version:		2.3
-Release:		%{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	2.3
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary:	A network meter for Kicker [Trinity]
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org
 
-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:	gettext
 
+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
 KNetLoad is a small network meter for Kicker (the TDE panel).  It shows
@@ -60,10 +85,14 @@ styles.
 KNetLoad can monitor just about any network device.
 
 
-%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}}
@@ -105,6 +134,16 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %find_lang %{tde_pkg}
 
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file %{tde_pkg} System Monitor
+%endif
+
+# These icons are copied from 'crystalsvg' theme, provided by 'tdelibs'.
+%__mkdir_p "%{?buildroot}%{tde_datadir}/icons/hicolor/"{16x16,32x32,48x48}"/apps/"
+pushd "%{?buildroot}%{tde_datadir}/icons"
+for i in {16,32,48};    do %__cp crystalsvg/"$i"x"$i"/apps/knetload.png  hicolor/"$i"x"$i"/apps/knetload.png  ;done
+popd
 
 
 %clean
@@ -112,15 +151,15 @@ export PATH="%{tde_bindir}:${PATH}"
 
 
 %post
-update-desktop-database %{tde_appdir} > /dev/null
-for f in crystalsvg locolor ; do
+update-desktop-database %{tde_tdeappdir} > /dev/null
+for f in crystalsvg hicolor locolor ; 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
-for f in crystalsvg locolor ; do
+update-desktop-database %{tde_tdeappdir} > /dev/null
+for f in crystalsvg hicolor locolor ; do
   touch --no-create %{tde_datadir}/icons/${f} || :
   gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
 done
@@ -132,9 +171,11 @@ done
 %{tde_tdeappdir}/knetload.desktop
 %{tde_datadir}/apps/knetload
 %{tde_datadir}/icons/crystalsvg/*/apps/knetload.png
+%{tde_datadir}/icons/hicolor/*/apps/knetload.png
 %{tde_datadir}/icons/locolor/*/apps/knetload.png
 %{tde_tdedocdir}/HTML/en/knetload/
 
+
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2.3-6
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:2.3-1
 - Initial release for TDE 14.0.0
diff --git a/redhat/applications/knetload/knetload-3.5.13.1.spec b/redhat/applications/knetload/knetload-3.5.13.1.spec
deleted file mode 100644
index 0dc01dc02..000000000
--- a/redhat/applications/knetload/knetload-3.5.13.1.spec
+++ /dev/null
@@ -1,144 +0,0 @@
-# Default version for this component
-%define kdecomp knetload
-
-# 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:	a network meter for Kicker [Trinity]
-Version:	2.3
-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
-BuildRequires:	gettext
-
-
-%description
-KNetLoad is a small network meter for Kicker (the KDE panel).  It shows
-a recent history of network usage in the form of two configurable
-diagrams in the system tray, one for incoming and one for outgoing
-data.  These diagrams have settings for colours and various different
-styles.
-
-KNetLoad can monitor just about any network device.
-
-
-%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
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-for f in crystalsvg locolor ; 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
-for f in crystalsvg locolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/knetload
-%{tde_tdeappdir}/knetload.desktop
-%{tde_datadir}/apps/knetload
-%{tde_datadir}/icons/crystalsvg/*/apps/knetload.png
-%{tde_datadir}/icons/locolor/*/apps/knetload.png
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.3-3
-- Initial release for TDE 3.5.13.1
-
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 2.3-2
-- Rebuild for Fedora 17
-
-* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 2.3-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/knetload/knetload-3.5.13.spec b/redhat/applications/knetload/knetload-3.5.13.spec
deleted file mode 100644
index 0d4293016..000000000
--- a/redhat/applications/knetload/knetload-3.5.13.spec
+++ /dev/null
@@ -1,136 +0,0 @@
-# Default version for this component
-%define kdecomp knetload
-
-# 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:	a network meter for Kicker [Trinity]
-Version:	2.3
-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
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-KNetLoad is a small network meter for Kicker (the KDE panel).  It shows
-a recent history of network usage in the form of two configurable
-diagrams in the system tray, one for incoming and one for outgoing
-data.  These diagrams have settings for colours and various different
-styles.
-
-KNetLoad can monitor just about any network device.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-# 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
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-for f in crystalsvg locolor ; 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
-for f in crystalsvg locolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/knetload
-%{tde_tdeappdir}/knetload.desktop
-%{tde_datadir}/apps/knetload
-%{tde_datadir}/icons/crystalsvg/*/apps/knetload.png
-%{tde_datadir}/icons/locolor/*/apps/knetload.png
-
-
-%Changelog
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 2.3-2
-- Rebuild for Fedora 17
-
-* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 2.3-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/knetstats/knetstats-14.0.0.spec b/redhat/applications/knetstats/knetstats-14.0.0.spec
index 69519453d..e7d1498a9 100644
--- a/redhat/applications/knetstats/knetstats-14.0.0.spec
+++ b/redhat/applications/knetstats/knetstats-14.0.0.spec
@@ -1,64 +1,93 @@
-# Default version for this component
-%define tde_pkg knetstats
+#
+# spec file for package knetstats (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 knetstats
+%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:		network interfaces monitor for the Trinity systray
-Version:		1.6.1
-Release:		%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	1.6.1
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary:	Network interfaces monitor for the Trinity systray
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org
 
-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:	gettext
 
+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
 A simple TDE network monitor that show rx/tx LEDs of any
 network interface on a system tray icon
 
 
-%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}}
@@ -100,6 +129,10 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %find_lang %{tde_pkg}
 
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file %{tde_pkg} System Monitor
+%endif
 
 
 %clean
@@ -107,12 +140,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/hicolor || :
 gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 %postun
-update-desktop-database %{tde_appdir} > /dev/null
+update-desktop-database %{tde_tdeappdir} > /dev/null
 touch --no-create %{tde_datadir}/icons/hicolor || :
 gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
@@ -127,5 +160,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.6.1-5
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:1.6.1-1
 - Initial release for TDE 14.0.0
diff --git a/redhat/applications/knetstats/knetstats-3.5.13.1.spec b/redhat/applications/knetstats/knetstats-3.5.13.1.spec
deleted file mode 100644
index 0d12ef070..000000000
--- a/redhat/applications/knetstats/knetstats-3.5.13.1.spec
+++ /dev/null
@@ -1,132 +0,0 @@
-# Default version for this component
-%define kdecomp knetstats
-
-# 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:	network interfaces monitor for the Trinity systray
-Version:	1.6.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.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
-BuildRequires:	gettext
-
-
-%description
-A simple KDE network monitor that show rx/tx LEDs of any
-network interface on a system tray icon
-
-
-%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
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/knetstats
-%{tde_tdeappdir}/knetstats.desktop
-%{tde_datadir}/apps/knetstats
-%{tde_tdedocdir}/HTML/en/knetstats/
-%{tde_datadir}/icons/hicolor/*/apps/knetstats.png
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.1-2
-- Initial release for TDE 3.5.13.1
-
-* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 1.6.1-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/knetstats/knetstats-3.5.13.spec b/redhat/applications/knetstats/knetstats-3.5.13.spec
deleted file mode 100644
index 17a63d2bf..000000000
--- a/redhat/applications/knetstats/knetstats-3.5.13.spec
+++ /dev/null
@@ -1,124 +0,0 @@
-# Default version for this component
-%define kdecomp knetstats
-
-# 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:	network interfaces monitor for the Trinity systray
-Version:	1.6.1
-Release:	1%{?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
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-A simple KDE network monitor that show rx/tx LEDs of any
-network interface on a system tray icon
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-# 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
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/knetstats
-%{tde_tdeappdir}/knetstats.desktop
-%{tde_datadir}/apps/knetstats
-%{tde_tdedocdir}/HTML/en/knetstats/
-%{tde_datadir}/icons/hicolor/*/apps/knetstats.png
-
-
-%Changelog
-* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 1.6.1-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13-wpa_passphrase_lag.patch b/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13-wpa_passphrase_lag.patch
deleted file mode 100644
index ad10145cf..000000000
--- a/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13-wpa_passphrase_lag.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Nuar knetworkmanager9/knetworkmanager-0.9/src.ORI//knetworkmanager-connection_setting_wireless_security_widget.cpp knetworkmanager9/knetworkmanager-0.9/src/knetworkmanager-connection_setting_wireless_security_widget.cpp
---- knetworkmanager9/knetworkmanager-0.9/src.ORI//knetworkmanager-connection_setting_wireless_security_widget.cpp	2011-11-11 20:45:47.964680619 +0100
-+++ knetworkmanager9/knetworkmanager-0.9/src/knetworkmanager-connection_setting_wireless_security_widget.cpp	2011-11-11 20:51:32.689072955 +0100
-@@ -432,14 +432,15 @@
- 	, _wireless_setting(wireless_setting)
- {
- 	txtPSK->setText(_security_setting->getPSK());
--	connect(txtPSK, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotPSKChanged(const TQString&)));
-+	connect(txtPSK, TQT_SIGNAL(lostFocus()), this, TQT_SLOT(slotPSKChanged()));
- }
- 
- void
--WirelessSecurityWPAPSKImpl::slotPSKChanged(const TQString& psk)
-+WirelessSecurityWPAPSKImpl::slotPSKChanged()
- {
- 	if (_wireless_setting)
- 	{
-+		TQString psk = txtPSK->text();
- 		_security_setting->setPSK(psk);
- 	}
- }
-diff -Nuar knetworkmanager9/knetworkmanager-0.9/src.ORI//knetworkmanager-connection_setting_wireless_security_widget.h knetworkmanager9/knetworkmanager-0.9/src/knetworkmanager-connection_setting_wireless_security_widget.h
---- knetworkmanager9/knetworkmanager-0.9/src.ORI//knetworkmanager-connection_setting_wireless_security_widget.h	2011-11-11 20:45:47.962680657 +0100
-+++ knetworkmanager9/knetworkmanager-0.9/src/knetworkmanager-connection_setting_wireless_security_widget.h	2011-11-11 20:46:21.640030856 +0100
-@@ -145,7 +145,7 @@
- 			TQCString String2Hex(TQByteArray bytes, int final_len) const;
- 
- 		public slots:
--			void slotPSKChanged(const TQString&);
-+			void slotPSKChanged();
- 
- 		private:
- 			WirelessSecurity* _security_setting;
diff --git a/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13.1.spec b/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13.1.spec
deleted file mode 100644
index 38e901008..000000000
--- a/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13.1.spec
+++ /dev/null
@@ -1,186 +0,0 @@
-# Default version for this component
-%define kdecomp knetworkmanager
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion}
-%define version 0.9
-%else
-%define version 0.8
-%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_tdedocdir}
-
-
-Name:			trinity-%{kdecomp}
-Version:		%{?version}
-Release:	4%{?dist}%{?_variant}
-
-Summary:        Trinity applet for Network Manager
-
-Group:          Applications/Internet
-License:        GPLv2+
-URL:            http://en.opensuse.org/Projects/KNetworkManager
-
-%if "%{?version}" == "0.9"
-Source0:		%{kdecomp}9-3.5.13.tar.gz
-%else
-Source0:		%{kdecomp}8-3.5.13.tar.gz
-%endif
-
-Patch0:			knetworkmanager-3.5.13-missing_includes.patch
-
-# For knetworkmanager 0.9 only !
-Patch10:		knetworkmanager-3.5.13-subdir_version.patch
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-#Requires:       kde-filesystem
-BuildRequires:  desktop-file-utils
-
-%if 0%{?rhel} || 0%{?fedora}
-Requires:       NetworkManager-gnome
-%else
-Requires:       networkmanager
-%endif
-
-BuildRequires:	dbus-1-tqt-devel
-BuildRequires:	dbus-tqt-devel
-BuildRequires:	NetworkManager-glib-devel
-
-%description
-KNetworkManager is a system tray applet for controlling network
-connections on systems that use the NetworkManager daemon.
-
-
-%package devel
-Summary:        Common data shared among the MySQL GUI Suites
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-
-%description devel
-Development headers for knetworkmanager
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep 
-%if "%{?version}" == "0.9"
-%setup -q -n %{kdecomp}-3.5.13.19
-%else
-%setup -q -n applications/knetworkmanager8
-%endif
-
-%if "%{?version}" == "0.9"
-%patch10 -p1
-%endif
-
-cd knetworkmanager-0.*/src
-%patch0 -p3
-
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
-export LD_LIBRARY_PATH="%{tde_libdir}"
-
-# Missing TDE macros
-%__mkdir_p cmake
-%__ln_s %{tde_datadir}/cmake cmake/modules
-
-%if 0%{?rhel} || 0%{?fedora}
-%__mkdir_p build
-cd build
-%endif
-
-%cmake \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  -DCMAKE_SKIP_RPATH="OFF" \
-  ..
-  
-%__make %{?_smp_mflags} 
-
-%install
-%__rm -rf $RPM_BUILD_ROOT
-%__make install DESTDIR=%{?buildroot} -C build
-
-
-%clean
-%__rm -rf $RPM_BUILD_ROOT
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-/sbin/ldconfig
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-/sbin/ldconfig
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%post devel
-/sbin/ldconfig
-
-%postun devel
-/sbin/ldconfig
-
-%files 
-%defattr(-,root,root,-)
-%{tde_bindir}/knetworkmanager
-%{tde_libdir}/*.la
-%{tde_libdir}/*.so
-%{_sysconfdir}/dbus-1/system.d/knetworkmanager.conf
-%{tde_tdeappdir}/knetworkmanager.desktop
-%{tde_datadir}/apps/knetworkmanager
-%{tde_datadir}/icons/hicolor/*/apps/knetworkmanager*
-%{tde_datadir}/servicetypes/knetworkmanager_plugin.desktop
-%{tde_datadir}/servicetypes/knetworkmanager_vpnplugin.desktop
-
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/*.h
-%{tde_tdelibdir}/*.la
-%{tde_tdelibdir}/*.so
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - %{?version}-4
-- Initial release for TDE 3.5.13.1
-
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.8-3 / 0.9-3
-- Rebuild for Fedora 17
-
-* Sat Nov 13 2011 Francois Andriot <francois.andriot@free.fr> - 0.8-2 / 0.9-2
-- Remove faulty patch for WPA authentication
-
-* Tue Nov 11 2011 Francois Andriot <francois.andriot@free.fr> - 0.8-1 / 0.9-1
-- Initial release
diff --git a/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13.spec b/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13.spec
deleted file mode 100644
index b51395370..000000000
--- a/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13.spec
+++ /dev/null
@@ -1,180 +0,0 @@
-# Default version for this component
-%define kdecomp knetworkmanager
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion}
-%define version 0.9
-%else
-%define version 0.8
-%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_tdedocdir}
-
-
-Name:			trinity-%{kdecomp}
-Version:		%{?version}
-Release:		3%{?dist}%{?_variant}
-
-Summary:        Trinity applet for Network Manager
-
-Group:          Applications/Internet
-License:        GPLv2+
-URL:            http://en.opensuse.org/Projects/KNetworkManager
-
-%if "%{?version}" == "0.9"
-Source0:		%{kdecomp}9-3.5.13.tar.gz
-%else
-Source0:		%{kdecomp}8-3.5.13.tar.gz
-%endif
-
-Patch0:			knetworkmanager-3.5.13-missing_includes.patch
-Patch1:			knetworkmanager-3.5.13-wpa_passphrase_lag.patch
-
-# For knetworkmanager 0.9 only !
-Patch10:		knetworkmanager-3.5.13-subdir_version.patch
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-#Requires:       kde-filesystem
-BuildRequires:  desktop-file-utils
-
-%if 0%{?rhel} || 0%{?fedora}
-Requires:       NetworkManager-gnome
-%else
-Requires:       networkmanager
-%endif
-
-BuildRequires:	dbus-1-tqt-devel
-BuildRequires:	dbus-tqt-devel
-BuildRequires:	NetworkManager-glib-devel
-
-%description
-KNetworkManager is a system tray applet for controlling network
-connections on systems that use the NetworkManager daemon.
-
-
-%package devel
-Summary:        Common data shared among the MySQL GUI Suites
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-
-%description devel
-Development headers for knetworkmanager
-
-
-%prep 
-%if "%{?version}" == "0.9"
-%setup -q -n applications/%{kdecomp}9
-%else
-%setup -q -n applications/%{kdecomp}8
-%endif
-
-%if "%{?version}" == "0.9"
-%patch10 -p1
-%endif
-
-cd knetworkmanager-0.*/src
-%patch0 -p3
-#patch1 -p3
-
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
-export LD_LIBRARY_PATH="%{tde_libdir}"
-
-# Missing TDE macros
-%__mkdir_p cmake
-%__ln_s %{tde_datadir}/cmake cmake/modules
-
-%if 0%{?rhel} || 0%{?fedora}
-%__mkdir_p build
-cd build
-%endif
-
-%cmake \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  -DCMAKE_SKIP_RPATH="OFF" \
-  ..
-  
-%__make %{?_smp_mflags} 
-
-%install
-%__rm -rf $RPM_BUILD_ROOT
-%__make install DESTDIR=%{?buildroot} -C build
-
-
-%clean
-%__rm -rf $RPM_BUILD_ROOT
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-/sbin/ldconfig
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-/sbin/ldconfig
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%post devel
-/sbin/ldconfig
-
-%postun devel
-/sbin/ldconfig
-
-%files 
-%defattr(-,root,root,-)
-%{tde_bindir}/knetworkmanager
-%{tde_libdir}/*.la
-%{tde_libdir}/*.so
-%{_sysconfdir}/dbus-1/system.d/knetworkmanager.conf
-%{tde_tdeappdir}/knetworkmanager.desktop
-%{tde_datadir}/apps/knetworkmanager
-%{tde_datadir}/icons/hicolor/*/apps/knetworkmanager*
-%{tde_datadir}/servicetypes/knetworkmanager_plugin.desktop
-%{tde_datadir}/servicetypes/knetworkmanager_vpnplugin.desktop
-
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/*.h
-%{tde_tdelibdir}/*.la
-%{tde_tdelibdir}/*.so
-
-%changelog
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.8-3 / 0.9-3
-- Rebuild for Fedora 17
-
-* Sat Nov 13 2011 Francois Andriot <francois.andriot@free.fr> - 0.8-2 / 0.9-2
-- Remove faulty patch for WPA authentication
-
-* Tue Nov 11 2011 Francois Andriot <francois.andriot@free.fr> - 0.8-1 / 0.9-1
-- Initial release
diff --git a/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec b/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec
index 7571533b4..12ea8e41c 100644
--- a/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec
+++ b/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec
@@ -15,10 +15,6 @@
 # Please submit bugfixes or comments via http://www.trinitydesktop.org/
 #
 
-# BUILD WARNING:
-#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
-#  Having KDE libraries may cause FTBFS here !
-
 # TDE variables
 %define tde_epoch 2
 %define tde_version 14.0.0
@@ -29,25 +25,20 @@
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_prefix}/man
+%define tde_mandir %{tde_datadir}/man
 %define tde_tdeappdir %{tde_datadir}/applications/tde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
 
-Name:			trinity-%{tde_pkg}8
-Epoch:			%{tde_epoch}
-Version:		0.8
-Summary:		Trinity applet for Network Manager
-Release:		%{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
-Group:			Applications/Internet
-URL:			http://www.trinitydesktop.org/
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.8
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary:	Trinity applet for Network Manager
+Group:		Applications/Internet
+URL:		http://www.trinitydesktop.org/
 
 %if 0%{?suse_version}
 License:	GPL-2.0+
@@ -55,27 +46,47 @@ License:	GPL-2.0+
 License:	GPLv2+
 %endif
 
-#Vendor:		Trinity Project
+#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
+Source0:		%{name}8-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-#Requires:       kde-filesystem
+BuildRequires:	trinity-dbus-1-tqt-devel >= 1:0.9
+BuildRequires:	trinity-dbus-tqt-devel >= 1:0.63
+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
+
 %if 0%{?rhel} || 0%{?fedora}
 Requires:		NetworkManager-gnome
 %else
 Requires:		networkmanager
 %endif
 
-BuildRequires:	trinity-dbus-1-tqt-devel >= 1:0.9
-BuildRequires:	trinity-dbus-tqt-devel >= 1:0.63
+# NetworkManager support
 BuildRequires:	NetworkManager-glib-devel
 
+# HAL support
+BuildRequires:	hal-devel
+
 Obsoletes:		trinity-knetworkmanager < %{version}-%{release}
 Provides:		trinity-knetworkmanager = %{version}-%{release}
 
@@ -83,6 +94,38 @@ Provides:		trinity-knetworkmanager = %{version}-%{release}
 KNetworkManager is a system tray applet for controlling network
 connections on systems that use the NetworkManager daemon.
 
+%post
+update-desktop-database %{tde_appdir} > /dev/null
+/sbin/ldconfig
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
+
+
+%postun
+update-desktop-database %{tde_appdir} > /dev/null
+/sbin/ldconfig
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
+
+%files -f knetworkmanager.lang
+%defattr(-,root,root,-)
+%{tde_bindir}/knetworkmanager
+%{tde_libdir}/*.la
+%{tde_libdir}/*.so
+%{tde_tdelibdir}/knetworkmanager_openvpn.so.*
+%{tde_tdelibdir}/knetworkmanager_pptp.so.*
+%{tde_tdelibdir}/knetworkmanager_vpnc.so.*
+%{_sysconfdir}/dbus-1/system.d/knetworkmanager.conf
+%{tde_tdeappdir}/knetworkmanager.desktop
+%{tde_datadir}/apps/knetworkmanager
+%{tde_datadir}/icons/hicolor/*/apps/knetworkmanager*
+%{tde_datadir}/servicetypes/knetworkmanager_plugin.desktop
+%{tde_datadir}/servicetypes/knetworkmanager_vpnplugin.desktop
+%{tde_datadir}/services/knetworkmanager_openvpn.desktop
+%{tde_datadir}/services/knetworkmanager_pptp.desktop
+%{tde_datadir}/services/knetworkmanager_vpnc.desktop
+
+##########
 
 %package devel
 Summary:		Common data shared among the MySQL GUI Suites
@@ -95,14 +138,29 @@ Provides:		trinity-knetworkmanager-devel = %{version}-%{release}
 %description devel
 Development headers for knetworkmanager
 
+%post devel
+/sbin/ldconfig
+
+%postun devel
+/sbin/ldconfig
+
+%files devel
+%defattr(-,root,root,-)
+%{tde_tdeincludedir}/*.h
+%{tde_tdelibdir}/*.la
+%{tde_tdelibdir}/*.so
+
+##########
 
 %if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
+##########
+
 
 %prep 
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+%setup -q -n %{name}8-%{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"
@@ -149,52 +207,6 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf $RPM_BUILD_ROOT
 
 
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-/sbin/ldconfig
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-/sbin/ldconfig
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%post devel
-/sbin/ldconfig
-
-
-%postun devel
-/sbin/ldconfig
-
-
-%files -f knetworkmanager.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/knetworkmanager
-%{tde_libdir}/*.la
-%{tde_libdir}/*.so
-%{tde_tdelibdir}/knetworkmanager_openvpn.so.*
-%{tde_tdelibdir}/knetworkmanager_pptp.so.*
-%{tde_tdelibdir}/knetworkmanager_vpnc.so.*
-%{_sysconfdir}/dbus-1/system.d/knetworkmanager.conf
-%{tde_tdeappdir}/knetworkmanager.desktop
-%{tde_datadir}/apps/knetworkmanager
-%{tde_datadir}/icons/hicolor/*/apps/knetworkmanager*
-%{tde_datadir}/servicetypes/knetworkmanager_plugin.desktop
-%{tde_datadir}/servicetypes/knetworkmanager_vpnplugin.desktop
-%{tde_datadir}/services/knetworkmanager_openvpn.desktop
-%{tde_datadir}/services/knetworkmanager_pptp.desktop
-%{tde_datadir}/services/knetworkmanager_vpnc.desktop
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/*.h
-%{tde_tdelibdir}/*.la
-%{tde_tdelibdir}/*.so
-
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.8-6
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.8-1
 - Initial release for TDE 14.0.0
diff --git a/redhat/applications/knights/knights-14.0.0.spec b/redhat/applications/knights/knights-14.0.0.spec
index ce05ede7c..ebe2fdc9a 100644
--- a/redhat/applications/knights/knights-14.0.0.spec
+++ b/redhat/applications/knights/knights-14.0.0.spec
@@ -1,54 +1,80 @@
-# Default version for this component
-%define tde_pkg knights
+#
+# spec file for package knights (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 knights
+%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.6
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary:	A chess interface for the K Desktop Environment [Trinity]
+Group:		Amusements/Games
+URL:		http://www.trinitydesktop.org/
 
-Name:			trinity-%{tde_pkg}
-Summary:		A chess interface for the K Desktop Environment [Trinity]
-Version:		0.6
-Release:		%{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
-
-License:		GPLv2+
-Group:			Amusements/Games
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
 
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
+#Vendor:		Trinity 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:	gettext
 
+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
+
+# GNUCHESS support
 Requires:		gnuchess
 
 %description
@@ -66,10 +92,14 @@ Here's a quick list of Knights' key features:
 * Save your unfinished matches and play them again later.
 
 
-%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}}
@@ -136,5 +166,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.6-7
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.6-1
 - Initial release for TDE 14.0.0
diff --git a/redhat/applications/knights/knights-3.5.13.1.spec b/redhat/applications/knights/knights-3.5.13.1.spec
deleted file mode 100644
index bba7572b4..000000000
--- a/redhat/applications/knights/knights-3.5.13.1.spec
+++ /dev/null
@@ -1,145 +0,0 @@
-# Default version for this component
-%define kdecomp knights
-
-# 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:	A chess interface for the K Desktop Environment [Trinity]
-Version:	0.6
-Release:	4%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Amusements/Games
-
-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
-BuildRequires:	gettext
-
-Requires:		gnuchess
-
-%description
-Knights aims to be the ultimate chess resource on your computer. 
-Written for the K Desktop Environment, it's designed to be both friendly 
-to new chess players and functional for Grand Masters.
-
-Here's a quick list of Knights' key features:
-* Play against yourself, against computer opponents, 
-  or against others over the Internet.
-* Customize your board and pieces with over 30 different themes, 
-  or make your own!
-* Audio cues help alert you to important events.
-* Novice players can preview potential moves.
-* Save your unfinished matches and play them again later.
-
-
-%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:%{tde_includedir}
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/knights
-%{tde_datadir}/applnk/Games/Board/knights.desktop
-%{tde_datadir}/apps/knights
-%{tde_tdedocdir}/HTML/*/knights
-%{tde_datadir}/icons/hicolor/*/*/*.png
-%{tde_datadir}/mimelnk/application/pgn.desktop
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.6-4
-- Initial release for TDE 3.5.13.1
-
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.6-3
-- Rebuild for Fedora 17
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.6-2
-- Fix HTML directory location
-
-* Sun Nov 20 2011 Francois Andriot <francois.andriot@free.fr> - 0.6-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/knights/knights-3.5.13.spec b/redhat/applications/knights/knights-3.5.13.spec
deleted file mode 100644
index 0ce527693..000000000
--- a/redhat/applications/knights/knights-3.5.13.spec
+++ /dev/null
@@ -1,137 +0,0 @@
-# Default version for this component
-%define kdecomp knights
-
-# 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:	A chess interface for the K Desktop Environment [Trinity]
-Version:	0.6
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Amusements/Games
-
-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
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-Requires:		gnuchess
-
-%description
-Knights aims to be the ultimate chess resource on your computer. 
-Written for the K Desktop Environment, it's designed to be both friendly 
-to new chess players and functional for Grand Masters.
-
-Here's a quick list of Knights' key features:
-* Play against yourself, against computer opponents, 
-  or against others over the Internet.
-* Customize your board and pieces with over 30 different themes, 
-  or make your own!
-* Audio cues help alert you to important events.
-* Novice players can preview potential moves.
-* Save your unfinished matches and play them again later.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-# 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:%{tde_includedir}
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/knights
-%{tde_datadir}/applnk/Games/Board/knights.desktop
-%{tde_datadir}/apps/knights
-%{tde_tdedocdir}/HTML/*/knights
-%{tde_datadir}/icons/hicolor/*/*/*.png
-%{tde_datadir}/mimelnk/application/pgn.desktop
-
-
-%Changelog
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.6-3
-- Rebuild for Fedora 17
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.6-2
-- Fix HTML directory location
-
-* Sun Nov 20 2011 Francois Andriot <francois.andriot@free.fr> - 0.6-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/knmap/knmap-14.0.0.spec b/redhat/applications/knmap/knmap-14.0.0.spec
index 5f1acaa39..8886333a2 100644
--- a/redhat/applications/knmap/knmap-14.0.0.spec
+++ b/redhat/applications/knmap/knmap-14.0.0.spec
@@ -1,50 +1,84 @@
-# 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
-
-# Default version for this component
-%define tde_pkg knmap
+#
+# spec file for package knmap (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
-
-# TDE specific building variables
+%define tde_pkg knmap
+%define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
 %define tde_mandir %{tde_datadir}/man
-
 %define tde_tdeappdir %{tde_datadir}/applications/tde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
-%define _docdir %{tde_docdir}
 
-Name:           trinity-%{tde_pkg}
-Version:        2.1
-Release:		%{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
-Summary:        An NMAP frontend for TDE
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	2.1
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary:	An NMAP frontend for TDE
+Group:		Applications/Internet
+URL:		http://sourceforge.net/projects/knmap/
 
-Group:          Applications/Internet
-License:        GPLv2+
-URL:            http://sourceforge.net/projects/knmap/
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
 
-BuildRequires:	trinity-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:	gettext
 
+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
+
+# NMAP support
 Requires:		nmap
 
+
 %description
 Knmap is a TDE-based interface to the 'nmap' facility.
 
@@ -57,14 +91,18 @@ released on 2003-03-09 and targeted the KDE 2.2 and QT 2.3 environments.
 
 Not to mention that it did not cater for the full set of 'nmap' options.
 Or, perhaps, 'nmap' progressed whilst that version of Knmap languished.
- .
+
 http://www.kde-apps.org/content/show.php?content=31108
 
 
-%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}}
 
@@ -76,7 +114,6 @@ http://www.kde-apps.org/content/show.php?content=31108
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
   --prefix=%{tde_prefix} \
@@ -101,6 +138,16 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 %__rm -rf $RPM_BUILD_ROOT
 %__make install DESTDIR=$RPM_BUILD_ROOT
 
+# Move desktop icon to XDG directory
+%__mkdir_p %{buildroot}%{tde_tdeappdir}
+%__mv "%{buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
+%__rm -r "%{buildroot}%{tde_datadir}/applnk"
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -r %{tde_pkg} TDE System Network
+%endif
+
 
 %clean
 %__rm -rf $RPM_BUILD_ROOT
@@ -108,15 +155,15 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %post
 for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
+  touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
 done
 
 
 %postun
 for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
+  touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
 done
 
 
@@ -124,10 +171,8 @@ done
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README ChangeLog
 %{tde_bindir}/knmap
-%{tde_datadir}/applnk/Internet/knmap.desktop
-%{tde_datadir}/apps/knmap/knmapui.rc
-%{tde_datadir}/apps/knmap/nmap_manpage.html
-%{tde_datadir}/apps/knmap/nmap_manpage.html.diff
+%{tde_tdeappdir}/knmap.desktop
+%{tde_datadir}/apps/knmap/
 %{tde_tdedocdir}/HTML/en/knmap/
 %{tde_datadir}/icons/hicolor/*/apps/knmap.png
 %{tde_datadir}/icons/hicolor/*/apps/knmapman.png
@@ -150,8 +195,5 @@ done
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2.1-2
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:2.1-1
 - Initial release for TDE 14.0.0
-
-* Mon Apr 08 2013 Francois Andriot <francois.andriot@free.fr> - 2.1-1
-- Initial release for TDE 3.5.13.2
diff --git a/redhat/applications/knowit/knowit-14.0.0.spec b/redhat/applications/knowit/knowit-14.0.0.spec
index efe714add..124527ee4 100644
--- a/redhat/applications/knowit/knowit-14.0.0.spec
+++ b/redhat/applications/knowit/knowit-14.0.0.spec
@@ -1,54 +1,79 @@
-# Default version for this component
-%define tde_pkg knowit
+#
+# spec file for package knowit (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 knowit
+%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:		Tool for managing notes [Trinity]
-Version:		0.10
-Release:		%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.10
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary:	Tool for managing notes [Trinity]
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org
 
-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:	gettext
 
+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
 KnowIt is a tool for managing notes which are organized in
@@ -56,10 +81,14 @@ tree-like hierarchy. It is similar to TuxCards,
 but TDE-based, and requires Trinity.
 
 
-%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}}
@@ -72,7 +101,6 @@ but TDE-based, and requires Trinity.
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 # Warning: --enable-final causes FTBFS
 %configure \
@@ -105,9 +133,12 @@ export PATH="%{tde_bindir}:${PATH}"
 %__mv %{buildroot}%{tde_datadir}/applnk/Applications/knowit.desktop %{buildroot}%{tde_tdeappdir}/knowit.desktop
 %__rm -r %{buildroot}%{tde_datadir}/applnk
 
-
 %find_lang %{tde_pkg}
 
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -r %{tde_pkg} Utility Applet X-SuSE-DesktopUtility
+%endif
 
 
 %clean
@@ -115,12 +146,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/hicolor || :
 gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 %postun
-update-desktop-database %{tde_appdir} > /dev/null
+update-desktop-database %{tde_tdeappdir} > /dev/null
 touch --no-create %{tde_datadir}/icons/hicolor || :
 gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
@@ -129,15 +160,11 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 %defattr(-,root,root,-)
 %{tde_bindir}/knowit
 %{tde_tdeappdir}/knowit.desktop
-%{tde_datadir}/apps/knowit/knowitui.rc
-%{tde_datadir}/apps/knowit/tips
-%{tde_tdedocdir}/HTML/en/knowit/common
-%{tde_tdedocdir}/HTML/en/knowit/index.cache.bz2
-%{tde_tdedocdir}/HTML/en/knowit/index.docbook
-%{tde_tdedocdir}/HTML/en/knowit/screenshot.png
+%{tde_datadir}/apps/knowit/
+%{tde_tdedocdir}/HTML/en/knowit/
 %{tde_datadir}/icons/hicolor/*/apps/knowit.png
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.10-5
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.10-1
 - Initial release for TDE 14.0.0
diff --git a/redhat/applications/knowit/knowit-3.5.13.1.spec b/redhat/applications/knowit/knowit-3.5.13.1.spec
deleted file mode 100644
index 6fb781e27..000000000
--- a/redhat/applications/knowit/knowit-3.5.13.1.spec
+++ /dev/null
@@ -1,142 +0,0 @@
-# Default version for this component
-%define kdecomp knowit
-
-# 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:	Tool for managing notes [Trinity]
-Version:	0.10
-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.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
-BuildRequires:	gettext
-
-
-%description
-KnowIt is a tool for managing notes which are organized in
-tree-like hierarchy. It is similar to TuxCards,
-but KDE-based, and requires Trinity.
-
-
-%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
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%__mkdir_p %{buildroot}%{tde_tdeappdir}
-%__mv %{buildroot}%{tde_datadir}/applnk/Applications/knowit.desktop %{buildroot}%{tde_tdeappdir}/knowit.desktop
-%__rm -r %{buildroot}%{tde_datadir}/applnk
-
-
-%find_lang %{kdecomp}
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/knowit
-%{tde_tdeappdir}/knowit.desktop
-%{tde_datadir}/apps/knowit/knowitui.rc
-%{tde_datadir}/apps/knowit/tips
-%{tde_tdedocdir}/HTML/en/knowit/common
-%{tde_tdedocdir}/HTML/en/knowit/index.cache.bz2
-%{tde_tdedocdir}/HTML/en/knowit/index.docbook
-%{tde_tdedocdir}/HTML/en/knowit/screenshot.png
-%{tde_datadir}/icons/hicolor/*/apps/knowit.png
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.10-2
-- Initial release for TDE 3.5.13.1
-
-* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.10-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/knowit/knowit-3.5.13.spec b/redhat/applications/knowit/knowit-3.5.13.spec
deleted file mode 100644
index b76bc64db..000000000
--- a/redhat/applications/knowit/knowit-3.5.13.spec
+++ /dev/null
@@ -1,134 +0,0 @@
-# Default version for this component
-%define kdecomp knowit
-
-# 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:	Tool for managing notes [Trinity]
-Version:	0.10
-Release:	1%{?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
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-KnowIt is a tool for managing notes which are organized in
-tree-like hierarchy. It is similar to TuxCards,
-but KDE-based, and requires Trinity.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-# 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
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%__mkdir_p %{buildroot}%{tde_tdeappdir}
-%__mv %{buildroot}%{tde_datadir}/applnk/Applications/knowit.desktop %{buildroot}%{tde_tdeappdir}/knowit.desktop
-%__rm -r %{buildroot}%{tde_datadir}/applnk
-
-
-%find_lang %{kdecomp}
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/knowit
-%{tde_tdeappdir}/knowit.desktop
-%{tde_datadir}/apps/knowit/knowitui.rc
-%{tde_datadir}/apps/knowit/tips
-%{tde_tdedocdir}/HTML/en/knowit/common
-%{tde_tdedocdir}/HTML/en/knowit/index.cache.bz2
-%{tde_tdedocdir}/HTML/en/knowit/index.docbook
-%{tde_tdedocdir}/HTML/en/knowit/screenshot.png
-%{tde_datadir}/icons/hicolor/*/apps/knowit.png
-
-
-%Changelog
-* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.10-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16