RPM Packaging: lots of updates for 3.5.13.2

26 files changed, 1087 insertions, 711 deletions

diff --git a/redhat/applications/amarok/amarok-3.5.13.2.spec b/redhat/applications/amarok/amarok-3.5.13.2.spec
index 01baf11e7..e3a183dd5 100644
--- a/redhat/applications/amarok/amarok-3.5.13.2.spec
+++ b/redhat/applications/amarok/amarok-3.5.13.2.spec
@@ -1,13 +1,13 @@
 # Basic package informations
-%define tdecomp amarok
-%define tdeversion 3.5.13.2
+%define tde_pkg amarok
+%define tde_version 3.5.13.2
 
 # 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
+# TDE specific building variables
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
@@ -23,43 +23,43 @@
 %define _docdir %{tde_docdir}
 
 
-Name:		trinity-%{tdecomp}
-Summary:	Media player
-Version:	1.4.10
-Release:	9%{?dist}%{?_variant}
+Name:			trinity-%{tde_pkg}
+Summary:		Media player
+Version:		1.4.10
+Release:		%{?!preversion:10}%{?preversion:9_%{preversion}}%{?dist}%{?_variant}
 
-Group: 	    Applications/Multimedia
-License:    GPLv2+
+Group:			Applications/Multimedia
+License:		GPLv2+
 Url:        http://amarok.kde.org
 
-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}-%{tdeversion}%{?preversion:~%{preversion}}.tar.gz
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
 Patch3:		amarok-3.5.13.1-fix_rhel4_libs.patch
 
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.2
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.2
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.2
-BuildRequires:	trinity-konqueror-devel >= 3.5.13.2
+BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	trinity-konqueror-devel >= %{tde_version}
 
-BuildRequires:  alsa-lib-devel
-BuildRequires:  desktop-file-utils
-BuildRequires:  esound-devel
-BuildRequires:  gettext
+BuildRequires:	alsa-lib-devel
+BuildRequires:	desktop-file-utils
+BuildRequires:	esound-devel
+BuildRequires:	gettext
 BuildRequires:	pcre-devel
-BuildRequires:  taglib-devel 
+BuildRequires:	taglib-devel 
 
-BuildRequires:  libtool
+BuildRequires:	libtool
 %if 0%{?fedora} > 4 || 0%{?rhel} > 4
-BuildRequires:  libtool-ltdl-devel
+BuildRequires:	libtool-ltdl-devel
 %endif
-BuildRequires:  libusb-devel
-BuildRequires:  mysql-devel
-BuildRequires:  postgresql-devel
-BuildRequires:  SDL-devel
-BuildRequires:  taglib-devel
+BuildRequires:	libusb-devel
+BuildRequires:	mysql-devel
+BuildRequires:	postgresql-devel
+BuildRequires:	SDL-devel
+BuildRequires:	taglib-devel
 BuildRequires:	sqlite-devel
 # not used anymore, in favor of libvisual ? -- Rex
 #{?fedora:BuildRequires:  xmms-devel}
@@ -76,7 +76,7 @@ BuildRequires:	dbus-devel
 %if 0%{?rhel} == 4
 BuildRequires:	dbus-qt
 %else
-BuildRequires:	trinity-dbus-tqt-devel >= 3.5.13.2
+BuildRequires:	trinity-dbus-tqt-devel >= %{tde_version}
 %endif
 
 # IFP support
@@ -84,7 +84,7 @@ BuildRequires:	trinity-dbus-tqt-devel >= 3.5.13.2
 %if 0%{?pclinuxos} == 0
 %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_ifp 1
-BuildRequires:  libifp-devel
+BuildRequires:	libifp-devel
 %endif
 %endif
 
@@ -100,34 +100,34 @@ BuildRequires:	karma-sharp
 # GPOD (ipod) support
 %if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
 %define with_gpod 1
-BuildRequires:  libgpod-devel >= 0.4.2
+BuildRequires:	libgpod-devel >= 0.4.2
 %endif
 
 # MTP players
 %if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
 %define with_mtp 1
-BuildRequires:  libmtp-devel
-BuildRequires:  libmusicbrainz-devel
+BuildRequires:	libmtp-devel
+BuildRequires:	libmusicbrainz-devel
 %endif
 
 # Creative Nomad Jukebox
 %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} >= 1220
 %define with_njb 1
-BuildRequires:  libnjb-devel
+BuildRequires:	libnjb-devel
 %endif
 
 # VISUAL support
 %if 0%{?rhel} >= 4 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
 %define with_libvisual 1
-BuildRequires:  libvisual-devel
+BuildRequires:	libvisual-devel
 %endif
 
 # TUNEPIMP support
 %if 0%{?mgaversion} && 0%{?mgaversion} <= 2
-BuildRequires:  libtunepimp-devel
+BuildRequires:	libtunepimp-devel
 %endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?suse_version}
-BuildRequires:  libtunepimp-devel
+%if 0%{?fedora} || 0%{?mdkversion} || 0%{?suse_version}
+BuildRequires:	libtunepimp-devel
 %endif
 
 # INOTIFY support
@@ -142,10 +142,10 @@ BuildRequires:	%{_lib}inotifytools-devel
 %if 0%{?rhel} >= 4 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
 %define with_xine 1
 %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-BuildRequires:  libxine-devel
+BuildRequires:	libxine-devel
 %endif
 %if 0%{?rhel} || 0%{?fedora}
-BuildRequires:  xine-lib-devel
+BuildRequires:	xine-lib-devel
 %endif
 %endif
 
@@ -168,10 +168,10 @@ BuildRequires:	libmp4v2-devel
 
 # ruby
 BuildRequires:	ruby
-BuildRequires:  ruby-devel
+BuildRequires:	ruby-devel
 
 # To open the selected browser, works with Patch2
-Requires:  xdg-utils
+Requires:		xdg-utils
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
 
@@ -193,7 +193,7 @@ Amarok is a multimedia player with:
 %{tde_bindir}/amarok_proxy.rb
 %{tde_datadir}/apps/amarok/
 %{tde_datadir}/icons/hicolor/*/*/*
