RHEL/Fedora: TDE fixes, add applications, etc ....

28 files changed, 2694 insertions, 78 deletions

diff --git a/redhat/applications/gtk-qt-engine/trinity-gtk-qt-engine.spec b/redhat/applications/gtk-qt-engine/trinity-gtk-qt-engine.spec
new file mode 100644
index 000000000..ccdbaa156
--- /dev/null
+++ b/redhat/applications/gtk-qt-engine/trinity-gtk-qt-engine.spec
@@ -0,0 +1,111 @@
+# Default version for this component
+%define kdecomp gtk-qt-engine
+%define version 0.8
+%define release 1
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%define _variant .opt
+%define _docdir %{_prefix}/share/doc
+%endif
+
+# TDE 3.5.13 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}/kde
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/trinity
+
+
+Name:		trinity-%{kdecomp}
+Summary:	theme engine using Qt for GTK+ 2.x and Trinity
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/Utilities
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.trinitydesktop.org/
+
+Prefix:    %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+
+
+BuildRequires:	tqtinterface-devel
+BuildRequires:	trinity-kdelibs-devel
+BuildRequires:	trinity-kdebase-devel
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+
+%description
+The GTK-Qt Theme Engine (also known as gtk-qt-engine) is a GTK 2 theme engine
+that calls Qt to do the actual drawing. This makes your GTK 2 applications
+look almost like real Qt applications and gives you a more unified desktop
+experience.
+
+Please note that this package is targeted at Trinity users and therefore provides
+a way to configure it from within KControl.
+
+
+%prep
+%setup -q -n applications/%{kdecomp}
+
+
+# Ugly hack to modify TQT include directory inside autoconf files.
+# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
+sed -i CMakeLists.txt \
+  -e "s,/usr/include/tqt,%{_includedir}/tqt,g"
+
+
+%build
+unset QTDIR || : ; . /etc/profile.d/qt.sh
+export PATH="%{_bindir}:${PATH}"
+
+export CXXFLAGS="-I${QTINC} ${CXXFLAGS}"
+	
+%__mkdir build
+cd build
+%cmake \
+	-DKDE3PREFIX=%{_prefix} \
+	..
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+
+%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 NEWS README TODO
+%{tde_libdir}/kcm_kcmgtk.la
+%{tde_libdir}/kcm_kcmgtk.so
+%{_datadir}/applications/kcmgtk.desktop
+%{_usr}/%{_lib}/gtk-2.0/2.10.0/engines/libqtengine.so
+%{_usr}/share/themes/Qt/gtk-2.0/gtkrc
+%{_datadir}/locale/*/LC_MESSAGES/*.mo
+
+
+%Changelog
+* Sun Nov 20 2011 Francois Andriot <francois.andriot@free.fr> - 0.8-1
+- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kde-style-lipstik/trinity-kde-style-lipstik-3.5.12.spec b/redhat/applications/kde-style-lipstik/trinity-kde-style-lipstik-3.5.12.spec
new file mode 100644
index 000000000..30f8e8a67
--- /dev/null
+++ b/redhat/applications/kde-style-lipstik/trinity-kde-style-lipstik-3.5.12.spec
@@ -0,0 +1,108 @@
+# Default version for this component
+%define kdecomp kde-style-lipstik
+%define version 2.2.3
+%define release 1
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%define _variant .opt
+%define _docdir %{_prefix}/share/doc
+%endif
+
+# TDE 3.5.13 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/kde3
+
+
+Name:		trinity-%{kdecomp}
+Summary:	Lipstik style for TDE
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/Utilities
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.trinitydesktop.org/
+
+Prefix:    %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.12.tar.gz
+
+BuildRequires:	tqtinterface-devel
+BuildRequires:	trinity-kdelibs-devel
+BuildRequires:	trinity-kdebase-devel
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+
+%description
+Based on the plastik style, Lipstik is a purified style with many options to
+tune your desktop look.
+
+Lipstik also provides Lipstik-color-schemes
+
+
+%prep
+%setup -q -n applications/%{kdecomp}
+
+# Ugly hack to modify TQT include directory inside autoconf files.
+# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
+sed -i admin/acinclude.m4.in \
+  -e "s,/usr/include/tqt,%{_includedir}/tqt,g"
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%configure \
+	--disable-rpath \
+    --with-extra-includes=%{_includedir}/tqt
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{tde_libdir}/kstyle_lipstik_config.la
+%{tde_libdir}/kstyle_lipstik_config.so
+%{tde_libdir}/plugins/styles/lipstik.la
+%{tde_libdir}/plugins/styles/lipstik.so
+%{_datadir}/apps/kdisplay/color-schemes/lipstiknoble.kcsrc
+%{_datadir}/apps/kdisplay/color-schemes/lipstikstandard.kcsrc
+%{_datadir}/apps/kdisplay/color-schemes/lipstikwhite.kcsrc
+%{_datadir}/apps/kstyle/themes/lipstik.themerc
+
+
+%Changelog
+* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 2.2.3-1
+- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kde-style-lipstik/trinity-kde-style-lipstik.spec b/redhat/applications/kde-style-lipstik/trinity-kde-style-lipstik-3.5.13.spec
index 6a6dcd028..6a6dcd028 100644
--- a/redhat/applications/kde-style-lipstik/trinity-kde-style-lipstik.spec
+++ b/redhat/applications/kde-style-lipstik/trinity-kde-style-lipstik-3.5.13.spec
diff --git a/redhat/applications/keep/trinity-keep.spec b/redhat/applications/keep/trinity-keep.spec
new file mode 100644
index 000000000..8b73ec156
--- /dev/null
+++ b/redhat/applications/keep/trinity-keep.spec
@@ -0,0 +1,110 @@
+# Default version for this component
+%define kdecomp keep
+%define version 0.4.0
+%define release 1
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%define _variant .opt
+%define _docdir %{_prefix}/share/doc
+%endif
+
+# TDE 3.5.13 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}/kde
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/trinity
+
+
+Name:		trinity-%{kdecomp}
+Summary:	backup system for KDE [Trinity]
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/Utilities
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.trinitydesktop.org/
+
+Prefix:    %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+
+BuildRequires:	tqtinterface-devel
+BuildRequires:	trinity-kdelibs-devel
+BuildRequires:	trinity-kdebase-devel
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+Requires: rdiff-backup
+
+%description
+Keep is an automatic backup program that allows users to set the parameters of
+the backup, including the frequency and the number of backups.
+
+Homepage: http://jr.falleri.free.fr/keep
+
+
+%prep
+%setup -q -n applications/%{kdecomp}
+
+# Ugly hack to modify TQT include directory inside autoconf files.
+# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
+sed -i admin/acinclude.m4.in \
+  -e "s,/usr/include/tqt,%{_includedir}/tqt,g"
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%configure \
+	--disable-rpath \
+    --with-extra-includes=%{_includedir}/tqt
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+%find_lang %{kdecomp}
+
+%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 -f %{kdecomp}.lang
+%defattr(-,root,root,-)
+%{_bindir}/keep
+%{tde_libdir}/kded_keep.la
+%{tde_libdir}/kded_keep.so
+%{_datadir}/applications/kde/keep.desktop
+%{_datadir}/icons/hicolor/scalable/apps/keep.svgz
+%{_datadir}/apps/keep
+%{_datadir}/config.kcfg/keepsettings.kcfg
+%{_datadir}/icons/hicolor/*/apps/keep.png
+%{_datadir}/services/kded/keep.desktop
+
+
+%Changelog
+* Thu Nov 24 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.0-1
+- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/koffice/chalk.xpm b/redhat/applications/koffice/chalk.xpm
new file mode 100644
index 000000000..0edc4f49a
--- /dev/null
+++ b/redhat/applications/koffice/chalk.xpm
@@ -0,0 +1,295 @@
+/* XPM */
+static char *chalk[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 257 2",
+"   c #000000",
+".  c #0C0C0C",
+"X  c #080604",
+"o  c #0E0F12",
+"O  c #110D01",
+"+  c #1A1200",
+"@  c #131314",
+"#  c #171719",
+"$  c #001D0B",
+"%  c #1A1C22",
+"&  c #00350A",
+"*  c #013716",
+"=  c #06221C",
+"-  c #242424",
+";  c #2D2D2C",
+":  c #3D3C3D",
+">  c #343434",
+",  c #282C33",
+"<  c #000F56",
+"1  c #00164F",
+"2  c #011554",
+"3  c #001263",
+"4  c #051E7B",
+"5  c #0A2C6A",
+"6  c #3B3D41",
+"7  c #005313",
+"8  c #085621",
+"9  c #1D5137",
+"0  c #016914",
+"q  c #0B6328",
+"w  c #126C3B",
+"e  c #23723C",
+"r  c #084755",
+"t  c #1B5952",
+"y  c #1F5475",
+"u  c #006044",
+"i  c #1B6F41",
+"p  c #2E5F48",
+"a  c #3D6270",
+"s  c #473504",
+"d  c #5C4B0B",
+"f  c #634F09",
+"g  c #4A4A4A",
+"h  c #424345",
+"j  c #5A5A5A",
+"k  c #5A5240",
+"l  c #496457",
+"z  c #5F636D",
+"x  c #605F5D",
+"c  c #6D765F",
+"v  c #636363",
+"b  c #656866",
+"n  c #666B73",
+"m  c #747573",
+"M  c #787778",
+"N  c #6C7572",
+"B  c #1A3890",
+"V  c #0739C1",
+"C  c #0030D2",
+"Z  c #1E5091",
+"A  c #13488F",
+"S  c #1243B4",
+"D  c #395787",
+"F  c #3B5498",
+"G  c #2554A9",
+"H  c #264CB8",
+"J  c #1B4BC1",
+"K  c #1650DB",
+"L  c #1960DE",
+"P  c #2254CF",
+"I  c #3766D9",
+"U  c #3A7AD6",
+"Y  c #2B67E2",
+"T  c #236EFE",
+"R  c #2C74FD",
+"E  c #2F78FD",
+"W  c #3269E2",
+"Q  c #386BFE",
+"!  c #337FFE",
+"~  c #3578FD",
+"^  c #2C7CE6",
+"/  c #4569AF",
+"(  c #646287",
+")  c #4D70CE",
+"_  c #4777E0",
+"`  c #4D7FFE",
+"'  c #038021",
+"]  c #128D2E",
+"[  c #0EA835",
+"{  c #3F9159",
+"}  c #2EB551",
+"|  c #22C24D",
+" . c #6E8422",
+".. c #428F5E",
+"X. c #5D8270",
+"o. c #53976B",
+"O. c #58AA6F",
+"+. c #618673",
+"@. c #139CFD",
+"#. c #0795FD",
+"$. c #16A2FD",
+"%. c #11B2F2",
+"&. c #2880DA",
+"*. c #378BF2",
+"=. c #27B4F4",
+"-. c #38A9F2",
+";. c #22ABFE",
+":. c #14C2FB",
+">. c #19C5FE",
+",. c #19C8FE",
+"<. c #17C8FE",
+"1. c #31C5F8",
+"2. c #559C95",
+"3. c #4C81B7",
+"4. c #798484",
+"5. c #7689B0",
+"6. c #4F8DFD",
+"7. c #5394ED",
+"8. c #5091EF",
+"9. c #43A0C6",
+"0. c #52AEE8",
+"q. c #749BE8",
+"w. c #739EFE",
+"e. c #6497F2",
+"r. c #62BDC9",
+"t. c #67A5FD",
+"y. c #7DAFFD",
+"u. c #5CCE82",
+"i. c #56CFF2",
+"p. c #70C4DA",
+"a. c #63DAFC",
+"s. c #66C9F5",
+"d. c #B8682F",
+"f. c #A78F18",
+"g. c #9F915C",
+"h. c #818279",
+"j. c #958E78",
+"k. c #969360",
+"l. c #9FA07B",
+"z. c #B69F47",
+"x. c #D1B928",
+"c. c #FEA509",
+"v. c #FEBE01",
+"b. c #FCB507",
+"n. c #FEAD22",
+"m. c #D7AF68",
+"M. c #DCC82C",
+"N. c #FEC100",
+"B. c #FECC00",
+"V. c #FDD201",
+"C. c #FDDA01",
+"Z. c #FEC614",
+"A. c #F7C825",
+"S. c #F9C63A",
+"D. c #FDDC2A",
+"F. c #F1D629",
+"G. c #F8D638",
+"H. c #E8CC39",
+"J. c #FDE502",
+"K. c #FDE717",
+"L. c #FDF911",
+"P. c #FAEA3F",
+"I. c #FDF933",
+"U. c #D3C254",
+"Y. c #DED16A",
+"T. c #E9D645",
+"R. c #FEC550",
+"E. c #F5D741",
+"W. c #EDD476",
+"Q. c #F7D375",
+"!. c #EDDB63",
+"~. c #FDEA58",
+"^. c #FBF644",
+"/. c #FDFE59",
+"(. c #F5EE49",
+"). c #FCE969",
+"_. c #FBE27C",
+"`. c #FDFE6B",
+"'. c #FDFE71",
+"]. c #92918F",
+"[. c #989A81",
+"{. c #9B9B9A",
+"}. c #949492",
+"|. c #898D8A",
+" X c #8F92A0",
+".X c #9AA3B7",
+"XX c #9BACAA",
+"oX c #A0A182",
+"OX c #B0A996",
+"+X c gray64",
+"@X c #A8ACA9",
+"#X c #AFB0AF",
+"$X c #B4B5B3",
+"%X c #BABABA",
+"&X c #B6B6B3",
+"*X c #ADA8AD",
+"=X c #8BA9E9",
+"-X c #92B3F0",
+";X c #A8BDEB",
+":X c #84D3A7",
+">X c #93CAD8",
+",X c #84C4D6",
+"<X c #8BD4F8",
+"1X c #90C9FD",
+"2X c #93EBFE",
+"3X c #B1C6D5",
+"4X c #AECCFE",
+"5X c #A8C5F8",
+"6X c #A9D6FB",
+"7X c #BACCF3",
+"8X c #B8D9F8",
+"9X c #BCCBEE",
+"0X c #ACE6FB",
+"qX c #D2BD83",
+"wX c #C4BDBA",
+"eX c #CFC497",
+"rX c #C7C3B9",
+"tX c #D1CABB",
+"yX c #ECD98D",
+"uX c #EECFA1",
+"iX c #EDDCA2",
+"pX c #FDF690",
+"aX c #FDFAA8",
+"sX c #FCFAB7",
+"dX c #F8E3A2",
+"fX c #C5C5C6",
+"gX c #D3D3D3",
+"hX c #D8D8D8",
+"jX c #D0D0CE",
+"kX c #C9D8F7",
+"lX c #D6D7E3",
+"zX c #D0DDFC",
+"xX c #C8E4FB",
+"cX c #DEE0E3",
+"vX c #DDFEFE",
+"bX c #D1EDFD",
+"nX c #E3DDD1",
+"mX c #E0DCE3",
+"MX c #E4E1DA",
+"NX c #F7ECCA",
+"BX c #FDFDCB",
+"VX c #FDFDC5",
+"CX c #FBF5DD",
+"ZX c #E1E2E1",
+"AX c #E6E7E8",
+"SX c #EEF0EE",
+"DX c #E9F3F8",
+"FX c #F4E9E4",
+"GX c #FBFBE8",
+"HX c #F4F4F2",
+"JX c #F6FAFB",
+"KX c #F8F5F0",
+"LX c #FCFAF4",
+"PX c #FDFDFD",
+"IX c #F1F7FE",
+"UX c #EBECF2",
+"YX c None",
+/* pixels */
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX  f O YXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXf F.+ YXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX+ F.d   YXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXf.M.X YXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXs I.d YXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXO x.G.k . YXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX  - j M z.(.Q.PXg YXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYX  # g M @XhXJXPXNX~.G.NXPX&X  YXYXYXYXYX",
+"YXYXYXYXYXYXYXYX  # h m %XSXPXPXPXPXPXJXW.~.U.<X8XPX- YXYXYXYXYX",
+"YXYXYX  . : x ].rXKXPXPXPXPXJXxX6X8X0XNX).T.3.T w.PXv YXYXYX    ",
+"YX> }.wXFXPXPXIXkX4X4X-Xy.e.6.~ 6.1XxXW.).k.Q Q ` JX$X  YX      ",
+"YXv PXxX1Xt.6.*.R E E T R R E t.<XbXdXQ.U.U E ! Y 7XLX@         ",
+"YX; PXs.#.@.$.$.$.$.$.$.@.$.%.$.;.<XyX).2.@.U G 4 F MX:     YXYX",
+"YX. FX2X%.>.<.%.%.<.<.<.>.>.,.1.,.9.OXg./ G B 4 3 < .X].  YXYXYX",
+"YX  &XvXa.i.p.>X>X,Xp.a.a.a.p.p.2. X+.t r 5 5 3 1 1 5.KX@ YXYXYX",
+"YXYXM PX3XcXKXLXKXrX{.XXr.u.| 0 e {.9 * 8 e q 8 7 * p PXg YXYXYX",
+"YXYXj SXmXJXLXHXZX$Xm l O.| [ 0 N n * t { ] 0 7 & $ = HX|.YXYXYX",
+"YXYX- lXSXLXJXZX$X|.v N O.[ 0 8 4.l o.{ i i u r y D / -XnX  YXYX",
+"YXYX. rXgXHXLXmX&XXX+XXXo.0 7  .c G Z A S V V _ zXzX) / PX; YXYX",
+"YXX h +X&XgXAXAXcXgX%X#X#XX.a d.y J P P J S H =XkXvXkX7.JXm YXYX",
+"  b jXAXlXcXhXjXtXrXrXgXlXlXOX( _ _ I I I Y *.<X6X2XxXL 5XrX  YX",
+"; gXPXFX!.G.G.E.H.S.G.T.yXKXJX.X_ 8.7.-.=.%.%.0.-X=XK C q.GX- YX",
+"g JXiXZ.B.V.B.N.v.N.N.C.B.A.nXjX0.i.-.-.*.^ Y I _ q.=XzXJXPXj YX",
+": SXA.v.V.C.K.D.D.D.K.J.C.B.yX3X0.e.e.q.=X3XkXDXPXLXMX@Xm h @ YX",
+"# gXpXD.K.^./.`.'.`./.I.K.`.sX.X=X9XUXJXPXKXMX&Xh.: o     YXYXYX",
+"  OXG.pXsXaXsXVXBXsXaXsXaX^.H.jXKXMX%X].v > @     YXYXYXYXYXYXYX",
+"YXn R.B.I.pXBXGXLXGXBX'.L.V.m.b : @       YXYXYXYXYXYXYXYXYXYXYX",
+"YX, uXc.b.D.).aXsXsX).A.c.n.j.  YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+"YX  {.Q.n.b.v.B.C.C.V.Z.S.yX: YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYX# }.qXU.T.(.^.(.T.Y.eXv   YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXX g m j.l.oX[.h.x #   YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYX    o @ @ @ X   YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX"
+};
diff --git a/redhat/applications/koffice/koffice-3.5.13-disable_graphicksmagick.patch b/redhat/applications/koffice/koffice-3.5.13-disable_graphicksmagick.patch
new file mode 100644
index 000000000..2ed8017e6
--- /dev/null
+++ b/redhat/applications/koffice/koffice-3.5.13-disable_graphicksmagick.patch
@@ -0,0 +1,20 @@
+--- koffice/configure.in.in.ORI	2011-11-23 14:10:51.406182478 -0500
++++ koffice/configure.in.in	2011-11-23 14:11:51.714475724 -0500
+@@ -20,7 +20,7 @@
+ 
+ if test -n "$GRAPHICS_MAGICK_CONFIG"; then
+  vers=`$GRAPHICS_MAGICK_CONFIG --version 2>/dev/null | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
+-  if test -n "$vers" && test "$vers" -ge 1001007;  then
++  if test -n "$vers" && test "$vers" -ge 1001007 && test "$vers" -lt 1002000;  then
+      LIBGMAGICK_LIBS="`$GRAPHICS_MAGICK_CONFIG --libs`"
+      LIBGMAGICK_LDFLAGS="`$GRAPHICS_MAGICK_CONFIG --ldflags`"
+      LIBGMAGICK_RPATH=
+@@ -36,7 +36,7 @@
+      AC_DEFINE(HAVE_GMAGICK,1, [GraphicsMagick is available])
+      have_graphicsmagick=yes
+   else
+-     AC_MSG_WARN([You need at least GraphicsMagick 1.1.7])
++     AC_MSG_WARN([You need at least GraphicsMagick 1.1.7, but less than 1.2.0])
+   fi
+ 
+ fi
diff --git a/redhat/applications/koffice/koffice-3.5.13-fix_poppler_detect.patch b/redhat/applications/koffice/koffice-3.5.13-fix_poppler_detect.patch
new file mode 100644
index 000000000..2675ddd01
--- /dev/null
+++ b/redhat/applications/koffice/koffice-3.5.13-fix_poppler_detect.patch
@@ -0,0 +1,10 @@
+--- koffice/filters/chalk/pdf/configure.in.in.ORI	2011-11-23 14:20:06.517677101 -0500
++++ koffice/filters/chalk/pdf/configure.in.in	2011-11-23 14:20:14.461584005 -0500
+@@ -1,5 +1,5 @@
+ # Compile the pdf import filter only if Poppler is available
+-# PKG_CHECK_MODULES(POPPLER, poppler-qt >= 0.5.1, have_poppler=yes, have_poppler=no)
+-have_poppler=yes
++PKG_CHECK_MODULES(POPPLER, poppler-qt >= 0.5.1, have_poppler=yes, have_poppler=no)
++#have_poppler=yes
+ 
+ AM_CONDITIONAL(include_PDF, test "x$have_poppler" = xyes) 
diff --git a/redhat/applications/koffice/koffice-3.5.13-kross_utilities_syntax.patch b/redhat/applications/koffice/koffice-3.5.13-kross_utilities_syntax.patch
new file mode 100644
index 000000000..db24095b3
--- /dev/null
+++ b/redhat/applications/koffice/koffice-3.5.13-kross_utilities_syntax.patch
@@ -0,0 +1,34 @@
+--- koffice/lib/kross/python/scripts/RestrictedPython/Utilities.py.ORI	2011-11-25 00:13:38.356036607 +0100
++++ koffice/lib/kross/python/scripts/RestrictedPython/Utilities.py	2011-11-25 00:14:16.794035577 +0100
+@@ -46,11 +46,11 @@
+     if l%2: return args[-1]
+ utility_builtins['test'] = test
+ 
+-def reorder(s, with=None, without=()):
+-    # s, with, and without are sequences treated as sets.
+-    # The result is subtract(intersect(s, with), without),
+-    # unless with is None, in which case it is subtract(s, without).
+-    if with is None: with=s
++def reorder(s, swith=None, swithout=()):
++    # s, swith, and swithout are sequences treated as sets.
++    # The result is subtract(intersect(s, swith), swithout),
++    # unless swith is None, in which case it is subtract(s, swithout).
++    if swith is None: swith=s
+     d={}
+     tt=type(())
+     for i in s:
+@@ -61,12 +61,12 @@
+     a=r.append
+     h=d.has_key
+ 
+-    for i in without:
++    for i in swithout:
+         if type(i) is tt and len(i)==2: k, v = i
+         else:                           k= v = i
+         if h(k): del d[k]
+ 
+-    for i in with:
++    for i in swith:
+         if type(i) is tt and len(i)==2: k, v = i
+         else:                           k= v = i
+         if h(k):
diff --git a/redhat/applications/koffice/koshell.png b/redhat/applications/koffice/koshell.png
new file mode 100644
index 000000000..c66ef99e8
--- /dev/null
+++ b/redhat/applications/koffice/koshell.png
diff --git a/redhat/applications/koffice/trinity-koffice.spec b/redhat/applications/koffice/trinity-koffice.spec
new file mode 100644
index 000000000..aa0fe2321
--- /dev/null
+++ b/redhat/applications/koffice/trinity-koffice.spec
@@ -0,0 +1,965 @@
+# Default version for this component
+%define kdecomp koffice
+%define version 1.6.3
+%define release 1
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%define _variant .opt
+%define _docdir %{_prefix}/share/doc
+%endif
+
+# TDE 3.5.13 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}/kde
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/trinity
+
+%if 0%{?fedora} > 0 || 0%{?rhel} >= 6
+%define with_kross 1
+%endif
+
+Name:		trinity-%{kdecomp}
+Summary:        An integrated office suite
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+Group:          Applications/Productivity
+License:        GPLv2+
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.trinitydesktop.org/
+
+Prefix:    %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+Source1:	chalk.xpm
+Source100:      koshell.png
+
+# [koffice] Disable GraphicksMagick version >= 1.2.0
+Patch0:		koffice-3.5.13-disable_graphicksmagick.patch
+# [filters/chalk/pdf] Fix poppler-qt detection
+Patch1:		koffice-3.5.13-fix_poppler_detect.patch
+# [lib/kross/python/scripts/RestrictedPython/Utilities.py] Syntax error
+Patch2:		koffice-3.5.13-kross_utilities_syntax.patch
+
+# BuildRequires: world-devel ;)
+BuildRequires:  trinity-kdelibs-devel
+BuildRequires:  trinity-kdegraphics-devel
+BuildRequires:  automake libtool
+BuildRequires:  freetype-devel
+BuildRequires:  fontconfig-devel
+BuildRequires:  libart_lgpl-devel
+BuildRequires:  libpng-devel
+BuildRequires:  libtiff-devel
+BuildRequires:  libjpeg-devel
+BuildRequires:  ImageMagick-devel
+BuildRequires:  bzip2-devel
+BuildRequires:  zlib-devel
+BuildRequires:  openssl-devel
+BuildRequires:  python-devel
+BuildRequires:  pcre-devel
+BuildRequires:  lcms-devel
+BuildRequires:  gettext-devel
+BuildRequires:  mysql-devel
+BuildRequires:  desktop-file-utils
+BuildRequires:  perl
+BuildRequires:  wv2-devel >= 0.4.0
+BuildRequires:  libpqxx2-devel
+BuildRequires:  doxygen
+BuildRequires:  aspell-devel
+BuildRequires:  libxslt-devel
+BuildRequires:  OpenEXR-devel
+BuildRequires:  libexif-devel
+BuildRequires:  libGL-devel libGLU-devel
+BuildRequires:  readline-devel
+BuildRequires:  ruby ruby-devel >= 1.8.2
+BuildRequires:  libpaper-devel
+BuildRequires:  libXi-devel
+BuildRequires:	libutempter-devel
+BuildRequires:	poppler-qt-devel >= 0.1.2
+
+# GraphicsMagick version >= 1.2.0 is not compatible with Koffice 1.6
+BuildRequires: GraphicsMagick-devel >= 1.1.0
+BuildRequires: GraphicsMagick-devel < 1.2.0
+
+# libwpd for FC15 and FC16 is too recent for Koffice ! (0.9.x)
+# So we built an alternate 0.8.x package !
+%if 0%{?fedora} >= 15
+BuildRequires: libwpd08-devel
+%else
+BuildRequires: libwpd-devel
+%endif
+
+
+%description
+KOffice is an integrated office suite.
+
+%package suite
+Summary:        An integrated office suite
+Group:          Applications/Productivity
+Obsoletes:      %{name} <= %{version}-%{release}
+Obsoletes:      %{name}-i18n < 4:%{version}
+Requires:       %{name}-core = %{version}-%{release} 
+Requires:       %{name}-kword = %{version}-%{release} 
+Requires:       %{name}-kspread = %{version}-%{release} 
+Requires:       %{name}-kpresenter = %{version}-%{release}
+Requires:       %{name}-kivio = %{version}-%{release}
+Requires:       %{name}-karbon = %{version}-%{release}
+Requires:       %{name}-kugar = %{version}-%{release}
+Requires:       %{name}-kexi = %{version}-%{release}
+Requires:       %{name}-kexi-driver-mysql = %{version}-%{release}
+Requires:       %{name}-kexi-driver-pgsql = %{version}-%{release}
+Requires:       %{name}-kchart = %{version}-%{release}
+Requires:       %{name}-kformula = %{version}-%{release}
+Requires:       %{name}-filters = %{version}-%{release}
+Requires:       %{name}-kplato = %{version}-%{release}
+Requires:       %{name}-chalk = %{version}-%{release}
+
+%description suite
+KOffice is an integrated office suite.
+
+%package core
+Summary:        Core support files for %{name} 
+Group:          Applications/Productivity
+Requires:       %{name}-libs = %{version}-%{release}
+Requires:       perl
+Conflicts:      koffice-i18n < %{version}
+%description core
+%{summary}.
+
+%package libs
+Summary:        Runtime libraries for %{name} 
+Group:          System Environment/Libraries
+Conflicts:      %{name} <= %{version}-%{release}
+Requires:       trinity-kdelibs
+License:        LGPLv2+
+%description libs
+%{summary}.
+
+%package devel
+Summary:        Development files for %{name} 
+Group:          Development/Libraries
+Requires:       %{name}-libs = %{version}-%{release}
+License:        LGPLv2+
+%description devel
+%{summary}.
+
+%package kword
+Summary:	A frame-based word processor capable of professional standard documents
+Group:          Applications/Productivity
+Requires:       %{name}-core = %{version}-%{release}
+%description kword
+%{summary}.
+
+%package kspread
+Summary:        A powerful spreadsheet application
+Group:          Applications/Productivity
+Requires:       %{name}-core = %{version}-%{release}
+%description kspread
+%{summary}.
+
+%package kpresenter
+Summary:        A full-featured presentation program
+Group:          Applications/Productivity
+Requires:       %{name}-core = %{version}-%{release}
+%description kpresenter
+%{summary}.
+
+%package kivio
+Summary:        A flowcharting application
+Group:          Applications/Productivity
+Requires:       %{name}-core = %{version}-%{release}
+Obsoletes:      kivio < %{version}-%{release}
+%description kivio
+%{summary}.
+
+%package karbon
+Summary:        A vector drawing application
+Group:          Applications/Productivity
+Requires:       %{name}-core = %{version}-%{release}
+%description karbon
+%{summary}.
+
+%package kugar
+Summary:        A tool for generating business quality reports
+Group:          Applications/Productivity
+Requires:       %{name}-core = %{version}-%{release}
+%description kugar
+%{summary}.
+
+%package kexi
+Summary:        An integrated environment for managing data
+Group:          Applications/Productivity
+Requires:       %{name}-core = %{version}-%{release}
+%description kexi
+%{summary}.
+For additional database drivers take a look at %{name}-kexi-driver-*
+
+%package kexi-driver-mysql
+Summary:        Mysql-driver for kexi
+Group:          Applications/Productivity
+Requires:       %{name}-kexi = %{version}-%{release}
+%description kexi-driver-mysql
+%{summary}.
+
+%package kexi-driver-pgsql
+Summary:        Postgresql driver for kexi
+Group:          Applications/Productivity
+Requires:       %{name}-kexi = %{version}-%{release}
+%description kexi-driver-pgsql
+%{summary}.
+
+%package kchart
+Summary:        An integrated graph and chart drawing tool
+Group:          Applications/Productivity
+Requires:       %{name}-core = %{version}-%{release}
+%description kchart
+%{summary}.
+
+%package kformula
+Summary:        A powerful formula editor
+Group:          Applications/Productivity
+Requires:       %{name}-core = %{version}-%{release}
+#if 0%{?fedora} > 9 
+Requires:       lyx-cmex10-fonts
+#else
+#Requires:       mathml-fonts
+#endif
+%if 0%{?fedora} > 10
+Requires:       dejavu-lgc-sans-fonts
+%else
+Requires:       dejavu-lgc-fonts 
+%endif
+%description kformula
+%{summary}.
+
+%package filters
+Summary:        Import and Export Filters for KOffice
+Group:          Applications/Productivity
+Requires:       %{name}-core = %{version}-%{release}
+%description filters
+%{summary}.
+
+%package kplato
+Summary:         An integrated project management and planning tool
+Group:           Applications/Productivity
+Requires:        %{name}-core = %{version}-%{release}
+%description kplato
+%{summary}.
+
+%package chalk
+Summary:		 pixel-based image manipulation program for the KDE Office Suite [Trinity]
+Group:           Applications/Productivity
+Requires:        %{name}-core = %{version}-%{release}
+Requires:        %{name}-chalk-data = %{version}-%{release}
+Requires:        %{name}-filters
+%description chalk
+Chalk is a painting and image editing application for KOffice. Chalk contains
+both ease-of-use and fun features like guided painting.
+
+This package is part of the KDE Office Suite.
+
+%package chalk-data
+Summary:		data files for Chalk painting program [Trinity]
+Group:           Applications/Productivity
+%description chalk-data
+This package contains architecture-independent data files for Chalk,
+the painting program shipped with the KDE Office Suite.
+
+See the chalk package for further information.
+
+This package is part of the KDE Office Suite.
+
+
+
+%prep
+%setup -q -n applications/%{kdecomp}
+%patch0 -p1
+#patch1 -p1
+%patch2 -p1
+
+# use LGC variant instead
+sed -i.dejavu-lgc \
+  -e 's|DejaVu Sans|DejaVu LGC Sans|' \
+  -e 's|dejavu sans|dejavu lgc sans|' \
+  lib/kformula/{contextstyle,fontstyle,symboltable}.cc 
+
+# 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}"
+
+%configure \
+  --disable-rpath --disable-dependency-tracking \
+  --enable-new-ldflags \
+  --disable-debug --disable-warnings \
+  --with-pic --enable-shared --disable-static \
+  --with-extra-libs=%{_libdir} \
+  --enable-final \
+  --with-extra-includes=%{_includedir}/tqt \
+  --enable-closure \
+  --disable-kexi-macros \
+%if 0%{?with_kross} > 0
+  --enable-scripting \
+%else
+  --disable-scripting \
+%endif
+
+%__make %{?_smp_mflags}
+
+
+%install
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+[ ! -f %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/koshell.png ] && \
+%__install -p -D -m644 %{SOURCE100} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/koshell.png
+
+# Replace absolute symlinks with relative ones
+pushd %{buildroot}%{_docdir}/HTML
+for lang in *; do
+  if [ -d $lang ]; then
+    pushd $lang
+    for i in */*; do
+      [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../../common $i/common
+    done
+    popd
+  fi
+done
+popd
+
+desktop-file-install \
+  --dir=%{buildroot}%{_datadir}/applications/kde \
+  --vendor="" \
+  --delete-original \
+  %{buildroot}%{_datadir}/applnk/Office/*.desktop
+
+## Hack-in NoDisplay=True (http://bugzilla.redhat.com/245061)
+## until http://bugzilla.redhat.com/245190 is fixed
+for desktop_file in %{buildroot}%{_datadir}/applnk/.hidden/*.desktop ; do
+  grep "^NoDisplay=" ${desktop_file} || \
+    echo "NoDisplay=True" >> ${desktop_file}
+done
+
+## unpackaged files
+# fonts
+rm -rfv %{buildroot}%{_datadir}/apps/kformula/fonts/
+# libtool archives
+rm -f %{buildroot}%{_libdir}/lib*.la
+# shouldn't these be in koffice-l10n? 
+rm -f %{buildroot}%{_datadir}/locale/pl/LC_MESSAGES/kexi_{add,delete}_column_gui_transl_pl.sh
+# -devel symlinks to nuke
+rm -f %{buildroot}%{_libdir}/lib*common.so
+rm -f %{buildroot}%{_libdir}/lib*filters.so
+rm -f %{buildroot}%{_libdir}/lib*private.so
+rm -f %{buildroot}%{_libdir}/libkarbon*.so
+rm -f %{buildroot}%{_libdir}/libkchart*.so
+rm -f %{buildroot}%{_libdir}/libkexi*.so
+rm -f %{buildroot}%{_libdir}/libkisexiv2.so
+rm -f %{buildroot}%{_libdir}/libkformdesigner.so
+rm -f %{buildroot}%{_libdir}/libkplato*.so
+rm -f %{buildroot}%{_libdir}/libkpresenter*.so
+rm -f %{buildroot}%{_libdir}/libkword*.so
+#rm -f %{buildroot}%{_libdir}/libkrita*.so
+rm -f %{buildroot}%{_libdir}/libkross*.so
+rm -f %{buildroot}%{_libdir}/libkugar*.so
+
+# Chalk icon
+%__install -D -m 644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/chalk.xpm
+
+%clean
+%__rm -rf %{buildroot}
+
+%post core
+touch --no-create %{_datadir}/icons/crystalsvg &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+touch --no-create %{_datadir}/icons/locolor &> /dev/null || :
+
+%postun core
+if [ $1 -eq 0 ]; then
+  gtk-update-icon-cache %{_datadir}/icons/crystalsvg &> /dev/null || :
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+  gtk-update-icon-cache %{_datadir}/icons/locolor &> /dev/null || :
+  update-desktop-database -q &> /dev/null ||:
+fi
+
+%posttrans core
+gtk-update-icon-cache %{_datadir}/icons/crystalsvg &> /dev/null || :
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_datadir}/icons/locolor &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
+
+%post kword -p /sbin/ldconfig
+
+%postun kword -p /sbin/ldconfig
+
+%posttrans kword
+update-desktop-database -q &> /dev/null ||:
+
+%post kpresenter -p /sbin/ldconfig
+
+%postun kpresenter -p /sbin/ldconfig
+
+%posttrans kpresenter
+update-desktop-database -q &> /dev/null ||:
+
+%post kugar -p /sbin/ldconfig
+
+%postun kugar -p /sbin/ldconfig
+
+%posttrans kugar
+update-desktop-database -q &> /dev/null ||:
+
+%post kexi -p /sbin/ldconfig
+
+%postun kexi -p /sbin/ldconfig
+
+%posttrans kexi
+update-desktop-database -q &> /dev/null ||:
+
+%post kchart -p /sbin/ldconfig
+
+%postun kchart -p /sbin/ldconfig
+
+%posttrans kchart
+update-desktop-database -q &> /dev/null ||:
+
+%post filters -p /sbin/ldconfig
+%postun filters -p /sbin/ldconfig 
+
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+
+%post chalk -p /sbin/ldconfig
+
+%postun chalk -p /sbin/ldconfig
+
+%posttrans chalk
+update-desktop-database -q &> /dev/null ||:
+
+%files suite
+#empty => virtual package
+
+%files core
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING README
+%{_bindir}/koshell
+%{_bindir}/kthesaurus
+%{_bindir}/koconverter
+%{_libdir}/libkdeinit_koshell.so
+%{_libdir}/libkdeinit_kthesaurus.so
+%{tde_libdir}/kfile_koffice.*
+%{tde_libdir}/kfile_ooo.*
+%{tde_libdir}/kfile_abiword.*
+%{tde_libdir}/kfile_gnumeric.*
+%{tde_libdir}/kodocinfopropspage.*
+%{tde_libdir}/kofficescan.*
+%{tde_libdir}/kofficethumbnail.*
+%{tde_libdir}/koshell.*
+%{tde_libdir}/kthesaurus.*
+%{tde_libdir}/kwmailmerge_classic.*
+%{tde_libdir}/kwmailmerge_kabc.*
+%{tde_libdir}/kwmailmerge_qtsqldb_power.*
+%{tde_libdir}/kwmailmerge_qtsqldb.*
+%{tde_libdir}/libkounavailpart.*
+%{tde_libdir}/libkprkword.*
+%{tde_libdir}/libthesaurustool.*
+%{tde_libdir}/clipartthumbnail.*
+%{_datadir}/apps/koffice/
+%{_datadir}/apps/konqueror/servicemenus/*
+%{_datadir}/apps/koshell/
+%{_datadir}/apps/thesaurus/
+%{_datadir}/config.kcfg/koshell.kcfg
+%{_datadir}/doc/HTML/en/koffice/
+%{_datadir}/doc/HTML/en/koshell/
+%{_datadir}/doc/HTML/en/thesaurus/
+%{_datadir}/icons/crystalsvg/*/*/*
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/icons/locolor/*/*/*
+%{_datadir}/services/clipartthumbnail.desktop
+%{_datadir}/services/kfile*.desktop
+%{_datadir}/services/kwmailmerge*.desktop
+%{_datadir}/services/kodocinfopropspage.desktop
+%{_datadir}/services/kofficethumbnail.desktop
+%{_datadir}/services/kounavail.desktop
+%{_datadir}/services/kprkword.desktop
+%{_datadir}/services/thesaurustool.desktop
+%{_datadir}/servicetypes/kochart.desktop
+%{_datadir}/servicetypes/kofficepart.desktop
+%{_datadir}/servicetypes/koplugin.desktop
+%{_datadir}/servicetypes/kwmailmerge.desktop
+%{_datadir}/servicetypes/widgetfactory.desktop
+%{_datadir}/applications/kde/*koffice.desktop
+%{_datadir}/applications/kde/*KThesaurus.desktop
+%{_datadir}/applications/kde/*koshell.desktop
+%{_datadir}/apps/kofficewidgets/
+%if 0%{?with_kross} > 0
+%{_datadir}/apps/kross/
+%{tde_libdir}/krosspython.*
+%{tde_libdir}/krossruby.*
+%endif
+
+%files libs
+%defattr(-,root,root,-)
+%doc COPYING.LIB
+#_libdir/libk*common.so.*
+%{_libdir}/libkarboncommon.so.*
+%{_libdir}/libkspreadcommon.so.*
+%{_libdir}/libkdchart.so.*
+%{_libdir}/libkochart.so.*
+%{_libdir}/libkofficecore.so.*
+%{_libdir}/libkofficeui.so.*
+%{_libdir}/libkotext.so.*
+%{_libdir}/libkowmf.so.*
+%{_libdir}/libkopainter.so.*
+%{_libdir}/libkstore.so.*
+%{_libdir}/libkwmailmerge_interface.so.*
+%{_libdir}/libkwmf.so.*
+%{_libdir}/libkformulalib.so.*
+%{_libdir}/libkopalette.so.*
+%{_libdir}/libkoproperty.so.*
+%if 0%{?with_kross} > 0
+%{_libdir}/libkrossapi.so.*
+%{_libdir}/libkrossmain.so.*
+%endif
+
+%files devel
+%defattr(-,root,root,-)
+%lang(en) %{_docdir}/HTML/en/koffice-apidocs/
+%{_includedir}/*
+# FIXME: include only shlib symlinks we know/want to export
+%{_libdir}/lib*.so
+%exclude %{_libdir}/libkdeinit_*.so
+%exclude %{_libdir}/libkudesignercore.so
+
+%files kword
+%defattr(-,root,root,-)
+%lang(en) %{_docdir}/HTML/en/kword/
+%{_bindir}/kword
+%{_libdir}/libkdeinit_kword.so
+%{_libdir}/libkwordprivate.so.*
+%{tde_libdir}/libkwordpart.*
+%{tde_libdir}/kword.*
+%{_datadir}/apps/kword/
+%{_datadir}/services/kword*.desktop
+%{_datadir}/services/kwserial*.desktop
+%{_datadir}/templates/TextDocument.desktop
+%{_datadir}/templates/.source/TextDocument.kwt
+%{_datadir}/applications/kde/*kword.desktop
+
+%files kspread
+%defattr(-,root,root,-)
+%lang(en) %{_docdir}/HTML/en/kspread/
+%{_bindir}/kspread
+%{_libdir}/libkdeinit_kspread.so
+%{tde_libdir}/kspread.*
+%{tde_libdir}/libkspreadpart.*
+%{tde_libdir}/kwmailmerge_kspread.*
+%{tde_libdir}/libcsvexport.*
+%{tde_libdir}/libcsvimport.*
+%{tde_libdir}/libgnumericexport.*
+%{tde_libdir}/libgnumericimport.*
+%{tde_libdir}/libkspreadhtmlexport.*
+%{tde_libdir}/libkspreadinsertcalendar.*
+%{tde_libdir}/libopencalcexport.*
+%{tde_libdir}/libopencalcimport.*
+%{tde_libdir}/libqproimport.*
+%{_datadir}/apps/kspread/
+%{_datadir}/services/kspread*.desktop
+%{_datadir}/templates/SpreadSheet.desktop
+%{_datadir}/templates/.source/SpreadSheet.kst
+%{_datadir}/applications/kde/*kspread.desktop
+%if 0%{?with_kross} > 0
+%{tde_libdir}/kspreadscripting.*
+%{tde_libdir}/krosskspreadcore.*
+%endif
+
+%files kpresenter
+%defattr(-,root,root,-)
+%lang(en) %{_docdir}/HTML/en/kpresenter/
+%{_bindir}/kpresenter
+%{_bindir}/kprconverter.pl
+%{_libdir}/libkdeinit_kpresenter.so
+%{_libdir}/libkpresenterimageexport.so.*
+%{_libdir}/libkpresenterprivate.so.*
+%{tde_libdir}/*kpresenter*.*
+%{_datadir}/apps/kpresenter/
+%{_datadir}/services/kpresenter*.desktop
+%{_datadir}/templates/Presentation.desktop
+%{_datadir}/templates/.source/Presentation.kpt
+%{_datadir}/applications/kde/*kpresenter.desktop
+
+%files karbon
+%defattr(-,root,root,-)
+%lang(en) %{_docdir}/HTML/en/karbon/
+%{_bindir}/karbon
+%{_libdir}/libkdeinit_karbon.so
+%{tde_libdir}/*karbon*.*
+%{tde_libdir}/libwmfexport.*
+%{tde_libdir}/libwmfimport.*
+%{_datadir}/apps/karbon/
+%{_datadir}/services/karbon*
+%{_datadir}/servicetypes/karbon_module.desktop
+%{_datadir}/templates/Illustration.desktop
+%{_datadir}/templates/.source/Illustration.karbon
+%{_datadir}/applications/kde/*karbon.desktop
+
+%files kugar
+%defattr(-,root,root,-)
+%lang(en) %{_docdir}/HTML/en/kugar/
+%{_bindir}/kugar
+%{_bindir}/kudesigner
+%{_libdir}/libkdeinit_kugar.so
+%{_libdir}/libkdeinit_kudesigner.so
+%{_libdir}/libkugarlib.so.*
+%{_libdir}/libkudesignercore.so
+%{tde_libdir}/kudesigner.*
+%{tde_libdir}/kugar.*
+%{tde_libdir}/libkudesignerpart.*
+%{tde_libdir}/libkugarpart.*
+%{_datadir}/apps/kudesigner/
+%{_datadir}/apps/kugar/
+%{_datadir}/services/kugar*.desktop
+%{_datadir}/applications/kde/*kugar.desktop
+%{_datadir}/applications/kde/*kudesigner.desktop
+
+%files kexi
+%defattr(-,root,root,-)
+%lang(en) %{_docdir}/HTML/en/kexi/
+%{_bindir}/kexi*
+%{_bindir}/ksqlite*
+%{_libdir}/libkdeinit_kexi.so
+%{_libdir}/libkexi*.so.*
+%{_libdir}/libkformdesigner.so.*
+%{tde_libdir}/kformdesigner_*.*
+%{tde_libdir}/kexidb_sqlite2driver.*
+%{tde_libdir}/kexidb_sqlite3driver.*
+%{tde_libdir}/kexihandler_*.*
+%{tde_libdir}/kexi.*
+# moved here to workaround bug #394101, alternative is to move libkexi(db|dbparser|utils) to -libs)
+%{tde_libdir}/libkspreadkexiimport.*
+%{_datadir}/config/kexirc
+%{_datadir}/config/magic/kexi.magic
+%{_datadir}/mimelnk/application/*
+%{_datadir}/servicetypes/kexi*.desktop
+%{_datadir}/services/kexi/
+%{_datadir}/apps/kexi/
+%{_datadir}/services/kformdesigner/*
+%{_datadir}/applications/kde/*kexi.desktop
+%{_datadir}/services/kexidb_sqlite*driver.desktop
+%if 0%{?with_kross} > 0
+%{_bindir}/krossrunner
+%{tde_libdir}/krosskexiapp.*
+%{tde_libdir}/krosskexidb.*
+%endif
+
+%files kexi-driver-mysql
+%defattr(-,root,root,-)
+%{tde_libdir}/kexidb_mysqldriver.*
+%{tde_libdir}/keximigrate_mysql.*
+%{_datadir}/services/keximigrate_mysql.desktop
+%{_datadir}/services/kexidb_mysqldriver.desktop
+
+%files kexi-driver-pgsql
+%defattr(-,root,root,-)
+%{tde_libdir}/kexidb_pqxxsqldriver.*
+%{tde_libdir}/keximigrate_pqxx.*
+%{_datadir}/services/kexidb_pqxxsqldriver.desktop
+%{_datadir}/services/keximigrate_pqxx.desktop
+
+%files kchart
+%defattr(-,root,root,-)
+%lang(en) %{_docdir}/HTML/en/kchart/
+%{_bindir}/kchart
+%{_libdir}/libkchart*.so.*
+%{_libdir}/libkdeinit_kchart.so
+%{tde_libdir}/*kchart*.*
+%{_datadir}/apps/kchart/
+%{_datadir}/services/kchart*.desktop
+%{_datadir}/applications/kde/*kchart.desktop
+
+%files kformula
+%defattr(-,root,root,-)
+%lang(en) %{_docdir}/HTML/en/kformula/
+%{_bindir}/kformula
+%{_libdir}/libkdeinit_kformula.so
+%{tde_libdir}/*kformula*.*
+%{_datadir}/apps/kformula/
+%{_datadir}/services/kformula*.desktop
+%{_datadir}/applications/kde/*kformula.desktop
+
+%files kivio
+%defattr(-,root,root,-)
+%lang(en) %{_docdir}/HTML/en/kivio/
+%{_bindir}/kivio
+%{_libdir}/libkdeinit_kivio.so
+%{_libdir}/libkiviocommon.so.*
+%{tde_libdir}/*kivio*.*
+%{tde_libdir}/straight_connector.*
+%{_datadir}/apps/kivio/
+%{_datadir}/config.kcfg/kivio.kcfg
+%{_datadir}/services/kivio*.desktop
+%{_datadir}/applications/kde/*kivio.desktop
+
+%files filters
+%defattr(-,root,root,-)
+%{_libdir}/libkwordexportfilters.so.*
+%{tde_libdir}/libabiwordexport.*
+%{tde_libdir}/libabiwordimport.*
+%{tde_libdir}/libamiproexport.*
+%{tde_libdir}/libamiproimport.*
+%{tde_libdir}/libapplixspreadimport.*
+%{tde_libdir}/libapplixwordimport.*
+%{tde_libdir}/libasciiexport.*
+%{tde_libdir}/libasciiimport.*
+%{tde_libdir}/libdbaseimport.*
+%{tde_libdir}/libdocbookexport.*
+%{tde_libdir}/libexcelimport.*
+%{tde_libdir}/libgenerickofilter.*
+%{tde_libdir}/libhtmlexport.*
+%{tde_libdir}/libhtmlimport.*
+%{tde_libdir}/libkarbonepsimport.*
+%{tde_libdir}/libkfolatexexport.*
+%{tde_libdir}/libkfomathmlexport.*
+%{tde_libdir}/libkfomathmlimport.*
+%{tde_libdir}/libkfopngexport.*
+%{tde_libdir}/libkspreadlatexexport.*
+%{tde_libdir}/libkugarnopimport.*
+%{tde_libdir}/libkwordkword1dot3import.*
+%{tde_libdir}/libkwordlatexexport.*
+%{tde_libdir}/libmswriteexport.*
+%{tde_libdir}/libmswriteimport.*
+%{tde_libdir}/libooimpressexport.*
+%{tde_libdir}/libooimpressimport.*
+%{tde_libdir}/liboowriterexport.*
+%{tde_libdir}/liboowriterimport.*
+%{tde_libdir}/libpalmdocexport.*
+%{tde_libdir}/libpalmdocimport.*
+%{tde_libdir}/libpdfimport.*
+%{tde_libdir}/librtfexport.*
+%{tde_libdir}/librtfimport.*
+%{tde_libdir}/libwmlexport.*
+%{tde_libdir}/libwmlimport.*
+%{tde_libdir}/libwpexport.*
+%{tde_libdir}/libwpimport.*
+%{tde_libdir}/libmswordimport.*
+%{tde_libdir}/libxsltimport.*
+%{tde_libdir}/libxsltexport.*
+%{tde_libdir}/libhancomwordimport.*
+%{tde_libdir}/libkfosvgexport.*
+%{tde_libdir}/liboodrawimport.*
+%{tde_libdir}/libolefilter.*
+%{_datadir}/apps/xsltfilter/
+%{_datadir}/services/generic_filter.desktop
+%{_datadir}/services/ole_powerpoint97_import.desktop
+%{_datadir}/services/xslt*.desktop
+%{_datadir}/servicetypes/kofilter*.desktop
+
+%files kplato
+%defattr(-,root,root,-)
+%lang(en) %{_docdir}/HTML/en/kplato/
+%{_bindir}/kplato
+%{_libdir}/libkdeinit_kplato.so
+%{tde_libdir}/kplato.*
+%{tde_libdir}/libkplatopart.*
+%{_datadir}/apps/kplato/
+%{_datadir}/services/kplatopart.desktop
+%{_datadir}/applications/kde/*kplato.desktop
+
+%files chalk
+%defattr(-,root,root,-)
+%{_bindir}/chalk
+%{tde_libdir}/chalkblurfilter.la
+%{tde_libdir}/chalkblurfilter.so
+%{tde_libdir}/chalkbumpmap.la
+%{tde_libdir}/chalkbumpmap.so
+%{tde_libdir}/chalkcimg.la
+%{tde_libdir}/chalkcimg.so
+%{tde_libdir}/chalk_cmyk_*
+%{tde_libdir}/chalkcmykplugin.la
+%{tde_libdir}/chalkcmykplugin.so
+%{tde_libdir}/chalkcolorify.la
+%{tde_libdir}/chalkcolorify.so
+%{tde_libdir}/chalkcolorrange.la
+%{tde_libdir}/chalkcolorrange.so
+%{tde_libdir}/chalkcolorsfilters.la
+%{tde_libdir}/chalkcolorsfilters.so
+%{tde_libdir}/chalkcolorspaceconversion.la
+%{tde_libdir}/chalkcolorspaceconversion.so
+%{tde_libdir}/chalkconvolutionfilters.la
+%{tde_libdir}/chalkconvolutionfilters.so
+%{tde_libdir}/chalkdefaultpaintops.la
+%{tde_libdir}/chalkdefaultpaintops.so
+%{tde_libdir}/chalkdefaulttools.la
+%{tde_libdir}/chalkdefaulttools.so
+%{tde_libdir}/chalkdropshadow.la
+%{tde_libdir}/chalkdropshadow.so
+%{tde_libdir}/chalkembossfilter.la
+%{tde_libdir}/chalkembossfilter.so
+%{tde_libdir}/chalkexample.la
+%{tde_libdir}/chalkexample.so
+%{tde_libdir}/chalkextensioncolorsfilters.la
+%{tde_libdir}/chalkextensioncolorsfilters.so
+%{tde_libdir}/chalkfastcolortransfer.la
+%{tde_libdir}/chalkfastcolortransfer.so
+%{tde_libdir}/chalkfiltersgallery.la
+%{tde_libdir}/chalkfiltersgallery.so
+%{tde_libdir}/chalk_gray_*
+%{tde_libdir}/chalkgrayplugin.la
+%{tde_libdir}/chalkgrayplugin.so
+%{tde_libdir}/chalkhistogramdocker.la
+%{tde_libdir}/chalkhistogramdocker.so
+%{tde_libdir}/chalkhistogram.la
+%{tde_libdir}/chalkhistogram.so
+%{tde_libdir}/chalkimageenhancement.la
+%{tde_libdir}/chalkimageenhancement.so
+%{tde_libdir}/chalkimagesize.la
+%{tde_libdir}/chalkimagesize.so
+%{tde_libdir}/chalk.la
+%{tde_libdir}/chalklenscorrectionfilter.la
+%{tde_libdir}/chalklenscorrectionfilter.so
+%{tde_libdir}/chalklevelfilter.la
+%{tde_libdir}/chalklevelfilter.so
+%{tde_libdir}/chalk_lms_*
+%{tde_libdir}/chalkmodifyselection.la
+%{tde_libdir}/chalkmodifyselection.so
+%{tde_libdir}/chalknoisefilter.la
+%{tde_libdir}/chalknoisefilter.so
+%{tde_libdir}/chalkoilpaintfilter.la
+%{tde_libdir}/chalkoilpaintfilter.so
+%{tde_libdir}/chalkpixelizefilter.la
+%{tde_libdir}/chalkpixelizefilter.so
+%{tde_libdir}/chalkraindropsfilter.la
+%{tde_libdir}/chalkraindropsfilter.so
+%{tde_libdir}/chalkrandompickfilter.la
+%{tde_libdir}/chalkrandompickfilter.so
+%{tde_libdir}/chalk_rgb_*
+%{tde_libdir}/chalkrgbplugin.la
+%{tde_libdir}/chalkrgbplugin.so
+%{tde_libdir}/chalkrotateimage.la
+%{tde_libdir}/chalkrotateimage.so
+%{tde_libdir}/chalkroundcornersfilter.la
+%{tde_libdir}/chalkroundcornersfilter.so
+%{tde_libdir}/chalkselectiontools.la
+%{tde_libdir}/chalkselectiontools.so
+%{tde_libdir}/chalkselectopaque.la
+%{tde_libdir}/chalkselectopaque.so
+%{tde_libdir}/chalkseparatechannels.la
+%{tde_libdir}/chalkseparatechannels.so
+%{tde_libdir}/chalkshearimage.la
+%{tde_libdir}/chalkshearimage.so
+%{tde_libdir}/chalksmalltilesfilter.la
+%{tde_libdir}/chalksmalltilesfilter.so
+%{tde_libdir}/chalk.so
+%{tde_libdir}/chalkscreenshot.la
+%{tde_libdir}/chalkscreenshot.so
+%{tde_libdir}/chalksobelfilter.la
+%{tde_libdir}/chalksobelfilter.so
+%{tde_libdir}/chalksubstrate.la
+%{tde_libdir}/chalksubstrate.so
+%{tde_libdir}/chalktoolcrop.la
+%{tde_libdir}/chalktoolcrop.so
+%{tde_libdir}/chalktoolcurves.la
+%{tde_libdir}/chalktoolcurves.so
+%{tde_libdir}/chalktoolfilter.la
+%{tde_libdir}/chalktoolfilter.so
+%{tde_libdir}/chalktoolperspectivegrid.la
+%{tde_libdir}/chalktoolperspectivegrid.so
+%{tde_libdir}/chalktoolperspectivetransform.la
+%{tde_libdir}/chalktoolperspectivetransform.so
+%{tde_libdir}/chalktoolpolygon.la
+%{tde_libdir}/chalktoolpolygon.so
+%{tde_libdir}/chalktoolpolyline.la
+%{tde_libdir}/chalktoolpolyline.so
+%{tde_libdir}/chalktoolselectsimilar.la
+%{tde_libdir}/chalktoolselectsimilar.so
+%{tde_libdir}/chalktoolstar.la
+%{tde_libdir}/chalktoolstar.so
+%{tde_libdir}/chalktooltransform.la
+%{tde_libdir}/chalktooltransform.so
+%{tde_libdir}/chalkunsharpfilter.la
+%{tde_libdir}/chalkunsharpfilter.so
+%{tde_libdir}/chalkwavefilter.la
+%{tde_libdir}/chalkwavefilter.so
+%{tde_libdir}/chalkwetplugin.la
+%{tde_libdir}/chalkwetplugin.so
+%{tde_libdir}/chalk_ycbcr_*
+%{tde_libdir}/libchalkgmagickexport.la
+%{tde_libdir}/libchalkgmagickexport.so
+%{tde_libdir}/libchalkgmagickimport.la
+%{tde_libdir}/libchalkgmagickimport.so
+%{tde_libdir}/libchalkjpegexport.la
+%{tde_libdir}/libchalkjpegexport.so
+%{tde_libdir}/libchalkjpegimport.la
+%{tde_libdir}/libchalkjpegimport.so
+%{tde_libdir}/libchalk_openexr_export.la
+%{tde_libdir}/libchalk_openexr_export.so
+%{tde_libdir}/libchalk_openexr_import.la
+%{tde_libdir}/libchalk_openexr_import.so
+%{tde_libdir}/libchalkpart.la
+%{tde_libdir}/libchalkpart.so
+%{tde_libdir}/libchalkpdfimport.la
+%{tde_libdir}/libchalkpdfimport.so
+%{tde_libdir}/libchalkpngexport.la
+%{tde_libdir}/libchalkpngexport.so
+%{tde_libdir}/libchalkpngimport.la
+%{tde_libdir}/libchalkpngimport.so
+%{tde_libdir}/libchalk_raw_import.la
+%{tde_libdir}/libchalk_raw_import.so
+%{tde_libdir}/libchalktiffexport.la
+%{tde_libdir}/libchalktiffexport.so
+%{tde_libdir}/libchalktiffimport.la
+%{tde_libdir}/libchalktiffimport.so
+%{_libdir}/libkdeinit_chalk.so
+%{_libdir}/libchalk_cmyk_*.so.*
+%{_libdir}/libchalkcolor.so.*
+%{_libdir}/libchalkcommon.so.*
+%{_libdir}/libchalkgrayscale.so.*
+%{_libdir}/libchalk_gray_*.so.*
+%{_libdir}/libchalkimage.so.*
+%{_libdir}/libchalk_lms_*.so.*
+%{_libdir}/libchalk_rgb_*.so.*
+%{_libdir}/libchalkrgb.so.*
+%{_libdir}/libchalkui.so.*
+%{_libdir}/libchalk_ycbcr_*.so.*
+%if 0%{?with_kross} > 0
+%{tde_libdir}/krosschalkcore.la
+%{tde_libdir}/krosschalkcore.so
+%{tde_libdir}/chalkscripting.la
+%{tde_libdir}/chalkscripting.so
+%{_libdir}/libchalkscripting.so.*
+%endif
+
+%files chalk-data
+%{_datadir}/pixmaps/chalk.xpm
+%{_datadir}/applications/kde/chalk.desktop
+%{_datadir}/applnk/.hidden/chalk_*.desktop
+%{_datadir}/apps/konqueror/servicemenus/chalk_konqi.desktop
+%{_datadir}/apps/chalk
+%{_datadir}/apps/chalkplugins
+#%{tde_docdir}/HTML/en/chalk
+%lang(en) %{_docdir}/HTML/en/chalk
+%{_datadir}/icons/hicolor/*/apps/chalk.png
+%{_datadir}/services/chalk*.desktop
+%{_datadir}/servicetypes/chalk*.desktop
+#%{_datadir}/applnk/.hidden/chalk_pdf.desktop
+
+
+%changelog
+* Tue Nov 22 2011 Francois Andriot <francois.andriot@free.fr> - 1.6.3-1
+- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Based on Spec file from Fedora 11 'koffice-2:1.6.3-25.20090306svn'
+- Removed 'krita', added 'chalk'
diff --git a/redhat/applications/ksquirrel/trinity-ksquirrel.spec b/redhat/applications/ksquirrel/trinity-ksquirrel.spec
new file mode 100644
index 000000000..d837fc52e
--- /dev/null
+++ b/redhat/applications/ksquirrel/trinity-ksquirrel.spec
@@ -0,0 +1,124 @@
+# Default version for this component
+%define kdecomp ksquirrel
+%define version 0.8.0
+%define release 1
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%define _variant .opt
+%define _docdir %{_prefix}/share/doc
+%endif
+
+# TDE 3.5.13 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}/kde
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/trinity
+
+
+Name:		trinity-%{kdecomp}
+Summary:	Powerful Trinity image viewer
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Amusements/Games
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.trinitydesktop.org/
+
+Prefix:    %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+
+BuildRequires:	tqtinterface-devel
+BuildRequires:	trinity-kdelibs-devel
+BuildRequires:	trinity-kdebase-devel
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+BuildRequires:	trinity-libkipi-devel
+BuildRequires:	trinity-libksquirrel-devel
+#BuildRequires:	libkexif-devel
+
+%description
+KSquirrel is an image viewer for KDE with disk navigator, file tree,
+multiple directory view, thumbnails, extended thumbnails, dynamic
+format support, DCOP interface, KEXIF and KIPI plugins support.
+
+KSquirrel is a fast and convenient image viewer for KDE featuring
+OpenGL and dynamic format support.
+
+
+%prep
+%setup -q -n applications/%{kdecomp}
+
+# Ugly hack to modify TQT include directory inside autoconf files.
+# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
+sed -i admin/acinclude.m4.in \
+  -e "s,/usr/include/tqt,%{_includedir}/tqt,g"
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%configure \
+	--disable-rpath \
+    --with-extra-includes=%{_includedir}/tqt
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+%find_lang %{kdecomp}
+
+%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 -f %{kdecomp}
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING LICENSE LICENSE.GFDL LICENSE.LGPL README TODO
+%{_bindir}/ksquirrel
+%{_bindir}/ksquirrel-libs-configurator
+%{_bindir}/ksquirrel-libs-configurator-real
+%{tde_libdir}/libksquirrelpart.la
+%{tde_libdir}/libksquirrelpart.so
+%{_datadir}/applications/kde/ksquirrel.desktop
+%{_datadir}/apps/dolphin/servicemenus/dolphksquirrel-dir.desktop
+%{_datadir}/apps/konqueror/servicemenus/konqksquirrel-dir.desktop
+%{_datadir}/apps/ksquirrel/
+%{_datadir}/apps/ksquirrelpart/ksquirrelpart.rc
+%{_datadir}/config/magic/x-ras.magic
+%{_datadir}/config/magic/x-sun.magic
+%{_datadir}/config/magic/x-utah.magic
+%{_docdir}/HTML/*/ksquirrel
+%{_datadir}/icons/hicolor/*/apps/ksquirrel.png
+%{_datadir}/mimelnk/image/*.desktop
+%{_datadir}/services/ksquirrelpart.desktop
+%{_datadir}/locale/*/LC_MESSAGES/ksquirrel.mo
+%{_mandir}/man1/ksquirrel.1.gz
+
+%Changelog
+* Sun Nov 20 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.0-1
+- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/ktechlab/ktechlab-3.5.13-duplicate_icons.patch b/redhat/applications/ktechlab/ktechlab-3.5.13-duplicate_icons.patch
new file mode 100644
index 000000000..c989e6666
--- /dev/null
+++ b/redhat/applications/ktechlab/ktechlab-3.5.13-duplicate_icons.patch
@@ -0,0 +1,13 @@
+--- ktechlab/icons/pics/Makefile.am.ORI	2011-11-25 23:54:18.306754485 +0100
++++ ktechlab/icons/pics/Makefile.am	2011-11-25 23:54:32.547754077 +0100
+@@ -7,8 +7,8 @@
+ 		spdt.png spst.png keypad.png opamp.png xnor.png circuit.png flowcode.png \
+ 		delay.png interrupt.png pinread.png pinwrite.png portread.png portwrite.png \
+ 		repeat.png while.png for.png assignment.png branch.png delay.png embed.png end.png \
+-		for.png interrupt.png pinread.png pinwrite.png portread.png portwrite.png \
+-		repeat.png start.png sub.png subcall.png unary.png while.png item.png ic1.png \
++		interrupt.png pinread.png pinwrite.png portread.png portwrite.png \
++		repeat.png start.png sub.png subcall.png unary.png item.png ic1.png \
+ 		ic2.png ic3.png voltagesignal.png currentsignal.png clockinput.png cccs.png \
+ 		ccvs.png vcvs.png vccs.png mechanics.png buffer.png external_connection.png \
+ 		logicprobe.png potentiometer.png resistordip.png bidirled.png project_library.png \
diff --git a/redhat/applications/ktechlab/trinity-ktechlab.spec b/redhat/applications/ktechlab/trinity-ktechlab.spec
new file mode 100644
index 000000000..b93b6d73a
--- /dev/null
+++ b/redhat/applications/ktechlab/trinity-ktechlab.spec
@@ -0,0 +1,115 @@
+# Default version for this component
+%define kdecomp ktechlab
+%define version 0.3
+%define release 1
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%define _variant .opt
+%define _docdir %{_prefix}/share/doc
+%endif
+
+# TDE 3.5.13 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}/kde
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/trinity
+
+
+Name:		trinity-%{kdecomp}
+Summary:	circuit simulator for microcontrollers and electronics [Trinity]
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/Utilities
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.trinitydesktop.org/
+
+Prefix:    %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+Patch0:		ktechlab-3.5.13-duplicate_icons.patch
+
+BuildRequires:	tqtinterface-devel
+BuildRequires:	trinity-kdelibs-devel
+BuildRequires:	trinity-kdebase-devel
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+
+%description
+KTechlab is a circuit simulator with a nice, clickable and discoverable
+interface. It supports many discrete components, logic circuits as well
+as PIC programming in its own Basic dialect and some form of assembler. 
+
+Homepage: http://ktechlab.org/
+
+
+%prep
+%setup -q -n applications/%{kdecomp}
+%patch0 -p1
+
+# Ugly hack to modify TQT include directory inside autoconf files.
+# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
+sed -i admin/acinclude.m4.in \
+  -e "s,/usr/include/tqt,%{_includedir}/tqt,g"
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%configure \
+	--disable-rpath \
+    --with-extra-includes=%{_includedir}/tqt
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+%find_lang %{kdecomp}
+
+%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 -f %{kdecomp}.lang
+%defattr(-,root,root,-)
+%{_bindir}/ktechlab
+%{_bindir}/microbe
+%{_datadir}/applnk/Development/ktechlab.desktop
+%{_datadir}/apps/katepart/syntax/microbe.xml
+%{_datadir}/apps/ktechlab
+%{_datadir}/config.kcfg/ktechlab.kcfg
+%{_docdir}/HTML/en/ktechlab/
+%{_datadir}/icons/hicolor/*/*/*.png
+%{_datadir}/mimelnk/application/x-circuit.desktop
+%{_datadir}/mimelnk/application/x-flowcode.desktop
+%{_datadir}/mimelnk/application/x-ktechlab.desktop
+%{_datadir}/mimelnk/application/x-microbe.desktop
+
+
+%Changelog
+* Thu Nov 24 2011 Francois Andriot <francois.andriot@free.fr> - 0.3-1
+- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kwin-style-crystal/trinity-kwin-style-crystal-3.5.12.spec b/redhat/applications/kwin-style-crystal/trinity-kwin-style-crystal-3.5.12.spec
new file mode 100644
index 000000000..feb901d13
--- /dev/null
+++ b/redhat/applications/kwin-style-crystal/trinity-kwin-style-crystal-3.5.12.spec
@@ -0,0 +1,109 @@
+# Default version for this component
+%define kdecomp kwin-style-crystal
+%define version 1.0.5
+%define release 1
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%define _variant .opt
+%define _docdir %{_prefix}/share/doc
+%endif
+
+# TDE 3.5.13 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:	Semi transparant window decoration for Trinity.
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/Utilities
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.trinitydesktop.org/
+
+Prefix:    %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+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
+Crystal offers you pseudo transparent titlebar, buttons and borders
+transparent, so you can see more of your lovely background image
+Transparancy and buttons can be costumized to match your wishes.
+Offers rounded corners as well
+
+And it is of course nice to look at. Upstream says:
+"- Don't forget to breathe, while drooling."
+
+
+%prep
+%setup -q -n applications/%{kdecomp}
+
+# Ugly hack to modify TQT include directory inside autoconf files.
+# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
+sed -i admin/acinclude.m4.in \
+  -e "s,/usr/include/tqt,%{_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}"
+
+%configure \
+	--disable-rpath \
+    --with-extra-includes=%{_includedir}/tqt
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{tde_libdir}/kwin3_crystal.la
+%{tde_libdir}/kwin3_crystal.so
+%{tde_libdir}/kwin_crystal_config.la
+%{tde_libdir}/kwin_crystal_config.so
+%{_datadir}/apps/kwin/crystal.desktop
+
+
+%Changelog
+* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 1.0.5-1
+- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kwin-style-crystal/trinity-kwin-style-crystal.spec b/redhat/applications/kwin-style-crystal/trinity-kwin-style-crystal-3.5.13.spec
index 23cb1da54..c5eb4da3b 100644
--- a/redhat/applications/kwin-style-crystal/trinity-kwin-style-crystal.spec
+++ b/redhat/applications/kwin-style-crystal/trinity-kwin-style-crystal-3.5.13.spec
@@ -64,6 +64,7 @@ sed -i admin/acinclude.m4.in \
 
 
 %build
+unset QTDIR; . /etc/profile.d/qt.sh
 export PATH="%{_bindir}:${PATH}"
 export LDFLAGS="-L%{_libdir} -I%{_includedir}"
 
diff --git a/redhat/applications/piklab/trinity-piklab.spec b/redhat/applications/piklab/trinity-piklab.spec
new file mode 100644
index 000000000..3ee2a54eb
--- /dev/null
+++ b/redhat/applications/piklab/trinity-piklab.spec
@@ -0,0 +1,124 @@
+# Default version for this component
+%define kdecomp piklab
+%define version 0.15.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.13 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}/kde
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/trinity
+
+
+Name:		trinity-%{kdecomp}
+Summary:	IDE for PIC-microcontroller development [Trinity]
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/Utilities
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.trinitydesktop.org/
+
+Prefix:    %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+
+BuildRequires:	tqtinterface-devel
+BuildRequires:	trinity-kdelibs-devel
+BuildRequires:	trinity-kdebase-devel
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+BuildRequires:	readline-devel
+
+%description
+Piklab is an integrated development environment for applications based on
+Microchip PIC and dsPIC microcontrollers similar to the MPLAB environment.
+
+Support for several compiler and assembler toolchains is integrated. The
+GPSim simulator, the ICD1 programmer, the ICD2 debugger, the PICkit1 and
+PICkit2 programmers, the PicStart+ programmer, and most direct programmers
+are supported. A command-line programmer and debugger are also available.
+
+
+%prep
+%setup -q -n applications/%{kdecomp}
+
+# Ugly hack to modify TQT include directory inside autoconf files.
+# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
+sed -i admin/acinclude.m4.in \
+  -e "s,/usr/include/tqt,%{_includedir}/tqt,g"
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%configure \
+	--disable-rpath \
+    --with-extra-includes=%{_includedir}/tqt
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+# Incorrect extension on manpage
+%__mv -f %{buildroot}%{_mandir}/man1/piklab.1x %{buildroot}%{_mandir}/man1/piklab.1
+
+%find_lang %{kdecomp}
+
+%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 -f %{kdecomp}.lang
+%defattr(-,root,root,-)
+%{_bindir}/piklab
+%{_bindir}/piklab-coff
+%{_bindir}/piklab-hex
+%{_bindir}/piklab-prog
+%{_datadir}/applications/kde/piklab.desktop
+%{_datadir}/apps/katepart/syntax/asm-pic.xml
+%{_datadir}/apps/katepart/syntax/coff-c-pic.xml
+%{_datadir}/apps/katepart/syntax/coff-pic.xml
+%{_datadir}/apps/katepart/syntax/jal-pic.xml
+%{_datadir}/apps/piklab
+%{_docdir}/HTML/en/piklab
+%{_datadir}/icons/hicolor/*/*/*.png
+%{_datadir}/mimelnk/application/x-piklab.desktop
+%{_mandir}/man1/piklab-coff.1.gz
+%{_mandir}/man1/piklab-hex.1.gz
+%{_mandir}/man1/piklab-prog.1.gz
+%{_mandir}/man1/piklab.1.gz
+
+
+%Changelog
+* Thu Nov 24 2011 Francois Andriot <francois.andriot@free.fr> - 0.15.2-1
+- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tellico/tellico.xpm b/redhat/applications/tellico/tellico.xpm
new file mode 100644
index 000000000..589d66eeb
--- /dev/null
+++ b/redhat/applications/tellico/tellico.xpm
@@ -0,0 +1,62 @@
+/* XPM */
+static char *tellico[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 24 1",
+"  c #000404",
+". c #062625",
+"X c #01354A",
+"o c #165536",
+"O c #1C6056",
+"+ c #5E0507",
+"@ c #52545F",
+"# c #1E5F9D",
+"$ c #2B7ACF",
+"% c #57B35E",
+"& c #288FF2",
+"* c #3486D1",
+"= c #67ADB3",
+"- c #A12223",
+"; c #FD7070",
+": c #E35555",
+"> c #B84A4A",
+", c #90F592",
+"< c #FA8B8C",
+"1 c #DC9F9F",
+"2 c #FEFEFE",
+"3 c #D6D8D4",
+"4 c #ABB5B7",
+"5 c None",
+/* pixels */
+"55555555555555555555555555555555",
+"55555555555555555++5555555555555",
+"55555555555555+++:>+++5555555555",
+"55555555555+++><<;;<<>+++5555555",
+"55555555+++><<<<<;;;;;;;>+++5555",
+"55555+++>1<<<<;;;<;;;;:;:;;>+++5",
+"5555 +>1<<<<<<<;;;;;;;:;;;;:;>+ ",
+"5555+-:>><<<<;<;<;;;:;;::;;>>>+ ",
+"5555+>;;:--:;<;<;;;;;;;::><22>  ",
+"5555+:<;;;;:>-><<;;:::><222221  ",
+"5555+><<<<;;;::->>::;32222222>+5",
+"55XXX-;;<<<<<;;;:-322222222221+ ",
+"XX*==-::;;;<<<<<;>22222222231-+ ",
+"XO##*&@+->::;<;<<>2222222;>++   ",
+"X#&&$##*#@--::;;<>2223<--++    5",
+"X&&&&&$$##*#@+-:;-21>-+@4@  5555",
+"X$&&&&&&&$###$#.+--+@1432@ 55555",
+"X#&&&&&&&&&&$#32214432222=. 5555",
+"XX$&&&&&&&&&&#22222222224#X.. 55",
+"5XXX#&$&&&&&&422222224=OXo@%O. 5",
+"555.XXO$$$&&&=22223*#Xooo%%=O. 5",
+"555X,,%OX##$&#23=#ooo@o%%322%  5",
+"555.,,,,%%OXO##OXo%%%%322222@ 55",
+"555.%,,,,,,,%Ooo%O%322222222@ 55",
+"555.%,,,,,,,,,,%O22222222222%. 5",
+"555.o%%,,,,,,,,%%2222222224%X. 5",
+"5555..oO%,,,,,,,3222222,%oX..  5",
+"555555 ..oO%,,,,=2223%O...    55",
+"555555555 ..oO%,%3%Oo..    55555",
+"555555555555 ..ooXo.    55555555",
+"555555555555555..    55555555555",
+"55555555555555555555555555555555"
+};
diff --git a/redhat/applications/tellico/trinity-tellico.spec b/redhat/applications/tellico/trinity-tellico.spec
new file mode 100644
index 000000000..c01c0c9b6
--- /dev/null
+++ b/redhat/applications/tellico/trinity-tellico.spec
@@ -0,0 +1,197 @@
+# Default version for this component
+%define kdecomp tellico
+%define version 1.3.2.1
+%define release 1
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%define _variant .opt
+%define _docdir %{_prefix}/share/doc
+%endif
+
+# TDE 3.5.13 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}/kde
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/trinity
+
+
+Name:		trinity-%{kdecomp}
+Summary:	Icollection manager for books, videos, music [Trinity]
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/Utilities
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://periapsis.org/tellico/
+
+Prefix:    %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+Source1:	tellico.xpm
+
+BuildRequires:	tqtinterface-devel
+BuildRequires:	trinity-kdelibs-devel
+BuildRequires:	trinity-kdebase-devel
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+Requires:	%{name}-data = %{version}-%{release}
+Requires:	%{name}-scripts = %{version}-%{release}
+
+%description
+Tellico is a collection manager for KDE. It includes default collections for
+books, bibliographies, comic books, videos, music, coins, stamps, trading
+cards, and wines, and also allows custom collections; with unlimited
+user-defined fields allowed. Automatically formatted names, sorting by any
+property, filters, automatic ISBN validation and full customization for
+printing or display through XSLT files are some of the features present. It
+can import CSV, RIS, BibTeX, and BibTeXML files; and export CSV, HTML, BibTeX,
+BibTeXML, and PilotDB. Tellico can also import data from Amazon, IMDb, CDDB,
+or any US-MARC compliant z39.50 server.
+
+The files are stored in XML format, avoiding the need for database server.
+It also makes it easy for other softwares to use the Tellico data.
+
+
+%package data
+Group:		Applications/Utilities
+Summary:	collection manager for books, videos, music [data] [Trinity]
+
+%description data
+Tellico is a collection manager for KDE. It includes default collections for
+books, bibliographies, comic books, videos, music, coins, stamps, trading
+cards, and wines, and also allows custom collections; with unlimited
+user-defined fields allowed. Automatically formatted names, sorting by any
+property, filters, automatic ISBN validation and full customization for
+printing or display through XSLT files are some of the features present. It
+can import CSV, RIS, BibTeX, and BibTeXML files; and export CSV, HTML, BibTeX,
+BibTeXML, and PilotDB. Tellico can also import data from Amazon, IMDb, CDDB,
+or any US-MARC compliant z39.50 server.
+
+The files are stored in XML format, avoiding the need for database server.
+It also makes it easy for other softwares to use the Tellico data.
+
+This package contains the architecture independent files, such data files and
+documentation.
+
+%package scripts
+Summary:	collection manager for books, videos, music [scripts] [Trinity]
+
+%description scripts
+Tellico is a collection manager for KDE. It includes default collections for
+books, bibliographies, comic books, videos, music, coins, stamps, trading
+cards, and wines, and also allows custom collections; with unlimited
+user-defined fields allowed. Automatically formatted names, sorting by any
+property, filters, automatic ISBN validation and full customization for
+printing or display through XSLT files are some of the features present. It
+can import CSV, RIS, BibTeX, and BibTeXML files; and export CSV, HTML, BibTeX,
+BibTeXML, and PilotDB. Tellico can also import data from Amazon, IMDb, CDDB,
+or any US-MARC compliant z39.50 server.
+
+The files are stored in XML format, avoiding the need for database server.
+It also makes it easy for other softwares to use the Tellico data.
+
+This package contains the scripts to import data from external sources, such
+as websites. As the format of the data may change, these scripts are provided
+as a separate package which can be updated through debian-volatile.
+
+
+%prep
+%setup -q -n applications/%{kdecomp}
+
+# Ugly hack to modify TQT include directory inside autoconf files.
+# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
+sed -i admin/acinclude.m4.in \
+  -e "s,/usr/include/tqt,%{_includedir}/tqt,g"
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%configure \
+	--disable-rpath \
+    --with-extra-includes=%{_includedir}/tqt
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+# Add svg icons to xdg directories
+%__install -D -c -p -m 644 -T icons/tellico.svg %{?buildroot}%{_datadir}/icons/hicolor/scalable/apps/tellico.svg
+%__install -D -c -p -m 644 -T icons/tellico_mime.svg %{?buildroot}%{_datadir}/icons/hicolor/scalable/mimetypes/application-x-tellico.svg
+
+# Remove  dead symlink from French translation
+%__rm %{?buildroot}%{_docdir}/HTML/fr/tellico/common
+
+%__install -D -c -p -m 644 -T %{SOURCE1} %{?buildroot}%{_datadir}/pixmaps/tellico.xpm
+
+
+%find_lang %{kdecomp}
+
+
+%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 -f %{kdecomp}.lang
+%defattr(-,root,root,-)
+%{_bindir}/tellico
+%{_datadir}/pixmaps
+%{_datadir}/applications
+%{_datadir}/config/tellicorc
+
+%files data
+%defattr(-,root,root,-)
+%{_datadir}/apps/tellico/*.xsl
+%{_datadir}/apps/tellico/*.xml
+%{_datadir}/apps/tellico/*.png
+%{_datadir}/apps/tellico/entry-templates
+%{_datadir}/apps/tellico/*.py*
+%{_datadir}/apps/tellico/pics
+%{_datadir}/apps/tellico/report-templates
+%{_datadir}/apps/tellico/tellico.dtd
+%{_datadir}/apps/tellico/tellico.tips
+%{_datadir}/apps/tellico/tellico2html.js
+%{_datadir}/apps/tellico/tellicoui.rc
+%{_datadir}/apps/tellico/welcome.html
+%{_datadir}/config.kcfg
+%{_docdir}/HTML/*/tellico/
+%{_datadir}/icons
+%{_datadir}/apps/mime
+%{_datadir}/mimelnk
+%{_datadir}/apps/kconf_update/tellico-1-3-update.pl
+%{_datadir}/apps/kconf_update/tellico-rename.upd
+%{_datadir}/apps/kconf_update/tellico.upd
+
+%files scripts
+%defattr(-,root,root,-)
+%{_datadir}/apps/tellico/data-sources
+%{_datadir}/apps/tellico/z3950-servers.cfg
+
+
+%Changelog
+* Thu Nov 24 2011 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-1
+- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/components.txt b/redhat/components.txt
index a7853060a..1a8ac75ca 100644
--- a/redhat/components.txt
+++ b/redhat/components.txt
@@ -71,4 +71,8 @@ libraries/libksquirrel
 #extras/libkexif
 applications/ksquirrel
 applications/gtk-qt-engine
-
+applications/koffice
+applications/ktechlab
+applications/piklab
+applications/keep
+applications/tellico
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.12.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.12.spec
index e0bf6b56c..edb284609 100755
--- a/redhat/dependencies/tqtinterface/tqtinterface-3.5.12.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface-3.5.12.spec
@@ -64,7 +64,7 @@ Development files for %{name}
 %patch0 -p1
 
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 %build
diff --git a/redhat/genrpm.sh b/redhat/genrpm.sh
index b575f93cb..c16c7ab1f 100755
--- a/redhat/genrpm.sh
+++ b/redhat/genrpm.sh
@@ -94,7 +94,7 @@ case "${COMP##*/}" in
 esac
 	
 # Determines if we are running an i386 or x86_64 distro
-if [ "$(rpm -q --qf '%{arch}' kernel)" = "i686" ]; then
+if [ "$(rpm -q --qf '%{arch}\n' kernel | tail -n 1)" = "i686" ]; then
 	ARGS="${ARGS} --target=i686"
 fi
 
diff --git a/redhat/kdebase/kdebase-3.5.12-kickerfix.patch b/redhat/kdebase/kdebase-3.5.12-kickerfix.patch
new file mode 100644
index 000000000..2a58f0020
--- /dev/null
+++ b/redhat/kdebase/kdebase-3.5.12-kickerfix.patch
@@ -0,0 +1,13 @@
+Index: ui/k_new_mnu.cpp
+===================================================================
+--- ui/k_new_mnu.cpp	(revision 1259264)
++++ ui/k_new_mnu.cpp	(working copy)
+@@ -3502,6 +3502,8 @@
+                                   descr, "system:/media/" + name, nId++, -1 );
+ 
+         ++it; // skip separator
++	++it;
++	++it;
+     }
+ }
+ 
diff --git a/redhat/kdebase/kdebase-3.5.12-kickoff_unstable.patch b/redhat/kdebase/kdebase-3.5.13-kickoff_unstable.patch
index 7b8b649e1..7b8b649e1 100644
--- a/redhat/kdebase/kdebase-3.5.12-kickoff_unstable.patch
+++ b/redhat/kdebase/kdebase-3.5.13-kickoff_unstable.patch
diff --git a/redhat/kdebase/trinity-kdebase-3.5.12.spec b/redhat/kdebase/trinity-kdebase-3.5.12.spec
index 3229fe15d..1e0b0e18b 100644
--- a/redhat/kdebase/trinity-kdebase-3.5.12.spec
+++ b/redhat/kdebase/trinity-kdebase-3.5.12.spec
@@ -41,6 +41,12 @@ Source0:	kdebase-%{version}.tar.gz
 # Wrapper script to prevent Plasma launch at Trinity Startup
 Source1:	plasma-desktop
 
+# Pam configuration files for RHEL / Fedora
+Source2:	pamd.kdm-trinity%{?dist}
+Source3:	pamd.kdm-trinity-np%{?dist}
+Source4:	pamd.kcheckpass-trinity%{?dist}
+Source5:	pamd.kscreensaver-trinity%{?dist}
+
 # TDE Official patches (from SVN), unmodified
 # [kdebase/kcontrol] fix for openssl 1.0 
 Patch1:		http://www.trinitydesktop.org/patches/r1201523.diff
@@ -51,25 +57,54 @@ Patch4:		http://www.trinitydesktop.org/patches/r1182808.diff
 # [kdebase] fixed an incompatibility with gcc 4.5 
 Patch8:		http://www.trinitydesktop.org/patches/r1221326.diff
 
-Patch11:	kdebase-3.5.12-kickerfix.patch
-
 # TDE Official patches (from SVN), modified
 # [kdebase/ksmserver/shutdowndlg.cpp] Fixed invalid constructor per GCC 4.5.2
-Patch7:		kdebase-3.5.12-r1220975.patch
+Patch12:	kdebase-3.5.12-r1220975.patch
 # [kdebase] Another invalid constructor per gcc 4.5
 Patch9:		kdebase-3.5.12-r1220927.patch
 
 # TDE for RHEL/Fedora specific patches
-# Fix for DBUS include files in RHEL6
-Patch0:		kdebase-3.5.12-shutdowndlg-dbus-include.patch
-# [kdebase/kdesu] Remove 'ignore' button on 'kdesu' dialog box
+## [kdebase/kdesu] Remove 'ignore' button on 'kdesu' dialog box
 Patch3:		kdebase-3.5.12-kdesu-noignorebutton.patch
-# [kdebase/kdesktop] Modifies "open terminal here" on desktop
+## [kdebase/kdesktop] Modifies "open terminal here" on desktop
 Patch5:		kdebase-3.5.12-desktop-openterminalhere.patch
-# [kdebase/kioslave]: Forces HAL backend to use HAL mount options
+## [kdebase/kioslave] Forces HAL backend to use HAL mount options
 Patch6:		kdebase-3.5.12-halmountoptions.patch
+## [kdebase/kdm/kfrontend] Global Xsession file is '/etc/X11/xinit/Xsession'
+Patch7:		kdebase-3.5.13-genkdmconf_Xsession_location.patch
+## [kdebase/startkde] Sets default Start Icon in 'kickerrc'
+Patch11:	kdebase-3.5.13-startkde_icon.patch
+
+# TDE 3.5.12 patches
+# Fix for DBUS include files in RHEL6
+Patch0:		kdebase-3.5.12-shutdowndlg-dbus-include.patch
 # [kdebase/kcontrol]: disable components that depends of krandr (old distros)
-Patch10:	kdebase-3.5.12-disable-krandr.patch
+Patch100:	kdebase-3.5.12-disable-krandr.patch
+
+
+# Fedora 15 Theme: "Lovelock"
+%if 0%{?fedora} == 15
+Requires:	lovelock-backgrounds-single
+%define tde_bg /usr/share/backgrounds/lovelock/default/standard/lovelock.png
+%endif
+
+# Fedora 16 Theme: "Verne"
+%if 0%{?fedora} == 16
+Requires:	verne-backgrounds-single
+%define tde_bg /usr/share/backgrounds/verne/default/standard/verne.png
+%endif
+
+# RHEL 5 Theme
+%if 0%{?rhel} == 5
+Requires:	desktop-backgrounds-basic
+%define tde_bg /usr/share/backgrounds/images/default.jpg
+%endif
+
+# RHEL 6 Theme
+%if 0%{?rhel} == 6
+Requires:	redhat-logos
+%define tde_bg /usr/share/backgrounds/default.png
+%endif
 
 BuildRequires:	tqtinterface-devel
 BuildRequires:	trinity-arts-devel
@@ -81,12 +116,12 @@ BuildRequires:	imake
 BuildRequires:	xorg-x11-proto-devel
 BuildRequires:	OpenEXR-devel
 BuildRequires:	libsmbclient-devel
-BuildRequires:	dbus-devel dbus-qt-devel
+BuildRequires:	dbus-devel
+BuildRequires:	dbus-qt-devel
 BuildRequires:	lm_sensors-devel
 BuildRequires:	libfontenc-devel
 BuildRequires:	hal-devel
 BuildRequires:	audiofile-devel alsa-lib-devel
-BuildRequires:	jack-audio-connection-kit-devel
 BuildRequires:	libraw1394-devel
 BuildRequires:	openldap-devel
 BuildRequires:	libvorbis-devel
@@ -94,15 +129,28 @@ BuildRequires:	pam-devel
 BuildRequires:	libXdmcp-devel
 BuildRequires:	libxkbfile-devel
 BuildRequires:	libusb-devel
-BuildRequires:	esound-devel glib2-devel nas-devel
+BuildRequires:	esound-devel
+BuildRequires:	glib2-devel
 BuildRequires:	libXcomposite-devel
+BuildRequires:	libXtst-devel
+BuildRequires:	libXdamage-devel
+BuildRequires:	xorg-x11-font-utils
 
+# These dependancies are not met in RHEL
+%if 0%{?fedora}
+BuildRequires:	jack-audio-connection-kit-devel
+BuildRequires:	nas-devel
+%endif
+ 
 Requires:	tqtinterface
 Requires:	trinity-arts
 Requires:	trinity-kdelibs
 Requires:	qt%{?_qt_suffix}
 Requires:	openssl
 Requires:	avahi avahi-qt3
+Requires:	dbus-qt
+# Provides the global Xsession script (/etc/X11/xinit/Xsession)
+Requires:	xorg-x11-xinit
 
 
 # RHEL 6 Configuration files are provided in separate packages
@@ -111,6 +159,16 @@ Requires:	kde-settings-kdm
 %endif
 Requires:	redhat-menus
 
+Provides:	kdebase%{?_qt_suffix} = %{version}
+%if "%{?_prefix}" == "/usr"
+Obsoletes:		kdebase%{?_qt_suffix} <= 3.5.10
+%endif
+
+
+# Required for Fedora LiveCD
+Provides:	service(graphical-login)
+
+
 %description
 Core applications for the Trinity K Desktop Environment.  Included are: kdm
 (replacement for xdm), kwin (window manager), konqueror (filemanager,
@@ -127,9 +185,11 @@ Requires:	%{name}
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	trinity-kdelibs-devel
 Summary:	%{summary} - Development files
+Provides:	kdebase%{?_qt_suffix}-devel = %{version}
 %if "%{?_prefix}" == "/usr"
-Obsoletes:	kdebase%{?_qt_suffix}-devel
+Obsoletes:		kdebase%{?_qt_suffix}-devel <= 3.5.10
 %endif
+
 Group:		Development/Libraries
 %description devel
 Header files for developing applications using %{name}.
@@ -141,6 +201,10 @@ Kate plugins or KWin styles.
 Summary: Extra applications from %{name}
 Group: User Interface/Desktops
 Requires: %{name} = %{version}-%{release}
+Provides:	kdebase%{?_qt_suffix}-extras = %{version}
+%if "%{?_prefix}" == "/usr"
+Obsoletes: kdebase%{?_qt_suffix}-extras <= 3.5.10
+%endif
 %description extras
 %{summary}, including:
  * kappfinder
@@ -153,8 +217,9 @@ Requires: %{name} = %{version}-%{release}
 Summary: %{name} runtime libraries
 Group:   System Environment/Libraries
 Requires: trinity-kdelibs
+Provides:	kdebase%{?_qt_suffix}-libs = %{version}
 %if "%{?_prefix}" == "/usr"
-Obsoletes: kdebase%{?_qt_suffix}-libs
+Obsoletes: kdebase%{?_qt_suffix}-libs <= 3.5.10
 %endif
 Requires: %{name} = %{version}-%{release}
 %description libs
@@ -164,6 +229,10 @@ Requires: %{name} = %{version}-%{release}
 %package pim-ioslaves
 Summary: PIM KIOslaves from %{name}
 Group: System Environment/Libraries
+Provides:	kdebase%{?_qt_suffix}-pim-ioslaves = %{version}
+%if "%{?_prefix}" == "/usr"
+Obsoletes: kdebase%{?_qt_suffix}-pim-ioslaves <= 3.5.10
+%endif
 %description pim-ioslaves
 Protocol handlers (KIOslaves) for personal information management, including:
  * kio_ldap
@@ -184,15 +253,32 @@ Protocol handlers (KIOslaves) for personal information management, including:
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch11 -p1
+%patch12 -p1
 %if 0%{?rhel} && 0%{?rhel} < 6
-%patch10 -p1
+%patch100 -p1
+%endif
+
+# Applies an optional distro-specific graphical theme
+%if "%{?tde_bg}" != ""
+# KDM Background
+%__sed -i "kdm/kfrontend/genkdmconf.c" \
+	-e 's,"Wallpaper=isadora.png\n","Wallpaper=%{tde_bg}\n",'
+	
+# TDE user default background
+%__sed -i "kpersonalizer/keyecandypage.cpp" \
+	-e 's,#define DEFAULT_WALLPAPER "isadora.png",#define DEFAULT_WALLPAPER "%{tde_bg}",'
+
+%__sed -i "startkde" \
+	-e 's,/usr/share/wallpapers/isadora.png.desktop,%{tde_bg},' \
+	-e 's,Wallpaper=isadora.png,Wallpaper=%{tde_bg},'
 %endif
-%patch11 -d kicker/kicker
 
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh"
+%__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}"
@@ -205,9 +291,9 @@ export IMAKEINCLUDE="-I/usr/share/X11/config"
   --disable-dependency-tracking \
   --disable-debug --disable-warnings --enable-final \
   --with-pam=yes \
-  --with-kdm-pam=kdm \
-  --with-kcp-pam=kcheckpass \
-  --with-kss-pam=kscreensaver \
+  --with-kdm-pam=kdm-trinity \
+  --with-kcp-pam=kcheckpass-trinity \
+  --with-kss-pam=kscreensaver-trinity \
   --with-libraw1394 \
   --with-openexr \
   --with-samba \
@@ -225,21 +311,45 @@ export IMAKEINCLUDE="-I/usr/share/X11/config"
 %__make install DESTDIR=%{?buildroot}
 
 # Adds a GDM/KDM/XDM session called 'TDE'
-%if "%{?_prefix}" != "/usr"
-%__mkdir_p "%{?buildroot}%{_usr}/share/xsessions"
-install -m 644 "%{?buildroot}%{_datadir}/apps/kdm/sessions/kde.desktop" "%{?buildroot}%{_usr}/share/xsessions/tde.desktop"
-%endif
+%__install -D -m 644 \
+	"%{?buildroot}%{_datadir}/apps/kdm/sessions/kde.desktop" \
+	"%{?buildroot}%{_usr}/share/xsessions/tde.desktop"
+
+# Force session name to be 'TDE'
+%__sed -i "%{?buildroot}%{_usr}/share/xsessions/tde.desktop" \
+	-e "s,^Name=.*,Name=TDE,"
 
 # Modifies 'startkde' to set KDEDIR and KDEHOME hardcoded specific for TDE
-sed -i "%{?buildroot}%{_bindir}/startkde" \
+%__sed -i "%{?buildroot}%{_bindir}/startkde" \
   -e '/^echo "\[startkde\] Starting startkde.".*/ s,$,\nexport KDEDIR=%{_prefix}\nexport KDEHOME=~/.trinity,'
 
 # Renames '/etc/ksysguarddrc' to avoid conflict with KDE4 'ksysguard'
-mv -f %{?buildroot}%{_sysconfdir}/ksysguarddrc %{?buildroot}%{_sysconfdir}/ksysguarddrc.tde
+%__mv -f %{?buildroot}%{_sysconfdir}/ksysguarddrc %{?buildroot}%{_sysconfdir}/ksysguarddrc.tde
 
 # TDE 3.5.12: add script "plasma-desktop" to avoid conflict with KDE4
 %if "%{?_prefix}" != "/usr"
-%{__cp} -f "%{SOURCE1}" "%{?buildroot}%{_bindir}"
+%__install -m 755 "%{SOURCE1}" "%{?buildroot}%{_bindir}"
+%endif
+
+# PAM configuration files
+%__mkdir_p "%{?buildroot}%{_sysconfdir}/pam.d"
+%__install -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/kdm-trinity"
+%__install -m 644 "%{SOURCE3}" "%{?buildroot}%{_sysconfdir}/pam.d/kdm-trinity-np"
+%__install -m 644 "%{SOURCE4}" "%{?buildroot}%{_sysconfdir}/pam.d/kcheckpass-trinity"
+%__install -m 644 "%{SOURCE5}" "%{?buildroot}%{_sysconfdir}/pam.d/kscreensaver-trinity"
+
+# KDM configuration for RHEL/Fedora
+%__sed -i "%{?buildroot}%{_datadir}/config/kdm/kdmrc" \
+%if 0%{?fedora} >= 16
+	-e "s/^#*MinShowUID=.*/MinShowUID=1000/"
+%else
+	-e "s/^#*MinShowUID=.*/MinShowUID=500/"
+%endif
+
+# Moves the XDG configuration files to TDE directory
+%if "%{_prefix}" != "/usr"
+%__mkdir_p "%{?buildroot}%{_prefix}/etc"
+%__mv -f "%{?buildroot}%{_sysconfdir}/xdg" "%{?buildroot}%{_prefix}/etc"
 %endif
 
 %clean
@@ -329,6 +439,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %exclude %{_datadir}/applnk/Utilities/kpager.desktop
 %exclude %{_datadir}/icons/hicolor/*/apps/kpager.png
 
+# Pam configuration
+%{_sysconfdir}/pam.d/*
+
 %doc AUTHORS COPYING README
 %{tde_docdir}/HTML/en/*
 %config(noreplace) %{_sysconfdir}/ksysguarddrc.tde
@@ -411,8 +524,8 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %{_bindir}/knetattach
 %if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
 %{_bindir}/krandrtray
-%{_bindir}/kompmgr
 %endif
+%{_bindir}/kompmgr
 %{_bindir}/kpm
 %{_bindir}/ksplash
 %{_libdir}/kconf_update_bin
@@ -421,7 +534,6 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %{_datadir}/applnk/.hidden/*
 %exclude %{_datadir}/applnk/.hidden/.directory
 %{_datadir}/config.kcfg/*
-%{_bindir}/kde3
 %{_bindir}/kio_media_mounthelper
 %{_bindir}/kdcop
 %{_bindir}/kdeprintfax
@@ -432,26 +544,26 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %{_bindir}/klocaldomainurifilterhelper
 %{_bindir}/kprinter
 %{_datadir}/applications/*/*
-%exclude %{_datadir}/applications/kde/display.desktop
 %{_datadir}/apps/*
-%exclude %{_datadir}/fonts/override/fonts.dir
 %{_datadir}/icons/*color/*/*/*
 %{_datadir}/icons/crystalsvg/*/*/*
 %{_datadir}/mimelnk/*/*
 %{_datadir}/services/*
 %{_datadir}/servicetypes/*
 %{_datadir}/sounds/*
-%{_docdir}/kdm/README
 %{tde_libdir}/*
 %{_libdir}/libkdeinit_*.*
-%{_sysconfdir}/xdg/menus/applications-merged/kde-essential.menu
-%if 0%{?fedora} >= 15 && "%{?_prefix}" != "/usr"
-%exclude %{_sysconfdir}/xdg/menus/kde-information.menu
+%if "%{_prefix}" != "/usr"
+%{_prefix}/etc/xdg/menus/applications-merged/kde-essential.menu
+%{_prefix}/etc/xdg/menus/kde-information.menu
+%{_prefix}/etc/xdg/menus/kde-screensavers.menu
+%{_prefix}/etc/xdg/menus/kde-settings.menu
 %else
+%{_sysconfdir}/xdg/menus/applications-merged/kde-essential.menu
 %{_sysconfdir}/xdg/menus/kde-information.menu
-%endif
 %{_sysconfdir}/xdg/menus/kde-screensavers.menu
 %{_sysconfdir}/xdg/menus/kde-settings.menu
+%endif
 /usr/share/xsessions/*.desktop
 # Remove conflicts with redhat-menus
 %if "%{?_prefix}" != "/usr"
@@ -470,6 +582,12 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %exclude %{_datadir}/services/pop3*.protocol
 %exclude %{_datadir}/services/smtp*.protocol
 
+# TDE 3.5.12 specific
+%{_bindir}/kde3
+%exclude %{_datadir}/applications/kde/display.desktop
+%exclude %{_datadir}/fonts/override/fonts.dir
+%{_docdir}/kdm/README
+
 %files libs
 %defattr(-,root,root,-)
 %exclude %{_libdir}/libkdeinit_*.*
@@ -502,6 +620,15 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %exclude %{_libdir}/libkdeinit_*.*
 
 %changelog
+* Sun Nov 20 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-12
+- Updates Kickoff menu Fix [TDE Bugs #281, #508]
+- Add distribution-specific start button icon
+- Add graphical theme for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Moves XDG files in TDE prefix to avoid conflict with distro-provided KDE
+- Add "service(graphical-login)"
+- kdmrc: sets "MinShowUID=500"
+- Add missing BuildRequires
+
 * Fri Sep 16 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-11
 - Add support for RHEL 5.
 - Remove file conflicts with KDE 4.6.5 under Fedora 15
diff --git a/redhat/kdebase/trinity-kdebase-3.5.13.spec b/redhat/kdebase/trinity-kdebase-3.5.13.spec
index 84d3c4d8c..5c52d2732 100644
--- a/redhat/kdebase/trinity-kdebase-3.5.13.spec
+++ b/redhat/kdebase/trinity-kdebase-3.5.13.spec
@@ -47,6 +47,11 @@ Source3:	pamd.kdm-trinity-np%{?dist}
 Source4:	pamd.kcheckpass-trinity%{?dist}
 Source5:	pamd.kscreensaver-trinity%{?dist}
 
+# TDE Official patches (from SVN), unmodified
+# (none)
+
+# TDE Official patches (from SVN), modified
+# (none)
 
 # TDE for RHEL/Fedora specific patches
 ## [kdebase/kdesu] Remove 'ignore' button on 'kdesu' dialog box
@@ -57,18 +62,18 @@ Patch5:		kdebase-3.5.12-desktop-openterminalhere.patch
 Patch6:		kdebase-3.5.12-halmountoptions.patch
 ## [kdebase/kdm/kfrontend] Global Xsession file is '/etc/X11/xinit/Xsession'
 Patch7:		kdebase-3.5.13-genkdmconf_Xsession_location.patch
-## [kdebase/startkde] Hardcoded path '/usr/lib/xxx' in startkde, not suitable for x86_64
-Patch8:		kdebase-3.5.13-startkde_ldpreload.patch
-## [kdebase/kioslave/media/mediamanager] FTBFS missing dbus-tqt includes
-Patch9:		kdebase-3.5.13-mediamanager_ftbfs.patch
+## [kdebase/kicker/kicker/ui]
+Patch10:	kdebase-3.5.13-kickoff_unstable.patch
 ## [kdebase/startkde] Sets default Start Icon in 'kickerrc'
 Patch11:	kdebase-3.5.13-startkde_icon.patch
 
 # TDE 3.5.13 patches
-## [kdebase/kicker/kicker/ui]
-Patch10:	kdebase-3.5.12-kickoff_unstable.patch
 ## [kdebase/kdm] adds gcrypt support
 Patch12:	kdebase-3.5.13-kdm-crypt.patch
+## [kdebase/startkde] Hardcoded path '/usr/lib/xxx' in startkde, not suitable for x86_64
+Patch8:		kdebase-3.5.13-startkde_ldpreload.patch
+## [kdebase/kioslave/media/mediamanager] FTBFS missing dbus-tqt includes
+Patch9:		kdebase-3.5.13-mediamanager_ftbfs.patch
 
 # Fedora 15 Theme: "Lovelock"
 %if 0%{?fedora} == 15
@@ -105,7 +110,7 @@ BuildRequires:	xorg-x11-proto-devel
 BuildRequires:	OpenEXR-devel
 BuildRequires:	libsmbclient-devel
 BuildRequires:	dbus-devel
-BuildRequires:  dbus-tqt-devel
+BuildRequires:	dbus-tqt-devel
 BuildRequires:	lm_sensors-devel
 BuildRequires:	libfontenc-devel
 BuildRequires:	hal-devel
@@ -117,9 +122,9 @@ BuildRequires:	pam-devel
 BuildRequires:	libXdmcp-devel
 BuildRequires:	libxkbfile-devel
 BuildRequires:	libusb-devel
-BuildRequires:	esound-devel glib2-devel
+BuildRequires:	esound-devel
+BuildRequires:	glib2-devel
 BuildRequires:	libXcomposite-devel
-BuildRequires:	dbus-tqt-devel
 BuildRequires:	libXtst-devel
 BuildRequires:	libXdamage-devel
 BuildRequires:	xorg-x11-font-utils
@@ -147,6 +152,12 @@ Requires:	kde-settings-kdm
 %endif
 Requires:	redhat-menus
 
+Provides:	kdebase%{?_qt_suffix} = %{version}
+%if "%{?_prefix}" == "/usr"
+Obsoletes:		kdebase%{?_qt_suffix} <= 3.5.10
+%endif
+
+
 # Required for Fedora LiveCD
 Provides:	service(graphical-login)
 
@@ -167,9 +178,11 @@ Requires:	%{name}
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	trinity-kdelibs-devel
 Summary:	%{summary} - Development files
+Provides:	kdebase%{?_qt_suffix}-devel = %{version}
 %if "%{?_prefix}" == "/usr"
-Obsoletes:	kdebase%{?_qt_suffix}-devel
+Obsoletes:		kdebase%{?_qt_suffix}-devel <= 3.5.10
 %endif
+
 Group:		Development/Libraries
 %description devel
 Header files for developing applications using %{name}.
@@ -181,6 +194,10 @@ Kate plugins or KWin styles.
 Summary: Extra applications from %{name}
 Group: User Interface/Desktops
 Requires: %{name} = %{version}-%{release}
+Provides:	kdebase%{?_qt_suffix}-extras = %{version}
+%if "%{?_prefix}" == "/usr"
+Obsoletes: kdebase%{?_qt_suffix}-extras <= 3.5.10
+%endif
 %description extras
 %{summary}, including:
  * kappfinder
@@ -193,8 +210,9 @@ Requires: %{name} = %{version}-%{release}
 Summary: %{name} runtime libraries
 Group:   System Environment/Libraries
 Requires: trinity-kdelibs
+Provides:	kdebase%{?_qt_suffix}-libs = %{version}
 %if "%{?_prefix}" == "/usr"
-Obsoletes: kdebase%{?_qt_suffix}-libs
+Obsoletes: kdebase%{?_qt_suffix}-libs <= 3.5.10
 %endif
 Requires: %{name} = %{version}-%{release}
 %description libs
@@ -204,6 +222,10 @@ Requires: %{name} = %{version}-%{release}
 %package pim-ioslaves
 Summary: PIM KIOslaves from %{name}
 Group: System Environment/Libraries
+Provides:	kdebase%{?_qt_suffix}-pim-ioslaves = %{version}
+%if "%{?_prefix}" == "/usr"
+Obsoletes: kdebase%{?_qt_suffix}-pim-ioslaves <= 3.5.10
+%endif
 %description pim-ioslaves
 Protocol handlers (KIOslaves) for personal information management, including:
  * kio_ldap
@@ -239,6 +261,7 @@ Protocol handlers (KIOslaves) for personal information management, including:
 	-e 's,Wallpaper=isadora.png,Wallpaper=%{tde_bg},'
 %endif
 
+
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 export PATH="%{_bindir}:${PATH}"
@@ -286,10 +309,13 @@ cd build
 %__make install DESTDIR=%{?buildroot} -C build
 
 # Adds a GDM/KDM/XDM session called 'TDE'
-%if "%{?_prefix}" != "/usr"
-%__mkdir_p "%{?buildroot}%{_usr}/share/xsessions"
-%__install -m 644 "%{?buildroot}%{_datadir}/apps/kdm/sessions/tde.desktop" "%{?buildroot}%{_usr}/share/xsessions/tde.desktop"
-%endif
+%__install -D -m 644 \
+	"%{?buildroot}%{_datadir}/apps/kdm/sessions/tde.desktop" \
+	"%{?buildroot}%{_usr}/share/xsessions/tde.desktop"
+
+# Force session name to be 'TDE'
+%__sed -i "%{?buildroot}%{_usr}/share/xsessions/tde.desktop" \
+	-e "s,^Name=.*,Name=TDE,"
 
 # Modifies 'startkde' to set KDEDIR and KDEHOME hardcoded specific for TDE
 %__sed -i "%{?buildroot}%{_bindir}/startkde" \
diff --git a/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec b/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec
index c7f170f7b..6ad18e8c2 100644
--- a/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec
+++ b/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.13
 %endif
-%define release 3
+%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"
@@ -74,9 +74,7 @@ BuildRequires: OpenEXR-devel
 # kpdf
 BuildRequires: freetype-devel
 BuildRequires: poppler-devel
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
-BuildRequires: poppler-qt-devel
-%endif
+BuildRequires: poppler-qt-devel >= 0.12
 BuildRequires: libpaper-devel
 # ksvg
 %if 0%{?with_ksvg}
@@ -175,11 +173,8 @@ cd build
   -DWITH_LIBPAPER=ON \
   -DWITH_TIFF=ON \
   -DWITH_OPENEXR=ON \
-%if 0%{?rhel} && 0%{?rhel} <= 5
-  -DWITH_PDF=OFF \
-%else
   -DWITH_PDF=ON \
-%endif
+  -DWITH_PDF=ON \
   -DBUILD_ALL=ON \
   ..
 
@@ -340,7 +335,6 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %{_datadir}/mimelnk/*/*
 %{_libdir}/libkdeinit_*.so
 %{tde_libdir}/*
-%doc %lang(en) %{tde_docdir}/HTML/en/*
 
 %files libs
 %defattr(-,root,root,-)
@@ -354,9 +348,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %files devel
 %defattr(-,root,root,-)
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
-%{tde_includedir}/*
-%endif
+%{tde_includedir}/poppler-link-qt3.h
+%{tde_includedir}/poppler-page-transition.h
+%{tde_includedir}/poppler-qt.h
 %{_includedir}/dom/*
 %{_includedir}/ksvg/*
 %{_includedir}/kviewshell/*
@@ -370,6 +364,10 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %exclude %{_libdir}/libdjvu.so
 
 %changelog
+* Tue Nov 22 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
+- Rebuild with poppler 0.12 for RHEL 5
+- Re-adds qt-poppler include files
+
 * Fri Nov 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
 - Updates BuildRequires
 
diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.12.spec b/redhat/kdelibs/trinity-kdelibs-3.5.12.spec
index 6207fc5c1..30cb449a1 100755
--- a/redhat/kdelibs/trinity-kdelibs-3.5.12.spec
+++ b/redhat/kdelibs/trinity-kdelibs-3.5.12.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.12
 %endif
-%define release 8
+%define release 9
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -37,6 +37,7 @@ Prefix:		%{_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	kdelibs-%{version}.tar.gz
+Patch0:		kdelibs-3.5.13-maxlinelength.patch
 
 BuildRequires:	libtool
 BuildRequires:	tqtinterface-devel
@@ -52,6 +53,11 @@ BuildRequires:	alsa-lib-devel
 BuildRequires:	libidn-devel
 BuildRequires:	qt%{?_qt_suffix}-devel
 BuildRequires:	avahi-qt3-devel
+BuildRequires:	jasper-devel
+BuildRequires:	libtiff-devel
+BuildRequires:	OpenEXR-devel
+BuildRequires:	libtool-ltdl-devel
+BuildRequires:	glib2-devel
 
 Requires:		tqtinterface
 Requires:		trinity-arts
@@ -59,8 +65,10 @@ Requires:		avahi
 Requires:		qt%{?_qt_suffix}
 Requires:		avahi-qt3
 
+
+Provides:	kdelibs%{?_qt_suffix} = %{version}
 %if "%{?_prefix}" == "/usr"
-Obsoletes:		kdelibs%{?_qt_suffix}
+Obsoletes:		kdelibs%{?_qt_suffix} <= 3.5.10
 %endif
 
 %description
@@ -75,8 +83,9 @@ kimgio (image manipulation).
 Summary:	%{name} - Development files
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+Provides:	kdelibs%{?_qt_suffix}-devel = %{version}
 %if "%{?_prefix}" == "/usr"
-Obsoletes:	kdelibs%{?_qt_suffix}-devel
+Obsoletes:	kdelibs%{?_qt_suffix}-devel <= 3.5.10
 %endif
 
 %description devel
@@ -87,19 +96,22 @@ applications for TDE.
 Group:		Development/Libraries
 Summary:	%{name} - API documentation
 Requires:	%{name} = %{version}-%{release}
+Provides:	kdelibs%{?_qt_suffix}-apidocs = %{version}
 %if "%{?_prefix}" == "/usr"
-Obsoletes:	kdelibs%{?_qt_suffix}-apidocs-devel
+Obsoletes:	kdelibs%{?_qt_suffix}-apidocs <= 3.5.10
 %endif
 
 %description apidocs
 This package includes the TDE API documentation in HTML
 format for easy browsing
 
+
 %prep
 %setup -q -n kdelibs
+%patch0 -p1
 
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 
@@ -155,6 +167,16 @@ cat <<EOF >%{?buildroot}%{_sysconfdir}/ld.so.conf.d/trinity.conf
 %{tde_libdir}
 EOF
 
+# Moves the XDG configuration files to TDE directory
+%if "%{_prefix}" != "/usr"
+%__install -p -D -m644 \
+	"%{?buildroot}%{_sysconfdir}/xdg/menus/applications.menu" \
+	"%{?buildroot}%{_prefix}/etc/xdg/menus/kde-applications.menu"
+%__rm -rf "%{?buildroot}%{_sysconfdir}/xdg"
+%else
+%__mv -f "%{?buildroot}%{_sysconfdir}/xdg/menus/applications.menu" "%{?buildroot}%{_sysconfdir}/xdg/menus/kde-applications.menu"
+%endif
+
 
 %clean
 %__rm -rf %{?buildroot}
@@ -268,8 +290,12 @@ EOF
 %endif
 %{_sysconfdir}/ld.so.conf.d/trinity.conf
 
-# Provided by 'redhat-menus' package
-%exclude %{_sysconfdir}/xdg/menus/applications.menu
+# Avoid conflict with 'redhat-menus' package
+%if "%{_prefix}" == "/usr"
+%{_sysconfdir}/xdg/menus/kde-applications.menu
+%else
+%{_prefix}/etc/xdg/menus/kde-applications.menu
+%endif
 
 %files devel
 %defattr(-,root,root,-)
@@ -289,6 +315,12 @@ EOF
 
 
 %changelog
+* Sun Nov 29 2911 Francois Andriot <francois.andriot@free.fr> - 3.5.12-9
+- Moves XDG files in TDE prefix to avoid conflict with distro-provided KDE
+- Disable 'max line length' detection
+- Add missing BuildRequires
+- Disable 'max line length' detection
+
 * Fri Sep 16 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-8
 - Add support for RHEL 5.
 
diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
index abbb9a047..faea11948 100755
--- a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
+++ b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.13
 %endif
-%define release 3
+%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"
@@ -37,6 +37,7 @@ Prefix:		%{_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	kdelibs-%{version}.tar.gz
+Patch0:		kdelibs-3.5.13-maxlinelength.patch
 
 BuildRequires:	libtool
 BuildRequires:	tqtinterface-devel
@@ -64,8 +65,10 @@ Requires:		avahi
 Requires:		qt%{?_qt_suffix}
 Requires:		avahi-qt3
 
+
+Provides:	kdelibs%{?_qt_suffix} = %{version}
 %if "%{?_prefix}" == "/usr"
-Obsoletes:		kdelibs%{?_qt_suffix}
+Obsoletes:		kdelibs%{?_qt_suffix} <= 3.5.10
 %endif
 
 %description
@@ -80,8 +83,9 @@ kimgio (image manipulation).
 Summary:	%{name} - Development files
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+Provides:	kdelibs%{?_qt_suffix}-devel = %{version}
 %if "%{?_prefix}" == "/usr"
-Obsoletes:	kdelibs%{?_qt_suffix}-devel
+Obsoletes:	kdelibs%{?_qt_suffix}-devel <= 3.5.10
 %endif
 
 %description devel
@@ -92,8 +96,9 @@ applications for TDE.
 Group:		Development/Libraries
 Summary:	%{name} - API documentation
 Requires:	%{name} = %{version}-%{release}
+Provides:	kdelibs%{?_qt_suffix}-apidocs = %{version}
 %if "%{?_prefix}" == "/usr"
-Obsoletes:	kdelibs%{?_qt_suffix}-apidocs-devel
+Obsoletes:	kdelibs%{?_qt_suffix}-apidocs <= 3.5.10
 %endif
 
 %description apidocs
@@ -103,6 +108,8 @@ format for easy browsing
 
 %prep
 %setup -q -n kdelibs
+%patch0 -p1
+
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -146,11 +153,14 @@ cat <<EOF >%{?buildroot}%{_sysconfdir}/ld.so.conf.d/trinity.conf
 EOF
 
 # Moves the XDG configuration files to TDE directory
+%if "%{_prefix}" != "/usr"
 %__install -p -D -m644 \
 	"%{?buildroot}%{_sysconfdir}/xdg/menus/applications.menu" \
 	"%{?buildroot}%{_prefix}/etc/xdg/menus/kde-applications.menu"
 %__rm -rf "%{?buildroot}%{_sysconfdir}/xdg"
-
+%else
+%__mv -f "%{?buildroot}%{_sysconfdir}/xdg/menus/applications.menu" "%{?buildroot}%{_sysconfdir}/xdg/menus/kde-applications.menu"
+%endif
 
 
 %clean
@@ -266,7 +276,11 @@ EOF
 %{_sysconfdir}/ld.so.conf.d/trinity.conf
 
 # Avoid conflict with 'redhat-menus' package
+%if "%{_prefix}" == "/usr"
+%{_sysconfdir}/xdg/menus/kde-applications.menu
+%else
 %{_prefix}/etc/xdg/menus/kde-applications.menu
+%endif
 
 # New in TDE 3.5.13
 %{_bindir}/kdetcompmgr
@@ -292,6 +306,10 @@ EOF
 
 
 %changelog
+* Sun Nov 20 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
+- Add 'Provides: kdelibs3' to avoid installing distro-provided KDE3 libraries
+- Disable 'max line length' detection
+
 * Sat Nov 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
 - Moves XDG files in TDE prefix to avoid conflict with distro-provided KDE