RHEL/Fedora: updates kdelibs 3.5.13

20 files changed, 306 insertions, 210 deletions

diff --git a/redhat/applications/abakus/trinity-abakus-3.5.13.spec b/redhat/applications/abakus/trinity-abakus-3.5.13.spec
index 616896d1e..c47b06adc 100644
--- a/redhat/applications/abakus/trinity-abakus-3.5.13.spec
+++ b/redhat/applications/abakus/trinity-abakus-3.5.13.spec
@@ -1,7 +1,7 @@
 # Default version for this component
 %define kdecomp abakus
 %define version 0.91
-%define release 2
+%define release 3
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -45,7 +45,7 @@ AbaKus is a complex calculator, which provides
 many different kinds of calculations.
 Think of it as bc (the command-line calculator) with a nice GUI.
 It also gives information about mathematical variables and
-has the user-friendly menu options of a normal KDE application.
+has the user-friendly menu options of a normal TDE application.
 
 %prep
 %setup -q -n applications/%{kdecomp}
@@ -56,7 +56,7 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}"
 export CXXFLAGS="-I%{_includedir}/tqt"
 
 ./configure
-	
+
 %__make %{?_smp_mflags}
 
 
@@ -84,11 +84,14 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %doc AUTHORS COPYING
 %{_bindir}/*
 %{_datadir}/apps/*/
-%{_datadir}/icons/*/*/*/*
+%{_datadir}/icons/hicolor/*/*/*
 %{tde_docdir}/HTML/*/*/
 %{_datadir}/applnk/Utilities/abakus.desktop
 
 %Changelog
+* Wed Apr 25 2012 Francois Andriot <francois.andriot@free.fr> - 0.91-3
+- Fix postinstall
+
 * Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.91-2
 - Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
 