-%{tde_datadir}/applications/kde/*.desktop
+%{tde_tdeappdir}/*.desktop
 %{tde_datadir}/servicetypes/*.desktop
 %{tde_datadir}/apps/profiles/amarok.profile.xml
 %{tde_datadir}/config/amarokrc
@@ -281,11 +281,11 @@ xdg-desktop-menu forceupdate 2> /dev/null || :
 ##########
 
 %package ruby
-Summary:	%{name} Ruby support
-Group:		Applications/Multimedia
-Requires: %{name} = %{version}-%{release}
+Summary:		%{name} Ruby support
+Group:			Applications/Multimedia
+Requires:		%{name} = %{version}-%{release}
 # For dir ownership and some default plugins (lyrics)
-Requires:  ruby
+Requires:		ruby
 
 %description ruby
 %{summary}.
@@ -297,11 +297,11 @@ Requires:  ruby
 ##########
 
 %package konqueror
-Summary:	Amarok konqueror (service menus, sidebar) support
-Group:		Applications/Multimedia
+Summary:		Amarok konqueror (service menus, sidebar) support
+Group:			Applications/Multimedia
 
-Requires:	%{name} = %{version}-%{release}
-Requires:	trinity-konqueror
+Requires:		%{name} = %{version}-%{release}
+Requires:		trinity-konqueror
 
 %description konqueror
 %{summary}.
@@ -318,9 +318,9 @@ Requires:	trinity-konqueror
 %if 0%{?with_libvisual}
 
 %package visualisation
-Summary:    Visualisation plugins for Amarok
-Group:      Applications/Multimedia
-Requires:   %{name} = %{version}-%{release}
+Summary:		Visualisation plugins for Amarok
+Group:			Applications/Multimedia
+Requires:		%{name} = %{version}-%{release}
 # No plugins by default, we need libvisual-plugins
 #Requires:   libvisual-plugins
 
@@ -344,7 +344,7 @@ use any of xmms' visualisation plugins with Amarok.
 ##########
 
 %prep
-%setup -q -n %{name}-%{tdeversion}%{?preversion:~%{preversion}}
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 %if 0%{?rhel} == 4
 %patch3 -p1 -b .rhel4
 %endif
@@ -370,12 +370,18 @@ cd build
 %endif
 
 %cmake \
+	-DCMAKE_BUILD_TYPE="" \
+	-DCMAKE_C_FLAGS="-DNDEBUG" \
+	-DCMAKE_CXX_FLAGS="-DNDEBUG" \
+	-DCMAKE_SKIP_RPATH=OFF \
+	-DCMAKE_VERBOSE_MAKEFILE=ON \
+	\
 	-DBIN_INSTALL_DIR=%{tde_bindir} \
 	-DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
 	-DLIB_INSTALL_DIR=%{tde_libdir} \
 	-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-	-DCMAKE_SKIP_RPATH="OFF" \
 	-DQT_LIBRARY_DIRS="${QTLIB:-${QTDIR}/%{_lib}}" \
+	\
 	%{?with_libvisual:-DWITH_LIBVISUAL=ON} \
 	-DWITH_KONQSIDEBAR=ON \
 	%{?with_xine:-DWITH_XINE=ON} \
@@ -394,6 +400,7 @@ cd build
 
 %__make %{?_smp_mflags} || %__make
 
+
 %install
 %__rm -fr $RPM_BUILD_ROOT
 %__make install DESTDIR=$RPM_BUILD_ROOT -C build
@@ -405,7 +412,7 @@ cd build
 %__rm -f $RPM_BUILD_ROOT%{tde_libdir}/libamarok.so
 
 # Locales
-%find_lang amarok
+%find_lang %{tde_pkg}
 
 # HTML
 for lang_dir in $RPM_BUILD_ROOT%{tde_tdedocdir}/HTML/* ; do
@@ -423,6 +430,9 @@ done
 
 
 %changelog
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 1.4.10-10
+- Rebuild with NDEBUG option
+
 * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.4.10-9
 - Initial release for TDE 3.5.13.2
 
diff --git a/redhat/applications/basket/basket-3.5.13.2.spec b/redhat/applications/basket/basket-3.5.13.2.spec
index 991e859e2..a175d11b5 100644
--- a/redhat/applications/basket/basket-3.5.13.2.spec
+++ b/redhat/applications/basket/basket-3.5.13.2.spec
@@ -1,12 +1,13 @@
 # Default version for this component
-%define kdecomp basket
+%define tde_pkg basket
+%define tde_version 3.5.13.2
 
 # 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
+# TDE specific building variables
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
@@ -22,30 +23,30 @@
 %define _docdir %{tde_docdir}
 
 
-Name:		trinity-%{kdecomp}
-Summary:	Taking care of your ideas.
-Version:	1.0.3.1
-Release:	4%{?dist}%{?_variant}
+Name:			trinity-%{tde_pkg}
+Summary:		Taking care of your ideas.
+Version:		1.0.3.1
+Release:		%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
 
-License:	GPLv2+
-Group:		Applications/Utilities
+License:		GPLv2+
+Group:			Applications/Utilities
 
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
+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)
+Prefix:			%{tde_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:	%{name}-3.5.13.2.tar.gz
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2
-BuildRequires: trinity-tdelibs-devel >= 3.5.13.2
-BuildRequires: trinity-tdebase-devel >= 3.5.13.2
-BuildRequires: trinity-tdepim-devel >= 3.5.13.2
-BuildRequires: desktop-file-utils
+BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	trinity-tdepim-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
 
-BuildRequires: gpgme-devel
+BuildRequires:	gpgme-devel
 
 %description
 This application is mainly an all-purpose notes taker. It provide several baskets where
@@ -63,7 +64,7 @@ baskets to HTML.
 
 
 %prep
-%setup -q -n %{name}-3.5.13.2
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
 # Ugly hack to modify TQT include directory inside autoconf files.
 # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
@@ -89,6 +90,7 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 	--libdir=%{tde_libdir} \
 	--datadir=%{tde_datadir} \
 	--disable-rpath \
+	--disable-debug \
     --with-extra-includes=%{tde_includedir}/tqt \
     --disable-static
 
@@ -100,7 +102,7 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
-%find_lang %{kdecomp}
+%find_lang %{tde_pkg}
 
 %clean
 %__rm -rf %{buildroot}
@@ -121,7 +123,7 @@ done
 /sbin/ldconfig
 
 
-%files -f %{kdecomp}.lang
+%files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
 %{tde_bindir}/basket
@@ -157,6 +159,9 @@ done
 
 
 %changelog
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.3.1-5
+- Rebuild with NDEBUG option
+
 * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.3.1-4
 - Initial release for TDE 3.5.13.2
 
diff --git a/redhat/applications/digikam/digikam-3.5.13.2.spec b/redhat/applications/digikam/digikam-3.5.13.2.spec
index 23cf5320e..8af183e1b 100644
--- a/redhat/applications/digikam/digikam-3.5.13.2.spec
+++ b/redhat/applications/digikam/digikam-3.5.13.2.spec
@@ -1,12 +1,13 @@
 # Default version for this component
-%define kdecomp digikam
+%define tde_pkg digikam
+%define tde_version 3.5.13.2
 
 # 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
+# TDE specific building variables
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
@@ -22,33 +23,33 @@
 %define _docdir %{tde_docdir}
 
 
-Name:		trinity-%{kdecomp}
-Summary:	digital photo management application for KDE [Trinity]
-Version:	0.9.6
-Release:	5%{?dist}%{?_variant}
+Name:			trinity-%{tde_pkg}
+Summary:		digital photo management application for TDE [Trinity]
+Version:		0.9.6
+Release:		%{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
 
-License:	GPLv2+
-Group:		Applications/Utilities
+License:		GPLv2+
+Group:			Applications/Utilities
 
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
+Vendor:			Trinity Project
+Packager:		Francois Andriot <francois.andriot@free.fr>
+URL:			http://www.trinitydesktop.org/
 
-Prefix:    %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Prefix:			%{_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:	%{name}-3.5.13.2.tar.gz
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
 # [Digikam] Revert PNG support to libpng12 (for RHEL4)
 Patch1:		digikam-3.5.13.2-fix_png12_support.patch
 
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.2
-BuildRequires:	trinity-arts-devel >= 3.5.13.2
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.2
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.2
-BuildRequires:	trinity-libkexiv2-devel >= 3.5.13.2
-BuildRequires:	trinity-libkdcraw-devel >= 3.5.13.2
-BuildRequires:	trinity-libkipi-devel >= 3.5.13.2
+BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires:	trinity-arts-devel >= %{tde_version}
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	trinity-libkexiv2-devel >= %{tde_version}
+BuildRequires:	trinity-libkdcraw-devel >= %{tde_version}
+BuildRequires:	trinity-libkipi-devel >= %{tde_version}
 %if 0%{?rhel} == 4 || 0%{?rhel} == 5 || 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	gphoto2-devel
 %else
@@ -76,9 +77,9 @@ BuildRequires:	libexiv2-devel
 BuildRequires:	exiv2-devel
 %endif
 
-Requires:	trinity-libkexiv2 >= 3.5.13.1
-Requires:	trinity-libkdcraw >= 3.5.13.1
-Requires:	trinity-libkipi >= 3.5.13.1
+Requires:		trinity-libkexiv2 >= %{tde_version}
+Requires:		trinity-libkdcraw >= %{tde_version}
+Requires:		trinity-libkipi >= %{tde_version}
 
 %description
 An easy to use and powerful digital photo management
@@ -102,9 +103,9 @@ digiKam is based in part on the work of the Independent JPEG Group.
 
 
 %package devel
-Group:		Development/Libraries
-Summary:	Development files for %{name}
-Requires:	%{name} = %{version}
+Group:			Development/Libraries
+Summary:		Development files for %{name}
+Requires:		%{name} = %{version}
 
 %description devel
 %{summary}
@@ -116,7 +117,7 @@ Requires:	%{name} = %{version}
 
 
 %prep
-%setup -q -n %{name}-3.5.13.2
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 %if 0%{?rhel} == 4
 %patch1 -p1 -b .png12
 %endif
@@ -146,9 +147,15 @@ export KDEDIR="%{tde_prefix}"
   --datadir=%{tde_datadir} \
   --mandir=%{tde_mandir} \
   --includedir=%{tde_tdeincludedir} \
+  \
+  --disable-dependency-tracking \
+  --disable-debug \
+  --enable-new-ldflags \
+  --enable-final \
+  --enable-closure \
   --disable-rpath \
-  --with-extra-includes=%{tde_tdeincludedir}/tqt \
-  --enable-closure
+  \
+  --with-extra-includes=%{tde_tdeincludedir}/tqt
 
 %__make %{?_smp_mflags} || %__make
 
@@ -159,7 +166,7 @@ export PATH="%{tde_bindir}:${PATH}"
 %__make install DESTDIR=%{buildroot}
 
 
-%find_lang %{kdecomp}
+%find_lang %{tde_pkg}
 
 
 %clean
@@ -185,7 +192,7 @@ update-desktop-database %{tde_appdir} 2> /dev/null || :
 /sbin/ldconfig || :
 
 
-%files -f %{kdecomp}.lang
+%files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
 %{tde_bindir}/digikam
@@ -312,6 +319,9 @@ update-desktop-database %{tde_appdir} 2> /dev/null || :
 
 
 %changelog
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.6-6
+- Rebuild with NDEBUG option
+
 * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.6-5
 - Initial release for TDE 3.5.13.2
 
diff --git a/redhat/applications/filelight/filelight-3.5.13.2.spec b/redhat/applications/filelight/filelight-3.5.13.2.spec
index 2223e626e..385d23417 100644
--- a/redhat/applications/filelight/filelight-3.5.13.2.spec
+++ b/redhat/applications/filelight/filelight-3.5.13.2.spec
@@ -1,12 +1,13 @@
 # Default version for this component
-%define kdecomp filelight
+%define tde_pkg filelight
+%define tde_version 3.5.13.2
 
 # 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
+# TDE specific building variables
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
@@ -22,26 +23,26 @@
 %define _docdir %{tde_docdir}
 
 
-Name:		trinity-%{kdecomp}
-Summary:	Graphical disk usage display
-Version:	1.0
-Release:	6%{?dist}%{?_variant}
+Name:			trinity-%{tde_pkg}
+Summary:		Graphical disk usage display
+Version:		1.0
+Release:		%{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
 
-License:	GPLv2+
-Group:		Applications/Utilities
+License:		GPLv2+
+Group:			Applications/Utilities
 
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
+Vendor:			Trinity Project
+Packager:		Francois Andriot <francois.andriot@free.fr>
+URL:			http://www.trinitydesktop.org/
 
-Prefix:    %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Prefix:			%{_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:	%{name}-3.5.13.2.tar.gz
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.2
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.2
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.2
+BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
 Obsoletes:	filelight-l10n < %{version}-%{release}
@@ -58,7 +59,7 @@ directories on your computer.
 
 
 %prep
-%setup -q -n %{name}-3.5.13.2
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
 # Ugly hack to modify TQT include directory inside autoconf files.
 # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
@@ -84,7 +85,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
   --includedir=%{tde_tdeincludedir} \
   --docdir=%{tde_tdedocdir} \
   --libdir=%{tde_libdir} \
+  \
+  --disable-dependency-tracking \
+  --disable-debug \
+  --enable-new-ldflags \
+  --enable-final \
+  --enable-closure \
   --disable-rpath \
+  \
   --with-extra-includes=%{tde_includedir}/tqt
 
 %__make %{?_smp_mflags}
@@ -95,7 +103,7 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
-%find_lang %{kdecomp} --with-kde
+%find_lang %{tde_pkg}
 
 %clean
 %__rm -rf %{buildroot}
@@ -114,7 +122,7 @@ for f in crystalsvg hicolor ; do
 done
 
 
-%files -f %{kdecomp}.lang
+%files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
 %{tde_bindir}/filelight
@@ -136,6 +144,9 @@ done
 %lang(sv) %{tde_tdedocdir}/HTML/sv/filelight/
 
 %changelog
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-7
+- Rebuild with NDEBUG option
+
 * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-6
 - Initial release for TDE 3.5.13.2
 
diff --git a/redhat/applications/k9copy/k9copy-3.5.13.2-avcodec.patch b/redhat/applications/k9copy/k9copy-3.5.13.2-avcodec.patch
new file mode 100644
index 000000000..9fe3142a1
--- /dev/null
+++ b/redhat/applications/k9copy/k9copy-3.5.13.2-avcodec.patch
@@ -0,0 +1,14 @@
+--- trinity-k9copy-3.5.13.2/k9author/k9avidecode.h.ORI	2013-07-29 21:52:57.859615464 +0200
++++ trinity-k9copy-3.5.13.2/k9author/k9avidecode.h	2013-07-29 21:57:19.206481299 +0200
+@@ -43,7 +43,11 @@
+ #else
+ typedef int (*av_find_stream_info_t)(AVFormatContext *);
+ #endif
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 26, 0)
++typedef AVCodec* (*avcodec_find_decoder_t)(enum AVCodecID);
++#else
+ typedef AVCodec* (*avcodec_find_decoder_t)(enum CodecID);
++#endif
+ #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 8, 0)
+ typedef int (*avcodec_open2_t)(AVCodecContext *, AVCodec *, AVDictionary **);
+ #else
diff --git a/redhat/applications/k9copy/k9copy-3.5.13.2-ftbfs.patch b/redhat/applications/k9copy/k9copy-3.5.13.2-ftbfs.patch
new file mode 100644
index 000000000..4dfb39787
--- /dev/null
+++ b/redhat/applications/k9copy/k9copy-3.5.13.2-ftbfs.patch
@@ -0,0 +1,18 @@
+--- trinity-k9copy-3.5.13.2/k9decmpeg/mpeg2_internal.h.ORI	2013-07-28 19:42:30.331485057 +0200
++++ trinity-k9copy-3.5.13.2/k9decmpeg/mpeg2_internal.h	2013-07-28 19:43:09.713519110 +0200
+@@ -21,6 +21,9 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+  */
+ 
++#ifndef __MPEG2_INTERNAL_H__
++#define __MPEG2_INTERNAL_H__
++
+ /* macroblock modes */
+ #define MACROBLOCK_INTRA 1
+ #define MACROBLOCK_PATTERN 2
+@@ -298,3 +301,5 @@
+ extern mpeg2_mc_t mpeg2_mc_altivec;
+ extern mpeg2_mc_t mpeg2_mc_alpha;
+ extern mpeg2_mc_t mpeg2_mc_vis;
++
++#endif // __MPEG2_INTERNAL_H__
diff --git a/redhat/applications/k9copy/k9copy-3.5.13.2-use_external_dvdread.patch b/redhat/applications/k9copy/k9copy-3.5.13.2-use_external_dvdread.patch
new file mode 100644
index 000000000..0cf01006e
--- /dev/null
+++ b/redhat/applications/k9copy/k9copy-3.5.13.2-use_external_dvdread.patch
@@ -0,0 +1,102 @@
+--- ./k9author/Makefile.am.dvdread	2013-06-06 19:29:20.000000000 +0200
++++ ./k9author/Makefile.am	2013-07-28 20:05:20.857621477 +0200
+@@ -14,5 +14,5 @@
+ 	k9import.h k9importfiles.h k9lvitemimport.h k9menu.h k9menubutton.h k9menuedit.h \
+ 	k9menueditor.h k9newdvd.h k9newtitle.h k9title.h
+ libk9author_la_LIBADD = $(top_builddir)/libk9copy/libk9copy.la $(LIB_KDEUI)
+-INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9devices \
++INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9devices \
+ 	-I$(top_srcdir)/k9vamps -I$(top_srcdir)/libk9copy -I$(top_srcdir)/src $(all_includes)
+--- ./k9decmpeg/Makefile.am.dvdread	2013-06-06 19:29:20.000000000 +0200
++++ ./k9decmpeg/Makefile.am	2013-07-28 20:05:20.857621477 +0200
+@@ -12,7 +12,7 @@
+ 	motion_comp_altivec.cpp motion_comp.cpp motion_comp_mmx.cpp motion_comp_vis.cpp mpeg2convert.h \
+ 	mpeg2.h mpeg2_internal.h rgb.cpp rgb_mmx.cpp rgb_vis.cpp slice.cpp tendra.h \
+ 	uyvy.cpp video_out.h vis.h vlc.h k9decodethread.cpp k9plaympeg2.cpp
+-INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9vamps \
++INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9vamps \
+ 	-I$(top_srcdir)/libdvdnav -I$(top_srcdir)/libk9copy
+ 
+ noinst_HEADERS = k9decodethread.h k9plaympeg2.h
+--- ./k9devices/Makefile.am.dvdread	2013-06-06 19:29:20.000000000 +0200
++++ ./k9devices/Makefile.am	2013-07-28 20:05:20.857621477 +0200
+@@ -1,4 +1,4 @@
+-INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/libk9copy $(DBUS_INCS) \
++INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/libk9copy $(DBUS_INCS) \
+ 	$(HAL_INCS) $(K3B_INCS) $(all_includes)
+ METASOURCES = AUTO
+ libk9devices_la_LDFLAGS = $(all_libraries) 
+--- ./k9Mplayer/Makefile.am.dvdread	2013-06-06 19:29:20.000000000 +0200
++++ ./k9Mplayer/Makefile.am	2013-07-28 20:05:20.857621477 +0200
+@@ -1,4 +1,4 @@
+-INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/libk9copy $(all_includes)
++INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/libk9copy $(all_includes)
+ METASOURCES = AUTO
+ 
+ noinst_LTLIBRARIES = libk9mplayer.la
+--- ./k9vamps/Makefile.am.dvdread	2013-06-06 19:29:20.000000000 +0200
++++ ./k9vamps/Makefile.am	2013-07-28 20:05:20.858621351 +0200
+@@ -7,6 +7,6 @@
+ noinst_LTLIBRARIES = libk9vamps.la
+ libk9vamps_la_SOURCES = cputest.cpp getvlc.h k9fifo.cpp k9requant.cpp \
+ 	k9vamps.cpp k9vamps.h putvlc.h qTable.h tcmemcpy.cpp
+-INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9vamps \
++INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9vamps \
+ 	-I$(top_srcdir)/libk9copy
+ noinst_HEADERS = k9requant.h ac.h k9fifo.h
+--- ./libdvdnav/Makefile.am.dvdread	2013-06-06 19:29:20.000000000 +0200
++++ ./libdvdnav/Makefile.am	2013-07-28 20:05:20.858621351 +0200
+@@ -11,4 +11,4 @@
+ 
+ 
+ 
+-INCLUDES = -I$(top_srcdir)/dvdread
++INCLUDES = -I/usr/include/dvdread
+--- ./libk9copy/Makefile.am.dvdread	2013-06-06 19:29:20.000000000 +0200
++++ ./libk9copy/Makefile.am	2013-07-28 20:05:20.858621351 +0200
+@@ -24,6 +24,6 @@
+ 	k9saveimage.h k9script.h k9titleencopt.h k9tools.h k9videocodecs.h
+ 
+ 
+-INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9decmpeg \
++INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9decmpeg \
+ 	-I$(top_srcdir)/k9vamps -I$(top_srcdir)/libdvdnav
+ libk9copy_la_LDFLAGS = $(all_libraries)
+--- ./src/Makefile.am.dvdread	2013-07-28 20:05:20.855621729 +0200
++++ ./src/Makefile.am	2013-07-28 20:09:10.620642017 +0200
+@@ -1,5 +1,5 @@
+ # set the include path for X, qt and KDE
+-INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9Mplayer \
++INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9Mplayer \
+ 	-I$(top_srcdir)/k9author -I$(top_srcdir)/k9decmpeg -I$(top_srcdir)/k9devices \
+ 	-I$(top_srcdir)/k9vamps -I$(top_srcdir)/libdvdnav -I$(top_srcdir)/libk9copy $(all_includes)
+ 
+@@ -35,7 +35,7 @@
+ 	$(top_builddir)/k9author/libk9author.la $(top_builddir)/k9decmpeg/libk9decmpeg.la \
+ 	$(top_builddir)/k9devices/libk9devices.la $(top_builddir)/k9vamps/libk9vamps.la \
+ 	$(top_builddir)/libdvdnav/libk9dvdnav.la $(top_builddir)/libk9copy/libk9copy.la \
+-	$(top_builddir)/dvdread/libdvdread.la $(LIB_KDEUI) -lkmdi $(LIBDL) -lk3b -lk3bdevice
++	-ldvdread $(LIB_KDEUI) -lkmdi $(LIBDL) -lk3b -lk3bdevice
+ 
+ # this is where the desktop file will go 
+ shelldesktopdir = $(kde_appsdir)/Utilities
+--- ./Makefile.am.ORI	2013-07-28 20:15:29.961786846 +0200
++++ ./Makefile.am	2013-07-28 20:15:43.375094511 +0200
+@@ -1,4 +1,4 @@
+-SUBDIRS = doc dvdread libdvdnav k9Mplayer libk9copy k9author k9decmpeg k9devices k9vamps  \
++SUBDIRS = doc libdvdnav k9Mplayer libk9copy k9author k9decmpeg k9devices k9vamps  \
+ 	 po src
+ 
+ $(top_srcdir)/configure.in: configure.in.in $(top_srcdir)/subdirs
+@@ -29,11 +29,3 @@
+ 
+ AM_CXXFLAGS = -O0 -g3
+ 
+-
+-
+-
+-
+-
+-
+-
+-INCLUDES = -I$(top_srcdir)/dvdread
diff --git a/redhat/applications/k9copy/k9copy-3.5.13.2.spec b/redhat/applications/k9copy/k9copy-3.5.13.2.spec
index 537d72a3d..b77775b12 100644
--- a/redhat/applications/k9copy/k9copy-3.5.13.2.spec
+++ b/redhat/applications/k9copy/k9copy-3.5.13.2.spec
@@ -1,13 +1,13 @@
 # Default version for this component
