RPM Packaging: update krusader, kscope, ksensors, kshowmail, kshutdown

9 files changed, 359 insertions, 512 deletions

diff --git a/redhat/applications/krusader/krusader-14.0.0.spec b/redhat/applications/krusader/krusader-14.0.0.spec
index b62b79384..0882e5163 100644
--- a/redhat/applications/krusader/krusader-14.0.0.spec
+++ b/redhat/applications/krusader/krusader-14.0.0.spec
@@ -1,54 +1,79 @@
-# Default version for this component
-%define tde_pkg krusader
+#
+# spec file for package krusader (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 krusader
+%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:		twin-panel (commander-style) file manager for TDE (and other desktops)
-Version:		1.90.0
-Release:		%{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	1.90.0
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary:	Twin-panel (commander-style) file manager for TDE (and other desktops)
+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:	trinity-tdebindings-devel >= %{tde_version}
 
+BuildRequires:	autoconf automake libtool m4
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
 
 %description
 Krusader is a simple, easy, powerful, twin-panel (commander-style) file
@@ -70,10 +95,14 @@ Almost completely customizable, Krusader is very user friendly, fast and looks
 great on your desktop.
 
 
-%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}}
@@ -115,20 +144,27 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %find_lang %{tde_pkg}
 
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
+%suse_update_desktop_file krusader            System FileManager
+%suse_update_desktop_file krusader_root-mode  System FileManager
+%endif
+
 
 %clean
 %__rm -rf %{buildroot}
 
 
 %post
-update-desktop-database %{tde_appdir} > /dev/null
+update-desktop-database %{tde_tdeappdir} > /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
+update-desktop-database %{tde_tdeappdir} > /dev/null
 for f in crystalsvg locolor ; do
   touch --no-create %{tde_datadir}/icons/${f} || :
   gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
@@ -158,5 +194,5 @@ done
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.90.0-6
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:1.90.0-1
 - Initial release for TDE 14.0.0