diff --git a/redhat/applications/amarok/amarok-3.5.13-enable_akode.patch b/redhat/applications/amarok/amarok-3.5.13-enable_akode.patch
index f444392af..16ed9beb9 100644
--- a/redhat/applications/amarok/amarok-3.5.13-enable_akode.patch
+++ b/redhat/applications/amarok/amarok-3.5.13-enable_akode.patch
@@ -31,9 +31,9 @@ diff -Nuar amarok.ORI/amarok/src/engine/akode/CMakeLists.txt amarok.P/amarok/src
 +install( FILES amarok_aKode-engine.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 +
 +
-+##### libamarok_akode-engine (module) ############
++##### libamarok_aKode-engine (module) ############
 +
-+tde_add_kpart( libamarok_akode-engine AUTOMOC
++tde_add_kpart( libamarok_aKode-engine AUTOMOC
 +  SOURCES
 +    akode-scope.cpp akode-engine.cpp
 +  LINK amarok-shared ${AKODE_LIBRARIES}
diff --git a/redhat/applications/amarok/trinity-amarok.spec b/redhat/applications/amarok/trinity-amarok.spec
index be97d0cc4..1dfa40e1d 100644
--- a/redhat/applications/amarok/trinity-amarok.spec
+++ b/redhat/applications/amarok/trinity-amarok.spec
@@ -1,7 +1,7 @@
 # Basic package informations
 %define kdecomp amarok
 %define version 1.4.10
-%define release 4
+%define release 5
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -47,7 +47,11 @@ BuildRequires:  trinity-kdebase-devel
 BuildRequires:  taglib-devel 
 BuildRequires:  libifp-devel
 # Ipod
+%if 0%{?rhel} == 5
+BuildRequires:  trinity-libgpod-devel >= 0.4.2
+%else
 BuildRequires:  libgpod-devel >= 0.4.2
+%endif
 BuildRequires:	libmp4v2-devel
 # MTP players
 BuildRequires:  libmtp-devel
@@ -82,6 +86,7 @@ Requires:  xdg-utils
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
 
+%if "%{?_prefix}" == "%{_usr}"
 Obsoletes: amarok-arts < 1.3, amarok-akode < 1.3
 
 Obsoletes: amarok-devel < %{version}-%{release}
@@ -93,10 +98,12 @@ Provides:  amarok-devel = %{version}-%{release}
 # engines, etc...
 # old, obsolete ones: arts, akode
 Obsoletes: amarok-arts < 1.3, amarok-akode < 1.3
+%endif
+
 # xine-lib
 BuildRequires:  xine-lib-devel
-Provides: %{name}-engine-xine = %{version}-%{release}
 
+Provides: %{name}-engine-xine = %{version}-%{release}
 
 %description
 Amarok is a multimedia player with:
@@ -274,7 +281,7 @@ xdg-desktop-menu forceupdate 2> /dev/null || :
 %{tde_libdir}/libamarok_yauap-engine_plugin.*
 # AKODE
 %{_datadir}/services/amarok_aKode-engine.desktop
-%{tde_libdir}/libamarok_akode-engine.*
+%{tde_libdir}/libamarok_aKode-engine.*
 
 
 
@@ -290,6 +297,9 @@ xdg-desktop-menu forceupdate 2> /dev/null || :
 
 
 %changelog
+* Mon Mar 19 2012 Francois Andriot <francois.andriot@free.fr> - 1.4.10-5
+- Replaces BR "libgpod" with "trinity-libgpod" for EL5
+
 * Mon Jan 16 2012 Francois Andriot <francois.andriot@free.fr> - 1.4.10-4
 - Enable 'akode' support
 - Removes 'libvisual-plugins' dependency (obsolete ?)
diff --git a/redhat/applications/basket/trinity-basket-3.5.13.spec b/redhat/applications/basket/trinity-basket-3.5.13.spec
index 866bf10db..49cbcf219 100644
--- a/redhat/applications/basket/trinity-basket-3.5.13.spec
+++ b/redhat/applications/basket/trinity-basket-3.5.13.spec
@@ -71,7 +71,8 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}"
 
 %configure \
 	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt
+    --with-extra-includes=%{_includedir}/tqt \
+    --disable-static
 
 %__make %{?_smp_mflags}
 
diff --git a/redhat/applications/kaffeine/trinity-kaffeine.spec b/redhat/applications/kaffeine/trinity-kaffeine.spec
index 04b6ef65c..bab8aa4ab 100644
--- a/redhat/applications/kaffeine/trinity-kaffeine.spec
+++ b/redhat/applications/kaffeine/trinity-kaffeine.spec
@@ -1,12 +1,13 @@
 # Default version for this component
 %define kdecomp kaffeine
-%define version 0.8.6
-%define release 2
+%define version 0.8.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
+%define _mandir %{_datadir}/man
 %endif
 
 # TDE 3.5.13 specific building variables
@@ -17,17 +18,28 @@ BuildRequires: autoconf automake libtool m4
 
 
 Name:		trinity-%{kdecomp}
-Summary:	sudo frontend for Trinity
+Summary: Xine-based media player
 
 Version:	%{?version}
 Release:	%{?release}%{?dist}%{?_variant}
 
 License: GPLv2+
-Summary: Xine-based media player
 Group:   Applications/Multimedia
 URL:     http://kaffeine.sourceforge.net/
 
-Source0: kaffeine-3.5.13.tar.gz
+Source0:	kaffeine-3.5.13.tar.gz
+Source2:	kaffeine.1
+
+# [kaffeine] Work around Xine crash when displaying still logo image by creating a small movie file to replace it [Bug #511, #559]
+Source1:		508cb342-logo
+
+# [kaffeine] Fix nominal "tqt" typos and fix slow DVB start. This closes bug reports 729 and 899.
+Patch1:			1331343133:fd68e4c4940afb4529b16e2c3e3d0f379ac7b161.diff
+# [kaffeine] Change location where Kaffeine stores temporary pipe files from $HOME to the more appropriate $KDEHOME/tmp-$HOSTNAME.
+Patch2:			1331957353:b480e3db3a01b75376fa6b83e5b01efe104ccaec.diff
+# [kaffeine] Fix typos, branding, and inadvertent tqt changes.
+Patch3:			1333649519:0e3d0ed603c6c8065fdcb77bc79b59a768fc6a5b.diff
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gettext
@@ -79,14 +91,18 @@ Requires: %{name} = %{version}-%{release}
 %prep
 %setup -q -n applications/kaffeine
 
+%patch1 -p1
+%patch2 -p1
+%patch3 -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" \
-  -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g"
+  -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \
+  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
 
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f admin/Makefile.common
 
 %build
@@ -94,18 +110,18 @@ unset QTDIR || : ; source /etc/profile.d/qt.sh
 export PATH="%{_bindir}:${PATH}"
 export LDFLAGS="-L%{_libdir} -I%{_includedir}"
 
-# easier than patching, and using 
-#  --with-extra-includes=%{_includedir}/cdda below -- Rex
-#CPPFLAGS="-I%{_includedir}/cdda"; export CPPFLAGS
 
 %configure \
-  --disable-rpath \
   --enable-new-ldflags \
   --disable-debug --disable-warnings \
-  --disable-dependency-tracking --disable-final \
+  --disable-dependency-tracking --enable-final \
+  --disable-rpath \
+  --with-xinerama \
   --with-gstreamer \
   --without-lame \
   --with-extra-includes=%{_includedir}/tqt \
+  --with-extra-libs=%{_prefix}/%{_lib} \
+  --enable-closure \
 %if 0%{?rhel} > 0 && 0%{?rhel} <= 5
   --without-dvb \
 %endif
@@ -143,6 +159,8 @@ fi
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 rm -f $RPM_BUILD_ROOT%{_datadir}/mimelnk/application/x-mplayer2.desktop
 
+%__install -D -m 644 %{SOURCE1} %{?buildroot}%{_datadir}/apps/kaffeine/logo
+%__install -D -m 644 %{SOURCE2} %{?buildroot}%{_mandir}/man1/kaffeine.1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -180,6 +198,7 @@ update-desktop-database >& /dev/null ||:
 %{_datadir}/mimelnk/*/*.desktop
 %{_datadir}/service*/*.desktop
 %{tde_docdir}/HTML/en/kaffeine
+%{_mandir}/*/*
 
 %files libs
 %defattr(-,root,root,-)
@@ -193,6 +212,13 @@ update-desktop-database >& /dev/null ||:
 
 
 %changelog
+* Mon Apr 23 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.8-1
+- Updates version to 0.8.8
+- Fix nominal "tqt" typos and fix slow DVB start. [Bug #729, #899]
+- Change location where Kaffeine stores temporary pipe files from $HOME to the more appropriate $KDEHOME/tmp-$HOSTNAME.
+- Work around Xine crash when displaying still logo image by creating a small movie file to replace it [Bug #511, #559]
+- Add man page
+
 * Sun Dec 04 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.6-2
 - Disable 'libxcb-devel' for RHEL 5 compilation
 - Fix HTML directory location
diff --git a/redhat/applications/kile/trinity-kile.spec b/redhat/applications/kile/trinity-kile.spec
index f3defbc8e..36c013774 100644
--- a/redhat/applications/kile/trinity-kile.spec
+++ b/redhat/applications/kile/trinity-kile.spec
@@ -1,7 +1,7 @@
 # Default version for this component
 %define kdecomp kile
 %define version 2.0.2
-%define release 1
+%define release 2
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -402,7 +402,7 @@ This package contains the Chinese Simplified translations for Kile.
 
 
 %description
-Kile is a user-friendly LaTeX source editor and TeX shell for KDE.
+Kile is a user-friendly LaTeX source editor and TeX shell for TDE.
 
 The source editor is a multi-document editor designed for .tex and .bib
 files.  Menus, wizards and auto-completion are provided to assist with
@@ -421,11 +421,12 @@ Kile can support large projects consisting of several smaller files.
 # 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" \
-  -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g"
+  -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \
+  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
 
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || \
+%__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 
@@ -434,8 +435,8 @@ export PATH="%{_bindir}:${PATH}"
 export LDFLAGS="-L%{_libdir} -I%{_includedir}"
 
 %configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt
+  --disable-rpath \
+  --with-extra-includes=%{_includedir}/tqt
 
 %__make %{?_smp_mflags}
 
@@ -465,8 +466,8 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %defattr(-,root,root,-)
 %{_bindir}/kile
 %{_datadir}/applications/kde/kile.desktop
-%{_datadir}/apps/katepart/syntax/bibtex.xml
-%{_datadir}/apps/katepart/syntax/latex.xml
+%exclude %{_datadir}/apps/katepart/syntax/bibtex.xml
+%exclude %{_datadir}/apps/katepart/syntax/latex.xml
 %{_datadir}/apps/kconf_update
 %{_datadir}/apps/kile
 %{_datadir}/config.kcfg/kile.kcfg
@@ -622,5 +623,8 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 
 %Changelog
+* Fri Apr 20 2012 Francois Andriot <francois.andriot@free.fr> - 2.0.2-2
+- Fix file conflict with trinity-kdelibs
+
 * Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 2.0.2-1
 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/koffice/trinity-koffice.spec b/redhat/applications/koffice/trinity-koffice.spec
index 17a6329c4..5e8a87d0c 100644
--- a/redhat/applications/koffice/trinity-koffice.spec
+++ b/redhat/applications/koffice/trinity-koffice.spec
@@ -1,7 +1,7 @@
 # Default version for this component
 %define kdecomp koffice
 %define version 1.6.3
-%define release 2
+%define release 3
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -15,6 +15,7 @@ BuildRequires: autoconf automake libtool m4
 %define tde_includedir %{_includedir}/kde
 %define tde_libdir %{_libdir}/trinity
 
+# Disable Kross support for RHEL <= 5 (python is too old)
 %if 0%{?fedora} > 0 || 0%{?rhel} >= 6
 %define with_kross 1
 %endif
@@ -38,12 +39,22 @@ Source0:	%{kdecomp}-3.5.13.tar.gz
 Source1:	chalk.xpm
 Source100:      koshell.png
 
-# [koffice] Disable GraphicksMagick version >= 1.2.0
+# [koffice] Disable GraphicksMagick version >= 1.2.0 [Bug #353]
 Patch0:		koffice-3.5.13-disable_graphicksmagick.patch
-# [filters/chalk/pdf] Fix poppler-qt detection
+# [filters/chalk/pdf] Fix poppler-qt detection [Bug #783]
 Patch1:		koffice-3.5.13-fix_poppler_detect.patch
-# [lib/kross/python/scripts/RestrictedPython/Utilities.py] Syntax error
+# [lib/kross/python/scripts/RestrictedPython/Utilities.py] Syntax error [Bug #679]
 Patch2:		koffice-3.5.13-kross_utilities_syntax.patch
+# [koffice/chalk] Fix GraphicksMagick 1.3 support [Bug #353]
+Patch3:		koffice-3.5.13-chalk_gmagick.patch
+# [koffice/kexi] Various patches for kexi, found on the web [Bug # 777]
+Patch5:		kexi-fix-possible-crash-in-buffered-mode-sqlite-2.patch
+Patch6:		kexi-hide_hourglass-1.1.3-2.patch
+Patch7:		kexi-fix-support-for-boolean-types-in-migration.patch
+Patch8:		kexi-mysql_migrate_long_text-1.1.3.patch
+Patch9:		kexi-fix-support-for-boolean-types.patch
+Patch10:	kexi-thoushand_objects_support-1.1.3-2.patch
+Patch11:	kexi-fp_expressions-1.1.3.patch
 
 # BuildRequires: world-devel ;)
 BuildRequires:  trinity-kdelibs-devel
@@ -80,10 +91,7 @@ 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
+BuildRequires:	GraphicsMagick-devel >= 1.1.0
 
 # libwpd for FC15 and FC16 is too recent for Koffice ! (0.9.x)
 # So we built an alternate 0.8.x package !
@@ -277,9 +285,17 @@ This package is part of the KDE Office Suite.
 
 %prep
 %setup -q -n applications/%{kdecomp}
-%patch0 -p1
+#patch0 -p1
 #patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch5 -p0
+%patch6 -p0
+%patch7 -p0
+%patch8 -p0
+%patch9 -p0
+%patch10 -p0
+%patch11 -p0
 
 # use LGC variant instead
 sed -i.dejavu-lgc \
@@ -959,6 +975,10 @@ update-desktop-database -q &> /dev/null ||:
 
 
 %changelog
+* Sat Jan 07 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.3-3
+- Fix GraphicksMagick 1.3 support [Bug #353]
+- Various patches for kexi [Bug #777]
+
 * Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 1.6.3-2
 - Fix HTML directory location
 
diff --git a/redhat/components.txt b/redhat/components.txt
index b2f84234b..3029678b4 100644
--- a/redhat/components.txt
+++ b/redhat/components.txt
@@ -1,39 +1,40 @@
-libraries/libkdcraw
-libraries/libkexiv2
-libraries/libkipi
-libraries/libksquirrel
-libraries/python-trinity
-libraries/pykdeextensions
 dependencies/qt3
 dependencies/tqt3
-dependencies/tqca-tls
-dependencies/libcaldav
-dependencies/libcarddav
 dependencies/tqtinterface
+dependencies/arts
 dependencies/dbus-tqt
 dependencies/dbus-1-tqt
+dependencies/tqca
+dependencies/tqca-tls
 dependencies/avahi-tqt
-dependencies/arts
 dependencies/tqscintilla
+dependencies/libcaldav
+dependencies/libcarddav
 kdelibs
 kdebase
 kdebindings
+kdeaccessibility
 kdeutils
-kdepim
-kdesdk
-kdevelop
 kdemultimedia
-kdeartwork
-kdegraphics
-kdeaccessibility
 kdenetwork
-kdetoys
 kdeadmin
+kdeartwork
 kdegames
+kdetoys
 kdeedu
+kdegraphics
+kdevelop
 kdeaddons
 kdewebdev
+kdepim
+kdesdk
 kde-i18n
+libraries/libkdcraw
+libraries/libkexiv2
+libraries/libkipi
+libraries/libksquirrel
+libraries/python-trinity
+libraries/pykdeextensions
 extras/akode
 extras/kasablanca
 extras/ksensors
diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-r14.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-r14.spec
index faa71a064..2e0b389ba 100644
--- a/redhat/dependencies/avahi-tqt/avahi-tqt-r14.spec
+++ b/redhat/dependencies/avahi-tqt/avahi-tqt-r14.spec
@@ -11,12 +11,15 @@ Group:		System Environment/Libraries
 
 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:	%{name}-%{version}.tar.gz
-Patch0:		git.patch
+
+# Allows building with TQT3 instead of QT3
+Patch1:		avahi-tqt-moc-tqt3.patch
 
 BuildRequires:	gcc-c++
 BuildRequires:	avahi-devel
@@ -42,18 +45,14 @@ Development files for %{name}
 
 %prep
 %setup -q -n dependencies/%{name}
-%patch0 -p1
+%patch1 -p1
 
 %build
 ./autogen.sh
 %configure \
 	--enable-compat-libdns_sd \
-	--disable-mono --disable-monodoc \
-	--disable-gtk3 \
 	--with-systemdsystemunitdir=/lib/systemd/system
 
-
-
 %install
 %__rm -rf %{?buildroot}
 %__make install DESTDIR=%{?buildroot}
@@ -61,6 +60,7 @@ Development files for %{name}
 %clean
 %__rm -rf %{?buildroot}
 
+
 %files
 %{_libdir}/*.so.*
 
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-r14.spec b/redhat/dependencies/tqtinterface/tqtinterface-r14.spec
index 97cfa834c..18c9c463b 100755
--- a/redhat/dependencies/tqtinterface/tqtinterface-r14.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface-r14.spec
@@ -60,7 +60,7 @@ cd build
 
 # RHEL 5: add newline at end of include files to avoid warnings
 %if 0%{?rhel} && 0%{?rhel} <= 5
-for i in %{?buildroot}%{_includedir}/*.h; do
+for i in %{?buildroot}%{_includedir}/tqt/*.h; do
   echo "" >>${i}
 done
 %endif
diff --git a/redhat/gentarball.sh b/redhat/gentarball.sh
deleted file mode 100755
index 76d902fd5..000000000
--- a/redhat/gentarball.sh
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/bin/bash
-
-cd "$( dirname "$0" )"
-
-# Default TDE version (if unspecified in 'components.txt')
-DEFAULT_VERSION="3.5.12.99"
-
-clear
-cat <<EOF
-This script generates a source tarball of TDE from the SVN/GIT repository.
-Please choose a TDE component to archive or build.
-
-EOF
-
-
-##### CHOOSE A TDE COMPONENT #####
-PS3="Enter number: "
-select COMP in $( cut -f1 components.txt | grep -v "^#" ) ; do
-	ARCHIVEDIR="${PWD}/${COMP}"
-	[ -d "${ARCHIVEDIR}" ] || mkdir -p "${ARCHIVEDIR}"
-
-	VERSION=$( awk '{ if ($1 == "'${COMP}'") { print $2; } }' components.txt )
-	if [ -z "${VERSION}" ]; then VERSION=${DEFAULT_VERSION}; fi
-
-	# List existing tarballs
-	if ls ${ARCHIVEDIR}/${COMP##*/}*.tar.gz >/dev/null 2>&1; then
-		echo
-		echo "You currently have the following tarball(s): "
-		for i in ${ARCHIVEDIR}/${COMP##*/}*.tar.gz; do echo "  ${i##*/}"; done
-		echo
-	fi
-	
-	# Checks latest SVN revision
-	unset ARCHIVENAME
-	case "${COMP##*/}" in
-		"libcaldav"|"libcarddav"|"qt3") ;;
-		*)
-			SVNREV=$( LANG=C svn info svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/tqtinterface|sed -n "/^Revision: / s,.* \(.*\),\1,p" )
-			ARCHIVENAME=${COMP##*/}-${VERSION}.${SVNREV}.tar.gz
-
-			if [ -r ${ARCHIVEDIR}/${ARCHIVENAME} ]; then
-				echo "You already have the latest revision (${SVNREV})";
-			else
-				echo "A new revision is available: ${SVNREV}"
-			fi
-		;;
-	esac
-	
-	echo
-	echo "Press ENTER to download the new tarball, or CTRL+C to abort."
-	read rep
-
-	TMPDIRTDE=$(mktemp -d)
-	pushd "${TMPDIRTDE}" >/dev/null
-	mkdir -p "${TMPDIRTDE}/${COMP}"
-	pushd "${COMP}/.." >/dev/null
-	case "${COMP##*/}" in
-		"libcaldav")
-			echo "Downloading '${COMP}' ..."
-			ARCHIVENAME="libcaldav_0.6.5-2debian2.tar.gz"
-			wget --no-check-certificate "https://quickbuild.pearsoncomputing.net/~trinity/+archive/trinity-builddeps/+files/libcaldav_0.6.5-2debian2.tar.gz"
-			;;
-		"libcarddav")
-			echo "Downloading '${COMP}' ..."
-			ARCHIVENAME="libcarddav_0.6.2-2debian2.tar.gz"
-			wget --no-check-certificate "https://quickbuild.pearsoncomputing.net/~trinity/+archive/trinity-builddeps/+files/libcarddav_0.6.2-2debian2.tar.gz"
-			;;
-		"qt3")
-			echo "Extracting '${COMP}' from GIT ..."
-			ARCHIVENAME="qt3-3.3.8d.tar.gz"
-			git clone http://scm.trinitydesktop.org/scm/git/tde; mv tde/main/dependencies/qt3 .
-			;;
-		*)
-			echo "Extracting '${COMP}' from SVN ..."
-			svn export --force --quiet svn://anonsvn.kde.org/home/kde/branches/trinity/${COMP}
-			;;
-	esac
-
-	if [ ! -r "${ARCHIVENAME}" ]; then
-		popd >/dev/null
-		echo "Creating archive '${ARCHIVENAME}' ..."
-		tar cfz ${ARCHIVEDIR}/${ARCHIVENAME} ${COMP}
-	else
-		mv *.tar.gz ${ARCHIVEDIR}/
-		popd >/dev/null
-	fi
-	popd >/dev/null
-	echo "Cleaning temporary directory ..."
-	rm -rf "${TMPDIRTDE}"
-	cat <<EOF
-
-Resulting archive:
-EOF
-	\ls -l ${ARCHIVEDIR}/${ARCHIVENAME}
-	echo
-	echo "Have a nice day !"
-	break
-done
diff --git a/redhat/kdebase/trinity-kdebase-3.5.13.spec b/redhat/kdebase/trinity-kdebase-3.5.13.spec
index ebd1b3464..1feb46f18 100644
--- a/redhat/kdebase/trinity-kdebase-3.5.13.spec
+++ b/redhat/kdebase/trinity-kdebase-3.5.13.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.13
 %endif
