Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

17 files changed, 1752 insertions, 20 deletions

diff --git a/redhat/applications/abakus/trinity-abakus-3.5.13.spec b/redhat/applications/abakus/trinity-abakus-3.5.13.spec
new file mode 100644
index 000000000..616896d1e
--- /dev/null
+++ b/redhat/applications/abakus/trinity-abakus-3.5.13.spec
@@ -0,0 +1,97 @@
+# Default version for this component
+%define kdecomp abakus
+%define version 0.91
+%define release 2
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%define _variant .opt
+%define _docdir %{_prefix}/share/doc
+%endif
+
+# TDE 3.5.13 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}/kde
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/trinity
+
+
+Name:		trinity-%{kdecomp}
+Summary:	Calculator for TDE
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/Utilities
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.trinitydesktop.org/
+
+Prefix:    %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+
+BuildRequires:	tqtinterface-devel
+BuildRequires:	trinity-kdelibs-devel
+BuildRequires:	trinity-kdebase-devel
+BuildRequires:	desktop-file-utils
+BuildRequires:	scons
+BuildRequires:	bison
+
+%description
+AbaKus is a complex calculator, which provides
+many different kinds of calculations.
+Think of it as bc (the command-line calculator) with a nice GUI.
+It also gives information about mathematical variables and
+has the user-friendly menu options of a normal KDE application.
+
+%prep
+%setup -q -n applications/%{kdecomp}
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+export CXXFLAGS="-I%{_includedir}/tqt"
+
+./configure
+	
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}%{_prefix}
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{_bindir}/*
+%{_datadir}/apps/*/
+%{_datadir}/icons/*/*/*/*
+%{tde_docdir}/HTML/*/*/
+%{_datadir}/applnk/Utilities/abakus.desktop
+
+%Changelog
+* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.91-2
+- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
+
+* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.91-1
+- Initial build for RHEL 6 and Fedora 15
+- Import to GIT
diff --git a/redhat/applications/dolphin/trinity-dolphin-3.5.13.spec b/redhat/applications/dolphin/trinity-dolphin-3.5.13.spec
new file mode 100644
index 000000000..1b488e70e
--- /dev/null
+++ b/redhat/applications/dolphin/trinity-dolphin-3.5.13.spec
@@ -0,0 +1,145 @@
+# Default version for this component
+%define kdecomp dolphin
+%define version 0.9.2
+%define release 3
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%define _variant .opt
+%define _docdir %{_prefix}/share/doc
+%endif
+
+# TDE 3.5.13 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}/kde
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/trinity
+
+
+Name:		trinity-%{kdecomp}
+Summary:	File manager for KDE focusing on usability 
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/Utilities
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.trinitydesktop.org/
+
+Prefix:    %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+
+BuildRequires:	tqtinterface-devel
+BuildRequires:	trinity-kdelibs-devel
+BuildRequires:	trinity-kdebase-devel
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+
+%description
+Dolphin focuses on being only a file manager.
+This approach allows to optimize the user
+interface for the task of file management.
+
+
+%prep
+%setup -q -n applications/%{kdecomp}
+
+# Ugly hack to modify TQT include directory inside autoconf files.
+# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
+sed -i admin/acinclude.m4.in \
+  -e "s,/usr/include/tqt,%{_includedir}/tqt,g"
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%configure \
+	--disable-rpath \
+    --with-extra-includes=%{_includedir}/tqt
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+# TDE 3.5.12: dirty hack to prevent duplicate line in file 'd3lphin.desktop'
+sed -i "%{buildroot}%{_datadir}/applications/kde/d3lphin.desktop" \
+	-e "/^Name\[pa\].*/d"
+
+desktop-file-install --vendor ""                \
+    --delete-original                           \
+    --dir %{buildroot}%{_datadir}/applications/ \
+    %{buildroot}%{_datadir}/applications/kde/d3lphin.desktop
+
+
+## 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
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING TODO
+%{_bindir}/*
+%{_datadir}/applications/*.desktop
+%{_datadir}/apps/*/
+%doc %lang(en) %{_docdir}/HTML/en/*/
+%{_datadir}/icons/hicolor/128x128/apps/*.png
+%{_datadir}/icons/hicolor/??x??/apps/*.png
+%{_datadir}/locale/*/*/d3lphin.mo
+
+
+%Changelog
+* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.2-3
+- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
+
+* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.2-2
+- Import to GIT
+
+* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.2-1
+- Correct macro to install under "/opt", if desired
+
+* Thu Jun 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.2-0
+- Initial build for RHEL 6.0
+- Based on FC7 'Dolphin 0.8.2-2" SPEC file.
+
diff --git a/redhat/applications/filelight/trinity-filelight-3.5.13.spec b/redhat/applications/filelight/trinity-filelight-3.5.13.spec
new file mode 100644
index 000000000..43878bf0a
--- /dev/null
+++ b/redhat/applications/filelight/trinity-filelight-3.5.13.spec
@@ -0,0 +1,117 @@
+# Default version for this component
+%define kdecomp filelight
+%define version 1.0
+%define release 3
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%define _variant .opt
+%define _docdir %{_prefix}/share/doc
+%endif
+
+# TDE 3.5.13 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}/kde
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/trinity
+
+
+Name:		trinity-%{kdecomp}
+Summary:	Graphical disk usage display
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/Utilities
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.trinitydesktop.org/
+
+Prefix:    %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+
+
+BuildRequires: tqtinterface-devel
+BuildRequires: trinity-kdelibs-devel
+BuildRequires: trinity-kdebase-devel
+BuildRequires: desktop-file-utils
+
+%description
+Filelight creates a complex, but data-rich graphical representation of the files and
+directories on your computer. 
+
+
+%prep
+%setup -q -n applications/%{kdecomp}
+
+# Ugly hack to modify TQT include directory inside autoconf files.
+# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
+sed -i admin/acinclude.m4.in \
+  -e "s,/usr/include/tqt,%{_includedir}/tqt,g"
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%configure \
+	--disable-rpath \
+    --with-extra-includes=%{_includedir}/tqt
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{_bindir}/*
+%{_datadir}/applications/*/*.desktop
+%{_datadir}/apps/*/
+%{_datadir}/icons/*/*/*/*
+%{_datadir}/locale/*/*/*.mo
+%{_datadir}/config/filelightrc
+%{_datadir}/services/*.desktop
+%{_docdir}/HTML/*/*/
+
+%{_libdir}/*/*.so
+%exclude %{_libdir}/*/*.la
+
+%Changelog
+* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-3
+- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
+
+* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-2
+- Import to GIT
+
+* Wed Aug 24 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-1
+- Correct macro to install under "/opt", if desired
+
+* Sun Aug 14 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-0
+- Initial build for RHEL 6.0
+
diff --git a/redhat/applications/gwenview/gwenview-3.5.13-jpegint-ftbfs.patch b/redhat/applications/gwenview/gwenview-3.5.13-jpegint-ftbfs.patch
new file mode 100644
index 000000000..0cd290983
--- /dev/null
+++ b/redhat/applications/gwenview/gwenview-3.5.13-jpegint-ftbfs.patch
@@ -0,0 +1,254 @@
+diff -Nuar gwenview.ORI/src/imageutils/jpegint.h gwenview/src/imageutils/jpegint.h
+--- gwenview.ORI/src/imageutils/jpegint.h	2011-05-26 23:04:57.000000000 +0200
++++ gwenview/src/imageutils/jpegint.h	2011-11-01 20:45:15.494165195 +0100
+@@ -43,9 +43,9 @@
+ 
+ /* Master control module */
+ struct jpeg_comp_master {
+-  JTQT_METHOD(void, prepare_for_pass, (j_compress_ptr cinfo));
+-  JTQT_METHOD(void, pass_startup, (j_compress_ptr cinfo));
+-  JTQT_METHOD(void, finish_pass, (j_compress_ptr cinfo));
++  JMETHOD(void, prepare_for_pass, (j_compress_ptr cinfo));
++  JMETHOD(void, pass_startup, (j_compress_ptr cinfo));
++  JMETHOD(void, finish_pass, (j_compress_ptr cinfo));
+ 
+   /* State variables made visible to other modules */
+   boolean call_pass_startup;	/* True if pass_startup must be called */
+@@ -54,16 +54,16 @@
+ 
+ /* Main buffer control (downsampled-data buffer) */
+ struct jpeg_c_main_controller {
+-  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
+-  JTQT_METHOD(void, process_data, (j_compress_ptr cinfo,
++  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
++  JMETHOD(void, process_data, (j_compress_ptr cinfo,
+ 			       JSAMPARRAY input_buf, JDIMENSION *in_row_ctr,
+ 			       JDIMENSION in_rows_avail));
+ };
+ 
+ /* Compression preprocessing (downsampling input buffer control) */
+ struct jpeg_c_prep_controller {
+-  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
+-  JTQT_METHOD(void, pre_process_data, (j_compress_ptr cinfo,
++  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
++  JMETHOD(void, pre_process_data, (j_compress_ptr cinfo,
+ 				   JSAMPARRAY input_buf,
+ 				   JDIMENSION *in_row_ctr,
+ 				   JDIMENSION in_rows_avail,
+@@ -74,23 +74,23 @@
+ 
+ /* Coefficient buffer control */
+ struct jpeg_c_coef_controller {
+-  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
+-  JTQT_METHOD(boolean, compress_data, (j_compress_ptr cinfo,
++  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
++  JMETHOD(boolean, compress_data, (j_compress_ptr cinfo,
+ 				   JSAMPIMAGE input_buf));
+ };
+ 
+ /* Colorspace conversion */
+ struct jpeg_color_converter {
+-  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo));
+-  JTQT_METHOD(void, color_convert, (j_compress_ptr cinfo,
++  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
++  JMETHOD(void, color_convert, (j_compress_ptr cinfo,
+ 				JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
+ 				JDIMENSION output_row, int num_rows));
+ };
+ 
+ /* Downsampling */
+ struct jpeg_downsampler {
+-  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo));
+-  JTQT_METHOD(void, downsample, (j_compress_ptr cinfo,
++  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
++  JMETHOD(void, downsample, (j_compress_ptr cinfo,
+ 			     JSAMPIMAGE input_buf, JDIMENSION in_row_index,
+ 			     JSAMPIMAGE output_buf,
+ 			     JDIMENSION out_row_group_index));
+@@ -100,9 +100,9 @@
+ 
+ /* Forward DCT (also controls coefficient quantization) */
+ struct jpeg_forward_dct {
+-  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo));
++  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
+   /* perhaps this should be an array??? */
+-  JTQT_METHOD(void, forward_DCT, (j_compress_ptr cinfo,
++  JMETHOD(void, forward_DCT, (j_compress_ptr cinfo,
+ 			      jpeg_component_info * compptr,
+ 			      JSAMPARRAY sample_data, JBLOCKROW coef_blocks,
+ 			      JDIMENSION start_row, JDIMENSION start_col,
+@@ -111,23 +111,23 @@
+ 
+ /* Entropy encoding */
+ struct jpeg_entropy_encoder {
+-  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo, boolean gather_statistics));
+-  JTQT_METHOD(boolean, encode_mcu, (j_compress_ptr cinfo, JBLOCKROW *MCU_data));
+-  JTQT_METHOD(void, finish_pass, (j_compress_ptr cinfo));
++  JMETHOD(void, start_pass, (j_compress_ptr cinfo, boolean gather_statistics));
++  JMETHOD(boolean, encode_mcu, (j_compress_ptr cinfo, JBLOCKROW *MCU_data));
++  JMETHOD(void, finish_pass, (j_compress_ptr cinfo));
+ };
+ 
+ /* Marker writing */
+ struct jpeg_marker_writer {
+-  JTQT_METHOD(void, write_file_header, (j_compress_ptr cinfo));
+-  JTQT_METHOD(void, write_frame_header, (j_compress_ptr cinfo));
+-  JTQT_METHOD(void, write_scan_header, (j_compress_ptr cinfo));
+-  JTQT_METHOD(void, write_file_trailer, (j_compress_ptr cinfo));
+-  JTQT_METHOD(void, write_tables_only, (j_compress_ptr cinfo));
++  JMETHOD(void, write_file_header, (j_compress_ptr cinfo));
++  JMETHOD(void, write_frame_header, (j_compress_ptr cinfo));
++  JMETHOD(void, write_scan_header, (j_compress_ptr cinfo));
++  JMETHOD(void, write_file_trailer, (j_compress_ptr cinfo));
++  JMETHOD(void, write_tables_only, (j_compress_ptr cinfo));
+   /* These routines are exported to allow insertion of extra markers */
+   /* Probably only COM and APPn markers should be written this way */
+-  JTQT_METHOD(void, write_marker_header, (j_compress_ptr cinfo, int marker,
++  JMETHOD(void, write_marker_header, (j_compress_ptr cinfo, int marker,
+ 				      unsigned int datalen));
+-  JTQT_METHOD(void, write_marker_byte, (j_compress_ptr cinfo, int val));
++  JMETHOD(void, write_marker_byte, (j_compress_ptr cinfo, int val));
+ };
+ 
+ 
+@@ -135,8 +135,8 @@
+ 
+ /* Master control module */
+ struct jpeg_decomp_master {
+-  JTQT_METHOD(void, prepare_for_output_pass, (j_decompress_ptr cinfo));
+-  JTQT_METHOD(void, finish_output_pass, (j_decompress_ptr cinfo));
++  JMETHOD(void, prepare_for_output_pass, (j_decompress_ptr cinfo));
++  JMETHOD(void, finish_output_pass, (j_decompress_ptr cinfo));
+ 
+   /* State variables made visible to other modules */
+   boolean is_dummy_pass;	/* True during 1st pass for 2-pass quant */
+@@ -144,10 +144,10 @@
+ 
+ /* Input control module */
+ struct jpeg_input_controller {
+-  JTQT_METHOD(int, consume_input, (j_decompress_ptr cinfo));
+-  JTQT_METHOD(void, reset_input_controller, (j_decompress_ptr cinfo));
+-  JTQT_METHOD(void, start_input_pass, (j_decompress_ptr cinfo));
+-  JTQT_METHOD(void, finish_input_pass, (j_decompress_ptr cinfo));
++  JMETHOD(int, consume_input, (j_decompress_ptr cinfo));
++  JMETHOD(void, reset_input_controller, (j_decompress_ptr cinfo));
++  JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo));
++  JMETHOD(void, finish_input_pass, (j_decompress_ptr cinfo));
+ 
+   /* State variables made visible to other modules */
+   boolean has_multiple_scans;	/* True if file has multiple scans */
+@@ -156,18 +156,18 @@
+ 
+ /* Main buffer control (downsampled-data buffer) */
+ struct jpeg_d_main_controller {
+-  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
+-  JTQT_METHOD(void, process_data, (j_decompress_ptr cinfo,
++  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
++  JMETHOD(void, process_data, (j_decompress_ptr cinfo,
+ 			       JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
+ 			       JDIMENSION out_rows_avail));
+ };
+ 
+ /* Coefficient buffer control */
+ struct jpeg_d_coef_controller {
+-  JTQT_METHOD(void, start_input_pass, (j_decompress_ptr cinfo));
+-  JTQT_METHOD(int, consume_data, (j_decompress_ptr cinfo));
+-  JTQT_METHOD(void, start_output_pass, (j_decompress_ptr cinfo));
+-  JTQT_METHOD(int, decompress_data, (j_decompress_ptr cinfo,
++  JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo));
++  JMETHOD(int, consume_data, (j_decompress_ptr cinfo));
++  JMETHOD(void, start_output_pass, (j_decompress_ptr cinfo));
++  JMETHOD(int, decompress_data, (j_decompress_ptr cinfo,
+ 				 JSAMPIMAGE output_buf));
+   /* Pointer to array of coefficient virtual arrays, or NULL if none */
+   jvirt_barray_ptr *coef_arrays;
+@@ -175,8 +175,8 @@
+ 
+ /* Decompression postprocessing (color quantization buffer control) */
+ struct jpeg_d_post_controller {
+-  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
+-  JTQT_METHOD(void, post_process_data, (j_decompress_ptr cinfo,
++  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
++  JMETHOD(void, post_process_data, (j_decompress_ptr cinfo,
+ 				    JSAMPIMAGE input_buf,
+ 				    JDIMENSION *in_row_group_ctr,
+ 				    JDIMENSION in_row_groups_avail,
+@@ -187,12 +187,12 @@
+ 
+ /* Marker reading & parsing */
+ struct jpeg_marker_reader {
+-  JTQT_METHOD(void, reset_marker_reader, (j_decompress_ptr cinfo));
++  JMETHOD(void, reset_marker_reader, (j_decompress_ptr cinfo));
+   /* Read markers until SOS or EOI.
+    * Returns same codes as are defined for jpeg_consume_input:
+    * JPEG_SUSPENDED, JPEG_REACHED_SOS, or JPEG_REACHED_EOI.
+    */
+-  JTQT_METHOD(int, read_markers, (j_decompress_ptr cinfo));
++  JMETHOD(int, read_markers, (j_decompress_ptr cinfo));
+   /* Read a restart marker --- exported for use by entropy decoder only */
+   jpeg_marker_parser_method read_restart_marker;
+ 
+@@ -207,8 +207,8 @@
+ 
+ /* Entropy decoding */
+ struct jpeg_entropy_decoder {
+-  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo));
+-  JTQT_METHOD(boolean, decode_mcu, (j_decompress_ptr cinfo,
++  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
++  JMETHOD(boolean, decode_mcu, (j_decompress_ptr cinfo,
+ 				JBLOCKROW *MCU_data));
+ 
+   /* This is here to share code between baseline and progressive decoders; */
+@@ -217,21 +217,21 @@
+ };
+ 
+ /* Inverse DCT (also performs dequantization) */
+-typedef JTQT_METHOD(void, inverse_DCT_method_ptr,
++typedef JMETHOD(void, inverse_DCT_method_ptr,
+ 		(j_decompress_ptr cinfo, jpeg_component_info * compptr,
+ 		 JCOEFPTR coef_block,
+ 		 JSAMPARRAY output_buf, JDIMENSION output_col));
+ 
+ struct jpeg_inverse_dct {
+-  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo));
++  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
+   /* It is useful to allow each component to have a separate IDCT method. */
+   inverse_DCT_method_ptr inverse_DCT[MAX_COMPONENTS];
+ };
+ 
+ /* Upsampling (note that upsampler must also call color converter) */
+ struct jpeg_upsampler {
+-  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo));
+-  JTQT_METHOD(void, upsample, (j_decompress_ptr cinfo,
++  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
++  JMETHOD(void, upsample, (j_decompress_ptr cinfo,
+ 			   JSAMPIMAGE input_buf,
+ 			   JDIMENSION *in_row_group_ctr,
+ 			   JDIMENSION in_row_groups_avail,
+@@ -244,20 +244,20 @@
+ 
+ /* Colorspace conversion */
+ struct jpeg_color_deconverter {
+-  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo));
+-  JTQT_METHOD(void, color_convert, (j_decompress_ptr cinfo,
++  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
++  JMETHOD(void, color_convert, (j_decompress_ptr cinfo,
+ 				JSAMPIMAGE input_buf, JDIMENSION input_row,
+ 				JSAMPARRAY output_buf, int num_rows));
+ };
+ 
+ /* Color quantization or color precision reduction */
+ struct jpeg_color_quantizer {
+-  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo, boolean is_pre_scan));
+-  JTQT_METHOD(void, color_quantize, (j_decompress_ptr cinfo,
++  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, boolean is_pre_scan));
++  JMETHOD(void, color_quantize, (j_decompress_ptr cinfo,
+ 				 JSAMPARRAY input_buf, JSAMPARRAY output_buf,
+ 				 int num_rows));
+-  JTQT_METHOD(void, finish_pass, (j_decompress_ptr cinfo));
+-  JTQT_METHOD(void, new_color_map, (j_decompress_ptr cinfo));
++  JMETHOD(void, finish_pass, (j_decompress_ptr cinfo));
++  JMETHOD(void, new_color_map, (j_decompress_ptr cinfo));
+ };
+ 
+ 
diff --git a/redhat/applications/gwenview/trinity-gwenview-3.5.13.spec b/redhat/applications/gwenview/trinity-gwenview-3.5.13.spec
new file mode 100644
index 000000000..a1323c5c2
--- /dev/null
+++ b/redhat/applications/gwenview/trinity-gwenview-3.5.13.spec
@@ -0,0 +1,169 @@
+# Default version for this component
+%define kdecomp gwenview
+%define version 1.4.2
+%define release 4
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%define _variant .opt
+%define _docdir %{_prefix}/share/doc
+%endif
+
+# TDE 3.5.13 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}/kde
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/trinity
+
+
+Name:		trinity-%{kdecomp}
+Summary:	Gwenview is an image viewer for KDE.
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/Utilities
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.trinitydesktop.org/
+
+Prefix:    %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+
+# TDE 3.5.13 on RHEL/Fedora specific patches
+Patch0:		gwenview-3.5.13-jpegint-ftbfs.patch
+
+
+BuildRequires: tqtinterface-devel
+BuildRequires: trinity-arts-devel
+BuildRequires: trinity-kdelibs-devel
+BuildRequires: trinity-kdebase-devel
+BuildRequires: desktop-file-utils
+BuildRequires: gettext
+BuildRequires: exiv2-devel
+
+%if "%{?_prefix}" == "/usr"
+Conflicts: kdegraphics
+%endif
+
+
+%description
+Gwenview is a fast and easy to use image viewer/browser for KDE.
+All common image formats are supported, such as PNG(including transparency),
+JPEG(including EXIF tags and lossless transformations), GIF, XCF (Gimp
+image format), BMP, XPM and others. Standard features include slideshow,
+fullscreen view, image thumbnails, drag'n'drop, image zoom, full network
+transparency using the KIO framework, including basic file operations and
+browsing in compressed archives, non-blocking GUI with adjustable views.
+Gwenview also provides image and directory KParts components for use e.g. in
+Konqueror. Additional features, such as image renaming, comparing,
+converting, and batch processing, HTML gallery and others are provided by the
+KIPI image framework.
+
+
+%prep
+%setup -q -n applications/%{kdecomp}
+%patch0 -p1
+
+# Ugly hack to modify TQT include directory inside autoconf files.
+# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
+sed -i admin/acinclude.m4.in \
+  -e "s,/usr/include/tqt,%{_includedir}/tqt,g"
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%configure \
+	--disable-rpath \
+    --with-extra-includes=%{_includedir}/tqt \
+    --enable-closure
+
+%__make
+# %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install 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
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{_bindir}/*
+%{_libdir}/*.so.*
+%{_datadir}/applications/*/*.desktop
+%{_datadir}/services/*.desktop
+%{_datadir}/apps/*/
+%{_datadir}/config.kcfg/*
+%{tde_docdir}/HTML/en/*/
+%{_datadir}/icons/*/*/*/*
+%{_mandir}/man*/*
+
+%{_libdir}/libkdeinit_gwenview.so
+%exclude %{_libdir}/libgwenviewcore.so
+
+%exclude %{_libdir}/*.la
+%exclude %{_libdir}/*/*.so
+%exclude %{_libdir}/*/*.la
+
+
+
+%Changelog
+* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-4
+- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
+
+* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-3
+- Import to GIT
+
+* Wed Aug 24 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-2
+- Add fix for Fedora 15
+
+* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-1
+- Correct macro to install under "/opt", if desired
+
+* Sat Aug 13 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-0
+- Initial build for RHEL 6.0
+
diff --git a/redhat/applications/k3b/k3b-i18n-trinity.patch b/redhat/applications/k3b/k3b-i18n-trinity.patch
new file mode 100644
index 000000000..0b85e98cf
--- /dev/null
+++ b/redhat/applications/k3b/k3b-i18n-trinity.patch
@@ -0,0 +1,81 @@
+--- k3b-i18n-1.0.5/acinclude.m4.ORI	2011-10-30 11:45:36.484658442 +0100
++++ k3b-i18n-1.0.5/acinclude.m4	2011-10-30 11:53:00.134646577 +0100
+@@ -479,14 +479,14 @@
+     if test "$kde_qtver" = "2"; then
+       kde_moduledir='\${libdir}/kde2'
+     else
+-      kde_moduledir='\${libdir}/kde3'
++      kde_moduledir='\${libdir}/trinity'
+     fi
+   fi
+   if test -z "$kde_styledir"; then
+-    kde_styledir='\${libdir}/kde3/plugins/styles'
++    kde_styledir='\${libdir}/trinity/plugins/styles'
+   fi
+   if test -z "$kde_widgetdir"; then
+-    kde_widgetdir='\${libdir}/kde3/plugins/designer'
++    kde_widgetdir='\${libdir}/trinity/plugins/designer'
+   fi
+   if test -z "$xdg_appsdir"; then
+     xdg_appsdir='\${datadir}/applications/kde'
+@@ -546,7 +546,7 @@
+ 
+ AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
+ [
+-    kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
++    kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/trinity/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
+     test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
+     if test -n "$KDEDIRS"; then
+        kde_save_IFS=$IFS
+@@ -612,7 +612,7 @@
+         KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
+ 
+         if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
+- 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
++ 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/trinity/share /opt/kde3/share /opt/kde/share $prefix/share"
+             test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
+             AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
+ 	    if test "$KDE_XSL_STYLESHEET" = "NO"; then
+@@ -1817,7 +1817,7 @@
+ 
+ if test -z "$1"; then
+ 
+-kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
++kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/trinity/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
+ test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
+ kde_incdirs="$ac_kde_includes $kde_incdirs"
+ AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
+@@ -1829,7 +1829,7 @@
+ So, check this please and use another prefix!])
+ fi
+ 
+-kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
++kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/trinity/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
+ test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
+ kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
+ AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
+@@ -1837,7 +1837,7 @@
+ 
+ kde_widgetdir=NO
+ dnl this might be somewhere else
+-AC_FIND_FILE("kde3/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
++AC_FIND_FILE("trinity/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
+ 
+ if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then
+ AC_MSG_ERROR([
+@@ -1845,7 +1845,7 @@
+ So, check this please and use another prefix!])
+ fi
+ 
+-if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
++if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then
+ AC_MSG_ERROR([
+ I can't find the designer plugins. These are required and should have been installed
+ by kdelibs])
+@@ -1852,7 +1852,7 @@
+ fi
+
+ if test -n "$kde_widgetdir"; then
+-    kde_widgetdir="$kde_widgetdir/kde3/plugins/designer"
++    kde_widgetdir="$kde_widgetdir/trinity/plugins/designer"
+ fi
diff --git a/redhat/applications/k3b/trinity-k3b-3.5.12.spec b/redhat/applications/k3b/trinity-k3b-3.5.12.spec
index 423655f54..e58543d38 100644
--- a/redhat/applications/k3b/trinity-k3b-3.5.12.spec
+++ b/redhat/applications/k3b/trinity-k3b-3.5.12.spec
@@ -26,6 +26,9 @@ 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)
+
 %if "%{?_prefix}" == "/usr"
 Obsoletes: k3b
 %endif
@@ -33,10 +36,6 @@ Obsoletes: k3b
 Group:   Applications/Archiving
 License: GPLv2+
 
-Prefix:		%{_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-
 Source0: k3b-%{version}.tar.gz
 Source1: k3b-i18n-1.0.5.tar.bz2
 Source2: k3brc
@@ -62,7 +61,7 @@ BuildRequires: dbus-qt-devel hal-devel
 BuildRequires: flac-devel
 BuildRequires: gettext
 BuildRequires: libdvdread-devel
-%if 0%{?fedora} >= 15 || 0%{?rhel} && 0%{?rhel} <= 5
+%if 0%{?fedora} >= 15 || 0%{?rhel} <= 5
 BuildRequires: libmpcdec-devel
 %else
 BuildRequires: musepack-tools-devel
diff --git a/redhat/applications/k3b/trinity-k3b-3.5.13.spec b/redhat/applications/k3b/trinity-k3b-3.5.13.spec
index 22f1c4238..a40db17d6 100644
--- a/redhat/applications/k3b/trinity-k3b-3.5.13.spec
+++ b/redhat/applications/k3b/trinity-k3b-3.5.13.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.13
 %endif
-%define release 0
+%define release 1
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -26,12 +26,16 @@ 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)
+
 %if "%{?_prefix}" == "/usr"
 Obsoletes: k3b
 %endif
 
 Group:   Applications/Archiving
 License: GPLv2+
+
 Source0: k3b-%{version}.tar.gz
 Source1: k3b-i18n-1.0.5.tar.bz2
 Source2: k3brc
@@ -42,6 +46,8 @@ Patch4: k3b-1.0.4-manualbufsize.patch
 # RHEL6: Fix K3B icon
 Patch106: trinity-k3b-icons.patch
 
+# TDE 3.5.13 library directory changed
+Patch107: k3b-i18n-trinity.patch
 
 BuildRequires: trinity-kdelibs-devel
 BuildRequires: desktop-file-utils
@@ -51,7 +57,7 @@ BuildRequires: dbus-qt-devel hal-devel
 BuildRequires: flac-devel
 BuildRequires: gettext
 BuildRequires: libdvdread-devel
-%if 0%{?fedora} >= 15
+%if 0%{?fedora} >= 15 || 0%{?rhel} <= 5
 BuildRequires: libmpcdec-devel
 %else
 BuildRequires: musepack-tools-devel
@@ -90,7 +96,9 @@ start.
 Summary:  Common files of %{name}
 Group:    Applications/Archiving
 Requires: %{name} = %{version}-%{release}
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
 BuildArch: noarch
+%endif
 %description common
 %{summary}.
 
@@ -115,6 +123,8 @@ Requires: %{name}-libs = %{version}-%{release}
 # set in k3brc too 
 %patch4 -p1 -b .manualbufsize
 %patch106 -p1 -b .desktopfile
+%patch107
+
 
 # Ugly hack to modify TQT include directory inside autoconf files.
 # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
@@ -155,27 +165,22 @@ CXXFLAGS="%optflags -fno-strict-aliasing" \
 
 # Build for i18n tarball
 pushd k3b-i18n-1.0.5
+autoreconf
 %configure
 %__make %{?_smp_mflags}
 popd
 
 %install
 %__rm -rf %{buildroot}
-%make_install
-%make_install -C k3b-i18n-1.0.5
-%{__install} -D -m 644 -p %{SOURCE2} %{buildroot}%{_datadir}/config/k3brc
+%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C k3b-i18n-1.0.5
+%__install -D -m 644 -p %{SOURCE2} %{buildroot}%{_datadir}/config/k3brc
 
 # remove the .la files
-%{__rm} -f %{buildroot}%{_libdir}/libk3b*.la 
+%__rm -f %{buildroot}%{_libdir}/libk3b*.la 
 
 # remove i18n for Plattdeutsch (Low Saxon)
-%{__rm} -fr %{buildroot}%{_datadir}/locale/nds
-
-%find_lang k3b --with-kde
-%find_lang k3bsetup 
-%find_lang libk3b
-%find_lang libk3bdevice
-cat k3b.lang k3bsetup.lang libk3b.lang libk3bdevice.lang >> all.lang
+%__rm -fr %{buildroot}%{_datadir}/locale/nds
 
 
 %check
@@ -212,11 +217,12 @@ update-desktop-database -q &> /dev/null
 %{_bindir}/k3b
 %{tde_libdir}/*.so
 %{tde_libdir}/*.la
-%doc %{tde_docdir}/HTML/*/k3b/*
+%doc %{_docdir}/HTML/*/k3b/*
 
-%files common -f all.lang
+%files common
 %defattr(-,root,root,-)
 %{_datadir}/applications/kde/*.desktop
+%{_datadir}/applnk/.hidden/*.desktop
 %{_datadir}/apps/k3b/
 %{_datadir}/apps/konqueror/servicemenus/*.desktop
 %{_datadir}/apps/konqsidebartng/virtual_folders/services/videodvd.desktop
@@ -240,5 +246,8 @@ update-desktop-database -q &> /dev/null
 
 
 %changelog
+* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
+- Initial release for RHEL 6, RHEL 5 and Fedora 15
+
 * Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
 - Import to GIT
diff --git a/redhat/applications/kbookreader/trinity-kbookreader-3.5.13.spec b/redhat/applications/kbookreader/trinity-kbookreader-3.5.13.spec
new file mode 100644
index 000000000..1157fc5ff
--- /dev/null
+++ b/redhat/applications/kbookreader/trinity-kbookreader-3.5.13.spec
@@ -0,0 +1,128 @@
+# Default version for this component
+%define kdecomp kbookreader
+%define version 0.2.0
+%define release 1
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%define _variant .opt
+%define _docdir %{_prefix}/share/doc
+%endif
+
+# TDE 3.5.13 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}/kde
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/trinity
+
+
+Name:		trinity-%{kdecomp}
+Summary:	eBook reader for Trinity.
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/Utilities
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.trinitydesktop.org/
+
+Prefix:    %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+
+
+BuildRequires: tqtinterface-devel
+BuildRequires: trinity-arts-devel
+BuildRequires: trinity-kdelibs-devel
+BuildRequires: trinity-kdebase-devel
+BuildRequires: desktop-file-utils
+
+
+%description
+kbookreader is an application which allows you to view eBooks
+within the Trinity Desktop Environment.
+
+
+%prep
+%setup -q -n applications/%{kdecomp}
+
+# Ugly hack to modify TQT include directory inside autoconf files.
+# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
+sed -i admin/acinclude.m4.in \
+  -e "s,/usr/include/tqt,%{_includedir}/tqt,g"
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%configure \
+	--disable-rpath \
+    --with-extra-includes=%{_includedir}/tqt \
+    --enable-closure
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install 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
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{_bindir}/*
+%{_datadir}/applnk/*/*.desktop
+%{_datadir}/apps/*/
+%{_datadir}/config.kcfg/*
+%{_docdir}/HTML/en/*/
+%{_datadir}/icons/*/*/*/*
+
+
+
+%Changelog
+* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.2.0-1
+- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
diff --git a/redhat/applications/kdbusnotification/kdbusnotification-3.5.13-ftbfs_qt_ldlflags.patch b/redhat/applications/kdbusnotification/kdbusnotification-3.5.13-ftbfs_qt_ldlflags.patch
new file mode 100644
index 000000000..06e1d455e
--- /dev/null
+++ b/redhat/applications/kdbusnotification/kdbusnotification-3.5.13-ftbfs_qt_ldlflags.patch
@@ -0,0 +1,10 @@
+--- kdbusnotification/src/daemon/Makefile.am.ORI	2011-11-01 22:59:28.000000000 +0100
++++ kdbusnotification/src/daemon/Makefile.am	2011-11-01 22:59:45.000000000 +0100
+@@ -35,6 +35,7 @@
+ 	$(KDE_RPATH)							\
+ 	$(KDE_LDFLAGS)							\
+ 	$(LIB_QT)							\
++	$(QT_LDFLAGS)							\
+ 	-lDCOP								\
+ 	$(LIB_KDECORE)							\
+ 	$(LIB_KDEUI)							\
diff --git a/redhat/applications/kdbusnotification/trinity-kdbusnotification-3.5.13.spec b/redhat/applications/kdbusnotification/trinity-kdbusnotification-3.5.13.spec
new file mode 100644
index 000000000..27d2f55e5
--- /dev/null
+++ b/redhat/applications/kdbusnotification/trinity-kdbusnotification-3.5.13.spec
@@ -0,0 +1,126 @@
+# Default version for this component
+%define kdecomp kdbusnotification
+%define version 0.1
+%define release 1
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%define _variant .opt
+%define _docdir %{_prefix}/share/doc
+%endif
+
+# TDE 3.5.13 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}/kde
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/trinity
+
+
+Name:		trinity-%{kdecomp}
+Summary:	a DBUS notification service [Trinity]
+
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/Utilities
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.trinitydesktop.org/
+
+Prefix:    %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+
+# [kdbusnotification/src/daemon] Missing QT LDFLAGS
+Patch0:		kdbusnotification-3.5.13-ftbfs_qt_ldlflags.patch
+
+BuildRequires: tqtinterface-devel
+BuildRequires: trinity-arts-devel
+BuildRequires: trinity-kdelibs-devel
+BuildRequires: trinity-kdebase-devel
+BuildRequires: desktop-file-utils
+BuildRequires: dbus-glib-devel
+BuildRequires: gtk2-devel
+
+%description
+kdbusnotification is a small program for Trinity that displays
+DBUS notifications via unobtrusive, easily dismissed passive popups.
+
+
+%prep
+%setup -q -n applications/%{kdecomp}
+%patch0 -p1
+
+# Ugly hack to modify TQT include directory inside autoconf files.
+# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
+sed -i admin/acinclude.m4.in \
+  -e "s,/usr/include/tqt,%{_includedir}/tqt,g"
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%configure \
+	--disable-rpath \
+    --with-extra-includes=%{_includedir}/tqt \
+    --enable-closure
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install 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
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%files
+%defattr(-,root,root,-)
+%{_bindir}/notification-daemon-tde
+%{_datadir}/autostart/kdbusnotification-autostart.desktop
+
+
+
+%Changelog
+* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.1-1
+- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
diff --git a/redhat/applications/kdesudo/trinity-kdesudo-3.5.13.spec b/redhat/applications/kdesudo/trinity-kdesudo-3.5.13.spec
new file mode 100644
index 000000000..28425aac5
--- /dev/null
+++ b/redhat/applications/kdesudo/trinity-kdesudo-3.5.13.spec
@@ -0,0 +1,124 @@
+# Default version for this component
+%define kdecomp kdesudo
+%define version 2.5.1
+%define release 1
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%define _variant .opt
+%define _docdir %{_prefix}/share/doc
+%endif
+
+# TDE 3.5.13 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}/kde
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/trinity
+
+
+Name:		trinity-%{kdecomp}
+Summary:	sudo frontend for Trinity
+
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/Utilities
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.trinitydesktop.org/
+
+Prefix:    %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+
+BuildRequires: tqtinterface-devel
+BuildRequires: trinity-arts-devel
+BuildRequires: trinity-kdelibs-devel
+BuildRequires: trinity-kdebase-devel
+BuildRequires: desktop-file-utils
+
+
+%description
+KdeSudo is a graphical frontend for the sudo utility.
+It allows you to run programs as another user by entering your password.
+
+
+%prep
+%setup -q -n applications/%{kdecomp}
+
+# Ugly hack to modify TQT include directory inside autoconf files.
+# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
+sed -i admin/acinclude.m4.in \
+  -e "s,/usr/include/tqt,%{_includedir}/tqt,g"
+
+%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__make -f admin/Makefile.common
+
+%build
+unset QTDIR || : ; source /etc/profile.d/qt.sh
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%configure \
+	--disable-rpath \
+    --with-extra-includes=%{_includedir}/tqt
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__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
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%files
+%defattr(-,root,root,-)
+%{_bindir}/kdesudo
+%{_docdir}/HTML/en/kdesudo/common
+%{_docdir}/HTML/en/kdesudo/index.cache.bz2
+%{_docdir}/HTML/en/kdesudo/index.docbook
+%{_datadir}/locale/fr/LC_MESSAGES/kdesudo.mo
+
+
+%Changelog
+* Wed Nov 02 2011 Francois Andriot <francois.andriot@free.fr> - 2.5.1-1
+- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
diff --git a/redhat/applications/kdiff3/trinity-kdiff3-3.5.13.spec b/redhat/applications/kdiff3/trinity-kdiff3-3.5.13.spec
new file mode 100644
index 000000000..a62ea4bda
--- /dev/null
+++ b/redhat/applications/kdiff3/trinity-kdiff3-3.5.13.spec
@@ -0,0 +1,122 @@
+# Default version for this component
+%define kdecomp kdiff3
+%define version 0.9.91
+%define release 3
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%define _variant .opt
+%define _docdir %{_prefix}/share/doc
+%endif
+
+# TDE 3.5.13 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}/kde
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/trinity
+
+
+Name:		trinity-%{kdecomp}
+Summary:	KDiff3 is a utility for comparing and/or merging two or three text files or directories.
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/Utilities
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.trinitydesktop.org/
+
+Prefix:    %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+
+
+BuildRequires: tqtinterface-devel
+BuildRequires: trinity-kdelibs-devel
+BuildRequires: trinity-kdebase-devel
+BuildRequires: desktop-file-utils
+
+%description
+Shows the differences line by line and character by character (!).
+Provides an automatic merge-facility and
+an integrated editor for comfortable solving of merge-conflicts.
+Supports KIO on KDE (allows accessing ftp, sftp, fish, smb etc.).
+Unicode & UTF-8 support
+
+
+%prep
+%setup -q -n applications/%{kdecomp}
+
+# Ugly hack to modify TQT include directory inside autoconf files.
+# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
+sed -i admin/acinclude.m4.in \
+  -e "s,/usr/include/tqt,%{_includedir}/tqt,g"
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%configure \
+	--disable-rpath \
+    --with-extra-includes=%{_includedir}/tqt \
+    --enable-closure
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{_bindir}/*
+%{_datadir}/apps/*/
+%{_datadir}/icons/*/*/*/*
+%{_datadir}/locale/*/*/*.mo
+%{_docdir}/HTML/*/*
+%{_datadir}/services/*.desktop
+%{tde_libdir}/*.so
+%{_datadir}/applnk/Development/*.desktop
+%{_datadir}/applnk/.hidden/*.desktop
+%{_mandir}/man*/*
+
+%{tde_libdir}/*.la
+
+%Changelog
+* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.91-3
+- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
+
+* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.91-2
+- Import to GIT
+
+* Wed Aug 24 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.91-1
+- Correct macro to install under "/opt", if desired
+
+* Sun Aug 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.91-0
+- Initial build for RHEL 6.0
+
diff --git a/redhat/applications/krename/trinity-krename-3.5.13.spec b/redhat/applications/krename/trinity-krename-3.5.13.spec
new file mode 100644
index 000000000..9c813486c
--- /dev/null
+++ b/redhat/applications/krename/trinity-krename-3.5.13.spec
@@ -0,0 +1,115 @@
+# Default version for this component
+%define kdecomp krename
+%define version 3.0.14
+%define release 3
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%define _variant .opt
+%define _docdir %{_prefix}/share/doc
+%endif
+
+# TDE 3.5.12 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}/kde
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/trinity
+
+
+Name:		trinity-%{kdecomp}
+Summary:	A KDE batch file renaming utility. 
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/Utilities
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.trinitydesktop.org/
+
+Prefix:    %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+
+BuildRequires: tqtinterface-devel
+BuildRequires: trinity-kdelibs-devel
+BuildRequires: trinity-kdebase-devel
+BuildRequires: desktop-file-utils
+BuildRequires: imlib-devel
+
+%description
+KRename is a powerful batch renamer for KDE 3.x. It allows you to easily rename hundreds or
+even more files in one go. The filenames can be created by parts of the original filename,
+numbering the files or accessing hundreds of informations about the file, like creation date
+or Exif informations of an image. 
+
+%prep
+%setup -q -n applications/%{kdecomp}
+
+# Ugly hack to modify TQT include directory inside autoconf files.
+# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
+sed -i admin/acinclude.m4.in \
+  -e "s,/usr/include/tqt,%{_includedir}/tqt,g"
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%configure \
+	--disable-rpath \
+    --with-extra-includes=%{_includedir}/tqt \
+    --enable-closure
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{_bindir}/*
+%{_datadir}/applications/*/*.desktop
+%{_datadir}/apps/*/
+%{_docdir}/HTML/en/*/
+%{_datadir}/icons/*/*/*/*
+%{_datadir}/locale/*/*/*.mo
+
+
+%Changelog
+* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.0.14-3
+- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
+
+* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 3.0.14-2
+- Import to GIT
+
+* Wed Aug 24 2011 Francois Andriot <francois.andriot@free.fr> - 3.0.14-1
+- Correct macro to install under "/opt", if desired
+
+* Sun Aug 14 2011 Francois Andriot <francois.andriot@free.fr> - 3.0.14-0
+- Initial build for RHEL 6.0
+
diff --git a/redhat/applications/kstreamripper/kstreamripper-3.5.13-missing_include_tqt.patch b/redhat/applications/kstreamripper/kstreamripper-3.5.13-missing_include_tqt.patch
new file mode 100644
index 000000000..5663b1a81
--- /dev/null
+++ b/redhat/applications/kstreamripper/kstreamripper-3.5.13-missing_include_tqt.patch
@@ -0,0 +1,10 @@
+--- kstreamripper/src/addnewstreamimpl.h.ORI	2011-11-02 20:40:17.450317896 +0100
++++ kstreamripper/src/addnewstreamimpl.h	2011-11-02 20:40:25.777317020 +0100
+@@ -22,6 +22,7 @@
+ #define ADDNEWSTREAMIMPL_H
+ 
+ #include "addnewstream.h"
++#include <tqt.h>
+ 
+ class AddNewStreamImpl : public AddNewStream
+ {
diff --git a/redhat/applications/kstreamripper/trinity-kstreamripper-3.5.13.spec b/redhat/applications/kstreamripper/trinity-kstreamripper-3.5.13.spec
new file mode 100644
index 000000000..94855fdcf
--- /dev/null
+++ b/redhat/applications/kstreamripper/trinity-kstreamripper-3.5.13.spec
@@ -0,0 +1,118 @@
+# Default version for this component
+%define kdecomp kstreamripper
+%define version 0.3.4
+%define release 1
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%define _variant .opt
+%define _docdir %{_prefix}/share/doc
+%endif
+
+# TDE 3.5.13 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}/kde
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/trinity
+
+
+Name:		trinity-%{kdecomp}
+Summary:	TDE frontend for streamripper
+
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/Utilities
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.trinitydesktop.org/
+
+Prefix:    %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+
+Patch0:		kstreamripper-3.5.13-missing_include_tqt.patch
+
+BuildRequires: tqtinterface-devel
+BuildRequires: trinity-arts-devel
+BuildRequires: trinity-kdelibs-devel
+BuildRequires: trinity-kdebase-devel
+BuildRequires: desktop-file-utils
+BuildRequires: scons
+
+
+%description
+KStreamRipper is a small frontend for the streamripper command
+line utility. Streamripper captures internet shoutcast radio streams
+on your harddisk and splits them up in mp3 files. KStreamRipper helps
+you with managing/ripping your preferred streams.
+
+
+%prep
+%setup -q -n applications/%{kdecomp}
+%patch0 -p1
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+export CXXFLAGS="-I%{_includedir}/tqt"
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__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
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%files
+%defattr(-,root,root,-)
+%{_bindir}/kstreamripper
+%{_datadir}/applnk/Utilities/kstreamripper.desktop
+%{_datadir}/apps/kstreamripper/kstreamripperui.rc
+%{tde_docdir}/HTML/en/en/index.cache.bz2
+
+
+
+%Changelog
+* Wed Nov 02 2011 Francois Andriot <francois.andriot@free.fr> - 0.3.4-1
+- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
diff --git a/redhat/applications/yakuake/trinity-yakuake-3.5.13.spec b/redhat/applications/yakuake/trinity-yakuake-3.5.13.spec
new file mode 100644
index 000000000..7b49281db
--- /dev/null
+++ b/redhat/applications/yakuake/trinity-yakuake-3.5.13.spec
@@ -0,0 +1,108 @@
+# Default version for this component
+%define kdecomp yakuake
+%define version 2.8.1
+%define release 3
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%define _variant .opt
+%define _docdir %{_prefix}/share/doc
+%endif
+
+# TDE 3.5.12 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}/kde
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/trinity
+
+
+Name:		trinity-%{kdecomp}
+Summary:	Yakuake is a Quake-style terminal emulator based on KDE Konsole technology.
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/Utilities
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.trinitydesktop.org/
+
+Prefix:    %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+
+BuildRequires: tqtinterface-devel
+BuildRequires: trinity-kdelibs-devel
+BuildRequires: trinity-kdebase-devel
+BuildRequires: desktop-file-utils
+
+%description
+Yakuake is a Quake-style terminal emulator based on KDE Konsole technology.
+
+%prep
+%setup -q -n applications/%{kdecomp}
+
+# Ugly hack to modify TQT include directory inside autoconf files.
+# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
+sed -i admin/acinclude.m4.in \
+  -e "s,/usr/include/tqt,%{_includedir}/tqt,g"
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%configure \
+	--disable-rpath \
+    --with-extra-includes=%{_includedir}/tqt \
+    --enable-closure
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{_bindir}/*
+%{_datadir}/applications/*/*.desktop
+%{_datadir}/apps/*/
+%{_datadir}/icons/*/*/*/*
+%{_datadir}/locale/*/*/*.mo
+%{_datadir}/config.kcfg/*.kcfg
+
+%Changelog
+* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 2.8.1-3
+- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
+
+* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 2.8.1-2
+- Import to GIT
+
+* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 2.8.1-1
+- Correct macro to install under "/opt", if desired
+
+* Sun Aug 14 2011 Francois Andriot <francois.andriot@free.fr> - 2.8.1-0
+- Initial build for RHEL 6.0
+