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

64 files changed, 7473 insertions, 127 deletions

diff --git a/redhat/applications/abakus/abakus-0.91-link-dcop.patch b/redhat/applications/abakus/abakus-0.91-link-dcop.patch
new file mode 100644
index 000000000..f1dc37127
--- /dev/null
+++ b/redhat/applications/abakus/abakus-0.91-link-dcop.patch
@@ -0,0 +1,20 @@
+diff -rcb abakus.ORI/src/SConscript abakus/src/SConscript
+*** abakus.ORI/src/SConscript	2011-09-14 21:44:42.191599072 +0200
+--- abakus/src/SConscript	2011-09-14 21:44:51.352602708 +0200
+***************
+*** 66,72 ****
+  myenv.KDEaddpaths_includes('#/src/  #/')
+  
+  ## Necessary libraries to link against
+! myenv.KDEaddlibs( 'qt-mt kio kdecore kdeprint kdeui' )
+  
+  #############################
+  ## Data to install
+--- 66,72 ----
+  myenv.KDEaddpaths_includes('#/src/  #/')
+  
+  ## Necessary libraries to link against
+! myenv.KDEaddlibs( 'qt-mt kio kdecore kdeprint kdeui DCOP' )
+  
+  #############################
+  ## Data to install
diff --git a/redhat/applications/abakus/trinity-abakus-3.5.12.spec b/redhat/applications/abakus/trinity-abakus-3.5.12.spec
new file mode 100644
index 000000000..52cc67029
--- /dev/null
+++ b/redhat/applications/abakus/trinity-abakus-3.5.12.spec
@@ -0,0 +1,93 @@
+# Default version for this component
+%define kdecomp abakus
+%define version 0.91
+%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}
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/kde3
+
+
+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/
+
+Source0:	%{kdecomp}-3.5.12.tar.gz
+
+Patch0:		abakus-0.91-link-dcop.patch
+
+BuildRequires:	tqtinterface-devel
+BuildRequires:	trinity-kdelibs-devel
+BuildRequires:	trinity-kdebase-devel
+BuildRequires:	desktop-file-utils
+BuildRequires:	scons
+
+%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}
+%patch0 -p1
+
+%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
+* 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/basket/trinity-basket-3.5.12.spec b/redhat/applications/basket/trinity-basket-3.5.12.spec
new file mode 100644
index 000000000..a97f0bc9f
--- /dev/null
+++ b/redhat/applications/basket/trinity-basket-3.5.12.spec
@@ -0,0 +1,118 @@
+# Default version for this component
+%define kdecomp basket
+%define version 1.0.3.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}
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/kde3
+
+
+Name:		trinity-%{kdecomp}
+Summary:	Taking care of your ideas.
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/Utilities
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.trinitydesktop.org/
+
+Source0:	%{kdecomp}-3.5.12.tar.gz
+
+BuildRequires: tqtinterface-devel
+BuildRequires: trinity-kdelibs-devel
+BuildRequires: trinity-kdebase-devel
+BuildRequires: desktop-file-utils
+
+%description
+This application is mainly an all-purpose notes taker. It provide several baskets where
+to drop every sort of items: text, rich text, links, images, sounds, files, colors,
+application launcher... Objects can be edited, copied, dragged... So, you can arrange
+them as you want ! This application can be used to quickly drop web objects (link, text,
+images...) or notes, as well as to free your clutered desktop (if any). It is also useful
+to collect informations for a report. Those data can be shared with co-workers by exporting
+baskets to HTML.
+
+
+%prep
+%setup -q -n applications/%{kdecomp}
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%configure \
+	--disable-rpath \
+    --with-extra-includes=%{_includedir}/tqt
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%make_install
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{_bindir}/*
+%{_datadir}/applications/*/*.desktop
+%{_datadir}/apps/*/
+%{_datadir}/icons/*/*/*/*
+%{_datadir}/locale/*/*/*.mo
+%{tde_docdir}/HTML/en/*/
+%{_datadir}/services/*.desktop
+%{_datadir}/mimelnk/application/*.desktop
+%{_datadir}/services/*/*.desktop
+%{_datadir}/config/magic/*.magic
+%{_libdir}/*.so
+%{tde_libdir}/*.so
+
+%exclude %{_libdir}/*.la
+%exclude %{tde_libdir}/*.la
+
+
+%Changelog
+* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 1.0.3.1-3
+- Import to GIT
+
+* Tue Aug 23 2011 Francois Andriot <francois.andriot@free.fr> - 1.0.3.1-2
+- Add correction for Fedora 15
+
+* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 1.0.3.1-1
+- Correct macro to install under "/opt", if desired
+
+* Sun Aug 14 2011 Francois Andriot <francois.andriot@free.fr> - 1.0.3.1-0
+- Initial build for RHEL 6.0
+
diff --git a/redhat/applications/dolphin/trinity-dolphin-3.5.12.spec b/redhat/applications/dolphin/trinity-dolphin-3.5.12.spec
new file mode 100644
index 000000000..30b0eeb2f
--- /dev/null
+++ b/redhat/applications/dolphin/trinity-dolphin-3.5.12.spec
@@ -0,0 +1,134 @@
+# Default version for this component
+%define kdecomp dolphin
+%define version 0.9.2
+%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}
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/kde3
+
+
+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/
+
+Source0:	%{kdecomp}-3.5.12.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}
+
+%__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
+
+# 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/*/
+%{tde_docdir}/HTML/en/*/
+%{_datadir}/icons/hicolor/128x128/apps/*.png
+%{_datadir}/icons/hicolor/??x??/apps/*.png
+%{_datadir}/locale/*/*/d3lphin.mo
+
+
+%Changelog
+* 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.12.spec b/redhat/applications/filelight/trinity-filelight-3.5.12.spec
new file mode 100644
index 000000000..8340303f6
--- /dev/null
+++ b/redhat/applications/filelight/trinity-filelight-3.5.12.spec
@@ -0,0 +1,106 @@
+# Default version for this component
+%define kdecomp filelight
+%define version 1.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"
+%define _variant .opt
+%define _docdir %{_prefix}/share/doc
+%endif
+
+# TDE 3.5.12 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/kde3
+
+
+Name:		trinity-%{kdecomp}
+Summary:	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/
+
+Source0:	%{kdecomp}-3.5.12.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}
+
+%__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
+
+
+%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
+%{tde_docdir}/HTML/*/*/
+
+%{_libdir}/*/*.so
+%exclude %{_libdir}/*/*.la
+
+%Changelog
+* 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/trinity-gwenview-3.5.12.spec b/redhat/applications/gwenview/trinity-gwenview-3.5.12.spec
new file mode 100644
index 000000000..a46d016e2
--- /dev/null
+++ b/redhat/applications/gwenview/trinity-gwenview-3.5.12.spec
@@ -0,0 +1,153 @@
+# Default version for this component
+%define kdecomp gwenview
+%define version 1.4.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.12 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/kde3
+
+
+Name:		trinity-%{kdecomp}
+Summary:	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/
+
+Source0:	%{kdecomp}-3.5.12.tar.gz
+
+
+
+BuildRequires: tqtinterface-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}
+
+%__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
+
+
+
+## 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
+* 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-1.0.3-umount.patch b/redhat/applications/k3b/k3b-1.0.3-umount.patch
new file mode 100644
index 000000000..394aff152
--- /dev/null
+++ b/redhat/applications/k3b/k3b-1.0.3-umount.patch
@@ -0,0 +1,48 @@
+--- k3b-1.0.3/libk3b/core/k3bglobals.cpp.umount	2007-07-27 21:26:30.000000000 +0200
++++ k3b-1.0.3/libk3b/core/k3bglobals.cpp	2007-07-27 21:31:26.000000000 +0200
+@@ -569,7 +569,24 @@
+       return true;
+   }
+ 
+-  // now try pmount
++#ifdef HAVE_HAL
++    if (!K3bDevice::HalConnection::instance()->unmount( dev ))
++      return true;
++#endif
++
++  QString gumountBin = K3b::findExe( "gnome-umount" );
++  if( !gumountBin.isEmpty() ) {
++    KProcess p;
++    p << gumountBin;
++    p << "-u";
++    p << "-d";
++    p << dev->blockDeviceName();
++    p.start( KProcess::Block );
++    if( !p.exitStatus() )
++      return true;
++  }
++  
++// now try pmount
+   QString pumountBin = K3b::findExe( "pumount" );
+   if( !pumountBin.isEmpty() ) {
+     KProcess p;
+@@ -577,15 +592,11 @@
+     p << "-l"; // lazy unmount
+     p << dev->blockDeviceName();
+     p.start( KProcess::Block );
+-    return !p.exitStatus();
+-  }
+-  else {
+-#ifdef HAVE_HAL
+-    return !K3bDevice::HalConnection::instance()->unmount( dev );
+-#else
+-    return false;
+-#endif
++    if( !p.exitStatus() )
++      return true;
+   }
++
++  return false;
+ }
+ 
+ 
diff --git a/redhat/applications/k3b/k3b-1.0.4-manualbufsize.patch b/redhat/applications/k3b/k3b-1.0.4-manualbufsize.patch
new file mode 100644
index 000000000..4ee6105a0
--- /dev/null
+++ b/redhat/applications/k3b/k3b-1.0.4-manualbufsize.patch
@@ -0,0 +1,21 @@
+diff -up k3b-1.0.4/libk3b/core/k3bglobalsettings.cpp.manualbufsize k3b-1.0.4/libk3b/core/k3bglobalsettings.cpp
+--- k3b-1.0.4/libk3b/core/k3bglobalsettings.cpp.manualbufsize	2007-11-02 10:55:39.000000000 +0100
++++ k3b-1.0.4/libk3b/core/k3bglobalsettings.cpp	2008-04-22 14:15:06.000000000 +0200
+@@ -22,7 +22,7 @@ K3bGlobalSettings::K3bGlobalSettings()
+   : m_eject(true),
+     m_burnfree(true),
+     m_overburn(false),
+-    m_useManualBufferSize(false),
++    m_useManualBufferSize(true),
+     m_bufferSize(4),
+     m_force(false)
+ {
+@@ -37,7 +37,7 @@ void K3bGlobalSettings::readSettings( KC
+   m_eject = !c->readBoolEntry( "No cd eject", false );
+   m_burnfree = c->readBoolEntry( "burnfree", true );
+   m_overburn = c->readBoolEntry( "Allow overburning", false );
+-  m_useManualBufferSize = c->readBoolEntry( "Manual buffer size", false );
++  m_useManualBufferSize = c->readBoolEntry( "Manual buffer size", true );
+   m_bufferSize = c->readNumEntry( "Fifo buffer", 4 );
+   m_force = c->readBoolEntry( "Force unsafe operations", false );
+ 
diff --git a/redhat/applications/k3b/k3b-1.0.5-hidden.patch b/redhat/applications/k3b/k3b-1.0.5-hidden.patch
new file mode 100644
index 000000000..f27f0b391
--- /dev/null
+++ b/redhat/applications/k3b/k3b-1.0.5-hidden.patch
@@ -0,0 +1,31 @@
+diff -up k3b-1.0.5/src/Makefile.in.hidden k3b-1.0.5/src/Makefile.in
+--- k3b-1.0.5/src/Makefile.in.hidden	2008-05-27 03:34:44.000000000 -0500
++++ k3b-1.0.5/src/Makefile.in	2008-08-27 14:18:54.000000000 -0500
+@@ -512,9 +512,9 @@ k3b_LDADD = ./option/liboption.la ./rip/
+ 	-lkio -lkparts $(CAM_LIB) $(MUSICBRAINZ_LIBS)
+ 
+ SUBDIRS = option misc rip projects fastscale pics icons konqi mimetypes sounds
+-xdg_apps_DATA = k3b.desktop
+-silent_DATA = k3b-iso.desktop k3b-cue.desktop
+-silentdir = $(kde_appsdir)/.hidden/
++xdg_apps_DATA = k3b.desktop k3b-iso.desktop k3b-cue.desktop
++#silent_DATA = k3b-iso.desktop k3b-cue.desktop
++#silentdir = $(kde_appsdir)/.hidden/
+ 
+ ###################
+ # this 10 paths are KDE specific. Use them:
+diff -up k3b-1.0.5/src/Makefile.am.hidden k3b-1.0.5/src/Makefile.am
+--- k3b-1.0.5/src/Makefile.am.hidden	2008-05-27 03:24:04.000000000 -0500
++++ k3b-1.0.5/src/Makefile.am	2008-08-27 14:13:36.000000000 -0500
+@@ -32,10 +32,7 @@ k3b_LDADD = ./option/liboption.la ./rip/
+ 
+ SUBDIRS = option misc rip projects fastscale pics icons konqi mimetypes sounds
+ 
+-xdg_apps_DATA = k3b.desktop
+-
+-silent_DATA = k3b-iso.desktop k3b-cue.desktop
+-silentdir = $(kde_appsdir)/.hidden/
++xdg_apps_DATA = k3b.desktop k3b-iso.desktop k3b-cue.desktop
+ 
+ ###################
+ # this 10 paths are KDE specific. Use them:
diff --git a/redhat/applications/k3b/k3b-i18n-1.0.5.tar.bz2 b/redhat/applications/k3b/k3b-i18n-1.0.5.tar.bz2
new file mode 100644
index 000000000..014b9528e
--- /dev/null
+++ b/redhat/applications/k3b/k3b-i18n-1.0.5.tar.bz2
diff --git a/redhat/applications/k3b/k3brc b/redhat/applications/k3b/k3brc
new file mode 100644
index 000000000..5d967f599
--- /dev/null
+++ b/redhat/applications/k3b/k3brc
@@ -0,0 +1,6 @@
+[General Options]
+check system config=false
+Manual buffer size=true
+
+[Notification Messages]
+Don't prompt me again.=No
diff --git a/redhat/applications/k3b/reload-for-verification.diff b/redhat/applications/k3b/reload-for-verification.diff
new file mode 100644
index 000000000..a94298181
--- /dev/null
+++ b/redhat/applications/k3b/reload-for-verification.diff
@@ -0,0 +1,33 @@
+--- libk3b/jobs/k3bverificationjob.cpp.sav	2008-05-27 10:24:20.000000000 +0200
++++ libk3b/jobs/k3bverificationjob.cpp	2009-06-11 17:58:58.000000000 +0200
+@@ -154,6 +154,20 @@ void K3bVerificationJob::start()
+   emit newTask( i18n("Checking medium") );
+ 
+   d->mediumHasBeenReloaded = false;
++  connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::LOAD, d->device ),
++           SIGNAL(finished(K3bDevice::DeviceHandler*)),
++           this,
++           SLOT(slotMediaLoaded()) );
++}
++
++void K3bVerificationJob::slotMediaLoaded()
++{
++    // we always need to wait for the medium. Otherwise the diskinfo below
++    // may run before the drive is ready!
++    waitForMedia( d->device,
++                  K3bDevice::STATE_COMPLETE|K3bDevice::STATE_INCOMPLETE,
++                  K3bDevice::MEDIA_WRITABLE );
++
+   connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::DISKINFO, d->device ),
+            SIGNAL(finished(K3bDevice::DeviceHandler*)),
+            this,
+--- libk3b/jobs/k3bverificationjob.h.sav	2008-05-27 10:24:20.000000000 +0200
++++ libk3b/jobs/k3bverificationjob.h	2009-06-11 17:13:37.000000000 +0200
+@@ -75,6 +75,7 @@ class K3bVerificationJob : public K3bJob
+   void setGrownSessionSize( const K3b::Msf& );
+ 
+  private slots:
++  void slotMediaLoaded();
+   void slotMediaReloaded( bool success );
+   void slotDiskInfoReady( K3bDevice::DeviceHandler* dh );
+   void readTrack( int trackIndex );
diff --git a/redhat/applications/k3b/trinity-k3b-3.5.12.spec b/redhat/applications/k3b/trinity-k3b-3.5.12.spec
new file mode 100644
index 000000000..c29fa5c9b
--- /dev/null
+++ b/redhat/applications/k3b/trinity-k3b-3.5.12.spec
@@ -0,0 +1,271 @@
+# Default version for this component
+%if "%{?version}" == ""
+%define version 3.5.12
+%endif
+%define release 6
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%define _variant .opt
+%define _docdir %{_prefix}/share/doc
+%endif
+
+# TDE 3.5.12 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/kde3
+
+
+Name:    trinity-k3b
+Summary: CD/DVD burning application
+Version: %{?version}
+Release: %{?release}%{?dist}%{?_variant}
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.trinitydesktop.org/
+
+%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
+
+# Legacy RedHat / Fedora patches
+Patch2: k3b-1.0.3-umount.patch
+# manual bufsize (upstream?)
+Patch4: k3b-1.0.4-manualbufsize.patch
+# 3rd time is a charm, https://bugs.kde.org/show_bug.cgi?id=156684#c30 
+Patch102: reload-for-verification.diff
+# put k3b-(iso,cue).desktop to xdg_apps_DATA , see http://bugzilla.redhat.com/419681
+# upstreamed 2008-08-27
+Patch105: k3b-1.0.5-hidden.patch
+# RHEL6: Fix K3B icon
+Patch106: trinity-k3b-icons.patch
+
+
+BuildRequires: trinity-kdelibs-devel
+BuildRequires: desktop-file-utils
+BuildRequires: alsa-lib-devel
+BuildRequires: audiofile-devel
+BuildRequires: dbus-qt-devel hal-devel
+BuildRequires: flac-devel
+BuildRequires: gettext
+BuildRequires: libdvdread-devel
+%if 0%{?fedora} >= 15
+BuildRequires: libmpcdec-devel
+%else
+BuildRequires: musepack-tools-devel
+%endif
+BuildRequires: libmusicbrainz-devel
+BuildRequires: libsamplerate-devel
+BuildRequires: libsndfile-devel
+BuildRequires: libvorbis-devel
+BuildRequires: taglib-devel
+BuildRequires: zlib-devel
+
+Obsoletes: k3b-extras < 0:1.0-1
+Provides:  k3b-extras = %{version}-%{release} 
+
+Obsoletes: %{name}-i18n
+Provides: %{name}-i18n
+
+Requires(post): coreutils
+Requires(postun): coreutils
+
+Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-common = %{version}-%{release}
+
+Requires: cdrecord mkisofs
+Requires: cdrdao
+Requires: dvd+rw-tools
+
+%description
+K3b provides a comfortable user interface to perform most CD/DVD
+burning tasks. While the experienced user can take influence in all
+steps of the burning process the beginner may find comfort in the
+automatic settings and the reasonable k3b defaults which allow a quick
+start.
+
+%package common
+Summary:  Common files of %{name}
+Group:    Applications/Archiving
+Requires: %{name} = %{version}-%{release}
+BuildArch: noarch
+%description common
+%{summary}.
+
+%package libs
+Summary: Runtime libraries for %{name}
+Group:   System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+%description libs
+%{summary}.
+
+%package devel
+Summary: Files for the development of applications which will use %{name} 
+Group: Development/Libraries
+Requires: %{name}-libs = %{version}-%{release}
+%description devel
+%{summary}.
+
+
+%prep
+%setup -q -a 1 -n applications/k3b
+
+%patch2 -p1 -b .umount
+# set in k3brc too 
+%patch4 -p1 -b .manualbufsize
+%patch102 -p0 -b .kde#156684
+%patch106 -p1 -b .desktopfile
+
+%__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"
+
+%patch105 -p1 -b .hidden
+
+%build
+unset QTDIR || : ; . /etc/profile.d/qt.sh
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+CFLAGS="%optflags -fno-strict-aliasing" \
+CXXFLAGS="%optflags -fno-strict-aliasing" \
+%configure \
+  --includedir=%{_includedir}/k3b \
+  --disable-rpath \
+  --enable-new-ldflags \
+  --disable-debug --disable-warnings \
+  --disable-dependency-tracking --enable-final \
+  --with-k3bsetup=no \
+  --without-cdrecord-suid-root \
+  --with-oggvorbis \
+  --with-flac \
+  --with-external-libsamplerate \
+  --with-libdvdread \
+  --with-musicbrainz \
+  --with-sndfile \
+  --without-ffmpeg --without-lame --without-libmad \
+  --with-musepack \
+  --with-extra-includes=%{_includedir}/tqt
+
+%__make %{?_smp_mflags}
+
+# Build for i18n tarball
+pushd k3b-i18n-1.0.5
+%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
+
+# remove the .la files
+%{__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
+
+
+%check
+export PATH="%{_bindir}:${PATH}"
+desktop-file-validate %{buildroot}%{_datadir}/applications/kde/k3b.desktop
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
+%post common
+touch --no-create %{_datadir}/icons/hicolor ||:
+
+%postun common
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null
+fi
+
+%posttrans common
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS README COPYING TODO ChangeLog
+%{_bindir}/k3b
+%{tde_libdir}/*.so
+%{tde_libdir}/*.la
+%doc %{tde_docdir}/HTML/*/k3b/*
+
+%files common -f all.lang
+%defattr(-,root,root,-)
+%{_datadir}/applications/kde/*.desktop
+%{_datadir}/apps/k3b/
+%{_datadir}/apps/konqueror/servicemenus/*.desktop
+%{_datadir}/apps/konqsidebartng/virtual_folders/services/videodvd.desktop
+%{_datadir}/config/k3brc
+%{_datadir}/mimelnk/application/x-k3b.desktop
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/services/kfile_k3b.desktop
+%{_datadir}/services/videodvd.protocol
+%{_datadir}/sounds/k3b_*.wav
+
+%files libs
+%defattr(-,root,root,-)
+%{_libdir}/libk3b.so.3*
+%{_libdir}/libk3bdevice.so.5*
+
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/*
+%{_libdir}/libk3b.so
+%{_libdir}/libk3bdevice.so
+
+
+%changelog
+* Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-6
+- Import to GIT
+
+* Wed Aug 24 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-5
+- Add fix for Fedora 15
+
+* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-4
+- Correct macro to install under "/opt", if desired
+
+* Thu Apr 28 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-3
+- Fix config file '/usr/share/config/k3brc'
+
+* Sun Dec 19 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2
+- Add i18n translations
+- Add patches from RHEL 6.0 (except Patch106, redundant with our 'patch0')
+- Renamed 'patch0' (Thales) to 'patch106'
+
+* Fri Dec 17 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
+- Add macro _kde3_prefix to define custom installation prefix (ex: /opt/kde3)
+- Add '--with-extra-includes=%{_includedir}/tqt'
+
+* Wed Dec 15 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-0
+- Initial version built for RHEL 6.0
+- Add 'patch0' : invalid syntax in 'k3b.desktop'
+
diff --git a/redhat/applications/k3b/trinity-k3b-3.5.13.spec b/redhat/applications/k3b/trinity-k3b-3.5.13.spec
new file mode 100644
index 000000000..ebe091c1c
--- /dev/null
+++ b/redhat/applications/k3b/trinity-k3b-3.5.13.spec
@@ -0,0 +1,244 @@
+# 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 building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}/kde
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/trinity
+
+
+Name:    trinity-k3b
+Summary: CD/DVD burning application
+Version: %{?version}
+Release: %{?release}%{?dist}%{?_variant}
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.trinitydesktop.org/
+
+%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
+
+# Legacy RedHat / Fedora patches
+# manual bufsize (upstream?)
+Patch4: k3b-1.0.4-manualbufsize.patch
+# Thales: correction de l'icone
+Patch106: trinity-k3b-icons.patch
+
+
+BuildRequires: trinity-kdelibs-devel
+BuildRequires: desktop-file-utils
+BuildRequires: alsa-lib-devel
+BuildRequires: audiofile-devel
+BuildRequires: dbus-qt-devel hal-devel
+BuildRequires: flac-devel
+BuildRequires: gettext
+BuildRequires: libdvdread-devel
+%if 0%{?fedora} >= 15
+BuildRequires: libmpcdec-devel
+%else
+BuildRequires: musepack-tools-devel
+%endif
+BuildRequires: libmusicbrainz-devel
+BuildRequires: libsamplerate-devel
+BuildRequires: libsndfile-devel
+BuildRequires: libvorbis-devel
+BuildRequires: taglib-devel
+BuildRequires: zlib-devel
+
+Obsoletes: k3b-extras < 0:1.0-1
+Provides:  k3b-extras = %{version}-%{release} 
+
+Obsoletes: %{name}-i18n
+Provides: %{name}-i18n
+
+Requires(post): coreutils
+Requires(postun): coreutils
+
+Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-common = %{version}-%{release}
+
+Requires: cdrecord mkisofs
+Requires: cdrdao
+Requires: dvd+rw-tools
+
+%description
+K3b provides a comfortable user interface to perform most CD/DVD
+burning tasks. While the experienced user can take influence in all
+steps of the burning process the beginner may find comfort in the
+automatic settings and the reasonable k3b defaults which allow a quick
+start.
+
+%package common
+Summary:  Common files of %{name}
+Group:    Applications/Archiving
+Requires: %{name} = %{version}-%{release}
+BuildArch: noarch
+%description common
+%{summary}.
+
+%package libs
+Summary: Runtime libraries for %{name}
+Group:   System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+%description libs
+%{summary}.
+
+%package devel
+Summary: Files for the development of applications which will use %{name} 
+Group: Development/Libraries
+Requires: %{name}-libs = %{version}-%{release}
+%description devel
+%{summary}.
+
+
+%prep
+%setup -q -a 1 -n applications/k3b
+
+# set in k3brc too 
+%patch4 -p1 -b .manualbufsize
+%patch106 -p1 -b .desktopfile
+
+# 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
+unset QTDIR || : ; . /etc/profile.d/qt.sh
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+CFLAGS="%optflags -fno-strict-aliasing" \
+CXXFLAGS="%optflags -fno-strict-aliasing" \
+%configure \
+  --includedir=%{_includedir}/k3b \
+  --disable-rpath \
+  --enable-new-ldflags \
+  --disable-debug --disable-warnings \
+  --disable-dependency-tracking --enable-final \
+  --with-k3bsetup=no \
+  --without-cdrecord-suid-root \
+  --with-oggvorbis \
+  --with-flac \
+  --with-external-libsamplerate \
+  --with-libdvdread \
+  --with-musicbrainz \
+  --with-sndfile \
+  --without-ffmpeg --without-lame --without-libmad \
+  --with-musepack \
+  --with-extra-includes=%{_includedir}/tqt
+
+%__make %{?_smp_mflags}
+
+# Build for i18n tarball
+pushd k3b-i18n-1.0.5
+%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
+
+# remove the .la files
+%{__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
+
+
+%check
+export PATH="%{_bindir}:${PATH}"
+desktop-file-validate %{buildroot}%{_datadir}/applications/kde/k3b.desktop
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
+%post common
+touch --no-create %{_datadir}/icons/hicolor ||:
+
+%postun common
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null
+fi
+
+%posttrans common
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS README COPYING TODO ChangeLog
+%{_bindir}/k3b
+%{tde_libdir}/*.so
+%{tde_libdir}/*.la
+%doc %{tde_docdir}/HTML/*/k3b/*
+
+%files common -f all.lang
+%defattr(-,root,root,-)
+%{_datadir}/applications/kde/*.desktop
+%{_datadir}/apps/k3b/
+%{_datadir}/apps/konqueror/servicemenus/*.desktop
+%{_datadir}/apps/konqsidebartng/virtual_folders/services/videodvd.desktop
+%{_datadir}/config/k3brc
+%{_datadir}/mimelnk/application/x-k3b.desktop
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/services/kfile_k3b.desktop
+%{_datadir}/services/videodvd.protocol
+%{_datadir}/sounds/k3b_*.wav
+
+%files libs
+%defattr(-,root,root,-)
+%{_libdir}/libk3b.so.3*
+%{_libdir}/libk3bdevice.so.5*
+
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/*
+%{_libdir}/libk3b.so
+%{_libdir}/libk3bdevice.so
+
+
+%changelog
+* Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
+- Import to GIT
diff --git a/redhat/applications/k3b/trinity-k3b-icons.patch b/redhat/applications/k3b/trinity-k3b-icons.patch
new file mode 100644
index 000000000..ae7c44ee9
--- /dev/null
+++ b/redhat/applications/k3b/trinity-k3b-icons.patch
@@ -0,0 +1,22 @@
+diff -rcb k3b.ori/src/k3b.desktop k3b/src/k3b.desktop
+*** k3b.ori/src/k3b.desktop	Wed Dec 15 14:23:05 2010
+--- k3b/src/k3b.desktop	Wed Dec 15 14:28:55 2010
+***************
+*** 116,123 ****
+  Name[ar]= K3b
+  Name[bn]=কে-থ্রি-বি
+  Name[hi]=के3बी
+! MimeType=application/x-k3b;application/x-iso;application/x-cue
+  X-KDE-StartupNotify=true
+! X-KDE-NativeMimeType=application/x-k3b;application/x-iso;application/x-cue
+! Categories=KDE;Application;AudioVideo;DiscBurning;
+  X-DCOP-ServiceType=Unique
+--- 116,123 ----
+  Name[ar]= K3b
+  Name[bn]=কে-থ্রি-বি
+  Name[hi]=के3बी
+! MimeType=application/x-k3b;application/x-iso;application/x-cue;
+  X-KDE-StartupNotify=true
+! X-KDE-NativeMimeType=application/x-k3b;application/x-iso;application/x-cue;
+! Categories=KDE;AudioVideo;DiscBurning;
+  X-DCOP-ServiceType=Unique
diff --git a/redhat/applications/kdiff3/trinity-kdiff3-3.5.12.spec b/redhat/applications/kdiff3/trinity-kdiff3-3.5.12.spec
new file mode 100644
index 000000000..6383af2d2
--- /dev/null
+++ b/redhat/applications/kdiff3/trinity-kdiff3-3.5.12.spec
@@ -0,0 +1,111 @@
+# Default version for this component
+%define kdecomp kdiff3
+%define version 0.9.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.12 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/kde3
+
+
+Name:		trinity-%{kdecomp}
+Summary:	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/
+
+Source0:	%{kdecomp}-3.5.12.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}
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%configure \
+	--disable-rpath \
+    --with-extra-includes=%{_includedir}/tqt \
+    --enable-closure
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%make_install
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{_bindir}/*
+%{_datadir}/apps/*/
+%{_datadir}/icons/*/*/*/*
+%{_datadir}/locale/*/*/*.mo
+%{tde_docdir}/HTML/*/*
+%{_datadir}/services/*.desktop
+%{tde_libdir}/*.so
+%{_datadir}/applnk/Development/*.desktop
+%{_datadir}/applnk/.hidden/*.desktop
+%{_mandir}/man*/*
+
+%{tde_libdir}/*.la
+
+%Changelog
+* 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.12.spec b/redhat/applications/krename/trinity-krename-3.5.12.spec
new file mode 100644
index 000000000..37fc9e1c5
--- /dev/null
+++ b/redhat/applications/krename/trinity-krename-3.5.12.spec
@@ -0,0 +1,104 @@
+# Default version for this component
+%define kdecomp krename
+%define version 3.0.14
+%define release 2
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%define _variant .opt
+%define _docdir %{_prefix}/share/doc
+%endif
+
+# TDE 3.5.12 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/kde3
+
+
+Name:		trinity-%{kdecomp}
+Summary:	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/
+
+Source0:	%{kdecomp}-3.5.12.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}
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%configure \
+	--disable-rpath \
+    --with-extra-includes=%{_includedir}/tqt \
+    --enable-closure
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%make_install
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{_bindir}/*
+%{_datadir}/applications/*/*.desktop
+%{_datadir}/apps/*/
+%{tde_docdir}/HTML/en/*/
+%{_datadir}/icons/*/*/*/*
+%{_datadir}/locale/*/*/*.mo
+
+
+%Changelog
+* 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/kuickshow/trinity-kuickshow-3.5.12.spec b/redhat/applications/kuickshow/trinity-kuickshow-3.5.12.spec
new file mode 100644
index 000000000..307f9f0cc
--- /dev/null
+++ b/redhat/applications/kuickshow/trinity-kuickshow-3.5.12.spec
@@ -0,0 +1,109 @@
+# Default version for this component
+%define kdecomp kuickshow
+%define version 0.8.13
+%define release 2
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%define _variant .opt
+%define _docdir %{_prefix}/share/doc
+%endif
+
+# TDE 3.5.12 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/kde3
+
+
+Name:		trinity-%{kdecomp}
+Summary:	Quick picture 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/
+
+Source0:	%{kdecomp}-3.5.12.tar.gz
+
+Conflicts:	trinity-kdegraphics
+
+BuildRequires: tqtinterface-devel
+BuildRequires: trinity-kdelibs-devel
+BuildRequires: trinity-kdebase-devel
+BuildRequires: desktop-file-utils
+BuildRequires: imlib-devel
+
+%description
+Kuickshow is a picture viewer for KDE. It displays the directory structure,
+displaying images as thumbnails.
+Clicking on an image shows the image in its normal size. 
+
+
+%prep
+%setup -q -n applications/%{kdecomp}
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%configure \
+	--disable-rpath \
+    --with-extra-includes=%{_includedir}/tqt \
+    --enable-closure
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%make_install
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{_bindir}/*
+%{_datadir}/applications/*/*.desktop
+%{_datadir}/apps/*/
+%{tde_docdir}/HTML/en/*/
+%{_datadir}/icons/*/*/*/*
+%{_libdir}/libkdeinit_%{kdecomp}.so
+
+%exclude %{_libdir}/*.la
+%exclude %{_libdir}/*/*.so
+%exclude %{_libdir}/*/*.la
+
+
+%Changelog
+* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.13-2
+- Import to GIT
+
+* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.13-1
+- Correct macro to install under "/opt", if desired
+
+* Sat Aug 13 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.13-0
+- Initial build for RHEL 6.0
+
diff --git a/redhat/applications/yakuake/trinity-yakuake-3.5.12.spec b/redhat/applications/yakuake/trinity-yakuake-3.5.12.spec
new file mode 100644
index 000000000..0bec5e1f4
--- /dev/null
+++ b/redhat/applications/yakuake/trinity-yakuake-3.5.12.spec
@@ -0,0 +1,97 @@
+# Default version for this component
+%define kdecomp yakuake
+%define version 2.8.1
+%define release 2
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%define _variant .opt
+%define _docdir %{_prefix}/share/doc
+%endif
+
+# TDE 3.5.12 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/kde3
+
+
+Name:		trinity-%{kdecomp}
+Summary:	Yakuake is a Quake-style terminal emulator based on KDE Konsole technology.
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/Utilities
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.trinitydesktop.org/
+
+Source0:	%{kdecomp}-3.5.12.tar.gz
+
+BuildRequires: tqtinterface-devel
+BuildRequires: trinity-kdelibs-devel
+BuildRequires: trinity-kdebase-devel
+BuildRequires: desktop-file-utils
+
+%description
+Yakuake is a Quake-style terminal emulator based on KDE Konsole technology.
+
+%prep
+%setup -q -n applications/%{kdecomp}
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%configure \
+	--disable-rpath \
+    --with-extra-includes=%{_includedir}/tqt \
+    --enable-closure
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%make_install
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{_bindir}/*
+%{_datadir}/applications/*/*.desktop
+%{_datadir}/apps/*/
+%{_datadir}/icons/*/*/*/*
+%{_datadir}/locale/*/*/*.mo
+%{_datadir}/config.kcfg/*.kcfg
+
+%Changelog
+* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 2.8.1-2
+- Import to GIT
+
+* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 2.8.1-1
+- Correct macro to install under "/opt", if desired
+
+* Sun Aug 14 2011 Francois Andriot <francois.andriot@free.fr> - 2.8.1-0
+- Initial build for RHEL 6.0
+
diff --git a/redhat/components.txt b/redhat/components.txt
index 9a4b4836d..843fd85f7 100644
--- a/redhat/components.txt
+++ b/redhat/components.txt
@@ -5,3 +5,19 @@ dependencies/arts
 kdelibs
 kdebase
 kdebindings
+kdeutils
+kdepim
+kdesdk
+kdevelop
+kdemultimedia
+kdeartwork
+kdegraphics
+kdeaccessibility
+kdenetwork
+kdetoys
+kdeadmin
+kdegames
+kdeedu
+kdeaddons
+kde-i18n
+applications/k3b
diff --git a/redhat/dependencies/arts/trinity-arts-3.5.12.spec b/redhat/dependencies/arts/trinity-arts-3.5.12.spec
index 16ccd741e..4b6fcfe1a 100755
--- a/redhat/dependencies/arts/trinity-arts-3.5.12.spec
+++ b/redhat/dependencies/arts/trinity-arts-3.5.12.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.12
 %endif
-%define release 4
+%define release 5
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -18,7 +18,10 @@ 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
@@ -29,6 +32,7 @@ BuildRequires:	audiofile-devel
 BuildRequires:	alsa-lib-devel
 BuildRequires:	glib2-devel
 BuildRequires:	libtool-ltdl-devel
+BuildRequires:	gsl-devel
 
 Requires:	tqtinterface
 Requires:	audiofile
@@ -51,8 +55,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
@@ -65,7 +70,7 @@ Development files for %{name}
 
 %__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
+%__make -f "admin/Makefile.common"
 
 %build
 export PATH="%{_bindir}:${PATH}"
@@ -118,6 +123,9 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}"
 
 
 %changelog
+* Mon Sep 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-5
+- Add "Group" field
+
 * Sun Sep 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-4
 - Import to GIT
 - Removes cmake stuff, build with autotools only
diff --git a/redhat/dependencies/arts/trinity-arts-3.5.13.spec b/redhat/dependencies/arts/trinity-arts-3.5.13.spec
index 2a2cd2fba..fd2d6104d 100755
--- a/redhat/dependencies/arts/trinity-arts-3.5.13.spec
+++ b/redhat/dependencies/arts/trinity-arts-3.5.13.spec
@@ -18,7 +18,9 @@ Version:	%{?version}
 Release:	%{?release}%{?dist}%{?_variant}
 License:	GPL
 Summary:	aRts (analog realtime synthesizer) - the KDE sound system
+
 Vendor:		Trinity Project
+URL:		http://www.trinitydesktop.org/
 Packager:	Francois Andriot <francois.andriot@free.fr>
 
 Source0:	arts-%{version}.tar.gz
@@ -29,6 +31,7 @@ BuildRequires:	audiofile-devel
 BuildRequires:	alsa-lib-devel
 BuildRequires:	glib2-devel
 BuildRequires:	libtool-ltdl-devel
+BuildRequires:	gsl-devel
 
 Requires:	tqtinterface
 Requires:	audiofile
@@ -69,6 +72,7 @@ unset QTDIR || : ; . /etc/profile.d/qt.sh
 %__mkdir build
 cd build
 %cmake \
+  -DINCLUDE_INSTALL_DIR=%{_includedir}/arts \
   -DPKGCONFIG_INSTALL_DIR=%{_libdir}/pkgconfig \
   -DWITH_MAD=OFF \
   ..
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.12.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.12.spec
index 10c5fd0d6..79102f528 100755
--- a/redhat/dependencies/tqtinterface/tqtinterface-3.5.12.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface-3.5.12.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.12
 %endif
-%define release 7
+%define release 8
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -14,9 +14,9 @@
 %define _includedir %{_prefix}/include/tqt
 
 # TDE 3.5.12 specific building variables
-BuildRequires: autoconf automake libtool m4
+BuildRequires:	autoconf automake libtool m4
 BuildRequires:	qt3-devel >= 3.3.8b
-Requires:	qt3 >= 3.3.8b
+Requires:		qt3 >= 3.3.8b
 
 
 Name:		tqtinterface
@@ -24,7 +24,10 @@ 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}
@@ -40,8 +43,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}
@@ -51,7 +55,7 @@ Development files for %{name}
 
 %__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
+%__make -f "admin/Makefile.common"
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -83,6 +87,9 @@ CFLAGS=$( pkg-config --libs qt-mt )
 
 
 %changelog
+* Mon Sep 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-8
+- Add "Group"
+
 * Sun Sep 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-7
 - Import to GIT
 - Removes cmake stuff, build with autotools only
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec
index 3a35c6866..859afa0bd 100755
--- a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec
@@ -7,6 +7,9 @@
 # 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 cmake_modules_dir %{_datadir}/cmake
+%else
+%define cmake_modules_dir %{_datadir}/cmake/Modules
 %endif
 
 # TQT include files may conflict with QT4 includes, so we move them to a subdirectory.
@@ -14,9 +17,9 @@
 %define _includedir %{_prefix}/include/tqt
 
 # TDE 3.5.13 specific building variables
-BuildRequires: cmake >= 2.8
+BuildRequires:	cmake >= 2.8
 BuildRequires:	qt3-devel >= 3.3.8d
-Requires:	qt3 >= 3.3.8d
+Requires:		qt3 >= 3.3.8d
 
 
 Name:		tqtinterface
@@ -24,7 +27,9 @@ Version:	%{version}
 Release:	%{release}%{?dist}%{?_variant}
 License:	GPL
 Summary:	Trinity QT Interface
+
 Vendor:		Trinity Project
+URL:		http://www.trinitydesktop.org/
 Packager:	Francois Andriot <francois.andriot@free.fr>
 
 Prefix:		%{_prefix}
@@ -77,9 +82,9 @@ sed -i %{?buildroot}%{_libdir}/pkgconfig/tqt.pc \
   -e '/^uic_executable=.*/ s,^\(uic_executable=\).*,\1%{_bindir}/uic-tqt,'
 
 # Install 'cmake' modules for a specific package (for later use)
-%__mkdir_p %{?buildroot}%{_usr}/share/cmake/Modules
+%__mkdir_p %{?buildroot}%{cmake_modules_dir}
 for i in cmake/modules/*.cmake; do
-  install -m 644 $i %{?buildroot}%{_usr}/share/cmake/Modules
+  install -m 644 $i %{?buildroot}%{cmake_modules_dir}
 done
 
 %clean
@@ -94,7 +99,7 @@ done
 %{_libdir}/*.so
 %{_libdir}/*.la
 %{_libdir}/pkgconfig/*.pc
-%{_usr}/share/cmake/Modules/*.cmake
+%{cmake_modules_dir}/*.cmake
 
 
 %changelog
diff --git a/redhat/gentarball.sh b/redhat/gentarball.sh
index 9fd57625f..ab337ac6a 100755
--- a/redhat/gentarball.sh
+++ b/redhat/gentarball.sh
@@ -21,17 +21,24 @@ select COMP in $( cut -f1 components.txt ) ; do
 
 	VERSION=$( awk '{ if ($1 == "'${COMP}'") { print $2; } }' components.txt )
 	if [ -z "${VERSION}" ]; then VERSION=${DEFAULT_VERSION}; fi
-	ARCHIVENAME=${COMP##*/}-${VERSION}.$(date +%Y%m%d).tar.gz
 
 	# List existing tarballs