-%define release 18
+%define release 19
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -125,6 +125,8 @@ Patch44:	kdebase-3.5.13-ensure_pagersettings_is_installed.patch
 Patch45:	1333232616:f752bcbf6585c61f414963ad83e1300a1da08504.diff
 ## [kdebase/kioslave] Fix sftp failure on newer systems [Bug #897]
 Patch46:	1335166907:e72f4926c094b2bd94501518fbcd2a3e66a74f6a.diff
+## [kdebase/kicker] Fix compilation with GCC 4.7 [Bug #958]
+Patch47:	kdebase-3.5.13-kicker-easyvector.patch
 
 # Fedora 15 Theme: "Lovelock"
 %if 0%{?fedora} == 15
@@ -146,6 +148,16 @@ Requires:	fedora-release-notes
 %define tde_aboutpage /usr/share/doc/HTML/fedora-release-notes/index.html
 %endif
 
+# Fedora 17 Theme: "Beefy Miracle"
+%if 0%{?fedora} == 17
+Requires:	beefy-miracle-backgrounds-single
+%define tde_bg /usr/share/backgrounds/beefy-miracle/default/standard/beefy-miracle.png
+
+Requires:	fedora-release-notes
+%define tde_aboutlabel Fedora 17
+%define tde_aboutpage /usr/share/doc/HTML/fedora-release-notes/index.html
+%endif
+
 # RHEL 5 Theme
 %if 0%{?rhel} == 5
 Requires:	desktop-backgrounds-basic
