RHEL/Fedora: more application fixes ...

42 files changed, 706 insertions, 340 deletions

diff --git a/redhat/applications/kdiff3/trinity-kdiff3-3.5.13.spec b/redhat/applications/kdiff3/trinity-kdiff3-3.5.13.spec
index a62ea4bda..f98c3d8ff 100644
--- a/redhat/applications/kdiff3/trinity-kdiff3-3.5.13.spec
+++ b/redhat/applications/kdiff3/trinity-kdiff3-3.5.13.spec
@@ -1,12 +1,13 @@
 # Default version for this component
 %define kdecomp kdiff3
 %define version 0.9.91
-%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 _docdir %{_datadir}/doc
+%define _mandir %{_datadir}/man
 %endif
 
 # TDE 3.5.13 specific building variables
@@ -43,7 +44,7 @@ BuildRequires: desktop-file-utils
 Shows the differences line by line and character by character (!).
 Provides an automatic merge-facility and
 an integrated editor for comfortable solving of merge-conflicts.
-Supports KIO on KDE (allows accessing ftp, sftp, fish, smb etc.).
+Supports KIO on TDE (allows accessing ftp, sftp, fish, smb etc.).
 Unicode & UTF-8 support
 
 
@@ -52,11 +53,12 @@ Unicode & UTF-8 support
 
 # 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"