diff --git a/redhat/applications/krusader/krusader-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/krusader/krusader-3.5.13-fix_gcc47_compilation.patch
deleted file mode 100644
index cc1e71ff0..000000000
--- a/redhat/applications/krusader/krusader-3.5.13-fix_gcc47_compilation.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-commit fdf6d34084255fa4e17833f8ef93626e5dd926e6
-Author: Darrell Anderson <humanreadable@yahoo.com>
-Date:   1335632256 -0500
-
-    GCC 4.7 fixes.
-
-diff --git a/krusader/UserAction/tstring.h b/krusader/UserAction/tstring.h
-index 94ece59..9356e5c 100644
---- a/krusader/UserAction/tstring.h
-+++ b/krusader/UserAction/tstring.h
-@@ -14,6 +14,9 @@
- #include <tqvaluelist.h>
- #include <utility>
- #include <cassert>
-+
-+using namespace std;
-+
- template <class T>
- class TagString_t
- {
diff --git a/redhat/applications/krusader/krusader-3.5.13-fix_not_a_string_literal_error.patch b/redhat/applications/krusader/krusader-3.5.13-fix_not_a_string_literal_error.patch
deleted file mode 100644
index 754544dc3..000000000
--- a/redhat/applications/krusader/krusader-3.5.13-fix_not_a_string_literal_error.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- krusader/krusader/main.cpp.ORI	2012-08-06 00:19:36.475622376 +0200
-+++ krusader/krusader/main.cpp	2012-08-06 00:19:48.867387323 +0200
-@@ -199,7 +199,7 @@
-        exit( 0 );
-     TQCString regName = client->registerAs( KApplication::kApplication() ->name(), !singleInstanceMode );
-     if( singleInstanceMode && regName != KApplication::kApplication()->name() ) {
--      fprintf( stderr, i18n( "Application already running!\n" ).ascii() );
-+      fprintf( stderr, "%s", i18n( "Application already running!\n" ).ascii() );
- 
-       DCOPClient::mainClient()->send( KApplication::kApplication() ->name(), "Krusader-Interface",
-                                     "moveToTop()", TQByteArray() );
diff --git a/redhat/applications/krusader/krusader-3.5.13.1.spec b/redhat/applications/krusader/krusader-3.5.13.1.spec
deleted file mode 100644
index 07a376302..000000000
--- a/redhat/applications/krusader/krusader-3.5.13.1.spec
+++ /dev/null
@@ -1,164 +0,0 @@
-# Default version for this component
-%define kdecomp krusader
-
-# 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:	twin-panel (commander-style) file manager for KDE (and other desktops)
-Version:	1.90.0
-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:	trinity-tdebindings-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-
-
-%description
-Krusader is a simple, easy, powerful, twin-panel (commander-style) file
-manager for TDE and other desktops, similar to Midnight Commander (C) or Total
-Commander (C).
-
-It provides all the file management features you could possibly want.
-
-Plus: extensive archive handling, mounted filesystem support, FTP,
-advanced search module, viewer/editor, directory synchronisation,
-file content comparisons, powerful batch renaming and much much more.
-
-It supports archive formats: ace, arj, bzip2, deb, iso, lha, rar, rpm, tar,
-zip and 7-zip.
-
-It handles KIOSlaves such as smb:// or fish://.
-
-Almost completely customizable, Krusader is very user friendly, fast and looks
-great on your desktop.
-
-
-%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}
-
-%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,-)
-%doc AUTHORS COPYING FAQ README TODO
-%{tde_bindir}/krusader
-%{tde_tdelibdir}/kio_krarc.la
-%{tde_tdelibdir}/kio_krarc.so
-%{tde_tdelibdir}/kio_virt.la
-%{tde_tdelibdir}/kio_virt.so
-%{tde_tdeappdir}/krusader.desktop
-%{tde_tdeappdir}/krusader_root-mode.desktop
-%{tde_datadir}/apps/krusader
-%{tde_tdedocdir}/HTML/en/krusader/
-%lang(ru) %{tde_tdedocdir}/HTML/ru/krusader/
-%{tde_datadir}/icons/crystalsvg/*/apps/*.png
-%{tde_datadir}/icons/locolor/*/apps/*.png
-%{tde_datadir}/services/krarc.protocol
-%{tde_datadir}/services/virt.protocol
-%{tde_mandir}/man1/krusader.1
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.90.0-3
-- Initial release for TDE 3.5.13.1
-
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.90.0-2
-- Rebuild for Fedora 17
-- GCC 4.7 fixes. [Commit #fdf6d340]
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.90.0-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/krusader/krusader-3.5.13.spec b/redhat/applications/krusader/krusader-3.5.13.spec
deleted file mode 100644
index db8e3bd3a..000000000
--- a/redhat/applications/krusader/krusader-3.5.13.spec
+++ /dev/null
@@ -1,163 +0,0 @@
-# Default version for this component
-%define kdecomp krusader
-
-# 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:	twin-panel (commander-style) file manager for KDE (and other desktops)
-Version:	1.90.0
-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
-
-# [krusader] GCC 4.7 fixes. [Commit #fdf6d340]
-Patch1:		krusader-3.5.13-fix_gcc47_compilation.patch
-# [krusader] Fix "not a string literal" error
-Patch2:		krusader-3.5.13-fix_not_a_string_literal_error.patch
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-
-BuildRequires:	trinity-tdebindings-devel
-
-%description
-Krusader is a simple, easy, powerful, twin-panel (commander-style) file
-manager for TDE and other desktops, similar to Midnight Commander (C) or Total
-Commander (C).
-
-It provides all the file management features you could possibly want.
-
-Plus: extensive archive handling, mounted filesystem support, FTP,
-advanced search module, viewer/editor, directory synchronisation,
-file content comparisons, powerful batch renaming and much much more.
-
-It supports archive formats: ace, arj, bzip2, deb, iso, lha, rar, rpm, tar,
-zip and 7-zip.
-
-It handles KIOSlaves such as smb:// or fish://.
-
-Almost completely customizable, Krusader is very user friendly, fast and looks
-great on your desktop.
-
-
-%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
-
-%__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,-)
-%doc AUTHORS COPYING FAQ README TODO
-%{tde_bindir}/krusader
-%{tde_tdelibdir}/kio_krarc.la
-%{tde_tdelibdir}/kio_krarc.so
-%{tde_tdelibdir}/kio_virt.la
-%{tde_tdelibdir}/kio_virt.so
-%{tde_tdeappdir}/krusader.desktop
-%{tde_tdeappdir}/krusader_root-mode.desktop
-%{tde_datadir}/apps/krusader
-%{tde_tdedocdir}/HTML/en/krusader/
-%lang(ru) %{tde_tdedocdir}/HTML/ru/krusader/
-%{tde_datadir}/icons/crystalsvg/*/apps/*.png
-%{tde_datadir}/icons/locolor/*/apps/*.png
-%{tde_datadir}/services/krarc.protocol
-%{tde_datadir}/services/virt.protocol
-%{tde_mandir}/man1/krusader.1
-
-
-%Changelog
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.90.0-2
-- Rebuild for Fedora 17
-- GCC 4.7 fixes. [Commit #fdf6d340]
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.90.0-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/kscope/kscope-14.0.0.spec b/redhat/applications/kscope/kscope-14.0.0.spec
index 8af7b3b83..1dbe68c8f 100644
--- a/redhat/applications/kscope/kscope-14.0.0.spec
+++ b/redhat/applications/kscope/kscope-14.0.0.spec
@@ -1,42 +1,59 @@
-# Default version for this component
-%define tde_pkg kscope
+#
+# spec file for package kscope (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 kscope
+%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}
+Epoch:		%{tde_epoch}
+Version:	1.6.2
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary:	Source editing environment for TDE
+Group:		Applications/Internet
+URL:		http://kscope.sourceforge.net
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
 
-Name:           trinity-%{tde_pkg}
-Version:        1.6.2
-Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
-Summary:        source editing environment for TDE 
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
 
-Group:          Applications/Internet
-License:        GPLv2+
-URL:            http://kscope.sourceforge.net
-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
@@ -44,6 +61,25 @@ BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 Requires:		cscope
 
+BuildRequires:	autoconf automake libtool m4
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+BuildRequires:	flex
+BuildRequires:	bison
+
+
 %description
 KScope is a TDE front-end to Cscope. It provides a source-editing environment
 for large C projects. KScope is focused on source editing and analysis.
@@ -73,10 +109,14 @@ Main Features:
 * Works with externally-built cscope.out files
 
 
-%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}}
@@ -116,6 +156,15 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %find_lang %{tde_pkg}
 
+# Move desktop icon to correct location
+%__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
+%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}"
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file %{tde_pkg} Development IDE
+%endif
+
 
 %clean
 %__rm -rf $RPM_BUILD_ROOT
@@ -139,7 +188,7 @@ done
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README ChangeLog
 %{tde_bindir}/kscope
-%{tde_datadir}/applnk/Development/kscope.desktop
+%{tde_tdeappdir}/kscope.desktop
 %{tde_datadir}/apps/kscope/
 %{tde_tdedocdir}/HTML/en/kscope/
 %{tde_datadir}/icons/hicolor/*/apps/kscope.png