@@ -349,6 +361,7 @@ Protocol handlers (KIOslaves) for personal information management, including:
 %patch44 -p1
 %patch45 -p1
 %patch46 -p1
+%patch47 -p0
 
 # Applies an optional distro-specific graphical theme
 %if "%{?tde_bg}" != ""
@@ -735,6 +748,10 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %{_datadir}/cmake/*.cmake
 
 %changelog
+* Tue Apr 24 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-19
+- Build for Fedora 17
+- Fix compilation with GCC 4.7 [Bug #958]
+
 * Mon Apr 23 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-18
 - Ensures that 'pagersettings.kcfg' is installed [Bug #908, Commit bd9c1479]
 - Fix "Malformed URL $( kxdglauncher --getpath xdgname DOCUMENTS )" error dialog.
diff --git a/redhat/kdebindings/trinity-kdebindings-3.5.13.spec b/redhat/kdebindings/trinity-kdebindings-3.5.13.spec
index a095e581a..755e20517 100644
--- a/redhat/kdebindings/trinity-kdebindings-3.5.13.spec
+++ b/redhat/kdebindings/trinity-kdebindings-3.5.13.spec
@@ -2,12 +2,13 @@
 %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"
 %define _variant .opt
 %define _docdir %{_prefix}/share/doc
+%define _mandir %{_datadir}/man
 %endif
 
 # TDE 3.5.13 specific building variables
@@ -16,6 +17,9 @@ BuildRequires: autoconf automake libtool m4
 %define tde_includedir %{_includedir}/kde
 %define tde_libdir %{_libdir}/trinity
 
+# Ruby 1.9 includes are located in strance directories ... (taken from ruby 1.9 spec file)
+%global	_normalized_cpu	%(echo %{_target_cpu} | sed 's/^ppc/powerpc/;s/i.86/i386/;s/sparcv./sparc/;s/armv.*/arm/')
+
 
 Name:	 trinity-kdebindings
 Summary: TDE bindings to non-C++ languages