-	if [ -e ${ARCHIVEDIR}/${COMP##*/}*.tar.gz ]; then
+	if ls ${ARCHIVEDIR}/${COMP##*/}*.tar.gz >/dev/null 2>&1; then
 		echo
 		echo "You currently have the following tarball(s): "
 		for i in ${ARCHIVEDIR}/${COMP##*/}*.tar.gz; do echo "  ${i##*/}"; done
 	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
+
+	if [ -r ${ARCHIVEDIR}/${ARCHIVENAME} ]; then
+		echo "You already have the latest revision (${SVNREV})";
+	fi
+	
 	echo
-	echo "Press ENTER to download a new version '${ARCHIVENAME}', or CTRL+C to abort."
+	echo "Press ENTER to download a new version, or CTRL+C to abort."
 	read rep
 
 	TMPDIRTDE=$(mktemp -d)
@@ -41,9 +48,10 @@ select COMP in $( cut -f1 components.txt ) ; do
 	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};;
+		*) 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}
 	popd >/dev/null
diff --git a/redhat/kde-i18n/kde-i18n-kdesu.patch b/redhat/kde-i18n/kde-i18n-kdesu.patch
new file mode 100644
index 000000000..7c083cd42
--- /dev/null
+++ b/redhat/kde-i18n/kde-i18n-kdesu.patch
@@ -0,0 +1,45 @@
+diff -rcb kde-i18n-fr-3.5.10.ORI/messages/kdebase/kdesu.po kde-i18n-fr-3.5.10/messages/kdebase/kdesu.po
+*** kde-i18n-fr-3.5.10.ORI/messages/kdebase/kdesu.po	2010-12-19 01:32:05.649657741 +0100
+--- kde-i18n-fr-3.5.10/messages/kdebase/kdesu.po	2010-12-19 01:33:50.416539931 +0100
+***************
+*** 132,151 ****
+  #: sudlg.cpp:36
+  msgid ""
+  "The action you requested needs root privileges. Please enter root's password "
+! "below or click Ignore to continue with your current privileges."
+  msgstr ""
+  "L'action requise nécessite les droits du superutilisateur. Veuillez saisir "
+! "ci-dessous le mot de passe du superutilisateur ou cliquez sur « Ignorer » pour "
+! "continuer avec vos droits actuels."
+  
+  #: sudlg.cpp:40
+  msgid ""
+  "The action you requested needs additional privileges. Please enter the password "
+! "for \"%1\" below or click Ignore to continue with your current privileges."
+  msgstr ""
+  "L'action requise nécessite des droits supplémentaires. Veuillez saisir "
+! "ci-dessous le mot de passe de « %1 » ou cliquez sur « Ignorer » pour continuer "
+! "avec vos droits actuels."
+  
+  #: sudlg.cpp:48
+  msgid "&Ignore"
+--- 132,149 ----
+  #: sudlg.cpp:36
+  msgid ""
+  "The action you requested needs root privileges. Please enter root's password "
+! "below."
+  msgstr ""
+  "L'action requise nécessite les droits du superutilisateur. Veuillez saisir "
+! "ci-dessous le mot de passe du superutilisateur."
+  
+  #: sudlg.cpp:40
+  msgid ""
+  "The action you requested needs additional privileges. Please enter the password "
+! "for \"%1\" below."
+  msgstr ""
+  "L'action requise nécessite des droits supplémentaires. Veuillez saisir "
+! "ci-dessous le mot de passe de « %1 »."
+  
+  #: sudlg.cpp:48
+  msgid "&Ignore"
+Seulement dans kde-i18n-fr-3.5.10/messages/kdebase: kdesu.po~
diff --git a/redhat/kde-i18n/trinity-kde-i18n-3.5.12.spec b/redhat/kde-i18n/trinity-kde-i18n-3.5.12.spec
new file mode 100644
index 000000000..603503dde
--- /dev/null
+++ b/redhat/kde-i18n/trinity-kde-i18n-3.5.12.spec
@@ -0,0 +1,1243 @@
+# Default version for this component
+%if "%{?version}" == ""
+%define version 3.5.12
+%endif
+%define release 6
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%define _variant .opt
+%define _docdir %{_prefix}/share/doc
+%endif
+
+# TDE 3.5.12 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/kde3
+
+# 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/
+
+# 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
+
+# Patch for 'kdesu': the message was modified in 'kdebase' package
+Patch0:		kde-i18n-kdesu.patch
+
+# Patch to translate 'Open Terminal Here' desktop shortcut
+Patch1:		trinity-kde-i18n-fr-openterminalhere.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
+
+
+%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}
+
+      # Thales: 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
+* Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-6
+- Re-introduce all languages
+
+* Wed Aug 24 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-5
+- Re-introduce all languages
+
+* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-4
+- Correct macro to install under "/opt", if desired
+
+* Thu Jul 21 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-3
+- Add 'Patch1': translation for 'Open Terminal Here...' background shortcut
+
+* Sun Dec 19 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2
+- Rebuilt
+
+* Sun Dec 19 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-0
+- Initial version (French language only)
+- Based on RHEL SPEC file 'kde-i18n'
+- Add 'patch0' to reflect modifications in 'kdesu' from 'kdebase' package
+
diff --git a/redhat/kde-i18n/trinity-kde-i18n-fr-openterminalhere.patch b/redhat/kde-i18n/trinity-kde-i18n-fr-openterminalhere.patch
new file mode 100644
index 000000000..d45075fff
--- /dev/null
+++ b/redhat/kde-i18n/trinity-kde-i18n-fr-openterminalhere.patch
@@ -0,0 +1,16 @@
+diff -rcb 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	2011-07-21 10:02:12.261100210 +0200
+--- kde-i18n-fr-3.5.10/messages/kdebase/kdesktop.po	2011-07-21 10:05:55.365975529 +0200
+***************
+*** 246,251 ****
+--- 246,255 ----
+  msgid "Run Command..."
+  msgstr "Exécuter une commande..."
+  
++ #: krootwm.cc:135 (Trinity Specific)
++ msgid "Open Terminal Here..."
++ msgstr "Ouvrir un Terminal..."
++ 
+  #: krootwm.cc:137
+  msgid "Configure Desktop..."
+  msgstr "Configurer le bureau..."
diff --git a/redhat/kdeaccessibility/trinity-kdeaccessibility-3.5.12.spec b/redhat/kdeaccessibility/trinity-kdeaccessibility-3.5.12.spec
new file mode 100644
index 000000000..6ce1809ab
--- /dev/null
+++ b/redhat/kdeaccessibility/trinity-kdeaccessibility-3.5.12.spec
@@ -0,0 +1,176 @@
+# Default version for this component
+%if "%{?version}" == ""
+%define version 3.5.12
+%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}
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/kde3
+
+
+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
+
+%__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 \
+  --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
+
+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}/service*/*.desktop
+%{_libdir}/lib*.so.*
+%{_libdir}/*.la
+%{tde_libdir}/*
+
+%files devel
+%defattr(-,root,root,-)
+%{tde_includedir}/*
+%{_libdir}/lib*.so
+
+
+%changelog
+* Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
+- Initial build for RHEL 6
+- Spec file based on Fedora 8 "kdeaccessibility-3.5.10-1"
+- Import to GIT
diff --git a/redhat/kdeaddons/trinity-kdeaddons-3.5.12.spec b/redhat/kdeaddons/trinity-kdeaddons-3.5.12.spec
new file mode 100644
index 000000000..a63d01271
--- /dev/null
+++ b/redhat/kdeaddons/trinity-kdeaddons-3.5.12.spec
@@ -0,0 +1,244 @@
+# Default version for this component
+%if "%{?version}" == ""
+%define version 3.5.12
+%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}
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/kde3
+
+
+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/
+
+Source0: kdeaddons-%{version}.tar.gz
+Source1: metabar-fedora.tar.bz2
+Source2: metabarrc
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+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: kdegames3 >= %{version}
+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
+
+%__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 \
+  --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
+
+# File lists for locale
+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
+
+# 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*/*
+
+# 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 Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
+- Initial build for RHEL 6
+- Spec file based on Fedora 8 "kdeaddons-3.5.10-1"
+- Import to GIT
diff --git a/redhat/kdeadmin/trinity-kdeadmin-3.5.12.spec b/redhat/kdeadmin/trinity-kdeadmin-3.5.12.spec
new file mode 100644
index 000000000..83f0aafe0
--- /dev/null
+++ b/redhat/kdeadmin/trinity-kdeadmin-3.5.12.spec
@@ -0,0 +1,190 @@
+# Default version for this component
+%if "%{?version}" == ""
+%define version 3.5.12
+%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}
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/kde3
+
+
+%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}
+
+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
+
+%__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 \
+   --with-private-groups \
+   --with-extra-includes=%{_includedir}/tqt
+
+%__make %{?_smp_mflags}
+
+%install
+%__rm -rf %{buildroot}
+%make_install
+
+%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/*
+%endif
+%{_datadir}/apps/*
+%{_datadir}/applications/kde/*.desktop
+#%{_datadir}/config*/*
+#%{_datadir}/icons/crystalsvg/*/*/*
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/icons/locolor/*/*/*
+#%{_datadir}/mimelnk/*/*.desktop
+%{_datadir}/service*/*.desktop
+%{tde_libdir}/*
+%{_libdir}/pkgconfig/*.pc
+
+
+%changelog
+* Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
+- Initial build for RHEL 6
+- Spec file based on Fedora 8 "kdeadmin-3.5.10-1"
+- Import to GIT
diff --git a/redhat/kdeartwork/trinity-kdeartwork-3.5.12.spec b/redhat/kdeartwork/trinity-kdeartwork-3.5.12.spec
new file mode 100644
index 000000000..909ca1a51
--- /dev/null
+++ b/redhat/kdeartwork/trinity-kdeartwork-3.5.12.spec
@@ -0,0 +1,179 @@
+# Default version for this component
+%if "%{?version}" == ""
+%define version 3.5.12
+%endif
+%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.12 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_libdir %{_libdir}/kde3
+
+
+Name:    trinity-kdeartwork
+Summary: Additional artwork (themes, sound themes, ...) for KDE
+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/
+
+Source: kdeartwork-%{version}.tar.gz
+
+# FIXME: this should go in kde-settings -- Rex
+Source1: webcollagerc
+
+BuildRequires: gettext
+BuildRequires: trinity-kdebase-devel
+BuildRequires: libart_lgpl-devel
+BuildRequires: nas-devel esound-devel jack-audio-connection-kit-devel
+
+Requires: trinity-kdebase
+
+%description
+Additional artwork (themes, sound themes, screensavers ...) for KDE.
+
+# TODO: build this subpkg noarch
+%package icons
+Summary: Icon themes (kdeclassic, slick ....) for KDE
+Group: User Interface/Desktops
+%description icons
+%{summary}.
+
+
+%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
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+
+%make_install
+
+# webcollage -root -directory /usr/share/backgrounds/images #227683
+
+# rpmdocs
+for dir in IconThemes/* kworldclock kscreensaver/kxsconfig ; do
+  for file in AUTHORS ChangeLog COPYRIGHT README TODO ; do
+    test -s  "$dir/$file" && install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file"
+  done
+done
+
+# File lists
+%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 ] && rm -f $i/common && ln -sf ../common $i/common
+      done
+    popd
+  fi
+done
+fi
+
+# kde vs xscreensaver based screensavers
+for screensaver in %{buildroot}%{_datadir}/applnk/System/ScreenSavers/*.desktop ; do
+  if [ `grep '^TryExec=xscreensaver' $screensaver` ]; then
+    echo $screensaver | sed -e "s|%{buildroot}||" >> %{name}-extras.lang
+  else
+    echo $screensaver | sed -e "s|%{buildroot}||" >> %{name}.lang
+  fi
+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 || :
+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 || :
+done
+
+%clean
+%__rm -rf %{buildroot}
+
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%doc kwin-styles/smooth-blend/COPYING
+%doc rpmdocs/kworldclock
+%{_bindir}/*.kss
+%{tde_libdir}/plugins/styles/*
+%{tde_libdir}/*.so
+%{tde_libdir}/*.la
+%{_datadir}/apps/kfiresaver/
+%{_datadir}/apps/kscreensaver/
+%{_datadir}/apps/kstyle/themes/*
+%{_datadir}/apps/kwin/*
+%{_datadir}/apps/kworldclock/
+%{_datadir}/sounds/*
+%{_datadir}/wallpapers/*
+%{_datadir}/emoticons/*
+%{_bindir}/kxs*
+
+%files icons
+%defattr(-,root,root,-)
+%doc rpmdocs/IconThemes/*
+%{_datadir}/icons/ikons/
+%{_datadir}/icons/kdeclassic/
+%{_datadir}/icons/kids/
+%{_datadir}/icons/Locolor/
+%{_datadir}/icons/slick/
+
+
+
+%changelog
+* Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-4
+- Import to GIT
+
+* Tue Aug 23 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-3
+- Add correction for Fedora 15
+
+* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2
+- Correct macro to install under "/opt", if desired
+
+* Fri Aug 05 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
+- Initial version
+- Spec file based on Fedora 8 "kdeartwork 3.5.10-1"
diff --git a/redhat/kdeartwork/trinity-kdeartwork-3.5.13.spec b/redhat/kdeartwork/trinity-kdeartwork-3.5.13.spec
new file mode 100644
index 000000000..6a0ef7146
--- /dev/null
+++ b/redhat/kdeartwork/trinity-kdeartwork-3.5.13.spec
@@ -0,0 +1,169 @@
+# 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 building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_libdir %{_libdir}/trinity
+
+
+Name:    trinity-kdeartwork
+Summary: Additional artwork (themes, sound themes, ...) for KDE
+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/
+
+Source: kdeartwork-%{version}.tar.gz
+
+# FIXME: this should go in kde-settings -- Rex
+Source1: webcollagerc
+
+BuildRequires: gettext
+BuildRequires: trinity-kdebase-devel
+BuildRequires: libart_lgpl-devel
+BuildRequires: nas-devel esound-devel jack-audio-connection-kit-devel
+
+Requires: trinity-kdebase
+
+%description
+Additional artwork (themes, sound themes, screensavers ...) for KDE.
+
+# TODO: build this subpkg noarch
+%package icons
+Summary: Icon themes (kdeclassic, slick ....) for KDE
+Group: User Interface/Desktops
+%description icons
+%{summary}.
+
+
+%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
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+
+%make_install
+
+# webcollage -root -directory /usr/share/backgrounds/images #227683
+
+# rpmdocs
+for dir in IconThemes/* kworldclock kscreensaver/kxsconfig ; do
+  for file in AUTHORS ChangeLog COPYRIGHT README TODO ; do
+    test -s  "$dir/$file" && install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file"
+  done
+done
+
+# File lists
+%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 ] && rm -f $i/common && ln -sf ../common $i/common
+      done
+    popd
+  fi
+done
+fi
+
+# kde vs xscreensaver based screensavers
+for screensaver in %{buildroot}%{_datadir}/applnk/System/ScreenSavers/*.desktop ; do
+  if [ `grep '^TryExec=xscreensaver' $screensaver` ]; then
+    echo $screensaver | sed -e "s|%{buildroot}||" >> %{name}-extras.lang
+  else
+    echo $screensaver | sed -e "s|%{buildroot}||" >> %{name}.lang
+  fi
+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 || :
+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 || :
+done
+
+%clean
+rm -rf %{buildroot}
+
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%doc kwin-styles/smooth-blend/COPYING
+%doc rpmdocs/kworldclock
+%{_bindir}/*.kss
+%{tde_libdir}/plugins/styles/*
+%{tde_libdir}/*.so
+%{tde_libdir}/*.la
+%{_datadir}/apps/kfiresaver/
+%{_datadir}/apps/kscreensaver/
+%{_datadir}/apps/kstyle/themes/*
+%{_datadir}/apps/kwin/*
+%{_datadir}/apps/kworldclock/
+%{_datadir}/sounds/*
+%{_datadir}/wallpapers/*
+%{_datadir}/emoticons/*
+%{_bindir}/kxs*
+
+%files icons
+%defattr(-,root,root,-)
+%doc rpmdocs/IconThemes/*
+%{_datadir}/icons/ikons/
+%{_datadir}/icons/kdeclassic/
+%{_datadir}/icons/kids/
+%{_datadir}/icons/Locolor/
+%{_datadir}/icons/slick/
+
+
+
+%changelog
+* Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
+- Import to GIT
diff --git a/redhat/kdebase/trinity-kdebase-3.5.12.spec b/redhat/kdebase/trinity-kdebase-3.5.12.spec
index 8f2012085..9616f45d6 100755
--- a/redhat/kdebase/trinity-kdebase-3.5.12.spec
+++ b/redhat/kdebase/trinity-kdebase-3.5.12.spec
@@ -1,21 +1,35 @@
+# Default version for this component
+%if "%{?version}" == ""
+%define version 3.5.12
+%endif
+%define release 10
+
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
 %define _variant .opt
 %define _docdir %{_prefix}/share/doc
 %endif
 
+# TDE 3.5.12 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}
+%define tde_libdir %{_libdir}/kde3
+
 
 Name:		trinity-kdebase
-Version:	3.5.12
-Release:	9%{?dist}%{?_variant}
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
 License:	GPL
-Vendor:		Trinity Project
-Packager:	Thales Communications
 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}
 
-Source0:	http://mirror3.tokra.lv/releases/3.5.12/kdebase-3.5.12.tar.gz
+Source0:	kdebase-%{version}.tar.gz
 
 # Wrapper script to prevent Plasma launch at Trinity Startup
 Source1:	plasma-desktop
@@ -159,7 +173,7 @@ Protocol handlers (KIOslaves) for personal information management, including:
 
 %__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
+%__make -f "admin/Makefile.common"
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -298,7 +312,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %exclude %{_datadir}/icons/hicolor/*/apps/kpager.png
 
 %doc AUTHORS COPYING README
