RPM packaging: update kpicosim, kpilot, kpowersave, krecipes, krename

18 files changed, 347 insertions, 1531 deletions

diff --git a/redhat/applications/konversation/konversation-14.0.0.spec b/redhat/applications/konversation/konversation-14.0.0.spec
index 983cbe975..ce36a3b30 100644
--- a/redhat/applications/konversation/konversation-14.0.0.spec
+++ b/redhat/applications/konversation/konversation-14.0.0.spec
@@ -36,7 +36,7 @@ Name:		trinity-%{tde_pkg}
 Epoch:		%{tde_epoch}
 Version:	1.1
 Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
-Summary:	user friendly Internet Relay Chat (IRC) client for TDE [Trinity]
+Summary:	User friendly Internet Relay Chat (IRC) client for TDE
 Group:		Applications/Utilities
 URL:		http://www.trinitydesktop.org/
 
@@ -111,7 +111,6 @@ and experienced users alike will appreciate its many features:
  * DCC file transfer with resume support
 
 
-
 ##########
 
 %if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
diff --git a/redhat/applications/kpicosim/kpicosim-14.0.0.spec b/redhat/applications/kpicosim/kpicosim-14.0.0.spec
index 353c86aac..ee3310dca 100644
--- a/redhat/applications/kpicosim/kpicosim-14.0.0.spec
+++ b/redhat/applications/kpicosim/kpicosim-14.0.0.spec
@@ -1,54 +1,79 @@
-# Default version for this component
-%define tde_pkg kpicosim
+#
+# spec file for package kpicosim (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 kpicosim
+%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.6a
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary:	IDE and simulator for the Xilinx PicoBlaze-3 [Trinity]
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org
 
-Name:			trinity-%{tde_pkg}
-Summary:		IDE and simulator for the Xilinx PicoBlaze-3 [Trinity]
-Version:		0.6a
-Release:		%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
-
-License:		GPLv2+
-Group:			Applications/Utilities
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
 
-Vendor:			Trinity Project
-Packager:		Francois Andriot <[email protected]>
-URL:			http://www.trinitydesktop.org
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <[email protected]>
 
-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:	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
 kpicosim is a development environment for the Xilinx 
@@ -57,10 +82,14 @@ The environment has an editor with syntax highlighting, compiler,
 simulator and export functions to VHDL, HEX and MEM 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}}
@@ -73,7 +102,6 @@ simulator and export functions to VHDL, HEX and MEM files.
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 # Warning: --enable-final causes FTBFS
 %configure \
@@ -128,5 +156,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <[email protected]> - 0.6a-5
+* Fri Jul 05 2013 Francois Andriot <[email protected]> - 2:0.6a-1
 - Initial release for TDE 14.0.0
