Updates for TDE 3.5.12 for RHEL5

Signed-off-by: albator <albator@arcadia.vtf>

20 files changed, 209 insertions, 71 deletions

diff --git a/fedora/README.txt b/fedora/README.txt
new file mode 100644
index 000000000..d3ab53ad0
--- /dev/null
+++ b/fedora/README.txt
@@ -0,0 +1,2 @@
+The Fedora packages are the same as the RedHat packages.
+See directory 'redhat' to get the SPECS files.
diff --git a/redhat/applications/k3b/trinity-k3b-3.5.12.spec b/redhat/applications/k3b/trinity-k3b-3.5.12.spec
index c29fa5c9b..423655f54 100644
--- a/redhat/applications/k3b/trinity-k3b-3.5.12.spec
+++ b/redhat/applications/k3b/trinity-k3b-3.5.12.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.12
 %endif
-%define release 6
+%define release 7
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -32,6 +32,11 @@ Obsoletes: k3b
 
 Group:   Applications/Archiving
 License: GPLv2+
+
+Prefix:		%{_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+
 Source0: k3b-%{version}.tar.gz
 Source1: k3b-i18n-1.0.5.tar.bz2
 Source2: k3brc
@@ -57,7 +62,7 @@ BuildRequires: dbus-qt-devel hal-devel
 BuildRequires: flac-devel
 BuildRequires: gettext
 BuildRequires: libdvdread-devel
-%if 0%{?fedora} >= 15
+%if 0%{?fedora} >= 15 || 0%{?rhel} && 0%{?rhel} <= 5
 BuildRequires: libmpcdec-devel
 %else
 BuildRequires: musepack-tools-devel
@@ -96,7 +101,9 @@ start.
 Summary:  Common files of %{name}
 Group:    Applications/Archiving
 Requires: %{name} = %{version}-%{release}
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
 BuildArch: noarch
+%endif
 %description common
 %{summary}.
 
@@ -165,15 +172,15 @@ popd
 
 %install
 %__rm -rf %{buildroot}
-%make_install
-%make_install -C k3b-i18n-1.0.5
-%{__install} -D -m 644 -p %{SOURCE2} %{buildroot}%{_datadir}/config/k3brc
+%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C k3b-i18n-1.0.5
+%__install -D -m 644 -p %{SOURCE2} %{buildroot}%{_datadir}/config/k3brc
 
 # remove the .la files
-%{__rm} -f %{buildroot}%{_libdir}/libk3b*.la 
+%__rm -f %{buildroot}%{_libdir}/libk3b*.la 
 
 # remove i18n for Plattdeutsch (Low Saxon)
-%{__rm} -fr %{buildroot}%{_datadir}/locale/nds
+%__rm -fr %{buildroot}%{_datadir}/locale/nds
 
 %find_lang k3b --with-kde
 %find_lang k3bsetup 
@@ -244,6 +251,9 @@ update-desktop-database -q &> /dev/null
 
 
 %changelog
+* Mon Sep 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-7
+- Add support for RHEL5
+
 * Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-6
 - Import to GIT
 
diff --git a/redhat/components.txt b/redhat/components.txt
index 843fd85f7..2dd00f99f 100644
--- a/redhat/components.txt
+++ b/redhat/components.txt
@@ -19,5 +19,6 @@ kdeadmin
 kdegames
 kdeedu
 kdeaddons
+kdewebdev
 kde-i18n
 applications/k3b
diff --git a/redhat/kde-i18n/trinity-kde-i18n-3.5.12.spec b/redhat/kde-i18n/trinity-kde-i18n-3.5.12.spec
index 603503dde..1d46ff40f 100644
--- a/redhat/kde-i18n/trinity-kde-i18n-3.5.12.spec
+++ b/redhat/kde-i18n/trinity-kde-i18n-3.5.12.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.12
 %endif
-%define release 6
+%define release 7
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -31,6 +31,9 @@ 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)
+
 # GFDL, with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
 License:	GFDL
 Group:		User Interface/Desktops
@@ -653,7 +656,7 @@ for l in %{KDE_LANGS}; do
         sed -i docs/Makefile -e "s,^\(SUBDIRS =.*\)common\(.*\)$,\1 \2,"
       fi
 
-      %{__make} install DESTDIR=%{?buildroot}
+      %__make install DESTDIR=%{?buildroot}
       popd
     fi
   done