@@ -37,6 +41,13 @@ Source0: kdebindings-%{version}.tar.gz
 # RedHat Legacy patches (from Fedora)
 Patch1: kdebindings-3.5.6-libgcj.patch
 
+# [kdebindings] Removes 'hpi' support in openjdk (obsolete in openjdk 1.7.0) [Bug #978]
+Patch2: kdebindings-3.5.13-openjdk_remove_hpi_support.patch
+# [kdebindings] Allow compilation with Ruby >= 1.9 [Bug #597]
+Patch3: kdebindings-3.5.13-ruby_1.9.patch
+# [kdebindings] Fix various build issues [Bug #597]
+Patch4:	kdebindings-3.5.13-fixes.patch
+
 BuildRequires: tqtinterface-devel
 BuildRequires: trinity-arts-devel
 BuildRequires: trinity-kdelibs-devel
@@ -45,7 +56,11 @@ BuildRequires: desktop-file-utils
 BuildRequires: zlib-devel
 BuildRequires: perl(ExtUtils::MakeMaker)
 BuildRequires: gtk2-devel
+%if 0%{?fedora} >= 17
+BuildRequires: gdk-pixbuf2-devel
+%else
 BuildRequires: gdk-pixbuf-devel
+%endif
 BuildRequires: java-openjdk
 
 %if 0%{?fedora}
@@ -82,14 +97,18 @@ Provides: %{name}-ruby = %{version}-%{release}
 BuildRequires: java-1.4.2-gcj-compat-devel libgcj-devel gcc-java
 %else
 BuildRequires: java-devel >= 1.4.2
+%if 0%{?fedora} >= 17
+BuildRequires: java-1.7.0-openjdk-devel
+%else
 BuildRequires: java-1.6.0-openjdk-devel
 %endif