@@ -147,5 +196,5 @@ done
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.6.2-1
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:1.6.2-1
 - Initial release for TDE 14.0.0
diff --git a/redhat/applications/ksensors/ksensors-14.0.0.spec b/redhat/applications/ksensors/ksensors-14.0.0.spec
index f0396bafa..61f1a164d 100644
--- a/redhat/applications/ksensors/ksensors-14.0.0.spec
+++ b/redhat/applications/ksensors/ksensors-14.0.0.spec
@@ -1,48 +1,79 @@
-# 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 ksensors
+#
+# spec file for package ksensors (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 ksensors
+%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-ksensors
-Version:		0.7.3
-Release:		%{?!preversion:21}%{?preversion:20_%{preversion}}%{?dist}%{?_variant}
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.7.3
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary:	Trinity Frontend to lm_sensors
+Group:		Applications/System
+URL:		http://ksensors.sourceforge.net/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
 
-Summary:        Trinity Frontend to lm_sensors
-Group:          Applications/System
-License:        GPLv2+
-URL:            http://ksensors.sourceforge.net/
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
 
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-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:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
 %if 0%{?suse_version}
 BuildRequires:	libsensors4-devel
 %else
@@ -52,16 +83,21 @@ BuildRequires:	lm_sensors-devel
 # Keep archs in sync with lm_sensors
 ExcludeArch:    s390 s390x
 
