RPM packaging: update tde-systemsettings, tdesv, tdmtheme, tellico, tork, twin-style-crystal, wlassistant, yakuake

32 files changed, 771 insertions, 2506 deletions

diff --git a/redhat/applications/tde-systemsettings/kde-settings-laptops.directory b/redhat/applications/tde-systemsettings/kde-settings-laptops.directory
index 687a493c4..d37d9ba13 100644
--- a/redhat/applications/tde-systemsettings/kde-settings-laptops.directory
+++ b/redhat/applications/tde-systemsettings/kde-settings-laptops.directory
@@ -11,3 +11,4 @@ Name[pt_BR]=Energia
 Name[ru]=Управление питанием
 Name[sv]=Effekt
 Icon=energy
+OnlyShowIn=TDE;
diff --git a/redhat/applications/tde-systemsettings/kde-systemsettings-3.5.13.1.spec b/redhat/applications/tde-systemsettings/kde-systemsettings-3.5.13.1.spec
deleted file mode 100644
index 0059bb744..000000000
--- a/redhat/applications/tde-systemsettings/kde-systemsettings-3.5.13.1.spec
+++ /dev/null
@@ -1,159 +0,0 @@
-# Default version for this component
-%define kdecomp kde-systemsettings
-
-# 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
-# Currently, menu files under /etc/xdg conflict with KDE4
-%define tde_sysconfdir %{tde_prefix}/etc
-%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-systemsettings
-Summary:	easy to use control centre for TDE
-Version:	0.0svn20070312
-Release:	5%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-Source1:	kde-settings-laptops.directory
-
-Provides:	trinity-kde-systemsettings = %{version}-%{release}
-Obsoletes:	trinity-kde-systemsettings < %{version}-%{release}
-
-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
-
-Requires:	trinity-guidance
-
-%description
-System preferences is a replacement for the TDE
-Control Centre with an improved user interface.
-
-
-%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 -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --sysconfdir=%{tde_sysconfdir} \
-  --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}
-
-%__install -D -m 644 %{SOURCE1} %{buildroot}%{tde_datadir}/desktop-directories/
-
-# Unwanted files
-%__rm -f %{buildroot}%{tde_datadir}/applications/kde/kcmfontinst.desktop
-%__rm -f %{buildroot}%{tde_datadir}/desktop-directories/kde-settings-power.directory
-%__rm -f %{buildroot}%{tde_datadir}/desktop-directories/kde-settings-system.directory
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-xdg-user-dirs-update
-
-%postun
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-xdg-user-dirs-update
-
-%files
-%defattr(-,root,root,-)
-%doc README TODO
-%{tde_sysconfdir}/xdg/menus/applications-merged/system-settings-merge.menu
-%{tde_sysconfdir}/xdg/menus/system-settings.menu
-%{tde_bindir}/systemsettings
-%{tde_datadir}/applications/kde/audioencoding.desktop
-%{tde_datadir}/applications/kde/defaultapplication.desktop
-%{tde_datadir}/applications/kde/kcm_knetworkconfmodule_ss.desktop
-%{tde_datadir}/applications/kde/laptoppowermanagement.desktop
-%{tde_datadir}/applications/kde/medianotifications.desktop
-%{tde_datadir}/applications/kde/systemsettings.desktop
-%{tde_datadir}/apps/systemsettings/systemsettingsui.rc
-%{tde_datadir}/config/systemsettingsrc
-%{tde_datadir}/desktop-directories/*.directory
-%{tde_datadir}/icons/crystalsvg/*/apps/systemsettings.png
-
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-5
-- Initial release for TDE 3.5.13.1
-
-* Wed Jul 11 2012 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-4
-- Fix XDG menu directory location (again)
-
-* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-3
-- Updates 'Requires: trinity-guidance' to reflect package renaming
-
-* Wed Dec 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-2
-- Fix XDG menu directory location
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/tde-systemsettings/kde-systemsettings-3.5.13.spec b/redhat/applications/tde-systemsettings/kde-systemsettings-3.5.13.spec
deleted file mode 100644
index 926efcf41..000000000
--- a/redhat/applications/tde-systemsettings/kde-systemsettings-3.5.13.spec
+++ /dev/null
@@ -1,150 +0,0 @@
-# Default version for this component
-%define kdecomp kde-systemsettings
-
-# 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
-# Currently, menu files under /etc/xdg conflict with KDE4
-%define tde_sysconfdir %{tde_prefix}/etc
-%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-systemsettings
-Summary:	easy to use control centre for TDE
-Version:	0.0svn20070312
-Release:	4%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-Source1:	kde-settings-laptops.directory
-
-Provides:	trinity-kde-systemsettings = %{version}-%{release}
-Obsoletes:	trinity-kde-systemsettings < %{version}-%{release}
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-
-Requires:	trinity-guidance
-
-%description
-System preferences is a replacement for the TDE
-Control Centre with an improved user interface.
-
-
-%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 -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%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} \
-  --sysconfdir=%{tde_sysconfdir} \
-  --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}
-
-%__install -D -m 644 %{SOURCE1} %{buildroot}%{tde_datadir}/desktop-directories/
-
-# Unwanted files
-%__rm -f %{buildroot}%{tde_datadir}/applications/kde/kcmfontinst.desktop
-%__rm -f %{buildroot}%{tde_datadir}/desktop-directories/kde-settings-power.directory
-%__rm -f %{buildroot}%{tde_datadir}/desktop-directories/kde-settings-system.directory
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-xdg-user-dirs-update
-
-%postun
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-xdg-user-dirs-update
-
-%files
-%defattr(-,root,root,-)
-%doc README TODO
-%{tde_sysconfdir}/xdg/menus/applications-merged/system-settings-merge.menu
-%{tde_sysconfdir}/xdg/menus/system-settings.menu
-%{tde_bindir}/systemsettings
-%{tde_datadir}/applications/kde/audioencoding.desktop
-%{tde_datadir}/applications/kde/defaultapplication.desktop
-%{tde_datadir}/applications/kde/kcm_knetworkconfmodule_ss.desktop
-%{tde_datadir}/applications/kde/laptoppowermanagement.desktop
-%{tde_datadir}/applications/kde/medianotifications.desktop
-%{tde_datadir}/applications/kde/systemsettings.desktop
-%{tde_datadir}/apps/systemsettings/systemsettingsui.rc
-%{tde_datadir}/config/systemsettingsrc
-%{tde_datadir}/desktop-directories/*.directory
-%{tde_datadir}/icons/crystalsvg/*/apps/systemsettings.png
-
-
-
-%Changelog
-* Wed Jul 11 2012 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-4
-- Fix XDG menu directory location (again)
-
-* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-3
-- Updates 'Requires: trinity-guidance' to reflect package renaming
-
-* Wed Dec 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-2
-- Fix XDG menu directory location
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.patch b/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.patch
new file mode 100644
index 000000000..c5b383686
--- /dev/null
+++ b/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.patch
@@ -0,0 +1,10 @@
+diff --git a/systemsettings/tdecmodulemenu.cpp b/systemsettings/tdecmodulemenu.cpp
+index 56c1220..d8f84ce 100644
+--- a/systemsettings/tdecmodulemenu.cpp
++++ b/systemsettings/tdecmodulemenu.cpp
+@@ -185,4 +185,5 @@ TQString TDECModuleMenu::deriveCaptionFromPath( const TQString &menuPath )
+ 			return result;
+ 		}
+ 	}
++	return result;
+ }
diff --git a/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec b/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec
index 31a80d8be..338795cbe 100644
--- a/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec
+++ b/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec
@@ -1,74 +1,105 @@
-# Default version for this component
-%define tde_pkg tde-systemsettings
+#
+# spec file for package tde-systemsettings (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
-# Currently, menu files under /etc/xdg conflict with KDE4
-%define tde_sysconfdir %{tde_prefix}/etc
-%endif
-
-# TDE specific building variables
+%define tde_pkg tde-systemsettings
+%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_sysconfdir %{_sysconfdir}/trinity
+%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-systemsettings
-Summary:		easy to use control centre for TDE
-Version:		0.0svn20070312
-Release:		%{?!preversion:9}%{?preversion:8_%{preversion}}%{?dist}%{?_variant}
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.0svn20070312
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary:	Easy to use control centre 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 <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
 
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 Source1:		kde-settings-laptops.directory
+Patch0:			%{tde_pkg}-%{tde_version}.patch
+
 
 Provides:	trinity-kde-systemsettings = %{version}-%{release}
 Obsoletes:	trinity-kde-systemsettings < %{version}-%{release}
 Provides:	trinity-systemsettings = %{version}-%{release}
 Obsoletes:	trinity-systemsettings < %{version}-%{release}
 
-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
+
 Requires:		trinity-guidance
 
+
 %description
 System preferences is a replacement for the TDE
 Control Centre with an improved user interface.
 
+##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
+##########
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+%patch0 -p1
 
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
 %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@@ -113,6 +144,13 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %__rm -f %{buildroot}%{tde_datadir}/applications/tde/laptop.desktop
 
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/audioencoding.desktop"
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/defaultapplication.desktop"
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kcm_knetworkconfmodule_ss.desktop"
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/medianotifications.desktop"
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/systemsettings.desktop"
+
+
 %clean
 %__rm -rf %{buildroot}
 
@@ -130,6 +168,9 @@ update-desktop-database %{tde_tdeappdir} -q &> /dev/null
 %files
 %defattr(-,root,root,-)
 %doc README TODO
+%dir %{tde_sysconfdir}/xdg
+%dir %{tde_sysconfdir}/xdg/menus
+%dir %{tde_sysconfdir}/xdg/menus/applications-merged
 %{tde_sysconfdir}/xdg/menus/applications-merged/tde-system-settings-merge.menu
 %{tde_sysconfdir}/xdg/menus/tde-system-settings.menu
 %{tde_bindir}/systemsettings