-%{_docdir}/HTML/en/*
+%{tde_docdir}/HTML/en/*
 %config(noreplace) %{_sysconfdir}/ksysguarddrc.tde
 %{_bindir}/genkdmconf
 %{_bindir}/kaccess
@@ -408,7 +422,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %{_datadir}/servicetypes/*
 %{_datadir}/sounds/*
 %{_docdir}/kdm/README
-%{_libdir}/kde3/*
+%{tde_libdir}/*
 %{_libdir}/libkdeinit_*.*
 %{_sysconfdir}/xdg/menus/applications-merged/kde-essential.menu
 %{_sysconfdir}/xdg/menus/kde-information.menu
@@ -423,10 +437,10 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %exclude %{_datadir}/config
 %endif
 # exclude pim-ioslaves files from main package
-%exclude %{_libdir}/kde3/kio_ldap.*
-%exclude %{_libdir}/kde3/kio_nntp.*
-%exclude %{_libdir}/kde3/kio_pop3.*
-%exclude %{_libdir}/kde3/kio_smtp.*
+%exclude %{tde_libdir}/kio_ldap.*
+%exclude %{tde_libdir}/kio_nntp.*
+%exclude %{tde_libdir}/kio_pop3.*
+%exclude %{tde_libdir}/kio_smtp.*
 %exclude %{_datadir}/services/ldap*.protocol
 %exclude %{_datadir}/services/nntp*.protocol
 %exclude %{_datadir}/services/pop3*.protocol
@@ -440,10 +454,10 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %files pim-ioslaves
 %defattr(-,root,root,-)
-%{_libdir}/kde3/kio_ldap.*
-%{_libdir}/kde3/kio_nntp.*
-%{_libdir}/kde3/kio_pop3.*
-%{_libdir}/kde3/kio_smtp.*
+%{tde_libdir}/kio_ldap.*
+%{tde_libdir}/kio_nntp.*
+%{tde_libdir}/kio_pop3.*
+%{tde_libdir}/kio_smtp.*
 %{_datadir}/services/ldap*.protocol
 %{_datadir}/services/nntp*.protocol
 %{_datadir}/services/pop3*.protocol
@@ -464,6 +478,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %exclude %{_libdir}/libkdeinit_*.*
 
 %changelog
+* Mon Sep 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-10
+- Add "Group" field
+
 * Sun Sep 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-9
 - Import to GIT
 
diff --git a/redhat/kdebase/trinity-kdebase-3.5.13.spec b/redhat/kdebase/trinity-kdebase-3.5.13.spec
index e665696e7..c52d2f2b0 100755
--- a/redhat/kdebase/trinity-kdebase-3.5.13.spec
+++ b/redhat/kdebase/trinity-kdebase-3.5.13.spec
@@ -2,6 +2,7 @@
 %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"
@@ -9,14 +10,21 @@
 %define _docdir %{_prefix}/share/doc
 %endif
 
+# TDE 3.5.13 specific building variables
+BuildRequires: cmake >= 2.8
+%define tde_docdir %{_docdir}/kde
+%define tde_libdir %{_libdir}/trinity
+
 
 Name:		trinity-kdebase
-Version:	%{version}
-Release:	0%{?dist}%{?_variant}
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
 License:	GPL
+Summary:	Trinity KDE Base Programs
+
 Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
-Summary:	Trinity KDE Base Programs
+URL:		http://www.trinitydesktop.org/
 
 Prefix:		%{_prefix}
 
@@ -136,6 +144,9 @@ Protocol handlers (KIOslaves) for personal information management, including:
 %patch5 -p1
 %patch6 -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
@@ -278,7 +289,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %exclude %{_datadir}/icons/hicolor/*/apps/kpager.png
 
 %doc AUTHORS COPYING README
