Redhat 32 Bits small fixes

14 files changed, 143 insertions, 42 deletions

diff --git a/redhat/applications/gwenview/trinity-gwenview-3.5.13.spec b/redhat/applications/gwenview/trinity-gwenview-3.5.13.spec
index a1323c5c2..98b178c0f 100644
--- a/redhat/applications/gwenview/trinity-gwenview-3.5.13.spec
+++ b/redhat/applications/gwenview/trinity-gwenview-3.5.13.spec
@@ -1,7 +1,7 @@
 # Default version for this component
 %define kdecomp gwenview
 %define version 1.4.2
-%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"
@@ -138,20 +138,22 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %{_datadir}/services/*.desktop
 %{_datadir}/apps/*/
 %{_datadir}/config.kcfg/*
-%{tde_docdir}/HTML/en/*/
+%{_docdir}/HTML/en/*/
 %{_datadir}/icons/*/*/*/*
 %{_mandir}/man*/*
 
-%{_libdir}/libkdeinit_gwenview.so
-%exclude %{_libdir}/libgwenviewcore.so
+%{_libdir}/*.so
+%{_libdir}/*.la
+%{_libdir}/*/*.so
+%{_libdir}/*/*.la
 
-%exclude %{_libdir}/*.la
-%exclude %{_libdir}/*/*.so
-%exclude %{_libdir}/*/*.la
 
 
 
 %Changelog
+* Fri Nov 04 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-5
+- Adds missing files
+
 * Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-4
 - Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
 
diff --git a/redhat/applications/k3b/trinity-k3b-3.5.13.spec b/redhat/applications/k3b/trinity-k3b-3.5.13.spec
index a40db17d6..fd325935d 100644
--- a/redhat/applications/k3b/trinity-k3b-3.5.13.spec
+++ b/redhat/applications/k3b/trinity-k3b-3.5.13.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.13
 %endif
-%define release 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,7 @@ BuildRequires: dbus-qt-devel hal-devel
 BuildRequires: flac-devel
 BuildRequires: gettext
 BuildRequires: libdvdread-devel
-%if 0%{?fedora} >= 15 || 0%{?rhel} <= 5
 BuildRequires: libmpcdec-devel
-%else
-BuildRequires: musepack-tools-devel
-%endif
 BuildRequires: libmusicbrainz-devel
 BuildRequires: libsamplerate-devel
 BuildRequires: libsndfile-devel
@@ -246,6 +242,9 @@ update-desktop-database -q &> /dev/null
 
 
 %changelog
+* Sat Nov 05 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
+- Updates BuildRequires
+
 * Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
 - Initial release for RHEL 6, RHEL 5 and Fedora 15
 
diff --git a/redhat/dependencies/arts/trinity-arts-3.5.13.spec b/redhat/dependencies/arts/trinity-arts-3.5.13.spec
index f0be812f9..46ff718f6 100755
--- a/redhat/dependencies/arts/trinity-arts-3.5.13.spec
+++ b/redhat/dependencies/arts/trinity-arts-3.5.13.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.13
 %endif
-%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"
@@ -35,6 +35,7 @@ BuildRequires:	alsa-lib-devel
 BuildRequires:	glib2-devel
 BuildRequires:	libtool-ltdl-devel
 BuildRequires:	gsl-devel
+BuildRequires:	libvorbis-devel
 
 Requires:	tqtinterface
 Requires:	audiofile
@@ -120,6 +121,9 @@ cd build
 
 
 %changelog
+* Thu Nov 03 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
+- Add missing BuildRequires
+
 * Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
 - Initial release for RHEL 6, RHEL 5 and Fedora 15
 
diff --git a/redhat/dependencies/libcaldav/libcaldav.spec b/redhat/dependencies/libcaldav/libcaldav.spec
index 6624409cd..eef45ba22 100644
--- a/redhat/dependencies/libcaldav/libcaldav.spec
+++ b/redhat/dependencies/libcaldav/libcaldav.spec
@@ -5,7 +5,7 @@
 
 Name:		libcaldav
 Version:	0.6.5
-Release:	2debian2.1%{?dist}%{?_variant}
+Release:	2debian2.2%{?dist}%{?_variant}
 
 Vendor:		Trinity Project
 URL:		http://www.trinitydesktop.org/
@@ -19,6 +19,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	libcaldav_0.6.5-2debian2.tar.gz
 
+BuildRequires:	libtool
+BuildRequires:	glib2-devel
+BuildRequires:	gtk2-devel
+BuildRequires:	make
+
 %if 0%{?fedora} || 0%{?rhel} >= 6
 BuildRequires:	libcurl-devel
 %else
@@ -73,5 +78,8 @@ autoreconf --force --install --symlink
 
 
 %Changelog
+* Thu Nov 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.6.5-2debian2.2
+- Add missing BuildRequires
+
 * Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.6.5-2debian2.1
 - Initial build for RHEL 6, RHEL 5, and Fedora 15
diff --git a/redhat/dependencies/qt3/qt3.spec b/redhat/dependencies/qt3/qt3.spec
index e57d598b5..42840c511 100644
--- a/redhat/dependencies/qt3/qt3.spec
+++ b/redhat/dependencies/qt3/qt3.spec
@@ -16,7 +16,7 @@
 
 Name: qt3
 Version: %{?version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: The shared library for the Qt 3 GUI toolkit
 
 License: QPL or GPLv2 or GPLv3
@@ -149,6 +149,7 @@ BuildRequires: mysql-devel
 BuildRequires: postgresql-devel
 BuildRequires: unixODBC-devel
 BuildRequires: sqlite-devel
+BuildRequires: gcc-c++
 
 
 %package config
@@ -700,6 +701,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Nov 03 2011 Francois Andriot <francois.andriot@free.fr> - 3.3.8d-2
+- Add missing BuildRequires
+
 * Fri Sep 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.3.8d-1
 - Initial build for RHEL 6, RHEL 5, and Fedora 15
 - Switch to Trinity Version
diff --git a/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec b/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec
index b5ed3eda0..3845c0e41 100644
--- a/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec
+++ b/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.13
 %endif
-%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"
@@ -46,7 +46,10 @@ BuildRequires: SDL-devel
 BuildRequires: alsa-lib-devel
 BuildRequires: openssl-devel
 BuildRequires: db4-devel
+
+%if 0%{?fedora}
 BuildRequires: xmms-devel
+%endif
 
 Requires: trinity-kdebase
 %if 0%{?fedora}
@@ -248,6 +251,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
 
 
 %changelog
+* Fri Nov 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
+- Updates BuildRequires
+
 * Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
 - Initial release for RHEL 6, RHEL 5 and Fedora 15
 
diff --git a/redhat/kdeartwork/trinity-kdeartwork-3.5.13.spec b/redhat/kdeartwork/trinity-kdeartwork-3.5.13.spec
index 3603f7378..89944666b 100644
--- a/redhat/kdeartwork/trinity-kdeartwork-3.5.13.spec
+++ b/redhat/kdeartwork/trinity-kdeartwork-3.5.13.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.13
 %endif
-%define release 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"
@@ -39,14 +39,17 @@ Source: kdeartwork-%{version}.tar.gz
 # FIXME: this should go in kde-settings -- Rex
 Source1: webcollagerc
 
-BuildRequires: gettext
 BuildRequires: trinity-kdebase-devel
-BuildRequires: nas-devel esound-devel jack-audio-connection-kit-devel
-%if 0%{?rhel} > 5 || 0%{?fedora} >= 15
+
+BuildRequires: gettext
+BuildRequires: esound-devel
+%if 0%{?fedora}
+BuildRequires: jack-audio-connection-kit-devel
+BuildRequires: nas-devel
 BuildRequires: xscreensaver
-%else
-BuildRequires: gnome-screensaver
+%define with_xscreensaver 1
 %endif
+
 %if "%{?with_libart}" == "1"
 BuildRequires: libart_lgpl-devel
 %endif
@@ -78,7 +81,11 @@ export LD_LIBRARY_PATH="%{_libdir}"
 %__mkdir build
 cd build
 %cmake \
+%if 0%{?with_xscreensaver}
   -DWITH_XSCREENSAVER=ON \
+%else
+  -DWITH_XSCREENSAVER=OFF \
+%endif
 %if "%{?with_libart}" == "1"
   -DWITH_LIBART=ON \
 %else
@@ -166,7 +173,9 @@ done
 %{_datadir}/sounds/*
 %{_datadir}/wallpapers/*
 %{_datadir}/emoticons/*
+%if 0%{?with_xscreensaver}
 %{_bindir}/kxs*
+%endif
 
 %files icons
 %defattr(-,root,root,-)
@@ -180,6 +189,9 @@ done
 
 
 %changelog
+* Fri Nov 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
+- Updates BuildRequires
+
 * Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
 - Initial release for RHEL 6, RHEL 5 and Fedora 15
 
diff --git a/redhat/kdebase/trinity-kdebase-3.5.13.spec b/redhat/kdebase/trinity-kdebase-3.5.13.spec
index 2431e044a..967f8f3cf 100755
--- a/redhat/kdebase/trinity-kdebase-3.5.13.spec
+++ b/redhat/kdebase/trinity-kdebase-3.5.13.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.13
 %endif
-%define release 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"
@@ -75,7 +75,6 @@ BuildRequires:	lm_sensors-devel
 BuildRequires:	libfontenc-devel
 BuildRequires:	hal-devel
 BuildRequires:	audiofile-devel alsa-lib-devel
-BuildRequires:	jack-audio-connection-kit-devel
 BuildRequires:	libraw1394-devel
 BuildRequires:	openldap-devel
 BuildRequires:	libvorbis-devel
@@ -83,12 +82,19 @@ BuildRequires:	pam-devel
 BuildRequires:	libXdmcp-devel
 BuildRequires:	libxkbfile-devel
 BuildRequires:	libusb-devel
-BuildRequires:	esound-devel glib2-devel nas-devel
+BuildRequires:	esound-devel glib2-devel
 BuildRequires:	libXcomposite-devel
 BuildRequires:	dbus-tqt-devel
 BuildRequires:	libXtst-devel
 BuildRequires:	libXdamage-devel
+BuildRequires:	xorg-x11-font-utils
 
+# These dependancies are not met in RHEL
+%if 0%{?fedora}
+BuildRequires:	jack-audio-connection-kit-devel
+BuildRequires:	nas-devel
+%endif
+ 
 Requires:	tqtinterface
 Requires:	trinity-arts
 Requires:	trinity-kdelibs
@@ -513,6 +519,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %{_datadir}/cmake/*.cmake
 
 %changelog
+* Thu Nov 03 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
+- Add missing BuildRequires
+
 * Tue Nov 01 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
 - Add 'patch8' to fix LD_PRELOAD variable set by 'startkde' under x86_64
 
diff --git a/redhat/kdebindings/trinity-kdebindings-3.5.13.spec b/redhat/kdebindings/trinity-kdebindings-3.5.13.spec
index 7b1b74f69..0a6a57f39 100644
--- a/redhat/kdebindings/trinity-kdebindings-3.5.13.spec
+++ b/redhat/kdebindings/trinity-kdebindings-3.5.13.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.13
 %endif
-%define release 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"
@@ -37,14 +37,22 @@ Source0: kdebindings-%{version}.tar.gz
 # RedHat Legacy patches (from Fedora)
 Patch1: kdebindings-3.5.6-libgcj.patch
 
-BuildRequires: desktop-file-utils
 BuildRequires: tqtinterface-devel
+BuildRequires: trinity-arts-devel
 BuildRequires: trinity-kdelibs-devel
+
+BuildRequires: desktop-file-utils
 BuildRequires: zlib-devel
 BuildRequires: perl(ExtUtils::MakeMaker)
-BuildRequires: trinity-arts-devel
-BuildRequires: glib-devel gtk+-devel
 BuildRequires: gtk2-devel
+BuildRequires: gdk-pixbuf-devel
+BuildRequires: java-openjdk
+
+%if 0%{?fedora}
+BuildRequires: glib-devel
+BuildRequires: gtk+-devel
+%endif
+
 %define perl_ver        %{expand:%%(eval `perl -V:version`; echo $version)}
 %define perl_vendorarch %{expand:%%(eval `perl -V:installvendorarch`; echo $installvendorarch)}
 %define perl_vendorlib  %{expand:%%(eval `perl -V:installvendorlib`; echo $installvendorlib)}
@@ -70,10 +78,11 @@ Provides: %{name}-ruby = %{version}-%{release}
 %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')}
 
 ## java
-%if 0%{?rhel} && 0%{?rhel} < 6
+%if 0%{?rhel} > 0 && 0%{?rhel} < 6
 BuildRequires: java-1.4.2-gcj-compat-devel libgcj-devel gcc-java
 %else
 BuildRequires: java-devel >= 1.4.2
+BuildRequires: java-1.6.0-openjdk-devel
 %endif
 %define java_home %{_usr}/lib/jvm/java
 %define _with_java --with-java=%{java_home}
@@ -277,9 +286,12 @@ update-desktop-database >& /dev/null ||:
 %{ruby_arch}/*.la
 
 %changelog
+* Fri Nov 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
+- Add missing BuildRequires
+
 * Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
 - Initial release for RHEL 6, RHEL 5 and Fedora 15
 
-* Sat Sep 03 2011 Francois Andriot <francois.andriot@free.fr - 3.5.13-0
+* Sat Sep 03 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
 - Import to GIT
 - Built with future TDE version (3.5.13 + cmake + QT3.3.8d)
diff --git a/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec b/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec
index fcb49e865..c7f170f7b 100644
--- a/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec
+++ b/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.13
 %endif
-%define release 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"
@@ -16,6 +16,11 @@ BuildRequires: cmake >= 2.8
 %define tde_includedir %{_includedir}/kde
 %define tde_libdir %{_libdir}/trinity
 
+# KDEGRAPHICS components
+%if 0%{?fedora}
+%define with_ksvg 1
+%endif
+
 
 Name:		trinity-kdegraphics
 Version:	%{?version}
@@ -64,8 +69,6 @@ BuildRequires: libdrm-devel
 
 # kgamma
 BuildRequires: libXxf86vm-devel
-# kuickshow
-BuildRequires: imlib-devel
 #kfile-plugin
 BuildRequires: OpenEXR-devel
 # kpdf
@@ -76,15 +79,21 @@ BuildRequires: poppler-qt-devel
 %endif
 BuildRequires: libpaper-devel
 # ksvg
+%if 0%{?with_ksvg}
 BuildRequires: fontconfig-devel
-BuildRequires: fribidi-devel
 BuildRequires: lcms-devel
 BuildRequires: libart_lgpl-devel
 BuildRequires: libXmu-devel
+%endif
 
 # kpovmodeler
 BuildRequires: libGL-devel libGLU-devel libXi-devel
 
+# kuickshow
+BuildRequires: imlib-devel
+
+BuildRequires: fribidi-devel
+
 Requires: tqtinterface
 Requires: trinity-arts
 Requires: trinity-kdelibs
@@ -361,6 +370,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %exclude %{_libdir}/libdjvu.so
 
 %changelog
+* Fri Nov 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
+- Updates BuildRequires
+
 * Wed Nov 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
 - Fix kpovmodeler compilation on RHEL 5 (patch4)
 
diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
index 404a432c7..faccf03ca 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 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,6 +53,8 @@ BuildRequires:	libidn-devel
 BuildRequires:	qt%{?_qt_suffix}-devel
 BuildRequires:	avahi-qt3-devel
 BuildRequires:	jasper-devel
+BuildRequires:	libtiff-devel
+BuildRequires:	OpenEXR-devel
 
 Requires:		tqtinterface
 Requires:		trinity-arts
@@ -281,9 +283,11 @@ EOF
 
 
 %changelog
+* Thu Nov 03 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
+- Add missing BuildRequires
+
 * Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
 - Initial release for RHEL 6, RHEL 5 and Fedora 15
 
-* Wed Sep 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13pre.svn20110902-0.el6
+* Wed Sep 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
 - Import to GIT
-- Built with future TDE version (3.5.13 + cmake + QT3.3.8d)
diff --git a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec
index a57642152..c6e1e9ac0 100644
--- a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec
+++ b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.13
 %endif
-%define release 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"
@@ -24,7 +24,10 @@ BuildRequires: cmake >= 2.8
 ## not currently compatible with libtunepimp-0.5 (only libtunepimp-0.4)
 #define _with_musicbrainz --with-musicbrainz
 %define _with_taglib --with-taglib
+
+%if 0%{?fedora}
 %define _with_xine --with-xine
+%endif
 
 Name:    trinity-kdemultimedia
 Summary: Multimedia applications for the K Desktop Environment (KDE)
@@ -401,6 +404,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %exclude %{_libdir}/libyafxplayer.so
 
 %changelog
+* Fri Nov 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
+- Updates BuildRequires
+
 * Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
 - Initial release for RHEL 6, RHEL 5 and Fedora 15
 
diff --git a/redhat/kdepim/trinity-kdepim-3.5.13.spec b/redhat/kdepim/trinity-kdepim-3.5.13.spec
index 2e5b04d8d..a2fb37818 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 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"
@@ -15,6 +15,13 @@ BuildRequires: cmake >= 2.8
 %define tde_docdir %{_docdir}/kde
 %define tde_libdir %{_libdir}/trinity
 
+# KDEPIM specific features
+%if 0%{?fedora}
+%define with_gnokii 1
+%else
+%define with_gnokii 0
+%endif
+
 
 Name:		trinity-kdepim
 Version:	%{?version}
@@ -38,12 +45,15 @@ BuildRequires:	gpgme-devel
 BuildRequires:	libgpg-error-devel
 BuildRequires:	flex
 BuildRequires:	libical-devel
-BuildRequires:	gnokii-devel
 BuildRequires:	boost-devel
 
 BuildRequires:	libcaldav-devel
 BuildRequires:	libcarddav-devel
 
+%if 0%{?with_gnokii}
+BuildRequires:	gnokii-devel
+%endif
+
 %if 0%{?fedora} >= 15
 BuildRequires:	flex-static
 %else
@@ -85,7 +95,11 @@ cd build
   -DWITH_ARTS=ON \
   -DWITH_SASL=ON \
   -DWITH_NEWDISTRLISTS=ON  \
+%if 0%{?with_gnokii}
   -DWITH_GNOKII=ON \
+%else
+  -DWITH_GNOKII=OFF \
+%endif
   -DWITH_EXCHANGE=ON \
   -DWITH_EGROUPWARE=ON \
   -DWITH_KOLAB=ON \
@@ -151,6 +165,9 @@ export PATH="%{_bindir}:${PATH}"
 %{_datadir}/cmake/*.cmake
 
 %changelog
+* Fri Nov 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
+- Updates BuildRequires
+
 * Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
 - Initial release for RHEL 6, RHEL 5 and Fedora 15
 
diff --git a/redhat/kdeutils/trinity-kdeutils-3.5.13.spec b/redhat/kdeutils/trinity-kdeutils-3.5.13.spec
index 0e6777148..fab189481 100755
--- a/redhat/kdeutils/trinity-kdeutils-3.5.13.spec
+++ b/redhat/kdeutils/trinity-kdeutils-3.5.13.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.13
 %endif
-%define release 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,7 +56,10 @@ BuildRequires: gmp-devel
 %if 0%{?fedora} > 4 || 0%{?rhel} > 4
 BuildRequires: libXScrnSaver-devel libXtst-devel
 %endif
+
+%if 0%{?fedora}
 BuildRequires: xmms-devel
+%endif
 
 %define superkaramba_ver 0.39
 Obsoletes: superkaramba < 0:%{superkaramba_ver}
@@ -339,6 +342,9 @@ done
 
 
 %changelog
+* Fri Nov 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
+- Updates BuildRequires
+
 * Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
 - Initial release for RHEL 6, RHEL 5 and Fedora 15