+%__sed -i admin/acinclude.m4.in \
+  -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"
 
 
@@ -83,12 +85,16 @@ export PATH="%{_bindir}:${PATH}"
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+for f in hicolor locolor; do
+  touch --no-create %{_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+done
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+for f in hicolor locolor; do
+  touch --no-create %{_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+done
 
 
 %files
@@ -96,9 +102,10 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %doc AUTHORS COPYING
 %{_bindir}/*
 %{_datadir}/apps/*/
-%{_datadir}/icons/*/*/*/*
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/icons/locolor/*/*/*
 %{_datadir}/locale/*/*/*.mo
-%{_docdir}/HTML/*/*
+%{tde_docdir}/HTML/*/*
 %{_datadir}/services/*.desktop
 %{tde_libdir}/*.so
 %{_datadir}/applnk/Development/*.desktop
@@ -108,6 +115,11 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %{tde_libdir}/*.la
 
 %Changelog
+* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.91-4
+- Rebuilt for Fedora 17
+- Fix HTML directory location
+- Fix post and postun
+
 * Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.91-3
 - Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
 
diff --git a/redhat/applications/kdirstat/trinity-kdirstat.spec b/redhat/applications/kdirstat/trinity-kdirstat.spec
index 85161eabf..153c4b1a6 100644
--- a/redhat/applications/kdirstat/trinity-kdirstat.spec
+++ b/redhat/applications/kdirstat/trinity-kdirstat.spec
@@ -1,7 +1,7 @@
 # Default version for this component
 %define kdecomp kdirstat
 %define version 2.4.4
-%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"
@@ -57,11 +57,11 @@ own cleanup actions.
 # 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"
 
 
@@ -92,12 +92,16 @@ export PATH="%{_bindir}:${PATH}"
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+for f in hicolor locolor; do
+  touch --no-create %{_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+done
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+for f in hicolor locolor; do
+  touch --no-create %{_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+done
 
 
 %files -f %{kdecomp}.lang
@@ -108,9 +112,14 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %{_datadir}/apps/kconf_update/kdirstat.upd
 %{_datadir}/apps/kdirstat
 %{tde_docdir}/HTML/en/kdirstat
-%{_datadir}/icons/*/*/apps/kdirstat.png
+%{_datadir}/icons/hicolor/*/apps/kdirstat.png
+%{_datadir}/icons/locolor/*/apps/kdirstat.png
 
 
 %Changelog
+* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 2.4.4-2
+- Rebuilt for Fedora 17
+- Fix post and postun
+
 * Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 2.4.4-1
 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kdmtheme/trinity-kdmtheme.spec b/redhat/applications/kdmtheme/trinity-kdmtheme.spec
index 05f4b43a5..e2bd41958 100644
--- a/redhat/applications/kdmtheme/trinity-kdmtheme.spec
+++ b/redhat/applications/kdmtheme/trinity-kdmtheme.spec
@@ -1,7 +1,7 @@
 # Default version for this component
 %define kdecomp kdmtheme
 %define version 1.2.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"
@@ -32,7 +32,6 @@ Prefix:    %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
-Source1:	kdmtheme.lintian-overrides
 
 BuildRequires:	tqtinterface-devel
 BuildRequires:	trinity-kdelibs-devel
@@ -53,11 +52,11 @@ that allows you to easily install, remove and change your KDM themes.
 # 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"
 
 
@@ -77,20 +76,11 @@ export PATH="%{_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
-%__install -D -p -m644 %{SOURCE1} %{buildroot}%{_datadir}/lintian/overrides/kdmtheme-trinity
 
 %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,-)
@@ -100,9 +90,13 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %{tde_docdir}/HTML/en/kdmtheme/common
 %{tde_docdir}/HTML/en/kdmtheme/index.cache.bz2
 %{tde_docdir}/HTML/en/kdmtheme/index.docbook
-%{_datadir}/lintian/overrides/kdmtheme-trinity
 
 
 %Changelog
+* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.2.2-2
+- Rebuilt for Fedora 17
+- Removes post and postun
+- Removes the 'lintian' stuff from Debian
+
 * Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 1.2.2-1
 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/keep/trinity-keep.spec b/redhat/applications/keep/trinity-keep.spec
index 8b73ec156..2e172e5c4 100644
--- a/redhat/applications/keep/trinity-keep.spec
+++ b/redhat/applications/keep/trinity-keep.spec
@@ -1,7 +1,7 @@
 # Default version for this component
 %define kdecomp keep
 %define version 0.4.0
-%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"
@@ -53,11 +53,12 @@ Homepage: http://jr.falleri.free.fr/keep
 
 # 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"
+%__sed -i admin/acinclude.m4.in \
+  -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"
 
 
@@ -106,5 +107,8 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 
 %Changelog
+* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.0-2
+- Rebuilt for Fedora 17
+
 * 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/kerry/trinity-kerry.spec b/redhat/applications/kerry/trinity-kerry.spec
index 2949edcb4..cfe73a43d 100644
--- a/redhat/applications/kerry/trinity-kerry.spec
+++ b/redhat/applications/kerry/trinity-kerry.spec
@@ -57,11 +57,12 @@ filesystems, chat logs, mail and data, RSS and other.
 
 # 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"
+%__sed -i admin/acinclude.m4.in \
+  -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"
 
 
diff --git a/redhat/applications/kgtk-qt3/trinity-kgtk-qt3.spec b/redhat/applications/kgtk-qt3/trinity-kgtk-qt3.spec
index f8ef2b9e1..01ae9369b 100644
--- a/redhat/applications/kgtk-qt3/trinity-kgtk-qt3.spec
+++ b/redhat/applications/kgtk-qt3/trinity-kgtk-qt3.spec
@@ -1,7 +1,7 @@
 # Default version for this component
 %define kdecomp kgtk-qt3
 %define version 0.10.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"
@@ -88,17 +88,6 @@ export PATH="%{_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 
 
-%post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-/sbin/ldconfig || :
-
-%postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-/sbin/ldconfig || :
-
-
 %files -f kdialogd3.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO
@@ -112,5 +101,9 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 
 %Changelog
+* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.2-2
+- Rebuilt for Fedora 17
+- Removes post and postun
+
 * Thu Dec 01 2011 Francois Andriot <francois.andriot@free.fr> - 0.10.2-1
 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kile/trinity-kile.spec b/redhat/applications/kile/trinity-kile.spec
index 36c013774..1b106bb88 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 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"
@@ -32,7 +32,6 @@ Prefix:    %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
-Source1:	%{kdecomp}.xpm
 
 BuildRequires:	tqtinterface-devel
 BuildRequires:	trinity-kdelibs-devel
@@ -446,7 +445,6 @@ export PATH="%{_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
-%__install -D -p -m0644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/kile.xpm
 %__chmod +x %{buildroot}%{_datadir}/apps/kile/test/runTests.sh
 
 %clean
@@ -475,7 +473,6 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %{_datadir}/icons/hicolor/scalable/apps/kile.svgz
 %{tde_docdir}/HTML/en/kile
 %{_datadir}/mimelnk/text/x-kilepr.desktop
-%{_datadir}/pixmaps/kile.xpm
 
 %files i18n-da
 %lang(da) %{tde_docdir}/HTML/da/kile
@@ -623,6 +620,10 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 
 %Changelog
+* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 2.0.2-3
+- Rebuilt for Fedora 17
+- Removes the XPM icon
+
 * Fri Apr 20 2012 Francois Andriot <francois.andriot@free.fr> - 2.0.2-2
 - Fix file conflict with trinity-kdelibs
 
diff --git a/redhat/applications/kima/trinity-kima.spec b/redhat/applications/kima/trinity-kima.spec
index a6f8e2ab1..9403f857c 100644
--- a/redhat/applications/kima/trinity-kima.spec
+++ b/redhat/applications/kima/trinity-kima.spec
@@ -1,7 +1,7 @@
 # Default version for this component
 %define kdecomp kima
 %define version 0.7.3.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"
@@ -52,11 +52,11 @@ panel.
 # 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"
 
 
@@ -87,13 +87,9 @@ export PATH="%{_bindir}:${PATH}"
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 /sbin/ldconfig || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 /sbin/ldconfig || :
 
 
@@ -109,5 +105,9 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 
 %Changelog
+* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.7.3.2-2
+- Rebuilt for Fedora 17
+- Fix post and postun
+
 * Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.7.3.2-1
 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kio-locate/kio-locate-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/kio-locate/kio-locate-3.5.13-fix_gcc47_compilation.patch
new file mode 100644
index 000000000..2f08804da
--- /dev/null
+++ b/redhat/applications/kio-locate/kio-locate-3.5.13-fix_gcc47_compilation.patch
@@ -0,0 +1,22 @@
+--- kio-locate/src/SConscript.ORI	2012-05-02 00:23:36.637608539 +0200
++++ kio-locate/src/SConscript	2012-05-02 00:23:44.142459165 +0200
+@@ -28,7 +28,7 @@
+     pattern.cpp
+ """
+ obj.libs='tqt kio'
+-obj.linkflags='-module' # add more link flags
++#obj.linkflags='-module' # add more link flags
+ obj.execute()
+ 
+ # Install the protocol files
+--- kio-locate/admin/kde.py.ORI	2012-05-02 00:37:55.095993387 +0200
++++ kio-locate/admin/kde.py	2012-05-02 00:38:34.615142101 +0200
+@@ -781,7 +781,7 @@
+ 		lenv.KDEinstall( 'KDEDOC', lenv.join(lang,destination), lenv.join(folder,'index.cache.bz2') )
+ 		
+ 		if env['_INSTALL']:
+-			dir=lenv.join(lenv.getInstDirForResType('KDEDOC'), lang, destination)
++			dir=lenv.join(env['DESTDIR'], lenv.getInstDirForResType('KDEDOC'), lang, destination)
+ 			comp='mkdir -p %s && cd %s && rm -f common && ln -s ../common common' % (dir, dir)
+ 			lenv.Execute(comp)
+ 
diff --git a/redhat/applications/kio-locate/trinity-kio-locate.spec b/redhat/applications/kio-locate/trinity-kio-locate.spec
index 1ff1b119b..7f43664d0 100644
--- a/redhat/applications/kio-locate/trinity-kio-locate.spec
+++ b/redhat/applications/kio-locate/trinity-kio-locate.spec
@@ -1,7 +1,7 @@
 # Default version for this component
 %define kdecomp kio-locate
 %define version 0.4.5
-%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"
@@ -33,6 +33,8 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
 
+# [kio-locate] Fix compilation with GCC 4.7
+Patch1:		kio-locate-3.5.13-fix_gcc47_compilation.patch
 
 BuildRequires: tqtinterface-devel
 BuildRequires: trinity-kdelibs-devel
@@ -43,7 +45,7 @@ BuildRequires:	scons
 
 %description
 Adds support for the "locate:" and "locater:"
-protocols to Konqueror and other KDE applications.
+protocols to Konqueror and other TDE applications.
 
 This enables you to perform locate searches as you
 would in a terminal. The result is displayed just
@@ -51,16 +53,17 @@ as a directory.
 
 
 %prep
-unset QTDIR; . /etc/profile.d/qt.sh
 %setup -q -n applications/%{kdecomp}
+%patch1 -p1
 
 # Ugly hack to modify TQT include directory inside SCONS files.
 # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
 %__sed -i admin/kde.py \
-  -e "s,/usr/include/tqt,%{_includedir}/tqt,g"
+  -e "s|/usr/include/tqt|%{_includedir}/tqt|g"
 
 
 %build
+unset QTDIR; . /etc/profile.d/qt.sh
 export PATH="%{_bindir}:${PATH}"
 export LDFLAGS="-L%{_libdir} -I%{_includedir}"
 scons configure
@@ -76,14 +79,6 @@ scons install DESTDIR=%{buildroot}
 %__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,-)
@@ -100,6 +95,11 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 
 %Changelog
+* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.5-2
+- Rebuilt for Fedora 17
+- Removes post and postun
+- Fix compilation with GCC 4.7
+
 * Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.5-1
 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
 
diff --git a/redhat/applications/kio-umountwrapper/trinity-kio-umountwrapper.spec b/redhat/applications/kio-umountwrapper/trinity-kio-umountwrapper.spec
index 172f54bf3..350e38237 100644
--- a/redhat/applications/kio-umountwrapper/trinity-kio-umountwrapper.spec
+++ b/redhat/applications/kio-umountwrapper/trinity-kio-umountwrapper.spec
@@ -1,7 +1,7 @@
 # Default version for this component
 %define kdecomp kio-umountwrapper
 %define version 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"
@@ -52,12 +52,12 @@ unset QTDIR; . /etc/profile.d/qt.sh
 
 # 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"
+%__sed -i admin/acinclude.m4.in \
+  -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 "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 
@@ -83,14 +83,6 @@ export PATH="%{_bindir}:${PATH}"
 %__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,-)
@@ -99,6 +91,10 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 
 %Changelog
+* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.2-2
+- Rebuilt for Fedora 17
+- Removes post and postun
+
 * Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.2-1
 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
 
diff --git a/redhat/applications/kiosktool/trinity-kiosktool.spec b/redhat/applications/kiosktool/trinity-kiosktool.spec
index ec96de232..523f5682e 100644
--- a/redhat/applications/kiosktool/trinity-kiosktool.spec
+++ b/redhat/applications/kiosktool/trinity-kiosktool.spec
@@ -1,7 +1,7 @@
 # Default version for this component
 %define kdecomp kiosktool
 %define version 1.0
-%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"
@@ -47,12 +47,14 @@ groups of users.
 
 # 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"
+%__sed -i admin/acinclude.m4.in \
+  -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"
-%__make -f admin/Makefile.common
+%__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
 unset QTDIR || : ; source /etc/profile.d/qt.sh
@@ -103,13 +105,13 @@ fi
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+touch --no-create %{_datadir}/icons/crystalsvg ||:
+gtk-update-icon-cache -q %{_datadir}/icons/crystalsvg 2> /dev/null ||:
 update-desktop-database >& /dev/null ||:
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+touch --no-create %{_datadir}/icons/crystalsvg ||:
+gtk-update-icon-cache -q %{_datadir}/icons/crystalsvg 2> /dev/null ||:
 update-desktop-database >& /dev/null ||:
 
 
@@ -121,11 +123,15 @@ update-desktop-database >& /dev/null ||:
 %{_bindir}/kiosktool-kdedirs
 %{_datadir}/applications/kde/kiosktool.desktop
 %{_datadir}/apps/kiosktool/*.png
-%{_docdir}/HTML/en/kiosktool/
+%{tde_docdir}/HTML/en/kiosktool/
 %{_datadir}/icons/crystalsvg/*/apps/kiosktool.png
 %{_datadir}/apps/kiosktool/kiosk_data.xml
 %{_datadir}/apps/kiosktool/kiosktoolui.rc
 
 %Changelog
+* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-2
+- Rebuilt for Fedora 17
+- Fix post and postun
+
 * Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-1
 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kmplayer/kmplayer-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/kmplayer/kmplayer-3.5.13-fix_gcc47_compilation.patch
new file mode 100644
index 000000000..02962e256
--- /dev/null
+++ b/redhat/applications/kmplayer/kmplayer-3.5.13-fix_gcc47_compilation.patch
@@ -0,0 +1,45 @@
+commit 5106117b5c1439d3fee08395c1a025f62d30a53e
+Author: Darrell Anderson <humanreadable@yahoo.com>
+Date:   1335631986 -0500
+
+    GCC 4.7 fixes.
+
+diff --git a/src/gstplayer.cpp b/src/gstplayer.cpp
+index ebf7b0d..c4bf580 100644
+--- a/src/gstplayer.cpp
++++ b/src/gstplayer.cpp
+@@ -1003,11 +1003,16 @@ int main(int argc, char **argv) {
+     gstapp->exec ();
+ 
+     XLockDisplay(display);
+-    XClientMessageEvent ev = {
+-        ClientMessage, 0, true, display, wid, 
+-        XInternAtom (display, "XVIDEO", false), 8, {b: "quit_now"}
+-    };
+-    XSendEvent (display, wid, false, StructureNotifyMask, (XEvent *) & ev);
++    XEvent ev;
++    ev.xclient.type = ClientMessage;
++    ev.xclient.serial = 0;
++    ev.xclient.send_event = true;
++    ev.xclient.display = display;
++    ev.xclient.window = wid;
++    ev.xclient.message_type = XInternAtom (display, "XVIDEO", false);
++    ev.xclient.format = 8;
++    strcpy(ev.xclient.data.b, "quit_now");
++    XSendEvent (display, wid, false, StructureNotifyMask, &ev);
+     XFlush (display);
+     XUnlockDisplay(display);
+     eventThread->wait (500);
+diff --git a/src/kmplayerapp.cpp b/src/kmplayerapp.cpp
+index 27b26cd..bdeac91 100644
+--- a/src/kmplayerapp.cpp
++++ b/src/kmplayerapp.cpp
+@@ -17,6 +17,8 @@
+ 
+ #undef Always
+ 
++#include <unistd.h>
++
+ // include files for QT
+ #include <tqdatastream.h>
+ #include <tqregexp.h>
diff --git a/redhat/applications/kmplayer/kmplayer-3.5.13-ftbfs.patch b/redhat/applications/kmplayer/kmplayer-3.5.13-ftbfs.patch
index 6b606e32b..f3a5d51da 100644
--- a/redhat/applications/kmplayer/kmplayer-3.5.13-ftbfs.patch
+++ b/redhat/applications/kmplayer/kmplayer-3.5.13-ftbfs.patch
@@ -4,7 +4,7 @@
  kgstplayer_SOURCES= gstplayer.cpp
  
  knpplayer_LDADD= $(LIBNSPR_LIBS)
-+knpplayer_LDFLAGS= -lX11
++knpplayer_LDFLAGS= -lX11 -lgmodule-2.0
  knpplayer_SOURCES= npplayer.c
  
  xdg_apps_DATA = kmplayer.desktop
diff --git a/redhat/applications/kmplayer/trinity-kmplayer.spec b/redhat/applications/kmplayer/trinity-kmplayer.spec
index 9b938fc7e..933e47ee2 100644
--- a/redhat/applications/kmplayer/trinity-kmplayer.spec
+++ b/redhat/applications/kmplayer/trinity-kmplayer.spec
@@ -1,7 +1,7 @@
 # Default version for this component
 %define kdecomp kmplayer
 %define version 0.10.0c
-%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"
@@ -34,6 +34,9 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:	%{kdecomp}-3.5.13.tar.gz
 Patch0:		kmplayer-3.5.13-ftbfs.patch
 
+# [kmplayer] Fix compilation with GCC 4.7 [Commit #5106117b]
+Patch1:		kmplayer-3.5.13-fix_gcc47_compilation.patch
+
 BuildRequires: tqtinterface-devel
 BuildRequires: trinity-kdelibs-devel
 BuildRequires: trinity-kdebase-devel
@@ -96,18 +99,20 @@ Documention for KMPlayer, a basic audio/video viewer application for KDE.
 unset QTDIR; . /etc/profile.d/qt.sh
 %setup -q -n applications/%{kdecomp}
 %patch0 -p1
+%patch1 -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"
+%__sed -i admin/acinclude.m4.in \
+  -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 "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__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
 export PATH="%{_bindir}:${PATH}"
 export LDFLAGS="-L%{_libdir} -I%{_includedir}"
@@ -150,7 +155,7 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %files -f %{kdecomp}.lang
 %defattr(-,root,root,-)
-%doc README TODO
+%doc AUTHORS COPYING ChangeLog INSTALL README TODO kmplayer.lsm
 %{_bindir}/kmplayer
 %{_bindir}/knpplayer
 %{_bindir}/kxvplayer
@@ -193,6 +198,9 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 
 %Changelog
+* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-2
+- Fix compilation with GCC 4.7 [Commit #5106117b]
+
 * Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-1
 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
 
diff --git a/redhat/applications/kmyfirewall/kmyfirewall-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/kmyfirewall/kmyfirewall-3.5.13-fix_gcc47_compilation.patch
new file mode 100644
index 000000000..4daf67e9b
--- /dev/null
+++ b/redhat/applications/kmyfirewall/kmyfirewall-3.5.13-fix_gcc47_compilation.patch
@@ -0,0 +1,39 @@
+--- ./kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp.orig	2012-05-02 04:58:04.051212974 -0400
++++ ./kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp	2012-05-02 05:07:11.093803088 -0400
+@@ -305,14 +305,15 @@
+ 	if ( m_zone && ! m_host ) {
+ 		if ( onOff ) {
+ 			m_protocolUsage = 0;
+-			if ( KMFProtocolUsage* pro = m_zone->findProtocolUsageByProtocolUuid( protUsage->protocol()->uuid() ) ) {
++			KMFProtocolUsage* pro;
++			if ( pro = m_zone->findProtocolUsageByProtocolUuid( protUsage->protocol()->uuid() ) ) {
+ 				m_protocolUsage = pro;
+ 			} else { 
+ 					KMFUndoEngine::instance()->startTransaction(
+ 					m_zone,
+ 					i18n("Add protocol %1 to zone %2.").tqarg( protUsage->protocol()->name() ).tqarg( m_zone->guiName() )
+ 					);
+-					KMFProtocolUsage * pro = m_zone->addProtocolUsage( protUsage->protocol()->uuid(), protUsage->protocol()->getDOMTree() );
++					pro = m_zone->addProtocolUsage( protUsage->protocol()->uuid(), protUsage->protocol()->getDOMTree() );
+ 			
+ 				if ( pro ) {
+ 					kdDebug() << "Added Protocol to zone: " << m_zone-> name()  << endl;
+@@ -341,15 +342,16 @@
+ 	} else if ( m_host ) {
+ 		if ( onOff ) {
+ 			m_protocolUsage = 0;
++			KMFProtocolUsage* pro;
+ 			
+-				if ( KMFProtocolUsage* pro = m_host->findProtocolUsageByProtocolUuid( protUsage->protocol()->uuid() ) ) {
++				if ( pro = m_host->findProtocolUsageByProtocolUuid( protUsage->protocol()->uuid() ) ) {
+ 				m_protocolUsage = pro;
+ 			} else {
+ 				KMFUndoEngine::instance()->startTransaction(
+ 					m_host,
+ 					i18n("Add protocol %1 to host %2.").tqarg( protUsage->protocol()->name() ).tqarg( m_host->guiName() )
+ 					);
+-					KMFProtocolUsage * pro = m_host->addProtocolUsage( protUsage->protocol()->uuid(), protUsage->protocol() ->getDOMTree() );
++					pro = m_host->addProtocolUsage( protUsage->protocol()->uuid(), protUsage->protocol() ->getDOMTree() );
+ 			
+ 				if ( pro ) {
+ 					kdDebug() << "Added Protocol to host: " << m_host-> name()  << endl;
diff --git a/redhat/applications/kmyfirewall/trinity-kmyfirewall.spec b/redhat/applications/kmyfirewall/trinity-kmyfirewall.spec
index 54befc39d..ddc21d3fa 100644
--- a/redhat/applications/kmyfirewall/trinity-kmyfirewall.spec
+++ b/redhat/applications/kmyfirewall/trinity-kmyfirewall.spec
@@ -1,7 +1,7 @@
 # Default version for this component
 %define kdecomp kmyfirewall
 %define version 1.1.1
-%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"
@@ -33,6 +33,8 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
 
+# [kmyfirewall] GCC 4.7 fixes. [Commit #88d2d2a7]
+Patch1:		kmyfirewall-3.5.13-fix_gcc47_compilation.patch
 
 BuildRequires: tqtinterface-devel
 BuildRequires: trinity-kdelibs-devel
@@ -64,15 +66,16 @@ Requires:		%{name} = %{version}-%{release}
 %prep
 unset QTDIR; . /etc/profile.d/qt.sh
 %setup -q -n applications/%{kdecomp}
+%patch1 -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 -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 
@@ -98,13 +101,17 @@ export PATH="%{_bindir}:${PATH}"
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+for f in hicolor Locolor; do
+  touch --no-create %{_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+done
 /sbin/ldconfig || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+for f in hicolor Locolor; do
+  touch --no-create %{_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+done
 /sbin/ldconfig || :
 
 
@@ -158,7 +165,8 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %{tde_docdir}/HTML/en/kmyfirewall/common
 %{tde_docdir}/HTML/en/kmyfirewall/index.cache.bz2
 %{tde_docdir}/HTML/en/kmyfirewall/index.docbook
-%{_datadir}/icons/*/*/apps/kmyfirewall.png
+%{_datadir}/icons/hicolor/*/apps/kmyfirewall.png
+%{_datadir}/icons/Locolor/*/apps/kmyfirewall.png
 %{_datadir}/mimelnk/application/kmfgrs.desktop
 %{_datadir}/mimelnk/application/kmfnet.desktop
 %{_datadir}/mimelnk/application/kmfpkg.desktop
@@ -174,6 +182,9 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %{_libdir}/libkmfwidgets.so
 
 %Changelog
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-1
+* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.1.1-2
+- GCC 4.7 fixes. [Commit #88d2d2a7]
+
+* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.1.1-1
 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
 
diff --git a/redhat/applications/kmymoney/kmymoney-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/kmymoney/kmymoney-3.5.13-fix_gcc47_compilation.patch
new file mode 100644
index 000000000..f9c6cb62e
--- /dev/null
+++ b/redhat/applications/kmymoney/kmymoney-3.5.13-fix_gcc47_compilation.patch
@@ -0,0 +1,11 @@
+--- kmymoney/kmymoney2/plugins/ofximport/ofxpartner.cpp.ORI	2012-05-02 05:22:43.788349181 -0400
++++ kmymoney/kmymoney2/plugins/ofximport/ofxpartner.cpp	2012-05-02 05:23:01.910909490 -0400
+@@ -20,6 +20,8 @@
+ #include <config.h>
+ #endif
+ 
++#include <unistd.h>
++
+ // ----------------------------------------------------------------------------
+ // QT Includes
+ 
diff --git a/redhat/applications/kmymoney/trinity-kmymoney-3.5.13.spec b/redhat/applications/kmymoney/trinity-kmymoney-3.5.13.spec
index c0af9baf6..f1a9dea58 100644
--- a/redhat/applications/kmymoney/trinity-kmymoney-3.5.13.spec
+++ b/redhat/applications/kmymoney/trinity-kmymoney-3.5.13.spec
@@ -1,12 +1,13 @@
 # Default version for this component
 %define kdecomp kmymoney
 %define version 1.0.5
-%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"
 %define _variant .opt
-%define _docdir %{_prefix}/share/doc
+%define _docdir %{_datadir}/doc
+%define _mandir %{_datadir}/man
 %endif
 
 # TDE 3.5.13 specific building variables
@@ -36,12 +37,15 @@ Source0:	%{kdecomp}-3.5.13.tar.gz
 Source1:	kmymoneytitlelabel.png
 Patch0:		kmymoney-3.5.13-recode_ftbfs.patch
 
-## TDE Commit: 2a54aa58cfe166f48d6f1395cbc6c9bfd5e31bfc
+# TDE Commit: 2a54aa58cfe166f48d6f1395cbc6c9bfd5e31bfc
 Patch1:		kmymoney-3.5.13-lots_of_crash.patch
 
-## TDE Commit: 8654cea10f6902719006d5975db7dc07b2fcc713
+# TDE Commit: 8654cea10f6902719006d5975db7dc07b2fcc713
 Patch2:		kmymoney-3.5.13-update_to_1.0.5.patch
 
+# [kmymoney] Fix compilation with GCC 4.7 [Bug #958]
+Patch3:		kmymoney-3.5.13-fix_gcc47_compilation.patch
+
 BuildRequires: tqtinterface-devel
 BuildRequires: trinity-arts-devel
 BuildRequires: trinity-kdelibs-devel
@@ -87,16 +91,17 @@ This package contains development files needed for KMyMoney plugins.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 %__install -m644 %{SOURCE1} kmymoney2/widgets/
 
 # 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 "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 
@@ -142,19 +147,25 @@ if [ -d %{buildroot}$HTML_DIR ]; then
 	done
 fi
 
+%find_lang kmymoney2
+
 %clean
 %__rm -rf %{buildroot}
 
 
 %post
 /sbin/ldconfig
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+for f in hicolor locolor Tango oxygen; do
+  touch --no-create %{_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+done
 
 %postun
 /sbin/ldconfig
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+for f in hicolor locolor Tango oxygen; do
+  touch --no-create %{_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+done
 
 %files
 %defattr(-,root,root,-)
@@ -168,7 +179,7 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %{tde_libdir}/kmm_ofximport.la
 %{tde_libdir}/kmm_ofximport.so
 
-%files common
+%files common -f kmymoney2.lang
 %defattr(-,root,root,-)
 %{_datadir}/apps/kmymoney2/html/
 %{_datadir}/apps/kmymoney2/icons/*/*/*/*.png
@@ -178,9 +189,12 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %{_datadir}/apps/kmymoney2/templates/*/*.kmt
 %{_datadir}/apps/kmymoney2/tips
 %{_datadir}/config.kcfg/kmymoney2.kcfg
-%{_datadir}/icons/*/*/*/*.png
-%{_datadir}/icons/*/*/*.svgz
-%{_datadir}/locale/*/LC_MESSAGES/*.mo
+%{_datadir}/icons/hicolor/*/*/*.png
+%{_datadir}/icons/Tango/*/*/*.png
+%{_datadir}/icons/Tango/scalable/*.svgz
+%{_datadir}/icons/locolor/*/*/*.png
+%{_datadir}/icons/oxygen/*/*/*.png
+%{_datadir}/icons/oxygen/scalable/*.svgz
 %{tde_docdir}/HTML/en/kmymoney2/*.docbook
 %{tde_docdir}/HTML/en/kmymoney2/*.png
 %{tde_docdir}/HTML/en/kmymoney2/common
@@ -201,6 +215,10 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %{_usr}/%{_lib}/qt-3.3/plugins/designer/libkmymoney.so
 
 %Changelog
+* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.5-2
+- Rebuild for Fedora 17
+- Fix compilation with GCC 4.7 [Bug #958]
+
 * Sun Jan 15 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.5-1
 - Updates to upstream 1.0.5
 
diff --git a/redhat/applications/knemo/trinity-knemo.spec b/redhat/applications/knemo/trinity-knemo.spec
index 4a26e682b..441a78732 100644
--- a/redhat/applications/knemo/trinity-knemo.spec
+++ b/redhat/applications/knemo/trinity-knemo.spec
@@ -1,12 +1,12 @@
 # Default version for this component
 %define kdecomp knemo
 %define version 0.4.8
-%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"
 %define _variant .opt
-%define _docdir %{_prefix}/share/doc
+%define _docdir %{_datadir}/doc
 %endif
 
 # TDE 3.5.13 specific building variables
@@ -59,11 +59,11 @@ Homepage: http://extragear.kde.org/apps/knemo/
 # 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 "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 
@@ -88,12 +88,12 @@ export PATH="%{_bindir}:${PATH}"
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/crystalsvg || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/crystalsvg || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
 
 
 %files
@@ -111,5 +111,8 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 
 %Changelog
+* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.8-2
+- Rebuild for Fedora 17
+
 * Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.8-1
 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/knetload/trinity-knetload.spec b/redhat/applications/knetload/trinity-knetload.spec
index 1e90086c7..55b1383c2 100644
--- a/redhat/applications/knetload/trinity-knetload.spec
+++ b/redhat/applications/knetload/trinity-knetload.spec
@@ -1,7 +1,7 @@
 # Default version for this component
 %define kdecomp knetload
 %define version 2.3
-%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"
@@ -56,11 +56,11 @@ KNetLoad can monitor just about any network device.
 # 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 "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 
@@ -90,12 +90,16 @@ export PATH="%{_bindir}:${PATH}"
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+for f in crystalsvg locolor ; do
+  touch --no-create %{_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+done
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+for f in crystalsvg locolor ; do
+  touch --no-create %{_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+done
 
 
 %files -f %{kdecomp}.lang
@@ -103,9 +107,13 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %{_bindir}/knetload
 %{_datadir}/applications/kde/knetload.desktop
 %{_datadir}/apps/knetload
-%{_datadir}/icons/*/*/apps/knetload.png
+%{_datadir}/icons/crystalsvg/*/apps/knetload.png
+%{_datadir}/icons/locolor/*/apps/knetload.png
 
 
 %Changelog
+* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 2.3-2
+- Rebuild for Fedora 17
+
 * Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 2.3-1
 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/knetstats/trinity-knetstats.spec b/redhat/applications/knetstats/trinity-knetstats.spec
index f27ddeeda..0179cdd61 100644
--- a/redhat/applications/knetstats/trinity-knetstats.spec
+++ b/redhat/applications/knetstats/trinity-knetstats.spec
@@ -51,11 +51,11 @@ network interface on a system tray icon
 # 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 "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 
diff --git a/redhat/applications/knetworkmanager/trinity-knetworkmanager.spec b/redhat/applications/knetworkmanager/trinity-knetworkmanager.spec
index 1c45101ff..3dbcc7458 100644
--- a/redhat/applications/knetworkmanager/trinity-knetworkmanager.spec
+++ b/redhat/applications/knetworkmanager/trinity-knetworkmanager.spec
@@ -5,7 +5,7 @@
 %else
 %define version 0.8
 %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"
@@ -130,7 +130,7 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %{_sysconfdir}/dbus-1/system.d/knetworkmanager.conf
 %{_datadir}/applications/kde/knetworkmanager.desktop
 %{_datadir}/apps/knetworkmanager
-%{_datadir}/icons/*/*/apps/knetworkmanager*
+%{_datadir}/icons/hicolor/*/apps/knetworkmanager*
 %{_datadir}/servicetypes/knetworkmanager_plugin.desktop
 %{_datadir}/servicetypes/knetworkmanager_vpnplugin.desktop
 
@@ -142,6 +142,9 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %{tde_libdir}/*.so
 
 %changelog
+* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.8-3 / 0.9-3
+- Rebuild for Fedora 17
+
 * Sat Nov 13 2011 Francois Andriot <francois.andriot@free.fr> - 0.8-2 / 0.9-2
 - Remove faulty patch for WPA authentication
 
diff --git a/redhat/applications/knights/trinity-knights.spec b/redhat/applications/knights/trinity-knights.spec
index f1b53b788..6338661d7 100644
--- a/redhat/applications/knights/trinity-knights.spec
+++ b/redhat/applications/knights/trinity-knights.spec
@@ -1,7 +1,7 @@
 # Default version for this component
 %define kdecomp knights
 %define version 0.6
-%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"
@@ -62,11 +62,11 @@ Here's a quick list of Knights' key features:
 # 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 "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 
@@ -107,11 +107,14 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %{_datadir}/applnk/Games/Board/knights.desktop
 %{_datadir}/apps/knights
 %{tde_docdir}/HTML/*/knights
-%{_datadir}/icons/*/*/*/*.png
+%{_datadir}/icons/hicolor/*/*/*.png
 %{_datadir}/mimelnk/application/pgn.desktop
 
 
 %Changelog
+* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.6-3
+- Rebuild for Fedora 17
+
 * Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.6-2
 - Fix HTML directory location
 
diff --git a/redhat/applications/knowit/trinity-knowit.spec b/redhat/applications/knowit/trinity-knowit.spec
index 17a235f7e..4b40fe29f 100644
--- a/redhat/applications/knowit/trinity-knowit.spec
+++ b/redhat/applications/knowit/trinity-knowit.spec
@@ -52,11 +52,11 @@ but KDE-based, and requires Trinity.
 # 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 "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 
diff --git a/redhat/applications/knutclient/trinity-knutclient.spec b/redhat/applications/knutclient/trinity-knutclient.spec
index be92e93df..ef45ad28d 100644
--- a/redhat/applications/knutclient/trinity-knutclient.spec
+++ b/redhat/applications/knutclient/trinity-knutclient.spec
@@ -1,7 +1,7 @@
 # Default version for this component
 %define kdecomp knutclient
 %define version 0.9.5
-%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"
@@ -53,12 +53,12 @@ unset QTDIR; . /etc/profile.d/qt.sh
 
 # 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"
+%__sed -i admin/acinclude.m4.in \
+  -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 "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 
@@ -86,12 +86,16 @@ export PATH="%{_bindir}:${PATH}"
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+for f in hicolor locolor; do
+  touch --no-create %{_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+done
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+for f in hicolor locolor; do
+  touch --no-create %{_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+done
 
 
 %files -f %{kdecomp}.lang
@@ -103,10 +107,13 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %{_datadir}/apps/knutclient
 %{tde_docdir}/HTML/cs/knutclient
 %{tde_docdir}/HTML/en/knutclient
-%{_datadir}/icons/*/*/apps/*.png
-
+%{_datadir}/icons/hicolor/*/apps/*.png
+%{_datadir}/icons/locolor/*/apps/*.png
 
 %Changelog
+* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.5-2
+- Rebuild for Fedora 17
+
 * Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.5-1
 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
 
diff --git a/redhat/applications/koffice/koffice-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/koffice/koffice-3.5.13-fix_gcc47_compilation.patch
index d632a9d79..909107727 100644
--- a/redhat/applications/koffice/koffice-3.5.13-fix_gcc47_compilation.patch
+++ b/redhat/applications/koffice/koffice-3.5.13-fix_gcc47_compilation.patch
@@ -17,40 +17,3 @@
          }
      
          ~Iterator()
---- koffice/filters/chalk/png/kis_png_converter.cc.gcc47	2012-04-26 16:38:35.805156927 -0400
-+++ koffice/filters/chalk/png/kis_png_converter.cc	2012-04-26 16:49:27.179323394 -0400
-@@ -43,6 +43,8 @@
- #include <kis_paint_layer.h>
- #include <kis_group_layer.h>
- 
-+#include <zlib.h>
-+
- namespace {
- 
-     const TQ_UINT8 PIXEL_BLUE = 0;
-@@ -222,6 +224,7 @@
-     
-     // Read image profile
-     png_charp profile_name, profile_data;
-+    unsigned char* uprofile_data = reinterpret_cast<unsigned char*>(profile_data);
-     int compression_type;
-     png_uint_32 proflen;
-     int number_of_passes = 1;
-@@ -230,7 +233,7 @@
-         number_of_passes = png_set_interlace_handling(png_ptr);
- 
-     KisProfile* profile = 0;
--    if(png_get_iCCP(png_ptr, info_ptr, &profile_name, &compression_type, &profile_data, &proflen))
-+    if(png_get_iCCP(png_ptr, info_ptr, &profile_name, &compression_type, &uprofile_data, &proflen))
-     {
-         TQByteArray profile_rawdata;
-         // XXX: Hardcoded for icc type -- is that correct for us?
-@@ -627,7 +630,7 @@
-         } else { // Profile
-             char* name = new char[(*it)->type().length()+1];
-             strcpy(name, (*it)->type().ascii());
--            png_set_iCCP(png_ptr, info_ptr, name, PNG_COMPRESSION_TYPE_BASE, (char*)(*it)->annotation().data(), (*it) -> annotation() . size());
-+            png_set_iCCP(png_ptr, info_ptr, name, PNG_COMPRESSION_TYPE_BASE, (unsigned char*)(*it)->annotation().data(), (*it) -> annotation() . size());
-         }
-         ++it;
-     }
diff --git a/redhat/applications/koffice/koffice-3.5.13-fix_libpng.patch b/redhat/applications/koffice/koffice-3.5.13-fix_libpng.patch
index cba4b2584..004bb0225 100644
--- a/redhat/applications/koffice/koffice-3.5.13-fix_libpng.patch
+++ b/redhat/applications/koffice/koffice-3.5.13-fix_libpng.patch
@@ -1,5 +1,5 @@
---- /dev/shm/applications/koffice/filters/chalk/png/kis_png_converter.cc	2011-06-27 13:54:18.000000000 -0500
-+++ /dev/shm/applications/koffice/filters/chalk/png/kis_png_converter.cc.new	2011-11-07 15:38:47.918508855 -0600
+--- koffice/filters/chalk/png/kis_png_converter.cc	2011-06-27 13:54:18.000000000 -0500
++++ koffice/filters/chalk/png/kis_png_converter.cc.new	2011-11-07 15:38:47.918508855 -0600
 @@ -785,7 +785,7 @@
  
  void KisPNGConverter::progress(png_structp png_ptr, png_uint_32 row_number, int pass)
@@ -9,3 +9,40 @@
  //     setProgress(row_number);
  }
  
+--- koffice/filters/chalk/png/kis_png_converter.cc.gcc47	2012-04-26 16:38:35.805156927 -0400
++++ koffice/filters/chalk/png/kis_png_converter.cc	2012-04-26 16:49:27.179323394 -0400
+@@ -43,6 +43,8 @@
+ #include <kis_paint_layer.h>
+ #include <kis_group_layer.h>
+ 
++#include <zlib.h>
++
+ namespace {
+ 
+     const TQ_UINT8 PIXEL_BLUE = 0;
+@@ -222,6 +224,7 @@
+     
+     // Read image profile
+     png_charp profile_name, profile_data;
++    unsigned char* uprofile_data = reinterpret_cast<unsigned char*>(profile_data);
+     int compression_type;
+     png_uint_32 proflen;
+     int number_of_passes = 1;
+@@ -230,7 +233,7 @@
+         number_of_passes = png_set_interlace_handling(png_ptr);
+ 
+     KisProfile* profile = 0;
+-    if(png_get_iCCP(png_ptr, info_ptr, &profile_name, &compression_type, &profile_data, &proflen))
++    if(png_get_iCCP(png_ptr, info_ptr, &profile_name, &compression_type, &uprofile_data, &proflen))
+     {
+         TQByteArray profile_rawdata;
+         // XXX: Hardcoded for icc type -- is that correct for us?
+@@ -627,7 +630,7 @@
+         } else { // Profile
+             char* name = new char[(*it)->type().length()+1];
+             strcpy(name, (*it)->type().ascii());
+-            png_set_iCCP(png_ptr, info_ptr, name, PNG_COMPRESSION_TYPE_BASE, (char*)(*it)->annotation().data(), (*it) -> annotation() . size());
++            png_set_iCCP(png_ptr, info_ptr, name, PNG_COMPRESSION_TYPE_BASE, (unsigned char*)(*it)->annotation().data(), (*it) -> annotation() . size());
+         }
+         ++it;
+     }
diff --git a/redhat/applications/koffice/trinity-koffice.spec b/redhat/applications/koffice/trinity-koffice.spec
index 9f487c4e6..fe3f44328 100644
--- a/redhat/applications/koffice/trinity-koffice.spec
+++ b/redhat/applications/koffice/trinity-koffice.spec
@@ -92,9 +92,6 @@ BuildRequires:  gettext-devel
 BuildRequires:  mysql-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  perl
-BuildRequires:  trinity-wv2-devel >= 0.4.0
-#BuildRequires:  trinity-libpqxx-devel >= 2.6.0
-BuildRequires:  libpqxx-devel
 BuildRequires:  doxygen
 BuildRequires:  aspell-devel
 BuildRequires:  libxslt-devel
@@ -108,10 +105,12 @@ BuildRequires:  ruby ruby-devel >= 1.8.2
 BuildRequires:  libpaper-devel
 BuildRequires:  libXi-devel
 BuildRequires:	libutempter-devel
-BuildRequires:	poppler-qt-devel >= 0.1.2
 BuildRequires:	GraphicsMagick-devel >= 1.1.0
-BuildRequires:	trinity-libwpd-devel
 
+BuildRequires:  trinity-wv2-devel
+BuildRequires:	trinity-poppler-qt3-devel >= 0.1.2
+BuildRequires:	trinity-libwpd-devel
+BuildRequires:  trinity-libpqxx-devel
 
 %description
 KOffice is an integrated office suite.
@@ -308,8 +307,10 @@ This package is part of the TDE Office Suite.
 %patch10 -p0
 %patch11 -p0
 %patch12 -p1 -b .gcc47
-%patch13 -p1
-%patch14 -p5
+%if 0%{?fedora} >= 17
+%patch13 -p1 -b .ruby
+%patch14 -p1 -b .libpng
+%endif
 
 # use LGC variant instead
 %__sed -i.dejavu-lgc \
@@ -324,7 +325,7 @@ This package is part of the TDE Office Suite.
   -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"
 
 
@@ -343,6 +344,8 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}"
   --with-extra-includes=%{_includedir}/tqt \
   --enable-closure \
   --disable-kexi-macros \
+  --with-pqxx-includes=%{_includedir} \
+  --with-pqxx-libraries=%{_libdir} \
 %if 0%{?with_kross} > 0
   --enable-scripting \
 %else
diff --git a/redhat/applications/kopete-otr/trinity-kopete-otr.spec b/redhat/applications/kopete-otr/trinity-kopete-otr.spec
index 390c5c14e..ec87c5a5e 100644
--- a/redhat/applications/kopete-otr/trinity-kopete-otr.spec
+++ b/redhat/applications/kopete-otr/trinity-kopete-otr.spec
@@ -1,7 +1,7 @@
 # Default version for this component
 %define kdecomp kopete-otr
 %define version 0.7
-%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"
@@ -57,11 +57,11 @@ unset QTDIR; . /etc/profile.d/qt.sh
 # 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 "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 
@@ -87,13 +87,13 @@ export PATH="%{_bindir}:${PATH}"
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/crystalsvg || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
 /sbin/ldconfig || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/crystalsvg || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
 /sbin/ldconfig || :
 
 
@@ -120,6 +120,9 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 
 %Changelog
+* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.7-2
+- Rebuild for Fedora 17
+
 * Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.7-1
 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
 
diff --git a/redhat/applications/kpicosim/trinity-kpicosim.spec b/redhat/applications/kpicosim/trinity-kpicosim.spec
index d162b6413..e6fcf0466 100644
--- a/redhat/applications/kpicosim/trinity-kpicosim.spec
+++ b/redhat/applications/kpicosim/trinity-kpicosim.spec
@@ -6,7 +6,7 @@
 # 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 _docdir %{_datadir}/doc
 %endif
 
 # TDE 3.5.13 specific building variables
@@ -53,11 +53,11 @@ simulator and export functions to VHDL, HEX and MEM 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 "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 
diff --git a/redhat/applications/kpilot/trinity-kpilot.spec b/redhat/applications/kpilot/trinity-kpilot.spec
index 19e13e95f..ad078e091 100644
--- a/redhat/applications/kpilot/trinity-kpilot.spec
+++ b/redhat/applications/kpilot/trinity-kpilot.spec
@@ -1,7 +1,7 @@
 # Default version for this component
 %define kdecomp kpilot
 %define version 0.7
-%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"
@@ -59,11 +59,11 @@ and synchronize the built-in applications with their KDE counterparts.
 # 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 "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 
@@ -94,13 +94,17 @@ export PATH="%{_bindir}:${PATH}"
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+for f in hicolor locolor crystalsvg; do
+  touch --no-create %{_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+done
 /sbin/ldconfig || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+for f in hicolor locolor crystalsvg; do
+  touch --no-create %{_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+done
 /sbin/ldconfig || :
 
 
@@ -144,11 +148,16 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %{_datadir}/apps/kconf_update/kpilot.upd
 %{_datadir}/apps/kpilot
 %{_datadir}/config.kcfg/*.kcfg
-%{_datadir}/icons/*/*/apps/*.png
+%{_datadir}/icons/crystalsvg/*/apps/*.png
+%{_datadir}/icons/hicolor/*/apps/*.png
+%{_datadir}/icons/locolor/*/apps/*.png
 %{_datadir}/services/*.desktop
 %{_datadir}/servicetypes/kpilotconduit.desktop
 
 
 %Changelog
+* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.7-2
+- Rebuild for Fedora 17
+
 * Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.7-1
 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kpowersave/trinity-kpowersave.spec b/redhat/applications/kpowersave/trinity-kpowersave.spec
index 7ae8ec505..427d621c8 100644
--- a/redhat/applications/kpowersave/trinity-kpowersave.spec
+++ b/redhat/applications/kpowersave/trinity-kpowersave.spec
@@ -6,7 +6,7 @@
 # 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 _docdir %{_datadir}/doc
 %endif
 
 # TDE 3.5.13 specific building variables
@@ -117,7 +117,7 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %{_datadir}/applications/kde/kpowersave.desktop
 %{_datadir}/apps/kpowersave/eventsrc
 %{_datadir}/apps/kpowersave/icons/*/*/*/*.png
-%{_datadir}/icons/*/*/*/*.png
+%{_datadir}/icons/hicolor/*/*/*.png
 %{_datadir}/autostart/kpowersave-autostart.desktop
 %{_datadir}/config/kpowersaverc
 
diff --git a/redhat/applications/kradio/trinity-kradio.spec b/redhat/applications/kradio/trinity-kradio.spec
index 505dca071..f91bbe932 100644
--- a/redhat/applications/kradio/trinity-kradio.spec
+++ b/redhat/applications/kradio/trinity-kradio.spec
@@ -1,12 +1,12 @@
 # Default version for this component
 %define kdecomp kradio
 %define version 0.1.1.1
-%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"
 %define _variant .opt
-%define _docdir %{_prefix}/share/doc
+%define _docdir %{_datadir}/doc
 %endif
 
 # TDE 3.5.13 specific building variables
@@ -67,11 +67,12 @@ of new plugins (e.g. Internet Radio Streams, new cool GUIs) are welcome.
 
 # 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"
+%__sed -i admin/acinclude.m4.in \
+  -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 "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 
@@ -98,12 +99,16 @@ export PATH="%{_bindir}:${PATH}"
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+for f in hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+done
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+for f in hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+done
 
 
 %files -f %{kdecomp}.lang
@@ -113,12 +118,17 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %{_libdir}/kradio/plugins/*.la
 %{_libdir}/kradio/plugins/*.so
 %{_datadir}/applications/kde/kradio.desktop
-%{_datadir}/apps/kradio/icons/*/*/*/*.png
+%{_datadir}/apps/kradio/icons/hicolor/*/*/*.png
+%{_datadir}/apps/kradio/icons/locolor/*/*/*.png
 %{_datadir}/apps/kradio/presets/*/*.krp
 %{_datadir}/apps/kradio/presets/*/*/*.krp
 %{_datadir}/locale/*/LC_MESSAGES/kradio-*.mo
 
 
 %Changelog
+* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-2
+- Rebuild for Fedora 17
+- Fix HTML directory location
+
 * Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-1
 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/krename/trinity-krename-3.5.13.spec b/redhat/applications/krename/trinity-krename-3.5.13.spec
index 9c813486c..1b0a6929e 100644
--- a/redhat/applications/krename/trinity-krename-3.5.13.spec
+++ b/redhat/applications/krename/trinity-krename-3.5.13.spec
@@ -1,15 +1,15 @@
 # Default version for this component
 %define kdecomp krename
 %define version 3.0.14
-%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 _docdir %{_datadir}/doc
 %endif
 
-# TDE 3.5.12 specific building variables
+# TDE 3.5.13 specific building variables
 BuildRequires: autoconf automake libtool m4
 %define tde_docdir %{_docdir}/kde
 %define tde_includedir %{_includedir}/kde
@@ -17,7 +17,7 @@ BuildRequires: autoconf automake libtool m4
 
 
 Name:		trinity-%{kdecomp}
-Summary:	A KDE batch file renaming utility. 
+Summary:	A TDE batch file renaming utility. 
 Version:	%{?version}
 Release:	%{?release}%{?dist}%{?_variant}
 
@@ -40,7 +40,7 @@ BuildRequires: desktop-file-utils
 BuildRequires: imlib-devel
 
 %description
-KRename is a powerful batch renamer for KDE 3.x. It allows you to easily rename hundreds or
+KRename is a powerful batch renamer for TDE. It allows you to easily rename hundreds or
 even more files in one go. The filenames can be created by parts of the original filename,
 numbering the files or accessing hundreds of informations about the file, like creation date
 or Exif informations of an image. 
@@ -50,11 +50,12 @@ or Exif informations of an image.
 
 # 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"
+%__sed -i admin/acinclude.m4.in \
+  -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 "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 
@@ -75,32 +76,42 @@ 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 || :
+for f in hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+done
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+for f in hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+done
 
 
-%files
+%files -f %{kdecomp}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
 %{_bindir}/*
 %{_datadir}/applications/*/*.desktop
 %{_datadir}/apps/*/
-%{_docdir}/HTML/en/*/
-%{_datadir}/icons/*/*/*/*
-%{_datadir}/locale/*/*/*.mo
+%{tde_docdir}/HTML/en/*/
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/icons/locolor/*/*/*
 
 
 %Changelog
+* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 3.0.14-4
+- Rebuild for Fedora 17
+- Fix HTML directory location
+
 * Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.0.14-3
 - Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
 
diff --git a/redhat/applications/krusader/krusader-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/krusader/krusader-3.5.13-fix_gcc47_compilation.patch
new file mode 100644
index 000000000..cc1e71ff0
--- /dev/null
+++ b/redhat/applications/krusader/krusader-3.5.13-fix_gcc47_compilation.patch
@@ -0,0 +1,20 @@
+commit fdf6d34084255fa4e17833f8ef93626e5dd926e6
+Author: Darrell Anderson <humanreadable@yahoo.com>
+Date:   1335632256 -0500
+
+    GCC 4.7 fixes.
+
+diff --git a/krusader/UserAction/tstring.h b/krusader/UserAction/tstring.h
+index 94ece59..9356e5c 100644
+--- a/krusader/UserAction/tstring.h
++++ b/krusader/UserAction/tstring.h
+@@ -14,6 +14,9 @@
+ #include <tqvaluelist.h>
+ #include <utility>
+ #include <cassert>
++
++using namespace std;
++
+ template <class T>
+ class TagString_t
+ {
diff --git a/redhat/applications/krusader/trinity-krusader.spec b/redhat/applications/krusader/trinity-krusader.spec
index eeb31a155..2816e930f 100644
--- a/redhat/applications/krusader/trinity-krusader.spec
+++ b/redhat/applications/krusader/trinity-krusader.spec
@@ -1,13 +1,13 @@
 # Default version for this component
 %define kdecomp krusader
 %define version 1.90.0
-%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"
 %define _variant .opt
-%define _docdir %{_prefix}/share/doc
-%define _mandir %{_prefix}/share/man
+%define _docdir %{_datadir}/doc
+%define _mandir %{_datadir}/man
 %endif
 
 # TDE 3.5.13 specific building variables
@@ -34,6 +34,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
 
+# [krusader] GCC 4.7 fixes. [Commit #fdf6d340]
+Patch1:		krusader-3.5.13-fix_gcc47_compilation.patch
 
 BuildRequires: tqtinterface-devel
 BuildRequires: trinity-kdelibs-devel
@@ -44,7 +46,7 @@ BuildRequires:	trinity-kdebindings-devel
 
 %description
 Krusader is a simple, easy, powerful, twin-panel (commander-style) file
-manager for KDE and other desktops, similar to Midnight Commander (C) or Total
+manager for TDE and other desktops, similar to Midnight Commander (C) or Total
 Commander (C).
 
 It provides all the file management features you could possibly want.
@@ -64,15 +66,16 @@ great on your desktop.
 
 %prep
 %setup -q -n applications/%{kdecomp}
+%patch1 -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 -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 
@@ -99,14 +102,16 @@ export PATH="%{_bindir}:${PATH}"
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-/sbin/ldconfig || :
+for f in crystalsvg locolor ; do
+  touch --no-create %{_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+done
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-/sbin/ldconfig || :
+for f in crystalsvg locolor ; do
+  touch --no-create %{_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+done
 
 
 %files -f %{kdecomp}.lang
@@ -122,13 +127,18 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %{_datadir}/apps/krusader
 %{tde_docdir}/HTML/en/krusader
 %{tde_docdir}/HTML/ru/krusader
-%{_datadir}/icons/*/*/apps/*.png
+%{_datadir}/icons/crystalsvg/*/apps/*.png
+%{_datadir}/icons/locolor/*/apps/*.png
 %{_datadir}/services/krarc.protocol
 %{_datadir}/services/virt.protocol
 %{_mandir}/man1/krusader.1
 
 
 %Changelog
+* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.90.0-2
+- Rebuild for Fedora 17
+- GCC 4.7 fixes. [Commit #fdf6d340]
+
 * Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.90.0-1
 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
 
diff --git a/redhat/applications/ksplash-engine-moodin/trinity-ksplash-engine-moodin.spec b/redhat/applications/ksplash-engine-moodin/trinity-ksplash-engine-moodin.spec
index 8f1b80b1a..5fc9e7c07 100644
--- a/redhat/applications/ksplash-engine-moodin/trinity-ksplash-engine-moodin.spec
+++ b/redhat/applications/ksplash-engine-moodin/trinity-ksplash-engine-moodin.spec
@@ -1,7 +1,7 @@
 # Default version for this component
 %define kdecomp ksplash-engine-moodin
 %define version 0.4.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"
@@ -52,7 +52,7 @@ Features:
 * custom image arrangement
 * resolution independent themes
 
-This KDE splash screen engine is based upon Linspire's
+This TDE splash screen engine is based upon Linspire's
 engine by Sean Meiners <Sean.Meiners@LinspireInc.com>
 
 Homepage: http://moodwrod.com
@@ -63,11 +63,12 @@ Homepage: http://moodwrod.com
 
 # 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"
+%__sed -i admin/acinclude.m4.in \
+  -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 "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 
@@ -92,15 +93,6 @@ export PATH="%{_bindir}:${PATH}"
 %__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,-)
 %{tde_libdir}/ksplashmoodin.la
@@ -110,5 +102,9 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 
 %Changelog
+* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.2-2
+- Rebuild for Fedora 17
+- Removes post and postun
+
 * Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.2-1
 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/ksquirrel/trinity-ksquirrel.spec b/redhat/applications/ksquirrel/trinity-ksquirrel.spec
index d837fc52e..945628cfb 100644
--- a/redhat/applications/ksquirrel/trinity-ksquirrel.spec
+++ b/redhat/applications/ksquirrel/trinity-ksquirrel.spec
@@ -1,12 +1,13 @@
 # Default version for this component
 %define kdecomp ksquirrel
 %define version 0.8.0
-%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"
 %define _variant .opt
-%define _docdir %{_prefix}/share/doc
+%define _docdir %{_datadir}/doc
+%define _mandir %{_datadir}/man
 %endif
 
 # TDE 3.5.13 specific building variables
@@ -44,7 +45,7 @@ BuildRequires:	trinity-libksquirrel-devel
 #BuildRequires:	libkexif-devel
 
 %description
-KSquirrel is an image viewer for KDE with disk navigator, file tree,
+KSquirrel is an image viewer for TDE with disk navigator, file tree,
 multiple directory view, thumbnails, extended thumbnails, dynamic
 format support, DCOP interface, KEXIF and KIPI plugins support.
 
@@ -57,11 +58,12 @@ OpenGL and dynamic format support.
 
 # 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"
+%__sed -i admin/acinclude.m4.in \
+  -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 "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 
@@ -112,13 +114,17 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %{_datadir}/config/magic/x-ras.magic
 %{_datadir}/config/magic/x-sun.magic
 %{_datadir}/config/magic/x-utah.magic
-%{_docdir}/HTML/*/ksquirrel
+%{tde_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
+%{_mandir}/man1/ksquirrel.1
 
 %Changelog
+* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.1-2
+- Rebuild for Fedora 17
+- Fix HTML directory location
+
 * 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/kstreamripper/trinity-kstreamripper-3.5.13.spec b/redhat/applications/kstreamripper/trinity-kstreamripper-3.5.13.spec
index 94855fdcf..5860200ab 100644
--- a/redhat/applications/kstreamripper/trinity-kstreamripper-3.5.13.spec
+++ b/redhat/applications/kstreamripper/trinity-kstreamripper-3.5.13.spec
@@ -94,15 +94,6 @@ fi
 %__rm -rf %{buildroot}
 
 
-%post
-/sbin/ldconfig
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-
-%postun
-/sbin/ldconfig
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %files
 %defattr(-,root,root,-)
diff --git a/redhat/applications/ksystemlog/trinity-ksystemlog.spec b/redhat/applications/ksystemlog/trinity-ksystemlog.spec
index cf7249b88..8c2e00269 100644
--- a/redhat/applications/ksystemlog/trinity-ksystemlog.spec
+++ b/redhat/applications/ksystemlog/trinity-ksystemlog.spec
@@ -55,12 +55,12 @@ unset QTDIR; . /etc/profile.d/qt.sh
 
 # 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"
+%__sed -i admin/acinclude.m4.in \
+  -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 "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 
diff --git a/redhat/applications/kvpnc/trinity-kvpnc.spec b/redhat/applications/kvpnc/trinity-kvpnc.spec
new file mode 100644
index 000000000..930dcf410
--- /dev/null
+++ b/redhat/applications/kvpnc/trinity-kvpnc.spec
@@ -0,0 +1,113 @@
+# Default version for this component
+%define kdecomp kvpnc
+%define version 0.9.6a
+%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:	vpn clients frontend 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}-master.tar.gz
+Source1:	admin-master.tar.gz
+
+BuildRequires: tqtinterface-devel
+BuildRequires: trinity-kdelibs-devel
+BuildRequires: trinity-kdebase-devel
+BuildRequires: desktop-file-utils
+
+%description
+KVpnc is a TDE frontend for various vpn clients.
+
+It supports :
+ * Cisco-compatible VPN client (vpnc)
+ * IPSec (freeswan, openswan, racoon)
+ * Point-to-Point Tunneling Protocol (PPTP) client (pptp-linux)
+ * Virtual Private Network daemon (openvpn)
+
+
+%prep
+unset QTDIR; . /etc/profile.d/qt.sh
+%setup -q -n %{kdecomp}-master
+
+# 'admin' folder from GIT
+%setup -q -n %{kdecomp}-master -a 1
+%__rm -rf admin
+%__mv -f admin-master admin
+
+# 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"
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%configure \
+	--disable-rpath \
+    --with-extra-includes=%{_includedir}/tqt \
+    --enable-closure
+
+%__make %{?_smp_mflags}
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+/sbin/ldconfig || :
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+/sbin/ldconfig || :
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING README TODO
+
+
+
+%Changelog
+* Sat Dec 10 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.6a-1
+- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+