diff --git a/redhat/applications/kpicosim/kpicosim-3.5.13-fix_not_a_string_literal_error.patch b/redhat/applications/kpicosim/kpicosim-3.5.13-fix_not_a_string_literal_error.patch
deleted file mode 100644
index fa2f57859..000000000
--- a/redhat/applications/kpicosim/kpicosim-3.5.13-fix_not_a_string_literal_error.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kpicosim/src/cassembler.cpp.ORI	2012-08-05 23:39:09.061007283 +0200
-+++ kpicosim/src/cassembler.cpp	2012-08-05 23:42:53.639017712 +0200
-@@ -575,7 +575,7 @@
- 					for( j = 31 ; j >= 0 ; j-- )
- 		 				fprintf( outfile, "%02X", INITP[ j ][ line ] ) ;
- 			} else if ( strcmp( "name", varname ) == 0 ) {
--				fprintf( outfile, entityName.c_str() ) ;				
-+				fprintf( outfile, "%s", entityName.c_str() ) ;				
- 			} else if ( strcmp( "begin template", varname ) == 0 ) {
- 				copy = true ;
- 			}
diff --git a/redhat/applications/kpicosim/kpicosim-3.5.13.1.spec b/redhat/applications/kpicosim/kpicosim-3.5.13.1.spec
deleted file mode 100644
index 06140eb27..000000000
--- a/redhat/applications/kpicosim/kpicosim-3.5.13.1.spec
+++ /dev/null
@@ -1,135 +0,0 @@
-# Default version for this component
-%define kdecomp kpicosim
-
-# 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:	IDE and simulator for the Xilinx PicoBlaze-3 [Trinity]
-Version:	0.6a
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <[email protected]>
-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
-kpicosim is a development environment for the Xilinx 
-PicoBlaze-3 soft-core processor for the KDE Desktop (Linux).
-The environment has an editor with syntax highlighting, compiler,
-simulator and export functions to VHDL, HEX and MEM files.
-
-
-%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_tdeincludedir}
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%find_lang %{kdecomp} || touch %{kdecomp}.lang
-
-
-
-%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,-)
-%doc AUTHORS ChangeLog COPYING NEWS README
-%{tde_bindir}/kpicosim
-%{tde_datadir}/applnk/Development/kpicosim.desktop
-%{tde_datadir}/apps/katepart/syntax/psm.xml
-%{tde_datadir}/apps/kpicosim
-%{tde_tdedocdir}/HTML/en/kpicosim
-%{tde_datadir}/icons/hicolor/*/apps/kpicosim.png
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <[email protected]> - 0.6a-2
-- Initial release for TDE 3.5.13.1
-
-* Wed Nov 30 2011 Francois Andriot <[email protected]> - 0.6a-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kpicosim/kpicosim-3.5.13.spec b/redhat/applications/kpicosim/kpicosim-3.5.13.spec
deleted file mode 100644
index 3d7b5f8c3..000000000
--- a/redhat/applications/kpicosim/kpicosim-3.5.13.spec
+++ /dev/null
@@ -1,131 +0,0 @@
-# Default version for this component
-%define kdecomp kpicosim
-
-# 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:	IDE and simulator for the Xilinx PicoBlaze-3 [Trinity]
-Version:	0.6a
-Release:	1%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <[email protected]>
-URL:		http://www.trinitydesktop.org
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-# [kpicosim] Fix "not a string literal" error
-Patch1:		kpicosim-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:	gettext
-
-
-%description
-kpicosim is a development environment for the Xilinx 
-PicoBlaze-3 soft-core processor for the KDE Desktop (Linux).
-The environment has an editor with syntax highlighting, compiler,
-simulator and export functions to VHDL, HEX and MEM files.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%patch1 -p1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/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_tdeincludedir}
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%find_lang %{kdecomp} || touch %{kdecomp}.lang
-
-
-
-%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,-)
-%doc AUTHORS ChangeLog COPYING NEWS README
-%{tde_bindir}/kpicosim
-%{tde_datadir}/applnk/Development/kpicosim.desktop
-%{tde_datadir}/apps/katepart/syntax/psm.xml
-%{tde_datadir}/apps/kpicosim
-%{tde_tdedocdir}/HTML/en/kpicosim
-%{tde_datadir}/icons/hicolor/*/apps/kpicosim.png
-
-
-%Changelog
-* Wed Nov 30 2011 Francois Andriot <[email protected]> - 0.6a-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kpilot/kpilot-14.0.0.spec b/redhat/applications/kpilot/kpilot-14.0.0.spec
index f01734a2f..b36931281 100644
--- a/redhat/applications/kpilot/kpilot-14.0.0.spec
+++ b/redhat/applications/kpilot/kpilot-14.0.0.spec
@@ -1,52 +1,80 @@
-# Default version for this component
-%define tde_pkg kpilot
+#
+# spec file for package kpilot (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 kpilot
+%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.7
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary:	TDE Palm Pilot hot-sync tool
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org
 