@@ -1221,6 +1224,9 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Mon Sep 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-7
+- Add support for RHEL5
+
 * Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-6
 - Re-introduce all languages
 
diff --git a/redhat/kdeaccessibility/trinity-kdeaccessibility-3.5.12.spec b/redhat/kdeaccessibility/trinity-kdeaccessibility-3.5.12.spec
index 6ce1809ab..633fdc76b 100644
--- a/redhat/kdeaccessibility/trinity-kdeaccessibility-3.5.12.spec
+++ b/redhat/kdeaccessibility/trinity-kdeaccessibility-3.5.12.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.12
 %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"
@@ -29,9 +29,10 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.trinitydesktop.org/
 
-Source0: kdeaccessibility-%{version}.tar.gz
+Prefix:		%{_prefix}
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0: kdeaccessibility-%{version}.tar.gz
 
 
 Provides: kdeaccessibility3 = %{version}-%{release}
@@ -91,7 +92,7 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}"
 %install
 export PATH="%{_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%make_install
+%__make install DESTDIR=%{buildroot}
 
 desktop-file-install \
   --vendor="" \
@@ -170,6 +171,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %changelog
+* Mon Sep 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2
+- Add support for RHEL5
+
 * Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
 - Initial build for RHEL 6
 - Spec file based on Fedora 8 "kdeaccessibility-3.5.10-1"
diff --git a/redhat/kdeaddons/trinity-kdeaddons-3.5.12.spec b/redhat/kdeaddons/trinity-kdeaddons-3.5.12.spec
index a63d01271..348dd4d30 100644
--- a/redhat/kdeaddons/trinity-kdeaddons-3.5.12.spec
+++ b/redhat/kdeaddons/trinity-kdeaddons-3.5.12.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.12
 %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"
@@ -29,10 +29,12 @@ 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: kdeaddons-%{version}.tar.gz
 Source1: metabar-fedora.tar.bz2
 Source2: metabarrc
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch3: kdeaddons-3.5.3-sdl.patch
 
@@ -111,7 +113,7 @@ export CXXFLAGS="${CXXFLAGS} -fpermissive"
 %install
 export PATH="%{_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%make_install
+%__make install DESTDIR=%{buildroot}
 
 # File lists for locale
 HTML_DIR=$(kde-config --expandvars --install html)
@@ -238,6 +240,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
 
 
 %changelog
+* Mon Sep 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2
+- Add support for RHEL5
+
 * Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
 - Initial build for RHEL 6
 - Spec file based on Fedora 8 "kdeaddons-3.5.10-1"
diff --git a/redhat/kdeadmin/trinity-kdeadmin-3.5.12.spec b/redhat/kdeadmin/trinity-kdeadmin-3.5.12.spec
index bdbdf31af..73af2969a 100644
--- a/redhat/kdeadmin/trinity-kdeadmin-3.5.12.spec
+++ b/redhat/kdeadmin/trinity-kdeadmin-3.5.12.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.12
 %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"