+
 %description
 KSensors is a nice lm-sensors frontend for the K Desktop Environment.
 Install the hddtemp package if you wish to monitor hard disk
 temperatures with KSensors.
 
 
-%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}}
@@ -99,13 +135,22 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf $RPM_BUILD_ROOT
 %__make install DESTDIR=$RPM_BUILD_ROOT
 
+# Move desktop icon to correct location
+%__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
+%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}"
+
 # Creates autostart shortcut
 %__install -dm 755 $RPM_BUILD_ROOT%{tde_datadir}/autostart
-%__ln_s ../applnk/Utilities/ksensors.desktop \
-    $RPM_BUILD_ROOT%{tde_datadir}/autostart
+%__ln_s "%{tde_tdeappdir}/ksensors.desktop" \
+    "$RPM_BUILD_ROOT%{tde_datadir}/autostart"
 
 %find_lang %{tde_pkg}
 
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -G "Sensors Frontend" %{tde_pkg} System Monitor
+%endif
+
 
 %clean
 %__rm -rf $RPM_BUILD_ROOT
@@ -131,7 +176,7 @@ done
 %lang(de) %doc LIESMICH
 %lang(fr) %doc LISEZMOI
 %{tde_bindir}/ksensors
-%{tde_datadir}/applnk/System/ksensors.desktop
+%{tde_tdeappdir}/ksensors.desktop
 %{tde_datadir}/apps/ksensors/
 %{tde_datadir}/autostart/ksensors.desktop
 %{tde_datadir}/icons/hicolor/*/apps/ksensors.png
@@ -141,11 +186,5 @@ done
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.7.3-21
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.7.3-1
 - Initial release for TDE 14.0.0
-
-* Sat Jan 19 2013 Francois Andriot <francois.andriot@free.fr> - 0.7.3-20
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.7.3-19p3
-- Initial release for TDE 3.5.13.1
diff --git a/redhat/applications/kshowmail/kshowmail-14.0.0.spec b/redhat/applications/kshowmail/kshowmail-14.0.0.spec
index 52727c6a1..24baaccab 100644
--- a/redhat/applications/kshowmail/kshowmail-14.0.0.spec
+++ b/redhat/applications/kshowmail/kshowmail-14.0.0.spec
@@ -1,56 +1,93 @@
-# 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 kshowmail
+#
+# spec file for package kshowmail (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 kshowmail
+%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:        3.3.1
-Release:		%{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
-Summary:        Look messages into your mail server.
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	3.3.1
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary:	Look messages into your mail server
+Group:		Applications/Internet
+URL:		http://sourceforge.net/projects/kshowmail/
 
-Group:          Applications/Internet
-License:        GPLv2+
-URL:            http://sourceforge.net/projects/kshowmail/
-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:	trinity-tdepim-devel >= %{tde_version}
 
+BuildRequires:	autoconf automake libtool m4
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
 %description
 Very simply kshowmail is a program that allows you to look in on your mail server,
 see what is waiting, decide if it is legitimate, and delete it right off of the server if it is not.
-All without dragging any messages into your computer. 
+All without dragging any messages into your computer.
+
+##########
 
-%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}}
 
@@ -62,7 +99,6 @@ All without dragging any messages into your computer.
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
   --prefix=%{tde_prefix} \
@@ -89,6 +125,19 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %find_lang %{tde_pkg}
 
+# Move desktop icon to correct location
+%__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
+%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}"
+
+# Install missing icons
+install -D -m 644 "pics/cr16-app-kshowmail.png" "$RPM_BUILD_ROOT%{tde_datadir}/icons/hicolor/16x16/apps/kshowmail.png"
+install -D -m 644 "pics/kshowmail.png"          "$RPM_BUILD_ROOT%{tde_datadir}/icons/hicolor/48x48/apps/kshowmail.png"
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file kshowmail Network Email
+%endif
+
 
 %clean
 %__rm -rf $RPM_BUILD_ROOT
@@ -112,18 +161,10 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 %{tde_tdelibdir}/kcm_kshowmailconfiglog.so
 %{tde_tdelibdir}/kcm_kshowmailconfigspamcheck.la
 %{tde_tdelibdir}/kcm_kshowmailconfigspamcheck.so
-%{tde_datadir}/applnk/Internet/kshowmail.desktop
-%{tde_datadir}/apps/kshowmail/kshowmailui.rc
-%{tde_datadir}/apps/kshowmail/pics/eraser.png
-%{tde_datadir}/apps/kshowmail/pics/kshowmail.png
-%{tde_datadir}/apps/kshowmail/pics/kshowmail24.png
-%{tde_datadir}/apps/kshowmail/pics/letter-closed.png
-%{tde_datadir}/apps/kshowmail/pics/letter-open.png
-%{tde_datadir}/apps/kshowmail/pics/ok.png
-%{tde_datadir}/apps/kshowmail/pics/tool.png
-%{tde_datadir}/apps/kshowmail/sounds/neuepost.wav
-%{tde_datadir}/apps/kshowmail/sounds/newmail.wav
+%{tde_tdeappdir}/kshowmail.desktop
+%{tde_datadir}/apps/kshowmail/
 %{tde_datadir}/icons/crystalsvg/16x16/apps/kshowmail.png
+%{tde_datadir}/icons/hicolor/*/apps/kshowmail.png
 %{tde_datadir}/services/kshowmailconfigaccounts.desktop
 %{tde_datadir}/services/kshowmailconfigactions.desktop
 %{tde_datadir}/services/kshowmailconfigdisplay.desktop