-%define tdecomp k9copy
-%define tdeversion 3.5.13.2
+%define tde_pkg k9copy
+%define tde_version 3.5.13.2
 
 # 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
+# TDE specific building variables
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
@@ -24,35 +24,38 @@
 %define _docdir %{tde_docdir}
 
 
-Name:		trinity-%{tdecomp}
-Summary:	DVD backup tool for Trinity
-Version:	1.2.3
-Release:	4%{?dist}%{?_variant}
+Name:			trinity-%{tde_pkg}
+Summary:		DVD backup tool for Trinity
+Version:		1.2.3
+Release:		%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
 
-License:	GPLv2+
-Group:		Applications/Utilities
+License:		GPLv2+
+Group:			Applications/Utilities
 
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
+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)
+Prefix:			%{tde_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:	%{name}-%{tdeversion}%{?preversion:~%{preversion}}.tar.gz
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-Patch1:		k9copy-3.5.13.2-fix_k3b_link.patch
+Patch1:			k9copy-3.5.13.2-fix_k3b_link.patch
+Patch2:			k9copy-3.5.13.2-ftbfs.patch
+Patch3:			k9copy-3.5.13.2-use_external_dvdread.patch
+Patch4:			k9copy-3.5.13.2-avcodec.patch
 
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.2
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.2
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.2
-BuildRequires:	trinity-arts-devel >= 3.5.13.2
+BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	trinity-arts-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	trinity-k3b-devel
 
 # Warning: the target distribution must have ffmpeg !
-BuildRequires: ffmpeg-devel
-Requires:	ffmpeg
+BuildRequires:	ffmpeg-devel
+Requires:		ffmpeg
 
 %description
 k9copy is a tabbed tool that allows to copy of one or more titles from a DVD9
@@ -66,8 +69,14 @@ This is the Trinity version
 
 
 %prep
-%setup -q -n %{name}-%{tdeversion}%{?preversion:~%{preversion}}
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 %patch1 -p1 -b .ftbfs
+%patch2 -p1 -b .ftbfs
+%patch3 -p1 -b .dvdread
+%patch4 -p1 -b .avcodec
+
+# Removes internal dvdread headers
+%__rm -rf dvdread
 
 # Ugly hack to modify TQT include directory inside autoconf files.
 # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
@@ -80,7 +89,6 @@ This is the Trinity version
 %__make -f "admin/Makefile.common"
 
 
-
 %build
 unset QTDIR || : ; . /etc/profile.d/qt3.sh
 export PATH="%{tde_bindir}:${PATH}"
@@ -90,16 +98,25 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 if [ -d /usr/include/ffmpeg ]; then
 	export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/include/ffmpeg"
 fi
-
+ 
+# NOTICE: --enable-final causes FTBFS !
 %configure \
   --prefix=%{tde_prefix} \
   --exec-prefix=%{tde_prefix} \
   --bindir=%{tde_bindir} \
   --datadir=%{tde_datadir} \
   --includedir=%{tde_tdeincludedir} \
+  \
+  --disable-dependency-tracking \
+  --disable-debug \
+  --disable-final \
+  --enable-new-ldflags \
+  --enable-closure \
   --disable-rpath \
+  \
   --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure
+  \
+  --enable-k3bdevices
 
 %__make %{?_smp_mflags} || %__make
 
@@ -109,7 +126,8 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
-%find_lang %{tdecomp}
+%find_lang %{tde_pkg}
+
 
 %clean
 %__rm -rf %{buildroot}
@@ -126,7 +144,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 update-desktop-database %{tde_appdir} &> /dev/null
 
 
-%files -f %{tdecomp}.lang
+%files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
 %{tde_bindir}/k9copy
@@ -138,6 +156,9 @@ update-desktop-database %{tde_appdir} &> /dev/null
 
 
 %changelog
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 1.2.3-5
+- Rebuild with NDEBUG option
+
 * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.2.3-4
 - Initial release for TDE 3.5.13.2
 
diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2.spec b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2.spec
index 3e9694e3d..e20eb6996 100644
--- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2.spec
+++ b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2.spec
@@ -1,5 +1,6 @@
 # Default version for this component
-%define kdecomp kaffeine-mozilla
+%define tde_pkg kaffeine-mozilla
+%define tde_version 3.5.13.2
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?tde_prefix}" != "/usr"
@@ -23,29 +24,29 @@
 %define _docdir %{tde_docdir}
 
 
-Name:		trinity-%{kdecomp}
-Summary:	mozilla plugin that lanches kaffeine for supported media types [Trinity]
-Version:	0.4.3.1
-Release:	4%{?dist}%{?_variant}
+Name:			trinity-%{tde_pkg}
+Summary:		mozilla plugin that lanches kaffeine for supported media types [Trinity]
+Version:		0.4.3.1
+Release:		%{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant}
 
-License:	GPLv2+
-Group:		Applications/Multimedia
+License:		GPLv2+
+Group:			Applications/Multimedia
 
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
+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)
+Prefix:			%{tde_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:	%{name}-3.5.13.2.tar.gz
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
 # Fix 'nspr' includes location
 Patch1:		kaffeine-mozilla-3.5.13-fix_nspr_include.patch
 
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.2
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.2
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.2
+BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
 %if 0%{?suse_version}
@@ -57,14 +58,14 @@ BuildRequires:	nspr-devel
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	%{_lib}xaw-devel
 %endif
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1220
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
 BuildRequires:	libXaw-devel
 %endif
 
 Requires:		trinity-kaffeine
 
 %description
-This mozilla plugin launches kaffeine, the xine-based media player for KDE,
+This mozilla plugin launches kaffeine, the xine-based media player for TDE,
 when a page containing a supported media format is loaded.
 
 
@@ -74,8 +75,7 @@ when a page containing a supported media format is loaded.
 
 
 %prep
-unset QTDIR; . /etc/profile.d/qt3.sh
-%setup -q -n %{name}-3.5.13.2
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 %patch1 -p1 -b .nspr
 
 # Ugly hack to modify TQT include directory inside autoconf files.
@@ -90,17 +90,23 @@ unset QTDIR; . /etc/profile.d/qt3.sh
 
 
 %build
+unset QTDIR; . /etc/profile.d/qt3.sh
 export PATH="%{tde_bindir}:${PATH}"
 export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
-	--disable-rpath \
-    --with-extra-includes=%{tde_includedir}/tqt \
-    --enable-closure \
-    --prefix=%{_libdir}/mozilla
+  --prefix=%{_libdir}/mozilla \
+  \
+  --disable-dependency-tracking \
+  --disable-debug \
+  --enable-new-ldflags \
+  --enable-final \
+  --enable-closure \
+  --disable-rpath
 
 %__make %{?_smp_mflags}
 
+
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
@@ -109,6 +115,7 @@ export PATH="%{tde_bindir}:${PATH}"
 # Remove useless filess
 %__rm -f %{?buildroot}%{_libdir}/mozilla/plugins/kaffeineplugin.a
 
+
 %clean
 %__rm -rf %{buildroot}
 
diff --git a/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec b/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec
index cd0a75785..196e58419 100644
--- a/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec
+++ b/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec
@@ -1,12 +1,13 @@
 # Default version for this component
-%define kdecomp kaffeine
+%define tde_pkg kaffeine
+%define tde_version 3.5.13.2
 
 # 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
+# TDE specific building variables
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
@@ -21,55 +22,60 @@
 
 %define _docdir %{tde_docdir}
 
-Name:		trinity-%{kdecomp}
-Summary:	Xine-based media player
+Name:			trinity-%{tde_pkg}
+Summary:		Xine-based media player
 
-Version:	0.8.8
-Release:	5%{?dist}%{?_variant}
+Version:		0.8.8
+Release:		%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
 
-License: GPLv2+
-Group:   Applications/Multimedia
-URL:     http://kaffeine.sourceforge.net/
+License:		GPLv2+
+Group:			Applications/Multimedia
+URL:			http://kaffeine.sourceforge.net/
 
-Source0:	%{name}-3.5.13.2.tar.gz
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.2
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	gettext
+
+# VORBIS support
 BuildRequires:	libvorbis-devel
-BuildRequires:	libcdio-devel
 
+# CDDA support
+BuildRequires:	libcdio-devel
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	libcdda-devel
-BuildRequires:	%{_lib}xext%{?mgaversion:6}-devel
-BuildRequires:	%{_lib}xtst%{?mgaversion:6}-devel
-BuildRequires:	%{_lib}xinerama%{?mgaversion:1}-devel
-# dvb
-%if 0%{?pclinuxos} == 0
-BuildRequires:	kernel-headers
 %endif
-BuildRequires:	libgstreamer-devel >= 0.10
-BuildRequires:	libgstreamer-plugins-base-devel >= 0.10
-%else
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
 BuildRequires:	cdparanoia
 BuildRequires:	cdparanoia-devel
+%endif
 %if 0%{?suse_version} >= 1220
 BuildRequires:	libcdio-paranoia-devel
 %endif
 
 # X11 stuff
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1220
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}xext%{?mgaversion:6}-devel
+BuildRequires:	%{_lib}xtst%{?mgaversion:6}-devel
+BuildRequires:	%{_lib}xinerama%{?mgaversion:1}-devel
+%endif
 %if 0%{?rhel} == 4
 BuildRequires:	xorg-x11-devel 
-%else
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1220
 BuildRequires:	libXext-devel 
 BuildRequires:	libXtst-devel
 BuildRequires:	libXinerama-devel
 %endif
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
+BuildRequires: libxcb-devel
 %endif
 
-# dvb
+# GSTREAMER support
+%if 0%{?rhel} >= 5 || 0%{?suse_version} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_gstreamer 1
 BuildRequires:	gstreamer-devel
 %if 0%{?suse_version}
 BuildRequires:	gstreamer-0_10-plugins-base-devel
@@ -80,15 +86,14 @@ BuildRequires:	gstreamer-plugins-devel
 %endif
 %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	gstreamer-plugins-base-devel >= 0.10
-BuildRequires:	glibc-kernheaders 
 %endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	libgstreamer-devel >= 0.10
+BuildRequires:	libgstreamer-plugins-base-devel >= 0.10
 %endif
-
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
-BuildRequires: libxcb-devel
 %endif
 
-# xine-lib
+# XINE support
 %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
 BuildRequires:  libxine-devel
 %endif
@@ -96,31 +101,41 @@ BuildRequires:  libxine-devel
 BuildRequires:  xine-lib-devel
 %endif
 
-# LAME
+# LAME support
 %if 0%{?suse_version}
 BuildRequires:	libmp3lame-devel
 %else
 BuildRequires:	lame-devel
 %endif
 
+# WTF support
+%if 0%{?pclinuxos} == 0
+BuildRequires:	kernel-headers
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	glibc-kernheaders 
+%endif
+
 Requires: %{name}-libs = %{version}-%{release}
 
 %description
-Kaffeine is a xine-based media player for KDE.  It plays back CDs,
+Kaffeine is a xine-based media player for TDE.  It plays back CDs,
 and VCDs, and can decode all (local or streamed) multimedia formats 
 supported by xine-lib.
-Additionally, Kaffeine is fully integrated in KDE, it supports drag
+Additionally, Kaffeine is fully integrated in TDE, it supports drag
 and drop and provides an editable playlist, a bookmark system, a
 Konqueror plugin, OSD and much more.
 