@@ -33,6 +33,7 @@ Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.trinitydesktop.org/
 
 Prefix:		%{_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0: kdeadmin-%{version}.tar.gz
 Source1: kuser.pam
@@ -94,7 +95,7 @@ export CXXFLAGS="${CXXFLAGS} -fpermissive"
 %install
 export PATH="%{_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%make_install
+%__make install DESTDIR=%{buildroot}
 
 %if 0%{?rhel} > 1
 comps="kcron kdat knetworkconf"
@@ -171,20 +172,25 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %{_sbindir}/*
 %config(noreplace) /etc/pam.d/*
 %config(noreplace) /etc/security/console.apps/*
+%{_datadir}/config*/*
+%{_datadir}/mimelnk/*/*.desktop
+%{_datadir}/icons/crystalsvg/*/*/*
 %endif
 %{_datadir}/apps/*
 %{_datadir}/applications/kde/*.desktop
-%{_datadir}/config*/*
-%{_datadir}/icons/crystalsvg/*/*/*
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/icons/locolor/*/*/*
-%{_datadir}/mimelnk/*/*.desktop
 %{_datadir}/service*/*.desktop
 %{tde_libdir}/*
 %{_libdir}/pkgconfig/*.pc
 
 
+
+
 %changelog
+* Mon Sep 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2
+- Add support for RHEL5
+
 * Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
 - Initial build for RHEL 6
 - Spec file based on Fedora 8 "kdeadmin-3.5.10-1"
diff --git a/redhat/kdeartwork/trinity-kdeartwork-3.5.12.spec b/redhat/kdeartwork/trinity-kdeartwork-3.5.12.spec
index 909ca1a51..e1bc6e7b7 100644
--- a/redhat/kdeartwork/trinity-kdeartwork-3.5.12.spec
+++ b/redhat/kdeartwork/trinity-kdeartwork-3.5.12.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.12
 %endif
-%define release 4
+%define release 5
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -28,6 +28,9 @@ 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)
+
 Source: kdeartwork-%{version}.tar.gz
 
 # FIXME: this should go in kde-settings -- Rex
@@ -37,6 +40,8 @@ BuildRequires: gettext
 BuildRequires: trinity-kdebase-devel
 BuildRequires: libart_lgpl-devel
 BuildRequires: nas-devel esound-devel jack-audio-connection-kit-devel
+BuildRequires:	xscreensaver-extras xscreensaver-gl-base
+
 
 Requires: trinity-kdebase
 
@@ -79,8 +84,7 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}"
 %install
 export PATH="%{_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-
-%make_install
+%__make install DESTDIR=%{buildroot}
 
 # webcollage -root -directory /usr/share/backgrounds/images #227683
 
@@ -165,6 +169,9 @@ done
 
 
 %changelog
+* Mon Sep 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-5
+- Add support for RHEL5
+
 * Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-4
 - Import to GIT
 
diff --git a/redhat/kdebase/kdebase-3.5.12-disable-krandr.patch b/redhat/kdebase/kdebase-3.5.12-disable-krandr.patch
new file mode 100644
index 000000000..b7924cef0
--- /dev/null
+++ b/redhat/kdebase/kdebase-3.5.12-disable-krandr.patch
@@ -0,0 +1,36 @@
+*** kdebase/kcontrol/Makefile.am.ORI	2011-09-18 22:04:50.000000000 +0200
+--- kdebase/kcontrol/Makefile.am	2011-09-18 22:05:00.000000000 +0200
+***************
+*** 12,18 ****
+  endif
+  
+  if include_kcontrol_iccconfig
+! ICCCONFIG_SUBDIR=iccconfig
+  endif
+  
+  if include_kcontrol_usbview
+--- 12,18 ----
+  endif
+  
+  if include_kcontrol_iccconfig
+! #ICCCONFIG_SUBDIR=iccconfig
+  endif
+  
+  if include_kcontrol_usbview
+***************
+*** 24,30 ****
+  endif
+  
+  if include_kcontrol_randr
+! RANDR_SUBDIR=randr
+  endif
+  
+  if include_kcontrol_joystick
+--- 24,30 ----
+  endif
+  
+  if include_kcontrol_randr
+! #RANDR_SUBDIR=randr
+  endif
+  
+  if include_kcontrol_joystick
diff --git a/redhat/kdeedu/trinity-kdeedu-3.5.12.spec b/redhat/kdeedu/trinity-kdeedu-3.5.12.spec
index dd7df51eb..0cfdf0dcc 100644
--- a/redhat/kdeedu/trinity-kdeedu-3.5.12.spec
+++ b/redhat/kdeedu/trinity-kdeedu-3.5.12.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.12
 %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"
@@ -29,7 +29,9 @@ 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: kdeedu-%{version}.tar.gz
 
 Provides: kdeedu3 = %{version}-%{release}
@@ -43,7 +45,11 @@ BuildRequires: desktop-file-utils
 BuildRequires: trinity-kdelibs-devel
 BuildRequires: python-devel python
 BuildRequires: boost-devel
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
 BuildRequires: ocaml(compiler)
+%else
+BuildRequires: ocaml
+%endif
 #BuildRequires: ocaml-facile-devel
 
 
@@ -116,7 +122,11 @@ export CXXFLAGS="${CXXFLAGS} -fpermissive"
    --enable-new-ldflags \
    --disable-dependency-tracking \
    --disable-rpath \
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
    --enable-kig-python-scripting \
+%else
+   --disable-kig-python-scripting \
+%endif
    --disable-debug \
    --disable-warnings \
    --enable-final \
@@ -126,14 +136,14 @@ export CXXFLAGS="${CXXFLAGS} -fpermissive"
    --with-extra-includes=%{_includedir}/tqt
 
 
-%__make %{?_smp_mflags} \
+%__make \
   OCAMLLIB=$(ocamlc -where) FACILELIB=$(ocamlc -where)
 
 
 %install
 export PATH="%{_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%make_install
+%__make install DESTDIR=%{buildroot}
 
 # locale's
 %find_lang %{name} || touch %{name}.lang
@@ -214,6 +224,9 @@ update-desktop-database >& /dev/null ||:
 
 
 %changelog
+* Mon Sep 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2
+- Add support for RHEL5
+
 * Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
 - Initial build for RHEL 6
 - Spec file based on Fedora 8 "kdeedu-3.5.10-1"
diff --git a/redhat/kdegames/trinity-kdegames-3.5.12.spec b/redhat/kdegames/trinity-kdegames-3.5.12.spec
index 1c382332f..3cb97f970 100644
--- a/redhat/kdegames/trinity-kdegames-3.5.12.spec
+++ b/redhat/kdegames/trinity-kdegames-3.5.12.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.12
 %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"
@@ -29,7 +29,9 @@ 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)
+
 Source: kdegames-%{version}.tar.gz
 
 Provides: kdegames3 = %{version}-%{release}
@@ -102,7 +104,7 @@ export CXXFLAGS="${CXXFLAGS} -lkio"
 %install
 export PATH="%{_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%make_install
+%__make install DESTDIR=%{buildroot}
 
 # locale's
 %find_lang %{name} || touch %{name}.lang
@@ -183,6 +185,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %changelog
+* Mon Sep 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2
+- Add support for RHEL5
+
 * Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
 - Initial build for RHEL 6
 - Spec file based on Fedora 8 "kdegames-3.5.10-1"
diff --git a/redhat/kdegraphics/trinity-kdegraphics-3.5.12.spec b/redhat/kdegraphics/trinity-kdegraphics-3.5.12.spec
index 2c0405914..512d70952 100644
--- a/redhat/kdegraphics/trinity-kdegraphics-3.5.12.spec
+++ b/redhat/kdegraphics/trinity-kdegraphics-3.5.12.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.12
 %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"
@@ -24,12 +24,14 @@ License:	GPL
 Summary:    K Desktop Environment - Graphics Applications
 
 Group:      Applications/Multimedia
-Prefix:		%{_prefix}
 
 Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.trinitydesktop.org/
 
+Prefix:		%{_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 Source0:	kdegraphics-%{version}.tar.gz
 
 # Official TDE patches (from SVN)
@@ -54,6 +56,7 @@ BuildRequires: gphoto2-devel
 BuildRequires: sane-backends-devel
 BuildRequires: libusb-devel
 
+
 # kgamma
 BuildRequires: libXxf86vm-devel
 # kuickshow
@@ -62,7 +65,11 @@ BuildRequires: imlib-devel
 BuildRequires: OpenEXR-devel
 # kpdf
 BuildRequires: freetype-devel
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
 BuildRequires: poppler-qt-devel
+%else
+BuildRequires: poppler-devel
+%endif
 BuildRequires: libpaper-devel
 # ksvg
 BuildRequires: fontconfig-devel
@@ -171,7 +178,7 @@ sed -i kpdf/Makefile \
 export PATH="%{_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 
-make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot}
 
 # locale's
 %find_lang %{name} || touch %{name}.lang
@@ -344,6 +351,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %exclude %{_libdir}/libdjvu.so
 
 %changelog
+* Mon Sep 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-3
+- Add support for RHEL5
+
 * Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2 
 - Import to GIT
 
diff --git a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.12.spec b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.12.spec
index 16023a89d..e4f1f310c 100644
--- a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.12.spec
+++ b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.12.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.12
 %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"
@@ -38,15 +38,17 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.trinitydesktop.org/
 
-Source0: kdemultimedia-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Prefix:		%{_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Provides: kdemultimedia3 = %{version}-%{release}
+Source0: kdemultimedia-%{version}.tar.gz
 
 # RedHat Legacy patches (from Fedora 8)
 Patch3: kdemultimedia-3.4.0-xdg.patch
 Patch5: kdemultimedia-3.5.7-pthread.patch
 
+Provides: kdemultimedia3 = %{version}-%{release}
+
 Requires: %{name}-libs = %{version}-%{release}
 
 BuildRequires: zlib-devel
@@ -64,6 +66,8 @@ BuildRequires: automake libtool
 %{?_with_musicbrainz:BuildRequires: libmusicbrainz-devel libtunepimp-devel}
 %{?_with_taglib:BuildRequires: taglib-devel}
 %{?_with_xine:BuildRequires: xine-lib-devel}
+BuildRequires:	libXxf86dga-devel
+BuildRequires:	libXxf86vm-devel
 
 %description
 The K Desktop Environment (KDE) is a GUI desktop for the X Window
@@ -93,14 +97,7 @@ noatun plugins.
 %package extras
 Summary: Extra applications from %{name} 
 Group: Applications/Multimedia
-%if 0%{?libs}
 Requires: %{name}-extras-libs = %{version}-%{release}
-%else
-Obsoletes: %{name}-extras-libs < %{version}-%{release}
-Provides:  %{name}-extras-libs = %{version}-%{release}
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-%endif
 %description extras
 %{summary}, including:
  * juk, a media player
@@ -169,10 +166,10 @@ export CXXFLAGS="${CXXFLAGS} -lDCOP"
 
 %install
 export PATH="%{_bindir}:${PATH}"
-%__rm -rf %{buildroot} 
+%__rm -rf %{?buildroot} 
 
-%make_install
-%make_install -C kaudiocreator
+%__make install DESTDIR=%{?buildroot} 
+%__make install DESTDIR=%{?buildroot}  -C kaudiocreator
 
 ## Remove/uninstall (conflicting) bits we don't want
 rm -f $RPM_BUILD_ROOT%{_libdir}/mcop/akode*MPEGPlayObject.mcopclass
@@ -220,7 +217,6 @@ done
 
 
 %post
-%{?libs:/sbin/ldconfig}
 for f in crystalsvg hicolor locolor ; do
   touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
   gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
@@ -228,7 +224,6 @@ done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %postun
-%{?libs:/sbin/ldconfig}
 for f in crystalsvg hicolor locolor ; do
   touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
   gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
@@ -384,6 +379,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %changelog
+* Mon Sep 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2
+- Add support for RHEL5
+
 * Sat Sep 09 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
 - Initial build for RHEL 6
 - Spec file based on Fedora 8 "kdemultimedia-6:3.5.10-2"
diff --git a/redhat/kdenetwork/trinity-kdenetwork-3.5.12.spec b/redhat/kdenetwork/trinity-kdenetwork-3.5.12.spec
index c802d72bf..8f7a72611 100644
--- a/redhat/kdenetwork/trinity-kdenetwork-3.5.12.spec
+++ b/redhat/kdenetwork/trinity-kdenetwork-3.5.12.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.12
 %endif
-%define release 4
+%define release 5
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -43,7 +43,9 @@ URL:		http://www.trinitydesktop.org/
 
 License: GPLv2
 Group:   Applications/Internet
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Prefix:		%{_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Provides: kdenetwork3 = %{version}-%{release}
 
@@ -110,7 +112,9 @@ Requires(post):   chkconfig
 #Requires(hint): samba-client
 BuildRequires:  avahi-qt3-devel
 
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
 BuildRequires:	libv4l-devel
+%endif
 
 %if 0%{?console_helper}
 Requires: usermode-gtk
@@ -211,9 +215,9 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}"
 export PATH="%{_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 
-%make_install
+%__make install DESTDIR=%{buildroot}
 # RHEL6: kppp seems to be not installed by previous command ???
-%make_install -C kppp
+%__make install DESTDIR=%{buildroot} -C kppp
 
 
 ## File lists
@@ -477,6 +481,9 @@ done
 
 
 %changelog
+* Mon Sep 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-5
+- Add support for RHEL5
+
 * Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-4
 - Import to GIT
 
diff --git a/redhat/kdepim/trinity-kdepim-3.5.12.spec b/redhat/kdepim/trinity-kdepim-3.5.12.spec
index 01b349900..a8134cd94 100644
--- a/redhat/kdepim/trinity-kdepim-3.5.12.spec
+++ b/redhat/kdepim/trinity-kdepim-3.5.12.spec
@@ -1,7 +1,7 @@
 # Default version for this component
 %if "%{?version}" == ""
 %define version 3.5.12
-%define release 5
+%define release 6
 %endif
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
@@ -29,6 +29,7 @@ Summary:	PIM (Personal Information Manager) applications
 Prefix:		%{_prefix}
 
 Source0:	kdepim-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # TDE official patches from SVN, unmodified
 # Attempt to fix a kdepim FTBFS based on a missing stdc header #include
@@ -56,6 +57,7 @@ PIM (Personal Information Manager) applications.
 %package devel
 Requires:	%{name}
 Summary:	%{name} - Development files
+Group: Development/Libraries
 %description devel
 Development files for %{name}.
 
@@ -86,7 +88,7 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}"
 %install
 export PATH="%{_bindir}:${PATH}"
 %__rm -rf %{?buildroot}
-%make_install
+%__make install DESTDIR=%{?buildroot}
 
 %clean
 %__rm -rf %{?buildroot}
@@ -125,6 +127,9 @@ export PATH="%{_bindir}:${PATH}"
 %exclude %{_libdir}/libkmailprivate.so
 
 %changelog
+* Sun Sep 18 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-6
+- Add RHEL5 support
+
 * Mon Sep 05 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-5
 - Import to GIT
 
diff --git a/redhat/kdesdk/trinity-kdesdk-3.5.12.spec b/redhat/kdesdk/trinity-kdesdk-3.5.12.spec
index 91c574803..238fe5656 100644
--- a/redhat/kdesdk/trinity-kdesdk-3.5.12.spec
+++ b/redhat/kdesdk/trinity-kdesdk-3.5.12.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.12
 %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"
@@ -33,7 +33,10 @@ Group: User Interface/Desktops
 URL:		http://www.trinitydesktop.org/
 Vendor: Trinity Project
 Packager: Francois Andriot <francois.andriot@free.fr>
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Prefix:		%{_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 Source: kdesdk-%{version}.tar.gz
 
 # RedHat Legacy patches
@@ -139,7 +142,7 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}"
 export PATH="%{_bindir}:${PATH}"
 %__rm -rf %{buildroot} 
 
-%make_install
+%__make install DESTDIR=%{?buildroot}
 
 desktop-file-install --vendor "" \
   --dir %{buildroot}%{_datadir}/applications/kde \
@@ -226,6 +229,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %changelog
+* Mon Sep 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-3
+- Add support for RHEL5
+
 * Mon Sep 05 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2
 - Import to GIT
 
diff --git a/redhat/kdetoys/trinity-kdetoys-3.5.12.spec b/redhat/kdetoys/trinity-kdetoys-3.5.12.spec
index 557d872ee..6641945c2 100644
--- a/redhat/kdetoys/trinity-kdetoys-3.5.12.spec
+++ b/redhat/kdetoys/trinity-kdetoys-3.5.12.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.12
 %endif
-%define release 3
+%define release 4
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -25,20 +25,19 @@ Release: %{?release}%{?dist}%{?_variant}
 
 License: GPLv2+
 Source0: kdetoys-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.trinitydesktop.org/
 
 Prefix:		%{_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: desktop-file-utils
 BuildRequires: tqtinterface-devel >= %{version}
 BuildRequires: trinity-kdelibs-devel >= %{version}
 BuildRequires: gettext
 
-#Requires(hint): kdebase3 >= %{version}
 
 %description
 Includes: 
@@ -84,7 +83,7 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}"
 %install
 export PATH="%{_bindir}:${PATH}"
 %__rm -rf "%{buildroot}"
-%make_install
+%__make install DESTDIR=%{buildroot}
 
 desktop-file-install \
   --dir=%{buildroot}%{_datadir}/applnk/System/ScreenSavers \
@@ -151,6 +150,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
 
 
 %changelog
+* Mon Sep 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-4
+- Add support for RHEL5
+
 * Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-3
 - Import to GIT
 
diff --git a/redhat/kdeutils/trinity-kdeutils-3.5.12.spec b/redhat/kdeutils/trinity-kdeutils-3.5.12.spec
index fe8e9ec85..5e65d0712 100755
--- a/redhat/kdeutils/trinity-kdeutils-3.5.12.spec
+++ b/redhat/kdeutils/trinity-kdeutils-3.5.12.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.12
 %endif
-%define release 6
+%define release 7
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -29,6 +29,7 @@ Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.trinitydesktop.org/
 
 Prefix:		%{_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	kdeutils-%{version}.tar.gz
 Source1: klaptop_acpi_helper.pam
@@ -134,7 +135,7 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}"
 %install
 export PATH="%{_bindir}:${PATH}"
 %__rm -rf %{?buildroot}
-%make_install
+%__make install DESTDIR=%{?buildroot}
 
 # Show only in KDE (really? -- Rex)
 for i in kcalc kregexpeditor Kjots ktimer kdf kcmdf ksim KFloppy KEdit \
@@ -316,7 +317,7 @@ done
 %{_datadir}/services/*
 %{_datadir}/servicetypes/*
 %{_datadir}/applications/kde/*
-%if 0%{?rhel} >= 6
+%if 0%{?rhel} >= 5
 %{_datadir}/applnk/Utilities/*
 %{_datadir}/mimelnk/application/*
 %endif
@@ -333,6 +334,9 @@ done
 
 
 %changelog
+* Sun Sep 18 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-7
+- Add RHEL5 support
+
 * Mon Sep 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-6
 - Merge Spec file from Fedora8 "kdeutils-3.5.10-6"
 
diff --git a/redhat/kdevelop/trinity-kdevelop-3.5.12.spec b/redhat/kdevelop/trinity-kdevelop-3.5.12.spec
index 4d70451ba..a7504fbe2 100644
--- a/redhat/kdevelop/trinity-kdevelop-3.5.12.spec
+++ b/redhat/kdevelop/trinity-kdevelop-3.5.12.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.12
 %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"
@@ -33,7 +33,8 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.trinitydesktop.org/
 
-Prefix:	%{_prefix}
+Prefix:		%{_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source: kdevelop-%{version}.tar.gz
 Source1: ftp://129.187.206.68/pub/unix/ide/KDevelop/c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2
@@ -65,7 +66,7 @@ BuildRequires: trinity-kdelibs-devel
 BuildRequires: trinity-kdelibs-apidocs
 BuildRequires: qt3-devel-docs
 BuildRequires: db4-devel
-BuildRequires: flex flex-static
+BuildRequires: flex
 BuildRequires: pcre-devel
 BuildRequires: libacl-devel libattr-devel libidn-devel libart_lgpl-devel
 BuildRequires: gcc-c++
@@ -76,6 +77,9 @@ BuildRequires: subversion-devel neon-devel
 # looks like this is dragged in by apr-devel (dep of subversion-devel), but not
 # a dependency
 BuildRequires: openldap-devel
+%if 0%{?fedora} >= 15
+BuildRequires: flex-static
+%endif
 
 %description
 The KDevelop Integrated Development Environment provides many features
@@ -181,8 +185,8 @@ popd
 %install
 %__rm -rf %{buildroot}
 
-%make_install
-%make_install -C c_cpp_reference-2.0.2_for_KDE_3.0
+%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C c_cpp_reference-2.0.2_for_KDE_3.0
 
 # remove useless files
 %__rm -rf %{buildroot}%{_prefix}/kdevbdb
@@ -240,6 +244,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %changelog
+* Mon Sep 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2
+- Add support for RHEL5
+
 * Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
 - Initial build for RHEL 6
 - Spec file based on Fedora 8 "kdeedu-3.5.3-1"
diff --git a/redhat/kdewebdev/trinity-kdewebdev-3.5.12.spec b/redhat/kdewebdev/trinity-kdewebdev-3.5.12.spec
index d89e250f3..b1c69f526 100644
--- a/redhat/kdewebdev/trinity-kdewebdev-3.5.12.spec
+++ b/redhat/kdewebdev/trinity-kdewebdev-3.5.12.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.12
 %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"
@@ -28,6 +28,7 @@ Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.trinitydesktop.org/
 
 Prefix:		%{_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	kdewebdev-%{version}.tar.gz
 Source1: http://download.sourceforge.net/quanta/css.tar.bz2
@@ -127,7 +128,7 @@ export CXXFLAGS="${CXXFLAGS} -fpermissive"
 %install
 export PATH="%{_bindir}:${PATH}"
 %__rm -rf %{?buildroot}
-%make_install
+%__make install DESTDIR=%{?buildroot}
 
 
 ## package separately?  Why doesn't upstream include this? -- Rex
@@ -216,6 +217,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %changelog
+* Mon Sep 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2
+- Add support for RHEL5
+
 * Thu Sep 15 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
 - Initial build for RHEL 6 / Fedora 15
 - Use Spec file from Fedora8 "kdewebdev-3.5.10-1"