@@ -139,7 +180,7 @@ update-desktop-database %{tde_tdeappdir} -q &> /dev/null
 #%{tde_datadir}/applications/tde/laptop.desktop
 %{tde_datadir}/applications/tde/medianotifications.desktop
 %{tde_datadir}/applications/tde/systemsettings.desktop
-%{tde_datadir}/apps/systemsettings/systemsettingsui.rc
+%{tde_datadir}/apps/systemsettings/
 %{tde_datadir}/config/systemsettingsrc
 %{tde_datadir}/desktop-directories/*.directory
 %{tde_datadir}/icons/crystalsvg/*/apps/systemsettings.png
@@ -147,5 +188,5 @@ update-desktop-database %{tde_tdeappdir} -q &> /dev/null
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-9
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.0svn20070312-1
 - Initial release for TDE 14.0.0
diff --git a/redhat/applications/tdesvn/tdesvn-14.0.0.patch b/redhat/applications/tdesvn/tdesvn-14.0.0.patch
new file mode 100644
index 000000000..b22e7f2e4
--- /dev/null
+++ b/redhat/applications/tdesvn/tdesvn-14.0.0.patch
@@ -0,0 +1,57 @@
+--- trinity-tdesvn-14.0.0~pre185+fddfb277/src/svnqt/CMakeLists.txt.sqlite3	2013-12-30 17:57:05.867723485 +0100
++++ trinity-tdesvn-14.0.0~pre185+fddfb277/src/svnqt/CMakeLists.txt	2014-09-16 21:49:29.774968683 +0200
+@@ -45,19 +45,6 @@
+     cache/DatabaseException.cpp
+     )
+ 
+-#     IF (SQLITE_FOUND)
+-        MESSAGE(STATUS "Build own sqlite3 database modul")
+-        SET(SOURCES
+-            ${SOURCES}
+-            cache/sqlite3/qsqlcachedresult.cpp
+-            cache/sqlite3/qsql_sqlite3.cpp
+-            cache/sqlite3/qsqlcachedresult.h
+-            cache/sqlite3/qsql_sqlite3.h
+-        )
+-#     ELSE (SQLITE_FOUND)
+-#         MESSAGE(SEND_ERROR "The QT3 version requires sqlite3 but could not found")
+-#     ENDIF (SQLITE_FOUND)
+-
+ SET(CACHEINST_HEADERS
+     cache/LogCache.hpp
+     cache/ReposLog.hpp
+@@ -150,7 +137,7 @@
+ 
+ # IF (SQLITE_FOUND)
+     TARGET_LINK_LIBRARIES(${svnqt-name} ${SQLITE_LIBRARIES})
+-    INCLUDE_DIRECTORIES(SQLITE_INCLUDE_DIR)
++    INCLUDE_DIRECTORIES(${SQLITE_INCLUDE_DIR})
+ # ELSE (SQLITE_FOUND)
+ #     TARGET_LINK_LIBRARIES(${svnqt-name} ${QT_QTSQL_LIBRARY})
+ # ENDIF (SQLITE_FOUND)
+--- trinity-tdesvn-14.0.0~pre185+fddfb277/src/svnqt/cache/LogCache.cpp.sqlite3	2014-01-28 20:25:28.711539518 +0100
++++ trinity-tdesvn-14.0.0~pre185+fddfb277/src/svnqt/cache/LogCache.cpp	2014-09-16 21:51:37.826387614 +0200
+@@ -10,9 +10,10 @@
+ #include "svnqt/cache/DatabaseException.hpp"
+ 
+ #ifndef NO_SQLITE3
+-#include "sqlite3/qsql_sqlite3.h"
++#include <qsql_sqlite3.h>
+ #define SQLTYPE "QSQLITE3"
+ #else
++#include <qsql_sqlite.h>
+ #define SQLTYPE "QSQLITE"
+ #endif
+ 
+@@ -262,11 +263,6 @@
+ 
+ void LogCache::setupMainDb()
+ {
+-#ifndef NO_SQLITE3
+-    if (!TQSqlDatabase::isDriverAvailable(SQLTYPE)) {
+-        TQSqlDatabase::registerSqlDriver(SQLTYPE,new TQSqlDriverCreator<TQSQLite3Driver>);
+-    }
+-#endif
+     TQDataBase mainDB = m_CacheData->getMainDB();
+     if (!mainDB || !mainDB->open()) {
+         tqWarning("Failed to open main database: %s", (mainDB?mainDB->lastError().text().TOUTF8().data():"No database object."));
diff --git a/redhat/applications/tdesvn/tdesvn-14.0.0.spec b/redhat/applications/tdesvn/tdesvn-14.0.0.spec
index f22b66404..10292e44e 100644
--- a/redhat/applications/tdesvn/tdesvn-14.0.0.spec
+++ b/redhat/applications/tdesvn/tdesvn-14.0.0.spec
@@ -1,59 +1,103 @@
-# Default version for this component
-%define tde_pkg tdesvn
+#
+# spec file for package tdesvn (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 tdesvn
+%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:		subversion client with tight TDE integration [Trinity]
-Version:		1.0.4
-Release:		%{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant}
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	1.0.4
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary:	Subversion client with tight TDE integration
+Group:		Applications/Utilities
+URL:		http://www.elliptique.net/~ken/kima/
 
-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.elliptique.net/~ken/kima/
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
 
-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
+Patch0:			%{tde_pkg}-%{tde_version}.patch
 
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
+BuildRequires:	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
+
+# SVN support
 BuildRequires:	subversion-devel
+
+# SQLITE support
+BuildRequires:	sqlite-devel
+BuildRequires:	libtqt3-mt-sqlite3
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# GAMIN support
+#  Not on openSUSE.
+%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_gamin 1
+BuildRequires:	gamin-devel
+%endif
+
 Requires:		%{name}-tdeio-plugins = %{version}-%{release}
 Requires:		trinity-libsvnqt = %{version}-%{release}
 
 Obsoletes:	trinity-kdesvn < %{version}-%{release}
 Provides:	trinity-kdesvn = %{version}-%{release}
 
+
 %description
 TDESvn is a graphical client for the subversion revision control
 system (svn).
@@ -62,6 +106,46 @@ Besides offering common and advanced svn operations, it features
 a tight integration into TDE and can be embedded into other TDE 
 applications like konqueror via the TDE component technology KParts.
 
+%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 %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%{tde_bindir}/tdesvn
+%{tde_bindir}/tdesvnaskpass
+%{tde_tdelibdir}/tdesvnpart.la
+%{tde_tdelibdir}/tdesvnpart.so
+%{tde_datadir}/applications/tde/tdesvn.desktop
+%{tde_datadir}/apps/tdeconf_update/tdesvn-use-external-update.sh
+%{tde_datadir}/apps/tdeconf_update/tdesvnpartrc-use-external.upd
+%{tde_datadir}/apps/tdesvn/
+%{tde_datadir}/apps/tdesvnpart/
+%{tde_datadir}/apps/konqueror/servicemenus/tdesvn_subversion.desktop
+%{tde_datadir}/config.kcfg/tdesvn_part.kcfg
+%{tde_datadir}/icons/hicolor/*/*/*.png
+%{tde_datadir}/icons/hicolor/*/*/*.svgz
+%{tde_mandir}/man1/tdesvn.1*
+%{tde_mandir}/man1/tdesvnaskpass.1*
+%lang(en) %{tde_tdedocdir}/HTML/en/tdesvn/
+%lang(nl) %{tde_tdedocdir}/HTML/nl/tdesvn/
+%{tde_libdir}/libksvnwidgets.la
+%{tde_libdir}/libksvnwidgets.so
+%{tde_libdir}/libsvnfrontend.la
+%{tde_libdir}/libsvnfrontend.so
+%{tde_libdir}/libtdesvncfgreader.la
+%{tde_libdir}/libtdesvncfgreader.so
+%{tde_libdir}/libtdesvnevents.la
+%{tde_libdir}/libtdesvnevents.so
+%{tde_libdir}/libtdesvnhelpers.la
+%{tde_libdir}/libtdesvnhelpers.so
+
+##########
 
 %package -n trinity-libsvnqt
 Group:			Development/Libraries
@@ -74,6 +158,19 @@ subversion library.
 It is based on the RapidSvn SvnCpp library, a subversion client API 
 written in C++.
 
+%post -n trinity-libsvnqt
+/sbin/ldconfig || :
+
+%postun -n trinity-libsvnqt
+/sbin/ldconfig || :
+
+%files -n trinity-libsvnqt
+%defattr(-,root,root,-)
+%{tde_libdir}/libsvnqt.so.4
+%{tde_libdir}/libsvnqt.so.4.2.2
+
+##########
+
 %package -n trinity-libsvnqt-devel
 Group:			Development/Libraries
 Requires:		trinity-libsvnqt = %{version}-%{release}
@@ -85,6 +182,12 @@ Summary:		Qt wrapper library for subversion (development files) [Trinity]
 This package contains the header files and symbolic links that developers
 using svnqt will need.
 
+%files -n trinity-libsvnqt-devel
+%defattr(-,root,root,-)
+%{tde_includedir}/svnqt
+%{tde_libdir}/libsvnqt.so
+
+##########
 
 %package tdeio-plugins
 Group:			Development/Libraries
@@ -97,26 +200,64 @@ Obsoletes:	trinity-tdesvn-kio-plugins < %{version}-%{release}
 Provides:	trinity-tdesvn-kio-plugins = %{version}-%{release}
 
 %description tdeio-plugins
-This packages includes KIO slaves for svn, svn+file, svn+http, 
+This packages includes TDEIO slaves for svn, svn+file, svn+http, 
 svn+https, svn+ssh. This allows you to access subversion repositories 
-inside any KIO enabled TDE application.
+inside any TDEIO enabled TDE application.
 
 This package is part of tdesvn-trinity.
 
+%post tdeio-plugins
+for proto in svn+file svn+http svn+https svn+ssh svn; do
+  update-alternatives --install \
+    %{tde_datadir}/services/${proto}.protocol \
+    ${proto}.protocol \
+    %{tde_datadir}/services/${proto}.protocol_tdesvn \
+    20
+done
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%preun tdeio-plugins
+if [ $1 -eq 0 ]; then
+  for proto in svn+file svn+http svn+https svn+ssh svn; do
+    update-alternatives --remove \
+      ${proto}.protocol \
+      %{tde_datadir}/services/${proto}.protocol_tdesvn || :
+  done
+fi
+
+%files tdeio-plugins
+%defattr(-,root,root,-)
+%{tde_datadir}/services/kded/tdesvnd.desktop
+%{tde_datadir}/services/ksvn+file.protocol
+%{tde_datadir}/services/ksvn+http.protocol
+%{tde_datadir}/services/ksvn+https.protocol
+%{tde_datadir}/services/ksvn+ssh.protocol
+%{tde_datadir}/services/ksvn.protocol
+%{tde_datadir}/services/svn+file.protocol_tdesvn
+%{tde_datadir}/services/svn+http.protocol_tdesvn
+%{tde_datadir}/services/svn+https.protocol_tdesvn
+%{tde_datadir}/services/svn+ssh.protocol_tdesvn
+%{tde_datadir}/services/svn.protocol_tdesvn
+%{tde_tdelibdir}/tdeio_ksvn.la
+%{tde_tdelibdir}/tdeio_ksvn.so
+%{tde_tdelibdir}/kded_tdesvnd.la
+%{tde_tdelibdir}/kded_tdesvnd.so
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
+##########
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+%patch0 -p1
 
 rm -f src/svnqt/CMakeLists.txt.orig
 rm -fr src/svnqt/cache/sqlite3/
 
 
-
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
@@ -167,106 +308,16 @@ export PATH="%{_bindir}:${PATH}"
 # Locales
 %find_lang %{tde_pkg}
 
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -G "SVN Client" %{tde_pkg} Development RevisionControl
+%endif
+
 
 %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 || :
-
-%post -n trinity-libsvnqt
-/sbin/ldconfig || :
-
-%post tdeio-plugins
-for proto in svn+file svn+http svn+https svn+ssh svn; do
-  update-alternatives --install \
-    %{tde_datadir}/services/${proto}.protocol \
-    ${proto}.protocol \
-    %{tde_datadir}/services/${proto}.protocol_tdesvn \
-    20
-done
-
-%preun tdeio-plugins
-if [ $1 -eq 0 ]; then
-  for proto in svn+file svn+http svn+https svn+ssh svn; do
-    update-alternatives --remove \
-      ${proto}.protocol \
-      %{tde_datadir}/services/${proto}.protocol_tdesvn || :
-  done
-fi
-
-
-
-%postun -n trinity-libsvnqt
-/sbin/ldconfig || :
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_bindir}/tdesvn
-%{tde_bindir}/tdesvnaskpass
-%{tde_tdelibdir}/tdesvnpart.la
-%{tde_tdelibdir}/tdesvnpart.so
-%{tde_datadir}/applications/tde/tdesvn.desktop
-%{tde_datadir}/apps/tdeconf_update/tdesvn-use-external-update.sh
-%{tde_datadir}/apps/tdeconf_update/tdesvnpartrc-use-external.upd
-%{tde_datadir}/apps/tdesvn/tdesvnui.rc
-%{tde_datadir}/apps/tdesvnpart/tdesvn_part.rc
-%{tde_datadir}/apps/konqueror/servicemenus/tdesvn_subversion.desktop
-%{tde_datadir}/config.kcfg/tdesvn_part.kcfg
-%{tde_datadir}/icons/hicolor/*/*/*.png
-%{tde_datadir}/icons/hicolor/*/*/*.svgz
-%{tde_mandir}/man1/tdesvn.1*
-%{tde_mandir}/man1/tdesvnaskpass.1*
-%lang(en) %{tde_tdedocdir}/HTML/en/tdesvn/
-%lang(nl) %{tde_tdedocdir}/HTML/nl/tdesvn/
-%{tde_libdir}/libksvnwidgets.la
-%{tde_libdir}/libksvnwidgets.so
-%{tde_libdir}/libsvnfrontend.la
-%{tde_libdir}/libsvnfrontend.so
-%{tde_libdir}/libtdesvncfgreader.la
-%{tde_libdir}/libtdesvncfgreader.so
-%{tde_libdir}/libtdesvnevents.la
-%{tde_libdir}/libtdesvnevents.so
-%{tde_libdir}/libtdesvnhelpers.la
-%{tde_libdir}/libtdesvnhelpers.so
-
-%files -n trinity-libsvnqt
-%defattr(-,root,root,-)
-%{tde_libdir}/libsvnqt.so.4
-%{tde_libdir}/libsvnqt.so.4.2.2
-
-%files -n trinity-libsvnqt-devel
-%defattr(-,root,root,-)
-%{tde_includedir}/svnqt
-%{tde_libdir}/libsvnqt.so
-
-%files tdeio-plugins
-%defattr(-,root,root,-)
-%{tde_datadir}/services/kded/tdesvnd.desktop
-%{tde_datadir}/services/ksvn+file.protocol
-%{tde_datadir}/services/ksvn+http.protocol
-%{tde_datadir}/services/ksvn+https.protocol
-%{tde_datadir}/services/ksvn+ssh.protocol
-%{tde_datadir}/services/ksvn.protocol
-%{tde_datadir}/services/svn+file.protocol_tdesvn
-%{tde_datadir}/services/svn+http.protocol_tdesvn
-%{tde_datadir}/services/svn+https.protocol_tdesvn
-%{tde_datadir}/services/svn+ssh.protocol_tdesvn
-%{tde_datadir}/services/svn.protocol_tdesvn
-%{tde_tdelibdir}/tdeio_ksvn.la
-%{tde_tdelibdir}/tdeio_ksvn.so
-%{tde_tdelibdir}/kded_tdesvnd.la
-%{tde_tdelibdir}/kded_tdesvnd.so
-
-
 %changelog
-* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.4-8
+* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 2:1.0.4-1
 - Initial release for TDE 14.0.0
diff --git a/redhat/applications/tdmtheme/kdmtheme-3.5.13.1.spec b/redhat/applications/tdmtheme/kdmtheme-3.5.13.1.spec
deleted file mode 100644
index ff99cfcee..000000000
--- a/redhat/applications/tdmtheme/kdmtheme-3.5.13.1.spec
+++ /dev/null
@@ -1,130 +0,0 @@
-# Default version for this component
-%define kdecomp kdmtheme
-
-# 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:	theme manager for KDM [Trinity]
-Version:	1.2.2
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://beta.smileaf.org/projects
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-kdmtheme is a theme manager for KDM. It provides a Trinity Control Module (KCM)
-that allows you to easily install, remove and change your KDM themes.
-
-
-
-%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 -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kcm_kdmtheme.la
-%{tde_tdelibdir}/kcm_kdmtheme.so
-%{tde_tdeappdir}/kdmtheme.desktop
-%{tde_tdedocdir}/HTML/en/kdmtheme/
-
-
-%post
-update-desktop-database %{tde_appdir} &> /dev/null
-
-%postun
-update-desktop-database %{tde_appdir} &> /dev/null
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.2.2-3
-- Initial release for TDE 3.5.13.1
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.2.2-2
-- Rebuilt for Fedora 17
-- Removes post and postun
-- Removes the 'lintian' stuff from Debian
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 1.2.2-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tdmtheme/kdmtheme-3.5.13.spec b/redhat/applications/tdmtheme/kdmtheme-3.5.13.spec
deleted file mode 100644
index 22f3cd396..000000000
--- a/redhat/applications/tdmtheme/kdmtheme-3.5.13.spec
+++ /dev/null
@@ -1,121 +0,0 @@
-# Default version for this component
-%define kdecomp kdmtheme
-
-# 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:	theme manager for KDM [Trinity]
-Version:	1.2.2
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://beta.smileaf.org/projects
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-kdmtheme is a theme manager for KDM. It provides a Trinity Control Module (KCM)
-that allows you to easily install, remove and change your KDM themes.
-
-
-
-%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 -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kcm_kdmtheme.la
-%{tde_tdelibdir}/kcm_kdmtheme.so
-%{tde_tdeappdir}/kdmtheme.desktop
-%{tde_tdedocdir}/HTML/en/kdmtheme/
-
-
-%post
-update-desktop-database %{tde_appdir} &> /dev/null
-
-%postun
-update-desktop-database %{tde_appdir} &> /dev/null
-
-
-%Changelog
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.2.2-2
-- Rebuilt for Fedora 17
-- Removes post and postun
-- Removes the 'lintian' stuff from Debian
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 1.2.2-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tdmtheme/tdmtheme-14.0.0.spec b/redhat/applications/tdmtheme/tdmtheme-14.0.0.spec
index 88bb45713..f1db6fc0b 100644
--- a/redhat/applications/tdmtheme/tdmtheme-14.0.0.spec
+++ b/redhat/applications/tdmtheme/tdmtheme-14.0.0.spec
@@ -1,68 +1,94 @@
-# Default version for this component
-%define tde_pkg tdmtheme
+#
+# spec file for package tdmtheme (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 tdmtheme
+%define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
 %define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/tde
+%define tde_tdeappdir %{tde_datadir}/applications/tde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
-%define _docdir %{tde_docdir}
 
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	1.2.2
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary:	Theme manager for TDM
+Group:		Applications/Utilities
+URL:		http://beta.smileaf.org/projects
 
-Name:			trinity-%{tde_pkg}
-Summary:		theme manager for TDM [Trinity]
-Version:		1.2.2
-Release:		%{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
-
-License:		GPLv2+
-Group:			Applications/Utilities
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
 
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://beta.smileaf.org/projects
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
 
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
-
 BuildRequires:	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
+
 Obsoletes:		trinity-kdmtheme < %{version}-%{release}
 Provides:		trinity-kdmtheme = %{version}-%{release}
 
 
 %description
-kdmtheme is a theme manager for KDM. It provides a Trinity Control Module (KCM)
-that allows you to easily install, remove and change your KDM themes.
+tdmtheme is a theme manager for TDM. It provides a Trinity Control Module (TDECM)
+that allows you to easily install, remove and change your TDM themes.
 
+##########
 
-
-%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}}
@@ -106,7 +132,6 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 
 
-
 %files
 %defattr(-,root,root,-)
 %{tde_tdelibdir}/kcm_tdmtheme.la
@@ -116,12 +141,12 @@ export PATH="%{tde_bindir}:${PATH}"
 
 
 %post
-update-desktop-database %{tde_appdir} &> /dev/null
+update-desktop-database %{tde_tdeappdir} &> /dev/null
 
 %postun
-update-desktop-database %{tde_appdir} &> /dev/null
+update-desktop-database %{tde_tdeappdir} &> /dev/null
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.2.2-7
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:1.2.2-1
 - Initial release for TDE 14.0.0
diff --git a/redhat/applications/tdmtheme/tdmtheme-3.5.13.2-fix_segv.patch b/redhat/applications/tdmtheme/tdmtheme-3.5.13.2-fix_segv.patch
deleted file mode 100644
index 64272fe6a..000000000
--- a/redhat/applications/tdmtheme/tdmtheme-3.5.13.2-fix_segv.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- trinity-tdmtheme-3.5.13.2/src/kdmtheme.cpp.ORI	2013-06-13 08:36:49.449599069 +0200
-+++ trinity-tdmtheme-3.5.13.2/src/kdmtheme.cpp	2013-06-13 08:44:01.014366366 +0200
-@@ -268,16 +268,22 @@
- 
- void KDMThemeWidget::updateInfoView( ThemeData *theme )
- {
--	info->setText(
--		((theme->copyright.length() > 0) ?
--			i18n("<qt><strong>Copyright:</strong> %1<br/></qt>",
--				theme->copyright) : "") +
--		((theme->description.length() > 0) ?
--			i18n("<qt><strong>Description:</strong> %1</qt>",
--				theme->description) : "") );
--	preview->setPixmap( theme->path + '/' + theme->screenShot );
--	preview->setText( theme->screenShot.isEmpty() ?
--		"Screenshot not available" : TQString() );
-+	if(theme) {
-+		info->setText(
-+			((theme->copyright.length() > 0) ?
-+				i18n("<qt><strong>Copyright:</strong> %1<br/></qt>",
-+					theme->copyright) : "") +
-+			((theme->description.length() > 0) ?
-+				i18n("<qt><strong>Description:</strong> %1</qt>",
-+					theme->description) : "") );
-+		preview->setPixmap( theme->path + '/' + theme->screenShot );
-+		preview->setText( theme->screenShot.isEmpty() ?
-+			i18n("Screenshot not available") : TQString() );
-+	} else {
-+		info->setText(i18n("No theme selected."));
-+		preview->setPixmap(NULL);
-+		preview->setText(i18n("Screenshot not available"));
-+	}
- }
- 
- void KDMThemeWidget::installNewTheme()
diff --git a/redhat/applications/tellico/tellico-14.0.0.spec b/redhat/applications/tellico/tellico-14.0.0.spec
index 26b065bdc..731363619 100644
--- a/redhat/applications/tellico/tellico-14.0.0.spec
+++ b/redhat/applications/tellico/tellico-14.0.0.spec
@@ -1,61 +1,95 @@
-# Default version for this component
-%define tde_pkg tellico
+#
+# spec file for package tellico (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 tellico
+%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_tdedocdir}
-
 