-%files -f %{kdecomp}.lang
+%files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO
 %{tde_bindir}/kaffeine
 %{tde_libdir}/libkaffeinepart.so
 %{tde_tdelibdir}/lib*.*
 %{tde_datadir}/appl*/*/*.desktop
+%if 0%{?with_gstreamer}
 %{tde_datadir}/apps/gstreamerpart/
+%endif
 %{tde_datadir}/apps/kaffeine/
 %{tde_datadir}/apps/konqueror/servicemenus/*.desktop
 %{tde_datadir}/apps/profiles/
@@ -144,10 +159,10 @@ update-desktop-database >& /dev/null ||:
 ##########
 
 %package devel
-Summary: Development files for %{name}
-Group:   Development/Libraries
-Requires:	%{name}-libs = %{version}-%{release}
-Requires:	trinity-tdelibs-devel
+Summary:		Development files for %{name}
+Group:			Development/Libraries
+Requires:		%{name}-libs = %{version}-%{release}
+Requires:		trinity-tdelibs-devel
 
 %description devel
 %{summary}.
@@ -167,11 +182,11 @@ Requires:	trinity-tdelibs-devel
 ##########
 
 %package libs
-Summary: %{name} runtime libraries
-Group:   System Environment/Libraries
+Summary:		%{name} runtime libraries
+Group:			System Environment/Libraries
 
 # include to be paranoid, installing libs-only is still mostly untested -- Rex
-Requires: %{name} = %{version}-%{release}
+Requires:		%{name} = %{version}-%{release}
 
 %description libs
 %{summary}.
@@ -195,7 +210,7 @@ Requires: %{name} = %{version}-%{release}
 
 
 %prep
-%setup -q -n %{name}-3.5.13.2
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
 # Ugly hack to modify TQT include directory inside autoconf files.
 # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
@@ -221,16 +236,19 @@ export KDEDIR=%{tde_prefix}
   --datadir=%{tde_datadir} \
   --includedir=%{tde_tdeincludedir} \
   --mandir=%{tde_mandir} \
+  \
+  --disable-dependency-tracking \
+  --disable-debug \
   --enable-new-ldflags \
-  --disable-debug --disable-warnings \
-  --disable-dependency-tracking --enable-final \
+  --enable-final \
+  --enable-closure \
   --disable-rpath \
+  \
+  --with-extra-includes=%{tde_includedir}/tqt \
+  \
   --with-xinerama \
   --with-gstreamer \
   --with-lame \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --with-extra-libs=%{_prefix}/%{_lib} \
-  --enable-closure \
 %if 0%{?rhel} > 0 && 0%{?rhel} <= 5
   --without-dvb \
 %endif
@@ -246,23 +264,7 @@ export PATH="%{tde_bindir}:${PATH}"
 
 ## File lists
 # locale's
-%find_lang %{kdecomp}
-# HTML (1.0)
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then
-for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-    # replace absolute symlinks with relative ones
-    pushd $lang_dir
-      for i in *; do
-        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
-      done
-    popd
-  fi
-done
-fi
+%find_lang %{tde_pkg}
 
 # Unpackaged files
 rm -f $RPM_BUILD_ROOT%{tde_libdir}/lib*.la
@@ -272,7 +274,6 @@ rm -f $RPM_BUILD_ROOT%{tde_datadir}/mimelnk/application/x-mplayer2.desktop
 rm -rf $RPM_BUILD_ROOT
 
 
-
 %changelog
 * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.8-5
 - Initial release for TDE 3.5.13.2
diff --git a/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec b/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec
index c1fa65c21..c76b84f2b 100644
--- a/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec
+++ b/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec
@@ -1,12 +1,13 @@
 # Default version for this component
-%define kdecomp kdbusnotification
+%define tde_pkg kdbusnotification
+%define tde_version 3.5.13.2
 
 # 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
+# TDE specific building variables
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
@@ -23,37 +24,37 @@
 %define _docdir %{tde_docdir}
 
 
-Name:		trinity-%{kdecomp}
-Summary:	a DBUS notification service [Trinity]
+Name:			trinity-%{tde_pkg}
+Summary:		a DBUS notification service [Trinity]
 
-Version:	0.1
-Release:	4.1%{?dist}%{?_variant}
+Version:		0.1
+Release:		%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
 
-License:	GPLv2+
-Group:		Applications/Utilities
+License:		GPLv2+
+Group:			Applications/Utilities
 
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
+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)
+Prefix:			%{tde_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:	%{name}-3.5.13.2.tar.gz
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
 Patch1:			kdbusnotification-14.0.0-fix_utf8.patch
 
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.2
-BuildRequires:	trinity-arts-devel >= 3.5.13.2
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.2
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.2
-BuildRequires: desktop-file-utils
-BuildRequires: gtk2-devel
+BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires:	trinity-arts-devel >= %{tde_version}
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	gtk2-devel
 
 %if 0%{?suse_version}
-BuildRequires: dbus-1-glib-devel
+BuildRequires:	dbus-1-glib-devel
 %else
-BuildRequires: dbus-glib-devel
+BuildRequires:	dbus-glib-devel
 %endif
 
 %description
@@ -67,7 +68,7 @@ DBUS notifications via unobtrusive, easily dismissed passive popups.
 
 
 %prep
-%setup -q -n %{name}-3.5.13.2
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 %patch1 -p1 -b .utf8
 
 # Ugly hack to modify TQT include directory inside autoconf files.
@@ -93,9 +94,15 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
   --libdir=%{tde_libdir} \
   --datadir=%{tde_datadir} \
   --includedir=%{tde_tdeincludedir} \
+  \
+  --disable-dependency-tracking \
+  --disable-debug \
+  --enable-new-ldflags \
+  --enable-final \
+  --enable-closure \
   --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure
+  \
+  --with-extra-includes=%{tde_includedir}/tqt
 
 %__make %{?_smp_mflags}
 
@@ -120,7 +127,7 @@ export PATH="%{tde_bindir}:${PATH}"
 
 
 %changelog
-* Sun Jul 21 2013 Francois Andriot <francois.andriot@free.fr> - 0.1-4.1
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 0.1-5
 - Fix UTF8 messages
 
 * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.1-4
diff --git a/redhat/applications/kdiff3/kdiff3-3.5.13.2.spec b/redhat/applications/kdiff3/kdiff3-3.5.13.2.spec
index 0253cfa26..8fdcde01b 100644
--- a/redhat/applications/kdiff3/kdiff3-3.5.13.2.spec
+++ b/redhat/applications/kdiff3/kdiff3-3.5.13.2.spec
@@ -1,12 +1,13 @@
 # Default version for this component
-%define tdecomp kdiff3
+%define tde_pkg kdiff3
+%define tde_version 3.5.13.2
 
 # 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
+# TDE specific building variables
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
@@ -23,27 +24,27 @@
 %define _docdir %{tde_docdir}
 
 
-Name:		trinity-%{tdecomp}
-Summary:	KDiff3 is a utility for comparing and/or merging two or three text files or directories.
-Version:	0.9.91
-Release:	6%{?dist}%{?_variant}
+Name:			trinity-%{tde_pkg}
+Summary:		KDiff3 is a utility for comparing and/or merging two or three text files or directories.
+Version:		0.9.91
+Release:		%{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
 
-License:	GPLv2+
-Group:		Applications/Utilities
+License:		GPLv2+
+Group:			Applications/Utilities
 
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
+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)
+Prefix:			%{tde_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:	%{name}-3.5.13.2.tar.gz
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.2
-BuildRequires:	trinity-arts-devel >= 3.5.13.2
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.2
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.2
+BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires:	trinity-arts-devel >= %{tde_version}
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
 %description
@@ -60,7 +61,7 @@ Unicode & UTF-8 support
 
 
 %prep
-%setup -q -n %{name}-3.5.13.2
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
 # Ugly hack to modify TQT include directory inside autoconf files.
 # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
@@ -86,9 +87,15 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
   --includedir=%{tde_tdeincludedir} \
   --libdir=%{tde_libdir} \
   --mandir=%{tde_mandir} \
+  \
+  --disable-dependency-tracking \
+  --disable-debug \
+  --enable-new-ldflags \
+  --enable-final \
+  --enable-closure \
   --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure
+  \
+  --with-extra-includes=%{tde_includedir}/tqt
 
 %__make %{?_smp_mflags}
 
@@ -101,7 +108,7 @@ export PATH="%{tde_bindir}:${PATH}"
 # Unwanted files
 %__rm -rf %{?buildroot}%{tde_tdedocdir}/HTML/kdiff3/
 
-%find_lang %{tdecomp}
+%find_lang %{tde_pkg}
 
 %clean
 %__rm -rf %{buildroot}
@@ -120,7 +127,7 @@ for f in hicolor locolor; do
 done
 
 
-%files -f %{tdecomp}.lang
+%files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
 %{tde_bindir}/kdiff3
@@ -140,6 +147,9 @@ done
 %{tde_tdelibdir}/libkdiff3plugin.so
 
 %changelog
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.91-7
+- Rebuild with NDEBUG option
+
 * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.91-6
 - Initial release for TDE 3.5.13.2
 
diff --git a/redhat/applications/kile/kile-3.5.13.2.spec b/redhat/applications/kile/kile-3.5.13.2.spec
index cba7e4f2d..be360bd6d 100644
--- a/redhat/applications/kile/kile-3.5.13.2.spec
+++ b/redhat/applications/kile/kile-3.5.13.2.spec
@@ -1,12 +1,13 @@
 # Default version for this component
-%define tdecomp kile
+%define tde_pkg kile
+%define tde_version 3.5.13.2
 
 # 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
+# TDE specific building variables
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
@@ -23,26 +24,26 @@
 %define _docdir %{tde_docdir}
 
 
-Name:		trinity-%{tdecomp}
-Summary:	KDE Integrated LaTeX Environment [Trinity]
-Version:	2.0.2
-Release:	5%{?dist}%{?_variant}
+Name:			trinity-%{tde_pkg}
+Summary:		TDE Integrated LaTeX Environment [Trinity]
+Version:		2.0.2
+Release:		%{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
 
-License:	GPLv2+
-Group:		Applications/Publishing
+License:		GPLv2+
+Group:			Applications/Publishing
 
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
+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)
+Prefix:			%{tde_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:	%{name}-3.5.13.2.tar.gz
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.2
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.2
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.2
+BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
@@ -113,7 +114,7 @@ Kile can support large projects consisting of several smaller files.
 
 
 %prep
-%setup -q -n %{name}-3.5.13.2
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
 # Ugly hack to modify TQT include directory inside autoconf files.
 # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
@@ -139,7 +140,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
   --includedir=%{tde_tdeincludedir} \
   --libdir=%{tde_libdir} \
   --mandir=%{tde_mandir} \
+    \
+  --disable-dependency-tracking \
+  --disable-debug \
+  --enable-new-ldflags \
+  --enable-final \
+  --enable-closure \
   --disable-rpath \
+  \
   --with-extra-includes=%{tde_includedir}/tqt
 
 %__make %{?_smp_mflags}
@@ -156,7 +164,7 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -f %{?buildroot}%{tde_datadir}/apps/katepart/syntax/bibtex.xml
 %__rm -f %{?buildroot}%{tde_datadir}/apps/katepart/syntax/latex.xml
 
-%find_lang %{tdecomp}
+%find_lang %{tde_pkg}
 
 %clean
 %__rm -rf %{buildroot}
@@ -173,7 +181,7 @@ touch --no-create %{tde_datadir}/icons/hicolor || :
 gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 
-%files -f %{tdecomp}.lang
+%files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
 %{tde_bindir}/kile
 %{tde_tdeappdir}/kile.desktop
@@ -196,6 +204,9 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 
 %changelog
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 2.0.2-6
+- Rebuild with NDEBUG option
+
 * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 2.0.2-5
 - Initial release for TDE 3.5.13.2
 
diff --git a/redhat/applications/kima/kima-3.5.13.2.spec b/redhat/applications/kima/kima-3.5.13.2.spec
index 03068edbd..bbe41cc74 100644
--- a/redhat/applications/kima/kima-3.5.13.2.spec
+++ b/redhat/applications/kima/kima-3.5.13.2.spec
@@ -46,6 +46,13 @@ BuildRequires:	trinity-tdebase-devel >= 3.5.13.2
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
+# HAL support
+#  On RHEL4, we do not use HAL (too old)
+%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
+%define with_hal 1
+BuildRequires:	hal-devel >= 0.4.8
+%endif
+
 
 %description
 This applet monitors various temperature,
@@ -85,7 +92,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
   --includedir=%{tde_tdeincludedir} \
   --libdir=%{tde_libdir} \
   --mandir=%{tde_mandir} \
+  \
+  --disable-dependency-tracking \
+  --disable-debug \
+  --enable-new-ldflags \
+  --enable-final \
+  --enable-closure \
   --disable-rpath \
+  \
   --with-extra-includes=%{tde_includedir}/tqt:%{tde_tdeincludedir}
 
 # SMP safe !
diff --git a/redhat/applications/kiosktool/kiosktool-3.5.13.2.spec b/redhat/applications/kiosktool/kiosktool-3.5.13.2.spec
index 885e4131b..2d5d8bb0e 100644
--- a/redhat/applications/kiosktool/kiosktool-3.5.13.2.spec
+++ b/redhat/applications/kiosktool/kiosktool-3.5.13.2.spec
@@ -1,12 +1,13 @@
 # Default version for this component
-%define tdecomp kiosktool
+%define tde_pkg kiosktool
+%define tde_version 3.5.13.2
 
 # 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
+# TDE specific building variables
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
@@ -23,24 +24,24 @@
 %define _docdir %{tde_docdir}
 
 
-Name:		trinity-%{tdecomp}
-Version:	1.0
-Release:	4%{?dist}%{?_variant}
-Summary:	tool to configure the TDE kiosk framework
+Name:			trinity-%{tde_pkg}
+Version:		1.0
+Release:		%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
+Summary:		tool to configure the TDE kiosk framework
 
-License:	GPLv2+
-Group:		Applications/Multimedia
+License:		GPLv2+
+Group:			Applications/Multimedia
 
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
+Vendor:			Trinity Project
+Packager:		Francois Andriot <francois.andriot@free.fr>
+URL:			http://www.trinitydesktop.org/
 
 
-Source0:	%{name}-3.5.13.2.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: gettext
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.2
+BuildRequires:	gettext
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 
 
 %description
@@ -55,7 +56,7 @@ groups of users.
 
 
 %prep
-%setup -q -n %{name}-3.5.13.2
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
 # Ugly hack to modify TQT include directory inside autoconf files.
 # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
@@ -82,14 +83,16 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
   --includedir=%{tde_tdeincludedir} \
   --libdir=%{tde_libdir} \
   --mandir=%{tde_mandir} \
-  --disable-rpath \
+  \
+  --disable-dependency-tracking \
+  --disable-debug \
   --enable-new-ldflags \
-  --disable-debug --disable-warnings \
-  --disable-dependency-tracking --enable-final \
+  --enable-final \
   --enable-closure \
-  --with-extra-includes=%{tde_includedir}/tqt
+  --disable-rpath \
+  \
+  --with-extra-includes=%{tde_includedir}/tqt \
   
-
 %__make %{?_smp_mflags}
 
 
@@ -98,25 +101,7 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf $RPM_BUILD_ROOT
 %__make install DESTDIR=$RPM_BUILD_ROOT
 
-## File lists
-# locale's
-%find_lang %{tdecomp}
-# HTML (1.0)
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then
-for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-    # replace absolute symlinks with relative ones
-    pushd $lang_dir
-      for i in *; do
-        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
-      done
-    popd
-  fi
-done
-fi
+%find_lang %{tde_pkg}
 
 
 %clean
@@ -135,7 +120,7 @@ update-desktop-database >& /dev/null ||:
 
 
 
-%files -f %{tdecomp}.lang
+%files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
 %doc ChangeLog COPYING README TODO
 %{tde_bindir}/kiosktool
@@ -148,6 +133,9 @@ update-desktop-database >& /dev/null ||:
 %{tde_datadir}/apps/kiosktool/kiosktoolui.rc
 
 %changelog
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-5
+- Rebuild with NDEBUG option
+
 * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-4
 - Initial release for TDE 3.5.13.2
 
diff --git a/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec b/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec
index c5d8f4b37..9ac088547 100644
--- a/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec
+++ b/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec
@@ -1,12 +1,13 @@
 # Default version for this component
-%define tdecomp kmplayer
+%define tde_pkg kmplayer
+%define tde_version 3.5.13.2
 
 # 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
+# TDE specific building variables
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
@@ -23,30 +24,34 @@
 %define _docdir %{tde_docdir}
 
 
-Name:		trinity-%{tdecomp}
-Summary:	media player for Trinity
-Version:	0.10.0c
-Release:	5%{?dist}%{?_variant}
+Name:			trinity-%{tde_pkg}
+Summary:		media player for Trinity
+Version:		0.10.0c
+Release:		%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
 
-License:	GPLv2+
-Group:		Applications/Multimedia
+License:		GPLv2+
+Group:			Applications/Multimedia
 
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://kmplayer.kde.org
+Vendor:			Trinity Project
+Packager:		Francois Andriot <francois.andriot@free.fr>
+URL:			http://kmplayer.kde.org
 
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Prefix:			%{tde_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:	%{name}-3.5.13.2.tar.gz
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.2
-BuildRequires:	trinity-dbus-tqt-devel >= 3.5.13.2
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.2
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.2
+BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
+# DBUS support
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
+BuildRequires:	trinity-dbus-tqt-devel >= %{tde_version}
+%endif
 
+# GSTREAMER support
 %if 0%{?mgaversion} || 0%{?mdkversion}
 %if 0%{?pclinuxos}
 BuildRequires:	libgstreamer0.10-devel
@@ -54,24 +59,35 @@ BuildRequires:	libgstreamer0.10-devel
 BuildRequires:	%{_lib}gstreamer0.10-devel
 %endif
 BuildRequires:	%{_lib}gstreamer-plugins-base0.10-devel
-BuildRequires:	libxv-devel
 %endif
-%if 0%{?rhel} || 0%{?fedora}
+%if 0%{?rhel} == 4
+BuildRequires:	gstreamer-devel
+BuildRequires:	gstreamer-plugins-devel
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora}
 BuildRequires:	gstreamer-devel
 BuildRequires:	gstreamer-plugins-base-devel
-BuildRequires:	libXv-devel
 %endif
 %if 0%{?suse_version}
 BuildRequires:	gstreamer-devel
 BuildRequires:	gstreamer-0_10-plugins-base-devel
-%if 0%{?suse_version} == 1140
-BuildRequires:	xorg-x11-libXv-devel
-%else
+%endif
+
+# X11 stuff
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	libxv-devel
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1210
 BuildRequires:	libXv-devel
 %endif
+%if 0%{?rhel} == 4
+BuildRequires:	xorg-x11-devel 
+%endif
+%if 0%{?suse_version} == 1140
+BuildRequires:	xorg-x11-libXv-devel
 %endif
 
-Requires:	%{name}-base
+Requires:		%{name}-base
 
 %description
 A basic audio/video viewer application for Trinity.
@@ -84,7 +100,7 @@ KMPlayer can:
 * show backend player's console output
 * launch ffserver (only 0.4.8 works) when viewing from a v4l device
 * DCOP KMediaPlayer interface support
-* VDR viewer frontend (with *kxvplayer), configure VDR keys with standard KDE
+* VDR viewer frontend (with *kxvplayer), configure VDR keys with standard TDE
   shortcut configure window
 * Lots of configurable shortcuts. Highly recommended for the VDR keys
   (if you have VDR) and volume increase/decrease
@@ -125,7 +141,7 @@ Documention for KMPlayer, a basic audio/video viewer application for TDE.
 
 
 %prep
-%setup -q -n %{name}-3.5.13.2
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
 # Ugly hack to modify TQT include directory inside autoconf files.
 # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
@@ -152,11 +168,17 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
   --includedir=%{tde_tdeincludedir} \
   --libdir=%{tde_libdir} \
   --mandir=%{tde_mandir} \
+  \
+  --disable-dependency-tracking \
+  --disable-debug \
+  --enable-new-ldflags \
+  --enable-final \
+  --enable-closure \
   --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure
+  \
+  --with-extra-includes=%{tde_includedir}/tqt
 
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
 
 
 %install
@@ -164,7 +186,7 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
-%find_lang %{tdecomp}
+%find_lang %{tde_pkg}
 
 # Removes unwanted files
 %__rm -f %{?buildroot}%{tde_datadir}/mimelnk/application/x-mplayer2.desktop
@@ -191,7 +213,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 /sbin/ldconfig || :
 
 
-%files -f %{tdecomp}.lang
+%files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog INSTALL README TODO kmplayer.lsm
 %{tde_bindir}/kmplayer
diff --git a/redhat/applications/kmymoney/kmymoney-3.5.13.2-ftbfs.patch b/redhat/applications/kmymoney/kmymoney-3.5.13.2-ftbfs.patch
new file mode 100644
index 000000000..87e022f0f
--- /dev/null
+++ b/redhat/applications/kmymoney/kmymoney-3.5.13.2-ftbfs.patch
@@ -0,0 +1,19 @@
+--- ./kmymoney2/widgets/Makefile.am.ftbfs	2013-06-06 19:37:02.000000000 +0200
++++ ./kmymoney2/widgets/Makefile.am	2013-07-28 18:58:51.406093917 +0200
+@@ -7,14 +7,14 @@
+ libwidgets_a_METASOURCES = AUTO
+ 
+ libwidgets_a_SOURCES = kbudgetvalues.cpp kbudgetvaluesdecl.ui kguiutils.cpp klistviewsearchline.cpp kmymoneyaccountcombo.cpp kmymoneyaccountcompletion.cpp kmymoneyaccountselector.cpp kmymoneyaccounttreebase.cpp kmymoneyaccounttree.cpp kmymoneyaccounttreebudget.cpp kmymoneyaccounttreeforecast.cpp kmymoneybriefschedule.cpp kmymoneycalculator.cpp kmymoneycalendar.cpp kmymoneycategory.cpp kmymoneychecklistitem.cpp kmymoneycombo.cpp kmymoneycompletion.cpp kmymoneycurrencyselector.cpp kmymoneydateinput.cpp kmymoneydatetbl.cpp kmymoneyedit.cpp kmymoneyforecastlistviewitem.cpp kmymoneygpgconfig.cpp kmymoneygpgconfigdecl.ui kmymoneylineedit.cpp kmymoneylistviewitem.cpp kmymoneyonlinequoteconfig.cpp kmymoneyonlinequoteconfigdecl.ui kmymoneypriceview.cpp kmymoneyreportconfigtab1decl.ui kmymoneyreportconfigtab2decl.ui kmymoneyreportconfigtab3decl.ui kmymoneyreportconfigtabchartdecl.ui kmymoneyreportcontroldecl.ui kmymoneyscheduledcalendar.cpp kmymoneyscheduleddatetbl.cpp kmymoneyselector.cpp kmymoneytitlelabel.cpp kmymoneywizard.cpp kschedulebriefwidget.ui register.cpp registeritem.cpp registersearchline.cpp transaction.cpp scheduledtransaction.cpp stdtransactiondownloaded.cpp stdtransactionmatched.cpp transactioneditorcontainer.cpp transactionform.cpp kaccounttemplateselectordecl.ui kaccounttemplateselector.cpp \
+-transactionsortoption.cpp transactionsortoption.ui \
++transactionsortoption.ui \
+ selectedtransaction.cpp
+ 
+ #libwidgets_a_SOURCES = kmymoneyregisterinvestment.cpp kmymoneyequity.cpp kmymoneyequitycompletion.cpp kmymoneycompletion.cpp kmymoneyequityselector.cpp kmymoneyaccountcombo.cpp kmymoneyaccountcompletion.cpp kmymoneycurrencyselector.cpp kmymoneypriceview.cpp kmymoneypriceviewdecl.ui kschedulebriefwidget.ui kmymoneyaccountselector.cpp kmymoneyregisterloan.cpp kmymoneyregistersearch.cpp kmymoneybriefschedule.cpp kmymoneyscheduleddatetbl.cpp kmymoneydatetbl.cpp kmymoneyscheduledcalendar.cpp kmymoneycalendar.cpp kmymoneycalculator.cpp kmymoneycategory.cpp kmymoneypayee.cpp kmymoneytransactionform.cpp kmymoneyregistercheckings.cpp kmymoneyregister.cpp kmymoneycombo.cpp kmymoneyhlayout.cpp kmymoneylineedit.cpp kmymoneyedit.cpp kmymoneydateinput.cpp kmymoneyreportcontroldecl.ui kmymoneyreportconfigtab1decl.ui kmymoneyreportconfigtab2decl.ui kmymoneyreportconfigtab3decl.ui kmymoneyreportconfigtabchartdecl.ui kmymoneyonlinequoteconfig.cpp kmymoneyonlinequoteconfigdecl.ui kmymoneyaccounttree.cpp kmymoneygpgconfigdecl.ui kmymoneygpgconfig.cpp kmymoneytitlelabel.cpp kguiutils.cpp kmymoneywizard.cpp kmymoneyaccounttreebudget.cpp kmymoneyaccounttreeforecast.cpp \
+ #register.cpp registeritem.cpp transaction.cpp transactionform.cpp transactioneditor.cpp transactioneditorcontainer.cpp kmymoneychecklistitem.cpp kmymoneylistviewitem.cpp kmymoneyforecastlistviewitem.cpp kmymoneyselector.cpp \
+ #transactionsortoption.ui
+ 
+-EXTRA_DIST = kmymoney.widgets kmymoneygpgconfigdecl.ui kmymoneyonlinequoteconfigdecl.ui kmymoneyreportconfigtab1decl.ui kmymoneyreportconfigtab2decl.ui kmymoneyreportconfigtab3decl.ui kmymoneyreportcontroldecl.ui kschedulebriefwidget.ui kmymoneyreportconfigtabchartdecl.ui transactionsortoption.ui transactionsortoption.ui.h sortoptionlistitem.h kbudgetvaluesdecl.ui kaccounttemplateselectordecl.ui
++EXTRA_DIST = kmymoney.widgets kmymoneygpgconfigdecl.ui kmymoneyonlinequoteconfigdecl.ui kmymoneyreportconfigtab1decl.ui kmymoneyreportconfigtab2decl.ui kmymoneyreportconfigtab3decl.ui kmymoneyreportcontroldecl.ui kschedulebriefwidget.ui kmymoneyreportconfigtabchartdecl.ui transactionsortoption.ui.h sortoptionlistitem.h kbudgetvaluesdecl.ui kaccounttemplateselectordecl.ui
+ 
+ # include the widgets that are available to 3rd party sw (e.g. plugins or
+ # Qt designer) here
diff --git a/redhat/applications/kmymoney/kmymoney-3.5.13.2.spec b/redhat/applications/kmymoney/kmymoney-3.5.13.2.spec
index 5fa0965b2..0667d5ce0 100644
--- a/redhat/applications/kmymoney/kmymoney-3.5.13.2.spec
+++ b/redhat/applications/kmymoney/kmymoney-3.5.13.2.spec
@@ -1,5 +1,6 @@
 # Default version for this component
-%define tdecomp kmymoney
+%define tde_pkg kmymoney
+%define tde_version 3.5.13.2
 
 # Required for Mageia 2: removes the ldflag '--no-undefined'
 %define _disable_ld_no_undefined 1
@@ -19,7 +20,7 @@
 %define _variant .opt
 %endif
 
-# TDE 3.5.13 specific building variables
+# TDE specific building variables
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
@@ -36,24 +37,27 @@
 %define _docdir %{tde_docdir}
 
 
-Name:		trinity-%{tdecomp}
-Summary:	personal finance manager for TDE
+Name:			trinity-%{tde_pkg}
+Summary:		personal finance manager for TDE
 
-Version:	1.0.5
-Release:	4%{?dist}%{?_variant}
+Version:		1.0.5
+Release:		%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
 
-License:	GPLv2+
-Group:		Applications/Utilities
+License:		GPLv2+
+Group:			Applications/Utilities
 
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
+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)
+Prefix:			%{tde_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:	%{name}-3.5.13.2.tar.gz
-Source1:	kmymoneytitlelabel.png
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Source1:		kmymoneytitlelabel.png
+
+# [kmymoney] Fix FTBFS
+Patch1:		kmymoney-3.5.13.2-ftbfs.patch
 
 # [kmymoney] Missing LDFLAGS causing FTBFS
 Patch4:		kmymoney-3.5.13-missing_ldflags.patch
@@ -61,10 +65,10 @@ Patch4:		kmymoney-3.5.13-missing_ldflags.patch
 # [kmymoney] Fix QT3 plugins directory location
 Patch5:		kmymoney-3.5.13-fix_qt3_plugins_location.patch
 
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.2
-BuildRequires:	trinity-arts-devel >= 3.5.13.2
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.2
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.2
+BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires:	trinity-arts-devel >= %{tde_version}
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
 BuildRequires:	recode
@@ -101,9 +105,9 @@ support.
 
 
 %package common
-Summary:	KMyMoney architecture independent files
-Group:		Applications/Utilities
-Requires:	%{name} == %{version}
+Summary:		KMyMoney architecture independent files
+Group:			Applications/Utilities
+Requires:		%{name} == %{version}
 
 %description common
 This package contains architecture independent files needed for KMyMoney to
@@ -112,9 +116,9 @@ have '%{name}' package installed, you will hardly find this package useful.
 
 
 %package devel
-Summary:	KMyMoney development files
-Group:		Development/Libraries
-Requires:	%{name} == %{version}
+Summary:		KMyMoney development files
+Group:			Development/Libraries
+Requires:		%{name} == %{version}
 
 %description devel
 This package contains development files needed for KMyMoney plugins.
@@ -126,7 +130,8 @@ This package contains development files needed for KMyMoney plugins.
 
 
 %prep
-%setup -q -n %{name}-3.5.13.2
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+%patch1 -p1 -b .ftbfs
 %if 0%{?mgaversion} || 0%{?mdkversion}
 %patch5 -p1 -b .qtpluginsdir
 %endif
@@ -165,6 +170,7 @@ export QTPLUGINS="%{_libdir}/qt3/plugins"
 grep -v "^#~" po/it.po >/tmp/it.po && mv -f /tmp/it.po po/it.po
 %endif
 
+# NOTICE: --enable-final causes FTBFS !
 %configure \
   --prefix=%{tde_prefix} \
   --exec-prefix=%{tde_prefix} \
@@ -173,9 +179,16 @@ grep -v "^#~" po/it.po >/tmp/it.po && mv -f /tmp/it.po po/it.po
   --libdir=%{tde_libdir} \
   --mandir=%{tde_mandir} \
   --includedir=%{tde_tdeincludedir} \
+  \
+  --disable-dependency-tracking \
+  --disable-debug \
+  --enable-new-ldflags \
+  --disable-final \
+  --enable-closure \
   --disable-rpath \
+  \
   --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure \
+  \
   %{?with_pdf:--enable-pdf-docs} %{?!with_pdf:--disable-pdf-docs} \
   --enable-ofxplugin \
   --enable-ofxbanking \
@@ -198,29 +211,9 @@ export QTPLUGINS=%{_libdir}/qt3/plugins
 
 %__make install DESTDIR=%{buildroot}
 
-
-
-
-## File lists
-# HTML (1.0)
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}$HTML_DIR ]; then
-	for lang_dir in %{buildroot}$HTML_DIR/* ; do
-	  if [ -d $lang_dir ]; then
-		lang=$(basename $lang_dir)
-		echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-		# replace absolute symlinks with relative ones
-		pushd $lang_dir
-		  for i in *; do
-			[ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
-		  done
-		popd
-	  fi
-	done
-fi
-
 %find_lang kmymoney2
 
+
 %clean
 %__rm -rf %{buildroot}
 
@@ -241,6 +234,7 @@ for f in hicolor locolor Tango oxygen; do
   gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
 done
 
+
 %files
 %defattr(-,root,root,-)
 %{tde_bindir}/kmymoney
@@ -286,6 +280,9 @@ done
 %{qt3pluginsdir}/designer/libkmymoney.so
 
 %changelog
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.5-5
+- Rebuild with NDEBUG option
+
 * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.5-4
 - Initial release for TDE 3.5.13.2
 
diff --git a/redhat/applications/koffice/koffice-3.5.13.2.spec b/redhat/applications/koffice/koffice-3.5.13.2.spec
index 610a50901..e942636bf 100644
--- a/redhat/applications/koffice/koffice-3.5.13.2.spec
+++ b/redhat/applications/koffice/koffice-3.5.13.2.spec
@@ -1,5 +1,6 @@
 # Default version for this component
-%define tdecomp koffice
+%define tde_pkg koffice
+%define tde_version 3.5.13.2
 
 # Required for Mageia 2: removes the ldflag '--no-undefined'
 %define _disable_ld_no_undefined 1
@@ -9,7 +10,7 @@
 %define _variant .opt
 %endif
 
-# TDE 3.5.13 specific building variables
+# TDE specific building variables
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
@@ -37,80 +38,80 @@
 %global	_normalized_cpu	%(echo %{_target_cpu} | sed 's/^ppc/powerpc/;s/i.86/i386/;s/sparcv./sparc/;s/armv.*/arm/')
 
 