+%endif
 %define java_home %{_usr}/lib/jvm/java
 %define _with_java --with-java=%{java_home}
 Provides: %{name}-java = %{version}-%{release}
 
 %description
-KDE/DCOP bindings to non-C++ languages
+TDE/DCOP bindings to non-C++ languages
 
 %package devel
 Summary: Development files for %{name}
@@ -97,25 +116,42 @@ Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: trinity-kdelibs-devel 
 %description devel
-Development files for the KDE bindings.
+Development files for the TDE bindings.
 
 ## dcopperl
 %package dcopperl
 Summary: DCOP Bindings for Perl 
 Group:   Development/Libraries
 %description dcopperl
-Perl bindings to the DCOP interprocess communication protocol used by KDE
+Perl bindings to the DCOP interprocess communication protocol used by TDE
 
 
 %prep
 %setup -q -n kdebindings
 %patch1 -p1 -b .libgcj
 
+%if 0%{?fedora} >= 17
+%patch2 -p1 -b .libhpi
+%patch3 -p1
+%endif
+%patch4 -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" \
-  -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g"
+  -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \
+  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+
+# Adds non-standard Ruby include path in include dirs
+for d in \
+  qtruby/rubylib/qtruby \
+  qtruby/rubylib/designer/uilib \
+  qtruby/bin \
+  korundum/rubylib/korundum \
+  korundum/bin \
+; do
+  echo -e "\nINCLUDES += -I%{_usr}/include/%{_normalized_cpu}-%{_target_os}" >> "${d}/Makefile.am"
+done
 
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
 %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
@@ -134,7 +170,6 @@ unset JAVA_HOME ||:
 export DO_NOT_COMPILE="$DO_NOT_COMPILE python"
 
 %configure \
-  --includedir=%{tde_includedir} \
   --disable-rpath \
   --enable-new-ldflags \
   --disable-debug --disable-warnings \
@@ -142,12 +177,11 @@ export DO_NOT_COMPILE="$DO_NOT_COMPILE python"
   --with-extra-libs=%{_libdir} \
   --with-pythondir=%{_usr} \
   --enable-closure \
-  --disable-final \
+  --enable-final \
   %{?_with_java} %{!?_with_java:--without-java} \
   %{?_enable_qscintilla} %{!?_enable_qscintilla:--disable-qscintilla} \
   --with-extra-includes=%{_includedir}/tqt
 
-
 pushd dcopperl
 CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL INSTALLDIRS=vendor
 
@@ -158,7 +192,7 @@ sed -i Makefile \
 %__make OPTIMIZE="$RPM_OPT_FLAGS" ||:
 popd
 
-# smoke/ not smp-safe
+# smoke (not smp-safe)
 %__make -C smoke
 
 # The rest is smp-safe