-Name:			trinity-%{tde_pkg}
-Summary:		Icollection manager for books, videos, music [Trinity]
-Version:		1.3.2.1
-Release:		%{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant}
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	1.3.2.1
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary:	Icollection manager for books, videos, music [Trinity]
+Group:		Applications/Utilities
+URL:		http://periapsis.org/tellico/
 
-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://periapsis.org/tellico/
+#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
 
-Patch1:			tellico-3.5.13.2-videodev.patch
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
-
 BuildRequires:	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
+
+# YAZ support
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	yaz
 BuildRequires:	%{_lib}yaz-devel
 %endif
 
+# XML2 support
+BuildRequires:  libxml2-devel
+
+# XSLT support
+BuildRequires:  libxslt-devel
+%if 0%{?rhel} == 4
+# a bogus dep in libexslt.la file from EL-4 (WONTFIX bug http://bugzilla.redhat.com/142241)
+BuildRequires:  libgcrypt-devel
+%endif
+
 # V4L support
 %if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?suse_version}
 BuildRequires:	libv4l-devel
@@ -67,6 +101,7 @@ BuildRequires:	%{_lib}v4l-devel
 Requires:		%{name}-data = %{version}-%{release}
 Requires:		%{name}-scripts = %{version}-%{release}
 