-Name:		trinity-%{tdecomp}
-Summary:	An integrated office suite
-Version:	1.6.3
-Release:	7%{?dist}%{?_variant}
+Name:			trinity-%{tde_pkg}
+Summary:		An integrated office suite
+Version:		1.6.3
+Release:		%{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant}
 
-Group:          Applications/Productivity
-License:        GPLv2+
+Group:			Applications/Productivity
+License:		GPLv2+
 
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
+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)
+Prefix:			%{tde_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:	%{name}-3.5.13.2.tar.gz
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
 
 # BuildRequires: world-devel ;)
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.2
-BuildRequires:  trinity-tdegraphics-devel >= 3.5.13.2
-BuildRequires:	trinity-tdegraphics-libpoppler-tqt-devel >= 3.5.13.2
-BuildRequires:  automake libtool
-BuildRequires:  fontconfig-devel
-BuildRequires:  libart_lgpl-devel
-BuildRequires:  libtiff-devel
-BuildRequires:  libjpeg-devel
-BuildRequires:  ImageMagick-devel
-BuildRequires:  zlib-devel
-BuildRequires:  openssl-devel
-BuildRequires:  python-devel
-BuildRequires:  pcre-devel
-BuildRequires:  gettext-devel
-BuildRequires:  mysql-devel
-BuildRequires:  desktop-file-utils
-BuildRequires:  perl
-BuildRequires:  doxygen
-BuildRequires:  aspell-devel
-BuildRequires:  libxslt-devel
-BuildRequires:  OpenEXR-devel
-BuildRequires:  libexif-devel
-BuildRequires:  readline-devel
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdegraphics-devel >= %{tde_version}
+BuildRequires:	trinity-tdegraphics-libpoppler-tqt-devel >= %{tde_version}
+BuildRequires:	automake libtool
+BuildRequires:	fontconfig-devel
+BuildRequires:	libart_lgpl-devel
+BuildRequires:	libtiff-devel
+BuildRequires:	libjpeg-devel
+BuildRequires:	ImageMagick-devel
+BuildRequires:	zlib-devel
+BuildRequires:	openssl-devel
+BuildRequires:	python-devel
+BuildRequires:	pcre-devel
+BuildRequires:	gettext-devel
+BuildRequires:	mysql-devel
+BuildRequires:	desktop-file-utils
+BuildRequires:	perl
+BuildRequires:	doxygen
+BuildRequires:	aspell-devel
+BuildRequires:	libxslt-devel
+BuildRequires:	OpenEXR-devel
+BuildRequires:	libexif-devel
+BuildRequires:	readline-devel
 
 %if 0%{?suse_version}
 BuildRequires:	libbz2-devel
-BuildRequires:  liblcms-devel
+BuildRequires:	liblcms-devel
 %else
-BuildRequires:  bzip2-devel
-BuildRequires:  lcms-devel
+BuildRequires:	bzip2-devel
+BuildRequires:	lcms-devel
 
-BuildRequires:  libpaper-devel
+BuildRequires:	libpaper-devel
 %endif
 
 # RUBY support
 %if 0%{?with_ruby}
-BuildRequires:  ruby ruby-devel >= 1.8.1
+BuildRequires:	ruby ruby-devel >= 1.8.1
 %endif
 
 # FREETYPE support
 %if 0%{?suse_version} == 1140
-BuildRequires:  freetype2-devel
+BuildRequires:	freetype2-devel
 %else
-BuildRequires:  freetype-devel
+BuildRequires:	freetype-devel
 %endif
 
 # LIBPNG support
 %if 0%{?mgaversion}
-BuildRequires:  %{_lib}png-devel
+BuildRequires:	%{_lib}png-devel
 %endif
 %if 0%{?mdkversion} && 0%{?pclinuxos} == 0
-BuildRequires:  %{_lib}png15-devel
+BuildRequires:	%{_lib}png15-devel
 %endif
 %if 0%{?suse_version} || 0%{?fedora} || 0%{?rhel}
-BuildRequires:  libpng-devel
+BuildRequires:	libpng-devel
 %endif
 
 # GRAPHICSMAGICK support
@@ -139,7 +140,7 @@ BuildRequires:	libutempter-devel
 #  Requires 'libpqxx', for kexi-driver-pgqsl
 %if 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version}
 %define with_postgresql 1
