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

94 files changed, 7759 insertions, 1489 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
+
diff --git a/redhat/components.txt b/redhat/components.txt
index 2dd00f99f..d27ab75e1 100644
--- a/redhat/components.txt
+++ b/redhat/components.txt
@@ -1,7 +1,11 @@
+dependencies/libcaldav
+dependencies/libcarddav
 dependencies/qt3
 dependencies/tqtinterface
 dependencies/dbus-tqt
 dependencies/arts
+trinity-desktop
+trinity-settings
 kdelibs
 kdebase
 kdebindings
@@ -22,3 +26,20 @@ kdeaddons
 kdewebdev
 kde-i18n
 applications/k3b
+applications/abakus
+applications/dolphin
+applications/gwenview
+applications/krename
+applications/yakuake
+#applications/desktop-effects-kde
+applications/filelight
+applications/kdiff3
+#applications/kuickshow
+#applications/basket
+applications/katapult
+#compizconfig-backend-kconfig
+applications/kbookreader
+applications/kdbusnotification
+applications/kmymoney2
+applications/kstreamripper 
+applications/kdesudo
diff --git a/redhat/dependencies/arts/trinity-arts-3.5.13.spec b/redhat/dependencies/arts/trinity-arts-3.5.13.spec
index fd2d6104d..f0be812f9 100755
--- a/redhat/dependencies/arts/trinity-arts-3.5.13.spec
+++ b/redhat/dependencies/arts/trinity-arts-3.5.13.spec
@@ -1,8 +1,8 @@
 # Default version for this component
 %if "%{?version}" == ""
-%define version 1.5.10
+%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"
@@ -18,13 +18,16 @@ Version:	%{?version}
 Release:	%{?release}%{?dist}%{?_variant}
 License:	GPL
 Summary:	aRts (analog realtime synthesizer) - the KDE sound system
+Group:		System Environment/Daemons 
 
 Vendor:		Trinity Project
 URL:		http://www.trinitydesktop.org/
 Packager:	Francois Andriot <francois.andriot@free.fr>
 
-Source0:	arts-%{version}.tar.gz
 Prefix:		%{_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	arts-%{version}.tar.gz
 
 BuildRequires:	tqtinterface-devel
 BuildRequires:	audiofile-devel
@@ -54,8 +57,9 @@ playing a wave file with some effects.
 
 
 %package devel
-Requires:	%{name}
+Group:		Development/Libraries
 Summary:	%{name} - Development files
+Requires:	%{name} = %{version}-%{release}
 %if "%{?_prefix}" == "/usr"
 Obsoletes:	arts-devel
 %endif
@@ -80,7 +84,8 @@ cd build
 %__make %{?_smp_mflags}
 
 %install
-%make_install -C build
+%__rm -rf %{?buildroot}
+%__make install -C build DESTDIR=%{?buildroot}
 
 %clean
 %__rm -rf %{?buildroot}
@@ -111,10 +116,13 @@ cd build
 %{_bindir}/artsc-config
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*.pc
-%exclude %{_libdir}/*.a
+%{_libdir}/*.a
 
 
 %changelog
-* Fri Sep 02 2011 Francois Andriot <francois.andriot@free.fr> - 1.5.10-0
+* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
+- Initial release for RHEL 6, RHEL 5 and Fedora 15
+
+* Fri Sep 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
 - Import to GIT
 - Built with future TDE version (3.5.13 + cmake + QT3.3.8d)
diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec
index f1762a9d7..9a2be3b1e 100644
--- a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec
+++ b/redhat/dependencies/dbus-tqt/dbus-tqt-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"
@@ -20,10 +20,14 @@ Version:	%{?version}
 Release:	%{?release}%{?dist}%{?_variant}
 License:	GPL
 Summary:	Dbus TQT Interface
+Group:		System Environment/Libraries
+
 Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 
 Prefix:		%{_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 Source0:	%{name}-%{version}.tar.gz
 
 BuildRequires:	gcc-c++
@@ -37,6 +41,7 @@ Dbus TQT Interface
 %package devel
 Requires:	%{name}
 Summary:	%{name} - Development files
+Group:		Development/Libraries
 
 %description devel
 Development files for %{name}
@@ -58,7 +63,7 @@ cd build
 %install
 %__rm -rf %{?buildroot}
 %__mkdir_p %{?buildroot}%{_includedir}
-%make_install -C build
+%__make install DESTDIR=%{?buildroot} -C build
 
 %clean
 %__rm -rf %{?buildroot}
@@ -73,6 +78,9 @@ cd build
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Sun Sep 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13pre-0
+* 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 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13.0
 - Import to GIT
 - Built with future TDE version (3.5.13 + cmake + QT3.3.8d)
diff --git a/redhat/dependencies/libcaldav/libcaldav.spec b/redhat/dependencies/libcaldav/libcaldav.spec
index 220913b3b..6624409cd 100644
--- a/redhat/dependencies/libcaldav/libcaldav.spec
+++ b/redhat/dependencies/libcaldav/libcaldav.spec
@@ -1,6 +1,11 @@
+# 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
+%endif
+
 Name:		libcaldav
 Version:	0.6.5
-Release:	2debian2%{?dist}
+Release:	2debian2.1%{?dist}%{?_variant}
 
 Vendor:		Trinity Project
 URL:		http://www.trinitydesktop.org/
@@ -10,8 +15,17 @@ License:	GPL
 Group:		System Environment/Libraries
 Summary:	A client library that adds support for the CalDAV protocol (rfc4791).
 
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 Source0:	libcaldav_0.6.5-2debian2.tar.gz
 
+%if 0%{?fedora} || 0%{?rhel} >= 6
+BuildRequires:	libcurl-devel
+%else
+# Specific CURL version for TDE on RHEL 5 (and older)
+BuildRequires:	trinity-libcurl-devel
+%endif
+
 %description
 libcaldev is a client library that adds support for the CalDAV protocol (rfc4791).
 The object is to have a library which fully implements the protocol so that it is
@@ -38,6 +52,10 @@ autoreconf --force --install --symlink
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
+# The include files do not go in the correct directory
+%__mv -f %{buildroot}%{_includedir}/%{name}-0.6.2/*.h %{buildroot}%{_includedir}
+%__rm -rf %{buildroot}%{_includedir}/%{name}-0.6.2
+
 %clean
 %__rm -rf %{buildroot}
 
@@ -47,7 +65,7 @@ autoreconf --force --install --symlink
 %{_datadir}/doc/%{name}
 
 %files devel
-%{_includedir}/%{name}-0.6.2
+%{_includedir}/*.h
 %{_libdir}/*.a
 %{_libdir}/*.la
 %{_libdir}/*.so
@@ -55,5 +73,5 @@ autoreconf --force --install --symlink
 
 
 %Changelog
-* Fri Oct 21 2011 Francois Andriot <francois.andriot@free.fr> - 0.6.5-2debian2 
-- Initial build for RHEL 6.0
+* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.6.5-2debian2.1
+- Initial build for RHEL 6, RHEL 5, and Fedora 15
diff --git a/redhat/dependencies/libcarddav/libcarddav.spec b/redhat/dependencies/libcarddav/libcarddav.spec
index 9ab0dbd9f..c47f40a49 100644
--- a/redhat/dependencies/libcarddav/libcarddav.spec
+++ b/redhat/dependencies/libcarddav/libcarddav.spec
@@ -1,6 +1,11 @@
+# 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
+%endif
+
 Name:		libcarddav
 Version:	0.6.2
-Release:	2debian2%{?dist}
+Release:	2debian2.1%{?dist}%{?_variant}
 
 Vendor:		Trinity Project
 URL:		http://www.trinitydesktop.org/
@@ -8,10 +13,18 @@ Packager:	Francois Andriot <francois.andriot@free.fr>
 
 License:	GPL
 Group:		System Environment/Libraries
-Summary:	A client library that adds support for the CalDAV protocol (rfc4791).
+Summary:	A portable CardDAV client implementation originally developed for the Trinity PIM suite.
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	libcarddav_0.6.2-2debian2.tar.gz
 
+%if 0%{?fedora} || 0%{?rhel} >= 6
+BuildRequires:	libcurl-devel
+%else
+BuildRequires:	trinity-libcurl-devel
+%endif
+
 %description
 Libcarddav is a portable CardDAV client implementation originally developed for the Trinity PIM suite. 
 It incorporates full list, get, add, modify, and delete functionality per the latest CardDAV standards. 
@@ -38,6 +51,10 @@ autoreconf --force --install --symlink
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
+# The include files do not go in the correct directory
+%__mv -f %{buildroot}%{_includedir}/%{name}-0.6.1/*.h %{buildroot}%{_includedir}
+%__rm -rf %{buildroot}%{_includedir}/%{name}-0.6.1
+
 %clean
 %__rm -rf %{buildroot}
 
@@ -46,7 +63,7 @@ autoreconf --force --install --symlink
 %{_libdir}/*.so.*
 
 %files devel
-%{_includedir}/%{name}-0.6.1
+%{_includedir}/*.h
 %{_libdir}/*.a
 %{_libdir}/*.la
 %{_libdir}/*.so
@@ -54,5 +71,5 @@ autoreconf --force --install --symlink
 
 
 %Changelog
-* Fri Oct 21 2011 Francois Andriot <francois.andriot@free.fr> - 0.6.5-2debian2 
-- Initial build for RHEL 6.0
+* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.6.5-2debian2 .1
+- Initial build for RHEL 6, RHEL 5, and Fedora 15
diff --git a/redhat/dependencies/qt3/qt3.spec b/redhat/dependencies/qt3/qt3.spec
index 39786c99e..e57d598b5 100644
--- a/redhat/dependencies/qt3/qt3.spec
+++ b/redhat/dependencies/qt3/qt3.spec
@@ -4,7 +4,7 @@
 %endif
 
 # The following QT4 packages should NOT be installed to
-# allow QT3 compilation (please remove them prior to compile)
+# allow QT3 compilation (please uninstall them prior to compile)
 #  qt
 #  qt-sqlite
 #  qt-mysql
@@ -14,16 +14,21 @@
 
 %define _default_patch_fuzz 2
 
-Summary: The shared library for the Qt 3 GUI toolkit
-Version: %{?version}
-Release: 0%{?dist}
 Name: qt3
-Obsoletes: qt < 1:%{version}-%{release}
-Provides: qt = 1:%{version}-%{release}
+Version: %{?version}
+Release: 1%{?dist}
+Summary: The shared library for the Qt 3 GUI toolkit
+
 License: QPL or GPLv2 or GPLv3
 Group: System Environment/Libraries
+URL:		http://www.trinitydesktop.org/
+#Url: http://www.troll.no
+
+Obsoletes: qt < 1:%{version}-%{release}
+Provides: qt = 1:%{version}-%{release}
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Url: http://www.troll.no
+
 #Source0: ftp://ftp.troll.no/qt/source/qt-x11-free-3.3.8b.tar.gz
 Source0: %{name}-%{version}.tar.gz
 Source2: qt.sh
@@ -695,1233 +700,7 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Fri Sep 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.3.8d-0
+* Fri Sep 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.3.8d-1
+- Initial build for RHEL 6, RHEL 5, and Fedora 15
 - Switch to Trinity Version
-
-* Wed Jun 30 2010 Than Ngo <than@redhat.com> - 3.3.8b-29
-- Resolves: bz#605106, XML validity issue, fno-strict-aliasing
-
-* Thu Sep 10 2009 Than Ngo <than@redhat.com> - 3.3.8b-28
-- drop support fedora < 10
-
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.3.8b-27
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Fri May 15 2009 Rex Dieter <rdieter@fedoraproject.org> - 3.3.8b-26
-- arm patch
-
-* Thu Apr 16 2009 Rex Dieter <rdieter@fedoraproject.org> - 3.3.8b-25
-- move designer plugins to runtime (#487622)
-
-* Fri Apr 10 2009 Than Ngo <than@redhat.com> - 3.3.8b-24
-- unneeded executable permissions for profile.d scripts 
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.3.8b-23
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Tue Feb 24 2009 Than Ngo <than@redhat.com> - 3.3.8b-22
-- fix build problem against new unixODBC
-
-* Wed Feb 04 2009 Rex Dieter <rdieter@fedoraproject.org> 3.3.8b-21
-- unowned %%qt_docdir (#483441)
-
-* Mon Feb 02 2009 Rex Dieter <rdieter@fedoraproject.org> 3.3.8b-20
-- unowned dirs (#483441)
-
-* Sat Jan 31 2009 Karsten Hopp <karsten@redhat.com> 3.3.8b-19
-- s390x is 64bit, s390 is 32bit. Fixed in /etc/profile.d/qt.*
-
-* Thu Jan 22 2009 Rex Dieter <rdieter@fedoraproject.org> 3.3.8b-18
-- respin (mysql)
-
-* Wed Oct 08 2008 Than Ngo <than@redhat.com> 3.3.8b-17
-- update qt-x11-immodule-unified-qt3 patch
-
-* Tue Sep 30 2008 Than Ngo <than@redhat.com> 3.3.8b-16
-- mv translations in main package (bz#448761)
-
-* Sat Sep 20 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> - 3.3.8b-15
-- set _default_patch_fuzz (fixes FTBFS)
-
-* Mon Jul 07 2008 Rex Dieter <rdieter@fedoraproject.org> - 3.3.8b-14
-- QTDIR isn't set in ppc64 buildroot (#454313)
-- /etc/profile.d/qt.sh leaks variable ARCH (#454260)
-
-* Fri May 23 2008 Than Ngo <than@redhat.com> -  3.3.8b-13
-- fix rh#448027, qt3's PATH not set properly unless qt3-devel is installed
-
-* Wed Apr 02 2008 Than Ngo <than@redhat.com> -  3.3.8b-12
-- get rid of 0088-fix-xinput-clash.diff, it's fixed in
-  new xorg-x11-proto-7.3-11
-
-* Mon Mar 17 2008 Than Ngo <than@redhat.com> 3.3.8b-11
-- fix obsolete/provides of version/release
-
-* Thu Mar 13 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.3.8b-10
-- fix %{?epoch:%{epoch}:} idiom not to add a ':' after it
-
-* Wed Mar 12 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.3.8b-9
-- rename to qt3 on Fedora >= 9
-
-* Tue Mar 11 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.3.8b-8
-- prepare for rename to qt3 on Fedora >= 9 (not enabled yet)
-- add Provides and Obsoletes everywhere
-- update summaries and descriptions
-- remove dots at end of Summary tags
-- fix non-UTF-8 characters
-
-* Tue Mar 11 2008 Than Ngo <than@redhat.com> 3.3.8b-7
-- 0088-fix-xinput-clash.diff, fix compile errors with Xmd.h
-
-* Fri Mar 07 2008 Than Ngo <than@redhat.com> 3.3.8b-6
-- move qt.[c]sh in main package (#221000)
-
-* Mon Feb 18 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.3.8b-5
-- fix buildkey for GCC 4.3 (#433235)
-
-* Mon Feb 11 2008 Than Ngo <than@redhat.com> 3.3.8b-4
-- rebuild for GCC 4.3
-
-* Thu Jan 24 2008 Than Ngo <than@redhat.com> 3.3.8b-3
-- add LICENSE.GPL2/GPL3
-
-* Thu Jan 24 2008 Than Ngo <than@redhat.com> 3.3.8b-2
-- License: GPLv2 or GPLv3
-- merged in 3.3.8b -> drop following patches:
-    * qt-3.3.6-fontrendering-punjabi-209970.patch
-    * qt-3.3.6-fontrendering-or_IN-209098.patch
-    * qt-3.3.6-fontrendering-gu-228451.patch
-    * qt-font-default-subst.diff
-    * 0076-fix-qprocess.diff
-    * 0082-fix-qdatetime-fromstring.diff
-    * qt-x11-free-3.3.8-bz#243722-mysql.patch
-    * qt3-CVE-2007-3388.patch
-    * utf8-bug-qt3-CVE-2007-0242.diff
-    * qt-3.3.6-bz#292941-CVE-2007-4137.patch
-
-* Wed Jan 23 2008 Than Ngo <than@redhat.com> 3.3.8b-1
-- update to 3.3.8b, fix License
-
-* Mon Nov 26 2007 Than Ngo <than@redhat.com> 3.3.8-11
-- add Provides: qt3 = %%version-%%release
-
-* Wed Nov  7 2007 Stepan Kasal <skasal@redhat.com> - 3.3.8-10
-- rh#239216, fix a typo in qt-config description
-
-* Thu Oct 04 2007 Than Ngo <than@redhat.com> - 3.3.8-9
-- rh#309091, qt should provide %%{qtdir}/plugins/styles
-- rh#276521, qt-copy patches 0079, 0080, 0082 and 0084
-
-* Mon Sep 17 2007 Than Ngo <than@redhat.com> - 3.3.8-8
-- CVE-2007-4137
-
-* Wed Aug 29 2007 Than Ngo <than@redhat.com> - 1:3.3.8-7.fc7.1
-- CVE-2007-0242
-
-* Tue Aug 28 2007 Than Ngo <than@redhat.com> - 1:3.3.8-7
-- CVE-2007-3388 qt3 format string flaw
-- backport to fix #bz243722, bz#244148, Applications using qt-mysql crash if database is
-  removed before QApplication is destroyed
-- cleanup desktop files
-
-* Mon Apr 23 2007 Than Ngo <than@redhat.com> - 1:3.3.8-5.fc7
-- apply patch to fix fontrendering problem in gu_IN #228451,#228452
-
-* Wed Apr 11 2007 Than Ngo <than@redhat.com> - 1:3.3.8-4.fc7
-- adjust qt-3.3.8-fontrendering-as_IN-209972.patch and
-  qt-3.3.8-fontrendering-#214570.patch for qt-3.3.8
-
-* Mon Apr 02 2007 Than Ngo <than@redhat.com> - 1:3.3.8-3.fc7
-- apply patches to fix
-   Qt UTF-8 overlong sequence decoding vulnerability
-   QPopupMenu aware of Xinerama
-   a regression in QProgress::writeToStdin()
-
-* Tue Mar 27 2007 Than Ngo <than@redhat.com> 1:3.3.8-2.fc7
-- enable tablet support
-
-* Mon Mar 19 2007 Than Ngo <than@redhat.com> 1:3.3.8-1.fc7
-- update to 3.3.8
-
-* Wed Dec 06 2006 Than Ngo <than@redhat.com> - 1:3.3.7-2.fc7
-- Resolves: bz#214371, bn_IN font rendering
-- Resolves: bz#217657, ml_IN issue with cursor position
-- Resolves: bz#217638, regression bug in qt
-- Resolves: bz#209974, Vowel position set properly
-- Resolves: bz#214570, Rendering is not fine for 'RA' 09B0
-
-* Thu Nov 09 2006 Than Ngo <than@redhat.com> 1:3.3.7-1.fc6
-- update to 3.3.7
-- fix #209097, ml_IN font rendering
-- fix #209970, pa font rendering
-- fix #209098, or_IN font rendering
-- fix #209972, as_IN font rendering
-- fix #209975, bn_IN font rendering
-- fix #211259, te_IN font rendering
-- fix #211436, as_IN font rendering
-  thanks Sachin Tawniya, LingNing Zhang for the fixes
-- move html files to devel
-- add sqlite plugin
-- fix #189012, qt settings should be readable for other
-
-* Thu Aug 31 2006 Than Ngo <than@redhat.com> 1:3.3.6-13
-- add missing desktop files
-
-* Mon Jul 17 2006 Than Ngo <than@redhat.com> 1:3.3.6-12
-- rebuild
-
-* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 1:3.3.6-11.1
-- rebuild
-
-* Mon Jul 10 2006 Than Ngo <than@redhat.com> 1:3.3.6-11
-- apply upstream patches, fix arabic fonts issue, and
-  problems with missing minimum size when richtext
-  labels are used
-
-* Thu Jun 29 2006 Than Ngo <than@redhat.com> 1:3.3.6-10
-- apply patch from Lars, fixes Qt 3.3.6 for Arabic fonts
-
-* Wed Jun 28 2006 Than Ngo <than@redhat.com> 1:3.3.6-9
-- fix #183302, IM preedit issue in kbabel
-
-* Mon Jun 26 2006 Than Ngo <than@redhat.com> 1:3.3.6-8
-- rebuilt
-
-* Thu Jun 08 2006 Than Ngo <than@redhat.com> 1:3.3.6-7
-- fix utf8 issue in changelog
-- fix #195410, don't strip binaries/libraries
-- fix #156572, keyReleaseEvent issue
-
-* Mon Jun 05 2006 Than Ngo <than@redhat.com> 1:3.3.6-6
-- qt-devel requires on mesa-libGLU-devel mesa-libGU-devel
-
-* Tue May 16 2006 Than Ngo <than@redhat.com> 1:3.3.6-5 
-- fix #191895, BR libXmu-devel
-- disable warnings if debug is off
-
-* Mon May 15 2006 Than Ngo <than@redhat.com> 1:3.3.6-4
-- fix multilib issue 
-
-* Tue May 09 2006 Than Ngo <than@redhat.com> 1:3.3.6-3 
-- add subpackage qt-devel-docs #191099
-
-* Thu Apr 13 2006 Than Ngo <than@redhat.com> 1:3.3.6-2
-- fix xorg prefix #188510
-
-* Mon Mar 20 2006 Than Ngo <than@redhat.com> 1:3.3.6-1
-- update to 3.3.6
-- adapt qt-x11-immodule-unified-qt3.3.5-20060318 to qt-3.3.6
-- remove set of fixes for the immodule patch, included in qt-x11-immodule-unified-qt3.3.5-20060318
-- remove 0051-qtoolbar_77047.patch, qt-x11-free-3.3.4-assistant_de.patch,
-  qt-x11-free-3.3.5-warning.patch, included in new upstream
-
-
-* Mon Feb 27 2006 Than Ngo <than@redhat.com> 1:3.3.5-13
-- add set of fixes for the immodule patch, thanks to Dirk Müller
-
-* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 1:3.3.5-12.2
-- bump again for double-long bug on ppc(64)
-
-* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 1:3.3.5-12.1
-- rebuilt for new gcc4.1 snapshot and glibc changes
-
-* Tue Jan 17 2006 Than Ngo <than@redhat.com> 1:3.3.5-12
-- add BuildRequires on mesa-libGL-devel
-
-* Wed Dec 21 2005 Than Ngo <than@redhat.com> 1:3.3.5-11 
-- BuildRequires on libXt-devel/xorg-x11-proto-devel
- 
-* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
-- rebuilt
- 
-* Sun Nov 13 2005 Than Ngo <than@redhat.com> 1:3.3.5-10
-- workaround for keyboard input action in KHotKeys
-
-* Tue Nov 08 2005 Than Ngo <than@redhat.com> 1:3.3.5-9 
-- fix for modular X
-
-* Tue Nov 08 2005 Than Ngo <than@redhat.com> 1:3.3.5-8
-- get rid of xorg-x11-devel, fix for modular X
-
-* Tue Oct 25 2005 Than Ngo <than@redhat.com> 1:3.3.5-7
-- update qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch
-
-* Mon Oct 24 2005 Than Ngo <than@redhat.com> 1:3.3.5-6
-- update qt-x11-immodule-unified-qt3.3.5-20051018.diff
-- remove unneeded qt-x11-immodule-unified-qt3.3.5-20051012-build.patch
-
-* Thu Oct 13 2005 Than Ngo <than@redhat.com> 1:3.3.5-5
-- update qt-x11-immodule-unified-qt3.3.5-20051012
-- disable some debug messages
-- apply patch to fix build problem with the new immodule patch
-
-* Tue Sep 27 2005 Than Ngo <than@redhat.com> 1:3.3.5-4
-- apply patch to fix gcc warnings
-
-* Mon Sep 26 2005 Than Ngo <than@redhat.com> 1:3.3.5-3 
-- export QTINC/QTLIB, thanks to Rex Dieter (#169132)
-
-* Tue Sep 20 2005 Than Ngo <than@redhat.com> 1:3.3.5-2
-- German translation of the Qt Assistent #161558
-- add uic workaround
-
-* Sun Sep 11 2005 Than Ngo <than@redhat.com> 1:3.3.5-1
-- update to 3.3.5
-
-* Mon Aug 22 2005 Than Ngo <than@redhat.com> 1:3.3.4-22
-- apply upstream patch to fix kmail folder selector #166430
-
-* Mon Aug 15 2005 Than Ngo <than@redhat.com> 1:3.3.4-21
-- fix gcc4 build problem
-
-* Wed Aug 10 2005 Than Ngo <than@redhat.com> 1:3.3.4-20
-- apply missing patches
-
-* Wed Aug 10 2005 Than Ngo <than@redhat.com> 1:3.3.4-19
-- apply patch to fix wrong K menu width, #165510
-
-* Mon Aug 01 2005 Than Ngo <than@redhat.com> 1:3.3.4-18
-- add visibility patch
-
-* Wed Jul 20 2005 Than Ngo <than@redhat.com> 1:3.3.4-17
-- fix German translation of the Qt Assistent #161558
-
-* Mon Jun 27 2005 Than Ngo <than@redhat.com> 1:3.3.4-16
-- apply patch to fix Rendering for Punjabii, thanks to Trolltech #156504
-
-* Tue May 24 2005 Than Ngo <than@redhat.com> 1:3.3.4-15
-- add better fix for #156977, thanks to trolltech
-- apply patch to fix keyReleaseEvent problem #156572
-
-* Wed May 18 2005 Than Ngo <than@redhat.com> 1:3.3.4-14
-- apply patch to use ecvt, fcvt (thanks to Jakub)
-- fix a bug in printing of postscript #156977
-
-* Wed May 18 2005 Than Ngo <than@redhat.com> 1:3.3.4-13
-- rebuild
-
-* Thu Apr 14 2005 Than Ngo <than@redhat.com> 1:3.3.4-12
-- fix bad symlink #154086
-
-* Wed Apr 13 2005 Than Ngo <than@redhat.com> 1:3.3.4-11
-- remove bad symlink #154086
-- built with PostgresSQL 8.0.2
-
-* Wed Mar 23 2005 Than Ngo <than@redhat.com> 1:3.3.4-10
-- add GtkStyle patch from Peter Backlund #141125
-
-* Fri Mar 04 2005 Than Ngo <than@redhat.com> 1:3.3.4-9
-- fix buildkey issue with gcc-4
-
-* Fri Mar 04 2005 Than Ngo <than@redhat.com> 1:3.3.4-8
-- rebuilt against gcc-4.0.0-0.31
-
-* Tue Mar 01 2005 Than Ngo <than@redhat.com> 1:3.3.4-7
-- fix build problem with gcc4
-
-* Mon Feb 28 2005 Than Ngo <than@redhat.com> 1:3.3.4-6
-- rebuilt against gcc-4
-
-* Tue Feb 22 2005 Than Ngo <than@redhat.com> 1:3.3.4-5
-- fix application crash when input methode not available (bug #140658)
-- remove .moc/.obj
-- add qt-copy patch to fix KDE #80072
-
-* Fri Feb 11 2005 Than Ngo <than@redhat.com> 1:3.3.4-4
-- update qt-x11-immodule-unified patch
-
-* Thu Feb 10 2005 Than Ngo <than@redhat.com> 1:3.3.4-3 
-- fix rpm file conflict
-
-* Wed Feb 02 2005 Than Ngo <than@redhat.com> 1:3.3.4-2
-- remove useless doc files #143949
-- fix build problem if installman is disable #146311
-- add missing html/examples/tutorial symlinks
-
-* Fri Jan 28 2005 Than Ngo <than@redhat.com> 1:3.3.4-1
-- update to 3.3.4
-- adapt many patches to qt-3.3.4
-- drop qt-x11-free-3.3.0-freetype, qt-x11-free-3.3.3-qmake, qt-x11-free-3.3.1-lib64
-  qt-x11-free-3.3.3-qimage, which are included in new upstream
-
-* Tue Nov 30 2004 Than Ngo <than@redhat.com> 1:3.3.3-16
-- add sql macro
-
-* Mon Nov 29 2004 Than Ngo <than@redhat.com> 1:3.3.3-15
-- convert qdial.3qt to UTF-8 bug #140946
-
-* Tue Nov 23 2004 Than Ngo <than@redhat.com> 1:3.3.3-14
-- add missing lupdate and lrelease #140230
-
-* Fri Nov 19 2004 Than Ngo <than@redhat.com> 1:3.3.3-13 
-- apply patch to fix qinputcontext
-
-* Thu Nov 11 2004 Than Ngo <than@redhat.com> 1:3.3.3-12
-- link against MySQL 3
-- fix rpm conflict
-
-* Wed Nov 10 2004 Than Ngo <than@redhat.com> 1:3.3.3-11
-- apply patch to fix fullscreen problem
-- remove html documents duplicate #135696
-
-* Tue Nov 02 2004 Than Ngo <than@redhat.com> 1:3.3.3-10
-- rebuilt
-
-* Tue Nov 02 2004 Than Ngo <than@redhat.com> 1:3.3.3-9
-- remove unused patch
-- set XIMInputStyle=On The Spot
-- require xorg-x11-devel instead XFree86-devel
-
-* Thu Oct 14 2004 Than Ngo <than@redhat.com> 1:3.3.3-8
-- don't compress examples/tutorial
-
-* Thu Oct 07 2004 Than Ngo <than@redhat.com> 1:3.3.3-7
-- fix build problem without qt immodule #134918
-
-* Tue Sep 28 2004 Than Ngo <than@redhat.com> 1:3.3.3-6
-- fix font problem, bz #133578
-
-* Tue Sep 14 2004 Than Ngo <than@redhat.com> 1:3.3.3-4
-- update new immodule patch
-- fix multilib problem #132516
-
-* Wed Aug 18 2004 Than Ngo <than@redhat.com> 1:3.3.3-3
-- add patch to fix dlopen issue (#126422)
-- add image handling fix
-
-* Thu Aug 12 2004 Than Ngo <than@redhat.com> 1:3.3.3-2
-- fix qmake broken link (#129723)
-
-* Wed Aug 11 2004 Than Ngo <than@redhat.com> 1:3.3.3-1
-- update to 3.3.3 release
-
-* Thu Jul 01 2004 Than Ngo <than@redhat.com> 1:3.3.2-10
-- add immodule for Qt
-
-* Tue Jun 29 2004 Than Ngo <than@redhat.com> 1:3.3.2-9
-- add sub package config, allow multi lib installation (#126643)
-
-* Thu Jun 24 2004 Than Ngo <than@redhat.com> 1:3.3.2-8
-- add fontconfig fix for qfontdatabase, #123868
-- fix some buildrequires problem, #125289
-- fix dangling symlink, #125351
-- get rid of backup files
-
-* Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com> 1:3.3.2-7
-- rebuilt
-
-* Tue May 25 2004 Than Ngo <than@redhat.com> 1:3.3.2-5
-- add missing qembed tool #124052, #124052
-- get rid of unused trigger
-- add qt.conf in ld.so.conf.d -> don't change ld.so.conf #124080
-
-* Wed May 12 2004 Than Ngo <than@redhat.com> 1:3.3.2-4
-- backport some qt patches, Symbol font works again
-
-* Mon May 10 2004 Than Ngo <than@redhat.com> 1:3.3.2-3
-- fixed annoying warning
-
-* Tue May 04 2004 Than Ngo <than@redhat.com> 1:3.3.2-2
-- fix broken symlink at qt document, bug #121652
-
-* Thu Apr 29 2004 Than Ngo <than@redhat.com> 3.3.2-1
-- update to 3.3.2
-
-* Thu Apr 22 2004 Than Ngo <than@redhat.com> 3.3.1-1
-- add cvs backport
-- fix lib64 issue, #121052
-- fix CJK font display, bug #121017, #120542, thanks to Leon Ho
-- compress tutorial/examples
-
-* Fri Mar 26 2004 Than Ngo <than@redhat.com> 3.3.1-0.8
-- fixed symlinks issue, #117572
-
-* Thu Mar 25 2004 Than Ngo <than@redhat.com> 3.3.1-0.7
-- add Trolltech patch, fix dpi setting issue
-
-* Tue Mar 23 2004 Than Ngo <than@redhat.com> 3.3.1-0.6
-- add 0034-qclipboard_recursion_fix.patch from CVS, #118368
-- add better qt-x11-free-3.3.1-fontdatabase.patch
-
-* Sun Mar 07 2004 Than Ngo <than@redhat.com> 1:3.3.1-0.5
-- disable smpflags
-
-* Fri Mar 05 2004 Than Ngo <than@redhat.com> 1:3.3.1-0.4
-- fix font alias
-
-* Thu Mar 04 2004 Than Ngo <than@redhat.com> 1:3.3.1-0.3
-- add fontdatabase fix from Trolltech
-
-* Thu Mar 04 2004 Than Ngo <than@redhat.com> 1:3.3.1-0.2
-- fix wrong symlink #117451
-
-* Tue Mar 02 2004 Elliot Lee <sopwith@redhat.com>
-- rebuilt
-
-* Mon Mar 01 2004 Than Ngo <than@redhat.com> 3.3.1-0.1
-- update to 3.3.1
-
-* Mon Feb 23 2004 Than Ngo <than@redhat.com> 3.3.0-0.4
-- add fix for building with freetype 2.1.7 or newer
-
-* Tue Feb 17 2004 Than Ngo <than@redhat.com> 3.3.0-0.3 
-- enable IPv6 support
-- use dlopen, instead of linking with OpenGL libraries directly
-- don't install backup files
-
-* Thu Feb 05 2004 Than Ngo <than@redhat.com> 1:3.3.0-0.2
-- fix fontdatabase
-- don't use strip in install script
-- fix qt default setting
- 
-* Wed Feb 04 2004 Than Ngo <than@redhat.com> 1:3.3.0-0.1
-- 3.3.0
-
-* Fri Jan 30 2004 Than Ngo <than@redhat.com> 1:3.2.3-0.4
-- add mouse patch from CVS, bug #114647
-
-* Tue Jan 20 2004 Than Ngo <than@redhat.com> 1:3.2.3-0.3
-- rebuild
-
-* Tue Dec  2 2003 Than Ngo <than@redhat.com> 1:3.2.3-0.2
-- Added missing prl files, (report from trolltech)
-- Fixed description
-- include requires XFree86-devel on qt-devel
- 
-* Fri Nov 14 2003 Than Ngo <than@redhat.com> 1:3.2.3-0.1
-- 3.2.3 release
-
-* Thu Oct 30 2003 Than Ngo <than@redhat.com> 1:3.2.2-0.4
-- fix encoding problem
-
-* Sat Oct 18 2003 Than Ngo <than@redhat.com> 1:3.2.2-0.3
-- fix encoding problem
-
-* Fri Oct 17 2003 Than Ngo <than@redhat.com> 1:3.2.2-0.2
-- add font alias patch file, thanks to Leon Ho
-- clean up monospace.patch from Leon Ho
-- remove some unneeded patch files
-
-* Thu Oct 16 2003 Than Ngo <than@redhat.com> 1:3.2.2-0.1
-- 3.2.2 release
-- remove a patch file, which is included in 3.2.2
-
-* Tue Oct 14 2003 Than Ngo <than@redhat.com> 1:3.2.1-1.3
-- remove some unneeded patch files
-- don't load XLFDs if XFT2 is used
-
-* Mon Sep 08 2003 Than Ngo <than@redhat.com> 1:3.2.1-1.2
-- fixed rpm file list
-
-* Tue Sep 02 2003 Than Ngo <than@redhat.com> 1:3.2.1-1.1
-- fix for the khtml form lineedit bug from CVS
-
-* Wed Aug 27 2003 Than Ngo <than@redhat.com> 1:3.2.1-1
-- 3.2.1 release
-
-* Wed Jul 23 2003 Than Ngo <than@redhat.com> 1:3.2.0-1
-- 3.2.0 release
-
-* Mon Jun 23 2003 Than Ngo <than@redhat.com> 3.2.0b2-0.1
-- 3.2.0b2
-- add missing templates for designer
-
-* Wed Jun 18 2003 Than Ngo <than@redhat.com> 3.2.0b1-0.2
-- clean up specfile
-
-* Wed Jun 18 2003 Than Ngo <than@redhat.com> 3.2.0b1-0.1
-- 3.2.0b1
-
-* Tue Jun 17 2003 Than Ngo <than@redhat.com> 3.1.2-12
-- rebuilt
-
-* Tue Jun 17 2003 Than Ngo <than@redhat.com> 3.1.2-10
-- add missing translations
-
-* Wed Jun 11 2003 Elliot Lee <sopwith@redhat.com>
-- rebuilt
-
-* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
-- rebuilt
-
-* Mon May 19 2003 Than Ngo <than@redhat.com> 3.1.2-7
-- add some patches from KDE CVS qt-copy, thanks to Alexei Podtelezhnikov
-
-* Mon May  5 2003 Than Ngo <than@redhat.com> 3.1.2-5.1
-- set correct permission config scripts
-
-* Tue Apr 29 2003 Than Ngo <than@redhat.com> 3.1.2-4
-- fix typo bug in font loader
-
-* Wed Apr  9 2003 Than Ngo <than@redhat.com> 3.1.2-2
-- add xrandr extension
-
-* Mon Mar  3 2003 Than Ngo <than@redhat.com> 3.1.2-1
-- 3.1.2 release
-
-* Mon Feb 17 2003 Elliot Lee <sopwith@redhat.com> 3.1.1-7
-- ppc64 support
-
-* Wed Jan 29 2003 Than Ngo <than@redhat.com> 3.1.1-6
-- add missing Categories section in qt designer #82920
-
-* Wed Jan 22 2003 Tim Powers <timp@redhat.com>
-- rebuilt
-
-* Mon Dec 30 2002 Florian La Roche <Florian.LaRoche@redhat.de>
-- Change qmlined.h to not include an attic header that is also not shipped
-  with Red Hat Linux. This also fixes building unixODBC, that includes this
-  header (apparently also without needing it).
-
-* Thu Dec 19 2002 Than Ngo <than@redhat.com> 3.1.1-3
-- add monospace patch file from Leon Ho (bug #79949)
-- add small patch file from Sysoltsev Slawa (bug #79731)
-
-* Tue Dec 17 2002 Than Ngo <than@redhat.com> 3.1.1-2
-- don't require XFree86, it's not needed
-
-* Tue Dec 17 2002 Than Ngo <than@redhat.com> 3.1.1-1
-- update to 3.1.1
-
-* Thu Nov 28 2002 Than Ngo <than@redhat.com> 3.1.0-1.3
-- don't write Date into created moc files
-
-* Mon Nov 18 2002 Than Ngo <than@redhat.com> 3.1.0-1.2
-- add missing libs
-- remove workaround for ppc
-
-* Sun Nov 17 2002 Than Ngo <than@redhat.com> 3.1.0-1.1
-- adjust qfontdatabase_x11 for 3.1.0
-- fix lib64 issue
-- add workaround to build on ppc
-
-* Wed Nov 13 2002 Than Ngo <than@redhat.com> 3.1.0-1
-- update to 3.1.0
-- adjust some patch files for 3.1.0
-- clean up specfile
-- remove some Xft2 patch files, which are now in 3.1.0
-- add qwidget_x11.cpp.diff from Trolltech
-- install qt in %%{_libdir}/qt-3.1 (bug #77706)
-- don't use rpath
-- enable large file support
-- use system Xinerama
-- remove unneeded cups patch file
-- fix to build against new XFree86
-
-* Tue Nov  5 2002 Than Ngo <than@redhat.com> 3.0.5-19
-- examples misconfigured (bug #76083)
-- don't include pkg-config (bug #74621)
-- fix build problem with new XFree86
-
-* Tue Sep 17 2002 Than Ngo <than@redhat.com> 3.0.5-18
-- Fixed binaries symlinks
-
-* Mon Sep  9 2002 Than Ngo <than@redhat.com> 3.0.5-17hammer
-- clean up spec file for 64bit machine
-
-* Thu Aug 29 2002 Than Ngo <than@redhat.com> 3.0.5-17
-- Fixed rpath issue (bug #69692, #69575)
-- Removed dlopen patch
-- Added monospace alias patch from Leon Ho (bug #72811)
-- Added man pages
-
-* Sun Aug 25 2002 Than Ngo <than@redhat.com> 3.0.5-16
-- Added missing catagory in qt designer
-- Added small gb18030 patch file from Leon Ho
-
-* Thu Aug 22 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.5-15
-- Prereq fileutils (#71500)
-
-* Tue Aug 20 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.5-14
-- Don't link to libstdc++, it isn't used
-- Work around s390 compiler bug (fpic/fPIC coexistance)
-- Do away with the "Feature Bluecurve already defined" warning message
-- Remove qmake cache files from the package
-
-* Wed Aug 14 2002 Than Ngo <than@redhat.com> 3.0.5-13
-- Added fix to use VT100 graphic characters (bug #71364)
-- Added fontdatabase fix from llch@redhat.com (bug #68353)
-
-* Mon Aug 12 2002 Bernhard Rosenkraenzer <bero@redhat.com> [not built]
-- Fix default qtrc
-
-* Mon Aug 12 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.5-12
-- Fix CJK Printing (#71123)
-
-* Sun Aug 11 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.5-11
-- Move qtconfig from qt-devel to qt, it's generally useful
-- Use -fno-use-cxa-atexit
-- Some tweaks to allow building Qt/Embedded with the same spec file
-- Apply the GB18030 patch even if xft2 isn't set
-
-* Fri Aug  9 2002 Than Ngo <than@redhat.com> 3.0.5-10
-- Added XIM patch from llch@redhat.com (bug #70411)
-
-* Sun Aug  4 2002 Than Ngo <than@redhat.com> 3.0.5-9
-- add a missing patch file (closelock/openlock)
-
-* Thu Aug  1 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.5-8
-- Define QT_INSTALL_PREFIX in qmake
-
-* Thu Aug  1 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.5-7
-- Find correct location of qmake mkspecs even if QTDIR isn't set
-
-* Thu Jul 25 2002 Than Ngo <than@redhat.com> 3.0.5-6
-- Check file descriptor before closelock
-* Thu Jul 25 2002 Than Ngo <than@redhat.com> 3.0.5-5
-- Fixed a bug in openlock
-
-* Wed Jul 24 2002 Than Ngo <than@redhat.com> 3.0.5-4
-- Tiny tweaks to qt3 patch
-
-* Tue Jul 23 2002 Owen Taylor <otaylor@redhat.com>
-- Tiny fix to qt3.diff to not add '0' as a test character (#68964)
-
-* Mon Jul 22 2002 Tim Powers <timp@redhat.com> 3.0.5-2
-- rebuild using gcc-3.2-0.1
-
-* Mon Jul 22 2002 Than Ngo <than@redhat.com> 3.0.5-1
-- 3.0.5
-- Fixed dependencies issue
-
-* Thu Jul 18 2002 Than Ngo <than@redhat.com> 3.0.4-12
-- Added qt-clipfix from Harald Hoyer (bug #67648)
-
-* Tue Jul 16 2002 Than Ngo <than@redhat.com> 3.0.4-11
-- get rid of qt resource, it's now in redhat-artworks
-- add some define to build for 7.3
-
-* Thu Jul 11 2002 Than Ngo <than@redhat.com> 3.0.4-10
-- add missing Buildprequires desktop-file-utils
-- add patches for GB18030 (llch@redhat.com) bug #68430
-
-* Tue Jul 09 2002 Than Ngo <than@redhat.com> 3.0.4-9
-- add new desktop file for qt designer
-
-* Fri Jul  5 2002 Jakub Jelinek <jakub@redhat.com> 3.0.4-8
-- compile libXinerama.a with -fpic in Qt until XFree86 is fixed
-- make %%xft2 work even if old Xft headers aren't installed
-
-* Fri Jun 21 2002 Tim Powers <timp@redhat.com>
-- automated rebuild
-
-* Tue Jun 18 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.4-6
-- Re-enable Xft2 now that fontconfig is fixed
-- Require a version of fontconfig that works
-- Use -fPIC rather than -fpic on alpha
-
-* Tue Jun 18 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.4-5
-- Revert to Xft1 for now, Xft2 is too unstable
-- Exclude alpha for now to work around binutils bugs
-
-* Tue Jun 11 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.4-4
-- Add (and fix up) fontconfig patch
-
-* Mon Jun  3 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.4-3
-- Remove the glweak patch, it isn't needed after dropping XFree86 3.x
-
-* Thu May 23 2002 Tim Powers <timp@redhat.com>
-- automated rebuild
-
-* Sun May  5 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.4-1
-- 3.0.4
-- Make SQL plugins optional (buildtime)
-- Register with pkgconfig
-
-* Thu May 02 2002 Than Ngo <than@redhat.com> 3.0.3-12
-- qtdir /usr/lib/qt3
-- build against gcc-3.1-0.26
-- add qt-3.0.3-glweak.patch 
-
-* Wed Apr 17 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.3-11
-- qt3-gcc2.96 should be in qt, not qt-devel
-
-* Mon Apr 15 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.3-10
-- Tweaks to allow parallel installations of Qt 3.x (gcc 2.96) and Qt 3.x
-  (gcc 3.1)
-- Fix up debug spewage at Qt designer startup
-
-* Wed Apr 10 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.3-9
-- Spec file fixes
-
-* Wed Apr 10 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.3-8
-- Get rid of non-threaded version, dlopen()'ing threaded code
-  (like plugins) from non-threaded code is dangerous
-- Add some fixes from qt-copy, fixing the ksplash crash some people
-  have noticed on a first login
-- Add translation fixes from CVS
-- Patch example .pro files to build outside the Qt source tree (#63023)
-- Fix various bugs
-
-* Thu Apr 04 2002 Leon Ho <llch@redhat.com> 3.0.3-7
-- fixes for CJK - qpsprinter
-- fixes for CJK - gb18030
-
-* Fri Mar 29 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.3-6
-- Make sure it builds with both gcc 2.96 and 3.1
-
-* Wed Mar 28 2002 Leon Ho <llch@redhat.com> 3.0.3-5
-- fixes for CJK - qpsprinter
-
-* Wed Mar 27 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.3-4
-- Add CJK patches
-
-* Tue Mar 26 2002 Than Ngo <than@redhat.com> 3.0.3-3
-- fix loading kde styles
-
-* Tue Mar 19 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.3-1
-- Update to 3.0.3 final
-
-* Thu Mar 14 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.3-0.cvs20020314.1
-- Update to 3.0.3-pre, required for KDE3
-- force -fPIC usage
-- Remove conflict with qt2 < 2.3.2-1, the new qt2 2.3.1 is fixed and qt 2.3.2
-  is broken
-- Ship the qmake config files (so qmake works for building any 3rd party stuff,
-  e.g. aethera)
-
-* Wed Mar  6 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.2-2
-- Add some fixes from KDE's qt-copy CVS
-- Pluginize image formats
-
-* Mon Feb 25 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.2-1
-- 3.0.2 final
-
-* Tue Feb 19 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.2-0.cvs20020118.3
-- Add GB18030 codec patch, #60034
-- Force-build jpeg support, fixing #59775 and #59795
-
-* Sat Jan 26 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.2-0.cvs20020118.2
-- Build with CUPS support
-
-* Fri Jan 18 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.2-0.cvs20020118.1
-- Fix up /usr/bin/moc links, they should point to qt3
-
-* Mon Jan 14 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.2-0.cvs20020114.1
-- Build styles directly into the main library for now, there's too much broken
-  code out there depending on this ATM.
-
-* Wed Jan  9 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.2-0.cvs20020109.1
-- Stop excluding alpha, gcc has been fixed
-
-* Tue Jan  8 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.2-0.cvs20020108.1
-- Add fixes from CVS; this fixes the "Alt + F1, arrow up, arrow up doesn't work
-  in KDE" bug
-
-* Mon Dec 17 2001 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.1-2
-- Fix up settings search path
-- Add default qtrc allowing to use KDE 3.x Qt plugins
-- Make sure QLibrary uses RTLD_GLOBAL when dlopen()ing libraries
-
-* Thu Dec 13 2001 Bernhard Rosenkraenzer <bero@redhat.com> 3.1.0-1
-- Work around gcc bug #57467
-
-* Wed Dec 12 2001 Bernhard Rosenkraenzer <bero@redhat.com>
-- 3.0.1 final
-
-* Mon Dec 10 2001 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.1-0.cvs20011210.1
-- Update to current (needed by KDE 3.x)
-- Rebuild with current libstdc++
-- Temporarily disable building on alpha
-- Fix build with PostgreSQL 7.2
-
-* Mon Nov 26 2001 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.0-5
-- Fix up glweak
-
-* Mon Nov  5 2001 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.0-4
-- Give designer, uic, moc, etc. their real names - the qt2 versions
-  have been renamed in qt2-2.3.2-1.
-  Conflict with qt2 < 2.3.2-1.
-
-* Thu Oct 25 2001 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.0-3
-- Add symlink /usr/lib/qt-3.0.0 -> /usr/lib/qt3 and set QTDIR to the
-  symlink, allowing to update to 3.0.1 without breaking rpath'ed binaries
-
-* Tue Oct 16 2001 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.0-1
-- 3.0.0 final
-- fix some minor specfile bugs
-- Modularize some more (image format plugins)
-- Build codecs
-
-* Tue Sep 18 2001 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.0-0.beta5.1
-- beta5
-- Share more code between qt-x11 and qt-embedded builds
-
-* Wed Aug 29 2001 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.0-0.beta4.1
-- beta4
-- build the Motif style directly into Qt rather than as a plugin - Qt should
-  always have at least one style...
-- replace the designer3 symlink with a shell script that sets QTDIR correctly
-  before launching designer
-- Add desktop file for designer
-
-* Mon Aug  6 2001 Tim Powers <timp@redhat.com> 3.0.0-0.beta3.4
-- explicitly include qm2ts, qmake, qtconfig in the devel package file list to avoid dangling symlinks
-
-* Thu Aug  2 2001 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.0-0.beta3.3
-- Try yet another workaround for buildsystem breakages
-
-* Tue Jul 31 2001 Bernhard Rosenkraenzer <bero@redhat.com>
-- Add another ugly workaround for build system problems, this should finally
-  get rid of the dangling symlinks
-
-* Tue Jul 31 2001 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.0-0.beta3.2
-- Rephrase parts of the spec file, hopefully pleasing the build system
-
-* Sun Jul 29 2001 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.0-0.beta3.1
-- beta3
-- Fix dangling symlinks
-
-* Sun Jun 24 2001 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.0-0.beta1.2
-- Fix up QSQL Postgres classes for Postgres 7.1.x
-- Fix various bugs:
-  - QtMultilineEdit and QtTableView should actually compile
-  - Link libqsqlpsql with libpq
-  - Don't link the base library with libmysqlclient, linking the MySQL
-    module with it is sufficient
-- Add missing const qualifier
-- move the SQL drivers to separate packages to avoid dependencies
-- build and install designer plugins - converting glade files to Qt is fun. ;)
-- handle RPM_OPT_FLAGS
-
-* Tue May 22 2001 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.0-0.beta1.1
-- 3.0 beta 1
-
-* Wed May 16 2001 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.0-0.cvs20010516.1
-- Update, remove conflicts with Qt 2.x
-
-* Mon May 14 2001 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.0-0.cvs20010514.1
-- Initial build of 3.0 branch
-
-* Fri Apr 27 2001 Bernhard Rosenkraenzer <bero@redhat.com> 2.3.0-6
-- Fix crashes on ia64, Patch from Bill Nottingham <notting@redhat.com>
-- Allow building qt-nox
-
-* Fri Apr 20 2001 Bernhard Rosenkraenzer <bero@redhat.com> 2.3.0-5
-- Make sure uic and designer use the libqui from the source tree, not
-  a previously installed one.
-  Linking uic-x11 against libqui-embedded is definitely not a feature. ;)
-- The qclipboard fix is needed for qt-x11 only, don't apply it if we're
-  building qt-embedded
-
-* Sat Apr 14 2001 Bernhard Rosenkraenzer <bero@redhat.com>
-- Handle LPRng specific constructs in printcap, Bug #35937
-
-* Sun Mar 25 2001 Florian La Roche <Florian.LaRoche@redhat.de>
-- add qfont patch from Trolltech
-
-* Tue Mar 13 2001 Harald Hoyer <harald@redhat.de>
-- added patch for '@euro' language settings
-
-* Tue Mar  6 2001 Bernhard Rosenkraenzer <bero@redhat.com>
-- 2.3.0 final
-- BuildRequires XFree86-devel >= 4.0.2 (#30486)
-
-* Mon Feb 26 2001 Than Ngo <than@redhat.com>
-- fix check_env function, so that qt does not crash if QT_XFT is not set
-- fix symlinks
-
-* Mon Feb 26 2001 Bernhard Rosenkraenzer <bero@redhat.com>
-- 2.3.0b1
-- Add a patch to qpsprinter that handles TrueType fonts even if they come from xfs
-
-* Tue Feb 13 2001 Preston Brown <pbrown@redhat.com>
-- japanese input and clipboard fixes applied.  Changes have been sent upstream by patch authors.
-
-* Fri Feb  9 2001 Bernhard Rosenkraenzer <bero@redhat.com>
-- Rebuild with new Mesa to get rid of pthreads linkage
-- Add Xft fix from KDE CVS
-
-* Wed Feb  7 2001 Bernhard Rosenkraenzer <bero@redhat.com>
-- Add printing bugfix patch from Trolltech
-
-* Sat Feb  3 2001 Bernhard Rosenkraenzer <bero@redhat.com>
-- 2.2.4
-- Qt Embedded: Add QVfb and VNC support
-
-* Tue Jan 16 2001 Bernhard Rosenkraenzer <bero@redhat.com>
-- Don't segfault when running Qt/Embedded applications as root
-- Improve the Qt/Embedded sparc patch so we don't need the specfile hacks
-  anymore
-- Fix a bug in QPrintDialog (causing KDE Bug #18608)
-
-* Thu Jan 11 2001 Bernhard Rosenkraenzer <bero@redhat.com>
-- bzip2 source to save space
-- Qt/Embedded 2.2.3
-- Fix qte build on sparc
-
-* Wed Dec 20 2000 Bernhard Rosenkraenzer <bero@redhat.com>
-- Run ldconfig in %%post and %%postun for qt-Xt
-
-* Sun Dec 17 2000 Bernhard Rosenkraenzer <bero@redhat.com>
-- Build with the Xrender extension
-  (Patch from Keith Packard <keithp@keithp.com>)
-
-* Wed Dec 13 2000 Bernhard Rosenkraenzer <bero@redhat.com>
-- 2.2.3
-
-* Tue Dec 12 2000 Bernhard Rosenkraenzer <bero@redhat.com>
-- Rebuild to fix permissions on doc dir
-- Don't exclude ia64 anymore
-
-* Fri Nov 17 2000 Bernhard Rosenkraenzer <bero@redhat.com>
-- Fix up uic (Patch from trolltech) 
-
-* Wed Nov 15 2000 Bernhard Rosenkraenzer <bero@redhat.com>
-- Build qt-embedded
-  changes to base: fix build, fix ISO C99 compliance, fix 64bit support
-
-* Mon Nov 13 2000 Bernhard Rosenkraenzer <bero@redhat.com>
-- 2.2.2
-
-* Tue Oct 24 2000 Than Ngo <than@redhat.com>
-- call ldconfig for updating (Bug #19687)
-- added patch from Trolltech, thanks to Rainer <rms@trolltech.com>
-
-* Wed Oct 18 2000 Bernhard Rosenkraenzer <bero@redhat.com>
-- Add missing msg2qm, msgmerge, qconfig tools (Bug #18997), introduced
-  by broken Makefiles in base
-- fix up %%install so it works both with old-style and new-style fileutils
-  (fileutils <= 4.0z don't know about -L)
-
-* Fri Oct 13 2000 Bernhard Rosenkraenzer <bero@redhat.com>
-- Disable exception handling; this speeds up KDE 2.x and reduces its
-  memory footprint by 20 MB.
-
-* Tue Oct 10 2000 Bernhard Rosenkraenzer <bero@redhat.com>
-- dereference symlinks in include
-
-* Sun Oct  8 2000 Bernhard Rosenkraenzer <bero@redhat.com>
-- fix -devel
-- update to the new version of 2.2.1 on trolltech.com; the initial tarball
-  contained broken docs
-
-* Thu Oct  5 2000 Bernhard Rosenkraenzer <bero@redhat.com>
-- 2.2.1
-
-* Mon Sep 25 2000 Bernhard Rosenkraenzer <bero@redhat.com>
-- Add missing uic
-
-* Thu Sep 21 2000 Bernhard Rosenkraenzer <bero@redhat.com>
-- Move Qt designer to a different source RPM to get rid of a
-  circular dependency (kdelibs2->qt, qt->kdelibs2)
-- Enable MNG support
-- Don't compile (just include) examples and tutorials
-- move the static libraries to a separate package (qt-static).
-  They're HUGE, and most people won't ever need them.
-- clean up spec file
-- fix up dependencies (-devel requires base, -static requires devel,
-  Xt requires base)
-- add BuildRequires line
-
-* Tue Sep 12 2000 Than Ngo <than@redhat.com>
-- update release 2.2.0
-- changed copyright to GPL
-- added missing static libraries
-- made symbolic link for designer to load the help files correct
-- made designer and designer-kde2 as sub packages
-- added missing templates for designer
-- remove jakub patch, since the release 2.2.0 already 
-  contains this patch.
-- fixed qt again to compile with gcc-2.96
-- use make -j for building
-
-* Wed Aug 23 2000 Bernhard Rosenkraenzer <bero@redhat.com>
-- Work around compiler bugs (Patch from Jakub)
-- Use relative symlinks (Bug #16750)
-
-* Mon Aug 21 2000 Bernhard Rosenkraenzer <bero@redhat.com>
-- beta2
-
-* Mon Aug 14 2000 Bernhard Rosenkraenzer <bero@redhat.com>
-- new qt-copy from KDE2 CVS
-
-* Wed Aug 9 2000 Bernhard Rosenkraenzer <bero@redhat.com>
-- official beta 1
-
-* Thu Aug 3 2000 Than Ngo <than@redhat.de>
-- rebuilt against the libpng-1.0.8
-
-* Thu Jul 27 2000 Bernhard Rosenkraenzer <bero@redhat.com>
-- rebuild (so we have it on all arches)
-
-* Tue Jul 25 2000 Bernhard Rosenkraenzer <bero@redhat.com>
-- move man pages to a more reasonable place (this fixes Bug #14126)
-- exclude ia64 for now (compiler problems!!!)
-
-* Mon Jul 24 2000 Harald Hoyer <harald@redhat.de>
-- modified connect patch to fit qt 2.2.0 beta.
-
-* Thu Jul 20 2000 Bernhard Rosenkraenzer <bero@redhat.com>
-- update to current qt-copy; this is now a qt 2.2.0 beta.
-
-* Mon Jul 17 2000 Bernhard Rosenkraenzer <bero@redhat.com>
-- update to current qt-copy in kde CVS, required
-
-* Wed Jul 12 2000 Prospector <bugzilla@redhat.com>
-- automatic rebuild
-
-* Sun Jul 11 2000 Harald Hoyer <harald@redhat.de>
-- made patch smaller and binary compatible when recompiled with 6.2
-- modified connect and moc to cope with the new g++ class layout
-
-* Sun Jul 09 2000 Than Ngo <than@redhat.de>
-- rebuilt qt with gcc-2.96-34
-
-* Fri Jul 07 2000 Than Ngo <than@redhat.de>
-- rebuilt qt with c++ 2.96
-
-* Mon Jul  3 2000 Bernhard Rosenkraenzer <bero@redhat.com>
-- Fix dependancies
-
-* Sun Jul  2 2000 Bernhard Rosenkraenzer <bero@redhat.com>
-- Use egcs++ for now ** FIXME
-
-* Wed Jun 28 2000 Preston Brown <pbrown@redhat.com>
-- fix up qt.sh
-
-* Sun Jun 25 2000 Bernhard Rosenkraenzer <bero@redhat.com>
-- Build in jpeg and threading support
-- Fix a bug in clipboard pasting code
-
-* Wed Jun 07 2000 Preston Brown <pbrown@redhat.com>
-- fix qt.{sh,csh}
-- use new rpm macro paths
-- package man pages
-
-* Fri Jun  2 2000 Bill Nottingham <notting@redhat.com>
-- build without optimization on ia64
-
-* Mon May 29 2000 Bernhard Rosenkraenzer <bero@redhat.com>
-- 2.1.1
-
-* Thu May 18 2000 Florian La Roche <Florian.LaRoche@redhat.com>
-- recompile with correct libstdc++
-
-* Thu Apr 13 2000 Bernhard Rosenkraenzer <bero@redhat.com>
-- 2.1.0 final
-
-* Wed Apr  5 2000 Bernhard Rosenkraenzer <bero@redhat.com>
-- beta4
-- depend on libGL.so.1 rather than Mesa - XFree86 4.0 provides that
-  lib, too
-
-* Wed Mar 22 2000 Bernhard Rosenkraenzer <bero@redhat.com>
-- beta3
-
-* Tue Mar  7 2000 Bernhard Rosenkraenzer <bero@redhat.com>
-- beta2
-- fix compilation of the NSPlugin add-on
-
-* Fri Mar  3 2000 Bill Nottingham <notting@redhat.com>
-- fix %postun script
-
-* Fri Feb 18 2000 Bernhard Rosenkränzer <bero@redhat.com>
-- beta1
-- get rid of qt-ImageIO, the functionality is now in the main Qt library
-- remove qt-Network, the functionality is now in the main Qt library
-- add changes-2.1.0 to %doc
-
-* Thu Feb 17 2000 Preston Brown <pbrown@redhat.com>
-- no refcount check on postun script, we want it to happen even on upgrades
-
-* Thu Feb 10 2000 Bernhard Rosenkraenzer <bero@redhat.com>
-- new snapshot, should fix QWhatsThisButton
-- remove executable permissions from *.pro files
-
-* Mon Feb 07 2000 Preston Brown <pbrown@redhat.com>
-- strip binaries in examples, tutorial
-
-* Mon Jan 31 2000 Bernhard Rosenkraenzer <bero@redhat.com>
-- new snapshot - should fix the hotkey bug
-- Fix up the Makefiles so it compiles
-
-* Tue Jan 18 2000 Bernhard Rosenkraenzer <bero@redhat.com>
-- new snapshot - we need those QVariant fixes
-
-* Thu Jan 13 2000 Bernhard Rosenkraenzer <bero@redhat.com>
-- switch from glxMesa to Mesa for the GL addon
-
-* Wed Jan 5 2000 Bernhard Rosenkränzer <bero@redhat.com>
-- Fix up dependencies
-- new snapshot
-
-* Mon Jan 3 2000 Ngo Than <than@redhat.de>
-- new snapshot for Red Hat Linux 6.2
-- increase version number
-
-* Mon Dec 20 1999 Bernhard Rosenkraenzer <bero@redhat.com>
-- new snapshot
-- handle RPM_OPT_FLAGS
-
-* Mon Dec 13 1999 Bernhard Rosenkraenzer <bero@redhat.com>
-- new snapshot
-- -GL requires libGL.so.1 instead of Mesa (might as well be glxMesa
-  or some commercial OpenGL)
-- -GL BuildPrereqs /usr/X11R6/include/GL/gl.h instead of Mesa-devel
-  (might as well be glxMesa or some commercial OpenGL)
-
-* Sun Dec 05 1999 Bernhard Rosenkraenzer <bero@redhat.com>
-- update to current RSYNC version
-- remove compilation patch - it finally works out of the box
-
-* Wed Oct 27 1999 Bernhard Rosenkraenzer <bero@redhat.com>
-- update to current CVS snapshot
-- build extensions
-- add patch to fix QNetwork compilation
-
-* Sun Oct 24 1999 Bernhard Rosenkraenzer <bero@redhat.de>
-- current CVS snapshot
-- fix compilation with gcc 2.95.x
-- use install -c rather than just install to make BSD install happy
-
-* Mon Oct 11 1999 Bernhard Rosenkraenzer <bero@redhat.de>
-- 2.1.0 snapshot (for KDE2)
-- Fix typo in spec
-
-* Thu Sep 23 1999 Preston Brown <pbrown@redhat.com>
-- don't ship tutorial or example binaries
-
-* Tue Sep 21 1999 Preston Brown <pbrown@redhat.com>
-- substitution in tutorial and examples so that dependencies are correct and
-  they can be successfully rebuilt.
-- switched to completely using QTDIR.  trying to coexist with links into
-  /usr/{include,lib} and still compile with qt 1.x is very hard for
-  configure scripts to cope with.
-
-* Thu Aug 19 1999 Preston Brown <pbrown@redhat.com>
-- implemented QTDIR compatibility.
-
-* Tue Jul 20 1999 Preston Brown <pbrown@redhat.com>
-- qt 2.0.1 packaged.
-
-* Wed Jul 14 1999 Preston Brown <pbrown@redhat.com>
-- Qt 2.00 packaged.
-- examples, html documentation, tutorial moved to /usr/doc
-
-* Sat Apr 17 1999 Preston Brown <pbrown@redhat.com>
-- static library supplied in dev package.
-
-* Wed Apr 07 1999 Preston Brown <pbrown@redhat.com>
-- turn on internal GIF reading support
-
-* Tue Apr 06 1999 Preston Brown <pbrown@redhat.com>
-- strip binaries
-
-* Mon Mar 15 1999 Preston Brown <pbrown@redhat.com>
-- upgrade to qt 1.44.
-
-* Wed Feb 24 1999 Preston Brown <pbrown@redhat.com>
-- Injected new description and group.
-
-* Tue Jan 19 1999 Preston Brown <pbrown@redhat.com>
-- moved includes to /usr/include/qt
-
-* Mon Jan 04 1999 Preston Brown <pbrown@redhat.com>
-- made setup phase silent.
-
-* Fri Dec 04 1998 Preston Brown <pbrown@redhat.com>
-- upgraded to qt 1.42, released today.
-
-* Tue Dec 01 1998 Preston Brown <pbrown@redhat.com>
-- took Arnts RPM and made some minor changes for Red Hat.
+- Spec file based on RHEL 6 'qt3-3.3.8b-29'
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec
index 859afa0bd..6f65fa7bf 100755
--- a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface-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"
@@ -27,12 +27,14 @@ Version:	%{version}
 Release:	%{release}%{?dist}%{?_variant}
 License:	GPL
 Summary:	Trinity QT Interface
+Group:		System Environment/Libraries
 
 Vendor:		Trinity Project
 URL:		http://www.trinitydesktop.org/
 Packager:	Francois Andriot <francois.andriot@free.fr>
 
 Prefix:		%{_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:	%{name}-%{version}.tar.gz
 
 
@@ -45,8 +47,9 @@ BuildRequires:	pth-devel
 Trinity QT Interface
 
 %package devel
-Requires:	%{name}
+Group:		Development/Libraries
 Summary:	%{name} - Development files
+Requires:	%{name} = %{version}-%{release}
 
 %description devel
 Development files for %{name}
@@ -75,13 +78,16 @@ cd build
 %install
 %__rm -rf %{?buildroot}
 %__mkdir_p %{?buildroot}%{_includedir}
-%make_install -C build
+%__make install DESTDIR=%{?buildroot} -C build
 
-# Fix 'tqt.pc': UIC executable is not correct
-sed -i %{?buildroot}%{_libdir}/pkgconfig/tqt.pc \
-  -e '/^uic_executable=.*/ s,^\(uic_executable=\).*,\1%{_bindir}/uic-tqt,'
+# RHEL 5: add newline at end of include files to avoid warnings
+%if 0%{?rhel} && 0%{?rhel} <= 5
+for i in %{?buildroot}%{_includedir}/*.h; do
+  echo "" >>${i}
+done
+%endif
 
-# Install 'cmake' modules for a specific package (for later use)
+# Install 'cmake' modules for development use
 %__mkdir_p %{?buildroot}%{cmake_modules_dir}
 for i in cmake/modules/*.cmake; do
   install -m 644 $i %{?buildroot}%{cmake_modules_dir}
@@ -103,6 +109,9 @@ done
 
 
 %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 Aug 28 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
 - Import to GIT
 - Built with future TDE version (3.5.13 + cmake + QT3.3.8d)
diff --git a/redhat/genrpm.sh b/redhat/genrpm.sh
index 96d6ce7de..eb7015de2 100755
--- a/redhat/genrpm.sh
+++ b/redhat/genrpm.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 cd "$( dirname "$0" )"
+ARGS="$@"
 
 clear
 cat <<EOF
@@ -21,7 +22,7 @@ EOF
 	exit 1
 fi
 
-select COMP in $( cut -f1 "components.txt" ) ; do
+select COMP in $( cut -f1 "components.txt" | grep -v "^#" ) ; do
 	# Gets package version from 'components.txt' file
 	VERSION=$( awk '{ if ($1 == "'${COMP}'") { print $2; } }' components.txt )
 	
@@ -70,11 +71,14 @@ EOF
 	esac
 	
 	set -x
+	(
 	rpmbuild -ba \
 		--define "_sourcedir ${PWD}/${COMP}" \
 		--define "_prefix ${PREFIX:-/opt/trinity}" \
 		--define "version ${VERSION:-3.5.13}" \
+		$ARGS \
 		${COMP}/${SPEC} || exit 1
+	) 2>&1 | tee /tmp/log
 	set +x
 done
 
diff --git a/redhat/gentarball.sh b/redhat/gentarball.sh
index ab337ac6a..76d902fd5 100755
--- a/redhat/gentarball.sh
+++ b/redhat/gentarball.sh
@@ -15,7 +15,7 @@ EOF
 
 ##### CHOOSE A TDE COMPONENT #####
 PS3="Enter number: "
-select COMP in $( cut -f1 components.txt ) ; do
+select COMP in $( cut -f1 components.txt | grep -v "^#" ) ; do
 	ARCHIVEDIR="${PWD}/${COMP}"
 	[ -d "${ARCHIVEDIR}" ] || mkdir -p "${ARCHIVEDIR}"
 
@@ -27,33 +27,63 @@ select COMP in $( cut -f1 components.txt ) ; do
 		echo
 		echo "You currently have the following tarball(s): "
 		for i in ${ARCHIVEDIR}/${COMP##*/}*.tar.gz; do echo "  ${i##*/}"; done
+		echo
 	fi
 	
 	# Checks latest SVN revision
-	SVNREV=$( LANG=C svn info svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/tqtinterface|sed -n "/^Revision: / s,.* \(.*\),\1,p" )
-	ARCHIVENAME=${COMP##*/}-${VERSION}.${SVNREV}.tar.gz
+	unset ARCHIVENAME
+	case "${COMP##*/}" in
+		"libcaldav"|"libcarddav"|"qt3") ;;
+		*)
+			SVNREV=$( LANG=C svn info svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/tqtinterface|sed -n "/^Revision: / s,.* \(.*\),\1,p" )
+			ARCHIVENAME=${COMP##*/}-${VERSION}.${SVNREV}.tar.gz
 
-	if [ -r ${ARCHIVEDIR}/${ARCHIVENAME} ]; then
-		echo "You already have the latest revision (${SVNREV})";
-	fi
+			if [ -r ${ARCHIVEDIR}/${ARCHIVENAME} ]; then
+				echo "You already have the latest revision (${SVNREV})";
+			else
+				echo "A new revision is available: ${SVNREV}"
+			fi
+		;;
+	esac
 	
 	echo
-	echo "Press ENTER to download a new version, or CTRL+C to abort."
+	echo "Press ENTER to download the new tarball, or CTRL+C to abort."
 	read rep
 
 	TMPDIRTDE=$(mktemp -d)
 	pushd "${TMPDIRTDE}" >/dev/null
 	mkdir -p "${TMPDIRTDE}/${COMP}"
 	pushd "${COMP}/.." >/dev/null
-	echo "Extracting '${COMP}' from SVN ..."
 	case "${COMP##*/}" in
-		"qt3") git clone http://scm.trinitydesktop.org/scm/git/tde; mv tde/main/dependencies/qt3 . ;;
-		*) svn export --force --quiet svn://anonsvn.kde.org/home/kde/branches/trinity/${COMP} ;;
+		"libcaldav")
+			echo "Downloading '${COMP}' ..."
+			ARCHIVENAME="libcaldav_0.6.5-2debian2.tar.gz"
+			wget --no-check-certificate "https://quickbuild.pearsoncomputing.net/~trinity/+archive/trinity-builddeps/+files/libcaldav_0.6.5-2debian2.tar.gz"
+			;;
+		"libcarddav")
+			echo "Downloading '${COMP}' ..."
+			ARCHIVENAME="libcarddav_0.6.2-2debian2.tar.gz"
+			wget --no-check-certificate "https://quickbuild.pearsoncomputing.net/~trinity/+archive/trinity-builddeps/+files/libcarddav_0.6.2-2debian2.tar.gz"
+			;;
+		"qt3")
+			echo "Extracting '${COMP}' from GIT ..."
+			ARCHIVENAME="qt3-3.3.8d.tar.gz"
+			git clone http://scm.trinitydesktop.org/scm/git/tde; mv tde/main/dependencies/qt3 .
+			;;
+		*)
+			echo "Extracting '${COMP}' from SVN ..."
+			svn export --force --quiet svn://anonsvn.kde.org/home/kde/branches/trinity/${COMP}
+			;;
 	esac
-	popd >/dev/null
 
-	echo "Creating archive '${ARCHIVENAME}' ..."
-	tar cfz ${ARCHIVEDIR}/${ARCHIVENAME} ${COMP}
+	if [ ! -r "${ARCHIVENAME}" ]; then
+		popd >/dev/null
+		echo "Creating archive '${ARCHIVENAME}' ..."
+		tar cfz ${ARCHIVEDIR}/${ARCHIVENAME} ${COMP}
+	else
+		mv *.tar.gz ${ARCHIVEDIR}/
+		popd >/dev/null
+	fi
 	popd >/dev/null
 	echo "Cleaning temporary directory ..."
 	rm -rf "${TMPDIRTDE}"
diff --git a/redhat/kde-i18n/kde-i18n-3.5.13-add_french_translations.patch b/redhat/kde-i18n/kde-i18n-3.5.13-add_french_translations.patch
new file mode 100644
index 000000000..3239d6917
--- /dev/null
+++ b/redhat/kde-i18n/kde-i18n-3.5.13-add_french_translations.patch
@@ -0,0 +1,468 @@
+diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/kcmiccconfig.po kde-i18n-fr-3.5.10/messages/kdebase/kcmiccconfig.po
+--- kde-i18n-fr-3.5.10.ORI/messages/kdebase/kcmiccconfig.po	1970-01-01 01:00:00.000000000 +0100
++++ kde-i18n-fr-3.5.10/messages/kdebase/kcmiccconfig.po	2011-11-01 17:01:47.942636702 +0100
+@@ -0,0 +1,76 @@
++# TDE 3.5.13 'iccconfig.cpp' translation
++
++#: iccconfig.cpp:82
++msgid "<b>The global ICC color profile is a system wide setting, and requires administrator access</b><br>To alter the system's global ICC profile, click on the \"Administrator Mode\" button below."
++msgstr "<b>Le profil de couleurs ICC global est un réglage système, et nécessite les droits d'administrateur.</b><br>Pour modifier le profil ICC global, cliquez sur le bouton \"Mode administrateur\" ci-dessous."
++
++#: iccconfig.cpp:155
++#: iccconfig.cpp:189
++msgid "Please enter the new profile name below:"
++msgstr "Veuillez indiquer le nom du nouveau profil:"
++
++#: iccconfig.cpp:159
++#: iccconfig.cpp:193
++msgid "ICC Profile Configuration"
++msgstr "Configuration du profil ICC"
++
++#: iccconfig.cpp:166
++#: iccconfig.cpp:200
++msgid "Error: A profile with that name already exists"
++msgstr "Erreur: Il existe déja un profil portant ce nom."
++
++#: iccconfig.cpp:406
++msgid ""
++"<h1>ICC Profile Configuration</h1> This module allows you to configure KDE support"
++" for ICC profiles. This allows you to easily color correct your monitor"
++" for a more lifelike and vibrant image."
++msgstr ""
++"<h1>Configuration du profil ICC</h1> Ce module vous permet de configurer le support"
++" ICC de Trinity. Il permet de calibrer  les couleurs de votre moniteur, "
++" afin d'obtenir une image plus vivante et plus vibrante."
++
++#: iccconfigbase.ui:31
++msgid "ICC Color Profile Configuration"
++msgstr "Configuration des profils de couleurs ICC"
++
++#: iccconfigbase.ui:42
++msgid "System Settings"
++msgstr "Paramètres Système"
++
++#: iccconfigbase.ui:53
++msgid "&Enable global ICC color profile support"
++msgstr "Activer le profil ICC global"
++
++#: iccconfigbase.ui:61
++#: iccconfigbase.ui:148
++msgid "*.icc|ICC Standard Color Profiles (*.icc)\n*.icm|Windows(R) Color Profiles (*.icm)"
++msgstr "*.icc|Profils de couleurs ICC standards (*.icc)\n*.icm|Profils de couleurs Windows(R) (*.icm)"
++
++#: iccconfigbase.ui:69
++#: iccconfigbase.ui:156
++msgid "ICC File"
++msgstr "Fichier ICC"
++
++#: iccconfigbase.ui:79
++msgid "User Settings"
++msgstr "Paramètres Utilisateurs"
++
++#: iccconfigbase.ui:90
++msgid "&Enable user ICC color profile support"
++msgstr "Activer le profil ICC utilisateur"
++
++#: iccconfigbase.ui:103
++msgid "Current Profile"
++msgstr "Profil actuel"
++
++#: iccconfigbase.ui:111
++msgid "Create New"
++msgstr "Créer"
++
++#: iccconfigbase.ui:119
++msgid "Rename"
++msgstr "Renommer"
++
++#: iccconfigbase.ui:140
++msgid "Settings for output"
++msgstr "Appliquer à la sortie"
+diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/kdesktop.po kde-i18n-fr-3.5.10/messages/kdebase/kdesktop.po
+--- kde-i18n-fr-3.5.10.ORI/messages/kdebase/kdesktop.po	2008-08-19 20:29:30.000000000 +0200
++++ kde-i18n-fr-3.5.10/messages/kdebase/kdesktop.po	2011-11-01 17:14:54.379412830 +0100
+@@ -1144,3 +1144,20 @@
+ "Cependant, certains écrans de veille\n"
+ "       effectuent des calculs utiles, dans ces cas, il est souhaitable de ne "
+ "pas les désactiver."
++
++### TDE 3.5.13 ###
++#: lockdlg.cc:109
++msgid "Desktop Session Locked"
++msgstr "Session de bureau verrouillée"
++
++#: lockdlg.cc:128
++msgid "This computer is in use and has been locked."
++msgstr "Cet ordinateur est en cours d'utilisation et a été verrouillé."
++
++#: lockdlg.cc:129
++msgid "Only '%1' may unlock this session."
++msgstr "Seul '%1' peut déverouiller cette session."
++
++#: lockdlg.cc:139
++msgid "This session has been locked since %1"
++msgstr "Cette session est verrouillée depuis %1"
+diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/kicker.po kde-i18n-fr-3.5.10/messages/kdebase/kicker.po
+--- kde-i18n-fr-3.5.10.ORI/messages/kdebase/kicker.po	2008-08-19 20:29:30.000000000 +0200
++++ kde-i18n-fr-3.5.10/messages/kdebase/kicker.po	2011-11-01 16:16:16.453636429 +0100
+@@ -754,3 +754,8 @@
+ #, no-c-format
+ msgid "Custom size"
+ msgstr "Taille personnalisée"
++
++### TDE 3.5.13 ###
++#: panelextension.cpp:385
++msgid "&Launch Process Manager..."
++msgstr "Gestionnaire de taches..."
+diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/konsole.po kde-i18n-fr-3.5.10/messages/kdebase/konsole.po
+--- kde-i18n-fr-3.5.10.ORI/messages/kdebase/konsole.po	2008-08-19 20:29:30.000000000 +0200
++++ kde-i18n-fr-3.5.10/messages/kdebase/konsole.po	2011-11-01 16:16:16.453636429 +0100
+@@ -1475,3 +1475,8 @@
+ #: zmodem_dialog.cpp:28
+ msgid "&Stop"
+ msgstr "A&rrêter"
++
++### TDE 3.5.13 ###
++#: konsole.cpp:736
++msgid "&Open.."
++msgstr "Ouvrir.."
+diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/krandr.po kde-i18n-fr-3.5.10/messages/kdebase/krandr.po
+--- kde-i18n-fr-3.5.10.ORI/messages/kdebase/krandr.po	2008-08-19 20:29:30.000000000 +0200
++++ kde-i18n-fr-3.5.10/messages/kdebase/krandr.po	2011-11-01 17:42:36.100570353 +0100
+@@ -301,3 +301,33 @@
+ "_: Refresh rate in Hertz (Hz)\n"
+ "%1 Hz"
+ msgstr "%1 Hz"
++
++### TDE 3.5.13 ###
++
++#: krandrtray.cpp:237
++msgid "Global Configuation"
++msgstr "Configuration Globale"
++
++#: krandrtray.cpp:239
++msgid "Configure Color Profiles..."
++msgstr "Configurer les profils de couleurs ..."
++
++#: krandrtray.cpp:249
++msgid "Configure Shortcut Keys..."
++msgstr "Configurer les raccourcis clavier..."
++
++#: krandrtray.cpp:477
++msgid "Configure Display Color Profiles"
++msgstr "Configuration des profils de couleurs"
++
++#: krandrbindings.cpp:29
++msgid "Display Control"
++msgstr "Paramètres d'affichage"
++
++#: krandrbindings.cpp:31
++msgid "Switch Displays"
++msgstr "Permuter l'affichage"
++
++#: configdialog.cpp:49
++msgid "Global &Shortcuts"
++msgstr "Raccourcis Globaux"
+diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/ksmserver.po kde-i18n-fr-3.5.10/messages/kdebase/ksmserver.po
+--- kde-i18n-fr-3.5.10.ORI/messages/kdebase/ksmserver.po	2007-05-14 10:07:36.000000000 +0200
++++ kde-i18n-fr-3.5.10/messages/kdebase/ksmserver.po	2011-11-01 17:29:02.909615530 +0100
+@@ -92,3 +92,14 @@
+ "_: current option in boot loader\n"
+ " (current)"
+ msgstr " (courant)"
++
++### TDE 3.5.13 ###
++
++#: shutdown.cpp:202
++msgid "Synchronizing remote folders"
++msgstr "Synchronisation des dossiers distants"
++
++#: shutdown.cpp:207
++msgid "Saving your settings..."
++msgstr "Enregistrement de vos paramètres ..."
++
+diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/ksplash.po kde-i18n-fr-3.5.10/messages/kdebase/ksplash.po
+--- kde-i18n-fr-3.5.10.ORI/messages/kdebase/ksplash.po	2005-09-10 13:02:44.000000000 +0200
++++ kde-i18n-fr-3.5.10/messages/kdebase/ksplash.po	2011-11-01 17:03:49.799926756 +0100
+@@ -105,5 +105,5 @@
+ msgstr "Rétablissement de la session"
+ 
+ #: themeengine/objkstheme.cpp:135
+-msgid "KDE is up and running"
+-msgstr "KDE est prêt"
++msgid "Trinity is up and running"
++msgstr "Trinity est prêt"
+diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/Makefile.in kde-i18n-fr-3.5.10/messages/kdebase/Makefile.in
+--- kde-i18n-fr-3.5.10.ORI/messages/kdebase/Makefile.in	2008-08-20 09:14:47.000000000 +0200
++++ kde-i18n-fr-3.5.10/messages/kdebase/Makefile.in	2011-11-01 16:32:57.157386765 +0100
+@@ -192,8 +192,8 @@
+ SUBDIRS =.
+ #>- POFILES = AUTO
+ #>+ 2
+-POFILES = kio_sftp.po kate.po kjobviewer.po libkickermenu_konsole.po kcmkicker.po nsplugin.po display.po extensionproxy.po kdcop.po kcmbackground.po kstyle_keramik_config.po kcmlaunch.po kcminfo.po kcmkwinrules.po kasbarextension.po khtmlkttsd.po libdmctl.po ksplashthemes.po kgreet_classic.po kcontrol.po kmenuapplet.po kio_tar.po kcmview1394.po kcmbell.po kcmcomponentchooser.po kdmgreet.po kdesktop.po kpersonalizer.po ksplash.po kcmaccessibility.po kminipagerapplet.po kcmkded.po kio_remote.po kio_home.po kdeprintfax.po kcmicons.po filetypes.po kcmenergy.po kappfinder.po kthememanager.po kcmtaskbar.po kcmcgi.po kio_media.po libkickermenu_tom.po kio_finger.po ktip.po kaccess.po kio_pop3.po kdesud.po kio_fish.po kicker.po kcmkdnssd.po krdb.po libkickermenu_systemmenu.po kcmkio.po krunapplet.po kcmhtmlsearch.po kcmfonts.po libtaskbar.po useraccount.po knetattach.po kcmkonsole.po appletproxy.po dockbarextension.po kcmkonq.po kio_nntp.po kwriteconfig.po kio_ldap.po konsole.po kstart.po klipper.po kcmspellchecking.po kcmkurifilt.po kdepasswd.po clockapplet.po mediaapplet.po kdialog.po kcmlayout.po kpager.po kwin_clients.po kdebugdialog.po kcmnotify.po kio_nfs.po kcmprintmgr.po ksystemtrayapplet.po kcmxinerama.po kreadconfig.po kay.po libkickermenu_remotemenu.po lockout.po kcmkwindecoration.po kxkb.po kprinter.po libtaskmanager.po kio_system.po trashapplet.po kcmcrypto.po kcmnic.po privacy.po libkickermenu_kdeprint.po kscreensaver.po libkonq.po libkickermenu_recentdocs.po kmenuedit.po kio_trash.po kio_floppy.po krandr.po khotkeys.po kcmkclock.po kio_man.po ksystraycmd.po kcmsmartcard.po kwin.po libkicker.po khelpcenter.po ksmserver.po kgreet_winbind.po drkonqi.po kwin_lib.po kio_settings.po ksysguard.po kfontinst.po kcmscreensaver.po konqueror.po kdesu.po kcmsmserver.po kcmcolors.po kcminput.po kcmlocale.po kio_print.po kickermenu_kate.po kcmstyle.po kcmkeys.po kcmioslaveinfo.po kfmclient.po kfindpart.po kio_mac.po kio_smb.po kcmmedia.po naughtyapplet.po kcmkwm.po htmlsearch.po kcmcss.po kcmusb.po kcmperformance.po kio_thumbnail.po kcmarts.po libkickermenu_prefmenu.po joystick.po kdmconfig.po kcmaccess.po kcmkonqhtml.po quicklauncher.po kcmsamba.po kdeprint_part.po kio_smtp.po
+-GMOFILES = kio_sftp.gmo kate.gmo kjobviewer.gmo libkickermenu_konsole.gmo kcmkicker.gmo nsplugin.gmo display.gmo extensionproxy.gmo kdcop.gmo kcmbackground.gmo kstyle_keramik_config.gmo kcmlaunch.gmo kcminfo.gmo kcmkwinrules.gmo kasbarextension.gmo khtmlkttsd.gmo libdmctl.gmo ksplashthemes.gmo kgreet_classic.gmo kcontrol.gmo kmenuapplet.gmo kio_tar.gmo kcmview1394.gmo kcmbell.gmo kcmcomponentchooser.gmo kdmgreet.gmo kdesktop.gmo kpersonalizer.gmo ksplash.gmo kcmaccessibility.gmo kminipagerapplet.gmo kcmkded.gmo kio_remote.gmo kio_home.gmo kdeprintfax.gmo kcmicons.gmo filetypes.gmo kcmenergy.gmo kappfinder.gmo kthememanager.gmo kcmtaskbar.gmo kcmcgi.gmo kio_media.gmo libkickermenu_tom.gmo kio_finger.gmo ktip.gmo kaccess.gmo kio_pop3.gmo kdesud.gmo kio_fish.gmo kicker.gmo kcmkdnssd.gmo krdb.gmo libkickermenu_systemmenu.gmo kcmkio.gmo krunapplet.gmo kcmhtmlsearch.gmo kcmfonts.gmo libtaskbar.gmo useraccount.gmo knetattach.gmo kcmkonsole.gmo appletproxy.gmo dockbarextension.gmo kcmkonq.gmo kio_nntp.gmo kwriteconfig.gmo kio_ldap.gmo konsole.gmo kstart.gmo klipper.gmo kcmspellchecking.gmo kcmkurifilt.gmo kdepasswd.gmo clockapplet.gmo mediaapplet.gmo kdialog.gmo kcmlayout.gmo kpager.gmo kwin_clients.gmo kdebugdialog.gmo kcmnotify.gmo kio_nfs.gmo kcmprintmgr.gmo ksystemtrayapplet.gmo kcmxinerama.gmo kreadconfig.gmo kay.gmo libkickermenu_remotemenu.gmo lockout.gmo kcmkwindecoration.gmo kxkb.gmo kprinter.gmo libtaskmanager.gmo kio_system.gmo trashapplet.gmo kcmcrypto.gmo kcmnic.gmo privacy.gmo libkickermenu_kdeprint.gmo kscreensaver.gmo libkonq.gmo libkickermenu_recentdocs.gmo kmenuedit.gmo kio_trash.gmo kio_floppy.gmo krandr.gmo khotkeys.gmo kcmkclock.gmo kio_man.gmo ksystraycmd.gmo kcmsmartcard.gmo kwin.gmo libkicker.gmo khelpcenter.gmo ksmserver.gmo kgreet_winbind.gmo drkonqi.gmo kwin_lib.gmo kio_settings.gmo ksysguard.gmo kfontinst.gmo kcmscreensaver.gmo konqueror.gmo kdesu.gmo kcmsmserver.gmo kcmcolors.gmo kcminput.gmo kcmlocale.gmo kio_print.gmo kickermenu_kate.gmo kcmstyle.gmo kcmkeys.gmo kcmioslaveinfo.gmo kfmclient.gmo kfindpart.gmo kio_mac.gmo kio_smb.gmo kcmmedia.gmo naughtyapplet.gmo kcmkwm.gmo htmlsearch.gmo kcmcss.gmo kcmusb.gmo kcmperformance.gmo kio_thumbnail.gmo kcmarts.gmo libkickermenu_prefmenu.gmo joystick.gmo kdmconfig.gmo kcmaccess.gmo kcmkonqhtml.gmo quicklauncher.gmo kcmsamba.gmo kdeprint_part.gmo kio_smtp.gmo
++POFILES = kio_sftp.po kate.po kjobviewer.po libkickermenu_konsole.po kcmkicker.po nsplugin.po display.po extensionproxy.po kdcop.po kcmbackground.po kstyle_keramik_config.po kcmlaunch.po kcminfo.po kcmkwinrules.po kasbarextension.po khtmlkttsd.po libdmctl.po ksplashthemes.po kgreet_classic.po kcontrol.po kmenuapplet.po kio_tar.po kcmview1394.po kcmbell.po kcmcomponentchooser.po kdmgreet.po kdesktop.po kpersonalizer.po ksplash.po kcmaccessibility.po kminipagerapplet.po kcmkded.po kio_remote.po kio_home.po kdeprintfax.po kcmicons.po filetypes.po kcmenergy.po kappfinder.po kthememanager.po kcmtaskbar.po kcmcgi.po kio_media.po libkickermenu_tom.po kio_finger.po ktip.po kaccess.po kio_pop3.po kdesud.po kio_fish.po kicker.po kcmkdnssd.po krdb.po libkickermenu_systemmenu.po kcmkio.po krunapplet.po kcmhtmlsearch.po kcmfonts.po libtaskbar.po useraccount.po knetattach.po kcmkonsole.po appletproxy.po dockbarextension.po kcmkonq.po kio_nntp.po kwriteconfig.po kio_ldap.po konsole.po kstart.po klipper.po kcmspellchecking.po kcmkurifilt.po kdepasswd.po clockapplet.po mediaapplet.po kdialog.po kcmlayout.po kpager.po kwin_clients.po kdebugdialog.po kcmnotify.po kio_nfs.po kcmprintmgr.po ksystemtrayapplet.po kcmxinerama.po kreadconfig.po kay.po libkickermenu_remotemenu.po lockout.po kcmkwindecoration.po kxkb.po kprinter.po libtaskmanager.po kio_system.po trashapplet.po kcmcrypto.po kcmnic.po privacy.po libkickermenu_kdeprint.po kscreensaver.po libkonq.po libkickermenu_recentdocs.po kmenuedit.po kio_trash.po kio_floppy.po krandr.po khotkeys.po kcmkclock.po kio_man.po ksystraycmd.po kcmsmartcard.po kwin.po libkicker.po khelpcenter.po ksmserver.po kgreet_winbind.po drkonqi.po kwin_lib.po kio_settings.po ksysguard.po kfontinst.po kcmscreensaver.po konqueror.po kdesu.po kcmsmserver.po kcmcolors.po kcminput.po kcmlocale.po kio_print.po kickermenu_kate.po kcmstyle.po kcmkeys.po kcmioslaveinfo.po kfmclient.po kfindpart.po kio_mac.po kio_smb.po kcmmedia.po naughtyapplet.po kcmkwm.po htmlsearch.po kcmcss.po kcmusb.po kcmperformance.po kio_thumbnail.po kcmarts.po libkickermenu_prefmenu.po joystick.po kdmconfig.po kcmaccess.po kcmkonqhtml.po quicklauncher.po kcmsamba.po kdeprint_part.po kio_smtp.po kcmiccconfig.po
++GMOFILES = kio_sftp.gmo kate.gmo kjobviewer.gmo libkickermenu_konsole.gmo kcmkicker.gmo nsplugin.gmo display.gmo extensionproxy.gmo kdcop.gmo kcmbackground.gmo kstyle_keramik_config.gmo kcmlaunch.gmo kcminfo.gmo kcmkwinrules.gmo kasbarextension.gmo khtmlkttsd.gmo libdmctl.gmo ksplashthemes.gmo kgreet_classic.gmo kcontrol.gmo kmenuapplet.gmo kio_tar.gmo kcmview1394.gmo kcmbell.gmo kcmcomponentchooser.gmo kdmgreet.gmo kdesktop.gmo kpersonalizer.gmo ksplash.gmo kcmaccessibility.gmo kminipagerapplet.gmo kcmkded.gmo kio_remote.gmo kio_home.gmo kdeprintfax.gmo kcmicons.gmo filetypes.gmo kcmenergy.gmo kappfinder.gmo kthememanager.gmo kcmtaskbar.gmo kcmcgi.gmo kio_media.gmo libkickermenu_tom.gmo kio_finger.gmo ktip.gmo kaccess.gmo kio_pop3.gmo kdesud.gmo kio_fish.gmo kicker.gmo kcmkdnssd.gmo krdb.gmo libkickermenu_systemmenu.gmo kcmkio.gmo krunapplet.gmo kcmhtmlsearch.gmo kcmfonts.gmo libtaskbar.gmo useraccount.gmo knetattach.gmo kcmkonsole.gmo appletproxy.gmo dockbarextension.gmo kcmkonq.gmo kio_nntp.gmo kwriteconfig.gmo kio_ldap.gmo konsole.gmo kstart.gmo klipper.gmo kcmspellchecking.gmo kcmkurifilt.gmo kdepasswd.gmo clockapplet.gmo mediaapplet.gmo kdialog.gmo kcmlayout.gmo kpager.gmo kwin_clients.gmo kdebugdialog.gmo kcmnotify.gmo kio_nfs.gmo kcmprintmgr.gmo ksystemtrayapplet.gmo kcmxinerama.gmo kreadconfig.gmo kay.gmo libkickermenu_remotemenu.gmo lockout.gmo kcmkwindecoration.gmo kxkb.gmo kprinter.gmo libtaskmanager.gmo kio_system.gmo trashapplet.gmo kcmcrypto.gmo kcmnic.gmo privacy.gmo libkickermenu_kdeprint.gmo kscreensaver.gmo libkonq.gmo libkickermenu_recentdocs.gmo kmenuedit.gmo kio_trash.gmo kio_floppy.gmo krandr.gmo khotkeys.gmo kcmkclock.gmo kio_man.gmo ksystraycmd.gmo kcmsmartcard.gmo kwin.gmo libkicker.gmo khelpcenter.gmo ksmserver.gmo kgreet_winbind.gmo drkonqi.gmo kwin_lib.gmo kio_settings.gmo ksysguard.gmo kfontinst.gmo kcmscreensaver.gmo konqueror.gmo kdesu.gmo kcmsmserver.gmo kcmcolors.gmo kcminput.gmo kcmlocale.gmo kio_print.gmo kickermenu_kate.gmo kcmstyle.gmo kcmkeys.gmo kcmioslaveinfo.gmo kfmclient.gmo kfindpart.gmo kio_mac.gmo kio_smb.gmo kcmmedia.gmo naughtyapplet.gmo kcmkwm.gmo htmlsearch.gmo kcmcss.gmo kcmusb.gmo kcmperformance.gmo kio_thumbnail.gmo kcmarts.gmo libkickermenu_prefmenu.gmo joystick.gmo kdmconfig.gmo kcmaccess.gmo kcmkonqhtml.gmo quicklauncher.gmo kcmsamba.gmo kdeprint_part.gmo kio_smtp.gmo kcmiccconfig.gmo
+ #>- all: all-recursive
+ #>+ 1
+ all: all-nls docs-am  all-recursive
+@@ -531,7 +531,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=libkickermenu_remotemenu.po appletproxy.po kcminput.po kcmaccessibility.po krandr.po kickermenu_kate.po kwin.po libtaskmanager.po libkickermenu_tom.po kappfinder.po dockbarextension.po kcmmedia.po filetypes.po kreadconfig.po kio_smtp.po ksplashthemes.po kcmcolors.po display.po kfmclient.po kate.po kcmnotify.po libkonq.po kstyle_keramik_config.po privacy.po kxkb.po kio_finger.po kcontrol.po konqueror.po kcmsamba.po ksmserver.po mediaapplet.po kcmenergy.po kdeprintfax.po kcmview1394.po kio_tar.po kcmxinerama.po libkickermenu_systemmenu.po kjobviewer.po kio_mac.po kcmkwindecoration.po ksplash.po kio_nfs.po ksystemtrayapplet.po htmlsearch.po kwin_lib.po kthememanager.po klipper.po kaccess.po kdepasswd.po kicker.po khtmlkttsd.po kwriteconfig.po kcmkonsole.po kmenuapplet.po kmenuedit.po kcmsmartcard.po kcmkeys.po kcmcgi.po kcmkclock.po Makefile.in kdesu.po kcmstyle.po kcmhtmlsearch.po kcminfo.po kdialog.po kcmcrypto.po libkickermenu_prefmenu.po kio_media.po kminipagerapplet.po kcmkonqhtml.po kcmaccess.po ksysguard.po kdesktop.po kio_floppy.po kcmnic.po kio_nntp.po kdmconfig.po trashapplet.po extensionproxy.po kio_ldap.po ktip.po kcmusb.po kcmperformance.po kdebugdialog.po khotkeys.po kgreet_winbind.po kio_smb.po libkickermenu_kdeprint.po kdmgreet.po knetattach.po nsplugin.po kcmcss.po kio_sftp.po kcmkio.po kcmfonts.po useraccount.po kcmkwm.po kwin_clients.po kio_settings.po libkickermenu_recentdocs.po kdcop.po kcmkdnssd.po libtaskbar.po kcmkurifilt.po kio_pop3.po joystick.po libkicker.po krunapplet.po kcmbackground.po lockout.po kcmkwinrules.po libdmctl.po krdb.po kio_home.po kdesud.po kcmioslaveinfo.po kio_remote.po kgreet_classic.po konsole.po libkickermenu_konsole.po kcmkonq.po kcmspellchecking.po kcmprintmgr.po kio_thumbnail.po kcmbell.po kdeprint_part.po kcmcomponentchooser.po kcmlocale.po kcmarts.po kasbarextension.po kio_system.po kay.po kscreensaver.po khelpcenter.po kprinter.po kpager.po drkonqi.po kcmscreensaver.po kcmlaunch.po kstart.po kcmlayout.po kfindpart.po kio_print.po kcmicons.po quicklauncher.po kio_fish.po clockapplet.po ksystraycmd.po kcmkicker.po kio_trash.po kfontinst.po kcmtaskbar.po naughtyapplet.po Makefile.am kio_man.po kpersonalizer.po kcmkded.po kcmsmserver.po 
++KDE_DIST=libkickermenu_remotemenu.po appletproxy.po kcminput.po kcmaccessibility.po krandr.po kickermenu_kate.po kwin.po libtaskmanager.po libkickermenu_tom.po kappfinder.po dockbarextension.po kcmmedia.po filetypes.po kreadconfig.po kio_smtp.po ksplashthemes.po kcmcolors.po display.po kfmclient.po kate.po kcmnotify.po libkonq.po kstyle_keramik_config.po privacy.po kxkb.po kio_finger.po kcontrol.po konqueror.po kcmsamba.po ksmserver.po mediaapplet.po kcmenergy.po kdeprintfax.po kcmview1394.po kio_tar.po kcmxinerama.po libkickermenu_systemmenu.po kjobviewer.po kio_mac.po kcmkwindecoration.po ksplash.po kio_nfs.po ksystemtrayapplet.po htmlsearch.po kwin_lib.po kthememanager.po klipper.po kaccess.po kdepasswd.po kicker.po khtmlkttsd.po kwriteconfig.po kcmkonsole.po kmenuapplet.po kmenuedit.po kcmsmartcard.po kcmkeys.po kcmcgi.po kcmkclock.po Makefile.in kdesu.po kcmstyle.po kcmhtmlsearch.po kcminfo.po kdialog.po kcmcrypto.po libkickermenu_prefmenu.po kio_media.po kminipagerapplet.po kcmkonqhtml.po kcmaccess.po ksysguard.po kdesktop.po kio_floppy.po kcmnic.po kio_nntp.po kdmconfig.po trashapplet.po extensionproxy.po kio_ldap.po ktip.po kcmusb.po kcmperformance.po kdebugdialog.po khotkeys.po kgreet_winbind.po kio_smb.po libkickermenu_kdeprint.po kdmgreet.po knetattach.po nsplugin.po kcmcss.po kio_sftp.po kcmkio.po kcmfonts.po useraccount.po kcmkwm.po kwin_clients.po kio_settings.po libkickermenu_recentdocs.po kdcop.po kcmkdnssd.po libtaskbar.po kcmkurifilt.po kio_pop3.po joystick.po libkicker.po krunapplet.po kcmbackground.po lockout.po kcmkwinrules.po libdmctl.po krdb.po kio_home.po kdesud.po kcmioslaveinfo.po kio_remote.po kgreet_classic.po konsole.po libkickermenu_konsole.po kcmkonq.po kcmspellchecking.po kcmprintmgr.po kio_thumbnail.po kcmbell.po kdeprint_part.po kcmcomponentchooser.po kcmlocale.po kcmarts.po kasbarextension.po kio_system.po kay.po kscreensaver.po khelpcenter.po kprinter.po kpager.po drkonqi.po kcmscreensaver.po kcmlaunch.po kstart.po kcmlayout.po kfindpart.po kio_print.po kcmicons.po quicklauncher.po kio_fish.po clockapplet.po ksystraycmd.po kcmkicker.po kio_trash.po kfontinst.po kcmtaskbar.po naughtyapplet.po Makefile.am kio_man.po kpersonalizer.po kcmkded.po kcmsmserver.po kcmiccconfig.po
+ 
+ #>+ 469
+ kio_sftp.gmo: kio_sftp.po
+@@ -1002,15 +1002,18 @@
+ kio_smtp.gmo: kio_smtp.po
+ 	rm -f kio_smtp.gmo; $(GMSGFMT) -o kio_smtp.gmo $(srcdir)/kio_smtp.po
+ 	test ! -f kio_smtp.gmo || touch kio_smtp.gmo
++kcmiccconfig.gmo: kcmiccconfig.po
++	rm -f kcmiccconfig.gmo; $(GMSGFMT) -o kcmiccconfig.gmo $(srcdir)/kcmiccconfig.po
++	test ! -f kcmiccconfig.gmo || touch kcmiccconfig.gmo
+ 
+ #>+ 3
+ clean-nls:
+-	-rm -f  kio_sftp.gmo kate.gmo kjobviewer.gmo libkickermenu_konsole.gmo kcmkicker.gmo nsplugin.gmo display.gmo extensionproxy.gmo kdcop.gmo kcmbackground.gmo kstyle_keramik_config.gmo kcmlaunch.gmo kcminfo.gmo kcmkwinrules.gmo kasbarextension.gmo khtmlkttsd.gmo libdmctl.gmo ksplashthemes.gmo kgreet_classic.gmo kcontrol.gmo kmenuapplet.gmo kio_tar.gmo kcmview1394.gmo kcmbell.gmo kcmcomponentchooser.gmo kdmgreet.gmo kdesktop.gmo kpersonalizer.gmo ksplash.gmo kcmaccessibility.gmo kminipagerapplet.gmo kcmkded.gmo kio_remote.gmo kio_home.gmo kdeprintfax.gmo kcmicons.gmo filetypes.gmo kcmenergy.gmo kappfinder.gmo kthememanager.gmo kcmtaskbar.gmo kcmcgi.gmo kio_media.gmo libkickermenu_tom.gmo kio_finger.gmo ktip.gmo kaccess.gmo kio_pop3.gmo kdesud.gmo kio_fish.gmo kicker.gmo kcmkdnssd.gmo krdb.gmo libkickermenu_systemmenu.gmo kcmkio.gmo krunapplet.gmo kcmhtmlsearch.gmo kcmfonts.gmo libtaskbar.gmo useraccount.gmo knetattach.gmo kcmkonsole.gmo appletproxy.gmo dockbarextension.gmo kcmkonq.gmo kio_nntp.gmo kwriteconfig.gmo kio_ldap.gmo konsole.gmo kstart.gmo klipper.gmo kcmspellchecking.gmo kcmkurifilt.gmo kdepasswd.gmo clockapplet.gmo mediaapplet.gmo kdialog.gmo kcmlayout.gmo kpager.gmo kwin_clients.gmo kdebugdialog.gmo kcmnotify.gmo kio_nfs.gmo kcmprintmgr.gmo ksystemtrayapplet.gmo kcmxinerama.gmo kreadconfig.gmo kay.gmo libkickermenu_remotemenu.gmo lockout.gmo kcmkwindecoration.gmo kxkb.gmo kprinter.gmo libtaskmanager.gmo kio_system.gmo trashapplet.gmo kcmcrypto.gmo kcmnic.gmo privacy.gmo libkickermenu_kdeprint.gmo kscreensaver.gmo libkonq.gmo libkickermenu_recentdocs.gmo kmenuedit.gmo kio_trash.gmo kio_floppy.gmo krandr.gmo khotkeys.gmo kcmkclock.gmo kio_man.gmo ksystraycmd.gmo kcmsmartcard.gmo kwin.gmo libkicker.gmo khelpcenter.gmo ksmserver.gmo kgreet_winbind.gmo drkonqi.gmo kwin_lib.gmo kio_settings.gmo ksysguard.gmo kfontinst.gmo kcmscreensaver.gmo konqueror.gmo kdesu.gmo kcmsmserver.gmo kcmcolors.gmo kcminput.gmo kcmlocale.gmo kio_print.gmo kickermenu_kate.gmo kcmstyle.gmo kcmkeys.gmo kcmioslaveinfo.gmo kfmclient.gmo kfindpart.gmo kio_mac.gmo kio_smb.gmo kcmmedia.gmo naughtyapplet.gmo kcmkwm.gmo htmlsearch.gmo kcmcss.gmo kcmusb.gmo kcmperformance.gmo kio_thumbnail.gmo kcmarts.gmo libkickermenu_prefmenu.gmo joystick.gmo kdmconfig.gmo kcmaccess.gmo kcmkonqhtml.gmo quicklauncher.gmo kcmsamba.gmo kdeprint_part.gmo kio_smtp.gmo
++	-rm -f  kio_sftp.gmo kate.gmo kjobviewer.gmo libkickermenu_konsole.gmo kcmkicker.gmo nsplugin.gmo display.gmo extensionproxy.gmo kdcop.gmo kcmbackground.gmo kstyle_keramik_config.gmo kcmlaunch.gmo kcminfo.gmo kcmkwinrules.gmo kasbarextension.gmo khtmlkttsd.gmo libdmctl.gmo ksplashthemes.gmo kgreet_classic.gmo kcontrol.gmo kmenuapplet.gmo kio_tar.gmo kcmview1394.gmo kcmbell.gmo kcmcomponentchooser.gmo kdmgreet.gmo kdesktop.gmo kpersonalizer.gmo ksplash.gmo kcmaccessibility.gmo kminipagerapplet.gmo kcmkded.gmo kio_remote.gmo kio_home.gmo kdeprintfax.gmo kcmicons.gmo filetypes.gmo kcmenergy.gmo kappfinder.gmo kthememanager.gmo kcmtaskbar.gmo kcmcgi.gmo kio_media.gmo libkickermenu_tom.gmo kio_finger.gmo ktip.gmo kaccess.gmo kio_pop3.gmo kdesud.gmo kio_fish.gmo kicker.gmo kcmkdnssd.gmo krdb.gmo libkickermenu_systemmenu.gmo kcmkio.gmo krunapplet.gmo kcmhtmlsearch.gmo kcmfonts.gmo libtaskbar.gmo useraccount.gmo knetattach.gmo kcmkonsole.gmo appletproxy.gmo dockbarextension.gmo kcmkonq.gmo kio_nntp.gmo kwriteconfig.gmo kio_ldap.gmo konsole.gmo kstart.gmo klipper.gmo kcmspellchecking.gmo kcmkurifilt.gmo kdepasswd.gmo clockapplet.gmo mediaapplet.gmo kdialog.gmo kcmlayout.gmo kpager.gmo kwin_clients.gmo kdebugdialog.gmo kcmnotify.gmo kio_nfs.gmo kcmprintmgr.gmo ksystemtrayapplet.gmo kcmxinerama.gmo kreadconfig.gmo kay.gmo libkickermenu_remotemenu.gmo lockout.gmo kcmkwindecoration.gmo kxkb.gmo kprinter.gmo libtaskmanager.gmo kio_system.gmo trashapplet.gmo kcmcrypto.gmo kcmnic.gmo privacy.gmo libkickermenu_kdeprint.gmo kscreensaver.gmo libkonq.gmo libkickermenu_recentdocs.gmo kmenuedit.gmo kio_trash.gmo kio_floppy.gmo krandr.gmo khotkeys.gmo kcmkclock.gmo kio_man.gmo ksystraycmd.gmo kcmsmartcard.gmo kwin.gmo libkicker.gmo khelpcenter.gmo ksmserver.gmo kgreet_winbind.gmo drkonqi.gmo kwin_lib.gmo kio_settings.gmo ksysguard.gmo kfontinst.gmo kcmscreensaver.gmo konqueror.gmo kdesu.gmo kcmsmserver.gmo kcmcolors.gmo kcminput.gmo kcmlocale.gmo kio_print.gmo kickermenu_kate.gmo kcmstyle.gmo kcmkeys.gmo kcmioslaveinfo.gmo kfmclient.gmo kfindpart.gmo kio_mac.gmo kio_smb.gmo kcmmedia.gmo naughtyapplet.gmo kcmkwm.gmo htmlsearch.gmo kcmcss.gmo kcmusb.gmo kcmperformance.gmo kio_thumbnail.gmo kcmarts.gmo libkickermenu_prefmenu.gmo joystick.gmo kdmconfig.gmo kcmaccess.gmo kcmkonqhtml.gmo quicklauncher.gmo kcmsamba.gmo kdeprint_part.gmo kio_smtp.gmo kcmiccconfig.gmo
+ 
+ #>+ 10
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES
+-	@for base in kio_sftp kate kjobviewer libkickermenu_konsole kcmkicker nsplugin display extensionproxy kdcop kcmbackground kstyle_keramik_config kcmlaunch kcminfo kcmkwinrules kasbarextension khtmlkttsd libdmctl ksplashthemes kgreet_classic kcontrol kmenuapplet kio_tar kcmview1394 kcmbell kcmcomponentchooser kdmgreet kdesktop kpersonalizer ksplash kcmaccessibility kminipagerapplet kcmkded kio_remote kio_home kdeprintfax kcmicons filetypes kcmenergy kappfinder kthememanager kcmtaskbar kcmcgi kio_media libkickermenu_tom kio_finger ktip kaccess kio_pop3 kdesud kio_fish kicker kcmkdnssd krdb libkickermenu_systemmenu kcmkio krunapplet kcmhtmlsearch kcmfonts libtaskbar useraccount knetattach kcmkonsole appletproxy dockbarextension kcmkonq kio_nntp kwriteconfig kio_ldap konsole kstart klipper kcmspellchecking kcmkurifilt kdepasswd clockapplet mediaapplet kdialog kcmlayout kpager kwin_clients kdebugdialog kcmnotify kio_nfs kcmprintmgr ksystemtrayapplet kcmxinerama kreadconfig kay libkickermenu_remotemenu lockout kcmkwindecoration kxkb kprinter libtaskmanager kio_system trashapplet kcmcrypto kcmnic privacy libkickermenu_kdeprint kscreensaver libkonq libkickermenu_recentdocs kmenuedit kio_trash kio_floppy krandr khotkeys kcmkclock kio_man ksystraycmd kcmsmartcard kwin libkicker khelpcenter ksmserver kgreet_winbind drkonqi kwin_lib kio_settings ksysguard kfontinst kcmscreensaver konqueror kdesu kcmsmserver kcmcolors kcminput kcmlocale kio_print kickermenu_kate kcmstyle kcmkeys kcmioslaveinfo kfmclient kfindpart kio_mac kio_smb kcmmedia naughtyapplet kcmkwm htmlsearch kcmcss kcmusb kcmperformance kio_thumbnail kcmarts libkickermenu_prefmenu joystick kdmconfig kcmaccess kcmkonqhtml quicklauncher kcmsamba kdeprint_part kio_smtp ; do \
++	@for base in kio_sftp kate kjobviewer libkickermenu_konsole kcmkicker nsplugin display extensionproxy kdcop kcmbackground kstyle_keramik_config kcmlaunch kcminfo kcmkwinrules kasbarextension khtmlkttsd libdmctl ksplashthemes kgreet_classic kcontrol kmenuapplet kio_tar kcmview1394 kcmbell kcmcomponentchooser kdmgreet kdesktop kpersonalizer ksplash kcmaccessibility kminipagerapplet kcmkded kio_remote kio_home kdeprintfax kcmicons filetypes kcmenergy kappfinder kthememanager kcmtaskbar kcmcgi kio_media libkickermenu_tom kio_finger ktip kaccess kio_pop3 kdesud kio_fish kicker kcmkdnssd krdb libkickermenu_systemmenu kcmkio krunapplet kcmhtmlsearch kcmfonts libtaskbar useraccount knetattach kcmkonsole appletproxy dockbarextension kcmkonq kio_nntp kwriteconfig kio_ldap konsole kstart klipper kcmspellchecking kcmkurifilt kdepasswd clockapplet mediaapplet kdialog kcmlayout kpager kwin_clients kdebugdialog kcmnotify kio_nfs kcmprintmgr ksystemtrayapplet kcmxinerama kreadconfig kay libkickermenu_remotemenu lockout kcmkwindecoration kxkb kprinter libtaskmanager kio_system trashapplet kcmcrypto kcmnic privacy libkickermenu_kdeprint kscreensaver libkonq libkickermenu_recentdocs kmenuedit kio_trash kio_floppy krandr khotkeys kcmkclock kio_man ksystraycmd kcmsmartcard kwin libkicker khelpcenter ksmserver kgreet_winbind drkonqi kwin_lib kio_settings ksysguard kfontinst kcmscreensaver konqueror kdesu kcmsmserver kcmcolors kcminput kcmlocale kio_print kickermenu_kate kcmstyle kcmkeys kcmioslaveinfo kfmclient kfindpart kio_mac kio_smb kcmmedia naughtyapplet kcmkwm htmlsearch kcmcss kcmusb kcmperformance kio_thumbnail kcmarts libkickermenu_prefmenu joystick kdmconfig kcmaccess kcmkonqhtml quicklauncher kcmsamba kdeprint_part kio_smtp kcmiccconfig ; do \
+ 	  echo $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/$$base.mo ;\
+ 	  if test -f $$base.gmo; then $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/$$base.mo ;\
+ 	  elif test -f $(srcdir)/$$base.gmo; then $(INSTALL_DATA) $(srcdir)/$$base.gmo $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/$$base.mo ;\
+@@ -1176,6 +1179,7 @@
+ 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmsamba.mo
+ 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kdeprint_part.mo
+ 	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kio_smtp.mo
++	rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmiccconfig.mo
+ 
+ #>+ 2
+ all-nls: $(GMOFILES)
+diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdelibs/kdelibs.po kde-i18n-fr-3.5.10/messages/kdelibs/kdelibs.po
+--- kde-i18n-fr-3.5.10.ORI/messages/kdelibs/kdelibs.po	2008-08-19 20:29:58.000000000 +0200
++++ kde-i18n-fr-3.5.10/messages/kdelibs/kdelibs.po	2011-11-01 17:02:35.529386462 +0100
+@@ -5557,123 +5557,104 @@
+ 
+ #: kdeui/kaboutkde.cpp:34
+ msgid ""
+-"The <b>K Desktop Environment</b> is written and maintained by the KDE Team, a "
+-"world-wide network of software engineers committed to <a "
++"The <b>Trinity Desktop Environment</b> is a fork of the "
++"K Desktop Environment version 3.5, which was originally written by the KDE Team, "
++"a world-wide network of software engineers committed to <a "
+ "href=\"http://www.gnu.org/philosophy/free-sw.html\">Free Software</a> "
+-"development."
+-"<br>"
+-"<br>No single group, company or organization controls the KDE source code. "
+-"Everyone is welcome to contribute to KDE."
+-"<br>"
+-"<br>Visit <A HREF=\"http://www.kde.org/\">http://www.kde.org</A> "
++"development.<br><br>No single group, company or organization controls the "
++"Trinity source code. Everyone is welcome to contribute to Trinity.<br><br>Visit <A "
++"HREF=\"http://www.trinitydesktop.org/\">http://www.trinitydesktop.org</A> for more information "
++"about Trinity, and <A HREF=\"http://www.kde.org/\">http://www.kde.org</A> "
+ "for more information on the KDE project. "
+ msgstr ""
+-"L'<b>Environnement Bureautique KDE</b> est écrit et maintenu par l'équipe de "
+-"KDE, des informaticiens du monde entier travaillant sur Internet au "
+-"développement de <a href=\"http://www.gnu.org/philosophy/free-sw.fr.html\">"
+-"logiciels libres</a>."
+-"<br>"
+-"<br>Aucune société ni organisation ne contrôle le code source de KDE, et chacun "
+-"est invité à y contribuer."
+-"<br>"
+-"<br>Visitez <a href=\"http://www.kde.org/fr\">http://www.kde.org/fr</A> "
++"L'<b>Environnement Bureautique Trinity</b> est un clone de l'environnement "
++"KDE version 3.5, originellement écrit par l'équipe KDE, des informaticiens "
++"du monde entier travaillant sur Internet au développement de <a "
++"href=\"http://www.gnu.org/philosophy/free-sw.fr.html\">logiciels libres</a>."
++"<br><br>Aucune société ni organisation ne contrôle le code source de Trinity, et chacun "
++"est invité à y contribuer.<br><br>Visitez <A HREF=\"http://www.trinitydesktop.org/\">"
++"http://www.trinitydesktop.org</A> pour plus d'informations sur Trinity, et <a "
++"href=\"http://www.kde.org/fr\">http://www.kde.org/fr</A> "
+ "pour plus d'informations sur le projet KDE."
+ 
+ #: kdeui/kaboutkde.cpp:43
+ msgid ""
+-"Software can always be improved, and the KDE Team is ready to do so. However, "
+-"you - the user - must tell us when something does not work as expected or could "
+-"be done better."
+-"<br>"
+-"<br>The K Desktop Environment has a bug tracking system. Visit <A "
+-"HREF=\"http://bugs.kde.org/\">http://bugs.kde.org</A> "
+-"or use the \"Report Bug...\" dialog from the \"Help\" menu to report bugs."
+-"<br>"
+-"<br>If you have a suggestion for improvement then you are welcome to use the "
+-"bug tracking system to register your wish. Make sure you use the severity "
+-"called \"Wishlist\"."
++"Software can always be improved, and the Trinity Team is ready to "
++"do so. However, you - the user - must tell us when "
++"something does not work as expected or could be done better.<br><br>"
++"The Trinity Desktop Environment has a bug tracking system. Visit "
++"<A HREF=\"http://bugs.pearsoncomputing.net/\">http://bugs.pearsoncomputing.net</A> or "
++"use the \"Report Bug...\" dialog from the \"Help\" menu to report bugs.<br><br>"
++"If you have a suggestion for improvement then you are welcome to use "
++"the bug tracking system to register your wish. Make sure you use the "
++"severity called \"Wishlist\"."
+ msgstr ""
+-"Les logiciels peuvent toujours être améliorés et l'équipe KDE est prête à le "
++"Les logiciels peuvent toujours être améliorés et l'équipe Trinity est prête à le "
+ "faire. Cependant, vous - l'utilisateur(trice) - devez nous signaler ce qui ne "
+-"fonctionne pas correctement ou pourrait être perfectionné."
+-"<br>"
+-"<br>L'Environnement de Bureau KDE possède un système de suivi des bogues. Allez "
+-"sur <A HREF=\"http://bugs.kde.org/\">http://bugs.kde.org/</A> "
+-"ou utilisez la boîte de dialogue « Rapport de bogue » du menu « Aide » pour "
+-"signaler les erreurs."
+-"<br>"
+-"<br>Si vous voulez suggérer une amélioration, vous êtes invité(e) à utiliser le "
++"fonctionne pas correctement ou pourrait être perfectionné.<br><br>"
++"L'Environnement de Bureau Trinity possède un système de suivi des bogues. Allez "
++"sur <A HREF=\"http://bugs.pearsoncomputing.net/\">http://bugs.pearsoncomputing.net</A> "
++"ou utilisez la boîte de dialogue « Rapport de bogue » du menu « Aide » pour signaler les "
++"erreurs.<br><br>Si vous voulez suggérer une amélioration, vous êtes invité(e) à utiliser le "
+ "système de suivi des bogues pour enregistrer votre souhait. Assurez-vous "
+ "d'avoir utilisé l'option « Souhait » (wish)."
+ 
+ #: kdeui/kaboutkde.cpp:54
+ msgid ""
+-"You do not have to be a software developer to be a member of the KDE team. You "
+-"can join the national teams that translate program interfaces. You can provide "
+-"graphics, themes, sounds, and improved documentation. You decide!"
+-"<br>"
+-"<br>Visit <A HREF=\"http://www.kde.org/jobs/\">http://www.kde.org/jobs/</A> "
++"You do not have to be a software developer to be a member of the "
++"Trinity team. You can join the national teams that translate "
++"program interfaces. You can provide graphics, themes, sounds, and "
++"improved documentation. You decide!"
++"<br><br>"
++"Visit "
++"<A HREF=\"http://www.trinitydesktop.org/jobs/\">http://www.trinitydesktop.org/jobs/</A> "
+ "for information on some projects in which you can participate."
+-"<br>"
+-"<br>If you need more information or documentation, then a visit to <A "
+-"HREF=\"http://developer.kde.org/\">http://developer.kde.org</A> "
++"<br><br>"
++"If you need more information or documentation, then a visit to "
++"<A HREF=\"http://www.trinitydesktop.org/docs/\">http://www.trinitydesktop.org/docs/</A> "
+ "will provide you with what you need."
+ msgstr ""
+-"Il n'est pas nécessaire d'être programmeur pour être membre de l'équipe de KDE. "
++"Il n'est pas nécessaire d'être programmeur pour être membre de l'équipe de Trinity. "
+ "Vous pouvez rejoindre les équipes nationales qui traduisent les interfaces des "
+ "programmes. Vous pouvez réaliser des images, des thèmes, des sons et des "
+ "documentations enrichies. C'est vous qui décidez !"
+-"<br>"
+-"<br>Visitez <A HREF=\"http://www.kde.org/fr/jobs.html\">"
+-"http://www.kde.org/fr/jobs.html</A> pour des informations sur certains projets "
+-"auxquels vous pouvez participer."
+-"<br>"
+-"<br>Pour plus d'informations ou de documentations, une visite de <A "
+-"HREF=\"http://developer.kde.org/\">http://developer.kde.org/</A> "
++"<br><br>"
++"Visitez "
++"<A HREF=\"http://www.trinitydesktop.org/jobs/\">http://www.trinitydesktop.org/jobs/</A>"
++"pour des informations sur certains projets auxquels vous pouvez participer."
++"<br><br>"
++"Pour plus d'informations ou de documentations, une visite de <A "
++"HREF=\"http://www.trinitydesktop.org/docs/\">http://www.trinitydesktop.org/docs/</A> "
+ "devrait vous fournir ce dont vous avez besoin."
+ 
+ #: kdeui/kaboutkde.cpp:67
+ msgid ""
+-"KDE is available free of charge, but making it is not free."
+-"<br>"
+-"<br>Thus, the KDE team formed the KDE e.V., a non-profit organization legally "
+-"founded in Tuebingen, Germany. The KDE e.V. represents the KDE project in legal "
+-"and financial matters. See <a href=\"http://www.kde-ev.org/\">"
+-"http://www.kde-ev.org</a> for information on the KDE e.V."
+-"<br>"
+-"<br>The KDE team does need financial support. Most of the money is used to "
+-"reimburse members and others on expenses they experienced when contributing to "
+-"KDE. You are encouraged to support KDE through a financial donation, using one "
+-"of the ways described at <a href=\"http://www.kde.org/support/\">"
+-"http://www.kde.org/support/</a>."
+-"<br>"
+-"<br>Thank you very much in advance for your support."
+-msgstr ""
+-"KDE est disponible gratuitement, mais sa réalisation a un coût."
+-"<br>"
+-"<br>C'est pourquoi l'équipe de KDE a formé l'association KDE, une association à "
+-"but non lucratif fondée à Tübingen (Allemagne). L'association KDE représente "
+-"les aspects juridiques et financiers du Projet KDE. Consultez <a "
+-"href=\"http://www.kde-ev.org\">http://www.kde-ev.org/</a> "
+-"pour plus d'informations sur l'association KDE."
+-"<br>"
+-"<br>L'équipe de KDE a besoin d'un appui financier. La majeure partie de ses "
++"Trinity is available free of charge, but making it is not free.<br><br>"
++"<br><br>"
++"The Trinity team does need financial support. Most of the money is used to "
++"reimburse members and others on expenses they experienced when "
++"contributing to Trinity. You are encouraged to support Trinity through a financial "
++"donation, using one of the ways described at "
++"<a href=\"http://www.trinitydesktop.org/donate.php\">http://www.trinitydesktop.org/donate.php</a>."
++"<br><br>Thank you very much in advance for your support!"
++msgstr ""
++"Trinity est disponible gratuitement, mais sa réalisation a un coût."
++"<br><br>"
++"<br>L'équipe de Trinity a besoin d'un appui financier. La majeure partie de ses "
+ "fonds sert à rembourser les membres et d'autres intervenants des dépenses "
+-"qu'ils ont engagées lors de leur contribution à KDE. Pour apporter votre "
+-"participation financière à KDE, utilisez l'une des possibilités décrites à "
+-"l'adresse <a "
+-"href=\"http://www.kde.org/support/\">http://www.kde.org/support/</a>."
+-"<br>"
+-"<br>Nous vous remercions vivement de votre soutien."
++"qu'ils ont engagées lors de leur contribution à Trinity. Pour apporter votre "
++"participation financière à Trinity, utilisez l'une des possibilités décrites à "
++"l'adresse <a href=\"http://www.trinitydesktop.org/donate.php\">http://www.trinitydesktop.org/donate.php</a>."
++"<br><br>Nous vous remercions vivement de votre soutien."
+ 
+ #: kdeui/kaboutkde.cpp:81
+ #, c-format
+-msgid "K Desktop Environment. Release %1"
+-msgstr "Environnement de bureau KDE. Version %1"
++msgid "Trinity Desktop Environment. Release %1"
++msgstr "Environnement de bureau Trinity. Version %1"
+ 
+ #: kdeui/kaboutkde.cpp:83
+ msgid ""
+-"_: About KDE\n"
++"About Trinity"
+ "&About"
+ msgstr "À &propos"
+ 
+@@ -5682,12 +5663,12 @@
+ msgstr "Rapport de bogues et &souhaits"
+ 
+ #: kdeui/kaboutkde.cpp:85
+-msgid "&Join the KDE Team"
+-msgstr "Re&joignez l'équipe de KDE"
++msgid "&Join the Trinity Team"
++msgstr "Re&joignez l'équipe de Trinity"
+ 
+ #: kdeui/kaboutkde.cpp:86
+-msgid "&Support KDE"
+-msgstr "&Soutenez KDE"
++msgid "&Support Trinity"
++msgstr "&Soutenez Trinity"
+ 
+ #: kdeui/kstdguiitem.cpp:110 khtml/java/kjavaappletserver.cpp:804
+ msgid "&Yes"
+@@ -6623,8 +6604,8 @@
+ msgstr "À &propos de : %1"
+ 
+ #: kdeui/khelpmenu.cpp:176 kdeui/kstdaction_p.h:114
+-msgid "About &KDE"
+-msgstr "À propos de &KDE"
++msgid "About &Trinity"
++msgstr "À propos de &Trinity"
+ 
+ #: kdeui/kactionclasses.cpp:2072
+ msgid "Exit F&ull Screen Mode"
diff --git a/redhat/kde-i18n/trinity-kde-i18n-3.5.13.spec b/redhat/kde-i18n/trinity-kde-i18n-3.5.13.spec
new file mode 100644
index 000000000..16484c0ed
--- /dev/null
+++ b/redhat/kde-i18n/trinity-kde-i18n-3.5.13.spec
@@ -0,0 +1,1241 @@
+# Default version for this component
+%if "%{?version}" == ""
+%define version 3.5.13
+%endif
+%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
+
+# Builds all supported languages (not unsupported ones)
+%if "%{?KDE_LANGS}" == ""
+%define KDE_LANGS ar bg bn ca cs da de el en_GB es et fi fr he hi hu is it ja lt nl nb nn pa pl pt pt_BR ro ru sk sl sr sv ta tr uk zh_CN zh_TW
+%endif
+
+
+Name:		trinity-kde-i18n
+Summary:	Internationalization support for Trinity
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+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)
+
+# GFDL, with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+License:	GFDL
+Group:		User Interface/Desktops
+BuildArch:	noarch
+
+# Speed build options
+%define debug_package %{nil}
+%define __spec_install_post %{nil}
+AutoReq: no
+
+Source0:	kde-i18n-%{version}.tar.gz
+
+# TDE 3.5.12: Translate 'kdesu' message was modified in 'kdebase' package
+Patch0:		kde-i18n-kdesu.patch
+
+# TDE 3.5.12: Translate 'Open Terminal Here' desktop shortcut
+Patch1:		trinity-kde-i18n-fr-openterminalhere.patch
+
+# TDE 3.5.13: French translations for new features
+Patch2:		kde-i18n-3.5.13-add_french_translations.patch
+
+BuildRequires:	findutils
+BuildRequires:	gettext
+BuildRequires:	trinity-arts-devel
+BuildRequires:	trinity-kdelibs-devel
+
+%description
+%{summary}.
+
+%package Afrikaans
+Summary: Afrikaans(af) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-af = %{version}-%{release}
+Requires: kde-filesystem
+%description Afrikaans
+%{summary}.
+
+%package Arabic 
+Summary: Arabic(ar) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-ar = %{version}-%{release}
+Requires: kde-filesystem
+%description Arabic
+%{summary}.
+
+%package Azerbaijani
+Summary: Azerbaijani(az) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-az = %{version}-%{release}
+Requires: kde-filesystem
+%description Azerbaijani
+%{summary}.
+
+%package Belarusian
+Summary: Belarusian(be) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-be = %{version}-%{release}
+Requires: kde-filesystem
+%description Belarusian
+%{summary}.
+
+%package Bulgarian
+Summary: Bulgarian(bg) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-bg = %{version}-%{release}
+Requires: kde-filesystem
+%description Bulgarian
+%{summary}.
+
+%package Bengali
+Summary: Bengali(bn) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-bn = %{version}-%{release}
+Requires: kde-filesystem
+%description Bengali
+%{summary}.
+
+%package Tibetan
+Summary: Tibetan(bo) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-bo = %{version}-%{release}
+Requires: kde-filesystem
+%description Tibetan
+%{summary}.
+
+%package Breton
+Summary: Breton(br) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-br = %{version}-%{release}
+Requires: kde-filesystem
+%description Breton
+%{summary}.
+
+%package Bosnian
+Summary: Bosnian(bs) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-bs = %{version}-%{release}
+Requires: kde-filesystem
+%description Bosnian
+%{summary}.
+
+%package Catalan
+Summary: Catalan(ca) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-ca = %{version}-%{release}
+Requires: kde-filesystem
+%description Catalan
+%{summary}.
+
+%package Czech
+Summary: Czech(cs) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-cs = %{version}-%{release}
+Requires: kde-filesystem
+%description Czech
+%{summary}.
+
+%package Cymraeg
+Summary: Cymraeg language support for KDE3
+Group: User Interface/Desktops
+Requires: kde-filesystem
+%description Cymraeg
+%{summary}.
+
+%package Welsh
+Summary: Welsh(cy) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-cy = %{version}-%{release}
+Requires: kde-filesystem
+%description Welsh
+%{summary}.
+
+%package Danish
+Summary: Danish(da) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-da = %{version}-%{release}
+Requires: kde-filesystem
+%description Danish
+%{summary}.
+
+%package German
+Summary: German(de) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-de = %{version}-%{release}
+Requires: kde-filesystem
+%description German
+%{summary}.
+
+%package Greek
+Summary: Greek(el) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-el = %{version}-%{release}
+Requires: kde-filesystem
+%description Greek
+%{summary}.
+
+%package British
+Summary: British(en_GB) English support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-en_GB = %{version}-%{release}
+Requires: kde-filesystem
+%description British
+%{summary}.
+
+%package Esperanto
+Summary: Esperanto(eo) support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-eo = %{version}-%{release}
+Requires: kde-filesystem
+%description Esperanto
+%{summary}.
+
+%package Spanish
+Summary: Spanish(es) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-es = %{version}-%{release}
+Requires: kde-filesystem
+%description Spanish
+%{summary}.
+
+%package Estonian
+Summary: Estonian(et) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-et = %{version}-%{release}
+Requires: kde-filesystem
+%description Estonian
+%{summary}.
+
+%package Basque
+Summary: Basque(eu) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-eu = %{version}-%{release}
+Requires: kde-filesystem
+%description Basque
+%{summary}.
+
+%package Farsi
+Summary: Farsi(fa) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-fa = %{version}-%{release}
+Requires: kde-filesystem
+%description Farsi
+%{summary}.
+
+%package Finnish
+Summary: Finnish(fi) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-fi = %{version}-%{release}
+Requires: kde-filesystem
+%description Finnish
+%{summary}.
+
+%package Faroese
+Summary: Faroese(fo) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-fo = %{version}-%{release}
+Requires: kde-filesystem
+%description Faroese
+%{summary}.
+
+%package French
+Summary: French(fr) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-fr = %{version}-%{release}
+Requires: kde-filesystem
+%description French
+%{summary}.
+
+%package Frisian
+Summary: Frisian(fy) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-fy = %{version}-%{release}
+Requires: kde-filesystem
+%description Frisian
+%{summary}.
+
+%package Irish
+Summary: Irish(ga) language support for KDE3
+Group: User Interface/Desktops
+Obsoletes: kde-i18n-Gaeilge < %{version}
+Provides: %{name}-ga = %{version}-%{release}
+Requires: kde-filesystem
+%description Irish
+%{summary}.
+
+%package Galician
+Summary: Galician(gl) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-gl = %{version}-%{release}
+Requires: kde-filesystem
+%description Galician
+%{summary}.
+
+%package Hebrew
+Summary: Hebrew(he) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-he = %{version}-%{release}
+Requires: kde-filesystem
+%description Hebrew
+%{summary}.
+
+%package Hindi
+Summary: Hindi(hi) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-hi = %{version}-%{release}
+Requires: kde-filesystem
+%description Hindi
+%{summary}.
+
+%package Croatian
+Summary: Croatian(hr) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-hr = %{version}-%{release}
+Requires: kde-filesystem
+%description Croatian
+%{summary}.
+
+%package Hungarian
+Summary: Hungarian(hu) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-hu = %{version}-%{release}
+Requires: kde-filesystem
+%description Hungarian
+%{summary}.
+
+%package Indonesian
+Summary: Indonesian(id) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-id = %{version}-%{release}
+Requires: kde-filesystem
+%description Indonesian
+%{summary}.
+
+%package Icelandic
+Summary: Icelandic(is) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-is = %{version}-%{release}
+Requires: kde-filesystem
+%description Icelandic
+%{summary}.
+
+%package Italian
+Summary: Italian(it) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-it = %{version}-%{release}
+Requires: kde-filesystem
+%description Italian
+%{summary}.
+
+%package Japanese
+Summary: Japanese(ja) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-ja = %{version}-%{release}
+Requires: kde-filesystem
+%description Japanese
+%{summary}.
+
+%package Korean
+Summary: Korean(ko) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-ko = %{version}-%{release}
+Requires: kde-filesystem
+%description Korean
+%{summary}.
+
+%package Kurdish
+Summary: Kurdish(ku) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-ku = %{version}-%{release}
+Requires: kde-filesystem
+%description Kurdish
+%{summary}.
+
+%package Lao
+Summary: Lao(lo) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-lo = %{version}-%{release}
+Requires: kde-filesystem
+%description Lao
+%{summary}.
+
+%package Lithuanian
+Summary: Lithuanian(lt) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-lt = %{version}-%{release}
+Requires: kde-filesystem
+%description Lithuanian
+%{summary}.
+
+%package Latvian
+Summary: Latvian(lv) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-lv = %{version}-%{release}
+Requires: kde-filesystem
+%description Latvian
+%{summary}.
+
+%package Maori
+Summary: Maori(mi) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-mi = %{version}-%{release}
+Requires: kde-filesystem
+%description Maori
+%{summary}.
+
+%package Macedonian
+Summary: Macedonian(mk) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-mk = %{version}-%{release}
+Requires: kde-filesystem
+%description Macedonian
+%{summary}.
+
+%package Maltese
+Summary: Maltese(mt) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-mt = %{version}-%{release}
+Requires: kde-filesystem
+%description Maltese
+%{summary}.
+
+%package Dutch
+Summary: Dutch(nl) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-nl = %{version}-%{release}
+Requires: kde-filesystem
+%description Dutch
+%{summary}.
+
+%package Norwegian
+Summary: Norwegian(no) (Bokmaal) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-no = %{version}-%{release}
+Requires: kde-filesystem
+%description Norwegian
+%{summary}.
+
+%package Norwegian-Nynorsk
+Summary: Norwegian(nn) (Nynorsk) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-nn = %{version}-%{release}
+Requires: kde-filesystem
+%description Norwegian-Nynorsk
+%{summary}.
+
+%package Occitan
+Summary: Occitan(oc) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-oc = %{version}-%{release}
+Requires: kde-filesystem
+%description Occitan
+%{summary}.
+
+%package Polish
+Summary: Polish(pl) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-pl = %{version}-%{release}
+Requires: kde-filesystem
+%description Polish
+%{summary}.
+
+%package Portuguese
+Summary: Portuguese(pt) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-pt = %{version}-%{release}
+Requires: kde-filesystem
+%description Portuguese
+%{summary}.
+
+%package Punjabi
+Summary: Punjabi(pa) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-pa = %{version}-%{release}
+Requires: kde-filesystem
+%description Punjabi
+%{summary}.
+
+%package Brazil
+Summary: Brazil(pt_BR) Portuguese language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-pt_BR = %{version}-%{release}
+Requires: kde-filesystem
+%description Brazil
+%{summary}.
+
+%package Romanian
+Summary: Romanian(ro) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-ro = %{version}-%{release}
+Requires: kde-filesystem
+%description Romanian
+%{summary}.
+
+%package Russian
+Summary: Russian(ru) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-ru = %{version}-%{release}
+Requires: kde-filesystem
+%description Russian
+%{summary}.
+
+%package Slovak
+Summary: Slovak(sk) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-sk = %{version}-%{release}
+Requires: kde-filesystem
+%description Slovak
+%{summary}.
+
+%package Slovenian
+Summary: Slovenian(sl) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-sl = %{version}-%{release}
+Requires: kde-filesystem
+%description Slovenian
+%{summary}.
+
+%package Serbian
+Summary: Serbian(sr) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-sr = %{version}-%{release}
+Requires: kde-filesystem
+%description Serbian
+%{summary}.
+
+%package Swedish
+Summary: Swedish(sv) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-sv = %{version}-%{release}
+Requires: kde-filesystem
+%description Swedish
+%{summary}.
+
+%package Tamil
+Summary: Tamil(ta) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-ta = %{version}-%{release}
+Requires: kde-filesystem
+%description Tamil
+%{summary}.
+
+%package Tajik
+Summary: Tajik(tg) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-tg = %{version}-%{release}
+Requires: kde-filesystem
+%description Tajik
+%{summary}.
+
+%package Thai
+Summary: Thai(th) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-th = %{version}-%{release}
+Requires: kde-filesystem
+%description Thai
+%{summary}.
+
+%package Turkish
+Summary: Turkish(tr) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-tr = %{version}-%{release}
+Requires: kde-filesystem
+%description Turkish
+%{summary}.
+
+%package Ukrainian
+Summary: Ukrainian(uk) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-uk = %{version}-%{release}
+Requires: kde-filesystem
+%description Ukrainian
+%{summary}.
+
+%package Venda
+Summary: Venda(ven) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-ven = %{version}-%{release}
+Requires: kde-filesystem
+%description Venda
+%{summary}.
+
+%package Vietnamese
+Summary: Vietnamese(vi) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-vi = %{version}-%{release}
+Requires: kde-filesystem
+%description Vietnamese
+%{summary}.
+
+%package Walloon
+Summary: Walloon(wa) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-wa = %{version}-%{release}
+Requires: kde-filesystem
+%description Walloon
+%{summary}.
+
+%package Xhosa
+Summary: Xhosa(xh) (a Bantu language) support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-xh = %{version}-%{release}
+Requires: kde-filesystem
+%description Xhosa
+%{summary}.
+
+%package Chinese
+Summary: Chinese(zh_CN) (Simplified Chinese) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-zh_CN = %{version}-%{release}
+Requires: kde-filesystem
+%description Chinese
+%{summary}.
+
+%package Chinese-Big5
+Summary: Chinese(zh_TW) (Big5) language support for KDE3
+Group: User Interface/Desktops
+Provides: %{name}-tz_TW = %{version}-%{release}
+Requires: kde-filesystem
+%description Chinese-Big5
+%{summary}.
+
+
+
+%prep
+%setup -q -n kde-i18n
+
+for l in %{KDE_LANGS}; do
+  for f in kde-i18n-${l}-*.tar.bz2; do
+    tar xjf ${f}
+  done
+done
+
+%patch0
+%patch1
+%patch2
+
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+for l in %{KDE_LANGS}; do
+  for f in kde-i18n-${l}-*/; do
+    if [ -d "${f}" ] && [ -x "${f}/configure" ] ; then 
+      pushd ${f}
+      %configure --prefix=%{_prefix}
+      %{__make} %{?_smp_mflags}
+      popd
+    fi
+  done
+done
+
+%install
+rm -rf %{?buildroot}
+export PATH="%{_bindir}:${PATH}"
+
+for l in %{KDE_LANGS}; do
+  for f in kde-i18n-${l}-*/; do
+    if [ -d "${f}" ] && [ -r "${f}/Makefile" ] ; then 
+      pushd ${f}
+
+      # RHEL/Fedora: dirty hack to remove directory 'common' from install list (else it fails to install)
+      if [ -r docs/Makefile ]; then
+        sed -i docs/Makefile -e "s,^\(SUBDIRS =.*\)common\(.*\)$,\1 \2,"
+      fi
+
+      %__make install DESTDIR=%{?buildroot}
+      popd
+    fi
+  done
+done
+
+# make symlinks relative
+pushd %{buildroot}%{_docdir}/HTML
+for lang in *; do
+  if [ -d $lang ]; then
+    pushd $lang
+    for i in */*/*; do
+      if [ -d $i -a -L $i/common ]; then
+        rm -f $i/common
+        ln -sf ../../../docs/common $i
+      fi
+    done
+
+    for i in */*; do
+      if [ -d $i -a -L $i/common ]; then
+        rm -f $i/common
+        ln -sf ../../docs/common $i
+      fi
+    done
+
+    for i in *; do
+      if [ -d $i -a -L $i/common ]; then
+        rm -f $i/common
+        ln -sf ../docs/common $i
+      fi
+    done
+
+    popd
+  fi
+done
+popd   
+
+# remove zero-length file
+find %{buildroot}%{_docdir}/HTML -size 0 -exec rm -f {} \;
+
+# See http://fedoraproject.org/wiki/Languages (???)
+rm -f %{buildroot}%{_datadir}/locale/*/flag.png
+# And also the 'desktop.entry' (???)
+rm -f %{buildroot}%{_datadir}/locale/*/entry.desktop
+
+# remove obsolete KDE 3 application data translations
+rm -rf %{buildroot}%{_datadir}/apps
+
+%clean
+rm -rf %{buildroot}
+
+%if "%( grep -w af <<< '%{KDE_LANGS}' )" != ""
+%files Afrikaans
+%defattr(-,root,root,-)
+%lang(af) %{_datadir}/locale/af/LC_MESSAGES/*
+%lang(af) %{_datadir}/locale/af/charset
+%lang(af) %{_docdir}/HTML/af/
+%endif
+
+%if "%( grep -w ar <<< '%{KDE_LANGS}' )" != ""
+%files Arabic 
+%defattr(-,root,root,-)
+%lang(ar) %{_datadir}/locale/ar/LC_MESSAGES/*
+%lang(ar) %{_datadir}/locale/ar/charset
+%endif
+
+%if "%( grep -w az <<< '%{KDE_LANGS}' )" != ""
+%files Azerbaijani
+%defattr(-,root,root,-)
+%lang(az) %{_datadir}/locale/az/LC_MESSAGES/*
+%lang(az) %{_datadir}/locale/az/charset
+%endif
+
+%if "%( grep -w be <<< '%{KDE_LANGS}' )" != ""
+%files Belarusian
+%defattr(-,root,root,-)
+%lang(be) %{_datadir}/locale/be/LC_MESSAGES/*
+%lang(be) %{_datadir}/locale/be/charset
+%endif
+
+%if "%( grep -w bg <<< '%{KDE_LANGS}' )" != ""
+%files Bulgarian
+%defattr(-,root,root,-)
+%lang(bg) %{_datadir}/locale/bg/LC_MESSAGES/*
+%lang(bg) %{_datadir}/locale/bg/charset
+%endif
+
+%if "%( grep -w bn <<< '%{KDE_LANGS}' )" != ""
+%files Bengali
+%defattr(-,root,root,-)
+%lang(bn) %{_datadir}/locale/bn/LC_MESSAGES/*
+%lang(bn) %{_datadir}/locale/bn/charset
+%endif
+
+%if "%( grep -w bo <<< '%{KDE_LANGS}' )" != ""
+%files Tibetan
+%defattr(-,root,root,-)
+%lang(bo) %{_datadir}/locale/bo/LC_MESSAGES/*
+%lang(bo) %{_datadir}/locale/bo/charset
+%endif
+
+%if "%( grep -w br <<< '%{KDE_LANGS}' )" != ""
+%files Breton
+%defattr(-,root,root,-)
+%lang(br) %{_datadir}/locale/br/LC_MESSAGES/*
+%lang(br) %{_datadir}/locale/br/charset
+%endif
+
+%if "%( grep -w bs <<< '%{KDE_LANGS}' )" != ""
+%files Bosnian
+%defattr(-,root,root,-)
+%lang(bs) %{_datadir}/locale/bs/LC_MESSAGES/*
+%lang(bs) %{_datadir}/locale/bs/charset
+%endif
+
+%if "%( grep -w ca <<< '%{KDE_LANGS}' )" != ""
+%files Catalan
+%defattr(-,root,root,-)
+%lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/*
+%lang(ca) %{_datadir}/locale/ca/charset
+%lang(ca) %{_docdir}/HTML/ca/
+%endif
+
+%if "%( grep -w cs <<< '%{KDE_LANGS}' )" != ""
+%files Czech
+%defattr(-,root,root,-)
+%lang(cs) %{_datadir}/locale/cs/LC_MESSAGES/*
+%lang(cs) %{_datadir}/locale/cs/charset
+%lang(cs) %{_docdir}/HTML/cs/
+%endif
+
+%if "%( grep -w cy <<< '%{KDE_LANGS}' )" != ""
+%files Welsh
+%defattr(-,root,root,-)
+%lang(cy) %{_datadir}/locale/cy/LC_MESSAGES/*
+%lang(cy) %{_datadir}/locale/cy/charset
+%endif
+
+%if "%( grep -w da <<< '%{KDE_LANGS}' )" != ""
+%files Danish
+%defattr(-,root,root,-)
+%lang(da) %{_datadir}/locale/da/LC_MESSAGES/*
+%lang(da) %{_datadir}/locale/da/charset
+%lang(da) %{_datadir}/locale/da/da.compendium
+%lang(da) %{_docdir}/HTML/da/
+%endif
+
+%if "%( grep -w de <<< '%{KDE_LANGS}' )" != ""
+%files German
+%defattr(-,root,root,-)
+%lang(de) %{_datadir}/locale/de/LC_MESSAGES/*
+%lang(de) %{_datadir}/locale/de/charset
+%lang(de) %{_docdir}/HTML/de/
+%endif
+
+%if "%( grep -w el <<< '%{KDE_LANGS}' )" != ""
+%files Greek
+%defattr(-,root,root,-)
+%lang(el) %{_datadir}/locale/el/LC_MESSAGES/*
+%lang(el) %{_datadir}/locale/el/charset
+%endif
+
+%if "%( grep -w en_GB <<< '%{KDE_LANGS}' )" != ""
+%files British
+%defattr(-,root,root,-)
+%lang(en_GB) %{_datadir}/locale/en_GB/LC_MESSAGES/*
+%lang(en_GB) %{_datadir}/locale/en_GB/charset
+%lang(en_GB) %{_docdir}/HTML/en_GB/
+%endif
+
+%if "%( grep -w eo <<< '%{KDE_LANGS}' )" != ""
+%files Esperanto
+%defattr(-,root,root,-)
+%lang(eo) %{_datadir}/locale/eo/LC_MESSAGES/*
+%lang(eo) %{_datadir}/locale/eo/charset
+%endif
+
+%if "%( grep -w es <<< '%{KDE_LANGS}' )" != ""
+%files Spanish
+%defattr(-,root,root,-)
+%lang(es) %{_datadir}/locale/es/LC_MESSAGES/*
+%lang(es) %{_datadir}/locale/es/charset
+%lang(es) %{_docdir}/HTML/es/
+%endif
+
+%if "%( grep -w et <<< '%{KDE_LANGS}' )" != ""
+%files Estonian
+%defattr(-,root,root,-)
+%lang(et) %{_datadir}/locale/et/LC_MESSAGES/*
+%lang(et) %{_datadir}/locale/et/charset
+%lang(et) %{_docdir}/HTML/et/
+%endif
+
+%if "%( grep -w eu <<< '%{KDE_LANGS}' )" != ""
+%files Basque
+%defattr(-,root,root,-)
+%lang(eu) %{_datadir}/locale/eu/LC_MESSAGES/*
+%lang(eu) %{_datadir}/locale/eu/charset
+%endif
+
+%if "%( grep -w fa <<< '%{KDE_LANGS}' )" != ""
+%files Farsi
+%defattr(-,root,root,-)
+%lang(fa) %{_datadir}/locale/fa/LC_MESSAGES/*
+%lang(fa) %{_datadir}/locale/fa/charset
+%endif
+
+%if "%( grep -w fi <<< '%{KDE_LANGS}' )" != ""
+%files Finnish
+%defattr(-,root,root,-)
+%lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/*
+%lang(fi) %{_datadir}/locale/fi/charset
+%lang(fi) %{_docdir}/HTML/fi/
+%endif
+
+%if "%( grep -w fo <<< '%{KDE_LANGS}' )" != ""
+%files Faroese
+%defattr(-,root,root,-)
+%lang(fo) %{_datadir}/locale/fo/LC_MESSAGES/*
+%lang(fo) %{_datadir}/locale/fo/charset
+%endif
+
+%if "%( grep -w fr <<< '%{KDE_LANGS}' )" != ""
+%files French
+%defattr(-,root,root,-)
+%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/*
+%lang(fr) %{_datadir}/locale/fr/charset
+%lang(fr) %{_datadir}/locale/fr/nbsp_gui_fr.txt
+%lang(fr) %{_datadir}/locale/fr/relecture_*
+%lang(fr) %{_docdir}/HTML/fr/
+%endif
+
+%if "%( grep -w fy <<< '%{KDE_LANGS}' )" != ""
+%files Frisian
+%defattr(-,root,root,-)
+%lang(fy) %{_datadir}/locale/fy/LC_MESSAGES/*
+%lang(fy) %{_datadir}/locale/fy/charset
+%endif
+
+%if "%( grep -w ga <<< '%{KDE_LANGS}' )" != ""
+%files Irish
+%defattr(-,root,root,-)
+%lang(ga) %{_datadir}/locale/ga/LC_MESSAGES/*
+%lang(ga) %{_datadir}/locale/ga/charset
+%endif
+
+%if "%( grep -w gl <<< '%{KDE_LANGS}' )" != ""
+%files Galician
+%defattr(-,root,root,-)
+%lang(gl) %{_datadir}/locale/gl/LC_MESSAGES/*
+%lang(gl) %{_datadir}/locale/gl/charset
+%endif
+
+%if "%( grep -w he <<< '%{KDE_LANGS}' )" != ""
+%files Hebrew
+%defattr(-,root,root,-)
+%lang(he) %{_datadir}/locale/he/LC_MESSAGES/*
+%lang(he) %{_datadir}/locale/he/charset
+%lang(he) %{_docdir}/HTML/he/
+%endif
+
+%if "%( grep -w hi <<< '%{KDE_LANGS}' )" != ""
+%files Hindi
+%defattr(-,root,root,-)
+%lang(hi) %{_datadir}/locale/hi/LC_MESSAGES/*
+%lang(hi) %{_datadir}/locale/hi/charset
+%endif
+
+%if "%( grep -w hr <<< '%{KDE_LANGS}' )" != ""
+%files Croatian
+%defattr(-,root,root,-)
+%lang(hr) %{_datadir}/locale/hr/LC_MESSAGES/*
+%lang(hr) %{_datadir}/locale/hr/charset
+%lang(hr) %{_docdir}/HTML/hr/
+%endif
+
+%if "%( grep -w hu <<< '%{KDE_LANGS}' )" != ""
+%files Hungarian
+%defattr(-,root,root,-)
+%lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/*
+%lang(hu) %{_datadir}/locale/hu/charset
+%lang(hu) %{_docdir}/HTML/hu/
+%endif
+
+%if "%( grep -w id <<< '%{KDE_LANGS}' )" != ""
+%files Indonesian
+%defattr(-,root,root,-)
+%lang(id) %{_datadir}/locale/id/LC_MESSAGES/*
+%lang(id) %{_datadir}/locale/id/charset
+%lang(id) %{_docdir}/HTML/id/
+%endif
+
+%if "%( grep -w is <<< '%{KDE_LANGS}' )" != ""
+%files Icelandic
+%defattr(-,root,root,-)
+%lang(is) %{_datadir}/locale/is/LC_MESSAGES/*
+%lang(is) %{_datadir}/locale/is/charset
+%endif
+
+%if "%( grep -w it <<< '%{KDE_LANGS}' )" != ""
+%files Italian
+%defattr(-,root,root,-)
+%lang(it) %{_datadir}/locale/it/LC_MESSAGES/*
+%lang(it) %{_datadir}/locale/it/charset
+%lang(it) %{_docdir}/HTML/it/
+%endif
+
+%if "%( grep -w ja <<< '%{KDE_LANGS}' )" != ""
+%files Japanese
+%defattr(-,root,root,-)
+%lang(ja) %{_datadir}/locale/ja/LC_MESSAGES/*
+%lang(ja) %{_datadir}/locale/ja/charset
+%lang(ja) %{_docdir}/HTML/ja/
+%endif
+
+%if "%( grep -w ko <<< '%{KDE_LANGS}' )" != ""
+%files Korean
+%defattr(-,root,root,-)
+%lang(ko) %{_datadir}/locale/ko/LC_MESSAGES/*
+%lang(ko) %{_datadir}/locale/ko/charset
+%lang(ko) %{_docdir}/HTML/ko/
+%endif
+
+%if "%( grep -w ku <<< '%{KDE_LANGS}' )" != ""
+%files Kurdish
+%defattr(-,root,root,-)
+%lang(ku) %{_datadir}/locale/ku/LC_MESSAGES/*
+%lang(ku) %{_datadir}/locale/ku/charset
+%lang(ku) %{_docdir}/HTML/ku/
+%endif
+
+%if "%( grep -w lao <<< '%{KDE_LANGS}' )" != ""
+%files Lao
+%defattr(-,root,root,-)
+%lang(lo) %{_datadir}/locale/lo/LC_MESSAGES/*
+%lang(lo) %{_datadir}/locale/lo/charset
+%lang(lo) %{_docdir}/HTML/lo/
+%endif
+
+%if "%( grep -w lt <<< '%{KDE_LANGS}' )" != ""
+%files Lithuanian
+%defattr(-,root,root,-)
+%lang(lt) %{_datadir}/locale/lt/LC_MESSAGES/*
+%lang(lt) %{_datadir}/locale/lt/charset
+%endif
+
+%if "%( grep -w lv <<< '%{KDE_LANGS}' )" != ""
+%files Latvian
+%defattr(-,root,root,-)
+%lang(lv) %{_datadir}/locale/lv/LC_MESSAGES/*
+%lang(lv) %{_datadir}/locale/lv/charset
+%endif
+
+%if "%( grep -w mi <<< '%{KDE_LANGS}' )" != ""
+%files Maori
+%defattr(-,root,root,-)
+%lang(mi) %{_datadir}/locale/mi/LC_MESSAGES/*
+%lang(mi) %{_datadir}/locale/mi/charset
+%endif
+
+%if "%( grep -w mk <<< '%{KDE_LANGS}' )" != ""
+%files Macedonian
+%defattr(-,root,root,-)
+%lang(mk) %{_datadir}/locale/mk/LC_MESSAGES/*
+%lang(mk) %{_datadir}/locale/mk/charset
+%endif
+
+%if "%( grep -w mt <<< '%{KDE_LANGS}' )" != ""
+%files Maltese
+%defattr(-,root,root,-)
+%lang(mt) %{_datadir}/locale/mt/LC_MESSAGES/*
+%lang(mt) %{_datadir}/locale/mt/charset
+%endif
+
+%if "%( grep -w nl <<< '%{KDE_LANGS}' )" != ""
+%files Dutch
+%defattr(-,root,root,-)
+%lang(nl) %{_datadir}/locale/nl/LC_MESSAGES/*
+%lang(nl) %{_datadir}/locale/nl/charset
+%lang(nl) %{_docdir}/HTML/nl/
+%endif
+
+%if "%( grep -w nb <<< '%{KDE_LANGS}' )" != ""
+%files Norwegian
+%defattr(-,root,root,-)
+%lang(nb) %{_datadir}/locale/nb/LC_MESSAGES/*
+%lang(nb) %{_datadir}/locale/nb/charset
+%lang(nb) %{_datadir}/locale/nb/README
+#%lang(nb) %{_docdir}/HTML/nb/
+%endif
+
+%if "%( grep -w nn <<< '%{KDE_LANGS}' )" != ""
+%files Norwegian-Nynorsk
+%defattr(-,root,root,-)
+%lang(nn) %{_datadir}/locale/nn/LC_MESSAGES/*
+%lang(nn) %{_datadir}/locale/nn/charset
+#%lang(nn) %{_docdir}/HTML/nn/
+%endif
+
+%if "%( grep -w oc <<< '%{KDE_LANGS}' )" != ""
+%files Occitan
+%defattr(-,root,root,-)
+%lang(oc) %{_datadir}/locale/oc/LC_MESSAGES/*
+%lang(oc) %{_datadir}/locale/oc/charset
+%endif
+
+%if "%( grep -w pa <<< '%{KDE_LANGS}' )" != ""
+%files Punjabi
+%defattr(-,root,root,-)
+%lang(pa) %{_datadir}/locale/pa/LC_MESSAGES/*
+%lang(pa) %{_datadir}/locale/pa/charset
+%endif
+
+%if "%( grep -w pl <<< '%{KDE_LANGS}' )" != ""
+%files Polish
+%defattr(-,root,root,-)
+%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/*
+%lang(pl) %{_datadir}/locale/pl/charset
+%lang(pl) %{_docdir}/HTML/pl/
+%endif
+
+%if "%( grep -w pt <<< '%{KDE_LANGS}' )" != ""
+%files Portuguese
+%defattr(-,root,root,-)
+%lang(pt) %{_datadir}/locale/pt/LC_MESSAGES/*
+%lang(pt) %{_datadir}/locale/pt/charset
+%lang(pt) %{_docdir}/HTML/pt/
+%endif
+
+%if "%( grep -w pt_BR <<< '%{KDE_LANGS}' )" != ""
+%files Brazil
+%defattr(-,root,root,-)
+%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/*
+%lang(pt_BR) %{_datadir}/locale/pt_BR/charset
+%lang(pt_BR) %{_docdir}/HTML/pt_BR/
+%endif
+
+%if "%( grep -w ro <<< '%{KDE_LANGS}' )" != ""
+%files Romanian
+%defattr(-,root,root,-)
+%lang(ro) %{_datadir}/locale/ro/LC_MESSAGES/*
+%lang(ro) %{_datadir}/locale/ro/charset
+%lang(ro) %{_docdir}/HTML/ro/
+%endif
+
+%if "%( grep -w ru <<< '%{KDE_LANGS}' )" != ""
+%files Russian
+%defattr(-,root,root,-)
+%lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/*
+%lang(ru) %{_datadir}/locale/ru/charset
+%lang(ru) %{_docdir}/HTML/ru/
+%endif
+
+%if "%( grep -w sk <<< '%{KDE_LANGS}' )" != ""
+%files Slovak
+%defattr(-,root,root,-)
+%lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/*
+%lang(sk) %{_datadir}/locale/sk/charset
+%lang(sk) %{_docdir}/HTML/sk/
+%endif
+
+%if "%( grep -w sl <<< '%{KDE_LANGS}' )" != ""
+%files Slovenian
+%defattr(-,root,root,-)
+%lang(sl) %{_datadir}/locale/sl/LC_MESSAGES/*
+%lang(sl) %{_datadir}/locale/sl/charset
+%lang(sl) %{_docdir}/HTML/sl/
+%endif
+
+%if "%( grep -w sr <<< '%{KDE_LANGS}' )" != ""
+%files Serbian
+%defattr(-,root,root,-)
+%lang(sr) %{_datadir}/locale/sr/LC_MESSAGES/*
+%lang(sr) %{_datadir}/locale/sr/charset
+%lang(sr) %{_docdir}/HTML/sr/
+%endif
+
+%if "%( grep -w sv <<< '%{KDE_LANGS}' )" != ""
+%files Swedish
+%defattr(-,root,root,-)
+%lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/*
+%lang(sv) %{_datadir}/locale/sv/charset
+%lang(sv) %{_docdir}/HTML/sv/
+%endif
+
+%if "%( grep -w ta <<< '%{KDE_LANGS}' )" != ""
+%files Tamil
+%defattr(-,root,root,-)
+%lang(ta) %{_datadir}/locale/ta/LC_MESSAGES/*
+%lang(ta) %{_datadir}/locale/ta/charset
+%endif
+
+%if "%( grep -w tg <<< '%{KDE_LANGS}' )" != ""
+%files Tajik
+%defattr(-,root,root,-)
+%lang(tg) %{_datadir}/locale/tg/LC_MESSAGES/*
+%lang(tg) %{_datadir}/locale/tg/charset
+%endif
+
+%if "%( grep -w th <<< '%{KDE_LANGS}' )" != ""
+%files Thai
+%defattr(-,root,root,-)
+%lang(th) %{_datadir}/locale/th/LC_MESSAGES/*
+%lang(th) %{_datadir}/locale/th/charset
+%endif
+
+%if "%( grep -w tr <<< '%{KDE_LANGS}' )" != ""
+%files Turkish
+%defattr(-,root,root,-)
+%lang(tr) %{_datadir}/locale/tr/LC_MESSAGES/*
+%lang(tr) %{_datadir}/locale/tr/charset
+%lang(tr) %{_docdir}/HTML/tr/
+%endif
+
+%if "%( grep -w uk <<< '%{KDE_LANGS}' )" != ""
+%files Ukrainian
+%defattr(-,root,root,-)
+%lang(uk) %{_docdir}/HTML/uk/
+%lang(uk) %{_datadir}/locale/uk/LC_MESSAGES/*
+%lang(uk) %{_datadir}/locale/uk/charset
+%endif
+
+%if "%( grep -w ven <<< '%{KDE_LANGS}' )" != ""
+%files Venda
+%defattr(-,root,root,-)
+%lang(ven) %{_datadir}/locale/ven/LC_MESSAGES/*
+%lang(ven) %{_datadir}/locale/ven/charset
+%endif
+
+%if "%( grep -w vi <<< '%{KDE_LANGS}' )" != ""
+%files Vietnamese
+%defattr(-,root,root,-)
+%lang(vi) %{_datadir}/locale/vi/LC_MESSAGES/*
+%lang(vi) %{_datadir}/locale/vi/charset
+%endif
+
+%if "%( grep -w wa <<< '%{KDE_LANGS}' )" != ""
+%files Walloon
+%defattr(-,root,root,-)
+%lang(wa) %{_datadir}/locale/wa/LC_MESSAGES/*
+%lang(wa) %{_datadir}/locale/wa/charset
+%endif
+
+%if "%( grep -w xh <<< '%{KDE_LANGS}' )" != ""
+%files Xhosa
+%defattr(-,root,root,-)
+%lang(xh) %{_datadir}/locale/xh/LC_MESSAGES/*
+%lang(xh) %{_datadir}/locale/xh/charset
+%lang(xh) %{_docdir}/HTML/xh/
+%endif
+
+%if "%( grep -w zh_CN <<< '%{KDE_LANGS}' )" != ""
+%files Chinese
+%defattr(-,root,root,-)
+%lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/*
+%lang(zh_CN) %{_datadir}/locale/zh_CN/charset
+%lang(zh_CN) %{_docdir}/HTML/zh_CN/
+%endif
+
+%if "%( grep -w zh_TW <<< '%{KDE_LANGS}' )" != ""
+%files Chinese-Big5
+%defattr(-,root,root,-)
+%lang(zh_TW) %{_datadir}/locale/zh_TW/LC_MESSAGES/*
+%lang(zh_TW) %{_datadir}/locale/zh_TW/charset
+%lang(zh_TW) %{_docdir}/HTML/zh_TW/
+%endif
+
+%changelog
+* Tue Nov 01 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
+- Add missing french translations for TDE 3.5.13
+
+* 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 Dec 19 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
+- Initial version (French language only)
+- Based on RHEL SPEC file 'kde-i18n'
+- Add 'patch0' to reflect modifications in 'kdesu' from 'kdebase' package
+- Import to GIT
diff --git a/redhat/kdeaccessibility/trinity-kdeaccessibility-3.5.13.spec b/redhat/kdeaccessibility/trinity-kdeaccessibility-3.5.13.spec
new file mode 100644
index 000000000..e996a7261
--- /dev/null
+++ b/redhat/kdeaccessibility/trinity-kdeaccessibility-3.5.13.spec
@@ -0,0 +1,192 @@
+# Default version for this component
+%if "%{?version}" == ""
+%define version 3.5.13
+%endif
+%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.12 specific building variables
+BuildRequires: cmake >= 2.8
+%define tde_docdir %{_docdir}/kde
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/trinity
+
+
+Summary: K Desktop Environment - Accessibility
+Name:    trinity-kdeaccessibility
+Version: %{?version}
+Release: %{?release}%{?dist}%{?_variant}
+
+License: GPLv2
+Group: User Interface/Desktops
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.trinitydesktop.org/
+
+Source0: kdeaccessibility-%{version}.tar.gz
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+
+Provides: kdeaccessibility3 = %{version}-%{release}
+
+Requires: trinity-kdelibs
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+
+BuildRequires: desktop-file-utils
+BuildRequires: trinity-kdelibs-devel
+BuildRequires: alsa-lib-devel
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
+BuildRequires: libXtst-devel
+%endif
+
+%description
+Included with this package are:
+* kmag, a screen magnifier,
+* kmousetool, a program for people whom it hurts to click the mouse,
+* kmouth, program that allows people who have lost their voice
+  to let their computer speak for them.
+
+%package devel
+Summary: Development files for %{name}
+Group:   Development/Libraries
+Provides: kdeaccessibility3-devel = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
+Requires: trinity-kdelibs-devel
+%description devel
+%{summary}.
+
+
+%prep
+%setup -q -n kdeaccessibility
+
+# 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 || : ; . /etc/profile.d/qt.sh
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%configure \
+  --includedir=%{tde_includedir} \
+  --disable-rpath \
+  --enable-new-ldflags \
+  --enable-closure \
+  --disable-debug --disable-warnings \
+  --enable-final \
+  --with-extra-includes=%{_includedir}/tqt
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+desktop-file-install \
+  --vendor="" \
+  --dir %{buildroot}%{_datadir}/applications/kde \
+  --delete-original \
+  %{buildroot}%{_datadir}/applnk/Applications/*.desktop ||:
+
+# file lists for locale
+%find_lang %{name} || touch %{name}.lang
+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 ] && ln -nsf ../common $i/common
+         done
+      popd
+    fi
+  done
+fi
+
+# rpmdocs
+for dir in kmag kmousetool ksayit kttsd ; do
+  for file in AUTHORS ChangeLog README TODO ; do
+    test -s  $dir/$file && install -p -m644 -D $dir/$file rpmdocs/$dir/$file
+  done
+done
+
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+/sbin/ldconfig ||:
+for icon_theme in mono hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun
+/sbin/ldconfig ||:
+for icon_theme in mono hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%doc COPYING
+%doc rpmdocs/*
+%{_bindir}/*
+%{_datadir}/applications/kde/*.desktop
+%{_datadir}/apps/*/
+%{_datadir}/config/*
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/icons/locolor/*/*/*
+%{_datadir}/icons/mono/
+%{_datadir}/icons/crystalsvg/*/*/*
+%{_datadir}/service*/*.desktop
+%{_libdir}/lib*.so.*
+%{_libdir}/*.la
+%{tde_libdir}/*
+
+# Misc docs
+%doc %lang(en) %{_docdir}/HTML/en/kmag
+%doc %lang(en) %{_docdir}/HTML/en/kmousetool
+%doc %lang(en) %{_docdir}/HTML/en/kmouth
+%doc %lang(en) %{_docdir}/HTML/en/kttsd
+
+
+%files devel
+%defattr(-,root,root,-)
+%{tde_includedir}/*
+%{_libdir}/lib*.so
+
+
+%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
+- Spec file based on Fedora 8 "kdeaccessibility-3.5.10-1"
diff --git a/redhat/kdeaddons/kdeaddons-3.5.3-sdl.patch b/redhat/kdeaddons/kdeaddons-3.5.3-sdl.patch
new file mode 100644
index 000000000..70e72dc96
--- /dev/null
+++ b/redhat/kdeaddons/kdeaddons-3.5.3-sdl.patch
@@ -0,0 +1,64 @@
+--- kdeaddons-3.5.3/noatun-plugins/tippercanoe/sdlwrap.cpp.than	2006-06-07 18:52:09.000000000 +0200
++++ kdeaddons-3.5.3/noatun-plugins/tippercanoe/sdlwrap.cpp	2006-06-07 18:54:06.000000000 +0200
+@@ -183,6 +183,7 @@
+ 	SDL_UpdateRect(surface, 0, 0, 0, 0);
+ }
+ 
++#if 0
+ int SdlScreen::winID(void)
+ {
+ 	SDL_SysWMinfo info;
+@@ -195,3 +196,4 @@
+ 	SDL_GetWMInfo(&info);
+ 	return info.info.x11.wmwindow;
+ }
++#endif
+--- kdeaddons-3.5.3/noatun-plugins/tippercanoe/main.cpp.than	2006-06-07 18:54:19.000000000 +0200
++++ kdeaddons-3.5.3/noatun-plugins/tippercanoe/main.cpp	2006-06-07 18:54:27.000000000 +0200
+@@ -112,7 +112,7 @@
+ {
+ 	time_t timer = time(NULL);
+ 
+-	printf("%u\n", static_cast<SdlScreen *>(screen)->winID());
++	//printf("%u\n", static_cast<SdlScreen *>(screen)->winID());
+ 	fflush(stdout);
+ 
+ 	int frames = 0;
+--- kdeaddons-3.5.3/noatun-plugins/tippercanoe/syna.h.than	2006-06-07 18:51:25.000000000 +0200
++++ kdeaddons-3.5.3/noatun-plugins/tippercanoe/syna.h	2006-06-07 18:51:56.000000000 +0200
+@@ -108,7 +108,7 @@
+ 	int  sizeUpdate();
+ 	bool inputUpdate(int &mouseX,int &mouseY,int &mouseButtons,char &keyHit);
+ 	void show();
+-	int winID();
++	//int winID();
+ };
+ 
+ // core
+--- kdeaddons-3.5.3/noatun-plugins/tyler/main.cpp.than	2006-06-07 18:54:38.000000000 +0200
++++ kdeaddons-3.5.3/noatun-plugins/tyler/main.cpp	2006-06-07 18:55:00.000000000 +0200
+@@ -52,6 +52,7 @@
+ SDL_Surface *screen;
+ }
+ 
++#if 0
+ int winID(void)
+ {
+ 	SDL_SysWMinfo info;
+@@ -61,6 +62,7 @@
+ 	SDL_GetWMInfo(&info);
+ 	return info.info.x11.wmwindow;
+ }
++#endif
+ 
+ int main(int, char **)
+ {
+@@ -74,7 +76,7 @@
+ 	access_mutex = SDL_CreateMutex();
+ 
+ 	init_renderer1();
+-	printf("%u\n", winID());
++	//printf("%u\n", winID());
+ 	fflush(stdout);
+ 	init_renderer2();
+ 	thread = SDL_CreateThread((int (*)(void *))renderer, NULL);
diff --git a/redhat/kdeaddons/metabar-fedora.tar.bz2 b/redhat/kdeaddons/metabar-fedora.tar.bz2
new file mode 100644
index 000000000..8a0cde35d
--- /dev/null
+++ b/redhat/kdeaddons/metabar-fedora.tar.bz2
diff --git a/redhat/kdeaddons/metabarrc b/redhat/kdeaddons/metabarrc
new file mode 100644
index 000000000..7eb9a453b
--- /dev/null
+++ b/redhat/kdeaddons/metabarrc
@@ -0,0 +1,7 @@
+[General]
+AnimateResize=false
+MaxActions=3
+MaxEntries=3
+ShowFrame=true
+ShowServicemenus=true
+Theme=fedora
diff --git a/redhat/kdeaddons/svn.patch b/redhat/kdeaddons/svn.patch
new file mode 100644
index 000000000..10fb2d8f6
--- /dev/null
+++ b/redhat/kdeaddons/svn.patch
diff --git a/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec b/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec
new file mode 100644
index 000000000..b5ed3eda0
--- /dev/null
+++ b/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec
@@ -0,0 +1,256 @@
+# Default version for this component
+%if "%{?version}" == ""
+%define version 3.5.13
+%endif
+%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-kdeaddons
+Summary: Trinity Desktop Environment - Plugins
+Version: %{?version}
+Release: %{?release}%{?dist}%{?_variant}
+
+License: GPLv2
+Group: User Interface/Desktops
+
+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: kdeaddons-%{version}.tar.gz
+Source1: metabar-fedora.tar.bz2
+Source2: metabarrc
+
+Patch3: kdeaddons-3.5.3-sdl.patch
+
+BuildRequires: trinity-kdebase-devel
+BuildRequires: trinity-kdegames-devel
+BuildRequires: trinity-kdemultimedia-devel
+BuildRequires: trinity-kdepim-devel
+BuildRequires: SDL-devel
+BuildRequires: alsa-lib-devel
+BuildRequires: openssl-devel
+BuildRequires: db4-devel
+BuildRequires: xmms-devel
+
+Requires: trinity-kdebase
+%if 0%{?fedora}
+# used in jpegorient (#312641)
+Requires: python-exif
+%endif
+Requires: which
+
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+
+Obsoletes: %{name}-xmms < %{version}-%{release}
+
+%description
+A collection of KDE Addons/Plugins, including: 
+* konq-plugins: akregator, babelfish, domtreeviewer, imagerotation, validators, webarchiver
+* kate (plugins) 
+* kicker-applets: kbinaryclock, kolourpicker, ktimemon, mediacontrol
+* knewsticker-scripts
+
+%package extras
+Group: User Interface/Desktops
+Summary: Extras packages from kdeaddons
+Requires: %{name} = %{version}-%{release}
+Requires: trinity-kdegames
+Obsoletes: %{name}-atlantikdesigner < %{version}-%{release}
+%description extras
+This package includes:
+* atlantikdesigner: game board designer
+* noatun-plugins
+
+
+%prep
+%setup -q -a 1 -n kdeaddons
+
+%patch3 -p1 -b .sdl
+
+# 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 || : ; . /etc/profile.d/qt.sh
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%if 0%{?fedora} > 0
+export CXXFLAGS="${CXXFLAGS} -fpermissive"
+%endif
+
+%configure \
+  --includedir=%{_includedir}/kde \
+  --disable-rpath \
+  --enable-new-ldflags \
+  --enable-closure \
+  --disable-debug --disable-warnings \
+  --disable-dependency-tracking --enable-final \
+  --with-extra-includes=%{_includedir}/tqt
+
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+# File lists for locale
+HTML_DIR=$(kde-config --expandvars --install html)
+touch %{name}.lang
+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
+
+# rpmdocs
+for dir in konq-plugins ; do
+  for file in AUTHORS ChangeLog README TODO ; do
+    test -s  "$dir/$file" && install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file"
+  done
+done
+
+# install fedora metabar theme
+cp -prf fedora %{buildroot}%{_datadir}/apps/metabar/themes
+install -m644 -p %{SOURCE2} %{buildroot}%{_datadir}/config/
+
+
+%post
+/sbin/ldconfig
+for f in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun
+/sbin/ldconfig
+for f in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%post extras
+touch --no-create %{_datadir}/icons/hicolor 2> /dev/null ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+
+%postun extras
+touch --no-create %{_datadir}/icons/hicolor 2> /dev/null ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%doc README
+%doc rpmdocs/*
+%{_bindir}/*
+%{tde_libdir}/*
+%{_datadir}/applications/kde/*
+%{_datadir}/applnk/.hidden/*
+%{_datadir}/apps/akregator/pics/*
+%{_datadir}/apps/domtreeviewer/
+%{_datadir}/apps/fsview/
+%{_datadir}/apps/imagerotation/
+%{_datadir}/apps/kaddressbook/*
+%{_datadir}/apps/kate/*
+%{_datadir}/apps/katepart/syntax/*
+%{_datadir}/apps/katexmltools
+# own dir so we don't need to Requires: kdenetwork too
+%dir %{_datadir}/apps/knewsticker
+%{_datadir}/apps/knewsticker/*
+%{_datadir}/apps/khtml/kpartplugins/*
+%{_datadir}/apps/konq*view/kpartplugins/*
+%{_datadir}/apps/konqueror/icons/*/*/*/*
+%dir %{_datadir}/apps/konqueror/kpartplugins/
+%{_datadir}/apps/konqueror/kpartplugins/*
+%{_datadir}/apps/konqueror/servicemenus/*
+%{_datadir}/apps/konqsidebartng/*/*
+%{_datadir}/apps/mediacontrol/
+%{_datadir}/apps/metabar/
+%{_datadir}/apps/microformat/
+#%{_datadir}/apps/noatun/*
+%{_datadir}/apps/kicker/applets/*
+%{_datadir}/apps/ksig/
+%{_datadir}/config*/*
+%{_datadir}/icons/crystalsvg/*/*/*
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/icons/locolor/*/*/*
+%{_datadir}/mimelnk/*/*
+%{_datadir}/service*/*
+%doc %lang(en) %{_docdir}/HTML/en/*/*
+
+# atlantikdesigner
+#%exclude %{_bindir}/atlantikdesigner
+#%exclude %{_datadir}/icons/hicolor/*/*/atlantikdesigner*
+#%exclude %{_datadir}/applications/kde/atlantikdesigner.desktop
+
+# noatun-plugins
+#%exclude %{_bindir}/noatun*
+#%exclude %{tde_libdir}/noatun*
+#%exclude %{_datadir}/apps/noatun/*
+
+
+%files extras
+%defattr(-,root,root,-)
+
+# atlantikdesigner
+%doc atlantikdesigner/TODO
+#%{_bindir}/atlantikdesigner
+%{_datadir}/apps/atlantikdesigner/
+#%{_datadir}/icons/hicolor/*/*/atlantikdesigner*
+#%{_datadir}/applications/kde/atlantikdesigner.desktop
+
+# noatun-plugins
+#%{_bindir}/noatun*
+#%{tde_libdir}/noatun*
+%{_datadir}/apps/noatun/*
+
+
+%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
+
+* Sat Oct 29 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
+- Import to GIT
+
diff --git a/redhat/kdeadmin/kpackagerc b/redhat/kdeadmin/kpackagerc
new file mode 100644
index 000000000..72be06d46
--- /dev/null
+++ b/redhat/kdeadmin/kpackagerc
@@ -0,0 +1,33 @@
+[Kpackage]
+BSD=false
+DEBAPT=false
+DEBDPKG=false
+KISS=false
+RPM=true
+SLACK=false
+
+[Rpm]
+Package_L_0_0=/mnt/cdrom/RedHat/RPMS
+Package_L_0_1=/mnt/cdrom/SRPMS
+Package_L_0_2=/usr/src/redhat/RPMS
+Package_L_0_3=/usr/src/redhat/SRPMS
+Package_L_0_4=ftp://ftp.redhat.com/pub/redhat/linux/updates/7.2/en
+Package_L_1_0=ftp://rhcontrib.bero.org/pub/rh-contrib/7.2/i386
+Package_L_1_1=ftp://rhcontrib.bero.org/pub/rh-contrib/7.2/noarch
+Package_L_1_2=ftp://rhcontrib.bero.org/pub/rh-contrib/7.2/SRPMS
+Package_S_0_0=0
+Package_S_0_1=0
+Package_S_0_2=1
+Package_S_0_3=0
+Package_S_0_4=1
+Package_S_1_0=0
+Package_S_1_1=0
+Package_S_1_2=0
+Package_U_0_0=1
+Pacakge_U_0_1=1
+Package_U_0_2=1
+Pacakge_U_0_3=1
+Package_U_0_4=0
+Package_U_1_0=0
+Package_U_1_1=0
+Package_U_1_2=0
diff --git a/redhat/kdeadmin/ksysvrc b/redhat/kdeadmin/ksysvrc
new file mode 100644
index 000000000..48754643d
--- /dev/null
+++ b/redhat/kdeadmin/ksysvrc
@@ -0,0 +1,8 @@
+[Other Settings]
+Configured=true
+[Path Settings]
+RunlevelPath=/etc/rc.d
+ScriptPath=/etc/rc.d/init.d
+[Runlevels]
+Show Runlevels=0,1,2,3,4,5,6
+
diff --git a/redhat/kdeadmin/kuser.pam b/redhat/kdeadmin/kuser.pam
new file mode 100644
index 000000000..30492636a
--- /dev/null
+++ b/redhat/kdeadmin/kuser.pam
@@ -0,0 +1,3 @@
+USER=root
+PROGRAM=/usr/sbin/kuser
+SESSION=true
diff --git a/redhat/kdeadmin/kuser.pamd b/redhat/kdeadmin/kuser.pamd
new file mode 100644
index 000000000..c7d67e332
--- /dev/null
+++ b/redhat/kdeadmin/kuser.pamd
@@ -0,0 +1,4 @@
+#%PAM-1.0
+auth		include		config-util
+account		include		config-util
+session		include		config-util
diff --git a/redhat/kdeadmin/kuserrc b/redhat/kdeadmin/kuserrc
new file mode 100644
index 000000000..baeb5a53b
--- /dev/null
+++ b/redhat/kdeadmin/kuserrc
@@ -0,0 +1,6 @@
+[template]
+copySkel=true
+createHomeDir=true
+homeBase=/home
+shell=/bin/bash
+userPrivateGroup=true
diff --git a/redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec b/redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec
new file mode 100644
index 000000000..abc5006ca
--- /dev/null
+++ b/redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec
@@ -0,0 +1,201 @@
+# Default version for this component
+%if "%{?version}" == ""
+%define version 3.5.13
+%endif
+%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.12 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}/kde
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/trinity
+
+
+%define console_helper 1
+
+Name:    trinity-kdeadmin
+Summary: Administrative tools for TDE
+Version: %{?version}
+Release: %{?release}%{?dist}%{?_variant}
+
+License: GPLv2
+Group:   User Interface/Desktops
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+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: kdeadmin-%{version}.tar.gz
+Source1: kuser.pam
+Source2: kuser.pamd
+Source5: kpackagerc
+Source6: ksysvrc
+Source7: kuserrc
+
+Requires: trinity-kdelibs
+Requires: pkgconfig
+%if 0%{?console_helper}
+Requires: usermode-gtk
+%endif
+
+BuildRequires: trinity-kdelibs-devel
+BuildRequires: rpm-devel
+
+%description
+The kdeadmin package includes administrative tools for the K Desktop
+Environment (KDE) including:
+kcron, kdat, knetworkconf, kpackage, ksysv, kuser.
+
+
+%prep
+%setup -q -n kdeadmin
+
+%if 0%{?rhel} > 1
+  echo 'DO_NOT_COMPILE="$DO_NOT_COMPILE kpackage"' >kpackage/configure.in.in
+  echo 'DO_NOT_COMPILE="$DO_NOT_COMPILE ksysv"' >ksysv/configure.in.in
+  echo 'DO_NOT_COMPILE="$DO_NOT_COMPILE kuser"' >kuser/configure.in.in
+  echo 'DO_NOT_COMPILE="$DO_NOT_COMPILE lilo-config"' >lilo-config/configure.in.in
+%endif
+
+# 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 || : ; . /etc/profile.d/qt.sh
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%if 0%{?fedora} > 0
+export CXXFLAGS="${CXXFLAGS} -fpermissive"
+%endif
+
+%configure \
+   --enable-new-ldflags \
+   --disable-dependency-tracking \
+   --disable-rpath \
+   --with-rpm \
+   --enable-final \
+   --enable-closure \
+   --with-private-groups \
+   --with-extra-includes=%{_includedir}/tqt
+
+%__make %{?_smp_mflags}
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+%if 0%{?rhel} > 1
+comps="kcron kdat knetworkconf"
+rm -rf %{buildroot}%{_docdir}/HTML/en/kuser \
+       %{buildroot}%{_docdir}/HTML/en/kpackage \
+       %{buildroot}%{_docdir}/HTML/en/ksysv \
+       %{buildroot}%{_docdir}/HTML/en/lilo-config       
+%else
+comps="kcron kdat knetworkconf kpackage ksysv kuser"
+mkdir -p %{buildroot}%{_datadir}/config \
+         %{buildroot}/etc/security/console.apps \
+         %{buildroot}/etc/pam.d \
+         %{buildroot}%{_sbindir}
+
+install -p -m644 %{SOURCE5} %{SOURCE6} %{SOURCE7} %{buildroot}%{_datadir}/config/
+
+# Run kuser through consolehelper
+install -p -m644 %{SOURCE1} %{buildroot}/etc/security/console.apps/kuser
+install -p -m644 %{SOURCE2} %{buildroot}/etc/pam.d/kuser
+mv %{buildroot}%{_bindir}/kuser %{buildroot}%{_sbindir}
+ln -s consolehelper %{buildroot}%{_bindir}/kuser
+%endif
+
+# locale's
+%find_lang %{name} || touch %{name}.lang
+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 ] && ln -nsf ../common $i/common
+      done
+    popd
+  fi
+done
+fi
+
+# rpmdocs
+for dir in $comps ; do
+  for file in AUTHORS ChangeLog README TODO ; do
+    test -s  "$dir/$file" && install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file"
+  done
+done
+
+%post
+for icon_theme in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun
+for icon_theme in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING README
+%doc rpmdocs/*
+%{_bindir}/*
+%if 0%{?rhel} < 1
+%{_sbindir}/*
+%config(noreplace) /etc/pam.d/*
+%config(noreplace) /etc/security/console.apps/*
+%{_datadir}/config*/*
+%{_datadir}/mimelnk/*/*.desktop
+%{_datadir}/icons/crystalsvg/*/*/*
+%endif
+%{_datadir}/apps/*
+%{_datadir}/applications/kde/*.desktop
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/icons/locolor/*/*/*
+%{_datadir}/service*/*.desktop
+%{tde_libdir}/*
+%{_libdir}/pkgconfig/*.pc
+%doc %lang(en) %{_docdir}/HTML/en/*
+
+
+%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
+
+* Fri Oct 28 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
+- Import to GIT
+
diff --git a/redhat/kdeartwork/trinity-kdeartwork-3.5.13.spec b/redhat/kdeartwork/trinity-kdeartwork-3.5.13.spec
index 6a0ef7146..3603f7378 100644
--- a/redhat/kdeartwork/trinity-kdeartwork-3.5.13.spec
+++ b/redhat/kdeartwork/trinity-kdeartwork-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"
@@ -11,17 +11,23 @@
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
+BuildRequires: cmake >= 2.8
 %define tde_libdir %{_libdir}/trinity
 
+# kdeartwork specific settings
+# On RHEL 6, libart is too old !
+%if 0%{?fedora} >= 15
+%define with_libart 1
+%endif
+
 
 Name:    trinity-kdeartwork
-Summary: Additional artwork (themes, sound themes, ...) for KDE
+Summary: Additional artwork (themes, sound themes, ...) for TDE
 Version: %{?version}
 Release: %{?release}%{?dist}%{?_variant}
 
 License:	GPLv2
-Group:   User Interface/Desktops
+Group:		User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Vendor:		Trinity Project
@@ -35,8 +41,15 @@ Source1: webcollagerc
 
 BuildRequires: gettext
 BuildRequires: trinity-kdebase-devel
-BuildRequires: libart_lgpl-devel
 BuildRequires: nas-devel esound-devel jack-audio-connection-kit-devel
+%if 0%{?rhel} > 5 || 0%{?fedora} >= 15
+BuildRequires: xscreensaver
+%else
+BuildRequires: gnome-screensaver
+%endif
+%if "%{?with_libart}" == "1"
+BuildRequires: libart_lgpl-devel
+%endif
 
 Requires: trinity-kdebase
 
@@ -54,24 +67,27 @@ Group: User Interface/Desktops
 %prep
 %setup -q -n kdeartwork
 
-%__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 || : ; . /etc/profile.d/qt.sh
 export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
-
-
-%configure \
-  --disable-rpath \
-  --enable-new-ldflags \
-  --disable-dependency-tracking \
-  --disable-debug --disable-warnings \
-  --enable-final \
-  --with-extra-includes=%{_includedir}/tqt
+export PKG_CONFIG_PATH="%{_libdir}/pkgconfig"
+export CMAKE_INCLUDE_PATH="%{_includedir}:%{_includedir}/tqt"
+export LD_LIBRARY_PATH="%{_libdir}"
+
+%__mkdir build
+cd build
+%cmake \
+  -DWITH_XSCREENSAVER=ON \
+%if "%{?with_libart}" == "1"
+  -DWITH_LIBART=ON \
+%else
+  -DWITH_LIBART=OFF \
+%endif
+  -DWITH_OPENGL=ON \
+  -DWITH_ARTS=ON \
+  -DBUILD_ALL=ON \
+  ..
 
 %__make %{?_smp_mflags}
 
@@ -79,8 +95,7 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}"
 %install
 export PATH="%{_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-
-%make_install
+%__make install -C build DESTDIR=%{buildroot}
 
 # webcollage -root -directory /usr/share/backgrounds/images #227683
 
@@ -123,17 +138,17 @@ done
 %post icons
 for i in locolor ikons kdeclassic kids slick ; do
  touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
 done
 
 %postun icons
 for i in locolor ikons kdeclassic kids slick ; do
  touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
 done
 
 %clean
-rm -rf %{buildroot}
+%__rm -rf %{buildroot}
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
@@ -165,5 +180,8 @@ rm -rf %{buildroot}
 
 
 %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/kdeartwork/webcollagerc b/redhat/kdeartwork/webcollagerc
new file mode 100644
index 000000000..fc901454a
--- /dev/null
+++ b/redhat/kdeartwork/webcollagerc
@@ -0,0 +1,3 @@
+[directory]
+Value=/usr/share/backgrounds/images/
+
diff --git a/redhat/kdebase/kdebase-3.5.13-genkdmconf_Xsession_location.patch b/redhat/kdebase/kdebase-3.5.13-genkdmconf_Xsession_location.patch
new file mode 100644
index 000000000..d0efe3ef8
--- /dev/null
+++ b/redhat/kdebase/kdebase-3.5.13-genkdmconf_Xsession_location.patch
@@ -0,0 +1,11 @@
+--- kdebase/kdm/kfrontend/genkdmconf.c.ORI	2011-11-01 21:59:14.450046357 +0100
++++ kdebase/kdm/kfrontend/genkdmconf.c	2011-11-01 21:59:34.449045801 +0100
+@@ -676,7 +676,7 @@
+ "    ;;\n"
+ "esac\n"
+ "# invoke global X session script\n"
+-". /etc/X11/Xsession\n";
++". /etc/X11/xinit/Xsession\n";
+ 
+ static const char def_background[] =
+ "[Desktop0]\n"
diff --git a/redhat/kdebase/kdebase-3.5.13-startkde_ldpreload.patch b/redhat/kdebase/kdebase-3.5.13-startkde_ldpreload.patch
new file mode 100644
index 000000000..1b39a59ff
--- /dev/null
+++ b/redhat/kdebase/kdebase-3.5.13-startkde_ldpreload.patch
@@ -0,0 +1,13 @@
+--- kdebase/startkde.ORI	2011-11-01 22:17:52.000000000 +0100
++++ kdebase/startkde	2011-11-01 22:18:14.000000000 +0100
+@@ -413,7 +413,9 @@
+ fi
+ 
+ if [ -n $KGTK_PRELOAD ]; then
+-  if [ -e /usr/lib/libnspr4.so ]; then
++  if [ -e /usr/lib64/libnspr4.so ]; then
++    KGTK_NSPR_PRELOAD="/usr/lib64/libnspr4.so:"
++  elif [ -e /usr/lib/libnspr4.so ]; then
+     KGTK_NSPR_PRELOAD="/usr/lib/libnspr4.so:"
+   fi
+   export LD_PRELOAD=$KGTK_PRELOAD:$KGTK_NSPR_PRELOAD$LD_PRELOAD
diff --git a/redhat/kdebase/pamd.kcheckpass-trinity.el5 b/redhat/kdebase/pamd.kcheckpass-trinity.el5
new file mode 100644
index 000000000..56939d5a9
--- /dev/null
+++ b/redhat/kdebase/pamd.kcheckpass-trinity.el5
@@ -0,0 +1,9 @@
+#%PAM-1.0
+auth       include     system-auth
+account    required	pam_nologin.so
+account    include     system-auth
+password   include     system-auth
+session    include	system-auth
+session    required    pam_loginuid.so
+session    optional    pam_selinux.so
+session    optional	pam_console.so
diff --git a/redhat/kdebase/pamd.kcheckpass-trinity.el6 b/redhat/kdebase/pamd.kcheckpass-trinity.el6
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/kdebase/pamd.kcheckpass-trinity.el6
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth       include	system-auth
+account    include	system-auth
+password   include	system-auth
+session    include	system-auth
diff --git a/redhat/kdebase/pamd.kcheckpass-trinity.fc15 b/redhat/kdebase/pamd.kcheckpass-trinity.fc15
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/kdebase/pamd.kcheckpass-trinity.fc15
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth       include	system-auth
+account    include	system-auth
+password   include	system-auth
+session    include	system-auth
diff --git a/redhat/kdebase/pamd.kdm-trinity-np.el5 b/redhat/kdebase/pamd.kdm-trinity-np.el5
new file mode 100644
index 000000000..8dc8ef34d
--- /dev/null
+++ b/redhat/kdebase/pamd.kdm-trinity-np.el5
@@ -0,0 +1,11 @@
+#%PAM-1.0
+auth       required	pam_env.so
+auth       required	pam_nologin.so
+auth       required	pam_permit.so
+account    include	system-auth
+password   include	system-auth
+session	   optional	pam_keyinit.so force revoke
+session    include	system-auth
+session    required     pam_loginuid.so
+session    optional     pam_selinux.so
+session    optional     pam_console.so
diff --git a/redhat/kdebase/pamd.kdm-trinity-np.el6 b/redhat/kdebase/pamd.kdm-trinity-np.el6
new file mode 100644
index 000000000..c3f7172de
--- /dev/null
+++ b/redhat/kdebase/pamd.kdm-trinity-np.el6
@@ -0,0 +1,13 @@
+ #%PAM-1.0
+auth       required    pam_env.so
+auth       required    pam_permit.so
+account    required    pam_nologin.so
+account    include     system-auth
+password   include     system-auth
+session    required    pam_selinux.so close
+session    required    pam_loginuid.so
+session    optional    pam_console.so
+session    required    pam_selinux.so open
+session    optional    pam_keyinit.so force revoke
+session    required    pam_namespace.so
+session    include     system-auth
diff --git a/redhat/kdebase/pamd.kdm-trinity-np.fc15 b/redhat/kdebase/pamd.kdm-trinity-np.fc15
new file mode 100644
index 000000000..96fcfe378
--- /dev/null
+++ b/redhat/kdebase/pamd.kdm-trinity-np.fc15
@@ -0,0 +1,15 @@
+ #%PAM-1.0
+auth       required    pam_env.so
+auth       required    pam_permit.so
+auth       include     postlogin
+account    required    pam_nologin.so
+account    include     system-auth
+password   include     system-auth
+session    required    pam_selinux.so close
+session    required    pam_loginuid.so
+session    optional    pam_console.so
+session    required    pam_selinux.so open
+session    optional    pam_keyinit.so force revoke
+session    required    pam_namespace.so
+session    include     system-auth
+session    include     postlogin
diff --git a/redhat/kdebase/pamd.kdm-trinity.el5 b/redhat/kdebase/pamd.kdm-trinity.el5
new file mode 100644
index 000000000..30a26ae99
--- /dev/null
+++ b/redhat/kdebase/pamd.kdm-trinity.el5
@@ -0,0 +1,10 @@
+#%PAM-1.0
+auth       include     system-auth
+account    required    pam_nologin.so
+account    include     system-auth
+password   include     system-auth
+session    optional    pam_keyinit.so force revoke
+session    include     system-auth
+session    required    pam_loginuid.so
+session    optional    pam_selinux.so
+session    optional    pam_console.so
diff --git a/redhat/kdebase/pamd.kdm-trinity.el6 b/redhat/kdebase/pamd.kdm-trinity.el6
new file mode 100644
index 000000000..14f4aa748
--- /dev/null
+++ b/redhat/kdebase/pamd.kdm-trinity.el6
@@ -0,0 +1,16 @@
+#%PAM-1.0
+auth     [success=done ignore=ignore default=bad] pam_selinux_permit.so
+auth       required    pam_env.so
+auth       substack    system-auth
+auth       optional    pam_gnome_keyring.so
+account    required    pam_nologin.so
+account    include     system-auth
+password   include     system-auth
+session    required    pam_selinux.so close
+session    required    pam_loginuid.so
+session    optional    pam_console.so
+session    required    pam_selinux.so open
+session    optional    pam_keyinit.so force revoke
+session    required    pam_namespace.so
+session    optional    pam_gnome_keyring.so auto_start
+session    include     system-auth
diff --git a/redhat/kdebase/pamd.kdm-trinity.fc15 b/redhat/kdebase/pamd.kdm-trinity.fc15
new file mode 100644
index 000000000..f1d90f7f3
--- /dev/null
+++ b/redhat/kdebase/pamd.kdm-trinity.fc15
@@ -0,0 +1,18 @@
+#%PAM-1.0
+auth     [success=done ignore=ignore default=bad] pam_selinux_permit.so
+auth       required    pam_env.so
+auth       substack    system-auth
+auth       optional    pam_gnome_keyring.so
+auth       include     postlogin
+account    required    pam_nologin.so
+account    include     system-auth
+password   include     system-auth
+session    required    pam_selinux.so close
+session    required    pam_loginuid.so
+session    optional    pam_console.so
+session    required    pam_selinux.so open
+session    optional    pam_keyinit.so force revoke
+session    required    pam_namespace.so
+session    optional    pam_gnome_keyring.so auto_start
+session    include     system-auth
+session    include     postlogin
diff --git a/redhat/kdebase/pamd.kscreensaver-trinity.el5 b/redhat/kdebase/pamd.kscreensaver-trinity.el5
new file mode 100644
index 000000000..56939d5a9
--- /dev/null
+++ b/redhat/kdebase/pamd.kscreensaver-trinity.el5
@@ -0,0 +1,9 @@
+#%PAM-1.0
+auth       include     system-auth
+account    required	pam_nologin.so
+account    include     system-auth
+password   include     system-auth
+session    include	system-auth
+session    required    pam_loginuid.so
+session    optional    pam_selinux.so
+session    optional	pam_console.so
diff --git a/redhat/kdebase/pamd.kscreensaver-trinity.el6 b/redhat/kdebase/pamd.kscreensaver-trinity.el6
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/kdebase/pamd.kscreensaver-trinity.el6
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth       include	system-auth
+account    include	system-auth
+password   include	system-auth
+session    include	system-auth
diff --git a/redhat/kdebase/pamd.kscreensaver-trinity.fc15 b/redhat/kdebase/pamd.kscreensaver-trinity.fc15
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/kdebase/pamd.kscreensaver-trinity.fc15
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth       include	system-auth
+account    include	system-auth
+password   include	system-auth
+session    include	system-auth
diff --git a/redhat/kdebase/trinity-kdebase-3.5.12.spec b/redhat/kdebase/trinity-kdebase-3.5.12.spec
index b3df6b097..3229fe15d 100755
--- a/redhat/kdebase/trinity-kdebase-3.5.12.spec
+++ b/redhat/kdebase/trinity-kdebase-3.5.12.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.12
 %endif
-%define release 11
+%define release 12
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -51,6 +51,8 @@ Patch4:		http://www.trinitydesktop.org/patches/r1182808.diff
 # [kdebase] fixed an incompatibility with gcc 4.5 
 Patch8:		http://www.trinitydesktop.org/patches/r1221326.diff
 
+Patch11:	kdebase-3.5.12-kickerfix.patch
+
 # TDE Official patches (from SVN), modified
 # [kdebase/ksmserver/shutdowndlg.cpp] Fixed invalid constructor per GCC 4.5.2
 Patch7:		kdebase-3.5.12-r1220975.patch
@@ -150,7 +152,7 @@ Requires: %{name} = %{version}-%{release}
 %package libs
 Summary: %{name} runtime libraries
 Group:   System Environment/Libraries
-Requires: trinity-kdelibs >= %{version}
+Requires: trinity-kdelibs
 %if "%{?_prefix}" == "/usr"
 Obsoletes: kdebase%{?_qt_suffix}-libs
 %endif
@@ -185,6 +187,7 @@ Protocol handlers (KIOslaves) for personal information management, including:
 %if 0%{?rhel} && 0%{?rhel} < 6
 %patch10 -p1
 %endif
+%patch11 -d kicker/kicker
 
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
 %__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh"
diff --git a/redhat/kdebase/trinity-kdebase-3.5.13.spec b/redhat/kdebase/trinity-kdebase-3.5.13.spec
index c52d2f2b0..2431e044a 100755
--- a/redhat/kdebase/trinity-kdebase-3.5.13.spec
+++ b/redhat/kdebase/trinity-kdebase-3.5.13.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.13
 %endif
-%define release 0
+%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"
@@ -15,33 +15,55 @@ BuildRequires: cmake >= 2.8
 %define tde_docdir %{_docdir}/kde
 %define tde_libdir %{_libdir}/trinity
 
+# Older RHEL/Fedora versions use packages named "qt", "qt-devel", ..
+# whereas newer versions use "qt3", "qt3-devel" ...
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 8
+%define _qt_suffix 3
+%endif
+
 
 Name:		trinity-kdebase
 Version:	%{?version}
 Release:	%{?release}%{?dist}%{?_variant}
 License:	GPL
 Summary:	Trinity KDE Base Programs
+Group:		User Interface/Desktops
 
 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:	kdebase-%{version}.tar.gz
 
+# Wrapper script to prevent Plasma launch at Trinity Startup
+Source1:	plasma-desktop
+
+# Pam configuration files for RHEL / Fedora
+Source2:	pamd.kdm-trinity%{?dist}
+Source3:	pamd.kdm-trinity-np%{?dist}
+Source4:	pamd.kcheckpass-trinity%{?dist}
+Source5:	pamd.kscreensaver-trinity%{?dist}
+
+
 # TDE for RHEL/Fedora specific patches
 # [kdebase/kdesu] Remove 'ignore' button on 'kdesu' dialog box
 Patch3:		kdebase-3.5.13-kdesu-noignorebutton.patch
 # [kdebase/kdesktop] Modifies "open terminal here" on desktop
 Patch5:		kdebase-3.5.12-desktop-openterminalhere.patch
-# [kdebase/kioslave]: Forces HAL backend to use HAL mount options
+# [kdebase/kioslave] Forces HAL backend to use HAL mount options
 Patch6:		kdebase-3.5.12-halmountoptions.patch
+# [kdebase/kdm/kfrontend] Global Xsession file is '/etc/X11/xinit/Xsession'
+Patch7:		kdebase-3.5.13-genkdmconf_Xsession_location.patch
+# [kdebase/startkde] Hardcoded path '/usr/lib/xxx' in startkde, not suitable for x86_64
+Patch8:		kdebase-3.5.13-startkde_ldpreload.patch
 
 BuildRequires:	tqtinterface-devel
 BuildRequires:	trinity-arts-devel
 BuildRequires:	trinity-kdelibs-devel
-BuildRequires:	qt3-devel >= 3.3.8d
+BuildRequires:	qt%{?_qt_suffix}-devel
 BuildRequires:	openssl-devel
 BuildRequires:	avahi-devel avahi-qt3-devel
 BuildRequires:	imake
@@ -52,7 +74,7 @@ BuildRequires:	dbus-devel dbus-qt-devel
 BuildRequires:	lm_sensors-devel
 BuildRequires:	libfontenc-devel
 BuildRequires:	hal-devel
-BuildRequires:	audiofile-devel
+BuildRequires:	audiofile-devel alsa-lib-devel
 BuildRequires:	jack-audio-connection-kit-devel
 BuildRequires:	libraw1394-devel
 BuildRequires:	openldap-devel
@@ -60,15 +82,22 @@ BuildRequires:	libvorbis-devel
 BuildRequires:	pam-devel
 BuildRequires:	libXdmcp-devel
 BuildRequires:	libxkbfile-devel
+BuildRequires:	libusb-devel
+BuildRequires:	esound-devel glib2-devel nas-devel
+BuildRequires:	libXcomposite-devel
 BuildRequires:	dbus-tqt-devel
+BuildRequires:	libXtst-devel
+BuildRequires:	libXdamage-devel
 
 Requires:	tqtinterface
 Requires:	trinity-arts
 Requires:	trinity-kdelibs
-Requires:	qt3 >= 3.3.8d
+Requires:	qt%{?_qt_suffix}
 Requires:	openssl
 Requires:	avahi avahi-qt3
 Requires:	dbus-tqt
+# Provides the global Xsession script (/etc/X11/xinit/Xsession)
+Requires:	xorg-x11-xinit
 
 
 # RHEL 6 Configuration files are provided in separate packages
@@ -90,11 +119,11 @@ kfontmanager, kmenuedit).
 
 %package devel
 Requires:	%{name}
-Requires:	%{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	%{name}-libs = %{version}-%{release}
 Requires:	trinity-kdelibs-devel
 Summary:	%{summary} - Development files
 %if "%{?_prefix}" == "/usr"
-Obsoletes:	kdebase3-devel
+Obsoletes:	kdebase%{?_qt_suffix}-devel
 %endif
 Group:		Development/Libraries
 %description devel
@@ -106,7 +135,7 @@ Kate plugins or KWin styles.
 %package extras
 Summary: Extra applications from %{name}
 Group: User Interface/Desktops
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 %description extras
 %{summary}, including:
  * kappfinder
@@ -118,11 +147,11 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %package libs
 Summary: %{name} runtime libraries
 Group:   System Environment/Libraries
-Requires: trinity-kdelibs >= %{version}
+Requires: trinity-kdelibs
 %if "%{?_prefix}" == "/usr"
-Obsoletes: kdebase3-libs
+Obsoletes: kdebase%{?_qt_suffix}-libs
 %endif
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 %description libs
 %{summary}
 
@@ -143,10 +172,9 @@ Protocol handlers (KIOslaves) for personal information management, including:
 %patch3 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
+%patch8 -p1
 
-# Gets the cmake modules in current build directory
-%__mkdir_p cmake/modules
-%__cp -f %{_datadir}/cmake/*.* cmake/modules
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -165,7 +193,11 @@ cd build
   -DWITH_XCOMPOSITE=ON \
   -DWITH_XCURSOR=ON \
   -DWITH_XFIXES=ON \
+%if 0%{?fedora} || 0%{?rhel} > 5
   -DWITH_XRANDR=ON \
+%else
+  -DWITH_XRANDR=OFF \
+%endif
   -DWITH_XRENDER=ON \
   -DWITH_XDAMAGE=ON \
   -DWITH_XEXT=ON \
@@ -179,14 +211,16 @@ cd build
   -DWITH_I8K=OFF \
   -DWITH_HAL=ON \
   -DBUILD_ALL=ON \
+  -DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" \
+  -DKDM_PAM_SERVICE="kdm-trinity" \
+  -DKSCREENSAVER_PAM_SERVICE="kscreensaver-trinity" \
   ..
 
 %__make %{?_smp_mflags} 
 
 %install
 %__rm -rf %{?buildroot}
-%__mkdir_p %{?buildroot}
-%make_install -C build
+%__make install DESTDIR=%{?buildroot} -C build
 
 # Adds a GDM/KDM/XDM session called 'TDE'
 %if "%{?_prefix}" != "/usr"
@@ -201,6 +235,18 @@ sed -i "%{?buildroot}%{_bindir}/startkde" \
 # Renames '/etc/ksysguarddrc' to avoid conflict with KDE4 'ksysguard'
 mv -f %{?buildroot}%{_sysconfdir}/ksysguarddrc %{?buildroot}%{_sysconfdir}/ksysguarddrc.tde
 
+# TDE 3.5.12: add script "plasma-desktop" to avoid conflict with KDE4
+%if "%{?_prefix}" != "/usr"
+%__cp -f "%{SOURCE1}" "%{?buildroot}%{_bindir}"
+%endif
+
+# PAM configuration files
+%__mkdir_p "%{?buildroot}%{_sysconfdir}/pam.d"
+%__install -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/kdm-trinity"
+%__install -m 644 "%{SOURCE3}" "%{?buildroot}%{_sysconfdir}/pam.d/kdm-trinity-np"
+%__install -m 644 "%{SOURCE4}" "%{?buildroot}%{_sysconfdir}/pam.d/kcheckpass-trinity"
+%__install -m 644 "%{SOURCE5}" "%{?buildroot}%{_sysconfdir}/pam.d/kscreensaver-trinity"
+
 %clean
 %__rm -rf %{?buildroot}
 
@@ -288,6 +334,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %exclude %{_datadir}/applnk/Utilities/kpager.desktop
 %exclude %{_datadir}/icons/hicolor/*/apps/kpager.png
 
+# Pam configuration
+%{_sysconfdir}/pam.d/*
+
 %doc AUTHORS COPYING README
 %{tde_docdir}/HTML/en/*
 %config(noreplace) %{_sysconfdir}/ksysguarddrc.tde
@@ -321,7 +370,6 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %{_bindir}/konqueror
 %{_bindir}/konsole
 %{_bindir}/krandom.kss
-%{_bindir}/krandrtray
 %{_bindir}/krdb
 %{_bindir}/kreadconfig
 %{_bindir}/ksmserver
@@ -369,6 +417,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %{_bindir}/khc_mansearch.pl
 %{_bindir}/kicker
 %{_bindir}/knetattach
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
+%{_bindir}/krandrtray
+%endif
 %{_bindir}/kompmgr
 %{_bindir}/kpm
 %{_bindir}/ksplash
@@ -398,12 +449,17 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %{tde_libdir}/*
 %{_libdir}/libkdeinit_*.*
 %{_sysconfdir}/xdg/menus/applications-merged/kde-essential.menu
+%if 0%{?fedora} >= 15 && "%{?_prefix}" != "/usr"
+%exclude %{_sysconfdir}/xdg/menus/kde-information.menu
+%else
 %{_sysconfdir}/xdg/menus/kde-information.menu
+%endif
 %{_sysconfdir}/xdg/menus/kde-screensavers.menu
 %{_sysconfdir}/xdg/menus/kde-settings.menu
 /usr/share/xsessions/*.desktop
 # Remove conflicts with redhat-menus
 %if "%{?_prefix}" != "/usr"
+%{_bindir}/plasma-desktop
 %config(noreplace) %{_datadir}/config/*
 %else
 %exclude %{_datadir}/config
@@ -420,6 +476,8 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 # New in TDE 3.5.13
 %{_bindir}/krootbacking
+%{_bindir}/tsak
+%attr(4511,root,root) %{_bindir}/kdmtsak
 
 %files libs
 %defattr(-,root,root,-)
@@ -455,6 +513,12 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %{_datadir}/cmake/*.cmake
 
 %changelog
-* Sat Sep 03 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12.99-0
+* Tue Nov 01 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
+- Add 'patch8' to fix LD_PRELOAD variable set by 'startkde' under x86_64
+
+* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
+- Initial release for RHEL 6, RHEL 5 and Fedora 15
+
+* Sat Sep 03 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
 - Import to GIT
 - Use TDE 3.5.13, cmake, QT3.3.3.8d
diff --git a/redhat/kdebindings/trinity-kdebindings-3.5.12.spec b/redhat/kdebindings/trinity-kdebindings-3.5.12.spec
index 3e654a49f..2c4af58b7 100644
--- a/redhat/kdebindings/trinity-kdebindings-3.5.12.spec
+++ b/redhat/kdebindings/trinity-kdebindings-3.5.12.spec
@@ -27,7 +27,7 @@ Group:   User Interface/Desktops
 
 Vendor:  Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:     http://developer.kde.org/language-bindings/ 
+URL:		http://www.trinitydesktop.org/
 
 Source0: kdebindings-%{version}.tar.gz
 
@@ -211,6 +211,7 @@ done
 %clean
 %__rm -rf $RPM_BUILD_ROOT
 
+
 %post
 /sbin/ldconfig ||:
 touch --no-create %{_datadir}/icons/hicolor ||:
@@ -265,7 +266,7 @@ update-desktop-database >& /dev/null ||:
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/kde/*
+%{tde_includedir}/*
 %{_libdir}/lib*.so
 %if "%{?_with_java:1}" == "1"
 %{_libdir}/jni/*.so
diff --git a/redhat/kdebindings/trinity-kdebindings-3.5.13.spec b/redhat/kdebindings/trinity-kdebindings-3.5.13.spec
index f4ea50005..7b1b74f69 100644
--- a/redhat/kdebindings/trinity-kdebindings-3.5.13.spec
+++ b/redhat/kdebindings/trinity-kdebindings-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"
@@ -14,6 +14,7 @@
 BuildRequires: autoconf automake libtool m4
 %define tde_docdir %{_docdir}/kde
 %define tde_libdir %{_libdir}/trinity
+%define tde_includedir %{_includedir}/kde
 
 
 Name:	 trinity-kdebindings
@@ -26,7 +27,10 @@ Group:   User Interface/Desktops
 
 Vendor:  Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:     http://developer.kde.org/language-bindings/ 
+URL:		http://www.trinitydesktop.org/
+
+Prefix:		%{_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0: kdebindings-%{version}.tar.gz
 
@@ -39,6 +43,8 @@ BuildRequires: trinity-kdelibs-devel
 BuildRequires: zlib-devel
 BuildRequires: perl(ExtUtils::MakeMaker)
 BuildRequires: trinity-arts-devel
+BuildRequires: glib-devel gtk+-devel
+BuildRequires: gtk2-devel
 %define perl_ver        %{expand:%%(eval `perl -V:version`; echo $version)}
 %define perl_vendorarch %{expand:%%(eval `perl -V:installvendorarch`; echo $installvendorarch)}
 %define perl_vendorlib  %{expand:%%(eval `perl -V:installvendorlib`; echo $installvendorlib)}
@@ -59,12 +65,16 @@ Provides: %{name}-dcoppython = %{version}-%{release}
 ## ruby
 BuildRequires: ruby-devel >= 1.8, ruby
 Provides: %{name}-ruby = %{version}-%{release}
+%{!?ruby_arch: %define ruby_arch %(ruby -rrbconfig -e 'puts Config::CONFIG["archdir"]')}
 %{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')}
 %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')}
 
 ## java
-#BuildRequires: java-1.4.2-gcj-compat-devel libgcj-devel gcc-java
+%if 0%{?rhel} && 0%{?rhel} < 6
+BuildRequires: java-1.4.2-gcj-compat-devel libgcj-devel gcc-java
+%else
 BuildRequires: java-devel >= 1.4.2
+%endif
 %define java_home %{_usr}/lib/jvm/java
 %define _with_java --with-java=%{java_home}
 Provides: %{name}-java = %{version}-%{release}
@@ -114,13 +124,14 @@ unset JAVA_HOME ||:
 export DO_NOT_COMPILE="$DO_NOT_COMPILE python"
 
 %configure \
-  --includedir=%{_includedir}/kde \
+  --includedir=%{tde_includedir} \
   --disable-rpath \
   --enable-new-ldflags \
   --disable-debug --disable-warnings \
   --disable-dependency-tracking \
   --with-extra-libs=%{_libdir} \
   --with-pythondir=%{_usr} \
+  --enable-closure \
   --disable-final \
   %{?_with_java} %{!?_with_java:--without-java} \
   %{?_enable_qscintilla} %{!?_enable_qscintilla:--disable-qscintilla} \
@@ -145,10 +156,10 @@ popd
 
 
 %install
-%__rm -rf $RPM_BUILD_ROOT
 export PATH="%{_bindir}:${PATH}"
+%__rm -rf $RPM_BUILD_ROOT
 
-%make_install \
+%__make install DESTDIR=%{?buildroot} \
   PYTHON=%{__python}
 
 desktop-file-install \
@@ -175,14 +186,6 @@ fi
 # locale's
 %find_lang %{name} || touch %{name}.lang
 HTML_DIR=$(kde-config --expandvars --install html)
-
-# Fix HTML doc location in TDE 3.5.13
-# (from 'share/doc/HTML' to 'share/doc/kde/HTML')
-if [ ! -d $RPM_BUILD_ROOT$HTML_DIR ] && [ -d $RPM_BUILD_ROOT%{_docdir}/HTML ]; then
-  mkdir -p $RPM_BUILD_ROOT${HTML_DIR%/*}
-  mv -f $RPM_BUILD_ROOT%{_docdir}/HTML $RPM_BUILD_ROOT${HTML_DIR%/*}
-fi
-
 if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then
 for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do
   if [ -d $lang_dir ]; then
@@ -206,7 +209,8 @@ for dir in dcopperl dcoppython kalyptus %{?_with_java:kdejava qtjava} kjsembed k
 done
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%__rm -rf $RPM_BUILD_ROOT
+
 
 %post
 /sbin/ldconfig ||:
@@ -246,17 +250,14 @@ update-desktop-database >& /dev/null ||:
 #%{ruby_sitelib}/K*
 #%{ruby_sitelib}/Qt*
 %{_usr}/lib/ruby/*/*
-%if 0%{?fedora} >= 15
-%{_usr}/lib64/ruby/*/*/*.so.*
-%else
-%{_usr}/lib64/ruby/*/*.so.*
-%endif
+%{ruby_arch}/*.so.*
+%doc %lang(en) %{_docdir}/HTML/en/javalib/*
 
 # Excludes 'kjscmd' (conflicts with 'kdelibs' from RHEL6)
 %if "%{?_prefix}" == "/usr"
 %exclude %{_bindir}/kjscmd
-%exclude %{_mandir}/man1/kjscmd*
 %endif
+%exclude %{_mandir}/man1/kjscmd*
 
 
 %files dcopperl -f %{name}-dcopperl.list
@@ -266,21 +267,19 @@ update-desktop-database >& /dev/null ||:
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/kde/*
+%{tde_includedir}/*
 %{_libdir}/lib*.so
 %if "%{?_with_java:1}" == "1"
 %{_libdir}/jni/*.so
 %{_libdir}/jni/*.la
 %endif
-%if 0%{?fedora} >= 15
-%{_usr}/lib64/ruby/*/*/*.so
-%{_usr}/lib64/ruby/*/*/*.la
-%else
-%{_usr}/lib64/ruby/*/*.so
-%{_usr}/lib64/ruby/*/*.la
-%endif
+%{ruby_arch}/*.so
+%{ruby_arch}/*.la
 
 %changelog
-* Sat Sep 03 2011 Francois Andriot <francois.andriot@free.fr - 3.5.12.99.20110903-0
+* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
+- Initial release for RHEL 6, RHEL 5 and Fedora 15
+
+* Sat Sep 03 2011 Francois Andriot <francois.andriot@free.fr - 3.5.13-0
 - Import to GIT
 - Built with future TDE version (3.5.13 + cmake + QT3.3.8d)
diff --git a/redhat/kdeedu/trinity-kdeedu-3.5.13.spec b/redhat/kdeedu/trinity-kdeedu-3.5.13.spec
new file mode 100644
index 000000000..26730e4db
--- /dev/null
+++ b/redhat/kdeedu/trinity-kdeedu-3.5.13.spec
@@ -0,0 +1,237 @@
+# Default version for this component
+%if "%{?version}" == ""
+%define version 3.5.13
+%endif
+%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.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-kdeedu
+Summary: Educational/Edutainment applications
+Version: %{?version}
+Release: %{?release}%{?dist}%{?_variant}
+
+License: GPLv2
+Group:   Amusements/Games
+
+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: kdeedu-%{version}.tar.gz
+
+Provides: kdeedu3 = %{version}-%{release}
+
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+
+Requires: %{name}-libs = %{version}-%{release}
+
+BuildRequires: desktop-file-utils
+BuildRequires: trinity-kdelibs-devel
+BuildRequires: python-devel python
+BuildRequires: boost-devel
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
+BuildRequires: ocaml(compiler)
+%else
+BuildRequires: ocaml
+%endif
+#BuildRequires: ocaml-facile-devel
+
+
+%description
+Educational/Edutainment applications, including:
+* blinken: Simon Says Game
+* kalzium: Periodic Table of Elements
+* kanagram: Letter Order Game
+* kbruch: Exercise Fractions
+* keduca: Tests and Exams
+* kgeography: Geography Trainer
+* khangman: Hangman Game
+* kig: Interactive Geometry
+* kiten: Japanese Reference/Study Tool
+* klatin: Latin Reviser
+* klettres: French alphabet tutor
+* kmplot: Mathematical Function Plotter
+* kpercentage: Excersie Percentages
+* kstars: Desktop Planetarium
+* ktouch: Touch Typing Tutor
+* kturtle: Logo Programming Environment
+* kverbos: Study Spanish Verbforms
+* kvoctrain: Vocabulary Trainer
+* kwordquiz: Vocabulary Trainer
+
+%package devel
+Summary: Development files for %{name}
+Group: Development/Libraries
+Provides: kdeedu3-devel = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
+%description devel
+%{summary}.
+
+%package libs
+Summary: %{name} runtime libraries
+Group:   System Environment/Libraries
+Requires: trinity-kdelibs
+# include to be paranoid, installing libs-only is still mostly untested -- Rex
+Requires: %{name} = %{version}-%{release}
+%description libs
+%{summary}.
+
+
+%prep
+%setup -q -n kdeedu
+
+# 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"
+
+%if 0%{?rhel} > 0
+rm -rf doc/kgeography kgeography
+perl -pi -e "s|kgeography||" subdirs
+%endif
+
+%__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 || : ; . /etc/profile.d/qt.sh
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+# Fix link with kparts
+export CXXFLAGS="${CXXFLAGS} -lkparts"
+
+%if 0%{?fedora}
+export CXXFLAGS="${CXXFLAGS} -fpermissive"
+%endif
+
+%configure \
+   --enable-new-ldflags \
+   --disable-dependency-tracking \
+   --disable-rpath \
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
+   --enable-kig-python-scripting \
+%else
+   --disable-kig-python-scripting \
+%endif
+   --disable-debug \
+   --disable-warnings \
+   --enable-final \
+   --enable-closure \
+   --includedir=%{_includedir}/kde \
+   --disable-ocamlsolver \
+   --with-extra-includes=%{_includedir}/tqt
+
+
+%__make \
+  OCAMLLIB=$(ocamlc -where) FACILELIB=$(ocamlc -where)
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+# locale's
+%find_lang %{name} || touch %{name}.lang
+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 ] && ln -nsf ../common $i/common
+      done
+    popd
+  fi
+done
+fi
+
+# rpmdocs
+for dir in blinken k* ; do
+  for file in AUTHORS ChangeLog README TODO ; do
+    test -s  "$dir/$file" && install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file"
+  done
+done
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+for i in crystalsvg hicolor locolor ; do
+ touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
+done
+update-desktop-database >& /dev/null ||:
+
+%postun
+for i in crystalsvg hicolor locolor ; do
+ touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
+done
+update-desktop-database >& /dev/null ||:
+
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
+
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%doc README COPYING
+%doc rpmdocs/*
+%{_bindir}/*
+%{_datadir}/applications/kde/*
+# FIXME
+%{_datadir}/applnk/Edutainment/
+%{_datadir}/apps/*
+%config %{_datadir}/config*/*
+%{_datadir}/mimelnk/*/*
+%{_datadir}/icons/crystalsvg/*/*/*
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/icons/locolor/*/*/*
+%{_datadir}/services/*
+%{tde_libdir}/*
+%doc %lang(en) %{_docdir}/HTML/en/*
+
+%files libs
+%defattr(-,root,root,-)
+%{_libdir}/lib*.so.*
+%{_libdir}/lib*.la
+
+%files devel
+%defattr(-,root,root,-)
+%doc libkdeedu/AUTHORS libkdeedu/README
+%{tde_includedir}/*
+%{_libdir}/lib*.so
+
+
+%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
+
+* Sat Sep 09 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
+- Import to GIT
diff --git a/redhat/kdegames/trinity-kdegames-3.5.13.spec b/redhat/kdegames/trinity-kdegames-3.5.13.spec
new file mode 100644
index 000000000..97e64fb35
--- /dev/null
+++ b/redhat/kdegames/trinity-kdegames-3.5.13.spec
@@ -0,0 +1,199 @@
+# Default version for this component
+%if "%{?version}" == ""
+%define version 3.5.13
+%endif
+%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.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-kdegames
+Summary: Trinity Desktop Environment - Games
+Version: %{?version}
+Release: %{?release}%{?dist}%{?_variant}
+
+License: GPLv2
+Group:   Amusements/Games
+
+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)
+
+Source: kdegames-%{version}.tar.gz
+
+Provides: kdegames3 = %{version}-%{release}
+
+Requires: %{name}-libs = %{version}-%{release}
+
+BuildRequires: trinity-kdelibs-devel
+
+%description
+Games and gaming libraries for the K Desktop Environment.
+Included with this package are: kenolaba, kasteroids, kblackbox, kmahjongg,
+kmines, konquest, kpat, kpoker, kreversi, ksame, kshisen, ksmiletris,
+ksnake, ksirtet, katomic, kjumpingcube, ktuberling.
+
+%package devel
+Summary: Development files for %{name} 
+Group: Development/Libraries
+License: LGPLv2
+Provides: kdegames3-devel = %{version}-%{release}
+Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kdelibs-devel
+%description devel
+%{summary}.
+Install %{name}-devel if you wish to develop or compile games for the
+KDE desktop.
+
+%package libs
+Summary: %{name} runtime libraries
+Group:   System Environment/Libraries
+Requires: trinity-kdelibs
+License: LGPLv2
+# include to paranoid, installing libs-only is still mostly untested -- Rex
+#Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+%description libs
+%{summary}.
+
+
+
+%prep
+%setup -q -n kdegames
+
+# 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 || : ; . /etc/profile.d/qt.sh
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%if 0%{?fedora} > 0
+export CXXFLAGS="${CXXFLAGS} -lkio"
+%endif
+
+%configure \
+   --enable-new-ldflags \
+   --disable-dependency-tracking \
+   --disable-rpath \
+   --enable-final \
+   --disable-debug \
+   --disable-warnings \
+   --enable-closure \
+   --includedir=%{_includedir}/kde \
+   --disable-setgid \
+   --with-extra-includes=%{_includedir}/tqt
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+# locale's
+%find_lang %{name} || touch %{name}.lang
+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 ] && ln -nsf ../common $i/common
+      done
+    popd
+  fi
+done
+fi
+
+# rpmdocs
+for dir in k* lskat ; do
+  for file in AUTHORS ChangeLog README TODO ; do
+    test -s  "$dir/$file" && install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file"
+  done
+done
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+for f in crystalsvg hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun
+for f in crystalsvg hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
+
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS README COPYING
+%doc rpmdocs/*
+%{_bindir}/*
+%{_datadir}/applications/kde/*.desktop
+%{_datadir}/apps/*
+%{_datadir}/config*/*
+%{_datadir}/icons/crystalsvg/*/*/*
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/mimelnk/*/*
+%{_datadir}/service*/*
+%{tde_libdir}/*
+%{_libdir}/libkdeinit_*.so
+%doc %lang(en) %{_docdir}/HTML/en/*
+
+%files libs
+%defattr(-,root,root,-)
+%{_libdir}/lib*.so.*
+%{_libdir}/lib*.la
+
+%files devel
+%defattr(-,root,root,-)
+%doc COPYING.LIB
+%doc libkdegames/README libkdegames/TODO
+%{tde_includedir}/*
+%{_libdir}/lib*.so
+%exclude %{_libdir}/libkdeinit_*.so
+
+
+%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
+
+* Sat Sep 09 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
+- Import to GIT
diff --git a/redhat/kdegraphics/kdegraphics-3.5.13-disable_poppler.patch b/redhat/kdegraphics/kdegraphics-3.5.13-disable_poppler.patch
new file mode 100644
index 000000000..502972e7b
--- /dev/null
+++ b/redhat/kdegraphics/kdegraphics-3.5.13-disable_poppler.patch
@@ -0,0 +1,11 @@
+--- kdegraphics.ORI/kfile-plugins/dependencies/CMakeLists.txt	2011-07-31 08:24:04.000000000 +0200
++++ kdegraphics/kfile-plugins/dependencies/CMakeLists.txt	2011-10-30 14:42:03.000000000 +0100
+@@ -9,4 +9,6 @@
+ #
+ #################################################
+ 
+-add_subdirectory( poppler-tqt )
+\ Pas de fin de ligne à la fin du fichier.
++if( WITH_PDF )
++  add_subdirectory( poppler-tqt )
++endif ( )
diff --git a/redhat/kdegraphics/kdegraphics-3.5.13-kpovmodeler_check_glu.patch b/redhat/kdegraphics/kdegraphics-3.5.13-kpovmodeler_check_glu.patch
new file mode 100644
index 000000000..ba18d0b3d
--- /dev/null
+++ b/redhat/kdegraphics/kdegraphics-3.5.13-kpovmodeler_check_glu.patch
@@ -0,0 +1,16 @@
+diff -Nuar kdegraphics.ORI/kpovmodeler/ConfigureChecks.cmake kdegraphics/kpovmodeler/ConfigureChecks.cmake
+--- kdegraphics.ORI/kpovmodeler/ConfigureChecks.cmake	2011-05-11 22:40:19.000000000 +0200
++++ kdegraphics/kpovmodeler/ConfigureChecks.cmake	2011-10-30 14:00:54.000000000 +0100
+@@ -12,7 +12,10 @@
+ # glu
+ pkg_search_module( GLU glu )
+ if( NOT GLU_FOUND )
+-  tde_message_fatal( "glu is required, but was not found on your system" )
++  check_include_file ( GL/glu.h HAVE_GLU )
++  if( NOT HAVE_GLU )
++    tde_message_fatal( "glu is required, but was not found on your system" )
++  endif ( )
+ endif( )
+ 
+ 
+kfile-plugins/dependencies/poppler-tqt/CMakeFiles/poppler-tqt-shared.dir/build.make
diff --git a/redhat/kdegraphics/kdegraphics-3.5.13-kpovmodeler_missing_gl_ldflags.patch b/redhat/kdegraphics/kdegraphics-3.5.13-kpovmodeler_missing_gl_ldflags.patch
new file mode 100644
index 000000000..84b7b6e4a
--- /dev/null
+++ b/redhat/kdegraphics/kdegraphics-3.5.13-kpovmodeler_missing_gl_ldflags.patch
@@ -0,0 +1,10 @@
+--- kdegraphics/kpovmodeler/ConfigureChecks.cmake.ORI	2011-11-02 21:57:05.000000000 +0100
++++ kdegraphics/kpovmodeler/ConfigureChecks.cmake	2011-11-02 21:57:49.000000000 +0100
+@@ -16,6 +16,7 @@
+   if( NOT HAVE_GLU )
+     tde_message_fatal( "glu is required, but was not found on your system" )
+   endif ( )
++  set( GLU_LIBRARIES "-lGL -lGLU" )
+ endif( )
+ 
+ 
diff --git a/redhat/kdegraphics/kdegraphics-3.5.13-ksnapshot_ldflags.patch b/redhat/kdegraphics/kdegraphics-3.5.13-ksnapshot_ldflags.patch
new file mode 100644
index 000000000..c0e6e3da2
--- /dev/null
+++ b/redhat/kdegraphics/kdegraphics-3.5.13-ksnapshot_ldflags.patch
@@ -0,0 +1,11 @@
+diff -Nuar kdegraphics.ORI/ksnapshot/CMakeLists.txt kdegraphics/ksnapshot/CMakeLists.txt
+--- kdegraphics.ORI/ksnapshot/CMakeLists.txt	2011-05-11 23:29:40.000000000 +0200
++++ kdegraphics/ksnapshot/CMakeLists.txt	2011-10-31 15:45:47.107958154 +0100
+@@ -40,6 +40,6 @@
+   SOURCES
+     ksnapshotiface.skel main.cpp ksnapshot.cpp regiongrabber.cpp
+     windowgrabber.cpp ksnapshotwidget.ui
+-  LINK kdeprint-shared
++  LINK kdeprint-shared Xext
+   DESTINATION ${BIN_INSTALL_DIR}
+ )
diff --git a/redhat/kdegraphics/kdegraphics-3.5.13-xpdf_disable_mkstemps.patch b/redhat/kdegraphics/kdegraphics-3.5.13-xpdf_disable_mkstemps.patch
new file mode 100644
index 000000000..a531fb03d
--- /dev/null
+++ b/redhat/kdegraphics/kdegraphics-3.5.13-xpdf_disable_mkstemps.patch
@@ -0,0 +1,11 @@
+--- kdegraphics.ORI/kpdf/xpdf/aconf.h	2011-04-27 19:32:57.000000000 +0200
++++ kdegraphics/kpdf/xpdf/aconf.h	2011-10-30 14:54:24.000000000 +0100
+@@ -7,7 +7,7 @@
+ #define HAVE_FREETYPE_FREETYPE_H HAVE_FREETYPE
+ #define OPI_SUPPORT 0
+ #define TEXTOUT_WORD_LIST 0
+-#define HAVE_MKSTEMPS 1 //libkdefakes provides it
++#define HAVE_MKSTEMPS 0
+ #define HAVE_SPLASH 1
+ #define SPLASH_CMYK 1
+ #define HAVE_XPDFCORE 0
diff --git a/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec b/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec
new file mode 100644
index 000000000..fcb49e865
--- /dev/null
+++ b/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec
@@ -0,0 +1,372 @@
+# Default version for this component
+%if "%{?version}" == ""
+%define version 3.5.13
+%endif
+%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: cmake >= 2.8
+%define tde_docdir %{_docdir}/kde
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/trinity
+
+
+Name:		trinity-kdegraphics
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{_variant}
+License:	GPL
+Summary:    K Desktop Environment - Graphics Applications
+
+Group:      Applications/Multimedia
+Prefix:		%{_prefix}
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.trinitydesktop.org/
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	kdegraphics-%{version}.tar.gz
+
+# TDE 3.5.13
+## RHEL / Fedora specific patches
+### [kdegraphics/ksnapshot] Missing -lXext in LDFLAGS (required for Fedora 15)
+Patch0:		kdegraphics-3.5.13-ksnapshot_ldflags.patch
+### [kdegraphics/kpovmodeler] CMAKE does not detect GL/glu.h (on RHEL5)
+Patch1:		kdegraphics-3.5.13-kpovmodeler_check_glu.patch
+### [kdegraphics/kfile-plugins/dependencies/poppler-tqt] Compile 'poppler-tqt' only if HAVE_POPPLER_016
+Patch2:		kdegraphics-3.5.13-disable_poppler.patch
+### [kdegraphics/kpdf/xpdf] Disable 'mkstemps' support for RHEL5
+Patch3:		kdegraphics-3.5.13-xpdf_disable_mkstemps.patch
+### [kdegraphics/kpovmodeler] CMAKE missing GLU_LIBRARIES
+Patch4:		kdegraphics-3.5.13-kpovmodeler_missing_gl_ldflags.patch
+
+BuildRequires: tqtinterface-devel
+BuildRequires: trinity-kdelibs-devel
+BuildRequires: trinity-kdebase-devel
+BuildRequires: gettext
+BuildRequires: libmng-devel
+BuildRequires: libpng-devel
+BuildRequires: libtiff-devel
+BuildRequires: libungif-devel
+BuildRequires: automake libtool
+BuildRequires: gphoto2-devel
+BuildRequires: sane-backends-devel
+BuildRequires: libusb-devel
+BuildRequires: t1lib-devel
+BuildRequires: libdrm-devel
+
+# kgamma
+BuildRequires: libXxf86vm-devel
+# kuickshow
+BuildRequires: imlib-devel
+#kfile-plugin
+BuildRequires: OpenEXR-devel
+# kpdf
+BuildRequires: freetype-devel
+BuildRequires: poppler-devel
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
+BuildRequires: poppler-qt-devel
+%endif
+BuildRequires: libpaper-devel
+# ksvg
+BuildRequires: fontconfig-devel
+BuildRequires: fribidi-devel
+BuildRequires: lcms-devel
+BuildRequires: libart_lgpl-devel
+BuildRequires: libXmu-devel
+
+# kpovmodeler
+BuildRequires: libGL-devel libGLU-devel libXi-devel
+
+Requires: tqtinterface
+Requires: trinity-arts
+Requires: trinity-kdelibs
+Requires: ghostscript
+Requires: %{name}-libs = %{version}-%{release}
+
+%if "%{_prefix}" == "/usr"
+Provides: kdegraphics3 = %{version}-%{release}
+Conflicts: kdegraphics
+%endif
+
+%description
+Graphics applications for the K Desktop Environment, including
+* kamera (digital camera support)
+* kcoloredit (palette editor and color chooser)
+* kdvi (displays TeX .dvi files)
+* kghostview (displays postscript files)
+* kiconedit (icon editor)
+* kooka (scanner application)
+* kpdf (displays PDF files)
+* kruler (screen ruler and color measurement tool)
+* ksnapshot (screen capture utility)
+* kview (image viewer for GIF, JPEG, TIFF, etc.)
+
+%package devel
+Summary: Development files for %{name} 
+Provides: kdegraphics3-devel = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
+Group: Development/Libraries
+%description devel
+%{summary}.
+
+## FIXME: move more stuff to -extras
+%package extras
+Summary: Extra applications from %{name} 
+Group: Applications/Multimedia
+Requires: %{name}-libs = %{version}-%{release}
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+
+%description extras
+%{summary}, including:
+* kfax
+* kfaxview
+* kpovmodler
+
+%package libs
+Summary: %{name} runtime libraries
+Group:   System Environment/Libraries
+Requires: trinity-kdelibs >= %{version}
+# include to be paranoid, installing libs-only is still mostly untested -- Rex
+Requires: %{name} = %{version}-%{release}
+%description libs
+%{summary}.
+
+
+
+%prep
+%setup -q -n kdegraphics
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%if 0%{?rhel} && 0%{?rhel} <= 5
+%patch3 -p1
+%endif
+%patch4 -p1
+
+%build
+unset QTDIR || : ; . /etc/profile.d/qt.sh
+export PATH="%{_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{_libdir}/pkgconfig"
+export CMAKE_INCLUDE_PATH="%{_includedir}:%{_includedir}/tqt"
+export LD_LIBRARY_PATH="%{_libdir}"
+
+%__mkdir build
+cd build
+%cmake \
+  -DWITH_T1LIB=ON \
+  -DWITH_LIBPAPER=ON \
+  -DWITH_TIFF=ON \
+  -DWITH_OPENEXR=ON \
+%if 0%{?rhel} && 0%{?rhel} <= 5
+  -DWITH_PDF=OFF \
+%else
+  -DWITH_PDF=ON \
+%endif
+  -DBUILD_ALL=ON \
+  ..
+
+%__make %{?_smp_mflags}
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+# locale's
+%find_lang %{name} || touch %{name}.lang
+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 ] && ln -nsf ../common $i/common
+      done
+    popd
+  fi
+done
+fi
+
+# rpmdocs
+for dir in k* ; do
+  for file in AUTHORS ChangeLog README TODO ; do
+    if test -s "$dir/$file" ; then
+       install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file"
+       echo "%doc rpmdocs/$dir/" >> %{name}.lang
+    fi
+  done
+done
+
+# unpackaged files
+# omit kpovmodeler-devel files (for now) -- Rex
+rm -f %{buildroot}/libkpovmodeler.so
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+for f in crystalsvg hicolor ; do
+  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun
+for f in crystalsvg hicolor ; do
+  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
+%post extras
+/sbin/ldconfig ||:
+for f in crystalsvg hicolor ; do
+  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun extras
+/sbin/ldconfig ||:
+for f in crystalsvg hicolor ; do
+  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+
+%files extras
+%defattr(-,root,root,-)
+
+# kfax
+%doc rpmdocs/kfax/
+%{_bindir}/kfax
+%{_datadir}/applications/kde/kfax.desktop
+%{_datadir}/apps/kfax/
+%{_datadir}/icons/hicolor/??x??/apps/kfax.png
+%{_datadir}/icons/hicolor/scalable/apps/kfax.svgz
+
+# kfaxview
+%{_bindir}/kfaxview
+%{_libdir}/libkfaximage.so
+%{_libdir}/libkfaximage.la
+%{tde_libdir}/kfaxviewpart.*
+%{_datadir}/applications/kde/kfaxview.desktop
+%{_datadir}/apps/kfaxview/
+%{_datadir}/icons/hicolor/??x??/apps/kfaxview.png
+%{_datadir}/icons/hicolor/scalable/apps/kfaxview.svgz
+%{_datadir}/services/kfaxmultipage.desktop
+%{_datadir}/services/kfaxmultipage_tiff.desktop
+
+# kpovmodeler
+%doc rpmdocs/kpovmodeler/
+%doc %{tde_docdir}/HTML/en/kpovmodeler/
+%{_bindir}/kpovmodeler
+%{_libdir}/libkpovmodeler.so.*
+%{_libdir}/libkpovmodeler.la
+%{tde_libdir}/libkpovmodelerpart.*
+%{_datadir}/applications/kde/kpovmodeler.desktop
+%{_datadir}/apps/kpovmodeler/
+%{_datadir}/icons/crystalsvg/*/mimetypes/kpovmodeler_doc.*
+%{_datadir}/icons/hicolor/*/apps/kpovmodeler.*
+
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING README
+%doc rpmdocs/*
+
+# kfax
+%exclude %{_bindir}/kfax
+%exclude %{_datadir}/applications/kde/kfax.desktop
+%exclude %{_datadir}/apps/kfax/
+%exclude %{_datadir}/icons/hicolor/*/apps/kfax.*
+
+# kfaxview
+%exclude %{_bindir}/kfaxview
+%exclude %{_libdir}/libkfaximage.so
+%exclude %{_libdir}/libkfaximage.la
+%exclude %{tde_libdir}/kfaxviewpart.*
+%exclude %{_datadir}/applications/kde/kfaxview.desktop
+%exclude %{_datadir}/apps/kfaxview/
+%exclude %{_datadir}/icons/hicolor/*/apps/kfaxview.*
+%exclude %{_datadir}/services/kfaxmultipage.desktop
+%exclude %{_datadir}/services/kfaxmultipage_tiff.desktop
+
+# kpovmodeler
+%exclude %{tde_docdir}/HTML/en/kpovmodeler/
+%exclude %{_bindir}/kpovmodeler
+%exclude %{_libdir}/libkpovmodeler.*
+%exclude %{tde_libdir}/libkpovmodelerpart.*
+%exclude %{_datadir}/applications/kde/kpovmodeler.desktop
+%exclude %{_datadir}/apps/kpovmodeler/
+%exclude %{_datadir}/icons/crystalsvg/*/mimetypes/kpovmodeler_doc.*
+%exclude %{_datadir}/icons/hicolor/*/apps/kpovmodeler.*
+
+%{_bindir}/*
+%{_datadir}/applications/kde/*.desktop
+%{_datadir}/applnk/Graphics/*kruler.desktop
+%{_datadir}/apps/*
+%{_datadir}/icons/crystalsvg/*/*/*
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/config*/*
+%{_datadir}/service*/*
+%{_datadir}/mimelnk/*/*
+%{_libdir}/libkdeinit_*.so
+%{tde_libdir}/*
+%doc %lang(en) %{tde_docdir}/HTML/en/*
+
+%files libs
+%defattr(-,root,root,-)
+%exclude %{_libdir}/libkfaximage.la
+%exclude %{_libdir}/libkpovmodeler.la
+%exclude %{_libdir}/libkpovmodeler.so.*
+%{_libdir}/lib*.so.*
+%{_libdir}/lib*.la
+# Why ???
+%{_libdir}/libdjvu.so
+
+%files devel
+%defattr(-,root,root,-)
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
+%{tde_includedir}/*
+%endif
+%{_includedir}/dom/*
+%{_includedir}/ksvg/*
+%{_includedir}/kviewshell/*
+%{_includedir}/libtext2path-0.1/*
+%{_includedir}/kmultipageInterface.h
+%{_datadir}/cmake/*.cmake
+%{_libdir}/lib*.so
+#exclude %{_libdir}/libkpovmodeler.so
+%exclude %{_libdir}/libkfaximage.so
+%exclude %{_libdir}/libkdeinit_*.so
+%exclude %{_libdir}/libdjvu.so
+
+%changelog
+* Wed Nov 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
+- Fix kpovmodeler compilation on RHEL 5 (patch4)
+
+* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
+- Initial release for RHEL 6, RHEL 5 and Fedora 15
+- RHEL 5 build has some features disabled (see patches)
+
+* Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
+- Import to GIT
diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
index 4b98b33f9..404a432c7 100755
--- a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
+++ b/redhat/kdelibs/trinity-kdelibs-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"
@@ -15,69 +15,91 @@ BuildRequires: cmake >= 2.8
 %define tde_docdir %{_docdir}/kde
 %define tde_libdir %{_libdir}/trinity
 
+# Older RHEL/Fedora versions use packages named "qt", "qt-devel", ..
+# whereas newer versions use "qt3", "qt3-devel" ...
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 8
+%define _qt_suffix 3
+%endif
+
 
 Name:		trinity-kdelibs
 Version:	%{version}
 Release:	%{?release}%{?dist}%{?_variant}
 License:	GPL
-Summary:	Trinity KDE Libraries
+Summary:	TDE Libraries
+Group:		System Environment/Libraries
 
 Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.trinitydesktop.org/
 
-Source0:	kdelibs-%{version}.tar.gz
 Prefix:		%{_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	kdelibs-%{version}.tar.gz
 
 BuildRequires:	libtool
 BuildRequires:	tqtinterface-devel
 BuildRequires:	trinity-arts-devel
-BuildRequires:	qt3-devel
-BuildRequires:	avahi-devel avahi-qt3-devel
-#BuildRequires:	lua-devel
+BuildRequires:	avahi-devel
+BuildRequires:	lua-devel
 BuildRequires:	krb5-devel libxslt-devel cups-devel libart_lgpl-devel pcre-devel
 BuildRequires:	libutempter-devel
 BuildRequires:	bzip2-devel
 BuildRequires:	openssl-devel
-
-Requires:	tqtinterface
-Requires:	trinity-arts
-Requires:	qt3
-Requires:	avahi avahi-qt3
+BuildRequires:	gcc-c++
+BuildRequires:	alsa-lib-devel
+BuildRequires:	libidn-devel
+BuildRequires:	qt%{?_qt_suffix}-devel
+BuildRequires:	avahi-qt3-devel
+BuildRequires:	jasper-devel
+
+Requires:		tqtinterface
+Requires:		trinity-arts
+Requires:		avahi
+Requires:		qt%{?_qt_suffix}
+Requires:		avahi-qt3
 
 %if "%{?_prefix}" == "/usr"
-Obsoletes:	kdelibs3
+Obsoletes:		kdelibs%{?_qt_suffix}
 %endif
 
 %description
-Libraries for the Trinity K Desktop Environment
+Libraries for the Trinity Desktop Environment:
+KDE Libraries included: kdecore (KDE core library), kdeui (user interface),
+kfm (file manager), khtmlw (HTML widget), kio (Input/Output, networking),
+kspell (spelling checker), jscript (javascript), kab (addressbook),
+kimgio (image manipulation).
+
 
 %package devel
-Requires:	%{name}
 Summary:	%{name} - Development files
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
 %if "%{?_prefix}" == "/usr"
-Obsoletes:	kdelibs3-devel
+Obsoletes:	kdelibs%{?_qt_suffix}-devel
 %endif
 
 %description devel
-Development files for %{name}
+This package includes the header files you will need to compile
+applications for TDE.
 
 %package apidocs
-Requires:	%{name}
+Group:		Development/Libraries
 Summary:	%{name} - API documentation
+Requires:	%{name} = %{version}-%{release}
+%if "%{?_prefix}" == "/usr"
+Obsoletes:	kdelibs%{?_qt_suffix}-apidocs-devel
+%endif
 
 %description apidocs
-This package includes the KDE 3 API documentation in HTML
+This package includes the TDE API documentation in HTML
 format for easy browsing
 
+
 %prep
 %setup -q -n kdelibs
 
-# Gets the cmake modules in current build directory
-%__mkdir_p cmake/modules
-%__cp -f %{_datadir}/cmake/*.* cmake/modules
-
-
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 export PATH="%{_bindir}:${PATH}"
@@ -109,17 +131,17 @@ cd build
 
 %install
 %__rm -rf %{?buildroot}
-%__mkdir_p %{?buildroot}
-%make_install -C build
+%__make install DESTDIR=%{?buildroot} -C build
 
 %__mkdir_p %{?buildroot}%{_sysconfdir}/ld.so.conf.d
 cat <<EOF >%{?buildroot}%{_sysconfdir}/ld.so.conf.d/trinity.conf
 %if "%{?_prefix}" != "/usr"
 %{_libdir}
 %endif
-%{_libdir}/trinity
+%{tde_libdir}
 EOF
 
+
 %clean
 %__rm -rf %{?buildroot}
 
@@ -259,6 +281,9 @@ EOF
 
 
 %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
+
 * Wed Sep 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13pre.svn20110902-0.el6
 - Import to GIT
 - Built with future TDE version (3.5.13 + cmake + QT3.3.8d)
diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec~ b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec~
new file mode 100755
index 000000000..4b98b33f9
--- /dev/null
+++ b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec~
@@ -0,0 +1,264 @@
+# Default version for this component
+%if "%{?version}" == ""
+%define version 3.5.13
+%endif
+%define release 0
+
+# 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 variables
+BuildRequires: cmake >= 2.8
+%define tde_docdir %{_docdir}/kde
+%define tde_libdir %{_libdir}/trinity
+
+
+Name:		trinity-kdelibs
+Version:	%{version}
+Release:	%{?release}%{?dist}%{?_variant}
+License:	GPL
+Summary:	Trinity KDE Libraries
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.trinitydesktop.org/
+
+Source0:	kdelibs-%{version}.tar.gz
+Prefix:		%{_prefix}
+
+BuildRequires:	libtool
+BuildRequires:	tqtinterface-devel
+BuildRequires:	trinity-arts-devel
+BuildRequires:	qt3-devel
+BuildRequires:	avahi-devel avahi-qt3-devel
+#BuildRequires:	lua-devel
+BuildRequires:	krb5-devel libxslt-devel cups-devel libart_lgpl-devel pcre-devel
+BuildRequires:	libutempter-devel
+BuildRequires:	bzip2-devel
+BuildRequires:	openssl-devel
+
+Requires:	tqtinterface
+Requires:	trinity-arts
+Requires:	qt3
+Requires:	avahi avahi-qt3
+
+%if "%{?_prefix}" == "/usr"
+Obsoletes:	kdelibs3
+%endif
+
+%description
+Libraries for the Trinity K Desktop Environment
+
+%package devel
+Requires:	%{name}
+Summary:	%{name} - Development files
+%if "%{?_prefix}" == "/usr"
+Obsoletes:	kdelibs3-devel
+%endif
+
+%description devel
+Development files for %{name}
+
+%package apidocs
+Requires:	%{name}
+Summary:	%{name} - API documentation
+
+%description apidocs
+This package includes the KDE 3 API documentation in HTML
+format for easy browsing
+
+%prep
+%setup -q -n kdelibs
+
+# Gets the cmake modules in current build directory
+%__mkdir_p cmake/modules
+%__cp -f %{_datadir}/cmake/*.* cmake/modules
+
+
+%build
+unset QTDIR || : ; . /etc/profile.d/qt.sh
+export PATH="%{_bindir}:${PATH}"
+export LD_LIBRARY_PATH="%{_libdir}"
+export PKG_CONFIG_PATH="%{_libdir}/pkgconfig"
+export CMAKE_INCLUDE_PATH="%{_includedir}:%{_includedir}/tqt"
+
+%__mkdir build
+cd build
+%cmake \
+  -DWITH_ARTS=ON \
+  -DWITH_ALSA=ON \
+  -DWITH_LIBART=ON \
+  -DWITH_LIBIDN=OFF \
+  -DWITH_SSL=ON \
+  -DWITH_CUPS=ON \
+  -DWITH_LUA=OFF \
+  -DWITH_TIFF=ON \
+  -DWITH_JASPER=ON \
+  -DWITH_OPENEXR=ON \
+  -DWITH_UTEMPTER=ON \
+  -DWITH_AVAHI=ON \
+  -DWITH_ASPELL=OFF \
+  -DWITH_HSPELL=OFF \
+  ..
+
+%__make %{?_smp_mflags}
+
+
+%install
+%__rm -rf %{?buildroot}
+%__mkdir_p %{?buildroot}
+%make_install -C build
+
+%__mkdir_p %{?buildroot}%{_sysconfdir}/ld.so.conf.d
+cat <<EOF >%{?buildroot}%{_sysconfdir}/ld.so.conf.d/trinity.conf
+%if "%{?_prefix}" != "/usr"
+%{_libdir}
+%endif
+%{_libdir}/trinity
+EOF
+
+%clean
+%__rm -rf %{?buildroot}
+
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+
+%files
+%defattr(-,root,root,-)
+%doc README
+%doc COPYING.LIB
+%{_bindir}/artsmessage
+%{_bindir}/cupsdconf
+%{_bindir}/cupsdoprint
+%{_bindir}/dcop
+%{_bindir}/dcopclient
+%{_bindir}/dcopfind
+%{_bindir}/dcopobject
+%{_bindir}/dcopquit
+%{_bindir}/dcopref
+%{_bindir}/dcopserver
+%{_bindir}/dcopserver_shutdown
+%{_bindir}/dcopstart
+%{_bindir}/filesharelist
+%{_bindir}/fileshareset
+%{_bindir}/imagetops
+%{_bindir}/kab2kabc
+%{_bindir}/kaddprinterwizard
+%{_bindir}/kbuildsycoca
+%{_bindir}/kcmshell
+%{_bindir}/kconf_update
+%{_bindir}/kcookiejar
+%{_bindir}/kde-config
+%{_bindir}/kde-menu
+%{_bindir}/kded
+%{_bindir}/kdeinit
+%{_bindir}/kdeinit_shutdown
+%{_bindir}/kdeinit_wrapper
+%{_bindir}/kdesu_stub
+%{_bindir}/kdontchangethehostname
+%{_bindir}/kdostartupconfig
+%{_bindir}/kfile
+%{_bindir}/kfmexec
+%{_bindir}/khotnewstuff
+%{_bindir}/kinstalltheme
+%{_bindir}/kio_http_cache_cleaner
+%{_bindir}/kio_uiserver
+%{_bindir}/kioexec
+%{_bindir}/kioslave
+%{_bindir}/klauncher
+%{_bindir}/kmailservice
+%{_bindir}/kmimelist
+%attr(4755,root,root) %{_bindir}/kpac_dhcp_helper
+%{_bindir}/ksendbugmail
+%{_bindir}/kshell
+%{_bindir}/kstartupconfig
+%{_bindir}/ktelnetservice
+%{_bindir}/ktradertest
+%{_bindir}/kwrapper
+%{_bindir}/lnusertemp
+%{_bindir}/make_driver_db_cups
+%{_bindir}/make_driver_db_lpr
+%{_bindir}/meinproc
+%{_bindir}/networkstatustestservice
+%{_bindir}/start_kdeinit
+%{_bindir}/start_kdeinit_wrapper
+%attr(4755,root,root) %{_bindir}/kgrantpty
+%{_libdir}/lib*.so.*
+%{_libdir}/libkdeinit_*.so
+%{_libdir}/lib*.la
+%{tde_libdir}/
+%{_datadir}/applications/kde/*.desktop
+%{_datadir}/autostart/kab2kabc.desktop
+%{_datadir}/applnk/kio_iso.desktop
+%{_datadir}/apps/*
+%exclude %{_datadir}/apps/ksgmltools2/
+%config(noreplace) %{_datadir}/config/*
+%{_datadir}/emoticons/*
+%{_datadir}/icons/default.kde
+%{_datadir}/mimelnk/magic
+%{_datadir}/mimelnk/*/*.desktop
+%{_datadir}/services/*
+%{_datadir}/servicetypes/*
+%{_datadir}/icons/crystalsvg/
+%{tde_docdir}/HTML/en/kspell
+# remove conflicts with kdelibs-4
+%if "%{?_prefix}" != "/usr"
+%{_bindir}/checkXML
+%{_bindir}/ksvgtopng
+%{_bindir}/kunittestmodrunner
+%{_bindir}/preparetips
+%{_datadir}/icons/hicolor/index.theme
+%{_datadir}/locale/all_languages
+%{tde_docdir}/HTML/en/common/*
+%else
+%exclude %{_bindir}/checkXML
+%exclude %{_bindir}/ksvgtopng
+%exclude %{_bindir}/kunittestmodrunner
+%exclude %{_bindir}/preparetips
+%exclude %{_datadir}/config/colors
+%exclude %{_datadir}/config/kdebug.areas
+%exclude %{_datadir}/config/kdebugrc
+%exclude %{_datadir}/config/ksslcalist
+%exclude %{_datadir}/config/ui/ui_standards.rc
+%exclude %{_datadir}/icons/hicolor/index.theme
+%exclude %{_datadir}/locale/all_languages
+%exclude %{tde_docdir}/HTML/en/common/*
+%endif
+%{_sysconfdir}/ld.so.conf.d/trinity.conf
+
+# Provided by 'redhat-menus' package
+%exclude %{_sysconfdir}/xdg/menus/applications.menu
+
+# New in TDE 3.5.13
+%{_bindir}/kdetcompmgr
+
+%files devel
+%defattr(-,root,root,-)
+%{_bindir}/dcopidl*
+%{_bindir}/kconfig_compiler
+%{_bindir}/makekdewidgets
+%{_datadir}/apps/ksgmltools2/
+%{_includedir}/
+%{_libdir}/lib*.so
+%{_libdir}/lib*.a
+%exclude %{_libdir}/libkdeinit_*.so
+
+# New in TDE 3.5.13
+%{_datadir}/cmake/kdelibs.cmake
+
+%files apidocs
+%defattr(-,root,root,-)
+%{_docdir}/%{name}-%{version}/
+#%{tde_docdir}/HTML/en/kdelibs*
+
+
+%changelog
+* Wed Sep 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13pre.svn20110902-0.el6
+- Import to GIT
+- Built with future TDE version (3.5.13 + cmake + QT3.3.8d)
diff --git a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.12.spec b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.12.spec
index e4f1f310c..82e4df87f 100644
--- a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.12.spec
+++ b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.12.spec
@@ -43,6 +43,8 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0: kdemultimedia-%{version}.tar.gz
 
+Provides: kdemultimedia3 = %{version}-%{release}
+
 # RedHat Legacy patches (from Fedora 8)
 Patch3: kdemultimedia-3.4.0-xdg.patch
 Patch5: kdemultimedia-3.5.7-pthread.patch
@@ -159,7 +161,8 @@ export CXXFLAGS="${CXXFLAGS} -lDCOP"
   %{?_with_musicbrainz} %{!?_with_musicbrainz:--without-musicbrainz} \
   %{?_with_taglib} %{!?_with_taglib:--without-taglib} \
   %{?_with_xine} %{!?_with_xine:--without-xine} \
-   --with-extra-includes=%{_usr}/include/cdda:%{_includedir}/tqt
+   --with-extra-includes=%{_usr}/include/cdda:%{_includedir}/tqt \
+   --enable-closure
 
 %__make %{?_smp_mflags}
 
@@ -172,7 +175,7 @@ export PATH="%{_bindir}:${PATH}"
 %__make install DESTDIR=%{?buildroot}  -C kaudiocreator
 
 ## Remove/uninstall (conflicting) bits we don't want
-rm -f $RPM_BUILD_ROOT%{_libdir}/mcop/akode*MPEGPlayObject.mcopclass
+%__rm -f $RPM_BUILD_ROOT%{_libdir}/mcop/akode*MPEGPlayObject.mcopclass
 
 # only show in KDE, really? -- Rex (FIXME)
 for f in %{buildroot}%{appdir}/*.desktop ; do
@@ -217,6 +220,7 @@ done
 
 
 %post
+/sbin/ldconfig
 for f in crystalsvg hicolor locolor ; do
   touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
   gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
@@ -224,6 +228,7 @@ done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %postun
+/sbin/ldconfig
 for f in crystalsvg hicolor locolor ; do
   touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
   gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
diff --git a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec
index adcafccb5..a57642152 100644
--- a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec
+++ b/redhat/kdemultimedia/trinity-kdemultimedia-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"
@@ -38,8 +38,10 @@ 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: kdemultimedia-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Provides: kdemultimedia3 = %{version}-%{release}
 
@@ -47,10 +49,15 @@ Provides: kdemultimedia3 = %{version}-%{release}
 Patch3: kdemultimedia-3.4.0-xdg.patch
 Patch5: kdemultimedia-3.5.7-pthread.patch
 
+
+Provides: kdemultimedia3 = %{version}-%{release}
+
 Requires: %{name}-libs = %{version}-%{release}
 
-BuildRequires: zlib-devel
+BuildRequires: trinity-arts-devel
 BuildRequires: trinity-kdelibs-devel
+
+BuildRequires: zlib-devel
 BuildRequires: libvorbis-devel
 BuildRequires: audiofile-devel
 BuildRequires: desktop-file-utils
@@ -64,6 +71,8 @@ BuildRequires: automake libtool
 %{?_with_musicbrainz:BuildRequires: libmusicbrainz-devel libtunepimp-devel}
 %{?_with_taglib:BuildRequires: taglib-devel}
 %{?_with_xine:BuildRequires: xine-lib-devel}
+BuildRequires:	libXxf86dga-devel
+BuildRequires:	libXxf86vm-devel
 
 %description
 The K Desktop Environment (KDE) is a GUI desktop for the X Window
@@ -93,14 +102,7 @@ noatun plugins.
 %package extras
 Summary: Extra applications from %{name} 
 Group: Applications/Multimedia
-%if 0%{?libs}
 Requires: %{name}-extras-libs = %{version}-%{release}
-%else
-Obsoletes: %{name}-extras-libs < %{version}-%{release}
-Provides:  %{name}-extras-libs = %{version}-%{release}
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-%endif
 %description extras
 %{summary}, including:
  * juk, a media player
@@ -141,14 +143,9 @@ sed -i admin/acinclude.m4.in \
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
-
-# just to be paranoid -- Rex
-unset QTDIR || : ; . /etc/profile.d/qt.sh
 export PATH="%{_bindir}:${PATH}"
 export LDFLAGS="-L%{_libdir} -I%{_includedir}"
 
-export CXXFLAGS="${LDFLAGS} $(pkg-config --libs gsl)"
-
 %configure  \
    --enable-new-ldflags \
    --disable-dependency-tracking \
@@ -168,19 +165,19 @@ export CXXFLAGS="${LDFLAGS} $(pkg-config --libs gsl)"
   %{?_with_musicbrainz} %{!?_with_musicbrainz:--without-musicbrainz} \
   %{?_with_taglib} %{!?_with_taglib:--without-taglib} \
   %{?_with_xine} %{!?_with_xine:--without-xine} \
-   --with-extra-includes=%{_usr}/include/cdda:%{_includedir}/tqt
+   --with-extra-includes=%{_usr}/include/cdda:%{_includedir}/tqt \
+   --enable-closure
 
 %__make %{?_smp_mflags}
 
 
 %install
-%__rm -rf %{buildroot} 
-
-%make_install
-%make_install -C kaudiocreator
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{?buildroot} 
+%__make install DESTDIR=%{buildroot}
 
 ## Remove/uninstall (conflicting) bits we don't want
-rm -f $RPM_BUILD_ROOT%{_libdir}/mcop/akode*MPEGPlayObject.mcopclass
+%__rm -f $RPM_BUILD_ROOT%{_libdir}/mcop/akode*MPEGPlayObject.mcopclass
 
 # only show in KDE, really? -- Rex (FIXME)
 for f in %{buildroot}%{appdir}/*.desktop ; do
@@ -225,7 +222,7 @@ done
 
 
 %post
-%{?libs:/sbin/ldconfig}
+/sbin/ldconfig
 for f in crystalsvg hicolor locolor ; do
   touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
   gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
@@ -233,14 +230,13 @@ done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %postun
-%{?libs:/sbin/ldconfig}
+/sbin/ldconfig
 for f in crystalsvg hicolor locolor ; do
   touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
   gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
 done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
-%if 0%{?libs}
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
@@ -248,10 +244,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %post extras-libs -p /sbin/ldconfig
 
 %postun extras-libs -p /sbin/ldconfig
-%endif
 
 %post extras
-%{?libs:/sbin/ldconfig}
+/sbin/ldconfig
 for f in crystalsvg hicolor ; do
   touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
   gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
@@ -259,7 +254,7 @@ done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %postun extras
-%{?libs:/sbin/ldconfig}
+/sbin/ldconfig
 for f in crystalsvg hicolor ; do
   touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
   gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
@@ -357,6 +352,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %{_libdir}/mcop/*
 %{_libdir}/libkdeinit_*.so
 #%{_libdir}/liboggarts.so
+%{_libdir}/libmpeg-0.3.0.so
+%{_libdir}/libyafcore.so
+%{_libdir}/libyafxplayer.so
 %{tde_libdir}/*
 %{_libdir}/kconf_update_bin/*
 %{_bindir}/*
@@ -372,6 +370,16 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %{_datadir}/services/*
 %{_datadir}/servicetypes/*
 
+# Misc HTML docs
+%doc %lang(en) %{tde_docdir}/HTML/en/artsbuilder
+%doc %lang(en) %{tde_docdir}/HTML/en/kaudiocreator
+%doc %lang(en) %{tde_docdir}/HTML/en/kioslave/audiocd.docbook
+%doc %lang(en) %{tde_docdir}/HTML/en/kmid
+%doc %lang(en) %{tde_docdir}/HTML/en/kmix
+%doc %lang(en) %{tde_docdir}/HTML/en/krec
+%doc %lang(en) %{tde_docdir}/HTML/en/kscd
+
+
 %files libs
 %defattr(-,root,root,-)
 %exclude %{_libdir}/libnoatun*.*
@@ -388,9 +396,14 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %exclude %{_libdir}/libnoatunarts.*
 #exclude %{_libdir}/liboggarts.so
 %exclude %{_libdir}/libwinskinvis.so
-
+%exclude %{_libdir}/libmpeg-0.3.0.so
+%exclude %{_libdir}/libyafcore.so
+%exclude %{_libdir}/libyafxplayer.so
 
 %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
+
 * Sat Sep 09 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
-- Initial build for RHEL 6
+- Import to GIT
 - Spec file based on Fedora 8 "kdemultimedia-6:3.5.10-2"
diff --git a/redhat/kdenetwork/kdenetwork-3.2.3-resolv.patch b/redhat/kdenetwork/kdenetwork-3.2.3-resolv.patch
new file mode 100644
index 000000000..11d1c6cb6
--- /dev/null
+++ b/redhat/kdenetwork/kdenetwork-3.2.3-resolv.patch
@@ -0,0 +1,26 @@
+--- kdenetwork-3.2.3/kppp/connect.cpp.orig	2004-07-01 16:03:52.861908057 +0200
++++ kdenetwork-3.2.3/kppp/connect.cpp	2004-07-01 16:33:35.943692521 +0200
+@@ -1399,9 +1399,13 @@
+ 
+ void addpeerdns() {
+   int fd, fd2;
++  QString p = "/var/run/ppp/resolv.conf";
++
++  if (!QFile::exists(p))
++      p = "/etc/ppp/resolv.conf";
+ 
+   if((fd = Requester::rq->openResolv(O_WRONLY|O_APPEND)) >= 0) {
+-    if((fd2 = open("/etc/ppp/resolv.conf", O_RDONLY)) >= 0) {
++    if((fd2 = open(p.latin1(), O_RDONLY)) >= 0) {
+       char c;
+       int i = 0;
+       while(i++ < 100 && read(fd2, &c, 1) == 1) {
+@@ -1412,7 +1416,7 @@
+       }
+       close(fd2);
+     } else
+-      fprintf(stderr, "failed to read from /etc/ppp/resolv.conf\n");
++      fprintf(stderr, "failed to read from %s\n", p.latin1());
+     close(fd);
+   }
+   add_domain(gpppdata.domain());
diff --git a/redhat/kdenetwork/kdenetwork-3.5.8-kppp.patch b/redhat/kdenetwork/kdenetwork-3.5.8-kppp.patch
new file mode 100644
index 000000000..ebd9fa7fa
--- /dev/null
+++ b/redhat/kdenetwork/kdenetwork-3.5.8-kppp.patch
@@ -0,0 +1,9 @@
+diff -up kdenetwork-3.5.8/kppp/Kppp.desktop.kppp kdenetwork-3.5.8/kppp/Kppp.desktop
+--- kdenetwork-3.5.8/kppp/Kppp.desktop.kppp	2007-10-08 04:49:13.000000000 -0500
++++ kdenetwork-3.5.8/kppp/Kppp.desktop	2007-10-13 16:03:03.000000000 -0500
+@@ -66,5 +66,4 @@ Path=
+ Type=Application
+ Terminal=false
+ X-KDE-StartupNotify=true
+-X-DCOP-ServiceType=Multi
+ Categories=Qt;KDE;Network;Dialup;
diff --git a/redhat/kdenetwork/kdenetwork-3.5.9-krfb_httpd.patch b/redhat/kdenetwork/kdenetwork-3.5.9-krfb_httpd.patch
new file mode 100644
index 000000000..8d7c53693
--- /dev/null
+++ b/redhat/kdenetwork/kdenetwork-3.5.9-krfb_httpd.patch
@@ -0,0 +1,33 @@
+diff -ur kdenetwork-orig/krfb/krfb_httpd/krfb_httpd kdenetwork-3.5.9/krfb/krfb_httpd/krfb_httpd
+--- kdenetwork-orig/krfb/krfb_httpd/krfb_httpd	2007-05-14 09:40:05.000000000 +0200
++++ kdenetwork-3.5.9/krfb/krfb_httpd/krfb_httpd	2008-02-26 12:43:21.000000000 +0100
+@@ -6,17 +6,14 @@
+ fi
+ 
+ read request url httptype || exit 0
+-url="${url/
+-/}"
+-httptype="${httptype/
+-/}"
++url="${url/
/}"
++httptype="${httptype/
/}"
+ 
+ if [ "x$httptype" != "x" ]; then
+ 	line="x"
+ 	while [ -n "$line" ]; do
+ 		read line || exit 0
+-		line="${line/
+-/}"
++		line="${line/
/}"
+ 	done
+ fi
+ # echo "url = $url, request = $request" >> /tmp/httpd.log
+@@ -38,7 +35,7 @@
+ 	content="
+ <HTML><HEAD><TITLE>$LOGNAME's desktop</TITLE></HEAD>
+ <BODY>
+-<APPLET CODE=VncViewer.class ARCHIVE=VncViewer.jar WIDTH=$width HEIGHT=$height>
++<APPLET CODE=vncviewer/VNCViewer.class ARCHIVE=vncviewer.jar WIDTH=$width HEIGHT=$height>
+ 	<param name=PORT value=$port>
+ </APPLET>
+ </BODY></HTML>"
diff --git a/redhat/kdenetwork/kdenetwork-kopete-gcc45.patch b/redhat/kdenetwork/kdenetwork-kopete-gcc45.patch
new file mode 100644
index 000000000..f93e68922
--- /dev/null
+++ b/redhat/kdenetwork/kdenetwork-kopete-gcc45.patch
@@ -0,0 +1,57 @@
+*** kdenetwork/kopete/protocols/testbed/testbedaccount.h.ORI	2011-08-24 00:30:58.403965000 +0200
+--- kdenetwork/kopete/protocols/testbed/testbedaccount.h	2011-08-24 00:31:29.706965000 +0200
+***************
+*** 59,65 ****
+  	/**
+  	 * 'Connect' to the testbed server.  Only sets myself() online.
+  	 */
+! 	virtual void connect( const Kopete::OnlineStatus& initialStatus = Kopete::OnlineStatus::OnlineStatus() );
+  	/**
+  	 * Disconnect from the server.  Only sets myself() offline.
+  	 */
+--- 59,65 ----
+  	/**
+  	 * 'Connect' to the testbed server.  Only sets myself() online.
+  	 */
+! 	virtual void connect( const Kopete::OnlineStatus& initialStatus = Kopete::OnlineStatus() );
+  	/**
+  	 * Disconnect from the server.  Only sets myself() offline.
+  	 */
+*** kdenetwork/kopete/kopete/contactlist/kopetegroupviewitem.cpp.ORI	2011-08-24 00:28:22.080965001 +0200
+--- kdenetwork/kopete/kopete/contactlist/kopetegroupviewitem.cpp	2011-08-24 00:28:36.149965002 +0200
+***************
+*** 175,181 ****
+  	// the sorting itself is rather slow. Therefore we call delayedSort, which tries
+  	// to group multiple sort requests into one.
+  	using namespace Kopete::UI::ListView;
+! 	if ( ListView::ListView *lv = dynamic_cast<ListView::ListView *>( listView() ) )
+  		lv->delayedSort();
+  	else
+  		listView()->sort();
+--- 175,181 ----
+  	// the sorting itself is rather slow. Therefore we call delayedSort, which tries
+  	// to group multiple sort requests into one.
+  	using namespace Kopete::UI::ListView;
+! 	if ( ListView *lv = dynamic_cast<ListView *>( listView() ) )
+  		lv->delayedSort();
+  	else
+  		listView()->sort();
+*** kdenetwork/kopete/kopete/chatwindow/krichtexteditpart.cpp.ORI	2011-08-24 00:29:00.953965001 +0200
+--- kdenetwork/kopete/kopete/chatwindow/krichtexteditpart.cpp	2011-08-24 00:29:21.080965001 +0200
+***************
+*** 38,44 ****
+  KopeteRichTextEditPart::KopeteRichTextEditPart( TQWidget *wparent, const char *wname, TQObject*, const char*, const TQStringList& )
+  	: KParts::ReadOnlyPart( wparent, wname ? wname : "rich_text_part" )
+  {
+! 	KopeteRichTextEditPart::KopeteRichTextEditPart( wparent, wname, false );
+  }
+  
+  KopeteRichTextEditPart::KopeteRichTextEditPart( TQWidget *parent, const char *name, int capabilities )
+--- 38,44 ----
+  KopeteRichTextEditPart::KopeteRichTextEditPart( TQWidget *wparent, const char *wname, TQObject*, const char*, const TQStringList& )
+  	: KParts::ReadOnlyPart( wparent, wname ? wname : "rich_text_part" )
+  {
+! 	KopeteRichTextEditPart( wparent, wname, false );
+  }
+  
+  KopeteRichTextEditPart::KopeteRichTextEditPart( TQWidget *parent, const char *name, int capabilities )
diff --git a/redhat/kdenetwork/kppp.pamd b/redhat/kdenetwork/kppp.pamd
new file mode 100644
index 000000000..c7d67e332
--- /dev/null
+++ b/redhat/kdenetwork/kppp.pamd
@@ -0,0 +1,4 @@
+#%PAM-1.0
+auth		include		config-util
+account		include		config-util
+session		include		config-util
diff --git a/redhat/kdenetwork/ktalk b/redhat/kdenetwork/ktalk
new file mode 100644
index 000000000..4458a0964
--- /dev/null
+++ b/redhat/kdenetwork/ktalk
@@ -0,0 +1,12 @@
+# default: off
+# description: KDE version of the talk server (accepting talk requests
+#              for chatting with users on other systems).
+service ntalk
+{
+	disable		= yes
+	socket_type	= dgram
+	wait		= yes
+	user		= root
+	group		= tty
+	server		= /usr/bin/ktalkd
+}
diff --git a/redhat/kdenetwork/lisa.redhat b/redhat/kdenetwork/lisa.redhat
new file mode 100644
index 000000000..bcc059e86
--- /dev/null
+++ b/redhat/kdenetwork/lisa.redhat
@@ -0,0 +1,91 @@
+#!/bin/bash
+#
+# Startup script for LISa
+#
+# chkconfig: - 92 36
+# description: LISa is a small daemon which is intended to run on \
+#              end user systems. It provides something like a \
+#              "network neighbourhood", but only relying on the TCP/IP \
+#              protocol stack, no smb or whatever.\
+#              The information about the hosts in your "neighbourhood" \
+#              is provided via TCP port 7741.
+# processname: lisa
+# config: /etc/lisarc
+
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+# Source function library.
+if [ -f /etc/init.d/functions ] ; then
+  . /etc/init.d/functions
+elif [ -f /etc/rc.d/init.d/functions ] ; then
+  . /etc/rc.d/init.d/functions
+else
+  exit 0
+fi
+
+# Some definitions.
+lisa=/usr/bin/lisa
+prog=LISa
+OPTIONS="--quiet --config=/etc/lisarc"
+RETVAL=0
+
+#
+start() {
+        echo -n $"Starting $prog: "
+        daemon $lisa $OPTIONS
+        RETVAL=$?
+        echo
+        if [ $RETVAL = 0 ] ; then
+           touch /var/lock/subsys/lisa
+        else
+           RETVAL=1
+        fi
+        return $RETVAL
+}
+
+stop() {
+	echo -n $"Stopping $prog: "
+	killproc $lisa
+	RETVAL=$?
+	echo
+	if [ $RETVAL = 0 ] ; then
+           rm -f /var/lock/subsys/lisa
+        else
+           RETVAL=1
+        fi
+        return $RETVAL
+}
+
+reload() {
+	echo -n $"Reloading $prog: "
+	killproc $lisa -HUP
+	RETVAL=$?
+	echo
+}
+
+# See how we were called.
+case "$1" in
+  start)
+	start
+	;;
+  stop)
+	stop
+	;;
+  status)
+        status $lisa
+	RETVAL=$?
+	;;
+  restart)
+	stop
+	start
+	;;
+  condrestart)
+        [ -f /var/lock/subsys/lisa ] && restart
+        ;;
+  *)
+	echo $"Usage: $prog {start|stop|restart|status|condrestart}"
+	exit 1
+esac
+
+exit $RETVAL
diff --git a/redhat/kdenetwork/lisarc b/redhat/kdenetwork/lisarc
new file mode 100644
index 000000000..9b5cc84d1
--- /dev/null
+++ b/redhat/kdenetwork/lisarc
@@ -0,0 +1,10 @@
+PingAddresses = 127.0.0.1/255.255.255.0;
+PingNames = 
+AllowedAddresses = 127.0.0.1/255.255.255.0;
+BroadcastNetwork = 127.0.0.1/255.255.255.0;
+SearchUsingNmblookup = 0
+FirstWait = 30
+SecondWait = -1
+UpdatePeriod = 150
+DeliverUnnamedHosts = 1
+MaxPingsAtOnce = 256
diff --git a/redhat/kdenetwork/r1243951.diff b/redhat/kdenetwork/r1243951.diff
new file mode 100644
index 000000000..1ee7d4e3b
--- /dev/null
+++ b/redhat/kdenetwork/r1243951.diff
@@ -0,0 +1,42 @@
+Index: kdenetwork/kopete/libkopete/avdevice/configure.in.in
+===================================================================
+--- kdenetwork/kopete/libkopete/avdevice/configure.in.in	(revision 0)
++++ kdenetwork/kopete/libkopete/avdevice/configure.in.in	(revision 1243951)
+@@ -0,0 +1,21 @@
++# -- Check for libv4l1-videodev.h presence --------------------
++
++AC_MSG_CHECKING([for libv4l1-videodev.h])
++
++AC_TRY_COMPILE([
++#include <libv4l1-videodev.h>
++],
++[
++],
++        ac_have_libv4l1_videodev_h=yes
++,
++        ac_have_libv4l1_videodev_h=no
++)
++
++if test $ac_have_libv4l1_videodev_h = yes; then
++        AC_DEFINE(HAVE_LIBV4L1_VIDEODEV_H, 1, [Define if you have libv4l1-videodev.h installed])
++fi
++
++AC_MSG_RESULT($ac_have_libv4l1_videodev_h)
++
++# -- End libv4l1-videodev.h ----------------------------------------------
+Index: kdenetwork/kopete/libkopete/avdevice/videodevice.h
+===================================================================
+--- kdenetwork/kopete/libkopete/avdevice/videodevice.h	(revision 1243950)
++++ kdenetwork/kopete/libkopete/avdevice/videodevice.h	(revision 1243951)
+@@ -52,7 +52,11 @@
+ 
+ #include <linux/fs.h>
+ #include <linux/kernel.h>
++#if defined(HAVE_LIBV4L1_VIDEODEV_H)
++#include <libv4l1-videodev.h>
++#else
+ #include <linux/videodev.h>
++#endif
+ #define VIDEO_MODE_PAL_Nc  3
+ #define VIDEO_MODE_PAL_M   4
+ #define VIDEO_MODE_PAL_N   5
diff --git a/redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec b/redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec
new file mode 100644
index 000000000..d06c7b328
--- /dev/null
+++ b/redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec
@@ -0,0 +1,473 @@
+# Default version for this component
+%if "%{?version}" == ""
+%define version 3.5.13
+%endif
+%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: cmake >= 2.8
+%define tde_docdir %{_docdir}/kde
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/trinity
+
+
+# Fedora review:  http://bugzilla.redhat.com/195486
+
+## Conditional build:
+# disabled, for now, doesn't build -- Rex
+#define _enable_jingle --enable-jingle
+#define _enable_slp --enable-slp
+# RHEL6: xmms is outdated !
+#define _with_xmms --with-xmms
+%ifnarch s390 s390x
+%define _with_wifi --with-wifi
+%endif
+
+%define console_helper 1 
+
+Name:    trinity-kdenetwork
+Version: %{?version}
+Release: %{?release}%{?dist}%{?_variant}
+Summary: K Desktop Environment - Network Applications
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.trinitydesktop.org/
+
+License: GPLv2
+Group:   Applications/Internet
+
+Prefix:		%{_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Provides: kdenetwork3 = %{version}-%{release}
+
+Source0: kdenetwork-%{version}.tar.gz
+Source1: kppp.pamd
+Source2: ktalk
+Source4: lisarc
+Source5: lisa.redhat
+
+# RedHat/Fedora legacy patches
+Patch3: kdenetwork-3.5.8-kppp.patch
+Patch4: kdenetwork-3.2.3-resolv.patch
+# include more/proper ppp headers
+Patch6: kdenetwork-3.5.9-krfb_httpd.patch
+
+Requires: %{name}-libs = %{version}-%{release}
+
+BuildRequires: gettext
+BuildRequires: trinity-kdelibs-devel
+BuildRequires: coreutils 
+BuildRequires: openssl-devel
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
+BuildRequires: libXmu-devel libXScrnSaver-devel libXtst-devel libXxf86vm-devel
+%endif
+%if "%{?_with_wifi:1}" == "1"
+%if 0%{?fedora} > 5 || 0%{?rhel} > 4
+BuildRequires: wireless-tools-devel
+%else
+BuildRequires: wireless-tools
+%endif
+%endif
+%{?_enable_slp:BuildRequires: openslp-devel}
+## kopete:
+BuildRequires: libxml2-devel libxslt-devel
+%ifarch %{ix86}
+# BR: %{_includedir}/valgrind/valgrind.h
+BuildRequires: valgrind
+%endif
+#jabber
+BuildRequires: libidn-devel
+#jabber/jingle
+%{?_enable_jingle:BuildRequires: expat-devel glib2-devel ortp-devel speex-devel}
+# jabber/ssl
+#{?fedora:Requires(hint): qca-tls}
+# sametime
+BuildRequires: meanwhile-devel
+%{?_with_xmms:BuildRequires: xmms-devel}
+Requires: jasper
+## kppp
+Requires: ppp
+## krdc
+Requires: rdesktop
+## lisa
+Requires(preun):  chkconfig
+Requires(post):   chkconfig
+#Requires(hint): samba-client
+BuildRequires:  avahi-qt3-devel
+
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
+BuildRequires:	libv4l-devel
+%endif
+
+# The following libraries are not available on RHEL
+%if 0%{?fedora} >= 15
+BuildRequires: libgadu-devel
+BuildRequires: openslp-devel
+BuildRequires: libjingle-devel
+%endif
+
+%if 0%{?console_helper}
+Requires: usermode-gtk
+%endif
+
+
+%description
+Networking applications, including:
+* kget: downloader manager
+* kio_lan: lan browsing kio slave
+* knewsticker: RDF newsticker applet
+* kopete: chat client
+* kppp: dialer and front end for pppd
+* krdc: a client for Desktop Sharing and other VNC servers
+* krfb: Desktop Sharing server, allow others to access your desktop via VNC
+* lisa: lan information server
+
+%package devel
+Summary: Development files for %{name} 
+Group: Development/Libraries
+Provides: kdenetwork3-devel = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
+Requires: trinity-kdelibs-devel
+%description devel
+%{summary}. 
+
+%package extras
+Summary: Extras packages for %{name} 
+Group: Applications/Internet
+Requires: %{name}-libs = %{version}-%{release}
+%if "%{?_with_xmms:1}" == "1"
+Obsoletes: %{name}-nowlistening < %{version}-%{release}
+Provides:  %{name}-nowlistening = %{version}-%{release}
+%endif
+%description extras
+More Networking applications for the K Desktop Environment:
+ * ksirc
+ * kdict
+ * ktalkd
+ * kpf
+ * kwifimanager
+%if "%{?_with_xmms:1}" == "1"
+ * nowlistening (xmms) plugin for Kopete.
+%endif
+
+%package libs
+Summary: %{name} runtime libraries
+Group:   System Environment/Libraries
+Requires: trinity-kdelibs
+# helps multilib upgrades
+Obsoletes: %{name} < %{version}-%{release}
+# include to be paranoid, installing libs-only is still mostly untested -- Rex
+Requires: %{name} = %{version}-%{release}
+%description libs
+%{summary}.
+
+
+%prep
+%setup -q -n kdenetwork
+
+%if %{console_helper}
+%patch3 -p1 -b .kppp
+%endif
+%patch4 -p1 -b .resolv
+%patch6 -p1 -b .krfb_httpd
+
+
+%build
+unset QTDIR || : ; . /etc/profile.d/qt.sh
+export PATH="%{_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{_libdir}/pkgconfig"
+export CMAKE_INCLUDE_PATH="%{_includedir}:%{_includedir}/tqt"
+export LD_LIBRARY_PATH="%{_libdir}"
+
+%__mkdir build
+cd build
+%cmake \
+  -DWITH_JINGLE=ON \
+  -DWITH_SPEEX=ON \
+  -DWITH_WEBCAM=ON \
+  -DWITH_GSM=ON \
+  -DWITH_ARTS=ON \
+  -DBUILD_ALL=ON \
+  ..
+
+# Do not use '%{?_smp_mflags}' because it will fail to build !
+%__make
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+
+## File lists
+# locale's
+%find_lang %{name} || touch %{name}.lang
+# 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
+
+# Show only in KDE, FIXME, need to re-evaluate these -- Rex
+for i in fileshare kcmkrfb kcmktalkd kcmwifi krfb kppp kppplogview \
+   kwifimanager kget knewsticker ksirc kdict ; do
+   if [ -f %{buildroot}%{_datadir}/applications/kde/$i.desktop ] ; then
+      echo "OnlyShowIn=KDE;" >> %{buildroot}%{_datadir}/applications/kde/$i.desktop
+   fi
+done
+
+%if %console_helper
+# Run kppp through consolehelper
+install -p -m644 -D %{SOURCE1} %{buildroot}/etc/pam.d/kppp3
+mkdir -p %{buildroot}%{_sbindir}
+mv %{buildroot}%{_bindir}/kppp %{buildroot}%{_sbindir}
+ln -s consolehelper %{buildroot}%{_bindir}/kppp
+mkdir -p %{buildroot}/etc/security/console.apps
+cat > %{buildroot}/etc/security/console.apps/kppp3 <<EOF
+USER=root
+PROGRAM=%{_sbindir}/kppp
+SESSION=true
+EOF
+%endif
+
+# ktalk
+install -p -m 0644 -D  %{SOURCE2} %{buildroot}%{_sysconfdir}/xinetd.d/ktalk
+
+# Add lisa startup script
+install -p -m 0644 -D %{SOURCE4} %{buildroot}%{_sysconfdir}/lisarc
+install -p -m 0755 -D %{SOURCE5} %{buildroot}%{_initrddir}/lisa
+
+%post
+/sbin/chkconfig --add lisa ||:
+for f in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun
+for f in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%preun
+if [ $1 -eq 0 ]; then
+  /sbin/chkconfig --del lisa ||:
+  /sbin/service lisa stop > /dev/null 2>&1 ||:
+fi
+
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
+%post extras
+for f in crystalsvg hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+
+%postun extras
+for f in crystalsvg hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files extras
+%defattr(-,root,root,-)
+
+# ksirc
+%{tde_docdir}/HTML/??/ksirc/
+%{_bindir}/ksirc
+%{_libdir}/libkdeinit_ksirc.*
+%{tde_libdir}/ksirc.*
+%{_datadir}/applications/kde/ksirc.desktop
+%{_datadir}/apps/ksirc/
+%config(noreplace) %{_datadir}/config/ksircrc
+%{_datadir}/icons/hicolor/*/apps/ksirc.*
+
+# kdict
+%{tde_docdir}/HTML/en/kdict
+%{_bindir}/kdict
+%{tde_libdir}/kdict*
+%{_libdir}/libkdeinit_kdict.*
+%{_datadir}/applications/kde/kdict.desktop
+%{_datadir}/apps/kdict
+%{_datadir}/apps/kicker/applets/kdictapplet.desktop
+%{_datadir}/icons/hicolor/*/apps/kdict.*
+
+# ktalk
+%{tde_docdir}/HTML/en/ktalkd
+%{_bindir}/ktalkd*
+%{tde_libdir}/kcm_ktalkd.*
+%{_datadir}/applications/kde/kcmktalkd.desktop
+%config(noreplace) %{_datadir}/config/ktalkdrc
+%{_datadir}/icons/crystalsvg/*/apps/ktalkd.*
+%{_datadir}/sounds/ktalkd.wav
+%config(noreplace) %{_sysconfdir}/xinetd.d/ktalk
+
+# kpf
+%{tde_docdir}/HTML/en/kpf
+%{tde_libdir}/kpf*
+%{_datadir}/apps/kicker/applets/kpfapplet.desktop
+%{_datadir}/icons/crystalsvg/*/apps/kpf.*
+%{_datadir}/services/kpfpropertiesdialogplugin.desktop
+
+%if "%{?_with_wifi:1}" == "1"
+# kwifimanager
+%doc %{tde_docdir}/HTML/en/kwifimanager
+%{_bindir}/kwifimanager
+%{tde_libdir}/kcm_wifi.*
+%{_datadir}/applications/kde/kcmwifi.desktop
+%{_datadir}/applications/kde/kwifimanager.desktop
+%{_datadir}/apps/kwifimanager
+%{_datadir}/icons/hicolor/*/apps/kwifimanager.png
+%endif
+
+%if "%{?_with_xmms:1}" == "1"
+#files nowlistening
+#defattr(-,root,root,-)
+%{_datadir}/apps/kopete/*nowlisteningchatui*
+%{_datadir}/apps/kopete/*nowlisteningui*
+%{_datadir}/services/kconfiguredialog/*nowlistening*
+%{_datadir}/services/*nowlistening*
+%{tde_libdir}/*nowlistening*
+%endif
+
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING README
+
+# ksirc
+%exclude %{_bindir}/ksirc
+%exclude %{_libdir}/libkdeinit_ksirc.*
+%exclude %{tde_libdir}/ksirc.*
+%exclude %{_datadir}/applications/kde/ksirc.desktop
+%exclude %{_datadir}/apps/ksirc/
+%exclude %{_datadir}/config/ksircrc
+%exclude %{tde_docdir}/HTML/??/ksirc/
+%exclude %{_datadir}/icons/hicolor/??x??/apps/ksirc.png
+
+# kdict
+%exclude %{tde_docdir}/HTML/en/kdict
+%exclude %{_bindir}/kdict
+%exclude %{tde_libdir}/kdict*
+%exclude %{_libdir}/libkdeinit_kdict.*
+%exclude %{_datadir}/applications/kde/kdict.desktop
+%exclude %{_datadir}/apps/kdict
+%exclude %{_datadir}/apps/kicker/applets/kdictapplet.desktop
+%exclude %{_datadir}/icons/hicolor/128x128/apps/kdict.png
+%exclude %{_datadir}/icons/hicolor/??x??/apps/kdict.png
+%exclude %{_datadir}/icons/hicolor/scalable/apps/kdict.svgz
+
+# ktalk
+%exclude %{tde_docdir}/HTML/en/ktalkd
+%exclude %{_sysconfdir}/xinetd.d/ktalk
+%exclude %{_bindir}/ktalkd*
+%exclude %{tde_libdir}/kcm_ktalkd.*
+%exclude %{_datadir}/applications/kde/kcmktalkd.desktop
+%exclude %{_datadir}/config/ktalkdrc
+%exclude %{_datadir}/icons/crystalsvg/128x128/apps/ktalkd.png
+%exclude %{_datadir}/icons/crystalsvg/??x??/apps/ktalkd.png
+%exclude %{_datadir}/sounds/ktalkd.wav
+
+# kpf
+%exclude %{tde_libdir}/kpf*
+%exclude %{_datadir}/apps/kicker/applets/kpfapplet.desktop
+%exclude %{tde_docdir}/HTML/en/kpf
+%exclude %{_datadir}/icons/crystalsvg/??x??/apps/kpf.png
+%exclude %{_datadir}/services/kpfpropertiesdialogplugin.desktop
+
+%ifnarch s390 s390x
+# kwifimanager
+%exclude %{_bindir}/kwifimanager
+%exclude %{tde_libdir}/kcm_wifi.*
+%exclude %{_datadir}/applications/kde/kcmwifi.desktop
+%exclude %{_datadir}/applications/kde/kwifimanager.desktop
+%exclude %{_datadir}/apps/kwifimanager
+%exclude %{tde_docdir}/HTML/en/kwifimanager
+%exclude %{_datadir}/icons/hicolor/128x128/apps/kwifimanager.png
+%exclude %{_datadir}/icons/hicolor/??x??/apps/kwifimanager.png
+%exclude %{_datadir}/icons/hicolor/scalable/apps/kwifimanager.svgz
+%endif
+
+# nowlistening
+%if "%{?_with_xmms:1}" == "1"
+%exclude %{_datadir}/apps/kopete/*nowlisteningchatui*
+%exclude %{_datadir}/apps/kopete/*nowlisteningui*
+%exclude %{_datadir}/services/kconfiguredialog/*nowlistening*
+%exclude %{_datadir}/services/*nowlistening*
+%exclude %{tde_libdir}/*nowlistening*
+%endif
+
+%if %console_helper
+%config(noreplace) /etc/security/console.apps/kppp3
+%config(noreplace) /etc/pam.d/kppp3
+%{_sbindir}/kppp
+%else
+%attr(4755,root,root) %{_bindir}/kppp
+%endif
+%config(noreplace) %{_sysconfdir}/lisarc
+%config(noreplace) %{_initrddir}/lisa
+%{_libdir}/libkdeinit_*.so
+%{tde_libdir}/*
+%{_libdir}/kconf_update_bin/*
+%{_bindir}/*
+%{_datadir}/apps/*
+%{_datadir}/applications/kde/*
+%{_datadir}/applnk/.hidden/*
+%{_datadir}/config/*
+%{_datadir}/config.kcfg/*
+%{_datadir}/icons/*/*/*/*
+%{_datadir}/mimelnk/*
+%{_datadir}/services/*
+%{_datadir}/servicetypes/*
+%{_datadir}/sounds/*
+
+%files libs
+%defattr(-,root,root,-)
+%{_libdir}/libkopete*.so.*
+%{_libdir}/libkopete*.la
+%{_libdir}/librss.so.*
+%{_libdir}/librss.la
+
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/*
+%{_libdir}/libkopete*.so
+%{_libdir}/librss.so
+
+
+%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
+
+* Tue Oct 25 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
+- Import to GIT
+
diff --git a/redhat/kdepim/trinity-kdepim-3.5.13.spec b/redhat/kdepim/trinity-kdepim-3.5.13.spec
index 604dbd208..2e5b04d8d 100644
--- a/redhat/kdepim/trinity-kdepim-3.5.13.spec
+++ b/redhat/kdepim/trinity-kdepim-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"
@@ -29,21 +29,32 @@ Summary:	PIM (Personal Information Manager) applications
 Prefix:		%{_prefix}
 
 Source0:	kdepim-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	tqtinterface
-BuildRequires:	trinity-arts
-BuildRequires:	trinity-kdelibs
+BuildRequires:	tqtinterface-devel
+BuildRequires:	trinity-arts-devel
+BuildRequires:	trinity-kdelibs-devel
 BuildRequires:	gpgme-devel
 BuildRequires:	libgpg-error-devel
 BuildRequires:	flex
 BuildRequires:	libical-devel
 BuildRequires:	gnokii-devel
+BuildRequires:	boost-devel
+
+BuildRequires:	libcaldav-devel
+BuildRequires:	libcarddav-devel
 
 %if 0%{?fedora} >= 15
 BuildRequires:	flex-static
+%else
+%if 0%{?rhel} <= 5
+BuildRequires:	trinity-libcurl-devel
+%endif
 %endif
 
 Requires:	trinity-kdelibs
+Requires:	libcaldav
+Requires:	libcarddav
 
 %description
 PIM (Personal Information Manager) applications.
@@ -52,6 +63,7 @@ PIM (Personal Information Manager) applications.
 %package devel
 Requires:	%{name}
 Summary:	%{name} - Development files
+Group: Development/Libraries
 %description devel
 Development files for %{name}.
 
@@ -84,18 +96,19 @@ cd build
   -DWITH_BIRTHDAYS=ON \
   -DWITH_NEWEXCHANGE=ON \
   -DWITH_SCALIX=ON \
-  -DWITH_CALDAV=OFF \
-  -DWITH_CARDDAV=OFF \
+  -DWITH_CALDAV=ON \
+  -DWITH_CARDDAV=ON \
   -DWITH_INDEXLIB=ON \
   -DBUILD_ALL=ON \
   ..
 
-%__make %{?_smp_mflags}
+# Do not use %{?_smp_mflags} !
+%__make 
 
 %install
 export PATH="%{_bindir}:${PATH}"
 %__rm -rf %{?buildroot}
-%make_install -C build
+%__make install DESTDIR=%{?buildroot} -C build
 
 %clean
 %__rm -rf %{?buildroot}
@@ -116,11 +129,13 @@ export PATH="%{_bindir}:${PATH}"
 %{_datadir}/config.kcfg/*
 %{_libdir}/lib*.so.*
 %{tde_libdir}/*.so
+#%{tde_libdir}/*.so.*
 %{tde_libdir}/plugins/designer/*.so
 %{_datadir}/servicetypes/*
 %{_libdir}/kconf_update_bin/*
 %{_libdir}/libakregatorprivate.so
 %{_libdir}/libkmailprivate.so
+%{_libdir}/libkmobiledevice.so
 %{tde_docdir}/HTML/en/*
 
 %files devel
@@ -132,8 +147,12 @@ export PATH="%{_bindir}:${PATH}"
 %{tde_libdir}/plugins/designer/*.la
 %exclude %{_libdir}/libakregatorprivate.so
 %exclude %{_libdir}/libkmailprivate.so
+%exclude %{_libdir}/libkmobiledevice.so
 %{_datadir}/cmake/*.cmake
 
 %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
+
 * Mon Sep 05 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-0
 - Import to GIT
diff --git a/redhat/kdesdk/trinity-kdesdk-3.5.12.spec b/redhat/kdesdk/trinity-kdesdk-3.5.12.spec
index 238fe5656..7458317d2 100644
--- a/redhat/kdesdk/trinity-kdesdk-3.5.12.spec
+++ b/redhat/kdesdk/trinity-kdesdk-3.5.12.spec
@@ -50,7 +50,7 @@ Provides: kdesdk3 = %{version}-%{release}
 
 Requires: %{name}-libs = %{version}-%{release}
 
-BuildRequires: automake libtool
+BuildRequires: libtool
 BuildRequires: tqtinterface-devel
 BuildRequires: pcre-devel
 BuildRequires: trinity-kdelibs-devel
@@ -66,7 +66,7 @@ BuildRequires: libxslt-devel libxml2-devel
 BuildRequires: binutils-devel
 %endif
 BuildRequires: perl
-%{?_with_subversion:BuildRequires: subversion-devel neon-devel}
+BuildRequires: subversion-devel neon-devel
 
 # Obsoletes/Provides
 %define cervisia_ver 2.4.7
@@ -99,7 +99,7 @@ Requires: trinity-kdelibs-devel
 %package libs
 Summary: %{name} runtime libraries
 Group:   System Environment/Libraries
-Requires: trinity-kdelibs >= %{version}
+Requires: trinity-kdelibs
 # helps multilib upgrades
 Obsoletes: %{name} < %{version}-%{release}
 # include to be paranoid, installing libs-only is still mostly untested -- Rex
diff --git a/redhat/kdesdk/trinity-kdesdk-3.5.13.spec b/redhat/kdesdk/trinity-kdesdk-3.5.13.spec
index 00d1d5f3b..2caf50a01 100644
--- a/redhat/kdesdk/trinity-kdesdk-3.5.13.spec
+++ b/redhat/kdesdk/trinity-kdesdk-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,7 +26,10 @@ Group: User Interface/Desktops
 URL:		http://www.trinitydesktop.org/
 Vendor: Trinity Project
 Packager: Francois Andriot <francois.andriot@free.fr>
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Prefix:		%{_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 Source: kdesdk-%{version}.tar.gz
 
 # RedHat Legacy patches
@@ -48,7 +51,9 @@ BuildRequires: desktop-file-utils
 BuildRequires: flex
 # umbrello
 BuildRequires: libxslt-devel libxml2-devel
+%if 0%{?fedora} > 5 || 0%{?rhel} > 4
 BuildRequires: binutils-devel
+%endif
 BuildRequires: perl
 BuildRequires: subversion-devel neon-devel
 
@@ -83,7 +88,7 @@ Requires: trinity-kdelibs-devel
 %package libs
 Summary: %{name} runtime libraries
 Group:   System Environment/Libraries
-Requires: trinity-kdelibs >= %{version}
+Requires: trinity-kdelibs
 # helps multilib upgrades
 Obsoletes: %{name} < %{version}-%{release}
 # include to be paranoid, installing libs-only is still mostly untested -- Rex
@@ -111,14 +116,15 @@ cd build
   -DBUILD_ALL=ON \
   ..
 
-%__make %{?_smp_mflags}
+# Do not use %{?_smp_mflags} !
+%__make
 
 
 %install
 export PATH="%{_bindir}:${PATH}"
 %__rm -rf %{buildroot} 
 
-%make_install -C build
+%__make install DESTDIR=%{?buildroot} -C build
 
 desktop-file-install --vendor "" \
   --dir %{buildroot}%{_datadir}/applications/kde \
@@ -174,7 +180,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %{_bindir}/*
 %{tde_docdir}/HTML/en/*
 %{_datadir}/apps/*
-%{_datadir}/mimelnk/application/*
+#%{_datadir}/mimelnk/application/*
 %{_datadir}/services/*
 %{_datadir}/servicetypes/*
 %{_datadir}/icons/crystalsvg/*/*/*
@@ -184,7 +190,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %{_datadir}/config.kcfg/*
 %{tde_libdir}/*
 %{_libdir}/libkdeinit_*.so
-%{_mandir}/man1/*
+#%{_mandir}/man1/*
 
 # Removes conflict with package 'rpmdevtool' on RHEL 6
 %if "%{_prefix}" == "/usr"
@@ -198,13 +204,17 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/kde/*
+%{_includedir}/*.h
+%{_includedir}/kbabel
 %{_libdir}/lib*.so
 %exclude %{_libdir}/libkdeinit_*.so
-%{_libdir}/kmtrace/*
+#%{_libdir}/kmtrace/*
+%{_datadir}/cmake/*.cmake
 
 
 %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
+
 * Mon Sep 05 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
 - Import to GIT
-- Built with future TDE version (3.5.13 + cmake + QT3.3.8d)
diff --git a/redhat/kdetoys/trinity-kdetoys-3.5.13.spec b/redhat/kdetoys/trinity-kdetoys-3.5.13.spec
new file mode 100644
index 000000000..f9ef1f207
--- /dev/null
+++ b/redhat/kdetoys/trinity-kdetoys-3.5.13.spec
@@ -0,0 +1,165 @@
+# Default version for this component
+%if "%{?version}" == ""
+%define version 3.5.13
+%endif
+%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.12 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}/kde
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/trinity
+
+
+Summary: K Desktop Environment - Toys and Amusements
+Name: 	 trinity-kdetoys
+Group:	 Amusements/Graphics
+Version: %{?version}
+Release: %{?release}%{?dist}%{?_variant}
+
+License: GPLv2+
+Source0: kdetoys-%{version}.tar.gz
+
+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)
+
+BuildRequires: desktop-file-utils
+BuildRequires: tqtinterface-devel
+BuildRequires: trinity-kdelibs-devel
+BuildRequires: gettext
+
+
+%description
+Includes: 
+* amor: Amusing Misuse Of Resources put's comic figures above your windows
+* eyesapplet: a kicker applet similar to XEyes
+* fifteenapplet: kicker applet, order 15 pieces in a 4x4 square by moving them
+* kmoon: system tray applet showing the moon phase
+* kodo: mouse movement meter
+* kteatime: system tray applet that makes sure your tea doesn't get too strong
+* ktux: Tux-in-a-Spaceship screen saver
+* kweather: kicker applet that will display the current weather outside
+* kworldwatch: application and kicker applet showing daylight area on the world
+               globe
+
+NOTE: kicker applets and screen savers require kdebase to be installed, 
+and user to be logged-in to KDE.
+
+
+%prep
+%setup -q -n kdetoys
+
+# 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 || : ; . /etc/profile.d/qt.sh
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%configure \
+  --includedir=%{_includedir}/kde \
+  --disable-rpath \
+  --enable-new-ldflags \
+  --enable-closure \
+  --disable-debug --disable-warnings \
+  --disable-dependency-tracking --enable-final \
+  --with-extra-includes=%{_includedir}/tqt
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf "%{buildroot}"
+%__make install DESTDIR=%{buildroot}
+
+desktop-file-install \
+  --dir=%{buildroot}%{_datadir}/applnk/System/ScreenSavers \
+  --vendor="" \
+  %{buildroot}%{_datadir}/applnk/System/ScreenSavers/*.desktop ||:
+
+desktop-file-install \
+  --dir=%{buildroot}%{_datadir}/applications/kde \
+  --vendor="" \
+  %{buildroot}%{_datadir}/applications/kde/*.desktop ||:
+
+# replace absolute symlink with relative
+ln -nfs tips-en %{buildroot}%{_datadir}/apps/amor/tips
+
+## File lists
+# locale's
+%find_lang %{name} || touch %{name}.lang
+# 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 ] && ln -nsf ../common $i/common
+      done
+    popd
+  fi
+done
+fi
+
+## Unpackaged files
+# not sure the point of just one header file 'AmorIface.h', omit (for now).
+%__rm -rf %{buildroot}%{_includedir}
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+
+
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING README
+%{_bindir}/*
+%{_libdir}/libkdeinit_*.*
+%{tde_libdir}/*
+%{_datadir}/applications/kde/*.desktop
+%{_datadir}/applnk/System/ScreenSavers/*.desktop
+%{_datadir}/apps/*
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/service*/*.desktop
+%doc %lang(en) %{_docdir}/HTML/en/*
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%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
+
+* Fri Oct 28 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
+- Import to GIT
+
diff --git a/redhat/kdeutils/trinity-kdeutils-3.5.12.spec b/redhat/kdeutils/trinity-kdeutils-3.5.12.spec
index 5e65d0712..5cf187ce2 100755
--- a/redhat/kdeutils/trinity-kdeutils-3.5.12.spec
+++ b/redhat/kdeutils/trinity-kdeutils-3.5.12.spec
@@ -79,6 +79,7 @@ Utilities for the Trinity Desktop Environment, including:
   * ktimer (task scheduler)
   * kwikdisk (removable media utility)
 
+
 # afaik, nobody BR's it, and it pulls kdeutils into multilib -- Rex
 %package devel
 Summary: Development files for %{name} 
@@ -222,7 +223,6 @@ done
 
 %files extras
 %defattr(-,root,root,-)
-
 # kmilo
 %{tde_libdir}/kded_kmilod.*
 %{tde_libdir}/kmilo*
diff --git a/redhat/kdeutils/trinity-kdeutils-3.5.13.spec b/redhat/kdeutils/trinity-kdeutils-3.5.13.spec
index 17acde68e..0e6777148 100755
--- a/redhat/kdeutils/trinity-kdeutils-3.5.13.spec
+++ b/redhat/kdeutils/trinity-kdeutils-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"
@@ -12,7 +12,8 @@
 
 # TDE 3.5.13 specific building variables
 BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}
+%define tde_docdir %{_docdir}/kde
+%define tde_includedir %{_includedir}/kde
 %define tde_libdir %{_libdir}/trinity
 
 
@@ -20,34 +21,95 @@ Name:		trinity-kdeutils
 Version:	%{?version}
 Release:	%{?release}%{?dist}%{?_variant}
 License:	GPL
+Summary:	TDE Utilities
+Group:		Applications/System
+
 Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
-Summary:	Trinity KDE Utilities
+URL:		http://www.trinitydesktop.org/
+
 Prefix:		%{_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	kdeutils-%{version}.tar.gz
+Source1: klaptop_acpi_helper.pam
+Source2: klaptop_acpi_helper.console
+Source3: kcmlaptoprc
 
 BuildRequires:	tqtinterface
 BuildRequires:	trinity-arts
 BuildRequires:	trinity-kdelibs
 
+# RedHat / Fedora legacy patches
+Patch1: kdf-3.0.2-label.patch
+
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+
 Requires:	tqtinterface
 Requires:	trinity-kdelibs
 
+BuildRequires: gettext
+BuildRequires: net-snmp-devel
+BuildRequires: python-devel
+BuildRequires: gmp-devel
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
+BuildRequires: libXScrnSaver-devel libXtst-devel
+%endif
+BuildRequires: xmms-devel
+
+%define superkaramba_ver 0.39
+Obsoletes: superkaramba < 0:%{superkaramba_ver}
+Provides:  superkaramba = 0:%{superkaramba_ver}
+
 %description
-Trinity KDE Utilities.
+Utilities for the Trinity Desktop Environment, including:
+  * ark (tar/gzip archive manager)
+  * kcalc (scientific calculator)
+  * kcharselect (character selector)
+  * kdepasswd (change password)
+  * kdessh (ssh front end)
+  * kdf (view disk usage)
+  * kedit (simple text editor)
+  * kfloppy (floppy formatting tool)
+  * kgpg (gpg gui)
+  * khexedit (hex editor)
+  * kjots (note taker)
+  * kregexpeditor (regular expression editor)
+  * ktimer (task scheduler)
+  * kwikdisk (removable media utility)
 
 
+# afaik, nobody BR's it, and it pulls kdeutils into multilib -- Rex
 %package devel
-Requires:	%{name}
-Summary:	%{name} - Development files
+Summary: Development files for %{name} 
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-extras = %{version}-%{release}
+Requires: trinity-kdelibs-devel
 %description devel
 Development files for %{name}.
 
+%package extras
+Summary: Extras packages from %{name} 
+Group: Applications/Internet
+Requires: %{name} = %{version}-%{release}
+%if 0%{?fedora} > 5 || 0%{?rhel} > 4
+Requires: pm-utils
+%endif
+Requires: usermode
+%description extras
+More Utilities for the K Desktop Environment:
+ * kmilo
+ * ksim (system information monitor);
+ * klaptopdaemon (battery monitoring and management for laptops);
+
 
 %prep
 %setup -q -n kdeutils
 
+%patch1 -p1 -b .label
+
 # 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 \
@@ -61,58 +123,225 @@ sed -i admin/acinclude.m4.in \
 unset QTDIR || : ; source /etc/profile.d/qt.sh
 export PATH="%{_bindir}:${PATH}"
 export LDFLAGS="-L%{_libdir} -I%{_includedir}"
-export LDFLAGS="${LDFLAGS} -lqt-mt -lkdeui -L${QTLIB}"
 
 %configure \
-  --disable-rpath \
-  --enable-new-ldflags \
-  --disable-dependency-tracking \
-  --disable-debug --disable-warnings --enable-final \
-  --with-xinerama \
-  --with-extra-includes=%{_includedir}/tqt \
-  --with-extra-libs=%{tde_libdir} \
-  --enable-closure
+   --enable-new-ldflags \
+   --disable-dependency-tracking \
+   --disable-rpath \
+   --disable-debug --disable-warnings \
+   --enable-final \
+   --includedir=%{tde_includedir} \
+   --with-snmp \
+   --with-xscreensaver \
+   --with-extra-includes=%{_includedir}/tqt \
+   --enable-closure
 
 %__make %{?_smp_mflags}
 
 %install
-%__rm -rf %{?buildroot}
-%__mkdir_p %{?buildroot}
 export PATH="%{_bindir}:${PATH}"
-%make_install
+%__rm -rf %{?buildroot}
+%__make install DESTDIR=%{?buildroot}
+
+# Show only in KDE (really? -- Rex)
+for i in kcalc kregexpeditor Kjots ktimer kdf kcmdf ksim KFloppy KEdit \
+  KCharSelect ark kwalletmanager kwalletconfig \
+ irkick kcmlirc laptop pcmcia kvaio thinkpad kwikdisk; do
+ if [ -f %{buildroot}%{_datadir}/applications/kde/$i.desktop ] ; then
+   echo "OnlyShowIn=KDE;" >> %{buildroot}%{_datadir}/applications/kde/$i.desktop
+ fi
+done
+
+## File lists
+# locale's
+%find_lang %{name} || touch %{name}.lang
+# 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
+    pushd $lang_dir/kcontrol
+      for i in *; do
+        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../../common $i/common
+      done
+    popd
+  fi
+done
+fi
+
+# using pam
+install -p -D -m 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/pam.d/klaptop_acpi_helper
+install -p -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/security/console.apps/klaptop_acpi_helper
+
+pushd %{buildroot}%{_bindir}
+  mkdir -p %{buildroot}%{_sbindir}
+  mv klaptop_acpi_helper ../sbin
+  ln -s consolehelper klaptop_acpi_helper
+popd
+
+# klaptop setting
+install -p -D -m 644 %{SOURCE3} %{buildroot}%{_datadir}/config/kcmlaptoprc
+
 
 %clean
 %__rm -rf %{?buildroot}
 
-%files
+
+%post
+/sbin/ldconfig
+for f in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun
+/sbin/ldconfig
+for f in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null  ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%post extras
+/sbin/ldconfig
+for f in crystalsvg hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+
+%postun extras
+/sbin/ldconfig
+for f in crystalsvg hicolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+
+
+%files extras
 %defattr(-,root,root,-)
+# kmilo
+%{tde_libdir}/kded_kmilod.*
+%{tde_libdir}/kmilo*
+%{_libdir}/libkmilo.la
+%{_libdir}/libkmilo.so.*
+%{_datadir}/services/kded/kmilod.desktop
+%{_datadir}/services/kmilo
+%{_datadir}/servicetypes/kmilo
+
+# ksim
+%doc %{_docdir}/HTML/*/ksim/
+%{tde_libdir}/ksim*
+%{_libdir}/libksimcore.la
+%{_libdir}/libksimcore.so.*
+%{_datadir}/apps/kicker/extensions/ksim.desktop
+%{_datadir}/apps/ksim/
+%config %{_datadir}/config/ksim_panelextensionrc
+%{_datadir}/icons/crystalsvg/??x??/apps/ksim.png
+%{_datadir}/icons/crystalsvg/16x16/devices/ksim_cpu.png
+
+# klaptop
+%doc %{_docdir}/HTML/en/kcontrol
+%{_sysconfdir}/pam.d/klaptop_acpi_helper
+%attr(644,root,root) %{_sysconfdir}/security/console.apps/klaptop_acpi_helper
+%{_bindir}/klaptop*
+%{tde_libdir}/kded_klaptopdaemon.*
+%{_sbindir}/klaptop_acpi_helper
+%{_datadir}/apps/klaptopdaemon
+%{_datadir}/services/kded/klaptopdaemon.desktop
+%{tde_libdir}/kcm_laptop.*
+%{_libdir}/libkcmlaptop.*
+%{_datadir}/applications/kde/laptop.desktop
+%config %{_datadir}/config/kcmlaptoprc
+%{_datadir}/icons/crystalsvg/128x128/apps/laptop_battery.png
+%{_datadir}/icons/crystalsvg/??x??/apps/laptop_battery.png
+%{_datadir}/icons/crystalsvg/scalable/apps/laptop_battery.svgz
+
+
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+
+# kmilo
+%exclude %{tde_libdir}/kded_kmilod.*
+%exclude %{tde_libdir}/kmilo*
+%exclude %{_libdir}/libkmilo.la
+%exclude %{_libdir}/libkmilo.so.*
+%exclude %{_datadir}/services/kded/kmilod.desktop
+%exclude %{_datadir}/services/kmilo
+%exclude %{_datadir}/servicetypes/kmilo
+
+# ksim
+%exclude %{_docdir}/HTML/*/ksim/
+%exclude %{tde_libdir}/ksim*
+%exclude %{_libdir}/libksimcore.la
+%exclude %{_libdir}/libksimcore.so.*
+%exclude %{_datadir}/apps/kicker/extensions/ksim.desktop
+%exclude %{_datadir}/apps/ksim/
+%exclude %{_datadir}/config/ksim_panelextensionrc
+%exclude %{_datadir}/icons/crystalsvg/??x??/apps/ksim.png
+%exclude %{_datadir}/icons/crystalsvg/16x16/devices/ksim_cpu.png
+
+# klaptop
+%exclude %{_sysconfdir}/pam.d/klaptop_acpi_helper
+%exclude %{_sysconfdir}/security/console.apps/klaptop_acpi_helper
+%exclude %{_bindir}/klaptop*
+%exclude %{tde_libdir}/kded_klaptopdaemon.*
+%exclude %{_sbindir}/klaptop_acpi_helper
+%exclude %{_datadir}/apps/klaptopdaemon
+%exclude %{_datadir}/services/kded/klaptopdaemon.desktop
+%exclude %{tde_libdir}/kcm_laptop.*
+%exclude %{_libdir}/libkcmlaptop.*
+%exclude %{_datadir}/applications/kde/laptop.desktop
+%exclude %{_datadir}/config/kcmlaptoprc
+%exclude %{_docdir}/HTML/en/kcontrol/
+%exclude %{_datadir}/icons/crystalsvg/128x128/apps/laptop_battery.png
+%exclude %{_datadir}/icons/crystalsvg/??x??/apps/laptop_battery.png
+%exclude %{_datadir}/icons/crystalsvg/scalable/apps/laptop_battery.svgz
+
+%attr(644,root,root) %{_sysconfdir}/security/console.apps/*
+%attr(644,root,root) %{_sysconfdir}/pam.d/*
 %{_bindir}/*
-%{_datadir}/applications/kde/*.desktop
+%{_sbindir}/*
+%{tde_libdir}/*
+%{_libdir}/*.la
+%{_libdir}/libkdeinit*.so
+%{_libdir}/lib*.so.*
+%{_datadir}/icons/*/*/*/*
 %{_datadir}/apps/*
-%{_datadir}/autostart/*.desktop
-%{_datadir}/config/*
-%{_datadir}/icons/*
-%{_datadir}/services/*
+%config %{_datadir}/config/*
 %{_datadir}/config.kcfg/*
-%{_datadir}/servicetypes/kmilo/kmilopluginsvc.desktop
-%{_libdir}/lib*.so.*
-%{_libdir}/libkdeinit*.so
-%{tde_libdir}/*.so
-%{tde_docdir}/HTML/en/*
-
-%if 0%{?rhel} >= 4
-%{_datadir}/applnk/*/*
+%{_datadir}/services/*
+%{_datadir}/servicetypes/*
+%{_datadir}/applications/kde/*
+%if 0%{?rhel} >= 5 || 0%{?fedora}
+%{_datadir}/applnk/Utilities/*
 %{_datadir}/mimelnk/application/*
 %endif
+%{_datadir}/autostart/*
+%doc %lang(en) %{_docdir}/HTML/en/*
 
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/*.la
-%{_libdir}/*.so
-%{_includedir}/*
-%{tde_libdir}/*.la
+%{tde_includedir}/*
+%{_libdir}/libkcmlaptop.so
+%{_libdir}/libkhexeditcommon.so
+%{_libdir}/libkmilo.so
+%{_libdir}/libkregexpeditorcommon.so
+%{_libdir}/libksimcore.so
+
 
 %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
+
 * Mon Sep 05 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
 - Import to GIT
 
diff --git a/redhat/kdevelop/kdevelop-3.5.13-kdevdesigner-ftbfs.patch b/redhat/kdevelop/kdevelop-3.5.13-kdevdesigner-ftbfs.patch
new file mode 100644
index 000000000..590aa40bf
--- /dev/null
+++ b/redhat/kdevelop/kdevelop-3.5.13-kdevdesigner-ftbfs.patch
@@ -0,0 +1,11 @@
+--- kdevelop/kdevdesigner/designer/listeditor.ui.h.ORI	2011-10-30 13:30:56.655489268 +0100
++++ kdevelop/kdevdesigner/designer/listeditor.ui.h	2011-10-30 13:31:00.782489292 +0100
+@@ -30,7 +30,7 @@
+ {
+     QListViewItem *i = new QListViewItem( listview, listview->lastItem() );
+     i->setRenameEnabled( 0, TRUE );
+-    tqApp->processEvents();
++    qApp->processEvents();
+     i->startRename( 0 );
+ }
+ 
diff --git a/redhat/kdevelop/trinity-kdevelop-3.5.12.spec b/redhat/kdevelop/trinity-kdevelop-3.5.12.spec
index a7504fbe2..6d963ec74 100644
--- a/redhat/kdevelop/trinity-kdevelop-3.5.12.spec
+++ b/redhat/kdevelop/trinity-kdevelop-3.5.12.spec
@@ -143,7 +143,7 @@ Requires: %{name} = %{version}-%{release}
 
 
 %build
-QTDIR="" && source /etc/profile.d/qt.sh
+unset QTDIR || : ; . /etc/profile.d/qt.sh
 export PATH="%{_bindir}:${PATH}"
 export LDFLAGS="-L%{_libdir} -I%{_includedir}"
 
@@ -184,7 +184,6 @@ popd
 
 %install
 %__rm -rf %{buildroot}
-
 %__make install DESTDIR=%{buildroot}
 %__make install DESTDIR=%{buildroot} -C c_cpp_reference-2.0.2_for_KDE_3.0
 
diff --git a/redhat/kdevelop/trinity-kdevelop-3.5.13.spec b/redhat/kdevelop/trinity-kdevelop-3.5.13.spec
new file mode 100644
index 000000000..969f6bab5
--- /dev/null
+++ b/redhat/kdevelop/trinity-kdevelop-3.5.13.spec
@@ -0,0 +1,237 @@
+# Default version for this component
+%if "%{?version}" == ""
+%define version 3.5.13
+%endif
+%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 variables
+BuildRequires:	cmake >= 2.8
+%define tde_libdir %{_libdir}/trinity
+
+%define _default_patch_fuzz 2
+%define qt_version 3.3.8d
+%define qt_ver %{qt_version}
+
+Name:    trinity-kdevelop
+Summary: Integrated Development Environment for C++/C
+Version: %{?version}
+Release: %{?release}%{?dist}%{?_variant}
+
+
+License: GPLv2
+Group: Development/Tools
+
+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)
+
+Source: kdevelop-%{version}.tar.gz
+Source1: ftp://129.187.206.68/pub/unix/ide/KDevelop/c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2
+
+# RedHat Legacy patches
+Patch1: c_cpp_reference-2.0.2-config.patch
+
+# TDE 3.5.13 patches
+## RHEL / Fedora RPM specific patches
+Patch2: kdevelop-3.5.13-kdevdesigner-ftbfs.patch
+
+
+Provides: kdevelop3 = %{version}-%{release}
+
+Requires: %{name}-libs = %{version}-%{release}
+
+
+Requires: trinity-kdelibs-devel
+Requires: make
+Requires: perl
+Requires: flex >= 2.5.4
+Requires: qt3-designer
+Requires: gettext
+Requires: ctags
+
+BuildRequires: tqtinterface-devel
+BuildRequires: trinity-arts-devel
+BuildRequires: trinity-kdelibs-devel
+BuildRequires: trinity-kdelibs-apidocs
+BuildRequires: qt3-devel-docs
+BuildRequires: db4-devel
+BuildRequires: flex
+# FIXME: No CVS support in KDevelop? This is going to suck...
+# Requires kdesdk3.
+BuildRequires: trinity-kdesdk-devel
+BuildRequires: subversion-devel neon-devel
+# looks like this is dragged in by apr-devel (dep of subversion-devel), but not
+# a dependency
+BuildRequires: openldap-devel
+
+%description
+The KDevelop Integrated Development Environment provides many features
+that developers need as well as providing a unified interface to programs
+like gdb, the C/C++ compiler, and make. KDevelop manages or provides:
+
+All development tools needed for C++ programming like Compiler,
+Linker, automake and autoconf; KAppWizard, which generates complete,
+ready-to-go sample applications; Classgenerator, for creating new
+classes and integrating them into the current project; File management
+for sources, headers, documentation etc. to be included in the
+project; The creation of User-Handbooks written with SGML and the
+automatic generation of HTML-output with the KDE look and feel;
+Automatic HTML-based API-documentation for your project's classes with
+cross-references to the used libraries; Internationalization support
+for your application, allowing translators to easily add their target
+language to a project;
+
+KDevelop also includes WYSIWYG (What you see is what you get)-creation
+of user interfaces with a built-in dialog editor; Debugging your
+application by integrating KDbg; Editing of project-specific pixmaps
+with KIconEdit; The inclusion of any other program you need for
+development by adding it to the "Tools"-menu according to your
+individual needs.
+
+%package devel
+Summary: Development files for %{name}
+Group: Development/Libraries
+Provides: kdevelop3-devel = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
+Requires: trinity-kdelibs-devel
+%description devel
+%{summary}.
+
+%package libs
+Summary: %{name} runtime libraries
+Group:   System Environment/Libraries
+Requires: trinity-kdelibs
+# helps multilib upgrades
+Obsoletes: %{name} < %{version}-%{release}
+# include to be paranoid, installing libs-only is still mostly untested -- Rex
+Requires: %{name} = %{version}-%{release}
+%description libs
+%{summary}.
+
+
+
+%prep
+
+%setup -q -n kdevelop -a1
+%patch1 -p0 -b .config
+%patch2 -p1
+
+# Ugly hack to modify TQT include directory inside autoconf files.
+# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
+sed -i admin/acinclude.m4.in \
+  -e "s,/usr/include/tqt,%{_includedir}/tqt,g"
+
+
+%__rm -rf c_cpp_reference-2.0.2_for_KDE_3.0/admin
+%__cp -a admin c_cpp_reference-2.0.2_for_KDE_3.0/
+%__make -C c_cpp_reference-2.0.2_for_KDE_3.0 -f admin/Makefile.common cvs
+
+
+%build
+unset QTDIR || : ; . /etc/profile.d/qt.sh
+export PATH="%{_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{_libdir}/pkgconfig"
+export CMAKE_INCLUDE_PATH="%{_includedir}:%{_includedir}/tqt"
+export LD_LIBRARY_PATH="%{_libdir}"
+
+# c references
+pushd c_cpp_reference-2.0.2_for_KDE_3.0
+%configure \
+  --with-qt-libraries=$QTDIR/lib \
+  --with-qt-includes=$QTDIR/include \
+  --with-extra-libs=%{_libdir}
+popd
+
+%__mkdir build
+cd build
+%cmake \
+  -DWITH_BUILDTOOL_ALL=ON \
+  -DWITH_LANGUAGE_ALL=ON \
+  -DWITH_VCS_ALL=OFF \
+  -DBUILD_ALL=ON \
+  ..
+  
+
+%__make %{?_smp_mflags}
+
+cd ..
+%__make %{?_smp_mflags} -C c_cpp_reference-2.0.2_for_KDE_3.0
+
+%install
+%__rm -rf %{buildroot}
+cd build
+%__make install DESTDIR=%{buildroot}
+cd ..
+%__make install DESTDIR=%{buildroot} -C c_cpp_reference-2.0.2_for_KDE_3.0
+
+# remove useless files
+%__rm -rf %{buildroot}%{_prefix}/kdevbdb
+
+
+%post
+for f in hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun
+for f in hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%{_docdir}/HTML/en/*
+%{_bindir}/*
+%{tde_libdir}/*
+%{_libdir}/kconf_update_bin/*
+%{_datadir}/applications/kde/*
+%{_datadir}/apps/*
+%{_datadir}/config/*
+%{_datadir}/desktop-directories/*
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/icons/locolor/*/*/*
+%{_datadir}/mimelnk/*.desktop
+%{_datadir}/mimelnk/*/*
+%{_datadir}/services/*
+%{_datadir}/servicetypes/*
+
+%files libs
+%defattr(-,root,root,-)
+%{_libdir}/lib*.so.*
+%{_libdir}/lib*.la
+
+%files devel
+%defattr(-,root,root,-)
+%{_libdir}/lib*.so
+%{_includedir}/*
+
+
+%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
+
+* Sat Oct 29 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
+- Import to GIT
+- Based on SPEC file from Fedora: kdevelop 9:3.5.3-1
diff --git a/redhat/kdewebdev/hi48-app-kxsldbg.png b/redhat/kdewebdev/hi48-app-kxsldbg.png
new file mode 100644
index 000000000..a26283571
--- /dev/null
+++ b/redhat/kdewebdev/hi48-app-kxsldbg.png
diff --git a/redhat/kdewebdev/trinity-kdewebdev-3.5.13.spec b/redhat/kdewebdev/trinity-kdewebdev-3.5.13.spec
new file mode 100644
index 000000000..53acedb23
--- /dev/null
+++ b/redhat/kdewebdev/trinity-kdewebdev-3.5.13.spec
@@ -0,0 +1,231 @@
+# Default version for this component
+%if "%{?version}" == ""
+%define version 3.5.13
+%endif
+%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-kdewebdev
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+License:	GPL
+Summary:	Web development applications 
+Group:		Applications/Editors
+
+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:	kdewebdev-%{version}.tar.gz
+Source1: http://download.sourceforge.net/quanta/css.tar.bz2
+Source2: http://download.sourceforge.net/quanta/html.tar.bz2
+Source3: http://download.sourceforge.net/quanta/php_manual_en_20030401.tar.bz2
+Source4: http://download.sourceforge.net/quanta/javascript.tar.bz2
+Source5: hi48-app-kxsldbg.png
+
+Patch0: javascript.patch
+Patch1: kdewebdev-3.5.4-kxsldbg-icons.patch
+
+
+BuildRequires:	desktop-file-utils
+BuildRequires:	trinity-kdelibs-devel
+BuildRequires:	trinity-kdesdk-devel
+BuildRequires:	libxslt-devel libxml2-devel
+%if 0%{?rhel} == 4
+# a bogus dep in libexslt.la file from EL-4 (WONTFIX bug http://bugzilla.redhat.com/142241)
+BuildRequires:	libgcrypt-devel
+%endif
+BuildRequires:	perl
+
+Requires: %{name}-libs = %{version}-%{release}
+
+# optional
+Requires:	tidy
+
+Provides:	kdewebdev3 = %{version}-%{release}
+
+Obsoletes: quanta < %{version}-%{release}
+Provides:  quanta = %{version}-%{release}
+
+%define kommander_ver 1.2.2
+#Obsoletes: kommander < %{kommander_ver}-%{release}
+Provides:  kommander = %{kommander_ver}-%{release}
+
+%description
+%{summary}, including:
+* kfilereplace: batch search and replace tool
+* kimagemapeditor: HTML image map editor
+* klinkstatus: link checker
+* kommander: visual dialog building tool
+* kxsldbg: xslt Debugger
+* quanta+: web development
+
+%package devel
+Group: Development/Libraries
+Summary: Header files and documentation for %{name} 
+Provides: kdewebdev3-devel = %{version}-%{release}
+Requires: trinity-kdelibs-devel
+Requires: %{name}-libs
+Obsoletes: quanta-devel < %{version}-%{release}
+%description devel
+%{summary}.
+
+%package libs
+Summary: %{name} runtime libraries
+Group:   System Environment/Libraries
+Requires: trinity-kdelibs
+# helps multilib upgrades
+%description libs
+%{summary}.
+
+
+%prep
+%setup -q -a 1 -a 2 -a 3 -a 4 -n kdewebdev
+
+# 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"
+
+%patch0 -p0 -b .javascript
+%patch1 -p1 -b .kxsldbg-icons
+
+install -m644 -p %{SOURCE5} kxsldbg/
+
+%__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}"
+
+%if 0%{?fedora} >= 15
+#export CXXFLAGS="${CXXFLAGS} -fpermissive"
+%endif
+
+%configure \
+  --includedir=%{tde_includedir} \
+  --disable-rpath \
+  --enable-new-ldflags \
+  --enable-closure \
+  --disable-debug --disable-warnings \
+  --disable-dependancy-tracking --enable-final \
+  --with-extra-includes=%{_includedir}/tqt \
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{?buildroot}
+%__make install DESTDIR=%{?buildroot}
+
+
+## package separately?  Why doesn't upstream include this? -- Rex
+# install docs
+for i in css html javascript ; do
+   pushd $i
+   ./install.sh <<EOF
+%{buildroot}%{_datadir}/apps/quanta/doc
+EOF
+   popd
+   rm -rf $i
+done
+cp -a php php.docrc %{buildroot}%{_datadir}/apps/quanta/doc/
+
+# make symlinks relative
+pushd %{buildroot}%{_docdir}/HTML/en
+for i in *; do
+   if [ -d $i -a -L $i/common ]; then
+      rm -f $i/common
+      ln -nfs ../common $i
+   fi
+done
+popd
+
+# rpmdocs
+for dir in k* quanta; do
+  for file in AUTHORS ChangeLog README TODO ; do
+    test -s  "$dir/$file" && install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file"
+  done
+done
+
+
+%post
+for f in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun
+for f in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README
+%doc rpmdocs/*
+%{_bindir}/*
+%{tde_libdir}/*
+%{_datadir}/applications/kde/*
+%{_datadir}/applnk/.hidden/*
+%{_datadir}/apps/*
+%doc %{_datadir}/apps/quanta/doc
+%{_datadir}/config.kcfg/*
+%{_datadir}/icons/crystalsvg/*/*/*
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/icons/locolor/*/*/*
+%{_datadir}/mimelnk/application/*
+%{_datadir}/services/*
+%{_datadir}/servicetypes/*
+%doc %lang(en) %{_docdir}/HTML/en/*
+
+
+%files libs
+%defattr(-,root,root,-)
+%{_libdir}/lib*.so.*
+%{_libdir}/lib*.la
+
+%files devel
+%defattr(-,root,root,-)
+%{_libdir}/lib*.so
+%{tde_includedir}/*
+
+
+%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
+
+* Mon Sep 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
+- Import to GIT
diff --git a/redhat/trinity-desktop/trinity-desktop.spec b/redhat/trinity-desktop/trinity-desktop.spec
new file mode 100644
index 000000000..cf9a96d22
--- /dev/null
+++ b/redhat/trinity-desktop/trinity-desktop.spec
@@ -0,0 +1,96 @@
+# Default version for this component
+%if "%{?version}" == ""
+%define version 3.5.13
+%endif
+%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
+
+Name:		trinity-desktop
+Version:	%{version}
+Release:	%{?release}%{?dist}%{?_variant}
+License:	GPL
+Summary:	Meta-package to install TDE
+Group:		User Interface/Desktops
+
+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)
+BuildArch:	noarch
+
+Requires:	trinity-kdeaccessibility >= %{version}
+Requires:	trinity-kdeaddons >= %{version}
+Requires:	trinity-kdeadmin >= %{version}
+Requires:	trinity-kdeartwork >= %{version}
+Requires:	trinity-kdeartwork-icons >= %{version}
+Requires:	trinity-kdebase >= %{version}
+Requires:	trinity-kdebindings >= %{version}
+Requires:	trinity-kdeedu >= %{version}
+Requires:	trinity-kdegames >= %{version}
+Requires:	trinity-kdegraphics >= %{version}
+Requires:	trinity-kdemultimedia >= %{version}
+Requires:	trinity-kdenetwork >= %{version}
+Requires:	trinity-kdepim >= %{version}
+Requires:	trinity-kdeutils >= %{version}
+Requires:	trinity-kdetoys >= %{version}
+
+%description
+The TDE project aims to keep the KDE3.5 computing style alive, as well as 
+polish off any rough edges that were present as of KDE 3.5.10. Along 
+the way, new useful features will be added to keep the environment 
+up-to-date.
+Toward that end, significant new enhancements have already been made in 
+areas such as display control, network connectivity, user 
+authentication, and much more!
+
+%package dev
+Group:		User Interface/Desktops
+Summary:	Meta-package to install TDE development tools
+
+Requires:	trinity-kdesdk >= %{version}
+Requires:	trinity-kdevelop >= %{version}
+Requires:	trinity-kdewebdev >= %{version}
+
+%description dev
+%{summary}
+
+%package extras
+Group:		User Interface/Desktops
+Summary:	Meta-package to install extra TDE packages
+
+Requires:	trinity-kdeaddons-extras >= %{version}
+Requires:	trinity-kdebase-extras >= %{version}
+Requires:	trinity-kdegraphics-extras >= %{version}
+Requires:	trinity-kdemultimedia-extras >= %{version}
+Requires:	trinity-kdenetwork-extras >= %{version}
+Requires:	trinity-kdeutils-extras >= %{version}
+
+%description extras
+%{summary}
+
+%package all
+Group:		User Interface/Desktops
+Summary:	Meta-package to install all TDE packages
+
+Requires:	%{name} == %{version}
+Requires:	%{name}-dev == %{version}
+Requires:	%{name}-extras == %{version}
+
+%description all
+%{summary}
+
+
+%files
+
+%files dev
+
+%files extras
+
+%files all