+
 %description
 Tellico is a collection manager for TDE. It includes default collections for
 books, bibliographies, comic books, videos, music, coins, stamps, trading
@@ -81,6 +116,22 @@ or any US-MARC compliant z39.50 server.
 The files are stored in XML format, avoiding the need for database server.
 It also makes it easy for other softwares to use the Tellico data.
 
+%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 %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%{tde_bindir}/tellico
+#%{tde_datadir}/pixmaps
+%{tde_datadir}/applications
+%{tde_datadir}/config/tellicorc
+
+##########
 
 %package data
 Group:			Applications/Utilities
@@ -103,6 +154,32 @@ It also makes it easy for other softwares to use the Tellico data.
 This package contains the architecture independent files, such data files and
 documentation.
 
+%files data
+%defattr(-,root,root,-)
+%dir %{tde_datadir}/apps/tellico
+%{tde_datadir}/apps/tellico/*.xsl
+%{tde_datadir}/apps/tellico/*.xml
+%{tde_datadir}/apps/tellico/*.png
+%{tde_datadir}/apps/tellico/entry-templates
+%{tde_datadir}/apps/tellico/*.py*
+%{tde_datadir}/apps/tellico/pics
+%{tde_datadir}/apps/tellico/report-templates
+%{tde_datadir}/apps/tellico/tellico.dtd
+%{tde_datadir}/apps/tellico/tellico.tips
+%{tde_datadir}/apps/tellico/tellico2html.js
+%{tde_datadir}/apps/tellico/tellicoui.rc
+%{tde_datadir}/apps/tellico/welcome.html
+%{tde_datadir}/config.kcfg
+%{tde_tdedocdir}/HTML/*/tellico/
+%{tde_datadir}/icons
+%{tde_datadir}/apps/mime
+%{tde_datadir}/mimelnk
+%{tde_datadir}/apps/tdeconf_update/tellico-1-3-update.pl
+%{tde_datadir}/apps/tdeconf_update/tellico-rename.upd
+%{tde_datadir}/apps/tdeconf_update/tellico.upd
+
+##########
+
 %package scripts
 Group:			Applications/Utilities
 Summary:		collection manager for books, videos, music [scripts] [Trinity]
@@ -125,17 +202,24 @@ This package contains the scripts to import data from external sources, such
 as websites. As the format of the data may change, these scripts are provided
 as a separate package which can be updated through debian-volatile.
 
+%files scripts
+%defattr(-,root,root,-)
+%{tde_datadir}/apps/tellico/data-sources
+%{tde_datadir}/apps/tellico/z3950-servers.cfg
+
+##########
 
-%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}}
 
 if [ -r /usr/include/libv4l1-videodev.h ]; then
-%patch1 -p1 -b .videodev
+%__sed -i "src/barcode/barcode_v4l.h" -e "s|linux/videodev.h|libv4l1.h|"
 fi
 
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
@@ -186,51 +270,6 @@ export PATH="%{tde_bindir}:${PATH}"
 %__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 %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/tellico
-#%{tde_datadir}/pixmaps
-%{tde_datadir}/applications
-%{tde_datadir}/config/tellicorc
-
-%files data
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/tellico/*.xsl
-%{tde_datadir}/apps/tellico/*.xml
-%{tde_datadir}/apps/tellico/*.png
-%{tde_datadir}/apps/tellico/entry-templates
-%{tde_datadir}/apps/tellico/*.py*
-%{tde_datadir}/apps/tellico/pics
-%{tde_datadir}/apps/tellico/report-templates
-%{tde_datadir}/apps/tellico/tellico.dtd
-%{tde_datadir}/apps/tellico/tellico.tips
-%{tde_datadir}/apps/tellico/tellico2html.js
-%{tde_datadir}/apps/tellico/tellicoui.rc
-%{tde_datadir}/apps/tellico/welcome.html
-%{tde_datadir}/config.kcfg
-%{tde_tdedocdir}/HTML/*/tellico/
-%{tde_datadir}/icons
-%{tde_datadir}/apps/mime
-%{tde_datadir}/mimelnk
-%{tde_datadir}/apps/tdeconf_update/tellico-1-3-update.pl
-%{tde_datadir}/apps/tdeconf_update/tellico-rename.upd
-%{tde_datadir}/apps/tdeconf_update/tellico.upd
-
-%files scripts
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/tellico/data-sources
-%{tde_datadir}/apps/tellico/z3950-servers.cfg
-
-
 %changelog
-* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-8
+* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 2:1.3.2.1-1
 - Initial release for TDE 14.0.0
diff --git a/redhat/applications/tellico/tellico-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/tellico/tellico-3.5.13-fix_gcc47_compilation.patch
deleted file mode 100644
index 2e8d3f9a3..000000000
--- a/redhat/applications/tellico/tellico-3.5.13-fix_gcc47_compilation.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- tellico/src/mainwindow.cpp.ORI	2012-05-06 12:54:09.395765577 +0200
-+++ tellico/src/mainwindow.cpp	2012-05-06 12:54:30.626306963 +0200
-@@ -53,6 +53,7 @@
- #include "core/drophandler.h"
- #include "latin1literal.h"
- 
-+#include <unistd.h>
- #include <kapplication.h>
- #include <kcombobox.h>
- #include <kiconloader.h>
diff --git a/redhat/applications/tellico/tellico-3.5.13-fix_not_a_string_literal_error.patch b/redhat/applications/tellico/tellico-3.5.13-fix_not_a_string_literal_error.patch
deleted file mode 100644
index 5e93fd7d8..000000000
--- a/redhat/applications/tellico/tellico-3.5.13-fix_not_a_string_literal_error.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- tellico/src/translators/btparse/bibtex_ast.c.ORI	2012-08-06 15:44:03.978791275 +0200
-+++ tellico/src/translators/btparse/bibtex_ast.c	2012-08-06 15:44:23.449376138 +0200
-@@ -57,7 +57,7 @@
- void dump_ast (char *msg, AST *root)
- {
-    if (msg != NULL)
--      printf (msg);
-+      printf ("%s", msg);
-    dump (root, 0);
-    printf ("\n");
- }
---- tellico/src/translators/btparse/error.c.ORI	2012-08-06 15:44:38.954046066 +0200
-+++ tellico/src/translators/btparse/error.c	2012-08-06 15:45:08.152425553 +0200
-@@ -88,7 +88,7 @@
- 
-    if (err->filename)
-    {
--      fprintf (stderr, err->filename);
-+      fprintf (stderr, "%s", err->filename);
-       something_printed = TRUE;
-    }
-    if (err->line > 0)                   /* going to print a line number? */
-@@ -111,7 +111,7 @@
-    {
-       if (something_printed)
-          fprintf (stderr, ", ");
--      fprintf (stderr, name);
-+      fprintf (stderr, "%s", name);
-       something_printed = TRUE;
-    }
- 
diff --git a/redhat/applications/tellico/tellico-3.5.13.1-fix_ftbfs.patch b/redhat/applications/tellico/tellico-3.5.13.1-fix_ftbfs.patch
deleted file mode 100644
index 36b394666..000000000
--- a/redhat/applications/tellico/tellico-3.5.13.1-fix_ftbfs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tellico-3.5.13.1/src/Makefile.am.ORI	2012-10-04 23:24:30.130403046 +0200
-+++ tellico-3.5.13.1/src/Makefile.am	2012-10-04 23:25:46.806848842 +0200
-@@ -33,7 +33,7 @@
- 	./commands/libcommands.a -lexslt $(LIB_KFILE) $(LIB_KHTML) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) \
- 	$(LIBSOCKET) $(LIBXSLT_LIBS) $(TAGLIB_LIBS) $(KCDDB_LIBS) $(YAZ_LIBS) $(LIB_KIO) \
- 	$(LIB_KABC) $(KCAL_LIBS) $(LDADD_LIBBTPARSE) $(LIB_KNEWSTUFF) $(EXEMPI_LIBS) \
--	$(POPPLER_LIBS) $(LDADD_LIBBARCODE)
-+	$(POPPLER_LIBS) $(LDADD_LIBBARCODE) $(LIBXML_LIBS)
- 
- EXTRA_DIST = tellicoui.rc tellicorc \
- borrowerdialog.cpp          entryiconview.h\
diff --git a/redhat/applications/tellico/tellico-3.5.13.1.spec b/redhat/applications/tellico/tellico-3.5.13.1.spec
deleted file mode 100644
index 4827ec653..000000000
--- a/redhat/applications/tellico/tellico-3.5.13.1.spec
+++ /dev/null
@@ -1,239 +0,0 @@
-# Default version for this component
-%define kdecomp tellico
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_tdedocdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Icollection manager for books, videos, music [Trinity]
-Version:	1.3.2.1
-Release:	4%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://periapsis.org/tellico/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-
-# [tellico] Fix "not a string literal" error
-Patch2:		tellico-3.5.13-fix_not_a_string_literal_error.patch
-# [tellico] Fix FTBFS
-Patch3:		tellico-3.5.13.1-fix_ftbfs.patch
-
-
-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
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	yaz
-BuildRequires:	%{_lib}yaz-devel
-%endif
-
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	%{name}-scripts = %{version}-%{release}
-
-%description
-Tellico is a collection manager for TDE. It includes default collections for
-books, bibliographies, comic books, videos, music, coins, stamps, trading
-cards, and wines, and also allows custom collections; with unlimited
-user-defined fields allowed. Automatically formatted names, sorting by any
-property, filters, automatic ISBN validation and full customization for
-printing or display through XSLT files are some of the features present. It
-can import CSV, RIS, BibTeX, and BibTeXML files; and export CSV, HTML, BibTeX,
-BibTeXML, and PilotDB. Tellico can also import data from Amazon, IMDb, CDDB,
-or any US-MARC compliant z39.50 server.
-
-The files are stored in XML format, avoiding the need for database server.
-It also makes it easy for other softwares to use the Tellico data.
-
-
-%package data
-Group:		Applications/Utilities
-Summary:	collection manager for books, videos, music [data] [Trinity]
-
-%description data
-Tellico is a collection manager for TDE. It includes default collections for
-books, bibliographies, comic books, videos, music, coins, stamps, trading
-cards, and wines, and also allows custom collections; with unlimited
-user-defined fields allowed. Automatically formatted names, sorting by any
-property, filters, automatic ISBN validation and full customization for
-printing or display through XSLT files are some of the features present. It
-can import CSV, RIS, BibTeX, and BibTeXML files; and export CSV, HTML, BibTeX,
-BibTeXML, and PilotDB. Tellico can also import data from Amazon, IMDb, CDDB,
-or any US-MARC compliant z39.50 server.
-
-The files are stored in XML format, avoiding the need for database server.
-It also makes it easy for other softwares to use the Tellico data.
-
-This package contains the architecture independent files, such data files and
-documentation.
-
-%package scripts
-Group:		Applications/Utilities
-Summary:	collection manager for books, videos, music [scripts] [Trinity]
-
-%description scripts
-Tellico is a collection manager for TDE. It includes default collections for
-books, bibliographies, comic books, videos, music, coins, stamps, trading
-cards, and wines, and also allows custom collections; with unlimited
-user-defined fields allowed. Automatically formatted names, sorting by any
-property, filters, automatic ISBN validation and full customization for
-printing or display through XSLT files are some of the features present. It
-can import CSV, RIS, BibTeX, and BibTeXML files; and export CSV, HTML, BibTeX,
-BibTeXML, and PilotDB. Tellico can also import data from Amazon, IMDb, CDDB,
-or any US-MARC compliant z39.50 server.
-
-The files are stored in XML format, avoiding the need for database server.
-It also makes it easy for other softwares to use the Tellico data.
-
-This package contains the scripts to import data from external sources, such
-as websites. As the format of the data may change, these scripts are provided
-as a separate package which can be updated through debian-volatile.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-%patch2 -p1
-%patch3 -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 -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%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} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# Add svg icons to xdg directories
-%__install -D -c -p -m 644 -T icons/tellico.svg %{?buildroot}%{tde_datadir}/icons/hicolor/scalable/apps/tellico.svg
-%__install -D -c -p -m 644 -T icons/tellico_mime.svg %{?buildroot}%{tde_datadir}/icons/hicolor/scalable/mimetypes/application-x-tellico.svg
-
-# Remove  dead symlink from French translation
-%__rm %{?buildroot}%{tde_tdedocdir}/HTML/fr/tellico/common
-
-
-%find_lang %{kdecomp}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/tellico
-#%{tde_datadir}/pixmaps
-%{tde_datadir}/applications
-%{tde_datadir}/config/tellicorc
-
-%files data
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/tellico/*.xsl
-%{tde_datadir}/apps/tellico/*.xml
-%{tde_datadir}/apps/tellico/*.png
-%{tde_datadir}/apps/tellico/entry-templates
-%{tde_datadir}/apps/tellico/*.py*
-%{tde_datadir}/apps/tellico/pics
-%{tde_datadir}/apps/tellico/report-templates
-%{tde_datadir}/apps/tellico/tellico.dtd
-%{tde_datadir}/apps/tellico/tellico.tips
-%{tde_datadir}/apps/tellico/tellico2html.js
-%{tde_datadir}/apps/tellico/tellicoui.rc
-%{tde_datadir}/apps/tellico/welcome.html
-%{tde_datadir}/config.kcfg
-%{tde_tdedocdir}/HTML/*/tellico/
-%{tde_datadir}/icons
-%{tde_datadir}/apps/mime
-%{tde_datadir}/mimelnk
-%{tde_datadir}/apps/kconf_update/tellico-1-3-update.pl
-%{tde_datadir}/apps/kconf_update/tellico-rename.upd
-%{tde_datadir}/apps/kconf_update/tellico.upd
-
-%files scripts
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/tellico/data-sources
-%{tde_datadir}/apps/tellico/z3950-servers.cfg
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-4
-- Initial release for TDE 3.5.13.1
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-3
-- Fix compilation with GCC 4.7 [Bug #958]
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-2
-- Fix HTML directory location
-
-* Thu Nov 24 2011 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tellico/tellico-3.5.13.2-ftbfs.patch b/redhat/applications/tellico/tellico-3.5.13.2-ftbfs.patch
deleted file mode 100644
index 5695d8fff..000000000
--- a/redhat/applications/tellico/tellico-3.5.13.2-ftbfs.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- trinity-tellico-3.5.13.2/src/barcode/barcode.cpp.ORI	2013-07-29 17:21:06.358915613 +0200
-+++ trinity-tellico-3.5.13.2/src/barcode/barcode.cpp	2013-07-29 17:22:29.505126885 +0200
-@@ -172,14 +172,14 @@
-   for (int i = 0; i < 10; i++) {
-     TQCString temp;
-     temp.setNum( i );
--    fprintf( stderr, temp + " :   " );
-+    fprintf( stderr, "%s :   ", *(temp) );
-     for (int j = 0; j < 13; j++) {
-       if (array[i][j][level] == -1)
-         fprintf( stderr, "x  " );
-       else {
-         TQCString temp;
-         temp.setNum( array[i][j][level] );
--        fprintf( stderr, temp + "  " );
-+        fprintf( stderr, "%s  ", *(temp) );
-       }
-     }
-     fprintf( stderr, "\n" );
diff --git a/redhat/applications/tellico/tellico-3.5.13.2-videodev.patch b/redhat/applications/tellico/tellico-3.5.13.2-videodev.patch
deleted file mode 100644
index 261b24363..000000000
--- a/redhat/applications/tellico/tellico-3.5.13.2-videodev.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- trinity-tellico-3.5.13.2/src/barcode/barcode_v4l.h.ORI	2013-07-28 22:22:41.390223800 +0200
-+++ trinity-tellico-3.5.13.2/src/barcode/barcode_v4l.h	2013-07-28 22:23:10.085637439 +0200
-@@ -31,7 +31,7 @@
- #endif
- 
- //#include <linux/videodev2.h>
--#include <linux/videodev.h>
-+#include <libv4l1.h>
- 
- #include <tqstring.h>
- #include <tqimage.h>
diff --git a/redhat/applications/tellico/tellico-3.5.13.spec b/redhat/applications/tellico/tellico-3.5.13.spec
deleted file mode 100644
index 64b7fed47..000000000
--- a/redhat/applications/tellico/tellico-3.5.13.spec
+++ /dev/null
@@ -1,226 +0,0 @@
-# Default version for this component
-%define kdecomp tellico
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_tdedocdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Icollection manager for books, videos, music [Trinity]
-Version:	1.3.2.1
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://periapsis.org/tellico/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-
-# [tellico] Fix compilation with GCC 4.7 [Bug #958]
-Patch1:		tellico-3.5.13-fix_gcc47_compilation.patch
-# [tellico] Fix "not a string literal" error
-Patch2:		tellico-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
-
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	%{name}-scripts = %{version}-%{release}
-
-%description
-Tellico is a collection manager for TDE. It includes default collections for
-books, bibliographies, comic books, videos, music, coins, stamps, trading
-cards, and wines, and also allows custom collections; with unlimited
-user-defined fields allowed. Automatically formatted names, sorting by any
-property, filters, automatic ISBN validation and full customization for
-printing or display through XSLT files are some of the features present. It
-can import CSV, RIS, BibTeX, and BibTeXML files; and export CSV, HTML, BibTeX,
-BibTeXML, and PilotDB. Tellico can also import data from Amazon, IMDb, CDDB,
-or any US-MARC compliant z39.50 server.
-
-The files are stored in XML format, avoiding the need for database server.
-It also makes it easy for other softwares to use the Tellico data.
-
-
-%package data
-Group:		Applications/Utilities
-Summary:	collection manager for books, videos, music [data] [Trinity]
-
-%description data
-Tellico is a collection manager for TDE. It includes default collections for
-books, bibliographies, comic books, videos, music, coins, stamps, trading
-cards, and wines, and also allows custom collections; with unlimited
-user-defined fields allowed. Automatically formatted names, sorting by any
-property, filters, automatic ISBN validation and full customization for
-printing or display through XSLT files are some of the features present. It
-can import CSV, RIS, BibTeX, and BibTeXML files; and export CSV, HTML, BibTeX,
-BibTeXML, and PilotDB. Tellico can also import data from Amazon, IMDb, CDDB,
-or any US-MARC compliant z39.50 server.
-
-The files are stored in XML format, avoiding the need for database server.
-It also makes it easy for other softwares to use the Tellico data.
-
-This package contains the architecture independent files, such data files and
-documentation.
-
-%package scripts
-Group:		Applications/Utilities
-Summary:	collection manager for books, videos, music [scripts] [Trinity]
-
-%description scripts
-Tellico is a collection manager for TDE. It includes default collections for
-books, bibliographies, comic books, videos, music, coins, stamps, trading
-cards, and wines, and also allows custom collections; with unlimited
-user-defined fields allowed. Automatically formatted names, sorting by any
-property, filters, automatic ISBN validation and full customization for
-printing or display through XSLT files are some of the features present. It
-can import CSV, RIS, BibTeX, and BibTeXML files; and export CSV, HTML, BibTeX,
-BibTeXML, and PilotDB. Tellico can also import data from Amazon, IMDb, CDDB,
-or any US-MARC compliant z39.50 server.
-
-The files are stored in XML format, avoiding the need for database server.
-It also makes it easy for other softwares to use the Tellico data.
-
-This package contains the scripts to import data from external sources, such
-as websites. As the format of the data may change, these scripts are provided
-as a separate package which can be updated through debian-volatile.
-
-
-%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 -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%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_includedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# Add svg icons to xdg directories
-%__install -D -c -p -m 644 -T icons/tellico.svg %{?buildroot}%{tde_datadir}/icons/hicolor/scalable/apps/tellico.svg
-%__install -D -c -p -m 644 -T icons/tellico_mime.svg %{?buildroot}%{tde_datadir}/icons/hicolor/scalable/mimetypes/application-x-tellico.svg
-
-# Remove  dead symlink from French translation
-%__rm %{?buildroot}%{tde_tdedocdir}/HTML/fr/tellico/common
-
-
-%find_lang %{kdecomp}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/tellico
-#%{tde_datadir}/pixmaps
-%{tde_datadir}/applications
-%{tde_datadir}/config/tellicorc
-
-%files data
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/tellico/*.xsl
-%{tde_datadir}/apps/tellico/*.xml
-%{tde_datadir}/apps/tellico/*.png
-%{tde_datadir}/apps/tellico/entry-templates
-%{tde_datadir}/apps/tellico/*.py*
-%{tde_datadir}/apps/tellico/pics
-%{tde_datadir}/apps/tellico/report-templates
-%{tde_datadir}/apps/tellico/tellico.dtd
-%{tde_datadir}/apps/tellico/tellico.tips
-%{tde_datadir}/apps/tellico/tellico2html.js
-%{tde_datadir}/apps/tellico/tellicoui.rc
-%{tde_datadir}/apps/tellico/welcome.html
-%{tde_datadir}/config.kcfg
-%{tde_tdedocdir}/HTML/*/tellico/
-%{tde_datadir}/icons
-%{tde_datadir}/apps/mime
-%{tde_datadir}/mimelnk
-%{tde_datadir}/apps/kconf_update/tellico-1-3-update.pl
-%{tde_datadir}/apps/kconf_update/tellico-rename.upd
-%{tde_datadir}/apps/kconf_update/tellico.upd
-
-%files scripts
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/tellico/data-sources
-%{tde_datadir}/apps/tellico/z3950-servers.cfg
-
-
-%Changelog
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-3
-- Fix compilation with GCC 4.7 [Bug #958]
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-2
-- Fix HTML directory location
-
-* Thu Nov 24 2011 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tork/tork-14.0.0.spec b/redhat/applications/tork/tork-14.0.0.spec
index a750ee4e4..0618be62a 100644
--- a/redhat/applications/tork/tork-14.0.0.spec
+++ b/redhat/applications/tork/tork-14.0.0.spec
@@ -1,58 +1,100 @@
-# Default version for this component
-%define tde_pkg tork
+#
+# spec file for package tork (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 tork
+%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-tork
-Version:        0.33
-Release:		%{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
-Summary:        Anonymity Manager for TDE
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.33
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary:	Anonymity Manager for TDE
+Group:		Applications/Internet
+URL:		sourceforge.net/projects/tolrk/
 
-Group:          Applications/Internet
-License:        GPLv2+
-URL:            sourceforge.net/projects/tolrk/
-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
+
+# TORSOCKS support
 BuildRequires:	torsocks
 
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+
 %description
 TorK is an Anonymity Manager for the TDE Desktop. Browse anonymously on 
 Konqueror/Firefox/Opera. Send anonymous email via the MixMinion network.
 Use ssh/irc/IM anonymously. Control and monitor your anonymous traffic 
 on the Tor network.
 
-%if 0%{?suse_version}
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
+##########
+
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
@@ -64,7 +106,6 @@ on the Tor network.
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 # NOTICE: --enable-final causes FTBFS !
 %configure \
@@ -124,15 +165,14 @@ done
 %{tde_tdedocdir}/HTML/en/tork/
 %{tde_datadir}/icons/hicolor/*/actions/tork.png
 %{tde_datadir}/icons/hicolor/*/apps/tork.png
+%dir %{tde_datadir}/menu
 %{tde_datadir}/menu/tork
+%dir %{tde_datadir}/pixmaps
 %{tde_datadir}/pixmaps/tork.xpm
 %{tde_mandir}/man1/tork.1*
 %{tde_mandir}/man1/torkarkollon.1*
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.33-2
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.33-1
 - Initial release for TDE 14.0.0
-
-* Thu Apr 25 2013 Francois Andriot <francois.andriot@free.fr> - 0.33-1
-- Initial release for TDE 3.5.13.2
diff --git a/redhat/applications/twin-style-crystal/kwin-style-crystal-3.5.12.spec b/redhat/applications/twin-style-crystal/kwin-style-crystal-3.5.12.spec
deleted file mode 100644
index 2729aa1bf..000000000
--- a/redhat/applications/twin-style-crystal/kwin-style-crystal-3.5.12.spec
+++ /dev/null
@@ -1,109 +0,0 @@
-# Default version for this component
-%define kdecomp kwin-style-crystal
-%define version 1.0.5
-%define release 1
-
-# 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.13 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:	Semi transparant window decoration for Trinity.
-Version:	%{?version}
-Release:	%{?release}%{?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.12.tar.gz
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-Crystal offers you pseudo transparent titlebar, buttons and borders
-transparent, so you can see more of your lovely background image
-Transparancy and buttons can be costumized to match your wishes.
-Offers rounded corners as well
-
-And it is of course nice to look at. Upstream says:
-"- Don't forget to breathe, while drooling."
-
-
-%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"
-
-%__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
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%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_tdelibdir}/kwin3_crystal.la
-%{tde_tdelibdir}/kwin3_crystal.so
-%{tde_tdelibdir}/kwin_crystal_config.la
-%{tde_tdelibdir}/kwin_crystal_config.so
-%{tde_datadir}/apps/kwin/crystal.desktop
-
-
-%Changelog
-* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 1.0.5-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/twin-style-crystal/kwin-style-crystal-3.5.13.1.spec b/redhat/applications/twin-style-crystal/kwin-style-crystal-3.5.13.1.spec
deleted file mode 100644
index 0c98d0697..000000000
--- a/redhat/applications/twin-style-crystal/kwin-style-crystal-3.5.13.1.spec
+++ /dev/null
@@ -1,124 +0,0 @@
-# Default version for this component
-%define kdecomp kwin-style-crystal
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_tdedocdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Semi transparant window decoration for Trinity.
-Version:	1.0.5
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.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
-Crystal offers you pseudo transparent titlebar, buttons and borders
-transparent, so you can see more of your lovely background image
-Transparancy and buttons can be costumized to match your wishes.
-Offers rounded corners as well
-
-And it is of course nice to look at. Upstream says:
-"- Don't forget to breathe, while drooling."
-
-
-%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 -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_tdelibdir}/kwin3_crystal.la
-%{tde_tdelibdir}/kwin3_crystal.so
-%{tde_tdelibdir}/kwin_crystal_config.la
-%{tde_tdelibdir}/kwin_crystal_config.so
-%{tde_datadir}/apps/kwin/crystal.desktop
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.5-2
-- Initial release for TDE 3.5.13.1
-
-* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 1.0.5-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/twin-style-crystal/kwin-style-crystal-3.5.13.spec b/redhat/applications/twin-style-crystal/kwin-style-crystal-3.5.13.spec
deleted file mode 100644
index 82a1ccf7e..000000000
--- a/redhat/applications/twin-style-crystal/kwin-style-crystal-3.5.13.spec
+++ /dev/null
@@ -1,116 +0,0 @@
-# Default version for this component
-%define kdecomp kwin-style-crystal
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_tdedocdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Semi transparant window decoration for Trinity.
-Version:	1.0.5
-Release:	1%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-Crystal offers you pseudo transparent titlebar, buttons and borders
-transparent, so you can see more of your lovely background image
-Transparancy and buttons can be costumized to match your wishes.
-Offers rounded corners as well
-
-And it is of course nice to look at. Upstream says:
-"- Don't forget to breathe, while drooling."
-
-
-%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 -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%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_includedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_tdelibdir}/kwin3_crystal.la
-%{tde_tdelibdir}/kwin3_crystal.so
-%{tde_tdelibdir}/kwin_crystal_config.la
-%{tde_tdelibdir}/kwin_crystal_config.so
-%{tde_datadir}/apps/kwin/crystal.desktop
-
-
-%Changelog
-* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 1.0.5-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/twin-style-crystal/twin-style-crystal-14.0.0.spec b/redhat/applications/twin-style-crystal/twin-style-crystal-14.0.0.spec
index d96a0462a..a14e3013c 100644
--- a/redhat/applications/twin-style-crystal/twin-style-crystal-14.0.0.spec
+++ b/redhat/applications/twin-style-crystal/twin-style-crystal-14.0.0.spec
@@ -1,57 +1,83 @@
-# Default version for this component
-%define tde_pkg twin-style-crystal
+#
+# spec file for package twin-style-crystal (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 twin-style-crystal
+%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_tdedocdir}
 
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	1.0.5
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary:	Semi transparant window decoration for Trinity.
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org/
 
-Name:			trinity-%{tde_pkg}
-Summary:		Semi transparant window decoration for Trinity.
-Version:		1.0.5
-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 <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
 
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
-
 BuildRequires:	gettext
 
+BuildRequires:	autoconf automake libtool m4
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	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
+
 Obsoletes:	trinity-kwin-style-crystal < %{version}-%{release}
 Provides:	trinity-kwin-style-crystal = %{version}-%{release}
 
+
 %description
 Crystal offers you pseudo transparent titlebar, buttons and borders
 transparent, so you can see more of your lovely background image
@@ -61,11 +87,13 @@ Offers rounded corners as well
 And it is of course nice to look at. Upstream says:
 "- Don't forget to breathe, while drooling."
 
+##########
 
-%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}}
@@ -122,5 +150,5 @@ export PATH="%{tde_bindir}:${PATH}"
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.5-5
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:1.0.5-1
 - Initial release for TDE 14.0.0