@@ -241,8 +275,8 @@ update-desktop-database >& /dev/null ||:
 %doc rpmdocs/*
 %{_bindir}/*
 %{tde_libdir}/*
-%{_libdir}/lib*.la
-%{_libdir}/lib*.so.*
+%{_libdir}/*.la
+%{_libdir}/*.so.*
 %{_datadir}/appl*/*/*.desktop
 %{_datadir}/apps/embedjs/
 %{_datadir}/apps/kate/scripts/*
@@ -259,15 +293,20 @@ update-desktop-database >& /dev/null ||:
 #%{ruby_sitearch}/*
 #%{ruby_sitelib}/K*
 #%{ruby_sitelib}/Qt*
-%{_usr}/lib/ruby/*/*
+#%{_usr}/%{_lib}/ruby/*/*
 %{ruby_arch}/*.so.*
-%doc %lang(en) %{tde_docdir}/HTML/en/javalib/*
 
 # Excludes 'kjscmd' (conflicts with 'kdelibs' from RHEL6)
 %if "%{?_prefix}" == "/usr"
 %exclude %{_bindir}/kjscmd
-%endif
 %exclude %{_mandir}/man1/kjscmd*
+%endif
+
+%{_usr}/%{_lib}/korundum.la
+%{_usr}/%{_lib}/korundum.so.*
+%{_usr}/%{_lib}/qui.la
+%{_usr}/%{_lib}/qui.so.*
+%{_usr}/share/ruby/*
 
 
 %files dcopperl -f %{name}-dcopperl.list
@@ -277,16 +316,24 @@ update-desktop-database >& /dev/null ||:
 
 %files devel
 %defattr(-,root,root,-)
-%{tde_includedir}/*
-%{_libdir}/lib*.so
+%{_includedir}/*
+%{_libdir}/*.so
 %if "%{?_with_java:1}" == "1"
 %{_libdir}/jni/*.so
 %{_libdir}/jni/*.la
 %endif
 %{ruby_arch}/*.so
 %{ruby_arch}/*.la
+%{_usr}/%{_lib}/korundum.so
+%{_usr}/%{_lib}/qui.so
 
 %changelog
+* Tue Apr 24 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
+- Add support for Fedora 17
+- Removes 'hpi' support in openjdk (obsolete in openjdk 1.7.0) [Bug #978]
+- Allow compilation with Ruby >= 1.9 [Bug #597]
+- Fix various build issues [Bug #597]
+
 * Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
 - Fix HTML directory location
 
diff --git a/redhat/kdeedu/trinity-kdeedu-3.5.13.spec b/redhat/kdeedu/trinity-kdeedu-3.5.13.spec
index 6858904fe..b4e88e996 100644
--- a/redhat/kdeedu/trinity-kdeedu-3.5.13.spec
+++ b/redhat/kdeedu/trinity-kdeedu-3.5.13.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.13
 %endif
-%define release 2
+%define release 3
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -34,6 +34,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0: kdeedu-%{version}.tar.gz
 
+# [kdeedu] Fix compilation with GCC 4.7 [Bug #958]
+Patch1:		kdeedu-3.5.13-fix_gcc47_compilation.patch
+
 Provides: kdeedu3 = %{version}-%{release}
 
 Requires(post): /sbin/ldconfig
@@ -95,12 +98,13 @@ Requires: %{name} = %{version}-%{release}
 
 %prep
 %setup -q -n kdeedu
+%patch1 -p1 -b .gcc47
 
 # 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" \
-  -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g"
+  -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \
+  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
 
 %if 0%{?rhel} > 0
 rm -rf doc/kgeography kgeography
@@ -120,10 +124,6 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}"
 # Fix link with kparts
 export CXXFLAGS="${CXXFLAGS} -lkparts"
 
-%if 0%{?fedora}
-export CXXFLAGS="${CXXFLAGS} -fpermissive"
-%endif
-
 %configure \
    --enable-new-ldflags \
    --disable-dependency-tracking \
@@ -230,6 +230,9 @@ update-desktop-database >& /dev/null ||:
 
 
 %changelog
+* Wed Apr 25 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
+- Fix compilation with GCC 4.7 [Bug #958]
+
 * Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
 - Fix HTML directory location
 
diff --git a/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec b/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec
index 6ad18e8c2..dcf549729 100644
--- a/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec
+++ b/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec
@@ -41,16 +41,18 @@ Source0:	kdegraphics-%{version}.tar.gz
 
 # TDE 3.5.13
 ## RHEL / Fedora specific patches
-### [kdegraphics/ksnapshot] Missing -lXext in LDFLAGS (required for Fedora 15)
+# [kdegraphics/ksnapshot] Missing -lXext in LDFLAGS (required for Fedora 15)
 Patch0:		kdegraphics-3.5.13-ksnapshot_ldflags.patch
-### [kdegraphics/kpovmodeler] CMAKE does not detect GL/glu.h (on RHEL5)
+# [kdegraphics/kpovmodeler] CMAKE does not detect GL/glu.h (on RHEL5)
 Patch1:		kdegraphics-3.5.13-kpovmodeler_check_glu.patch
-### [kdegraphics/kfile-plugins/dependencies/poppler-tqt] Compile 'poppler-tqt' only if HAVE_POPPLER_016
+# [kdegraphics/kfile-plugins/dependencies/poppler-tqt] Compile 'poppler-tqt' only if HAVE_POPPLER_016
 Patch2:		kdegraphics-3.5.13-disable_poppler.patch
-### [kdegraphics/kpdf/xpdf] Disable 'mkstemps' support for RHEL5
+# [kdegraphics/kpdf/xpdf] Disable 'mkstemps' support for RHEL5
 Patch3:		kdegraphics-3.5.13-xpdf_disable_mkstemps.patch
-### [kdegraphics/kpovmodeler] CMAKE missing GLU_LIBRARIES
+# [kdegraphics/kpovmodeler] CMAKE missing GLU_LIBRARIES
 Patch4:		kdegraphics-3.5.13-kpovmodeler_missing_gl_ldflags.patch
+# [kdegraphics] Fix compilation with GCC 4.7
+Patch5:		kdegraphics-3.5.13-fix_gcc47_compilation.patch
 
 BuildRequires: tqtinterface-devel
 BuildRequires: trinity-kdelibs-devel
@@ -158,6 +160,7 @@ Requires: %{name} = %{version}-%{release}
 %patch3 -p1
 %endif
 %patch4 -p1
+%patch5 -p1 -b .gcc47
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
diff --git a/redhat/kdelibs/kdelibs-3.5.13-fix_dcoptypes_h.patch b/redhat/kdelibs/kdelibs-3.5.13-fix_dcoptypes_h.patch
new file mode 100644
index 000000000..45b622f5b
--- /dev/null
+++ b/redhat/kdelibs/kdelibs-3.5.13-fix_dcoptypes_h.patch
@@ -0,0 +1,22 @@
+--- a/dcop/dcoptypes.h.ORI	2012-04-24 16:24:05.448308109 -0400
++++ a/dcop/dcoptypes.h	2012-04-24 16:43:55.299809919 -0400
+@@ -22,6 +22,9 @@
+ #ifndef DCOPTYPES_H
+ #define DCOPTYPES_H
+ 
++// generic template fallback for unknown types
++template <class T> inline const char* dcopTypeName( const T& ) { return "<unknown>"; }
++
+ #include <dcopref.h>
+ 
+ // standard c/c++ types
+@@ -70,9 +73,6 @@
+ // And some KDE types
+ class KURL; inline const char* dcopTypeName( const KURL& ) { return "KURL"; }
+ 
+-// generic template fallback for unknown types
+-template <class T> inline const char* dcopTypeName( const T& ) { return "<unknown>"; }
+-
+ // type initialization for standard c/c++ types
+ inline void dcopTypeInit(bool& b){b=false;}
+ inline void dcopTypeInit(char& c){c=0;}
diff --git a/redhat/kdelibs/kdelibs-3.5.13-fix_kdirwatch.patch b/redhat/kdelibs/kdelibs-3.5.13-fix_kdirwatch.patch
new file mode 100644
index 000000000..c6792dfdc
--- /dev/null
+++ b/redhat/kdelibs/kdelibs-3.5.13-fix_kdirwatch.patch
@@ -0,0 +1,20 @@
+diff -urN tdelibs/kio/kio/kdirwatch.cpp tdelibs.new/kio/kio/kdirwatch.cpp
+--- tdelibs/kio/kio/kdirwatch.cpp	2012-04-05 13:26:08.000000000 -0500
++++ tdelibs.new/kio/kio/kdirwatch.cpp	2012-04-08 17:51:15.000000000 -0500
+@@ -1155,6 +1155,7 @@
+     if(!e->dirty) return NoChange;
+     e->dirty = false;
+   }
++  if (e->isDir) return Changed;
+ #endif
+ 
+   // Shouldn't happen: Ignore "unknown" notification method
+@@ -1184,6 +1185,8 @@
+   if (exists) {
+ 
+     if (e->m_status == NonExistent) {
++      // ctime is the 'creation time' on windows, but with qMax
++      // we get the latest change of any kind, on any platform.
+       e->m_ctime = stat_buf.st_ctime;
+       e->m_status = Normal;
+       e->m_nlink = stat_buf.st_nlink;
diff --git a/redhat/kdelibs/tdelibs-r14.spec b/redhat/kdelibs/tdelibs-r14.spec
index bbbcf60da..0dbf4a796 100755
--- a/redhat/kdelibs/tdelibs-r14.spec
+++ b/redhat/kdelibs/tdelibs-r14.spec
@@ -67,7 +67,7 @@ Requires:		avahi-tqt
 Obsoletes:		trinity-kdelibs <= 3.5.13
 
 %if "%{?_prefix}" == "/usr"
-Provides:	kdelibs%{?_qt_suffix} = %{version}
+Provides:		kdelibs%{?_qt_suffix} = %{version}
 Obsoletes:		kdelibs%{?_qt_suffix} <= 3.5.10
 %endif
 
@@ -124,6 +124,7 @@ export CMAKE_INCLUDE_PATH="%{_includedir}:%{_includedir}/tqt"
 cd build
 %cmake \
   -DHAVE_REAL_TQT=ON \
+  -DHTML_INSTALL_DIR=%{tde_docdir}/HTML \
   -DWITH_ARTS=ON \
   -DWITH_ALSA=ON \
   -DWITH_LIBART=ON \
@@ -203,13 +204,13 @@ EOF
 %{_bindir}/kcmshell
 %{_bindir}/kconf_update
 %{_bindir}/kcookiejar
-%{_bindir}/kde-config
+%{_bindir}/tde-config
 %{_bindir}/kde-menu
 %{_bindir}/kded
-%{_bindir}/kdeinit
-%{_bindir}/kdeinit_shutdown
-%{_bindir}/kdeinit_wrapper
-%{_bindir}/kdesu_stub
+%{_bindir}/tdeinit
+%{_bindir}/tdeinit_shutdown
+%{_bindir}/tdeinit_wrapper
+%{_bindir}/tdesu_stub
 %{_bindir}/kdontchangethehostname
 %{_bindir}/kdostartupconfig
 %{_bindir}/kfile
@@ -235,11 +236,11 @@ EOF
 %{_bindir}/make_driver_db_lpr
 %{_bindir}/meinproc
 %{_bindir}/networkstatustestservice
-%{_bindir}/start_kdeinit
-%{_bindir}/start_kdeinit_wrapper
+%{_bindir}/start_tdeinit
+%{_bindir}/start_tdeinit_wrapper
 %attr(4755,root,root) %{_bindir}/kgrantpty
 %{_libdir}/lib*.so.*
-%{_libdir}/libkdeinit_*.so
+%{_libdir}/libtdeinit_*.so
 %{_libdir}/lib*.la
 %{tde_libdir}/
 %{_datadir}/applications/kde/*.desktop
@@ -300,10 +301,8 @@ EOF
 %{_includedir}/
 %{_libdir}/lib*.so
 %{_libdir}/lib*.a
-%exclude %{_libdir}/libkdeinit_*.so
-
-# New in TDE 3.5.13
-%{_datadir}/cmake/kdelibs.cmake
+%exclude %{_libdir}/libtdeinit_*.so
+%{_datadir}/cmake/tdelibs.cmake
 
 %files apidocs
 %defattr(-,root,root,-)
diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
index c6a44125f..2ed52e51b 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 7
+%define release 8
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -52,12 +52,16 @@ Patch14:	kdelibs-3.5.13-enable_fam_gamin.patch
 Patch15:	kdelibs-3.5.13-fix_UTF8_encoding_for_WebDAV_directories.patch
 ## [kdelibs/kdeprint] Fix add printer [Bug #383]
 Patch16:	kdelibs-3.5.13-fix_add_printer.patch
+## [kdelibs/kio/kdirwatch] Fix "Konqueror: Does not update file pane with file changes" [Bug #756]
+Patch17:	kdelibs-3.5.13-fix_kdirwatch.patch
+## [kdelibs/dcop] Fix 'dcoptypes.h' for compilation with GCC 4.7
+Patch18:	kdelibs-3.5.13-fix_dcoptypes_h.patch
 
 BuildRequires:	libtool
 BuildRequires:	tqtinterface-devel
 BuildRequires:	trinity-arts-devel
 BuildRequires:	avahi-devel
-BuildRequires:	lua-devel
+#BuildRequires:	lua-devel
 BuildRequires:	krb5-devel libxslt-devel cups-devel libart_lgpl-devel pcre-devel
 BuildRequires:	libutempter-devel
 BuildRequires:	bzip2-devel
@@ -131,6 +135,8 @@ format for easy browsing
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
+%patch18 -p1
 
 
 %build
@@ -331,6 +337,10 @@ EOF
 
 
 %changelog
+* Tue Apr 24 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-8
+- Fix "Konqueror: Does not update file pane with file changes" [Bug #756] 
+- Fix compilation with GCC 4.7
+
 * Sat Jan 21 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-7
 - Fix UTF8 Encoding for WebDAV directories
 - Fix hardcoded path in 'add printer' [Bug #383]
diff --git a/redhat/kdepim/trinity-kdepim-3.5.13.spec b/redhat/kdepim/trinity-kdepim-3.5.13.spec
index 9482748e2..3cbfc506a 100644
--- a/redhat/kdepim/trinity-kdepim-3.5.13.spec
+++ b/redhat/kdepim/trinity-kdepim-3.5.13.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.13
 %endif
-%define release 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"
@@ -36,6 +36,11 @@ Summary:	PIM (Personal Information Manager) applications
 Prefix:		%{_prefix}
 
 Source0:	kdepim-%{version}.tar.gz
+
+# [kdepim] Fix compilation with GCC 4.7 [Bug #958]
+Patch1:		kdepim-3.5.13-fix_gcc47_compilation.patch
+
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	tqtinterface-devel
@@ -81,7 +86,7 @@ Development files for %{name}.
 
 %prep
 %setup -q -n kdepim
-
+%patch1 -p1 -b .gcc47
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -165,6 +170,9 @@ export PATH="%{_bindir}:${PATH}"
 %{_datadir}/cmake/*.cmake
 
 %changelog
+* Wed Apr 25 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
+- Fix compilation with GCC 4.7 [Bug #958]
+
 * Sun Nov 27 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
 - Add missing files '*.la'