@@ -142,8 +183,5 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 3.3.1-2
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:3.3.1-1
 - Initial release for TDE 14.0.0
-
-* Thu Apr 25 2013 Francois Andriot <francois.andriot@free.fr> - 3.3.1-1
-- Initial release for TDE 3.5.13.2
diff --git a/redhat/applications/kshutdown/kshutdown-14.0.0.spec b/redhat/applications/kshutdown/kshutdown-14.0.0.spec
index 249d51d3b..1a7c60f76 100644
--- a/redhat/applications/kshutdown/kshutdown-14.0.0.spec
+++ b/redhat/applications/kshutdown/kshutdown-14.0.0.spec
@@ -1,45 +1,78 @@
-# 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 kshutdown
+#
+# spec file for package kshutdown (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 kshutdown
+%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:        1.0.4
-Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
-Summary:        An advanced shut down utility for TDE
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	1.0.4
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary:	An advanced shut down utility for TDE
+Group:		Applications/Multimedia
+URL:		http://kde-apps.org/content/show.php?content=41180
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
 
-Group:          Applications/Multimedia
-License:        GPLv2+
-URL:            http://kde-apps.org/content/show.php?content=41180
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+#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:	autoconf automake libtool m4
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
 
 %description
 It has 4 main commands:
@@ -53,10 +86,14 @@ It features time and delay options, command line support, wizard,
 and sounds.
 
 
-%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}}
@@ -96,10 +133,17 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %find_lang %{tde_pkg}
 
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_datadir}/applications/kshutdown.desktop"
+%suse_update_desktop_file %{tde_pkg} Utility DesktopUtility
+%endif
+
 
 %clean
 %__rm -rf $RPM_BUILD_ROOT
 
+
 %post
 update-desktop-database %{tde_datadir}/applications -q &> /dev/null
 for f in hicolor ; do
@@ -130,7 +174,6 @@ done
 %lang(en) %{tde_datadir}/doc/tde/HTML/en/kshutdown/
 
 
-
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.4-1
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:1.0.4-1
 - Initial release for TDE 14.0.0