-BuildRequires:  libpqxx-devel
+BuildRequires:	libpqxx-devel
 %endif
 Obsoletes:		trinity-libpqxx
 
@@ -150,10 +151,10 @@ Obsoletes:		trinity-libwpd
 
 # WV2 support
 %if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:  %{_lib}wv2-devel
+BuildRequires:	%{_lib}wv2-devel
 %endif
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-BuildRequires:  wv2-devel
+BuildRequires:	wv2-devel
 %endif
 
 # MESA support
@@ -162,11 +163,11 @@ BuildRequires:	%{_lib}mesagl1-devel
 BuildRequires:	%{_lib}mesaglu1-devel
 %endif
 %if 0%{?fedora} || 0%{?rhel}
-BuildRequires:  libGL-devel
+BuildRequires:	libGL-devel
 BuildRequires:	libGLU-devel
 %endif
 %if 0%{?suse_version} >= 1220
-BuildRequires:  Mesa-libGL-devel
+BuildRequires:	Mesa-libGL-devel
 BuildRequires:	Mesa-libGLU-devel
 %endif
 
@@ -180,13 +181,13 @@ BuildRequires:	%{_lib}openjpeg-devel
 BuildRequires:	%{_lib}xi-devel
 %endif
 %if 0%{?rhel} >= 5 || 0%{?fedora}
-BuildRequires:  libXi-devel
+BuildRequires:	libXi-devel
 %endif
 %if 0%{?suse_version} == 1140
-BuildRequires:  libXi6-devel
+BuildRequires:	libXi6-devel
 %endif
 %if 0%{?suse_version} >= 1220
-BuildRequires:  libXi-devel
+BuildRequires:	libXi-devel
 %endif
 
 
@@ -196,25 +197,25 @@ KOffice is an integrated office suite.
 ##########
 
 %package suite
-Summary:        An integrated office suite
-Group:          Applications/Productivity
+Summary:		An integrated office suite
+Group:			Applications/Productivity
 Obsoletes:      %{name} <= %{version}-%{release}
 Obsoletes:      %{name}-i18n < 4:%{version}
-Requires:       %{name}-core = %{version}-%{release} 
-Requires:       %{name}-kword = %{version}-%{release} 
-Requires:       %{name}-kspread = %{version}-%{release} 
-Requires:       %{name}-kpresenter = %{version}-%{release}
-Requires:       %{name}-kivio = %{version}-%{release}
-Requires:       %{name}-karbon = %{version}-%{release}
-Requires:       %{name}-kugar = %{version}-%{release}
-Requires:       %{name}-kexi = %{version}-%{release}
-Requires:       %{name}-kexi-driver-mysql = %{version}-%{release}
+Requires:		%{name}-core = %{version}-%{release} 
+Requires:		%{name}-kword = %{version}-%{release} 
+Requires:		%{name}-kspread = %{version}-%{release} 
+Requires:		%{name}-kpresenter = %{version}-%{release}
+Requires:		%{name}-kivio = %{version}-%{release}
+Requires:		%{name}-karbon = %{version}-%{release}
+Requires:		%{name}-kugar = %{version}-%{release}
+Requires:		%{name}-kexi = %{version}-%{release}
+Requires:		%{name}-kexi-driver-mysql = %{version}-%{release}
 %{?with_postgresql:Requires:       %{name}-kexi-driver-pgsql = %{version}-%{release}}
-Requires:       %{name}-kchart = %{version}-%{release}
-Requires:       %{name}-kformula = %{version}-%{release}
-Requires:       %{name}-filters = %{version}-%{release}
-Requires:       %{name}-kplato = %{version}-%{release}
-Requires:       %{name}-chalk = %{version}-%{release}
+Requires:		%{name}-kchart = %{version}-%{release}
+Requires:		%{name}-kformula = %{version}-%{release}
+Requires:		%{name}-filters = %{version}-%{release}
+Requires:		%{name}-kplato = %{version}-%{release}
+Requires:		%{name}-chalk = %{version}-%{release}
 
 %description suite
 KOffice is an integrated office suite.
@@ -225,10 +226,10 @@ KOffice is an integrated office suite.
 ##########
 
 %package core
-Summary:        Core support files for %{name} 
-Group:          Applications/Productivity
-Requires:       %{name}-libs = %{version}-%{release}
-Requires:       perl
+Summary:		Core support files for %{name} 
+Group:			Applications/Productivity
+Requires:		%{name}-libs = %{version}-%{release}
+Requires:		perl
 Conflicts:      koffice-i18n < %{version}
 
 %description core
@@ -317,11 +318,11 @@ fi
 ##########
 
 %package libs
-Summary:        Runtime libraries for %{name} 
-Group:          System Environment/Libraries
+Summary:		Runtime libraries for %{name} 
+Group:			System Environment/Libraries
 Conflicts:      %{name} <= %{version}-%{release}
-Requires:       trinity-kdelibs
-License:        LGPLv2+
+Requires:		trinity-kdelibs
+License:		LGPLv2+
 
 %description libs
 %{summary}.
@@ -359,10 +360,10 @@ License:        LGPLv2+
 ##########
 
 %package devel
-Summary:        Development files for %{name} 
-Group:          Development/Libraries
-Requires:       %{name}-libs = %{version}-%{release}
-License:        LGPLv2+
+Summary:		Development files for %{name} 
+Group:			Development/Libraries
+Requires:		%{name}-libs = %{version}-%{release}
+License:		LGPLv2+
 
 %description devel
 %{summary}.
@@ -379,9 +380,9 @@ License:        LGPLv2+
 ##########
 
 %package kword
-Summary:	A frame-based word processor capable of professional standard documents
-Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
+Summary:		A frame-based word processor capable of professional standard documents
+Group:			Applications/Productivity
+Requires:		%{name}-core = %{version}-%{release}
 
 %description kword
 %{summary}.
@@ -413,9 +414,9 @@ update-desktop-database -q &> /dev/null ||:
 ##########
 
 %package kspread
-Summary:        A powerful spreadsheet application
-Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
+Summary:		A powerful spreadsheet application
+Group:			Applications/Productivity
+Requires:		%{name}-core = %{version}-%{release}
 
 %description kspread
 %{summary}.
@@ -450,9 +451,9 @@ Requires:       %{name}-core = %{version}-%{release}
 ##########
 
 %package kpresenter