diff --git a/redhat/applications/wlassistant/wlassistant-14.0.0.patch b/redhat/applications/wlassistant/wlassistant-14.0.0.patch
new file mode 100644
index 000000000..385d4d07d
--- /dev/null
+++ b/redhat/applications/wlassistant/wlassistant-14.0.0.patch
@@ -0,0 +1,13 @@
+diff --git a/src/watools.cpp b/src/watools.cpp
+index 5814274..252c791 100644
+--- a/src/watools.cpp
++++ b/src/watools.cpp
+@@ -192,6 +192,8 @@ int WATools::availableNetworks( const char* _ifname ) //returns a list of availa
+ 		i++;
+ 	} while (scan = scan->next);
+ 	printf( "WATools: Networks found: %i\n", i );
++	
++	return i;
+ }
+ 
+ 
diff --git a/redhat/applications/wlassistant/wlassistant-14.0.0.spec b/redhat/applications/wlassistant/wlassistant-14.0.0.spec
index 27310a351..7968ca413 100644
--- a/redhat/applications/wlassistant/wlassistant-14.0.0.spec
+++ b/redhat/applications/wlassistant/wlassistant-14.0.0.spec
@@ -1,51 +1,79 @@
-# Default version for this component
-%define tde_pkg wlassistant
+#
+# spec file for package wlassistant (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 wlassistant
+%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_tdedocdir}
 
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.5.7
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary:	User friendly TDE frontend for wireless network connection [Trinity]
+Group:		Applications/Utilities
+URL:		http://wlassistant.sourceforge.net/
 