-%{_docdir}/kde/HTML/en/*
+%{tde_docdir}/HTML/en/*
 %config(noreplace) %{_sysconfdir}/ksysguarddrc.tde
 %{_bindir}/genkdmconf
 %{_bindir}/kaccess
@@ -384,7 +395,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %{_datadir}/services/*
 %{_datadir}/servicetypes/*
 %{_datadir}/sounds/*
-%{_libdir}/trinity/*
+%{tde_libdir}/*
 %{_libdir}/libkdeinit_*.*
 %{_sysconfdir}/xdg/menus/applications-merged/kde-essential.menu
 %{_sysconfdir}/xdg/menus/kde-information.menu
@@ -398,10 +409,10 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %exclude %{_datadir}/config
 %endif
 # exclude pim-ioslaves files from main package
-%exclude %{_libdir}/trinity/kio_ldap.*
-%exclude %{_libdir}/trinity/kio_nntp.*
-%exclude %{_libdir}/trinity/kio_pop3.*
-%exclude %{_libdir}/trinity/kio_smtp.*
+%exclude %{tde_libdir}/kio_ldap.*
+%exclude %{tde_libdir}/kio_nntp.*
+%exclude %{tde_libdir}/kio_pop3.*
+%exclude %{tde_libdir}/kio_smtp.*
 %exclude %{_datadir}/services/ldap*.protocol
 %exclude %{_datadir}/services/nntp*.protocol
 %exclude %{_datadir}/services/pop3*.protocol
@@ -418,10 +429,10 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %files pim-ioslaves
 %defattr(-,root,root,-)
-%{_libdir}/trinity/kio_ldap.*
-%{_libdir}/trinity/kio_nntp.*
-%{_libdir}/trinity/kio_pop3.*
-%{_libdir}/trinity/kio_smtp.*
+%{tde_libdir}/kio_ldap.*
+%{tde_libdir}/kio_nntp.*
+%{tde_libdir}/kio_pop3.*
+%{tde_libdir}/kio_smtp.*
 %{_datadir}/services/ldap*.protocol
 %{_datadir}/services/nntp*.protocol
 %{_datadir}/services/pop3*.protocol
diff --git a/redhat/kdebindings/trinity-kdebindings-3.5.12.spec b/redhat/kdebindings/trinity-kdebindings-3.5.12.spec
index 09bb8658f..fe7565d72 100644
--- a/redhat/kdebindings/trinity-kdebindings-3.5.12.spec
+++ b/redhat/kdebindings/trinity-kdebindings-3.5.12.spec
@@ -22,10 +22,11 @@ Version: %{?version}
 Release: %{?release}%{?dist}%{_variant}
 
 License: GPLv2
-URL:     http://developer.kde.org/language-bindings/ 
+Group:   User Interface/Desktops
+
 Vendor:  Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
-Group:   User Interface/Desktops
+URL:     http://developer.kde.org/language-bindings/ 
 
 Source0: kdebindings-%{version}.tar.gz
 
@@ -120,6 +121,7 @@ export DO_NOT_COMPILE="$DO_NOT_COMPILE python"
   --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} \
diff --git a/redhat/kdebindings/trinity-kdebindings-3.5.13.spec b/redhat/kdebindings/trinity-kdebindings-3.5.13.spec
index 447db3d1e..f4ea50005 100644
--- a/redhat/kdebindings/trinity-kdebindings-3.5.13.spec
+++ b/redhat/kdebindings/trinity-kdebindings-3.5.13.spec
@@ -22,10 +22,11 @@ Version: %{?version}
 Release: %{?release}%{?dist}%{_variant}
 
 License: GPLv2
-URL:     http://developer.kde.org/language-bindings/ 
+Group:   User Interface/Desktops
+
 Vendor:  Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
-Group:   User Interface/Desktops
+URL:     http://developer.kde.org/language-bindings/ 
 
 Source0: kdebindings-%{version}.tar.gz
 
diff --git a/redhat/kdeedu/trinity-kdeedu-3.5.12.spec b/redhat/kdeedu/trinity-kdeedu-3.5.12.spec
new file mode 100644
index 000000000..dd7df51eb
--- /dev/null
+++ b/redhat/kdeedu/trinity-kdeedu-3.5.12.spec
@@ -0,0 +1,220 @@
+# Default version for this component
+%if "%{?version}" == ""
+%define version 3.5.12
+%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}
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/kde3
+
+
+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/
+
+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
+BuildRequires: ocaml(compiler)
+#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
+
+%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 \
+   --enable-kig-python-scripting \
+   --disable-debug \
+   --disable-warnings \
+   --enable-final \
+   --enable-closure \
+   --includedir=%{_includedir}/kde \
+   --disable-ocamlsolver \
+   --with-extra-includes=%{_includedir}/tqt
+
+
+%__make %{?_smp_mflags} \
+  OCAMLLIB=$(ocamlc -where) FACILELIB=$(ocamlc -where)
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%make_install
+
+# 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}/*
+
+%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 Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
+- Initial build for RHEL 6
+- Spec file based on Fedora 8 "kdeedu-3.5.10-1"
+- Import to GIT
diff --git a/redhat/kdegames/trinity-kdegames-3.5.12.spec b/redhat/kdegames/trinity-kdegames-3.5.12.spec
new file mode 100644
index 000000000..1c382332f
--- /dev/null
+++ b/redhat/kdegames/trinity-kdegames-3.5.12.spec
@@ -0,0 +1,189 @@
+# Default version for this component
+%if "%{?version}" == ""
+%define version 3.5.12
+%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}
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/kde3
+
+
+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/
+
+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
+
+%__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 \
+   --includedir=%{_includedir}/kde \
+   --disable-setgid \
+   --with-extra-includes=%{_includedir}/tqt
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%make_install
+
+# 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
+
+%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 Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
+- Initial build for RHEL 6
+- Spec file based on Fedora 8 "kdegames-3.5.10-1"
+- Import to GIT
diff --git a/redhat/kdegraphics/trinity-kdegraphics-3.5.12.spec b/redhat/kdegraphics/trinity-kdegraphics-3.5.12.spec
new file mode 100644
index 000000000..2c0405914
--- /dev/null
+++ b/redhat/kdegraphics/trinity-kdegraphics-3.5.12.spec
@@ -0,0 +1,357 @@
+# Default version for this component
+%if "%{?version}" == ""
+%define version 3.5.12
+%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.12 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/kde3
+
+
+Name:		trinity-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/
+
+Source0:	kdegraphics-%{version}.tar.gz
+
+# Official TDE patches (from SVN)
+#  Fix kdegraphics FTBFS under gcc4.6
+#  Thanks to David Rankin for the patch!
+Patch0:		r1242777.diff
+
+# [kdegraphics/kviewshell]: GCC >= 4.5 fix
+#   avoid "documentWidget.cpp:290:70: error: taking address of temporary"
+Patch1:		kdegraphics-documentwidget-gcc45.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
+
+# kgamma
+BuildRequires: libXxf86vm-devel
+# kuickshow
+BuildRequires: imlib-devel
+#kfile-plugin
+BuildRequires: OpenEXR-devel
+# kpdf
+BuildRequires: freetype-devel
+BuildRequires: poppler-qt-devel
+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
+
+%__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 \
+   --enable-new-ldflags \
+   --disable-dependency-tracking \
+   --disable-rpath \
+   --disable-debug \
+   --disable-warnings \
+   --enable-final \
+   --includedir=%{_includedir}/kde \
+   --with-xinerama \
+   --with-extra-includes=%{_includedir}/tqt
+
+%if 0%{?fedora} >= 15
+# Ugly fix for kolourpaint - problem when linking libkdefx.so
+sed -i kolourpaint/Makefile \
+  -e 's,\($(kolourpaint_LINK) $(kolourpaint_OBJECTS) $(kolourpaint_LDADD) \)\($(LIBS)\),\1 -lkdefx \2,'
+  
+# Another ugly fix for kpdf - problem when linking fontconfig
+sed -i kpdf/Makefile \
+  -e '/^LDFLAGS = .*/ s,$, -lfontconfig,'
+%endif
+
+%__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* ; 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 %{_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}/*
+
+%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,-)
+%{_includedir}/kde/*
+%{_libdir}/lib*.so
+#exclude %{_libdir}/libkpovmodeler.so
+%exclude %{_libdir}/libkfaximage.so
+%exclude %{_libdir}/libkdeinit_*.so
+%exclude %{_libdir}/libdjvu.so
+
+%changelog
+* Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2 
+- Import to GIT
+
+* Wed Aug 24 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
+- Add fix for Fedora 15
+- Add 'patch0' and 'patch1' for GCC >= 4.5
+- Correct macro to install under "/opt", if desired
+
+* Thu Jun 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-0
+- Initial build for RHEL 6.0
+- SPEC file taken from Fedora 8 "kdegraphics 7:3.5.10-1"
diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.12.spec b/redhat/kdelibs/trinity-kdelibs-3.5.12.spec
index 65c60a318..b81d77cb5 100755
--- a/redhat/kdelibs/trinity-kdelibs-3.5.12.spec
+++ b/redhat/kdelibs/trinity-kdelibs-3.5.12.spec
@@ -1,22 +1,36 @@
+# Default version for this component
+%if "%{?version}" == ""
+%define version 3.5.12
+%endif
+%define release 6
+
 # 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 variables
+BuildRequires:	autoconf automake libtool m4
+%define tde_docdir %{_docdir}
+%define tde_libdir %{_libdir}/kde3
+
 
 Name:		trinity-kdelibs
-Version:	3.5.12
-Release:	5%{?dist}%{?_variant}
+Version:	%{version}
+Release:	%{?release}%{?dist}%{?_variant}
 License:	GPL
+Summary:	Trinity KDE Libraries
+Group:		System Environment/Libraries
+
 Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
-Summary:	Trinity KDE Libraries
+URL:		http://www.trinitydesktop.org/
 
 Source0:	kdelibs-%{version}.tar.gz
 Prefix:		%{_prefix}
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	libtool
 BuildRequires:	tqtinterface-devel
 BuildRequires:	trinity-arts-devel
 BuildRequires:	qt3-devel
@@ -37,37 +51,51 @@ Obsoletes:	kdelibs3
 %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
 %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:	kdelibs3-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
+
 %__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 
+%__make -f "admin/Makefile.common"
+
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 export PATH="%{_bindir}:${PATH}"
 export LD_LIBRARY_PATH="%{_libdir}"
 export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
 %configure \
   --disable-rpath \
   --enable-new-ldflags \
@@ -94,18 +122,12 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}"
 # Do NOT use %{?_smp_mflags} for this package, or it will fail to build !
 %__make
 
+
 %install
 %__rm -rf %{?buildroot}
 %__mkdir_p %{?buildroot}
 %make_install
 
-%__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}
@@ -179,7 +201,7 @@ EOF
 %{_libdir}/lib*.so.*
 %{_libdir}/libkdeinit_*.so
 %{_libdir}/lib*.la
-%{_libdir}/kde3/
+%{tde_libdir}/
 %{_datadir}/applications/kde/*.desktop
 %{_datadir}/autostart/kab2kabc.desktop
 %{_datadir}/applnk/kio_iso.desktop
@@ -193,7 +215,7 @@ EOF
 %{_datadir}/services/*
 %{_datadir}/servicetypes/*
 %{_datadir}/icons/crystalsvg/
-%{_docdir}/HTML/en/kspell
+%{tde_docdir}/HTML/en/kspell
 # remove conflicts with kdelibs-4
 %if "%{?_prefix}" != "/usr"
 %{_bindir}/checkXML
@@ -202,7 +224,7 @@ EOF
 %{_bindir}/preparetips
 %{_datadir}/icons/hicolor/index.theme
 %{_datadir}/locale/all_languages
-%{_docdir}/HTML/en/common/*
+%{tde_docdir}/HTML/en/common/*
 %else
 %exclude %{_bindir}/checkXML
 %exclude %{_bindir}/ksvgtopng
@@ -215,9 +237,8 @@ EOF
 %exclude %{_datadir}/config/ui/ui_standards.rc
 %exclude %{_datadir}/icons/hicolor/index.theme
 %exclude %{_datadir}/locale/all_languages
-%exclude %{_docdir}/HTML/en/common/*
+%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
@@ -236,10 +257,13 @@ EOF
 %files apidocs
 %defattr(-,root,root,-)
 %{_docdir}/%{name}-%{version}/
-%{_docdir}/HTML/en/kdelibs*
+%{tde_docdir}/HTML/en/kdelibs*
 
 
 %changelog
+* Mon Sep 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-6
+- Add "Group" field
+
 * Sun Sep 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-5
 - Import to GIT
 - Removes cmake stuff, build with autotools only
diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
index efa1ae90a..4b98b33f9 100755
--- a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
+++ b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
@@ -2,6 +2,7 @@
 %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"
@@ -9,19 +10,25 @@
 %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:	0%{?dist}%{?_variant}
+Release:	%{?release}%{?dist}%{?_variant}
 License:	GPL
+Summary:	Trinity KDE Libraries
+
 Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
-Summary:	Trinity KDE Libraries
+URL:		http://www.trinitydesktop.org/
 
 Source0:	kdelibs-%{version}.tar.gz
 Prefix:		%{_prefix}
 
-BuildRequires:	cmake >= 2.8
 BuildRequires:	libtool
 BuildRequires:	tqtinterface-devel
 BuildRequires:	trinity-arts-devel
@@ -66,6 +73,11 @@ 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}"
@@ -94,6 +106,7 @@ cd build
 
 %__make %{?_smp_mflags}
 
+
 %install
 %__rm -rf %{?buildroot}
 %__mkdir_p %{?buildroot}
@@ -179,7 +192,7 @@ EOF
 %{_libdir}/lib*.so.*
 %{_libdir}/libkdeinit_*.so
 %{_libdir}/lib*.la
-%{_libdir}/trinity/
+%{tde_libdir}/
 %{_datadir}/applications/kde/*.desktop
 %{_datadir}/autostart/kab2kabc.desktop
 %{_datadir}/applnk/kio_iso.desktop
@@ -193,7 +206,7 @@ EOF
 %{_datadir}/services/*
 %{_datadir}/servicetypes/*
 %{_datadir}/icons/crystalsvg/
-%{_docdir}/kde/HTML/en/kspell
+%{tde_docdir}/HTML/en/kspell
 # remove conflicts with kdelibs-4
 %if "%{?_prefix}" != "/usr"
 %{_bindir}/checkXML
@@ -202,7 +215,7 @@ EOF
 %{_bindir}/preparetips
 %{_datadir}/icons/hicolor/index.theme
 %{_datadir}/locale/all_languages
-%{_docdir}/kde/HTML/en/common/*
+%{tde_docdir}/HTML/en/common/*
 %else
 %exclude %{_bindir}/checkXML
 %exclude %{_bindir}/ksvgtopng
@@ -215,7 +228,7 @@ EOF
 %exclude %{_datadir}/config/ui/ui_standards.rc
 %exclude %{_datadir}/icons/hicolor/index.theme
 %exclude %{_datadir}/locale/all_languages
-%exclude %{_docdir}/kde/HTML/en/common/*
+%exclude %{tde_docdir}/HTML/en/common/*
 %endif
 %{_sysconfdir}/ld.so.conf.d/trinity.conf
 
@@ -242,7 +255,7 @@ EOF
 %files apidocs
 %defattr(-,root,root,-)
 %{_docdir}/%{name}-%{version}/
-#%{_docdir}/kde/HTML/en/kdelibs*
+#%{tde_docdir}/HTML/en/kdelibs*
 
 
 %changelog
diff --git a/redhat/kdemultimedia/kdemultimedia-3.4.0-xdg.patch b/redhat/kdemultimedia/kdemultimedia-3.4.0-xdg.patch
new file mode 100644
index 000000000..445d88a40
--- /dev/null
+++ b/redhat/kdemultimedia/kdemultimedia-3.4.0-xdg.patch
@@ -0,0 +1,10 @@
+--- kdemultimedia-3.4.0/kappfinder-data/kde-multimedia-music.menu.tn	2005-04-25 16:16:32.000000000 +0200
++++ kdemultimedia-3.4.0/kappfinder-data/kde-multimedia-music.menu	2005-04-25 16:17:51.000000000 +0200
+@@ -2,6 +2,7 @@
+   "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
+ 
+ <Menu>
++<Name>Applications</Name>
+ <Menu>
+ 	<Name>Multimedia</Name>
+ 	<Exclude>
diff --git a/redhat/kdemultimedia/kdemultimedia-3.5.7-pthread.patch b/redhat/kdemultimedia/kdemultimedia-3.5.7-pthread.patch
new file mode 100644
index 000000000..70e2fe9c8
--- /dev/null
+++ b/redhat/kdemultimedia/kdemultimedia-3.5.7-pthread.patch
@@ -0,0 +1,11 @@
+--- kdemultimedia-3.5.7-patched/xine_artsplugin/Makefile.am.pthread	2006-07-22 03:10:54.000000000 -0500
++++ kdemultimedia-3.5.7-patched/xine_artsplugin/Makefile.am	2007-06-28 06:50:53.000000000 -0500
+@@ -8,7 +8,7 @@
+ 			  xinePlayObject_impl.cpp \
+ 			  audio_fifo_out.c
+ libarts_xine_la_LDFLAGS = $(all_libraries) -module -no-undefined -pthread
+-libarts_xine_la_LIBADD = $(XINE_LIBS) $(LIB_X11) $(LIB_XEXT) \
++libarts_xine_la_LIBADD = $(XINE_LIBS) $(LIBPTHREAD) $(LIB_X11) $(LIB_XEXT) \
+ 			 -lkmedia2_idl -lsoundserver_idl -lartsflow
+ 
+ libarts_xine_la_METASOURCES = AUTO
diff --git a/redhat/kdemultimedia/kdemultimedia-svn.patch b/redhat/kdemultimedia/kdemultimedia-svn.patch
new file mode 100644
index 000000000..669309d3f
--- /dev/null
+++ b/redhat/kdemultimedia/kdemultimedia-svn.patch
@@ -0,0 +1,19 @@
+*** configure.in.in.ORI	2011-09-10 21:38:57.805533683 +0200
+--- configure.in.in	2011-09-10 21:39:08.687283728 +0200
+***************
+*** 542,548 ****
+  if test "x$build_arts" = "xyes" && test "x$ARTSCCONFIG" != "xno" ; then
+  	LIB_ARTS="-lartskde"
+  	ARTS_PREFIX=[`$ARTSCCONFIG --arts-prefix`]
+! 	ARTS_CFLAGS="-I$ARTS_PREFIX/include/arts"
+  	AC_DEFINE(HAVE_ARTS, 1, [have arts support in juk])
+  else
+  	build_arts="no"
+--- 542,548 ----
+  if test "x$build_arts" = "xyes" && test "x$ARTSCCONFIG" != "xno" ; then
+  	LIB_ARTS="-lartskde"
+  	ARTS_PREFIX=[`$ARTSCCONFIG --arts-prefix`]
+! 	ARTS_CFLAGS="-I$ARTS_PREFIX/include"
+  	AC_DEFINE(HAVE_ARTS, 1, [have arts support in juk])
+  else
+  	build_arts="no"
diff --git a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.12.spec b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.12.spec
new file mode 100644
index 000000000..16023a89d
--- /dev/null
+++ b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.12.spec
@@ -0,0 +1,389 @@
+# Default version for this component
+%if "%{?version}" == ""
+%define version 3.5.12
+%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}
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/kde3
+
+
+%define appdir %{_datadir}/applications/kde
+
+# former extras bits
+#define _with_akode --with-akode
+## not currently compatible with libtunepimp-0.5 (only libtunepimp-0.4)
+#define _with_musicbrainz --with-musicbrainz
+%define _with_taglib --with-taglib
+%define _with_xine --with-xine
+
+Name:    trinity-kdemultimedia
+Summary: Multimedia applications for the K Desktop Environment (KDE)
+Version: %{?version}
+Release: %{?release}%{?dist}%{?_variant}
+
+License: GPLv2
+Group:   Applications/Multimedia
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.trinitydesktop.org/
+
+Source0: kdemultimedia-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Provides: kdemultimedia3 = %{version}-%{release}
+
+# RedHat Legacy patches (from Fedora 8)
+Patch3: kdemultimedia-3.4.0-xdg.patch
+Patch5: kdemultimedia-3.5.7-pthread.patch
+
+Requires: %{name}-libs = %{version}-%{release}
+
+BuildRequires: zlib-devel
+BuildRequires: trinity-kdelibs-devel
+BuildRequires: libvorbis-devel
+BuildRequires: audiofile-devel
+BuildRequires: desktop-file-utils
+BuildRequires: libtheora-devel
+BuildRequires: flac-devel
+BuildRequires: alsa-lib-devel 
+BuildRequires: cdparanoia-devel cdparanoia
+BuildRequires: gstreamer-devel
+BuildRequires: automake libtool
+%{?_with_akode:BuildRequires: akode-devel}
+%{?_with_musicbrainz:BuildRequires: libmusicbrainz-devel libtunepimp-devel}
+%{?_with_taglib:BuildRequires: taglib-devel}
+%{?_with_xine:BuildRequires: xine-lib-devel}
+
+%description
+The K Desktop Environment (KDE) is a GUI desktop for the X Window
+System. The %{name} package contains multimedia applications for
+KDE, including:
+  kmid, a midi player
+  kmix, an audio mixer
+  arts, additional functionality for the aRts sound system
+  krec, a recording tool
+  kscd, an Audio-CD player
+  kaudiocreator, a graphical frontend for audio file creation 
+
+%package devel
+Summary: Development files for %{name}, aRts and noatun plugins
+Group: Development/Libraries
+Provides: kdemultimedia3-devel = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
+# for noatun shlib(s)
+Requires: %{name}-extras-libs = %{version}-%{release}
+Requires: trinity-kdelibs-devel
+%description devel
+{summary}.
+Install %{name}-devel if you wish to develop or compile any
+applications using aRtsbuilder, aRtsmidi, aRtskde, aRts modules or
+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
+ * kaboodle, a media player
+ * noatun, a media player
+
+%package extras-libs
+Summary: Extra %{name} runtime libraries 
+Group: System Environment/Libraries 
+Requires: %{name}-libs = %{version}-%{release}
+%description extras-libs
+%{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 kdemultimedia
+%patch3 -p1 -b .xdg
+%patch5 -p1 -b .pthread
+
+%__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} -lDCOP"
+%endif
+
+%configure  \
+   --enable-new-ldflags \
+   --disable-dependency-tracking \
+   --includedir=%{tde_includedir} \
+   --with-cdparanoia \
+   --with-flac \
+   --with-theora \
+   --with-vorbis \
+   --with-alsa \
+   --with-gstreamer \
+   --without-lame \
+   --disable-debug \
+   --disable-warnings \
+   --enable-final \
+   --disable-rpath \
+  %{?_with_akode} %{!?_with_akode:--without-akode} \
+  %{?_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
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot} 
+
+%make_install
+%make_install -C kaudiocreator
+
+## Remove/uninstall (conflicting) bits we don't want
+rm -f $RPM_BUILD_ROOT%{_libdir}/mcop/akode*MPEGPlayObject.mcopclass
+
+# only show in KDE, really? -- Rex (FIXME)
+for f in %{buildroot}%{appdir}/*.desktop ; do
+  if [ -f %{buildroot}%{appdir}/*.desktop ] ; then
+    echo "OnlyShowIn=KDE;" >> $f
+  fi
+done
+
+# don't make these world-writeable
+chmod go-w %{buildroot}%{_datadir}/apps/kscd/*
+
+# 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"
+       # exclude kaboodle, juk, noatun
+       if [ $dir != kaboodle -a $dir != juk -a $dir != noatun ] ; then
+         echo "%doc rpmdocs/$dir/" >> %{name}.lang
+       fi
+    fi
+  done
+done
+
+
+%post
+%{?libs:/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
+%{?libs:/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 libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
+%post extras-libs -p /sbin/ldconfig
+
+%postun extras-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 || :
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files extras
+%defattr(-,root,root,-)
+
+# kaboodle
+%doc rpmdocs/kaboodle/
+%doc %lang(en) %{_docdir}/HTML/en/kaboodle/
+%{_bindir}/kaboodle
+%{tde_libdir}/libkaboodlepart.*
+%{_datadir}/applications/kde/kaboodle.desktop
+%{_datadir}/apps/kaboodle/
+%{_datadir}/icons/hicolor/*/apps/kaboodle.png
+%{_datadir}/services/kaboodle*
+
+# noatun
+%doc %lang(en) %{_docdir}/HTML/en/noatun/
+%{_bindir}/noatun
+%{_libdir}/kconf_update_bin/noatun20update
+%{tde_libdir}/noatun*
+%{_libdir}/libartseffects.*
+%{_libdir}/libwinskinvis.*
+%{_libdir}/libkdeinit_noatun.*
+%{_datadir}/applications/kde/noatun.desktop
+%{_datadir}/apps/kconf_update/noatun.upd
+%{_datadir}/apps/noatun/
+%{_datadir}/icons/hicolor/*/apps/noatun.png
+%{_datadir}/mimelnk/interface/x-winamp-skin.desktop
+
+# juk
+%doc %lang(en) %{_docdir}/HTML/en/juk/
+%{_bindir}/juk
+%{_datadir}/applications/kde/juk.desktop
+%{_datadir}/apps/juk/
+%{_datadir}/apps/konqueror/servicemenus/jukservicemenu.desktop
+%{_datadir}/icons/crystalsvg/*/*/juk*
+%{_datadir}/icons/hicolor/*/apps/juk.png
+
+%files extras-libs
+%defattr(-,root,root,-)
+%{_libdir}/libnoatun*.la
+%{_libdir}/libnoatun*.so.*
+%{_libdir}/libnoatunarts.so
+
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%doc COPYING
+
+# kaboodle
+%exclude %{tde_docdir}/HTML/en/kaboodle/
+%exclude %{_bindir}/kaboodle
+%exclude %{tde_libdir}/libkaboodlepart.*
+%exclude %{_datadir}/applications/kde/kaboodle.desktop
+%exclude %{_datadir}/apps/kaboodle/
+%exclude %{_datadir}/icons/hicolor/*/apps/kaboodle.png
+%exclude %{_datadir}/services/kaboodle*
+
+# noatun
+%exclude %{tde_docdir}/HTML/en/noatun/
+%exclude %{_bindir}/noatun
+%exclude %{_libdir}/kconf_update_bin/noatun20update
+%exclude %{tde_libdir}/noatun*
+%exclude %{_libdir}/libartseffects.*
+%exclude %{_libdir}/libkdeinit_noatun.*
+%exclude %{_libdir}/libnoatunarts.*
+%exclude %{_libdir}/libnoatuncontrols.*
+%exclude %{_libdir}/libnoatun.*
+%exclude %{_libdir}/libnoatuntags.*
+%exclude %{_libdir}/libwinskinvis.*
+%exclude %{_datadir}/applications/kde/noatun.desktop
+%exclude %{_datadir}/apps/kconf_update/noatun.upd
+%exclude %{_datadir}/apps/noatun/
+%exclude %{_datadir}/icons/hicolor/*/apps/noatun.png
+%exclude %{_datadir}/mimelnk/interface/x-winamp-skin.desktop
+
+# juk
+%exclude %{tde_docdir}/HTML/en/juk/
+%exclude %{_bindir}/juk
+%exclude %{_datadir}/applications/kde/juk.desktop
+%exclude %{_datadir}/apps/juk/
+%exclude %{_datadir}/apps/konqueror/servicemenus/jukservicemenu.desktop
+%exclude %{_datadir}/icons/crystalsvg/*/*/juk*
+%exclude %{_datadir}/icons/hicolor/*/apps/juk.png
+
+/etc/xdg/menus/applications-merged/*
+%{_libdir}/mcop/*
+%{_libdir}/libkdeinit_*.so
+#%{_libdir}/liboggarts.so
+%{tde_libdir}/*
+%{_libdir}/kconf_update_bin/*
+%{_bindir}/*
+%{_datadir}/applications/kde/*
+%{_datadir}/apps/*
+%{_datadir}/autostart/*
+%{_datadir}/config.kcfg/*
+%{_datadir}/desktop-directories/*
+%{_datadir}/icons/crystalsvg/*/*/*
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/icons/locolor/*/*/*
+%{_datadir}/mimelnk/*
+%{_datadir}/services/*
+%{_datadir}/servicetypes/*
+
+%files libs
+%defattr(-,root,root,-)
+%exclude %{_libdir}/libnoatun*.*
+%{_libdir}/lib*.so.*
+%{_libdir}/lib*.la
+
+
+%files devel
+%defattr(-,root,root,-)
+%{tde_includedir}/*
+%{_libdir}/lib*.so
+%exclude %{_libdir}/libkdeinit_*.so
+%exclude %{_libdir}/libartseffects.so
+%exclude %{_libdir}/libnoatunarts.*
+#exclude %{_libdir}/liboggarts.so
+%exclude %{_libdir}/libwinskinvis.so
+
+
+%changelog
+* Sat Sep 09 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
+- Initial build for RHEL 6
+- Spec file based on Fedora 8 "kdemultimedia-6:3.5.10-2"
diff --git a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec
new file mode 100644
index 000000000..adcafccb5
--- /dev/null
+++ b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec
@@ -0,0 +1,396 @@
+# 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 building variables
+BuildRequires: cmake >= 2.8
+%define tde_docdir %{_docdir}
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/trinity
+
+
+%define appdir %{_datadir}/applications/kde
+
+# former extras bits
+#define _with_akode --with-akode
+## not currently compatible with libtunepimp-0.5 (only libtunepimp-0.4)
+#define _with_musicbrainz --with-musicbrainz
+%define _with_taglib --with-taglib
+%define _with_xine --with-xine
+
+Name:    trinity-kdemultimedia
+Summary: Multimedia applications for the K Desktop Environment (KDE)
+Version: %{?version}
+Release: %{?release}%{?dist}%{?_variant}
+
+License: GPLv2
+Group:   Applications/Multimedia
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.trinitydesktop.org/
+
+Source0: kdemultimedia-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Provides: kdemultimedia3 = %{version}-%{release}
+
+# RedHat Legacy patches (from Fedora 8)
+Patch3: kdemultimedia-3.4.0-xdg.patch
+Patch5: kdemultimedia-3.5.7-pthread.patch
+
+Requires: %{name}-libs = %{version}-%{release}
+
+BuildRequires: zlib-devel
+BuildRequires: trinity-kdelibs-devel
+BuildRequires: libvorbis-devel
+BuildRequires: audiofile-devel
+BuildRequires: desktop-file-utils
+BuildRequires: libtheora-devel
+BuildRequires: flac-devel
+BuildRequires: alsa-lib-devel 
+BuildRequires: cdparanoia-devel cdparanoia
+BuildRequires: gstreamer-devel
+BuildRequires: automake libtool
+%{?_with_akode:BuildRequires: akode-devel}
+%{?_with_musicbrainz:BuildRequires: libmusicbrainz-devel libtunepimp-devel}
+%{?_with_taglib:BuildRequires: taglib-devel}
+%{?_with_xine:BuildRequires: xine-lib-devel}
+
+%description
+The K Desktop Environment (KDE) is a GUI desktop for the X Window
+System. The %{name} package contains multimedia applications for
+KDE, including:
+  kmid, a midi player
+  kmix, an audio mixer
+  arts, additional functionality for the aRts sound system
+  krec, a recording tool
+  kscd, an Audio-CD player
+  kaudiocreator, a graphical frontend for audio file creation 
+
+%package devel
+Summary: Development files for %{name}, aRts and noatun plugins
+Group: Development/Libraries
+Provides: kdemultimedia3-devel = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
+# for noatun shlib(s)
+Requires: %{name}-extras-libs = %{version}-%{release}
+Requires: trinity-kdelibs-devel
+%description devel
+{summary}.
+Install %{name}-devel if you wish to develop or compile any
+applications using aRtsbuilder, aRtsmidi, aRtskde, aRts modules or
+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
+ * kaboodle, a media player
+ * noatun, a media player
+
+%package extras-libs
+Summary: Extra %{name} runtime libraries 
+Group: System Environment/Libraries 
+Requires: %{name}-libs = %{version}-%{release}
+%description extras-libs
+%{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 kdemultimedia
+%patch3 -p1 -b .xdg
+%patch5 -p1 -b .pthread
+
+# 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
+
+# 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 \
+   --includedir=%{tde_includedir} \
+   --with-cdparanoia \
+   --with-flac \
+   --with-theora \
+   --with-vorbis \
+   --with-alsa \
+   --with-gstreamer \
+   --without-lame \
+   --disable-debug \
+   --disable-warnings \
+   --enable-final \
+   --disable-rpath \
+  %{?_with_akode} %{!?_with_akode:--without-akode} \
+  %{?_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
+
+%__make %{?_smp_mflags}
+
+
+%install
+%__rm -rf %{buildroot} 
+
+%make_install
+%make_install -C kaudiocreator
+
+## Remove/uninstall (conflicting) bits we don't want
+rm -f $RPM_BUILD_ROOT%{_libdir}/mcop/akode*MPEGPlayObject.mcopclass
+
+# only show in KDE, really? -- Rex (FIXME)
+for f in %{buildroot}%{appdir}/*.desktop ; do
+  if [ -f %{buildroot}%{appdir}/*.desktop ] ; then
+    echo "OnlyShowIn=KDE;" >> $f
+  fi
+done
+
+# don't make these world-writeable
+chmod go-w %{buildroot}%{_datadir}/apps/kscd/*
+
+# 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"
+       # exclude kaboodle, juk, noatun
+       if [ $dir != kaboodle -a $dir != juk -a $dir != noatun ] ; then
+         echo "%doc rpmdocs/$dir/" >> %{name}.lang
+       fi
+    fi
+  done
+done
+
+
+%post
+%{?libs:/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
+%{?libs:/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
+
+%post extras-libs -p /sbin/ldconfig
+
+%postun extras-libs -p /sbin/ldconfig
+%endif
+
+%post extras
+%{?libs:/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
+%{?libs:/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 || :
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files extras
+%defattr(-,root,root,-)
+
+# kaboodle
+%doc rpmdocs/kaboodle/
+%doc %lang(en) %{_docdir}/HTML/en/kaboodle/
+%{_bindir}/kaboodle
+%{tde_libdir}/libkaboodlepart.*
+%{_datadir}/applications/kde/kaboodle.desktop
+%{_datadir}/apps/kaboodle/
+%{_datadir}/icons/hicolor/*/apps/kaboodle.png
+%{_datadir}/services/kaboodle*
+
+# noatun
+%doc %lang(en) %{_docdir}/HTML/en/noatun/
+%{_bindir}/noatun
+%{_libdir}/kconf_update_bin/noatun20update
+%{tde_libdir}/noatun*
+%{_libdir}/libartseffects.*
+%{_libdir}/libwinskinvis.*
+%{_libdir}/libkdeinit_noatun.*
+%{_datadir}/applications/kde/noatun.desktop
+%{_datadir}/apps/kconf_update/noatun.upd
+%{_datadir}/apps/noatun/
+%{_datadir}/icons/hicolor/*/apps/noatun.png
+%{_datadir}/mimelnk/interface/x-winamp-skin.desktop
+
+# juk
+%doc %lang(en) %{_docdir}/HTML/en/juk/
+%{_bindir}/juk
+%{_datadir}/applications/kde/juk.desktop
+%{_datadir}/apps/juk/
+%{_datadir}/apps/konqueror/servicemenus/jukservicemenu.desktop
+%{_datadir}/icons/crystalsvg/*/*/juk*
+%{_datadir}/icons/hicolor/*/apps/juk.png
+
+%files extras-libs
+%defattr(-,root,root,-)
+%{_libdir}/libnoatun*.la
+%{_libdir}/libnoatun*.so.*
+%{_libdir}/libnoatunarts.so
+
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%doc COPYING
+
+# kaboodle
+%exclude %{tde_docdir}/HTML/en/kaboodle/
+%exclude %{_bindir}/kaboodle
+%exclude %{tde_libdir}/libkaboodlepart.*
+%exclude %{_datadir}/applications/kde/kaboodle.desktop
+%exclude %{_datadir}/apps/kaboodle/
+%exclude %{_datadir}/icons/hicolor/*/apps/kaboodle.png
+%exclude %{_datadir}/services/kaboodle*
+
+# noatun
+%exclude %{tde_docdir}/HTML/en/noatun/
+%exclude %{_bindir}/noatun
+%exclude %{_libdir}/kconf_update_bin/noatun20update
+%exclude %{tde_libdir}/noatun*
+%exclude %{_libdir}/libartseffects.*
+%exclude %{_libdir}/libkdeinit_noatun.*
+%exclude %{_libdir}/libnoatunarts.*
+%exclude %{_libdir}/libnoatuncontrols.*
+%exclude %{_libdir}/libnoatun.*
+%exclude %{_libdir}/libnoatuntags.*
+%exclude %{_libdir}/libwinskinvis.*
+%exclude %{_datadir}/applications/kde/noatun.desktop
+%exclude %{_datadir}/apps/kconf_update/noatun.upd
+%exclude %{_datadir}/apps/noatun/
+%exclude %{_datadir}/icons/hicolor/*/apps/noatun.png
+%exclude %{_datadir}/mimelnk/interface/x-winamp-skin.desktop
+
+# juk
+%exclude %{tde_docdir}/HTML/en/juk/
+%exclude %{_bindir}/juk
+%exclude %{_datadir}/applications/kde/juk.desktop
+%exclude %{_datadir}/apps/juk/
+%exclude %{_datadir}/apps/konqueror/servicemenus/jukservicemenu.desktop
+%exclude %{_datadir}/icons/crystalsvg/*/*/juk*
+%exclude %{_datadir}/icons/hicolor/*/apps/juk.png
+
+/etc/xdg/menus/applications-merged/*
+%{_libdir}/mcop/*
+%{_libdir}/libkdeinit_*.so
+#%{_libdir}/liboggarts.so
+%{tde_libdir}/*
+%{_libdir}/kconf_update_bin/*
+%{_bindir}/*
+%{_datadir}/applications/kde/*
+%{_datadir}/apps/*
+%{_datadir}/autostart/*
+%{_datadir}/config.kcfg/*
+%{_datadir}/desktop-directories/*
+%{_datadir}/icons/crystalsvg/*/*/*
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/icons/locolor/*/*/*
+%{_datadir}/mimelnk/*
+%{_datadir}/services/*
+%{_datadir}/servicetypes/*
+
+%files libs
+%defattr(-,root,root,-)
+%exclude %{_libdir}/libnoatun*.*
+%{_libdir}/lib*.so.*
+%{_libdir}/lib*.la
+
+
+%files devel
+%defattr(-,root,root,-)
+%{tde_includedir}/*
+%{_libdir}/lib*.so
+%exclude %{_libdir}/libkdeinit_*.so
+%exclude %{_libdir}/libartseffects.so
+%exclude %{_libdir}/libnoatunarts.*
+#exclude %{_libdir}/liboggarts.so
+%exclude %{_libdir}/libwinskinvis.so
+
+
+%changelog
+* Sat Sep 09 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
+- Initial build for RHEL 6
+- Spec file based on Fedora 8 "kdemultimedia-6:3.5.10-2"
diff --git a/redhat/kdenetwork/trinity-kdenetwork-3.5.12.spec b/redhat/kdenetwork/trinity-kdenetwork-3.5.12.spec
new file mode 100644
index 000000000..9ab8491bc
--- /dev/null
+++ b/redhat/kdenetwork/trinity-kdenetwork-3.5.12.spec
@@ -0,0 +1,493 @@
+# Default version for this component
+%if "%{?version}" == ""
+%define version 3.5.12
+%endif
+%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.12 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/kde3
+
+
+# Fedora review:  http://bugzilla.redhat.com/195486
+
+## Conditional build:
+# disabled, for now, doesn't build -- Rex
+#define _enable_jingle --enable-jingle
+%define _enable_sametime_plugin --enable-sametime-plugin
+#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
+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
+
+# Trinity official patches, from SVN
+# Use libv4l1-videodev.h when available in kdenetwork
+Patch7: r1243951.diff
+
+# Trinity unofficial patches
+#  Compiling Kopete for Fedora15 ...
+Patch8: kdenetwork-kopete-gcc45.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
+%{?_enable_sametime_plugin: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
+
+BuildRequires:	libv4l-devel
+
+%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 >= %{version}
+# 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
+%patch7 -p1
+%patch8 -p1
+
+%__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                        \
+   --enable-new-ldflags           \
+   --disable-dependency-tracking  \
+   --disable-rpath                \
+   --disable-debug                \
+   --disable-warnings             \
+   --enable-final                 \
+   --includedir=%{tde_includedir} \
+  %{?_enable_jingle} %{!?_enable_jingle:--disable-jingle} \
+  %{?_enable_sametime_plugin} %{!?_enable_sametime_plugin:--disable-sametime-plugin} \
+  %{?_enable_slp} %{!?_enable_slp:--disable-slp} \
+  %{?_with_wifi} %{!?_with_wifi:--without-wifi} \
+  %{?_with_xmms} %{!?_with_xmms:--without-xmms} \
+  --with-extra-includes=%{_includedir}/tqt
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+
+%make_install
+# RHEL6: kppp seems to be not installed by previous command ???
+%make_install -C kppp
+
+
+## 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
+%{_docdir}/HTML/??/ksirc/
+%{_bindir}/ksirc
+%{_libdir}/libkdeinit_ksirc.*
+%{_libdir}/kde3/ksirc.*
+%{_datadir}/applications/kde/ksirc.desktop
+%{_datadir}/apps/ksirc/
+%config(noreplace) %{_datadir}/config/ksircrc
+%{_datadir}/icons/hicolor/*/apps/ksirc.*
+
+# kdict
+%{_docdir}/HTML/en/kdict
+%{_bindir}/kdict
+%{_libdir}/kde3/kdict*
+%{_libdir}/libkdeinit_kdict.*
+%{_datadir}/applications/kde/kdict.desktop
+%{_datadir}/apps/kdict
+%{_datadir}/apps/kicker/applets/kdictapplet.desktop
+%{_datadir}/icons/hicolor/*/apps/kdict.*
+
+# ktalk
+%{_docdir}/HTML/en/ktalkd
+%{_bindir}/ktalkd*
+%{_libdir}/kde3/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
+%{_docdir}/HTML/en/kpf
+%{_libdir}/kde3/kpf*
+%{_datadir}/apps/kicker/applets/kpfapplet.desktop
+%{_datadir}/icons/crystalsvg/*/apps/kpf.*
+%{_datadir}/services/kpfpropertiesdialogplugin.desktop
+
+%if "%{?_with_wifi:1}" == "1"
+# kwifimanager
+%doc %{_docdir}/HTML/en/kwifimanager
+%{_bindir}/kwifimanager
+%{_libdir}/kde3/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*
+%{_libdir}/kde3/*nowlistening*
+%endif
+
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING README
+
+# ksirc
+%exclude %{_bindir}/ksirc
+%exclude %{_libdir}/libkdeinit_ksirc.*
+%exclude %{_libdir}/kde3/ksirc.*
+%exclude %{_datadir}/applications/kde/ksirc.desktop
+%exclude %{_datadir}/apps/ksirc/
+%exclude %{_datadir}/config/ksircrc
+%exclude %{_docdir}/HTML/??/ksirc/
+%exclude %{_datadir}/icons/hicolor/??x??/apps/ksirc.png
+
+# kdict
+%exclude %{_docdir}/HTML/en/kdict
+%exclude %{_bindir}/kdict
+%exclude %{_libdir}/kde3/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 %{_docdir}/HTML/en/ktalkd
+%exclude %{_sysconfdir}/xinetd.d/ktalk
+%exclude %{_bindir}/ktalkd*
+%exclude %{_libdir}/kde3/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 %{_libdir}/kde3/kpf*
+%exclude %{_datadir}/apps/kicker/applets/kpfapplet.desktop
+%exclude %{_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 %{_libdir}/kde3/kcm_wifi.*
+%exclude %{_datadir}/applications/kde/kcmwifi.desktop
+%exclude %{_datadir}/applications/kde/kwifimanager.desktop
+%exclude %{_datadir}/apps/kwifimanager
+%exclude %{_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 %{_libdir}/kde3/*nowlistening*
+%endif
+
+%{_docdir}/HTML/en/*
+%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
+%if "%{?_with_wifi:1}" == "1"
+%{_libdir}/libkwireless.*
+%endif
+%{_libdir}/kde3/*
+%{_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}/kde/*
+%{_libdir}/libkopete*.so
+%{_libdir}/librss.so
+
+
+%changelog
+* Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-4
+- Import to GIT
+
+* Tue Aug 23 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-3
+- Add correction for Fedora 15
+- Add patch7 for V4L compilation
+
+* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2
+- Correct macro to install under "/opt", if desired
+
+* Fri Aug 05 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
+- Initial version
+- Spec file based on Fedora 8 "kdenetwork 7:3.5.10-1"
+
diff --git a/redhat/kdepim/trinity-kdepim-3.5.12.spec b/redhat/kdepim/trinity-kdepim-3.5.12.spec
index 9a0361c86..01b349900 100644
--- a/redhat/kdepim/trinity-kdepim-3.5.12.spec
+++ b/redhat/kdepim/trinity-kdepim-3.5.12.spec
@@ -20,10 +20,12 @@ Name:		trinity-kdepim
 Version:	%{?version}
 Release:	%{?release}%{?dist}%{?_variant}
 License:	GPL
+Group:		Applications/Productivity
+
 Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 Summary:	PIM (Personal Information Manager) applications
-Group:		Applications/Productivity
+
 Prefix:		%{_prefix}
 
 Source0:	kdepim-%{version}.tar.gz
@@ -64,7 +66,7 @@ Development files for %{name}.
 
 %__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
+%__make -f "admin/Makefile.common"
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
diff --git a/redhat/kdepim/trinity-kdepim-3.5.13.spec b/redhat/kdepim/trinity-kdepim-3.5.13.spec
index 4ad751749..604dbd208 100644
--- a/redhat/kdepim/trinity-kdepim-3.5.13.spec
+++ b/redhat/kdepim/trinity-kdepim-3.5.13.spec
@@ -20,10 +20,12 @@ Name:		trinity-kdepim
 Version:	%{?version}
 Release:	%{?release}%{?dist}%{?_variant}
 License:	GPL
+Group:		Applications/Productivity
+
 Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 Summary:	PIM (Personal Information Manager) applications
-Group:		Applications/Productivity
+
 Prefix:		%{_prefix}
 
 Source0:	kdepim-%{version}.tar.gz
diff --git a/redhat/kdesdk/trinity-kdesdk-3.5.12.spec b/redhat/kdesdk/trinity-kdesdk-3.5.12.spec
index 0da572d1d..91c574803 100644
--- a/redhat/kdesdk/trinity-kdesdk-3.5.12.spec
+++ b/redhat/kdesdk/trinity-kdesdk-3.5.12.spec
@@ -1,4 +1,4 @@
-# If _kde3_prefix is # Default version for this component
+# Default version for this component
 %if "%{?version}" == ""
 %define version 3.5.12
 %endif
@@ -98,9 +98,9 @@ Summary: %{name} runtime libraries
 Group:   System Environment/Libraries
 Requires: trinity-kdelibs >= %{version}
 # helps multilib upgrades
-Obsoletes: %{name} < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name} < %{version}-%{release}
 # include to be paranoid, installing libs-only is still mostly untested -- Rex
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 %description libs
 %{summary}.
 
diff --git a/redhat/kdesdk/trinity-kdesdk-3.5.13.spec b/redhat/kdesdk/trinity-kdesdk-3.5.13.spec
index a9d1d3570..00d1d5f3b 100644
--- a/redhat/kdesdk/trinity-kdesdk-3.5.13.spec
+++ b/redhat/kdesdk/trinity-kdesdk-3.5.13.spec
@@ -1,4 +1,4 @@
-# If _kde3_prefix is # Default version for this component
+# Default version for this component
 %if "%{?version}" == ""
 %define version 3.5.13
 %endif
@@ -11,18 +11,11 @@
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}
+BuildRequires: cmake >= 2.8
+%define tde_docdir %{_docdir}/kde
 %define tde_libdir %{_libdir}/trinity
 
 
-%define _with_subversion --with-subversion
-%if 0%{?fedora} > 6 || 0%{?rhel} > 4
-%define _with_apr_config --with-apr-config=apr-1-config
-%define _with_apu_config --with-apu-config=apu-1-config
-%endif
-
-
 Name:    trinity-kdesdk
 Summary: The KDE Software Development Kit (SDK)
 Version: %{?version}
@@ -43,7 +36,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
@@ -55,11 +48,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
-%{?_with_subversion:BuildRequires: subversion-devel neon-devel}
+BuildRequires: subversion-devel neon-devel
 
 # Obsoletes/Provides
 %define cervisia_ver 2.4.7
@@ -94,9 +85,9 @@ Summary: %{name} runtime libraries
 Group:   System Environment/Libraries
 Requires: trinity-kdelibs >= %{version}
 # helps multilib upgrades
-Obsoletes: %{name} < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name} < %{version}-%{release}
 # include to be paranoid, installing libs-only is still mostly untested -- Rex
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 %description libs
 %{summary}.
 
@@ -105,42 +96,29 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %setup -q -n kdesdk
 %patch1 -p1 -b .subversion
 
-# 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}"
-export LDFLAGS="${LDFLAGS} -lqt-mt -L${QTLIB}"
+export LD_LIBRARY_PATH="%{_libdir}"
+export PKG_CONFIG_PATH="%{_libdir}/pkgconfig"
+export CMAKE_INCLUDE_PATH="%{_includedir}:%{_includedir}/tqt"
 
-%configure \
-  --includedir=%{_includedir}/kde \
-  --disable-rpath \
-  --enable-new-ldflags \
-  --disable-debug --disable-warnings \
-  --disable-dependancy-tracking --enable-final \
-  %{?_with_subversion} %{?_with_apr_config} %{?_with_apu_config} \
-  --with-extra-includes=%{_includedir}/tqt \
-  --without-svn \
-  --enable-closure
+%__mkdir build
+cd build
+%cmake \
+  -DWITH_DBSEARCHENGINE=OFF \
+  -DBUILD_ALL=ON \
+  ..
 
-# Do not use %{?_smp_mflags} !
-%__make
+%__make %{?_smp_mflags}
 
 
 %install
 export PATH="%{_bindir}:${PATH}"
 %__rm -rf %{buildroot} 
 
-%make_install
+%make_install -C build
 
 desktop-file-install --vendor "" \
   --dir %{buildroot}%{_datadir}/applications/kde \
diff --git a/redhat/kdetoys/trinity-kdetoys-3.5.12.spec b/redhat/kdetoys/trinity-kdetoys-3.5.12.spec
new file mode 100644
index 000000000..557d872ee
--- /dev/null
+++ b/redhat/kdetoys/trinity-kdetoys-3.5.12.spec
@@ -0,0 +1,163 @@
+# Default version for this component
+%if "%{?version}" == ""
+%define version 3.5.12
+%endif
+%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}
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/kde3
+
+
+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
+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}
+
+BuildRequires: desktop-file-utils
+BuildRequires: tqtinterface-devel >= %{version}
+BuildRequires: trinity-kdelibs-devel >= %{version}
+BuildRequires: gettext
+
+#Requires(hint): kdebase3 >= %{version}
+
+%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
+
+%__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 \
+  --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
+
+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
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%changelog
+* Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-3
+- Import to GIT
+
+* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2
+- Correct macro to install under "/opt", if desired
+
+* Fri Aug 05 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
+- Initial version
+- Spec file based on Fedora 8 "kdetoys 7:3.5.10-1"
+
diff --git a/redhat/kdeutils/kcmlaptoprc b/redhat/kdeutils/kcmlaptoprc
new file mode 100644
index 000000000..66d400f5d
--- /dev/null
+++ b/redhat/kdeutils/kcmlaptoprc
@@ -0,0 +1,114 @@
+[AcpiDefault]
+EnableHibernate=true
+EnablePerformance=false
+EnableStandby=true
+EnableSuspend=true
+EnableThrottle=false
+
+[BatteryCritical]
+Brightness=false
+BrightnessValue=255
+CriticalValPercent=3
+CriticalValTime=5
+Hibernate=false
+Logout=false
+Notify=true
+Performance=false
+PerformanceValue=
+PlaySound=false
+PlaySoundPath=
+RunCommand=false
+RunCommandPath=
+Shutdown=true
+Standby=false
+Suspend=false
+SystemBeep=true
+Throttle=false
+ThrottleValue=00%
+TimeBasedAction=true
+
+[BatteryDefault]
+BlankSaver=false
+ChargePixmap=laptop_charge
+Enable=true
+NoBatteryPixmap=laptop_nobattery
+NoChargePixmap=laptop_nocharge
+NotifyMe=false
+Poll=20
+
+[BatteryLow]
+Brightness=false
+BrightnessValue=255
+Hibernate=false
+Logout=false
+LowValPercent=7
+LowValTime=15
+Notify=true
+Performance=false
+PerformanceValue=
+PlaySound=false
+PlaySoundPath=
+RunCommand=false
+RunCommandPath=
+Shutdown=false
+Standby=false
+Suspend=false
+SystemBeep=true
+Throttle=false
+ThrottleValue=00%
+TimeBasedAction=true
+
+[LaptopButtons]
+LidBrightness=0
+LidBrightnessEnabled=false
+LidPerformance=
+LidPerformanceEnabled=false
+LidSuspend=0
+LidThrottle=00%
+LidThrottleEnabled=false
+PowerBrightness=0
+PowerBrightnessEnabled=false
+PowerPerformance=
+PowerPerformanceEnabled=false
+PowerSuspend=0
+PowerThrottle=
+PowerThrottleEnabled=false
+
+[LaptopPower]
+LavEnabled=false
+NoLavEnabled=false
+NoPowerBrightness=0
+NoPowerBrightnessEnabled=false
+NoPowerLav=0
+NoPowerPerformance=
+NoPowerPerformanceEnabled=false
+NoPowerSuspend=0
+NoPowerThrottle=00%
+NoPowerThrottleEnabled=false
+NoPowerWait=5
+PowerBrightness=255
+PowerBrightnessEnabled=false
+PowerLav=0
+PowerPerformance=
+PowerPerformanceEnabled=false
+PowerSuspend=0
+PowerThrottle=00%
+PowerThrottleEnabled=false
+PowerWait=20
+
+[ProfileDefault]
+BrightnessOffLevel=160
+BrightnessOnLevel=255
+EnableBrightnessOff=0
+EnableBrightnessOn=0
+EnablePerformanceOff=0
+EnablePerformanceOn=0
+EnableThrottleOff=0
+EnableThrottleOn=0
+PerformanceOffLevel=
+PerformanceOnLevel=
+ThrottleOffLevel=00%
+ThrottleOnLevel=00%
+
+[SoftwareSuspendDefault]
+EnableHibernate=false
diff --git a/redhat/kdeutils/kdf-3.0.2-label.patch b/redhat/kdeutils/kdf-3.0.2-label.patch
new file mode 100644
index 000000000..6ea620472
--- /dev/null
+++ b/redhat/kdeutils/kdf-3.0.2-label.patch
@@ -0,0 +1,13 @@
+--- kdeutils-3.0.3/kdf/disklist.cpp.label	2002-08-19 14:36:13.000000000 +0200
++++ kdeutils-3.0.3/kdf/disklist.cpp	2002-08-19 14:37:34.000000000 +0200
+@@ -163,8 +163,9 @@
+     while (! t.eof()) {
+       s=t.readLine();
+       s=s.simplifyWhiteSpace();
+-      if ( (!s.isEmpty() ) && (s.find(DELIMITER)!=0) ) {
++      if ( (!s.isEmpty() ) && (s.find(DELIMITER)!=0) && (s.find("LABEL")!=0) ) {
+                // not empty or commented out by '#'
++	       // skip LABEL entries as long as kdf can't handle them properly
+ 	//	kdDebug() << "GOT: [" << s << "]" << endl;
+ 	disk = new DiskEntry();// Q_CHECK_PTR(disk);
+         disk->setMounted(FALSE);
diff --git a/redhat/kdeutils/klaptop_acpi_helper.console b/redhat/kdeutils/klaptop_acpi_helper.console
new file mode 100644
index 000000000..6a738ec88
--- /dev/null
+++ b/redhat/kdeutils/klaptop_acpi_helper.console
@@ -0,0 +1 @@
+FALLBACK=true
diff --git a/redhat/kdeutils/klaptop_acpi_helper.pam b/redhat/kdeutils/klaptop_acpi_helper.pam
new file mode 100644
index 000000000..321c2eefb
--- /dev/null
+++ b/redhat/kdeutils/klaptop_acpi_helper.pam
@@ -0,0 +1,4 @@
+#%PAM-1.0
+auth       sufficient	pam_rootok.so
+auth       required	pam_console.so
+account    required	pam_permit.so
diff --git a/redhat/kdeutils/trinity-kdeutils-3.5.12.spec b/redhat/kdeutils/trinity-kdeutils-3.5.12.spec
new file mode 100755
index 000000000..ef98b3c56
--- /dev/null
+++ b/redhat/kdeutils/trinity-kdeutils-3.5.12.spec
@@ -0,0 +1,357 @@
+# Default version for this component
+%if "%{?version}" == ""
+%define version 3.5.12
+%endif
+%define release 6
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%define _variant .opt
+%define _docdir %{_prefix}/share/doc
+%endif
+
+# TDE 3.5.12 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/kde3
+
+
+Name:		trinity-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>
+URL:		http://www.trinitydesktop.org/
+
+Prefix:		%{_prefix}
+
+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
+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
+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
+
+%__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 \
+   --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
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{?buildroot}
+%make_install
+
+# 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}
+
+
+%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
+%{tde_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
+%{tde_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 %{tde_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 %{tde_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
+
+%{tde_docdir}/HTML/en/*
+%attr(644,root,root) %{_sysconfdir}/security/console.apps/*
+%attr(644,root,root) %{_sysconfdir}/pam.d/*
+%{_bindir}/*
+%{_sbindir}/*
+%{tde_libdir}/*
+%{_libdir}/*.la
+%{_libdir}/libkdeinit*.so
+%{_libdir}/lib*.so.*
+%{_datadir}/icons/*/*/*/*
+%{_datadir}/apps/*
+%config %{_datadir}/config/*
+%{_datadir}/config.kcfg/*
+%{_datadir}/services/*
+%{_datadir}/servicetypes/*
+%{_datadir}/applications/kde/*
+%if 0%{?rhel} > 6
+%{_datadir}/applnk/Utilities/*
+%{_datadir}/mimelnk/application/*
+%endif
+%{_datadir}/autostart/*
+
+%files devel
+%defattr(-,root,root,-)
+%{tde_includedir}/*
+%{_libdir}/libkcmlaptop.so
+%{_libdir}/libkhexeditcommon.so
+%{_libdir}/libkmilo.so
+%{_libdir}/libkregexpeditorcommon.so
+%{_libdir}/libksimcore.so
+
+
+%changelog
+* Mon Sep 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-6
+- Merge Spec file from Fedora8 "kdeutils-3.5.10-6"
+
+* Sun Sep 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-5
+- Import to GIT
+
+* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-4
+- Correct (again) macro to install under "/opt", if desired
+
+* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-3
+- Correct macro to install under "/opt", if desired
+
+* Sun Dec 19 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2
+- Rebuilt
+
+* Fri Dec 17 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
+- Add macro _kde3_prefix to define custom installation prefix (ex: /opt/kde3)
+- Add '--with-extra-includes=%{_includedir}/tqt'
+
+* Wed Dec 15 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-0
+- Initial version
+
diff --git a/redhat/kdeutils/trinity-kdeutils-3.5.13.spec b/redhat/kdeutils/trinity-kdeutils-3.5.13.spec
new file mode 100755
index 000000000..17acde68e
--- /dev/null
+++ b/redhat/kdeutils/trinity-kdeutils-3.5.13.spec
@@ -0,0 +1,118 @@
+# 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 building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}
+%define tde_libdir %{_libdir}/trinity
+
+
+Name:		trinity-kdeutils
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+License:	GPL
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+Summary:	Trinity KDE Utilities
+Prefix:		%{_prefix}
+
+Source0:	kdeutils-%{version}.tar.gz
+
+BuildRequires:	tqtinterface
+BuildRequires:	trinity-arts
+BuildRequires:	trinity-kdelibs
+
+Requires:	tqtinterface
+Requires:	trinity-kdelibs
+
+%description
+Trinity KDE Utilities.
+
+
+%package devel
+Requires:	%{name}
+Summary:	%{name} - Development files
+%description devel
+Development files for %{name}.
+
+
+%prep
+%setup -q -n kdeutils
+
+# 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}"
+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
+
+%__make %{?_smp_mflags}
+
+%install
+%__rm -rf %{?buildroot}
+%__mkdir_p %{?buildroot}
+export PATH="%{_bindir}:${PATH}"
+%make_install
+
+%clean
+%__rm -rf %{?buildroot}
+
+%files
+%defattr(-,root,root,-)
+%{_bindir}/*
+%{_datadir}/applications/kde/*.desktop
+%{_datadir}/apps/*
+%{_datadir}/autostart/*.desktop
+%{_datadir}/config/*
+%{_datadir}/icons/*
+%{_datadir}/services/*
+%{_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}/mimelnk/application/*
+%endif
+
+%files devel
+%defattr(-,root,root,-)
+%{_libdir}/*.la
+%{_libdir}/*.so
+%{_includedir}/*
+%{tde_libdir}/*.la
+
+%changelog
+* Mon Sep 05 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
+- Import to GIT
+
diff --git a/redhat/kdevelop/c_cpp_reference-2.0.2-config.patch b/redhat/kdevelop/c_cpp_reference-2.0.2-config.patch
new file mode 100644
index 000000000..3d534df91
--- /dev/null
+++ b/redhat/kdevelop/c_cpp_reference-2.0.2-config.patch
@@ -0,0 +1,11 @@
+--- c_cpp_reference-2.0.2_for_KDE_3.0/configure.orig	Mon Dec  9 18:35:50 2002
++++ c_cpp_reference-2.0.2_for_KDE_3.0/configure	Mon Dec  9 18:41:16 2002
+@@ -5868,7 +5868,7 @@
+ So, check this please and use another prefix!" 1>&2; exit 1; }
+ fi
+ 
+-kde_libdirs="/usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib /usr/X11R6/lib /usr/local/lib /opt/kde2/lib /opt/kde/lib /usr/X11R6/kde/lib"
++kde_libdirs="/usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib64 /usr/lib /usr/X11R6/lib /usr/local/lib /opt/kde2/lib /opt/kde/lib /usr/X11R6/kde/lib"
+ test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib $KDEDIR $kde_libdirs"
+ kde_libdirs="$ac_kde_libraries $kde_libdirs"
+ 
diff --git a/redhat/kdevelop/c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2 b/redhat/kdevelop/c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2
new file mode 100644
index 000000000..0c8e95118
--- /dev/null
+++ b/redhat/kdevelop/c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2
diff --git a/redhat/kdevelop/kdevelop-2.1.5_for_KDE_3.1-doc.patch b/redhat/kdevelop/kdevelop-2.1.5_for_KDE_3.1-doc.patch
new file mode 100644
index 000000000..c977cb75f
--- /dev/null
+++ b/redhat/kdevelop/kdevelop-2.1.5_for_KDE_3.1-doc.patch
@@ -0,0 +1,19 @@
+--- kdevelop-2.1.5_for_KDE_3.1/configure.doc	2003-10-21 15:08:22.000000000 +0200
++++ kdevelop-2.1.5_for_KDE_3.1/configure	2003-10-21 15:14:18.000000000 +0200
+@@ -23794,14 +23794,14 @@
+ 
+ kdelibs_docdirs="/usr/doc/kdelibs-doc/html"
+ if test "$ac_kde_htmldir" != ""; then
+- kdelibs_docdirs="$kdelibs_docdirs $ac_kde_htmldir/default/kdelibs $ac_kde_htmldir/en/kdelibs"
++ kdelibs_docdirs="$kdelibs_docdirs $ac_kde_htmldir/default/kdelibs $ac_kde_htmldir/en/kdelibs $ac_kde_htmldir/en/kdelibs-apidocs"
+ fi
+ kdelibs_docdirs="$ac_kdelibs_docdirs $kdelibs_docdirs"
+ 
+ kdelibs_docdir=NO
+ for i in $kdelibs_docdirs;
+ do
+-  for j in kdecore/index.html;
++  for j in index.html;
+   do
+     echo "configure: 23806: $i/$j" >&5
+     if test -r "$i/$j"; then
diff --git a/redhat/kdevelop/kdevelop-3.5.2-kde4template.patch b/redhat/kdevelop/kdevelop-3.5.2-kde4template.patch
new file mode 100644
index 000000000..58f668925
--- /dev/null
+++ b/redhat/kdevelop/kdevelop-3.5.2-kde4template.patch
@@ -0,0 +1,144 @@
+diff -ur kdevelop-3.5.2/languages/cpp/app_templates/kde4app/kde4app.kdevelop kdevelop-3.5.2-kde4template/languages/cpp/app_templates/kde4app/kde4app.kdevelop
+--- kdevelop-3.5.2/languages/cpp/app_templates/kde4app/kde4app.kdevelop	2007-09-26 11:42:09.000000000 +0200
++++ kdevelop-3.5.2-kde4template/languages/cpp/app_templates/kde4app/kde4app.kdevelop	2008-06-07 01:10:11.000000000 +0200
+@@ -113,18 +113,11 @@
+   </cppsupportpart>
+   <kdevcustomproject>
+     <run>
+-      <mainprogram>%{dest}/build/%{APPNAMELC}</mainprogram>
++      <mainprogram>%{dest}/%{APPNAMELC}</mainprogram>
+       <programargs/>
+       <terminal>false</terminal>
+-      <autocompile>false</autocompile>
+-      <envvars>
+-        <envvar value="" name="KDEDIRS" />
+-        <envvar value="" name="KDEHOME" />
+-        <envvar value="" name="LD_LIBRARY_PATH" />
+-        <envvar value="" name="PATH" />
+-        <envvar value="" name="PKG_CONFIG_PATH" />
+-        <envvar value="" name="QT_PLUGIN_PATH" />
+-      </envvars>
++      <autocompile>true</autocompile>
++      <envvars/>
+       <autoinstall>false</autoinstall>
+       <autokdesu>false</autokdesu>
+       <globaldebugarguments/>
+@@ -134,7 +127,7 @@
+     </run>
+     <build>
+       <buildtool>make</buildtool>
+-      <builddir>%{dest}/build</builddir>
++      <builddir>%{dest}</builddir>
+     </build>
+     <make>
+       <abortonerror>false</abortonerror>
+@@ -146,14 +139,7 @@
+       <makeoptions/>
+       <selectedenvironment>default</selectedenvironment>
+       <environments>
+-        <default>
+-          <envvar value="" name="KDEDIRS" />
+-          <envvar value="" name="KDEHOME" />
+-          <envvar value="" name="LD_LIBRARY_PATH" />
+-          <envvar value="" name="PATH" />
+-          <envvar value="" name="PKG_CONFIG_PATH" />
+-          <envvar value="" name="QT_PLUGIN_PATH" />
+-        </default>
++        <default/>
+       </environments>
+     </make>
+     <filetypes>
+@@ -179,7 +165,10 @@
+       </environments>
+     </other>
+     <blacklist>
+-        <path>build</path>
++        <path>CMakeFiles</path>
++        <path>CMakeTmp</path>
++        <path>cmake_install.cmake</path>
++        <path>cmake_uninstall.cmake</path>
+     </blacklist>
+   </kdevcustomproject>
+   <kdevcppsupport>
+@@ -189,7 +178,6 @@
+       <includestyle>4</includestyle>
+       <designerintegration>ExternalDesigner</designerintegration>
+       <designer>/usr/bin/designer-qt4</designer>
+-      <root>/usr/lib/qt4</root>
+     </qt>
+   </kdevcppsupport>
+   <kdevclassview>
+diff -ur kdevelop-3.5.2/languages/cpp/app_templates/kde4app/kde4app.kdevtemplate kdevelop-3.5.2-kde4template/languages/cpp/app_templates/kde4app/kde4app.kdevtemplate
+--- kdevelop-3.5.2/languages/cpp/app_templates/kde4app/kde4app.kdevtemplate	2008-02-11 12:22:37.000000000 +0100
++++ kdevelop-3.5.2-kde4template/languages/cpp/app_templates/kde4app/kde4app.kdevtemplate	2008-06-07 01:08:10.000000000 +0200
+@@ -43,7 +43,7 @@
+ Comment[sv]=Skapar ett enkelt KDE 4-program med ett toppnivåfönster, menyer och verktygsrader.
+ Comment[zh_TW]=產生一個簡單的 KDE4 應用程式，內含頂層視窗、選單與工具列。
+ FileTemplates=h,CStyle,cpp,CStyle
+-ShowFilesAfterGeneration=%{dest}/README
++ShowFilesAfterGeneration=%{dest}/%{APPNAMELC}.cpp
+ Archive=kde4app.tar.gz
+ 
+ [FILE1]
+@@ -112,24 +112,22 @@
+ Source=%{src}/settings.kcfgc
+ Dest=%{dest}/settings.kcfgc
+ 
+-[FILE13]
+-Type=install
+-Source=%{src}/README
+-Dest=%{dest}/README
+ 
+-[FILE14]
++[FILE13]
+ Type=install
+ Source=%{src}/kde4app.kdevelop
+ Dest=%{dest}/%{APPNAMELC}.kdevelop
+ 
+-[FILE15]
++[FILE14]
+ Type=install
+ Source=%{src}/kde4app.kdevelop.filelist
+ Dest=%{dest}/%{APPNAMELC}.kdevelop.filelist
+ 
+-[MKDIR1]
+-Type=mkdir
+-Dir=%{dest}/build
++[CMAKE]
++Type=finishcmd
++Command=cmake ./ -GKDevelop3
++Directory=%{dest}
++
+ 
+ [MSG]
+ Type=message
+diff -ur kdevelop-3.5.2/languages/cpp/app_templates/kde4app/Makefile.am kdevelop-3.5.2-kde4template/languages/cpp/app_templates/kde4app/Makefile.am
+--- kdevelop-3.5.2/languages/cpp/app_templates/kde4app/Makefile.am	2007-09-26 11:42:09.000000000 +0200
++++ kdevelop-3.5.2-kde4template/languages/cpp/app_templates/kde4app/Makefile.am	2008-06-07 00:37:23.000000000 +0200
+@@ -1,6 +1,6 @@
+ dataFiles = kapp4.cpp kapp4.h prefs_base.ui kapp4view.cpp kapp4view.h kapp4view_base.ui \
+ 	main.cpp kde4appui.rc CMakeLists.txt kapp4.desktop kapp4.kcfg settings.kcfgc \
+-	kde4app.png README kde4app.kdevelop kde4app.kdevelop.filelist
++	kde4app.png kde4app.kdevelop kde4app.kdevelop.filelist
+ 
+ templateName = kde4app
+ 
+diff -ur kdevelop-3.5.2/languages/cpp/app_templates/kde4app/Makefile.in kdevelop-3.5.2-kde4template/languages/cpp/app_templates/kde4app/Makefile.in
+--- kdevelop-3.5.2/languages/cpp/app_templates/kde4app/Makefile.in	2008-05-13 16:23:40.000000000 +0200
++++ kdevelop-3.5.2-kde4template/languages/cpp/app_templates/kde4app/Makefile.in	2008-06-07 00:37:30.000000000 +0200
+@@ -373,7 +373,7 @@
+ xdg_menudir = @xdg_menudir@
+ dataFiles = kapp4.cpp kapp4.h prefs_base.ui kapp4view.cpp kapp4view.h kapp4view_base.ui \
+ 	main.cpp kde4appui.rc CMakeLists.txt kapp4.desktop kapp4.kcfg settings.kcfgc \
+-	kde4app.png README kde4app.kdevelop kde4app.kdevelop.filelist
++	kde4app.png kde4app.kdevelop kde4app.kdevelop.filelist
+ 
+ templateName = kde4app
+ 
+diff -ur kdevelop-3.5.2/languages/cpp/app_templates/kdecpp.appwizard kdevelop-3.5.2-kde4template/languages/cpp/app_templates/kdecpp.appwizard
+--- kdevelop-3.5.2/languages/cpp/app_templates/kdecpp.appwizard	2007-04-10 01:44:25.000000000 +0200
++++ kdevelop-3.5.2-kde4template/languages/cpp/app_templates/kdecpp.appwizard	2008-06-06 23:52:16.000000000 +0200
+@@ -1,2 +1,2 @@
+ [General]
+-List=kdedcop,kioslave,kxt,kdevlang,kmake,kapp,kconfig35,kdevlang,kdevpart,kateplugin,kdevpart2,kopart,noatunui,kateplugin2,kfileplugin,konqnavpanel,noatunvisual,dcopservice,khello,kpartapp,khello2,kpartplugin,kcmodule,kicker,kscreensaver,kscons_kxt,kscons_kmdi
++List=kde4app,kdedcop,kioslave,kxt,kdevlang,kmake,kapp,kconfig35,kdevlang,kdevpart,kateplugin,kdevpart2,kopart,noatunui,kateplugin2,kfileplugin,konqnavpanel,noatunvisual,dcopservice,khello,kpartapp,khello2,kpartplugin,kcmodule,kicker,kscreensaver,kscons_kxt,kscons_kmdi
diff --git a/redhat/kdevelop/trinity-kdevelop-3.5.12.spec b/redhat/kdevelop/trinity-kdevelop-3.5.12.spec
new file mode 100644
index 000000000..d7ca3a9fe
--- /dev/null
+++ b/redhat/kdevelop/trinity-kdevelop-3.5.12.spec
@@ -0,0 +1,237 @@
+# Default version for this component
+%if "%{?version}" == ""
+%define version 3.5.12
+%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}
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/kde3
+
+%define _default_patch_fuzz 2
+%define qt_version 3.3.8b
+%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}
+
+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
+#Patch2: kdevelop-2.1.5_for_KDE_3.1-doc.patch
+# improved integration for the KDE 4 template - no special KDE 4 build environment needed in Fedora
+Patch4: kdevelop-3.5.2-kde4template.patch
+
+#upstream patches
+
+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: 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 -b .doc
+#patch4 -p1 -b .kde4template
+
+%__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
+
+%__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
+QTDIR="" && source /etc/profile.d/qt.sh
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+# Fix KDE detection fail in "./configure" because tqt.h cannot be found
+export CXXFLAGS="${CXXFLAGS} -I%{_includedir}/tqt"
+
+# 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} \
+  --with-extra-includes=%{_includedir}/tqt
+popd
+
+%configure \
+   --enable-new-ldflags \
+   --disable-dependency-tracking \
+   --disable-rpath \
+   --disable-debug \
+   --disable-warnings \
+   --enable-final \
+   --with-qtdoc-dir=%{_docdir}/qt-devel-%{qt_ver}/html/ \
+   --with-kdelibsdoc-dir=%{tde_docdir}/HTML/en/kdelibs-apidocs/ \
+   --with-extra-libs=%{_libdir} \
+   --with-extra-includes=%{_includedir}/tqt
+
+
+# parallel make disabled because otherwise main.cpp can get built before
+# profileeditorbase.h is fully generated
+%__make
+%__make %{?_smp_mflags} -C c_cpp_reference-2.0.2_for_KDE_3.0
+
+
+%install
+%__rm -rf %{buildroot}
+
+%make_install
+%make_install -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,-)
+%{tde_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/application/*
+%{_datadir}/mimelnk/text/*
+%{_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 Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
+- Initial build for RHEL 6
+- Spec file based on Fedora 8 "kdeedu-3.5.3-1"
+- Import to GIT