-Summary:        A full-featured presentation program
-Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
+Summary:		A full-featured presentation program
+Group:			Applications/Productivity
+Requires:		%{name}-core = %{version}-%{release}
 
 %description kpresenter
 %{summary}.
@@ -484,9 +485,9 @@ update-desktop-database -q &> /dev/null ||:
 ##########
 
 %package kivio
-Summary:        A flowcharting application
-Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
+Summary:		A flowcharting application
+Group:			Applications/Productivity
+Requires:		%{name}-core = %{version}-%{release}
 Obsoletes:      kivio < %{version}-%{release}
 
 %description kivio
@@ -508,9 +509,9 @@ Obsoletes:      kivio < %{version}-%{release}
 ##########
 
 %package karbon
-Summary:        A vector drawing application
-Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
+Summary:		A vector drawing application
+Group:			Applications/Productivity
+Requires:		%{name}-core = %{version}-%{release}
 
 %description karbon
 %{summary}.
@@ -539,9 +540,9 @@ Requires:       %{name}-core = %{version}-%{release}
 ##########
 
 %package kugar
-Summary:        A tool for generating business quality reports
-Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
+Summary:		A tool for generating business quality reports
+Group:			Applications/Productivity
+Requires:		%{name}-core = %{version}-%{release}
 
 %description kugar
 %{summary}.
@@ -577,9 +578,9 @@ update-desktop-database -q &> /dev/null ||:
 ##########
 
 %package kexi
-Summary:        An integrated environment for managing data
-Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
+Summary:		An integrated environment for managing data
+Group:			Applications/Productivity
+Requires:		%{name}-core = %{version}-%{release}
 
 %if 0%{?with_postgresql} == 0
 Obsoletes:		%{name}-kexi-driver-pgsql
@@ -631,9 +632,9 @@ update-desktop-database -q &> /dev/null ||:
 ##########
 
 %package kexi-driver-mysql
-Summary:        Mysql-driver for kexi
-Group:          Applications/Productivity
-Requires:       %{name}-kexi = %{version}-%{release}
+Summary:		Mysql-driver for kexi
+Group:			Applications/Productivity
+Requires:		%{name}-kexi = %{version}-%{release}
 
 %description kexi-driver-mysql
 %{summary}.
@@ -650,9 +651,9 @@ Requires:       %{name}-kexi = %{version}-%{release}
 %if 0%{?with_postgresql}
 
 %package kexi-driver-pgsql
-Summary:        Postgresql driver for kexi
-Group:          Applications/Productivity
-Requires:       %{name}-kexi = %{version}-%{release}
+Summary:		Postgresql driver for kexi
+Group:			Applications/Productivity
+Requires:		%{name}-kexi = %{version}-%{release}
 
 %description kexi-driver-pgsql
 %{summary}.
@@ -669,9 +670,9 @@ Requires:       %{name}-kexi = %{version}-%{release}
 ##########
 
 %package kchart
-Summary:        An integrated graph and chart drawing tool
-Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
+Summary:		An integrated graph and chart drawing tool
+Group:			Applications/Productivity
+Requires:		%{name}-core = %{version}-%{release}
 
 %description kchart
 %{summary}.
@@ -699,26 +700,26 @@ update-desktop-database -q &> /dev/null ||:
 ##########
 
 %package kformula
-Summary:        A powerful formula editor
-Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
+Summary:		A powerful formula editor
+Group:			Applications/Productivity
+Requires:		%{name}-core = %{version}-%{release}
 
 %if 0%{?mgaversion} || 0%{?mdkversion}
 Requires:		fonts-ttf-dejavu
 %else
 %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
-Requires:       dejavu-lgc-sans-fonts
-Requires:       lyx-cmex10-fonts
+Requires:		dejavu-lgc-sans-fonts
+Requires:		lyx-cmex10-fonts
 %endif
 %if 0%{?rhel} == 5
-Requires:       dejavu-lgc-fonts 
-Requires:       lyx-cmex10-fonts
+Requires:		dejavu-lgc-fonts 
+Requires:		lyx-cmex10-fonts
 %endif
 %if 0%{?suse_version} >= 1220
-Requires:       dejavu-fonts 
+Requires:		dejavu-fonts 
 %endif
 %if 0%{?suse_version} == 1140
-Requires:       dejavu
+Requires:		dejavu
 %endif
 %endif
 
@@ -738,9 +739,9 @@ Requires:       dejavu
 ##########
 
 %package filters
-Summary:        Import and Export Filters for KOffice
-Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
+Summary:		Import and Export Filters for KOffice
+Group:			Applications/Productivity
+Requires:		%{name}-core = %{version}-%{release}
 
 %description filters
 %{summary}.
@@ -808,9 +809,9 @@ Requires:       %{name}-core = %{version}-%{release}
 ##########
 
 %package kplato
-Summary:         An integrated project management and planning tool
-Group:           Applications/Productivity
-Requires:        %{name}-core = %{version}-%{release}
+Summary:		An integrated project management and planning tool
+Group:			Applications/Productivity
+Requires:		%{name}-core = %{version}-%{release}
 
 %description kplato
 %{summary}.
@@ -829,11 +830,11 @@ Requires:        %{name}-core = %{version}-%{release}
 ##########
 
 %package chalk
-Summary:		 pixel-based image manipulation program for the TDE Office Suite [Trinity]
-Group:           Applications/Productivity
-Requires:        %{name}-core = %{version}-%{release}
-Requires:        %{name}-chalk-data = %{version}-%{release}
-Requires:        %{name}-filters
+Summary:		pixel-based image manipulation program for the TDE Office Suite [Trinity]
+Group:			Applications/Productivity
+Requires:		%{name}-core = %{version}-%{release}
+Requires:		%{name}-chalk-data = %{version}-%{release}
+Requires:		%{name}-filters
 
 %description chalk
 Chalk is a painting and image editing application for KOffice. Chalk contains
@@ -1022,7 +1023,7 @@ update-desktop-database -q &> /dev/null ||:
 
 %package chalk-data
 Summary:		data files for Chalk painting program [Trinity]
-Group:           Applications/Productivity
+Group:			Applications/Productivity
 
 %description chalk-data
 This package contains architecture-independent data files for Chalk,
@@ -1053,7 +1054,7 @@ This package is part of the TDE Office Suite.
 ##########
 
 %prep
-%setup -q -n %{name}-3.5.13.2
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
 %if 0%{?mgaversion} >= 3 || 0%{?pclinuxos} >= 2013
 %__cp /usr/share/automake-1.13/test-driver admin/
@@ -1097,6 +1098,7 @@ export CXXFLAGS="${CXXFLAGS} -I${RD}/%_normalized_cpu-linux"
   --mandir=%{tde_mandir} \
   --includedir=%{tde_tdeincludedir} \
   --disable-rpath --disable-dependency-tracking \
+  --disable-debug \
   --enable-new-ldflags \
   --disable-debug --disable-warnings \
   --with-pic --enable-shared --disable-static \
diff --git a/redhat/applications/kpilot/kpilot-3.5.13.2.spec b/redhat/applications/kpilot/kpilot-3.5.13.2.spec
index 4cd596fd7..2e5385bf5 100644
--- a/redhat/applications/kpilot/kpilot-3.5.13.2.spec
+++ b/redhat/applications/kpilot/kpilot-3.5.13.2.spec
@@ -1,12 +1,13 @@
 # Default version for this component
-%define tdecomp kpilot
+%define tde_pkg kpilot
+%define tde_version 3.5.13.2
 
 # 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
+# TDE specific building variables
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
@@ -23,38 +24,38 @@
 %define _docdir %{tde_docdir}
 
 
-Name:		trinity-%{tdecomp}
-Summary:	TDE Palm Pilot hot-sync tool
-Version:	0.7
-Release:	4%{?dist}%{?_variant}
+Name:			trinity-%{tde_pkg}
+Summary:		TDE Palm Pilot hot-sync tool
+Version:		0.7
+Release:		%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
 