-Name:			trinity-%{tde_pkg}
-Summary:		User friendly TDE frontend for wireless network connection [Trinity]
-Version:		0.5.7
-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 <francois.andriot@free.fr>
-URL:			http://wlassistant.sourceforge.net/
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
 
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Patch0:			%{tde_pkg}-%{tde_version}.patch
 
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+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
 
 # Wireless support
 %if 0%{?fedora} >= 6 || 0%{?rhel} >= 5
@@ -61,10 +89,19 @@ BuildRequires: wireless-tools
 BuildRequires:	libiw-devel
 %endif
 
-BuildRequires:	gettext
+# IDN support
+BuildRequires:	libidn-devel
+
+# GAMIN support
+#  Not on openSUSE.
+%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_gamin 1
+BuildRequires:	gamin-devel
+%endif
 
+# PYTHON support
 BuildRequires:	python
-BuildRequires:	cmake >= 2.8
+
 
 %description
 Wireless Assistant scans for wireless access points and displays link quality,
@@ -73,14 +110,17 @@ network, Wireless Assistant opens up its wizards and guides the user through
 Wi-Fi settings. After a successful connection is made the settings are
 remembered so next time the user won't have to enter them again.
 
+##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
+##########
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+%patch0 -p1
 
 
 %build
@@ -124,6 +164,12 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot} -C build
 
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -i -r "%{?buildroot}%{tde_tdeappdir}/wlassistant.desktop" System Network
+%endif
+
+
 %clean
 %__rm -rf %{buildroot}
 
@@ -157,5 +203,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.5.7-5
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.5.7-1
 - Initial release for TDE 14.0.0