-Name:			trinity-%{tde_pkg}
-Summary:		TDE Palm Pilot hot-sync tool
-Version:		0.7
-Release:		%{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
-
-License:		GPLv2+
-Group:			Applications/Utilities
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
 
-Vendor:			Trinity Project
-Packager:		Francois Andriot <[email protected]>
-URL:			http://www.trinitydesktop.org
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <[email protected]>
 
-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-tdepim-devel >= %{tde_version}
+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
 
 # FLEX
 %if 0%{?suse_version} || 0%{?mgaversion}
@@ -57,9 +85,9 @@ BuildRequires:	flex
 BuildRequires:	flex-devel
 %endif
 
-BuildRequires:	gettext
+# PILOT support
 BuildRequires:	pilot-link-devel >= 0.12
-BuildRequires:	trinity-tdepim-devel >= %{tde_version}
+
 
 %description
 KPilot is an application that synchronizes your Palm Pilot or similar device
@@ -68,10 +96,14 @@ software does for Windows.  KPilot can back-up and restore your Palm Pilot
 and synchronize the built-in applications with their TDE counterparts.
 
 
+##########
+
 %if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
+##########
+
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
@@ -126,7 +158,7 @@ export PATH="%{tde_bindir}:${PATH}"
 
 
 %post
-update-desktop-database %{tde_appdir} > /dev/null
+update-desktop-database %{tde_tdeappdir} > /dev/null
 for f in hicolor locolor crystalsvg; do
   touch --no-create %{tde_datadir}/icons/${f} || :
   gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
@@ -134,7 +166,7 @@ done
 /sbin/ldconfig || :
 
 %postun
-update-desktop-database %{tde_appdir} > /dev/null
+update-desktop-database %{tde_tdeappdir} > /dev/null
 for f in hicolor locolor crystalsvg; do
   touch --no-create %{tde_datadir}/icons/${f} || :
   gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
@@ -176,7 +208,7 @@ done
 %{tde_tdeappdir}/kpalmdoc.desktop
 %{tde_tdeappdir}/kpilot.desktop
 %{tde_tdeappdir}/kpilotdaemon.desktop
-%{tde_datadir}/apps/kaddressbook/contacteditorpages/KPilotCustomFieldEditor.ui
+%{tde_datadir}/apps/kaddressbook/contacteditorpages/
 %{tde_datadir}/apps/tdeconf_update/kpalmdoc.upd
 %{tde_datadir}/apps/tdeconf_update/kpilot.upd
 %{tde_datadir}/apps/kpilot
@@ -189,5 +221,5 @@ done
 %{tde_tdedocdir}/HTML/en/kpilot/
 
 %changelog
-* Mon Jul 29 2013 Francois Andriot <[email protected]> - 0.7-7
+* Mon Jul 29 2013 Francois Andriot <[email protected]> - 2:0.7-1
 - Initial release for TDE 14.0.0
diff --git a/redhat/applications/kpilot/kpilot-3.5.13-ftbfs.patch b/redhat/applications/kpilot/kpilot-3.5.13-ftbfs.patch
deleted file mode 100644
index 00070dbc7..000000000
--- a/redhat/applications/kpilot/kpilot-3.5.13-ftbfs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kpilot/kpilot/pilotDaemon.cc.ORI	2011-11-30 21:55:04.912837969 +0100
-+++ kpilot/kpilot/pilotDaemon.cc	2011-11-30 21:55:11.819786099 +0100
-@@ -313,7 +313,7 @@
- #ifdef DEBUG
- 	DEBUGKPILOT << fname
- 		<< ": The daemon is ready with status "
--		<< statusString() << " (" << (int) fDaemonStatus << ")" << endl;
-+		<< statusString() << " (" << (int) fDaemontqStatus << ")" << endl;
- #endif
- }
- 
diff --git a/redhat/applications/kpilot/kpilot-3.5.13-missing_ldflags.patch b/redhat/applications/kpilot/kpilot-3.5.13-missing_ldflags.patch
deleted file mode 100644
index c655bbeb4..000000000
--- a/redhat/applications/kpilot/kpilot-3.5.13-missing_ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kpilot/lib/Makefile.am.ORI	2012-08-05 23:51:32.492490057 +0200
-+++ kpilot/lib/Makefile.am	2012-08-05 23:51:42.771261684 +0200
-@@ -29,7 +29,7 @@
- 	pilotTodoEntry.cc
- 
- libkpilot_la_LDFLAGS = $(PISOCK_LDFLAGS) -no-undefined $(all_libraries) $(KDE_EXTRA_RPATH) $(KDE_RPATH)
--libkpilot_la_LIBADD = $(PISOCK_LIB) $(LIB_KDEUI) $(LIB_KABC) -lkcal
-+libkpilot_la_LIBADD = $(PISOCK_LIB) $(LIB_KDEUI) $(LIB_KABC) -lkcal $(LIB_QT) $(LIB_KDECORE) -lDCOP $(LIB_KIO)
- 
- kpilotincludedir = $(includedir)/kpilot
- kpilotinclude_HEADERS = \
diff --git a/redhat/applications/kpilot/kpilot-3.5.13.1.spec b/redhat/applications/kpilot/kpilot-3.5.13.1.spec
deleted file mode 100644
index 8a0a7ef69..000000000
--- a/redhat/applications/kpilot/kpilot-3.5.13.1.spec
+++ /dev/null
@@ -1,184 +0,0 @@
-# Default version for this component
-%define kdecomp kpilot
-
-# 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:	TDE Palm Pilot hot-sync tool
-Version:	0.7
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <[email protected]>
-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
-
-BuildRequires:	pilot-link-devel
-BuildRequires:	trinity-kdepim-devel
-
-%description
-KPilot is an application that synchronizes your Palm Pilot or similar device
-(like the Handspring Visor) with your KDE desktop, much like the Palm HotSync
-software does for Windows.  KPilot can back-up and restore your Palm Pilot
-and synchronize the built-in applications with their KDE counterparts.
-
-
-%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_tdeincludedir}
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# Unwanted files
-%__rm -f %{?buildroot}%{tde_libdir}/libkpilot.so
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-for f in hicolor locolor crystalsvg; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-for f in hicolor locolor crystalsvg; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig || :
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/kpalmdoc
-%{tde_bindir}/kpilot
-%{tde_bindir}/kpilotDaemon
-%{tde_tdeincludedir}/kpilot
-%{tde_libdir}/libkpilot.la
-%{tde_libdir}/libkpilot.so.0
-%{tde_libdir}/libkpilot.so.0.0.0
-%{tde_tdelibdir}/conduit_address.la
-%{tde_tdelibdir}/conduit_address.so
-%{tde_tdelibdir}/conduit_doc.la
-%{tde_tdelibdir}/conduit_doc.so
-%{tde_tdelibdir}/conduit_knotes.la
-%{tde_tdelibdir}/conduit_knotes.so
-%{tde_tdelibdir}/conduit_memofile.la
-%{tde_tdelibdir}/conduit_memofile.so
-%{tde_tdelibdir}/conduit_notepad.la
-%{tde_tdelibdir}/conduit_notepad.so
-%{tde_tdelibdir}/conduit_popmail.la
-%{tde_tdelibdir}/conduit_popmail.so
-%{tde_tdelibdir}/conduit_sysinfo.la
-%{tde_tdelibdir}/conduit_sysinfo.so
-%{tde_tdelibdir}/conduit_time.la
-%{tde_tdelibdir}/conduit_time.so
-%{tde_tdelibdir}/conduit_todo.la
-%{tde_tdelibdir}/conduit_todo.so
-%{tde_tdelibdir}/conduit_vcal.la
-%{tde_tdelibdir}/conduit_vcal.so
-%{tde_tdelibdir}/kcm_kpilot.la
-%{tde_tdelibdir}/kcm_kpilot.so
-%{tde_tdeappdir}/kpalmdoc.desktop
-%{tde_tdeappdir}/kpilot.desktop
-%{tde_tdeappdir}/kpilotdaemon.desktop
-%{tde_datadir}/apps/kaddressbook/contacteditorpages/KPilotCustomFieldEditor.ui
-%{tde_datadir}/apps/kconf_update/kpalmdoc.upd
-%{tde_datadir}/apps/kconf_update/kpilot.upd
-%{tde_datadir}/apps/kpilot
-%{tde_datadir}/config.kcfg/*.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/*.png
-%{tde_datadir}/icons/hicolor/*/apps/*.png
-%{tde_datadir}/icons/locolor/*/apps/*.png
-%{tde_datadir}/services/*.desktop
-%{tde_datadir}/servicetypes/kpilotconduit.desktop
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <[email protected]> - 0.7-3
-- Initial release for TDE 3.5.13.1
-
-* Wed May 02 2012 Francois Andriot <[email protected]> - 0.7-2
-- Rebuild for Fedora 17
-
-* Wed Nov 30 2011 Francois Andriot <[email protected]> - 0.7-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kpilot/kpilot-3.5.13.spec b/redhat/applications/kpilot/kpilot-3.5.13.spec
deleted file mode 100644
index b03a819d3..000000000
--- a/redhat/applications/kpilot/kpilot-3.5.13.spec
+++ /dev/null
@@ -1,185 +0,0 @@
-# Default version for this component
-%define kdecomp kpilot
-
-# 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:	TDE Palm Pilot hot-sync tool
-Version:	0.7
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <[email protected]>
-URL:		http://www.trinitydesktop.org
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-# Fix FTBFS
-Patch0:		kpilot-3.5.13-ftbfs.patch
-
-# [kpilot] Missing LDFLAGS cause FTBFS on Mageia / Mandriva
-Patch1:		kpilot-3.5.13-missing_ldflags.patch
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	pilot-link-devel
-BuildRequires:	trinity-kdepim-devel
-
-%description
-KPilot is an application that synchronizes your Palm Pilot or similar device
-(like the Handspring Visor) with your KDE desktop, much like the Palm HotSync
-software does for Windows.  KPilot can back-up and restore your Palm Pilot
-and synchronize the built-in applications with their KDE counterparts.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%patch0 -p1
-%patch1 -p1 -b .ldflags
-
-# 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_tdeincludedir}
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# Unwanted files
-%__rm -f %{?buildroot}%{tde_libdir}/libkpilot.so
-
-%find_lang %{kdecomp}
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-for f in hicolor locolor crystalsvg; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-for f in hicolor locolor crystalsvg; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig || :
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/kpalmdoc
-%{tde_bindir}/kpilot
-%{tde_bindir}/kpilotDaemon
-%{tde_tdeincludedir}/kpilot
-%{tde_libdir}/libkpilot.la
-%{tde_libdir}/libkpilot.so.0
-%{tde_libdir}/libkpilot.so.0.0.0
-%{tde_tdelibdir}/conduit_address.la
-%{tde_tdelibdir}/conduit_address.so
-%{tde_tdelibdir}/conduit_doc.la
-%{tde_tdelibdir}/conduit_doc.so
-%{tde_tdelibdir}/conduit_knotes.la
-%{tde_tdelibdir}/conduit_knotes.so
-%{tde_tdelibdir}/conduit_memofile.la
-%{tde_tdelibdir}/conduit_memofile.so
-%{tde_tdelibdir}/conduit_notepad.la
-%{tde_tdelibdir}/conduit_notepad.so
-%{tde_tdelibdir}/conduit_popmail.la
-%{tde_tdelibdir}/conduit_popmail.so
-%{tde_tdelibdir}/conduit_sysinfo.la
-%{tde_tdelibdir}/conduit_sysinfo.so
-%{tde_tdelibdir}/conduit_time.la
-%{tde_tdelibdir}/conduit_time.so
-%{tde_tdelibdir}/conduit_todo.la
-%{tde_tdelibdir}/conduit_todo.so
-%{tde_tdelibdir}/conduit_vcal.la
-%{tde_tdelibdir}/conduit_vcal.so
-%{tde_tdelibdir}/kcm_kpilot.la
-%{tde_tdelibdir}/kcm_kpilot.so
-%{tde_tdeappdir}/kpalmdoc.desktop
-%{tde_tdeappdir}/kpilot.desktop
-%{tde_tdeappdir}/kpilotdaemon.desktop
-%{tde_datadir}/apps/kaddressbook/contacteditorpages/KPilotCustomFieldEditor.ui
-%{tde_datadir}/apps/kconf_update/kpalmdoc.upd
-%{tde_datadir}/apps/kconf_update/kpilot.upd
-%{tde_datadir}/apps/kpilot
-%{tde_datadir}/config.kcfg/*.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/*.png
-%{tde_datadir}/icons/hicolor/*/apps/*.png
-%{tde_datadir}/icons/locolor/*/apps/*.png
-%{tde_datadir}/services/*.desktop
-%{tde_datadir}/servicetypes/kpilotconduit.desktop
-
-
-%Changelog
-* Wed May 02 2012 Francois Andriot <[email protected]> - 0.7-2
-- Rebuild for Fedora 17
-
-* Wed Nov 30 2011 Francois Andriot <[email protected]> - 0.7-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kpowersave/kpowersave-14.0.0.spec b/redhat/applications/kpowersave/kpowersave-14.0.0.spec
index e3a7459e4..36d3b7409 100644
--- a/redhat/applications/kpowersave/kpowersave-14.0.0.spec
+++ b/redhat/applications/kpowersave/kpowersave-14.0.0.spec
@@ -1,56 +1,109 @@
-# Default version for this component
-%define tde_pkg kpowersave
+#
+# spec file for package kpowersave (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 kpowersave
+%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.7.3
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary:	HAL based power management applet for Trinityfiles or directories.
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org/
 
-Name:			trinity-%{tde_pkg}
-Version:		0.7.3
-Release:		%{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
-Summary:		HAL based power management applet for Trinityfiles or directories.
-
-License:		GPLv2+
-Group:			Applications/Utilities
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
 
-Vendor:			Trinity Project
-Packager:		Francois Andriot <[email protected]>
-URL:			http://www.trinitydesktop.org/
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <[email protected]>
 
-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:	hal-devel
 BuildRequires:	trinity-dbus-tqt-devel >= 1:0.63
 
+BuildRequires:	cmake libtool
+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
+
+# XSCREENSAVER support
+#  RHEL 4: disabled
+#  RHEL 6: available in EPEL
+#  RHEL 7: available in NUX
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 5 || 0%{?suse_version} || 0%{?with_xscreensaver}
+%define with_xscreensaver 1
+
+%if 0%{?fedora} || 0%{?rhel} >= 5
+BuildRequires:	libXScrnSaver-devel
+BuildRequires:	xscreensaver
+BuildRequires:	xscreensaver-base
+BuildRequires:	xscreensaver-extras
+%if 0%{?fedora}
+BuildRequires:	xscreensaver-extras-base
+%endif
+BuildRequires:	xscreensaver-gl-base
+BuildRequires:	xscreensaver-gl-extras
+%endif
+
+%if 0%{?suse_version}
+BuildRequires:	libXScrnSaver-devel
+BuildRequires:	xscreensaver
+BuildRequires:	xscreensaver-data
+BuildRequires:	xscreensaver-data-extra
+%endif
+
+%endif
+
 
 %description
 KPowersave is a TDE systray applet which allows to control the power 
@@ -83,10 +136,14 @@ settings for:
  * notification settings
 
 
-%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}}
@@ -160,5 +217,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 %{tde_datadir}/config/kpowersaverc
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <[email protected]> - 0.7.3-6
+* Fri Jul 05 2013 Francois Andriot <[email protected]> - 2:0.7.3-1
 - Initial release for TDE 14.0.0
diff --git a/redhat/applications/kpowersave/kpowersave-3.5.13.1.spec b/redhat/applications/kpowersave/kpowersave-3.5.13.1.spec
deleted file mode 100644
index 7ee0dff8d..000000000
--- a/redhat/applications/kpowersave/kpowersave-3.5.13.1.spec
+++ /dev/null
@@ -1,158 +0,0 @@
-# Default version for this component
-%define kdecomp kpowersave
-
-# 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}
-Version:	0.7.3
-Release:	3%{?dist}%{?_variant}
-Summary:	HAL based power management applet for Trinityfiles or directories.
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <[email protected]>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-
-%description
-KPowersave is a TDE systray applet which allows to control the power 
-management settings and policies of your computer.
-It relies on HAL to do the heavy lifting.
-
-Current feature list:
- * support for ACPI, APM and PMU
- * trigger suspend to disk/ram and standby
- * switch cpu frequency policy (between: performance, dynamic and powersave)
- * applet icon with information about AC state, battery fill and battery
-   (warning) states
- * applet tooltip with information about battery fill and remaining battery 
-   time/percentage
- * autosuspend (to suspend the machine if the user has been inactive for a 
-   defined time)
- * a global configurable blacklist with programs which prevent autosuspend
-   (e.g. videoplayer and cd burning tools)
- * trigger lock screen and select the lock method
- * KNotify support
- * online help
- * localisations for many languages
- 
-KPowersave supports schemes with following configurable specific 
-settings for:
- * screensaver
- * DPMS
- * autosuspend
- * scheme specific blacklist for autosuspend
- * notification settings
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-	
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__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
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%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
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_bindir}/kpowersave
-%{tde_libdir}/libkdeinit_kpowersave.la
-%{tde_libdir}/libkdeinit_kpowersave.so
-%{tde_tdelibdir}/kpowersave.la
-%{tde_tdelibdir}/kpowersave.so
-%{tde_tdeappdir}/kpowersave.desktop
-%{tde_datadir}/apps/kpowersave/eventsrc
-%{tde_datadir}/apps/kpowersave/icons/*/*/*/*.png
-%{tde_datadir}/icons/hicolor/*/*/*.png
-%{tde_datadir}/autostart/kpowersave-autostart.desktop
-%{tde_datadir}/config/kpowersaverc
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <[email protected]> - 0.7.3-3
-- Initial release for TDE 3.5.13.1
-
-* Sat Nov 26 2011 Francois Andriot <[email protected]> - 0.7.3-2
-- Add missing /sbin/ldconfig
-- Add missing doc file
-
-* Sat Nov 19 2011 Francois Andriot <[email protected]> - 0.7.3-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kpowersave/kpowersave-3.5.13.spec b/redhat/applications/kpowersave/kpowersave-3.5.13.spec
deleted file mode 100644
index 61c9fe930..000000000
--- a/redhat/applications/kpowersave/kpowersave-3.5.13.spec
+++ /dev/null
@@ -1,150 +0,0 @@
-# Default version for this component
-%define kdecomp kpowersave
-
-# 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}
-Version:	0.7.3
-Release:	2%{?dist}%{?_variant}
-Summary:	HAL based power management applet for Trinityfiles or directories.
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <[email protected]>
-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
-
-%description
-KPowersave is a TDE systray applet which allows to control the power 
-management settings and policies of your computer.
-It relies on HAL to do the heavy lifting.
-
-Current feature list:
- * support for ACPI, APM and PMU
- * trigger suspend to disk/ram and standby
- * switch cpu frequency policy (between: performance, dynamic and powersave)
- * applet icon with information about AC state, battery fill and battery
-   (warning) states
- * applet tooltip with information about battery fill and remaining battery 
-   time/percentage
- * autosuspend (to suspend the machine if the user has been inactive for a 
-   defined time)
- * a global configurable blacklist with programs which prevent autosuspend
-   (e.g. videoplayer and cd burning tools)
- * trigger lock screen and select the lock method
- * KNotify support
- * online help
- * localisations for many languages
- 
-KPowersave supports schemes with following configurable specific 
-settings for:
- * screensaver
- * DPMS
- * autosuspend
- * scheme specific blacklist for autosuspend
- * notification settings
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-	
-%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
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%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
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_bindir}/kpowersave
-%{tde_libdir}/libkdeinit_kpowersave.la
-%{tde_libdir}/libkdeinit_kpowersave.so
-%{tde_tdelibdir}/kpowersave.la
-%{tde_tdelibdir}/kpowersave.so
-%{tde_tdeappdir}/kpowersave.desktop
-%{tde_datadir}/apps/kpowersave/eventsrc
-%{tde_datadir}/apps/kpowersave/icons/*/*/*/*.png
-%{tde_datadir}/icons/hicolor/*/*/*.png
-%{tde_datadir}/autostart/kpowersave-autostart.desktop
-%{tde_datadir}/config/kpowersaverc
-
-%Changelog
-* Sat Nov 26 2011 Francois Andriot <[email protected]> - 0.7.3-2
-- Add missing /sbin/ldconfig
-- Add missing doc file
-
-* Sat Nov 19 2011 Francois Andriot <[email protected]> - 0.7.3-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/krecipes/krecipes-14.0.0.spec b/redhat/applications/krecipes/krecipes-14.0.0.spec
index 43af9cd92..35197c331 100644
--- a/redhat/applications/krecipes/krecipes-14.0.0.spec
+++ b/redhat/applications/krecipes/krecipes-14.0.0.spec
@@ -1,8 +1,24 @@
-# Default version for this component
-%define tde_pkg krecipes
+#
+# spec file for package krecipes (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
+%define tde_pkg krecipes
 %define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
@@ -14,37 +30,49 @@
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
-%define _docdir %{tde_docdir}
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
 
 
-Name:			trinity-%{tde_pkg}
-Summary:		Recipes manager for TDE
-Version:		1.0beta2
-Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	1.0beta2
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary:	Recipes manager for TDE
+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 <[email protected]>
-URL:			http://www.trinitydesktop.org/
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <[email protected]>
 
-Prefix:			%{_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-tdelibs-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
+
 # MYSQL support
 BuildRequires:	mysql-devel
 
@@ -54,6 +82,7 @@ BuildRequires:	postgresql-devel
 # SQLITE support
 BuildRequires:	sqlite-devel
 
+
 %description
 Krecipes is a TDE application designed to manage recipes. It can help you to
 do your shopping list, search through your recipes to find what you can do
@@ -61,7 +90,9 @@ with available ingredients and a diet helper. It can also import or export
 recipes from files in various format (eg RecipeML or Meal-Master) or from
 databases.
 
-%if 0%{?pclinuxos}
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
@@ -110,6 +141,18 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %find_lang %{tde_pkg}
 
+# Fix desktop file location
+%__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
+%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/krecipes.desktop" "%{?buildroot}%{tde_tdeappdir}"
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -r krecipes Education Chemistry
+%endif
+
+# Removes duplicate files
+%fdupes "%{buildroot}%{tde_datadir}"
+
 
 %clean
 %__rm -rf %{buildroot}
@@ -132,7 +175,7 @@ done
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
 %{tde_bindir}/krecipes
-%{tde_datadir}/applnk/Utilities/krecipes.desktop
+%{tde_tdeappdir}/krecipes.desktop
 %{tde_datadir}/apps/krecipes/
 %{tde_datadir}/icons/crystalsvg/*/mimetypes/krecipes_file.png
 %{tde_datadir}/icons/hicolor/*/apps/krecipes.png
@@ -147,5 +190,5 @@ done
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <[email protected]> - 1.0beta2-1
+* Fri Jul 05 2013 Francois Andriot <[email protected]> - 2:1.0beta2-1
 - Initial release for TDE 14.0.0
diff --git a/redhat/applications/krename/krename-14.0.0.spec b/redhat/applications/krename/krename-14.0.0.spec
index 560862453..bee98b406 100644
--- a/redhat/applications/krename/krename-14.0.0.spec
+++ b/redhat/applications/krename/krename-14.0.0.spec
@@ -1,52 +1,78 @@
-# Default version for this component
-%define tde_pkg krename
+#
+# spec file for package krename (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 krename
+%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 TDE batch file renaming utility. 
-Version:		3.0.14
-Release:		%{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant}
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	3.0.14
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary:	A TDE batch file renaming utility. 
+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 <[email protected]>
-URL:			http://www.trinitydesktop.org/
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <[email protected]>
 
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
+BuildRequires:	autoconf automake libtool m4
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	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
 KRename is a powerful batch renamer for TDE. It allows you to easily rename hundreds or
@@ -54,10 +80,14 @@ even more files in one go. The filenames can be created by parts of the original
 numbering the files or accessing hundreds of informations about the file, like creation date
 or Exif informations of an image. 
 
-%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}}
@@ -98,6 +128,13 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %find_lang %{tde_pkg}
 
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file krename System FileManager
+%suse_update_desktop_file -n %{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/krename_dir.desktop
+%suse_update_desktop_file -n %{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/krenameservicemenu.desktop
+%endif
+
 
 %clean
 %__rm -rf %{buildroot}
@@ -108,14 +145,14 @@ for f in hicolor locolor ; do
   touch --no-create %{tde_datadir}/icons/${f} || :
   gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
 done
-update-desktop-database %{tde_appdir} &> /dev/null
+update-desktop-database %{tde_tdeappdir} &> /dev/null
 
 %postun
 for f in hicolor locolor ; do
   touch --no-create %{tde_datadir}/icons/${f} || :
   gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
 done
-update-desktop-database %{tde_appdir} &> /dev/null
+update-desktop-database %{tde_tdeappdir} &> /dev/null
 
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
@@ -131,5 +168,5 @@ update-desktop-database %{tde_appdir} &> /dev/null
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <[email protected]> - 3.0.14-8
+* Fri Jul 05 2013 Francois Andriot <[email protected]> - 2:3.0.14-1
 - Initial release for TDE 14.0.0
diff --git a/redhat/applications/krename/krename-3.5.12.spec b/redhat/applications/krename/krename-3.5.12.spec
deleted file mode 100644
index dce4f5655..000000000
--- a/redhat/applications/krename/krename-3.5.12.spec
+++ /dev/null
@@ -1,105 +0,0 @@
-# Default version for this component
-%define kdecomp krename
-%define version 3.0.14
-%define release 2
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
-%define _variant .opt
-%define _docdir %{tde_prefix}/share/doc
-%endif
-
-# TDE 3.5.12 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}
-%define tde_includedir %{tde_includedir}/kde
-%define tde_libdir %{tde_libdir}/kde3
-
-
-Name:		trinity-%{kdecomp}
-Summary:	A KDE batch file renaming utility. 
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <[email protected]>
-URL:		http://www.trinitydesktop.org/
-
-Source0:	%{kdecomp}-3.5.12.tar.gz
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-BuildRequires: imlib-devel
-
-%description
-KRename is a powerful batch renamer for KDE 3.x. It allows you to easily rename hundreds or
-even more files in one go. The filenames can be created by parts of the original filename,
-numbering the files or accessing hundreds of informations about the file, like creation date
-or Exif informations of an image. 
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/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 \
-	--disable-rpath \
-    --with-extra-includes=%{tde_includedir}/tqt \
-    --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%make_install
-
-
-%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
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/*
-%{tde_datadir}/applications/*/*.desktop
-%{tde_datadir}/apps/*/
-%{tde_tdedocdir}/HTML/en/*/
-%{tde_datadir}/icons/*/*/*/*
-%{tde_datadir}/locale/*/*/*.mo
-
-
-%Changelog
-* Tue Sep 14 2011 Francois Andriot <[email protected]> - 3.0.14-2
-- Import to GIT
-
-* Wed Aug 24 2011 Francois Andriot <[email protected]> - 3.0.14-1
-- Correct macro to install under "/opt", if desired
-
-* Sun Aug 14 2011 Francois Andriot <[email protected]> - 3.0.14-0
-- Initial release for RHEL 6.0
-
diff --git a/redhat/applications/krename/krename-3.5.13.1.spec b/redhat/applications/krename/krename-3.5.13.1.spec
deleted file mode 100644
index 2a5d281c1..000000000
--- a/redhat/applications/krename/krename-3.5.13.1.spec
+++ /dev/null
@@ -1,155 +0,0 @@
-# Default version for this component
-%define kdecomp krename
-
-# 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 TDE batch file renaming utility. 
-Version:	3.0.14
-Release:	5%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <[email protected]>
-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
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	imlib-devel
-%endif
-
-%description
-KRename is a powerful batch renamer for TDE. It allows you to easily rename hundreds or
-even more files in one go. The filenames can be created by parts of the original filename,
-numbering the files or accessing hundreds of informations about the file, like creation date
-or Exif informations of an image. 
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-update-desktop-database %{tde_appdir} &> /dev/null
-
-%postun
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-update-desktop-database %{tde_appdir} &> /dev/null
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/krename
-%{tde_tdeappdir}/krename.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/krename_dir.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/krenameservicemenu.desktop
-%{tde_datadir}/apps/krename/
-%{tde_tdedocdir}/HTML/en/krename/
-%{tde_datadir}/icons/hicolor/*/apps/krename.png
-%{tde_datadir}/icons/locolor/*/apps/krename.png
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <[email protected]> - 3.0.14-5
-- Initial release for TDE 3.5.13.1
-
-* Wed May 02 2012 Francois Andriot <[email protected]> - 3.0.14-4
-- Rebuild for Fedora 17
-- Fix HTML directory location
-
-* Sun Oct 30 2011 Francois Andriot <[email protected]> - 3.0.14-3
-- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
-
-* Tue Sep 14 2011 Francois Andriot <[email protected]> - 3.0.14-2
-- Import to GIT
-
-* Wed Aug 24 2011 Francois Andriot <[email protected]> - 3.0.14-1
-- Correct macro to install under "/opt", if desired
-
-* Sun Aug 14 2011 Francois Andriot <[email protected]> - 3.0.14-0
-- Initial release for RHEL 6.0
-
diff --git a/redhat/applications/krename/krename-3.5.13.spec b/redhat/applications/krename/krename-3.5.13.spec
deleted file mode 100644
index 21d91105f..000000000
--- a/redhat/applications/krename/krename-3.5.13.spec
+++ /dev/null
@@ -1,144 +0,0 @@
-# Default version for this component
-%define kdecomp krename
-
-# 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 TDE batch file renaming utility. 
-Version:	3.0.14
-Release:	4%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <[email protected]>
-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: imlib-devel
-
-%description
-KRename is a powerful batch renamer for TDE. It allows you to easily rename hundreds or
-even more files in one go. The filenames can be created by parts of the original filename,
-numbering the files or accessing hundreds of informations about the file, like creation date
-or Exif informations of an image. 
-
-%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 \
-  --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-update-desktop-database %{tde_appdir} &> /dev/null
-
-%postun
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-update-desktop-database %{tde_appdir} &> /dev/null
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/krename
-%{tde_tdeappdir}/krename.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/krename_dir.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/krenameservicemenu.desktop
-%{tde_datadir}/apps/krename/
-%{tde_tdedocdir}/HTML/en/krename/
-%{tde_datadir}/icons/hicolor/*/apps/krename.png
-%{tde_datadir}/icons/locolor/*/apps/krename.png
-
-
-%Changelog
-* Wed May 02 2012 Francois Andriot <[email protected]> - 3.0.14-4
-- Rebuild for Fedora 17
-- Fix HTML directory location
-
-* Sun Oct 30 2011 Francois Andriot <[email protected]> - 3.0.14-3
-- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
-
-* Tue Sep 14 2011 Francois Andriot <[email protected]> - 3.0.14-2
-- Import to GIT
-
-* Wed Aug 24 2011 Francois Andriot <[email protected]> - 3.0.14-1
-- Correct macro to install under "/opt", if desired
-
-* Sun Aug 14 2011 Francois Andriot <[email protected]> - 3.0.14-0
-- Initial release for RHEL 6.0
-