-License:	GPLv2+
-Group:		Applications/Utilities
+License:		GPLv2+
+Group:			Applications/Utilities
 
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org
+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)
+Prefix:			%{tde_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:	%{name}-3.5.13.2.tar.gz
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
 
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.2
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.2
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.2
+BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
 BuildRequires:	pilot-link-devel
-BuildRequires:	trinity-kdepim-devel
+BuildRequires:	trinity-tdepim-devel >= %{tde_version}
 
 %description
 KPilot is an application that synchronizes your Palm Pilot or similar device
-(like the Handspring Visor) with your KDE desktop, much like the Palm HotSync
+(like the Handspring Visor) with your TDE desktop, much like the Palm HotSync
 software does for Windows.  KPilot can back-up and restore your Palm Pilot
-and synchronize the built-in applications with their KDE counterparts.
+and synchronize the built-in applications with their TDE counterparts.
 
 
 %if 0%{?suse_version} || 0%{?pclinuxos}
@@ -63,7 +64,7 @@ and synchronize the built-in applications with their KDE counterparts.
 
 
 %prep
-%setup -q -n %{name}-3.5.13.2
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
 # Ugly hack to modify TQT include directory inside autoconf files.
 # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
@@ -89,7 +90,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
   --libdir=%{tde_libdir} \
   --mandir=%{tde_mandir} \
   --includedir=%{tde_tdeincludedir} \
+  \
+  --disable-dependency-tracking \
+  --disable-debug \
+  --enable-new-ldflags \
+  --enable-final \
+  --enable-closure \
   --disable-rpath \
+  \
   --with-extra-includes=%{tde_includedir}/tqt:%{tde_tdeincludedir}
 
 # SMP safe !
@@ -174,6 +182,9 @@ done
 
 
 %changelog
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 0.7-5
+- Rebuild with NDEBUG option
+
 * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.7-4
 - Initial release for TDE 3.5.13.2
 
diff --git a/redhat/applications/kuickshow/kuickshow-3.5.13.2.spec b/redhat/applications/kuickshow/kuickshow-3.5.13.2.spec
index 15be9e31d..daea3460d 100644
--- a/redhat/applications/kuickshow/kuickshow-3.5.13.2.spec
+++ b/redhat/applications/kuickshow/kuickshow-3.5.13.2.spec
@@ -1,12 +1,13 @@
 # Default version for this component
-%define tdecomp kuickshow
+%define tde_pkg kuickshow
+%define tde_version 3.5.13.2
 
 # 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
+# TDE specific building variables
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
@@ -23,25 +24,25 @@
 %define _docdir %{tde_docdir}
 
 
-Name:		trinity-%{tdecomp}
-Summary:	Quick picture viewer for KDE 
-Version:	0.8.13
-Release:	6%{?dist}%{?_variant}
+Name:			trinity-%{tde_pkg}
+Summary:		Quick picture viewer for TDE 
+Version:		0.8.13
+Release:		%{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
 
-License:	GPLv2+
-Group:		Applications/Utilities
+License:		GPLv2+
+Group:			Applications/Utilities
 
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
+Vendor:			Trinity Project
+Packager:		Francois Andriot <francois.andriot@free.fr>
+URL:			http://www.trinitydesktop.org/
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:	%{name}-3.5.13.2.tar.gz
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.2
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.2
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.2
+BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
 %if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion}
@@ -52,7 +53,7 @@ BuildRequires:	imlib1-devel
 %endif
 
 %description
-Kuickshow is a picture viewer for KDE. It displays the directory structure,
+Kuickshow is a picture viewer for TDE. It displays the directory structure,
 displaying images as thumbnails.
 Clicking on an image shows the image in its normal size. 
 
@@ -63,7 +64,7 @@ Clicking on an image shows the image in its normal size.
 
 
 %prep
-%setup -q -n %{name}-3.5.13.2
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
 # Ugly hack to modify TQT include directory inside autoconf files.
 # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
@@ -89,9 +90,15 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
   --libdir=%{tde_libdir} \
   --mandir=%{tde_mandir} \
   --includedir=%{tde_tdeincludedir} \
+  \
+  --disable-dependency-tracking \
+  --disable-debug \
+  --enable-new-ldflags \
+  --enable-final \
+  --enable-closure \
   --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure
+  \
+  --with-extra-includes=%{tde_includedir}/tqt
 
 %__make %{?_smp_mflags}
 
@@ -123,7 +130,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 %{tde_datadir}/applications/*/*.desktop
 %{tde_datadir}/apps/*/
 %{tde_datadir}/icons/hicolor/*/*/*
-%{tde_libdir}/lib[kt]deinit_%{tdecomp}.so
+%{tde_libdir}/lib[kt]deinit_%{tde_pkg}.so
 %{tde_libdir}/*.la
 %{tde_tdelibdir}/*.so
 %{tde_tdelibdir}/*.la
@@ -131,6 +138,9 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 
 %changelog
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.13-7
+- Rebuild with NDEBUG option
+
 * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.13-6
 - Initial release for TDE 3.5.13.2
 
diff --git a/redhat/applications/rosegarden/rosegarden-3.5.13.2.spec b/redhat/applications/rosegarden/rosegarden-3.5.13.2.spec
index 22239302f..8e03ccf02 100644
--- a/redhat/applications/rosegarden/rosegarden-3.5.13.2.spec
+++ b/redhat/applications/rosegarden/rosegarden-3.5.13.2.spec
@@ -1,5 +1,6 @@
 # Default version for this component
-%define tdecomp rosegarden
+%define tde_pkg rosegarden
+%define tde_version 3.5.13.2
 
 # Required for Mageia 2: removes the ldflag '--no-undefined'
 %define _disable_ld_no_undefined 1
@@ -9,7 +10,7 @@
 %define _variant .opt
 %endif
 
-# TDE 3.5.13 specific building variables
+# TDE specific building variables
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
@@ -26,34 +27,38 @@
 %define _docdir %{tde_tdedocdir}
 
 
-Name:		trinity-%{tdecomp}
-Summary:	music editor and MIDI/audio sequencer [Trinity]
-Version:	1.7.0
-Release:	4%{?dist}%{?_variant}
+Name:			trinity-%{tde_pkg}
+Summary:		music editor and MIDI/audio sequencer [Trinity]
+Version:		1.7.0
+Release:		%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
 
-License:	GPLv2+
-Group: 	    Applications/Multimedia
+License:		GPLv2+
+Group:			Applications/Multimedia
 
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.rosegardenmusic.com/
+Vendor:			Trinity Project
+Packager:		Francois Andriot <francois.andriot@free.fr>
+URL:			http://www.rosegardenmusic.com/
 
-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}-3.5.13.2.tar.gz
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.2
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.2
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.2
+BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
 BuildRequires:	fftw-devel
-BuildRequires:	dssi-devel
 BuildRequires:	liblo-devel
 BuildRequires:	fontconfig-devel
 
+# DSSI support
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version}
+BuildRequires:	dssi-devel
+%endif
+
 # LRDF support
 %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version}
 BuildRequires:	liblrdf-devel
@@ -67,40 +72,40 @@ BuildRequires:	jack-audio-connection-kit-devel
 %endif
 
 # LIRC support
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6
 %define with_lirc 1
 BuildRequires:	lirc-devel
 %endif
 
-Requires:	lilypond
-Requires:	perl-XML-Twig
+Requires:		lilypond
+Requires:		perl-XML-Twig
 
 %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-Requires:	libsndfile-progs
+Requires:		libsndfile-progs
 %else
 %if 0%{?rhel}
-Requires:	libsndfile
+Requires:		libsndfile
 %else
-Requires:	libsndfile-utils
+Requires:		libsndfile-utils
 %endif
 %endif
 
 
-Requires:	%{name}-data == %{version}-%{release}
+Requires:		%{name}-data == %{version}-%{release}
 
 %description
-Rosegarden is a KDE application which provides a mixed Audio/MIDI
+Rosegarden is a TDE application which provides a mixed Audio/MIDI
 sequencer (for playback and recording), a multi-track editor, music
 editing using both piano-roll and score notation, MIDI file IO,
 lilypond and Csound files export, etc.
 
 %package data
-Group: 	    Applications/Multimedia
-Requires:	%{name} == %{version}-%{release}
-Summary:	music editor and MIDI/audio sequencer data files [Trinity]
+Group:			Applications/Multimedia
+Requires:		%{name} == %{version}-%{release}
+Summary:		music editor and MIDI/audio sequencer data files [Trinity]
 
 %description data
-Rosegarden is a KDE application which provides a mixed Audio/MIDI
+Rosegarden is a TDE application which provides a mixed Audio/MIDI
 sequencer (for playback and recording), a multi-track editor, music
 editing using both piano-roll and score notation, MIDI file IO,
 lilypond and Csound files export, etc.
@@ -114,7 +119,7 @@ This package provides the data files necessary for running Rosegarden
 
 
 %prep
-%setup -q -n %{name}-3.5.13.2
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
 # Hard-coded path to TQT binaries spotted !!!
 %__sed -i CMakeLists.txt \
@@ -134,14 +139,20 @@ cd build
 %endif
 
 %cmake \
+  -DCMAKE_BUILD_TYPE="" \
+  -DCMAKE_C_FLAGS="-DNDEBUG" \
+  -DCMAKE_CXX_FLAGS="-DNDEBUG" \
+  -DCMAKE_SKIP_RPATH="OFF" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWANT_DEBUG=OFF \
+  -DWANT_FULLDBG=OFF \
+  \
   -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
   -DBIN_INSTALL_DIR=%{tde_bindir} \
   -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
   -DLIB_INSTALL_DIR=%{tde_libdir} \
   -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  -DCMAKE_SKIP_RPATH="OFF" \
-  -DWANT_DEBUG=OFF \
-  -DWANT_FULLDBG=OFF \
+  \
   -DWANT_SOUND=ON \
   -DWANT_JACK=ON \
   -DWANT_DSSI=ON \
@@ -159,8 +170,11 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot} -C build
 
+# Unwanted files
+%__rm -f %{?buildroot}%{tde_libdir}/*.a
+
+%find_lang %{tde_pkg}
 
-%find_lang %{tdecomp}
 
 %clean
 %__rm -rf %{buildroot}
@@ -189,7 +203,7 @@ done
 %{tde_bindir}/rosegarden-project-package
 %{tde_bindir}/rosegardensequencer
 
-%files data -f %{tdecomp}.lang
+%files data -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
 %{tde_tdeappdir}/rosegarden.desktop
 %{tde_datadir}/apps/profiles/rosegarden.profile.xml
@@ -207,6 +221,9 @@ done
 
 
 %changelog
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 1.7.0-5
+- Rebuild with NDEBUG option
+
 * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.7.0-4
 - Initial release for TDE 3.5.13.2
 
diff --git a/redhat/applications/tdesvn/tdesvn-3.5.13.2.spec b/redhat/applications/tdesvn/tdesvn-3.5.13.2.spec
index 54a443726..b98cb94b4 100644
--- a/redhat/applications/tdesvn/tdesvn-3.5.13.2.spec
+++ b/redhat/applications/tdesvn/tdesvn-3.5.13.2.spec
@@ -1,12 +1,13 @@
 # Default version for this component
-%define tdecomp tdesvn
+%define tde_pkg tdesvn
+%define tde_version 3.5.13.2
 
 # 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
+# TDE specific building variables
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
@@ -23,26 +24,26 @@
 %define _docdir %{tde_docdir}
 
 
-Name:		trinity-%{tdecomp}
-Summary:	subversion client with tight KDE integration [Trinity]
-Version:	1.0.4
-Release:	5%{?dist}%{?_variant}
+Name:			trinity-%{tde_pkg}
+Summary:		subversion client with tight TDE integration [Trinity]
+Version:		1.0.4
+Release:		%{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
 
-License:	GPLv2+
-Group:		Applications/Utilities
+License:		GPLv2+
+Group:			Applications/Utilities
 
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.elliptique.net/~ken/kima/
+Vendor:			Trinity Project
+Packager:		Francois Andriot <francois.andriot@free.fr>
+URL:			http://www.elliptique.net/~ken/kima/
 
-Prefix:    %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Prefix:			%{_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:	%{name}-3.5.13.2.tar.gz
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.2
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.2
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.2
+BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
@@ -57,13 +58,13 @@ TDESvn is a graphical client for the subversion revision control
 system (svn).
 
 Besides offering common and advanced svn operations, it features
-a tight integration into KDE and can be embedded into other KDE 
-applications like konqueror via the KDE component technology KParts.
+a tight integration into TDE and can be embedded into other TDE 
+applications like konqueror via the TDE component technology KParts.
 
 
 %package -n trinity-libsvnqt
-Group:		Development/Libraries
-Summary: Qt wrapper library for subversion [Trinity]
+Group:			Development/Libraries
+Summary:		Qt wrapper library for subversion [Trinity]
 
 %description -n trinity-libsvnqt
 This package provides svnqt, a Qt wrapper library around the 
@@ -73,11 +74,11 @@ It is based on the RapidSvn SvnCpp library, a subversion client API
 written in C++.
 
 %package -n trinity-libsvnqt-devel
-Group:		Development/Libraries
-Requires:	trinity-libsvnqt = %{version}-%{release}
-Requires:	qt-devel
-Requires:	subversion-devel
-Summary:	Qt wrapper library for subversion (development files) [Trinity]
+Group:			Development/Libraries
+Requires:		trinity-libsvnqt = %{version}-%{release}
+Requires:		qt-devel
+Requires:		subversion-devel
+Summary:		Qt wrapper library for subversion (development files) [Trinity]
 
 %description -n trinity-libsvnqt-devel
 This package contains the header files and symbolic links that developers
@@ -85,9 +86,9 @@ using svnqt will need.
 
 
 %package tdeio-plugins
-Group:		Development/Libraries
+Group:			Development/Libraries
 Conflicts:	trinity-kdesdk-tdeio-plugins
-Summary:	subversion I/O slaves for Trinity
+Summary:		subversion I/O slaves for Trinity
 
 Obsoletes:	trinity-kdesvn-kio-plugins < %{version}-%{release}
 Provides:	trinity-kdesvn-kio-plugins = %{version}-%{release}
@@ -108,7 +109,7 @@ This package is part of tdesvn-trinity.
 
 
 %prep
-%setup -q -n %{name}-3.5.13.2
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
 # Ugly hack to modify TQT include directory inside autoconf files.
 # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
@@ -141,6 +142,12 @@ cd build
 %endif
 
 %cmake \
+  -DCMAKE_BUILD_TYPE="" \
+  -DCMAKE_C_FLAGS="-DNDEBUG" \
+  -DCMAKE_CXX_FLAGS="-DNDEBUG" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  \
   -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
   -DBIN_INSTALL_DIR=%{tde_bindir} \
   -DINCLUDE_INSTALL_DIR=%{tde_includedir} \
@@ -149,7 +156,6 @@ cd build
   -DDATA_INSTALL_DIR=%{tde_datadir} \
   -DPKGCONFIG_INSTALL_DIR=%{tde_tdelibdir}/pkgconfig \
   -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  -DCMAKE_SKIP_RPATH="OFF" \
   ..
 
 # SMP safe !
@@ -162,8 +168,6 @@ export PATH="%{_bindir}:${PATH}"
 %__make install DESTDIR=%{buildroot} -C build
 
 
-%find_lang kdesvn
-
 # Installs SVN protocols as alternatives
 %__mv -f %{?buildroot}%{tde_datadir}/services/svn+file.protocol %{?buildroot}%{tde_datadir}/services/svn+file.protocol_tdesvn
 %__mv -f %{?buildroot}%{tde_datadir}/services/svn+http.protocol %{?buildroot}%{tde_datadir}/services/svn+http.protocol_tdesvn
@@ -176,6 +180,8 @@ export PATH="%{_bindir}:${PATH}"
 %__ln_s /etc/alternatives/svn+ssh.protocol %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol
 %__ln_s /etc/alternatives/svn.protocol %{?buildroot}%{tde_datadir}/services/svn.protocol
 
+%find_lang %{tde_pkg}
+
 
 %clean
 %__rm -rf %{buildroot}
@@ -271,6 +277,9 @@ fi
 
 
 %changelog
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.4-6
+- Rebuild with NDEBUG option
+
 * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.4-5
 - Initial release for TDE 3.5.13.2
 
diff --git a/redhat/applications/tellico/tellico-3.5.13.2-ftbfs.patch b/redhat/applications/tellico/tellico-3.5.13.2-ftbfs.patch
new file mode 100644
index 000000000..5695d8fff
--- /dev/null
+++ b/redhat/applications/tellico/tellico-3.5.13.2-ftbfs.patch
@@ -0,0 +1,19 @@
+--- 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
new file mode 100644
index 000000000..261b24363
--- /dev/null
+++ b/redhat/applications/tellico/tellico-3.5.13.2-videodev.patch
@@ -0,0 +1,11 @@
+--- 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.2.spec b/redhat/applications/tellico/tellico-3.5.13.2.spec
index f28e3d813..59b542bdc 100644
--- a/redhat/applications/tellico/tellico-3.5.13.2.spec
+++ b/redhat/applications/tellico/tellico-3.5.13.2.spec
@@ -1,12 +1,13 @@
 # Default version for this component
-%define tdecomp tellico
+%define tde_pkg tellico
+%define tde_version 3.5.13.2
 
 # 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
+# TDE specific building variables
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
@@ -23,26 +24,29 @@
 %define _docdir %{tde_tdedocdir}
 
 
-Name:		trinity-%{tdecomp}
-Summary:	Icollection manager for books, videos, music [Trinity]
-Version:	1.3.2.1
-Release:	5%{?dist}%{?_variant}
+Name:			trinity-%{tde_pkg}
+Summary:		Icollection manager for books, videos, music [Trinity]
+Version:		1.3.2.1
+Release:		%{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
 
-License:	GPLv2+
-Group:		Applications/Utilities
+License:		GPLv2+
+Group:			Applications/Utilities
 
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://periapsis.org/tellico/
+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)
+Prefix:			%{tde_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:	%{name}-3.5.13.2.tar.gz
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.2
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.2
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.2
+Patch1:			tellico-3.5.13.2-videodev.patch
+Patch2:			tellico-3.5.13.2-ftbfs.patch
+
+BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
@@ -51,8 +55,16 @@ BuildRequires:	yaz
 BuildRequires:	%{_lib}yaz-devel
 %endif
 
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	%{name}-scripts = %{version}-%{release}
+# V4L support
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?suse_version}
+BuildRequires:	libv4l-devel
+%endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}v4l-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
@@ -70,8 +82,8 @@ 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]
+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
@@ -91,8 +103,8 @@ 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]
+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
@@ -119,7 +131,12 @@ as a separate package which can be updated through debian-volatile.
 
 
 %prep
-%setup -q -n %{name}-3.5.13.2
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+if [ -r /usr/include/libv4l1-videodev.h ]; then
+%patch1 -p1 -b .videodev
+fi
+%patch2 -p1 -b .ftbfs
 
 # Ugly hack to modify TQT include directory inside autoconf files.
 # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
@@ -137,6 +154,7 @@ unset QTDIR; . /etc/profile.d/qt3.sh
 export PATH="%{tde_bindir}:${PATH}"
 export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
+# Warning, --enable-final causes FTBFS §
 %configure \
   --prefix=%{tde_prefix} \
   --exec-prefix=%{tde_prefix} \
@@ -145,8 +163,17 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
   --libdir=%{tde_libdir} \
   --mandir=%{tde_mandir} \
   --includedir=%{tde_tdeincludedir} \
+  \
+  --disable-dependency-tracking \
+  --disable-debug \
+  --enable-new-ldflags \
+  --disable-final \
+  --enable-closure \
   --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt
+  \
+  --with-extra-includes=%{tde_includedir}/tqt \
+  \
+  --enable-webcam
 
 %__make %{?_smp_mflags} || %__make
 
@@ -164,7 +191,7 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm %{?buildroot}%{tde_tdedocdir}/HTML/fr/tellico/common
 
 
-%find_lang %{tdecomp}
+%find_lang %{tde_pkg}
 
 
 %clean
@@ -180,7 +207,7 @@ touch --no-create %{tde_datadir}/icons/hicolor || :
 gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 
-%files -f %{tdecomp}.lang
+%files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
 %{tde_bindir}/tellico
 #%{tde_datadir}/pixmaps
@@ -217,6 +244,9 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 
 %changelog
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-6
+- Rebuild with NDEBUG option
+
 * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-5
 - Initial release for TDE 3.5.13.2