diff --git a/redhat/applications/wlassistant/wlassistant-3.5.13.1.spec b/redhat/applications/wlassistant/wlassistant-3.5.13.1.spec
deleted file mode 100644
index 642d35393..000000000
--- a/redhat/applications/wlassistant/wlassistant-3.5.13.1.spec
+++ /dev/null
@@ -1,134 +0,0 @@
-# Default version for this component
-%define kdecomp wlassistant
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_tdedocdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	User friendly KDE frontend for wireless network connection [Trinity]
-Version:	0.5.7
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://wlassistant.sourceforge.net/
-
-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:	python
-BuildRequires:	cmake >= 2.8
-
-%description
-Wireless Assistant scans for wireless access points and displays link quality,
-encryption and other useful information. When user wants to connect to a
-network, Wireless Assistant opens up its wizards and guides the user through
-Wi-Fi settings. After a successful connection is made the settings are
-remembered so next time the user won't have to enter them again.
-
-
-%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"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__mkdir_p build
-cd build
-%endif
-
-%cmake \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  -DBUILD_ALL=on \
-  ..
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-%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 ChangeLog VERSION
-%{tde_bindir}/wlassistant
-%{tde_tdeappdir}/wlassistant.desktop
-%{tde_datadir}/icons/hicolor/16x16/apps/wlassistant.png
-%{tde_datadir}/icons/hicolor/32x32/apps/wlassistant.png
-%lang(ar) %{tde_datadir}/locale/ar/LC_MESSAGES/wlassistant.mo
-%lang(ca) %{tde_datadir}/locale/ca/LC_MESSAGES/wlassistant.mo
-%lang(es) %{tde_datadir}/locale/es/LC_MESSAGES/wlassistant.mo
-%lang(fr) %{tde_datadir}/locale/fr/LC_MESSAGES/wlassistant.mo
-%lang(nb) %{tde_datadir}/locale/nb/LC_MESSAGES/wlassistant.mo
-%lang(pl) %{tde_datadir}/locale/pl/LC_MESSAGES/wlassistant.mo
-%lang(pt) %{tde_datadir}/locale/pt_BR/LC_MESSAGES/wlassistant.mo
-%lang(sv) %{tde_datadir}/locale/sv/LC_MESSAGES/wlassistant.mo
-%lang(zh_CN) %{tde_datadir}/locale/zh_CN/LC_MESSAGES/wlassistant.mo
-%lang(zh_TW) %{tde_datadir}/locale/zh_TW/LC_MESSAGES/wlassistant.mo
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.5.7-2
-- Initial release for TDE 3.5.13.1
-
-* Tue Nov 29 2011 Francois Andriot <francois.andriot@free.fr> - 0.5.7-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/wlassistant/wlassistant-3.5.13.spec b/redhat/applications/wlassistant/wlassistant-3.5.13.spec
deleted file mode 100644
index 97e4344e7..000000000
--- a/redhat/applications/wlassistant/wlassistant-3.5.13.spec
+++ /dev/null
@@ -1,128 +0,0 @@
-# Default version for this component
-%define kdecomp wlassistant
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_tdedocdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	User friendly KDE frontend for wireless network connection [Trinity]
-Version:	0.5.7
-Release:	1%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://wlassistant.sourceforge.net/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	python
-BuildRequires:	scons
-
-%description
-Wireless Assistant scans for wireless access points and displays link quality,
-encryption and other useful information. When user wants to connect to a
-network, Wireless Assistant opens up its wizards and guides the user through
-Wi-Fi settings. After a successful connection is made the settings are
-remembered so next time the user won't have to enter them again.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-# Ugly hack to modify TQT include directory inside SCONS files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i bksys/kde.py \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-scons configure \
-  prefix=%{tde_prefix} \
-  execprefix=%{tde_bindir} \
-  libdir=%{tde_libdir} \
-  qtdir=${QTDIR} \
-  kdedir=%{tde_prefix} \
-  kdeincludes=%{tde_tdeincludedir} \
-  qtincludes=${QTINC} \
-  kdelibs=%{tde_libdir} \
-  qtlibs=${QTLIB} \
-  extraincludes=%{tde_includedir}:%{tde_includedir}/tqt:${QTINC}
-
-scons -j4
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-scons install DESTDIR=%{buildroot}
-
-%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 ChangeLog VERSION
-%{tde_bindir}/wlassistant
-%{tde_datadir}/applnk/Utilities/wlassistant.desktop
-%{tde_datadir}/icons/hicolor/16x16/apps/wlassistant.png
-%{tde_datadir}/icons/hicolor/32x32/apps/wlassistant.png
-%lang(ar) %{tde_datadir}/locale/ar/LC_MESSAGES/wlassistant.mo
-%lang(ca) %{tde_datadir}/locale/ca/LC_MESSAGES/wlassistant.mo
-%lang(es) %{tde_datadir}/locale/es/LC_MESSAGES/wlassistant.mo
-%lang(fr) %{tde_datadir}/locale/fr/LC_MESSAGES/wlassistant.mo
-%lang(nb) %{tde_datadir}/locale/nb/LC_MESSAGES/wlassistant.mo
-%lang(pl) %{tde_datadir}/locale/pl/LC_MESSAGES/wlassistant.mo
-%lang(pt) %{tde_datadir}/locale/pt_BR/LC_MESSAGES/wlassistant.mo
-%lang(sv) %{tde_datadir}/locale/sv/LC_MESSAGES/wlassistant.mo
-%lang(zh_CN) %{tde_datadir}/locale/zh_CN/LC_MESSAGES/wlassistant.mo
-%lang(zh_TW) %{tde_datadir}/locale/zh_TW/LC_MESSAGES/wlassistant.mo
-
-
-%Changelog
-* Tue Nov 29 2011 Francois Andriot <francois.andriot@free.fr> - 0.5.7-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/yakuake/yakuake-14.0.0.spec b/redhat/applications/yakuake/yakuake-14.0.0.spec
index 910f39f27..5b3e98495 100644
--- a/redhat/applications/yakuake/yakuake-14.0.0.spec
+++ b/redhat/applications/yakuake/yakuake-14.0.0.spec
@@ -1,65 +1,89 @@
-# Default version for this component
-%define tde_pkg yakuake
+#
+# spec file for package yakuake (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 yakuake
+%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_tdedocdir}
-
-# 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:		Yakuake is a Quake-style terminal emulator based on TDE Konsole technology.
-Version:		2.8.1
-Release:		%{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	2.8.1
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary:	Yakuake is a Quake-style terminal emulator based on TDE Konsole technology.
+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:	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
 Yakuake is a Quake-style terminal emulator based on TDE Konsole technology.
 
-%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}}
@@ -125,5 +149,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2.8.1-7
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:2.8.1-1
 - Initial release for TDE 14.0.0
diff --git a/redhat/applications/yakuake/yakuake-3.5.12.spec b/redhat/applications/yakuake/yakuake-3.5.12.spec
deleted file mode 100644
index 351a99acb..000000000
--- a/redhat/applications/yakuake/yakuake-3.5.12.spec
+++ /dev/null
@@ -1,97 +0,0 @@
-# Default version for this component
-%define kdecomp yakuake
-%define version 2.8.1
-%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 %{_prefix}/share/doc
-%endif
-
-# TDE 3.5.12 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/kde3
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Yakuake is a Quake-style terminal emulator based on KDE Konsole technology.
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Source0:	%{kdecomp}-3.5.12.tar.gz
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: trinity-kdebase-devel
-BuildRequires: desktop-file-utils
-
-%description
-Yakuake is a Quake-style terminal emulator based on KDE Konsole technology.
-
-%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
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
-
-%configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt \
-    --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%make_install
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{_bindir}/*
-%{_datadir}/applications/*/*.desktop
-%{_datadir}/apps/*/
-%{_datadir}/icons/*/*/*/*
-%{_datadir}/locale/*/*/*.mo
-%{_datadir}/config.kcfg/*.kcfg
-
-%Changelog
-* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 2.8.1-2
-- Import to GIT
-
-* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 2.8.1-1
-- Correct macro to install under "/opt", if desired
-
-* Sun Aug 14 2011 Francois Andriot <francois.andriot@free.fr> - 2.8.1-0
-- Initial release for RHEL 6.0
-
diff --git a/redhat/applications/yakuake/yakuake-3.5.13.1.spec b/redhat/applications/yakuake/yakuake-3.5.13.1.spec
deleted file mode 100644
index 3eae2c506..000000000
--- a/redhat/applications/yakuake/yakuake-3.5.13.1.spec
+++ /dev/null
@@ -1,134 +0,0 @@
-# Default version for this component
-%define kdecomp yakuake
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_tdedocdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Yakuake is a Quake-style terminal emulator based on KDE Konsole technology.
-Version:	2.8.1
-Release:	4%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires: desktop-file-utils
-
-%description
-Yakuake is a Quake-style terminal emulator based on KDE Konsole technology.
-
-%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 -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-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_datadir}/icons/hicolor/*/*/*
-%{tde_datadir}/locale/*/*/*.mo
-%{tde_datadir}/config.kcfg/*.kcfg
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.8.1-4
-- Initial release for TDE 3.5.13.1
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 2.8.1-3
-- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
-
-* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 2.8.1-2
-- Import to GIT
-
-* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 2.8.1-1
-- Correct macro to install under "/opt", if desired
-
-* Sun Aug 14 2011 Francois Andriot <francois.andriot@free.fr> - 2.8.1-0
-- Initial release for RHEL 6.0
-
diff --git a/redhat/applications/yakuake/yakuake-3.5.13.spec b/redhat/applications/yakuake/yakuake-3.5.13.spec
deleted file mode 100644
index b21e4e76d..000000000
--- a/redhat/applications/yakuake/yakuake-3.5.13.spec
+++ /dev/null
@@ -1,126 +0,0 @@
-# Default version for this component
-%define kdecomp yakuake
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_tdedocdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Yakuake is a Quake-style terminal emulator based on KDE Konsole technology.
-Version:	2.8.1
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-
-%description
-Yakuake is a Quake-style terminal emulator based on KDE Konsole technology.
-
-%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 -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%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_includedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-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_datadir}/icons/hicolor/*/*/*
-%{tde_datadir}/locale/*/*/*.mo
-%{tde_datadir}/config.kcfg/*.kcfg
-
-%Changelog
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 2.8.1-3
-- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
-
-* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 2.8.1-2
-- Import to GIT
-
-* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 2.8.1-1
-- Correct macro to install under "/opt", if desired
-
-* Sun Aug 14 2011 Francois Andriot <francois.andriot@free.fr> - 2.8.1-0
-- Initial release for RHEL 6.0
-