Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

17 files changed, 472 insertions, 325 deletions

diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14
index 57c9d5661..ab00f4ba4 100644
--- a/redhat/Makefile.r14
+++ b/redhat/Makefile.r14
@@ -1,12 +1,12 @@
 SHELL := /bin/bash
-PATH := $(PATH)/build:$(shell pwd)
+PATH := $(PATH):$(shell pwd)/build
 TDE_VERSION = 14.0.0
 
 buildpkg = \
   @echo "Now processing '$(1)' ."; \
-  if ! is_latest_package_installed.sh "$(1)" ${TDE_VERSION}; then \
+  if [ "${REBUILD}" = "$(1)" ] || ! is_latest_package_installed.sh "$(1)" ${TDE_VERSION}; then \
     echo "  Package '${1}' is not yet installed."; \
-    if ! is_latest_package_built.sh "$(1)" ${TDE_VERSION}; then \
+    if [ "${REBUILD}" = "$(1)" ] || ! is_latest_package_built.sh "$(1)" ${TDE_VERSION}; then \
       echo "  Building package."; \
       build_rpm_package.sh "$(1)" ${TDE_VERSION} || exit 1; \
       echo "  Updating repository."; \
diff --git a/redhat/Makefile.v3.5.13-sru b/redhat/Makefile.v3.5.13-sru
index 6f1321250..c8c2e61ff 100644
--- a/redhat/Makefile.v3.5.13-sru
+++ b/redhat/Makefile.v3.5.13-sru
@@ -1,12 +1,12 @@
 SHELL := /bin/bash
-PATH := $(PATH)/build:$(shell pwd)
+PATH := $(PATH):$(shell pwd)/build
 TDE_VERSION = 3.5.13.2
 
 buildpkg = \
   @echo "Now processing '$(1)' ."; \
-  if ! is_latest_package_installed.sh "$(1)" ${TDE_VERSION}; then \
+  if [ "${REBUILD}" = "$(1)" ] || ! is_latest_package_installed.sh "$(1)" ${TDE_VERSION}; then \
     echo "  Package '${1}' is not yet installed."; \
-    if ! is_latest_package_built.sh "$(1)" ${TDE_VERSION}; then \
+    if [ "${REBUILD}" = "$(1)" ] || ! is_latest_package_built.sh "$(1)" ${TDE_VERSION}; then \
       echo "  Building package."; \
       build_rpm_package.sh "$(1)" ${TDE_VERSION} || exit 1; \
       echo "  Updating repository."; \
@@ -51,7 +51,7 @@ tqca:	tqtinterface
 tqca-tls: tqtinterface tqca
 	$(call buildpkg,dependencies/tqca-tls)
 
-qt3:
+qt3: esound
 	$(call buildpkg,dependencies/qt3)
 
 tqtinterface:	qt3
diff --git a/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec b/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec
index 7b9b2f2e5..0570ac1ac 100644
--- a/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec
+++ b/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec
@@ -108,7 +108,7 @@ BuildRequires:	libgstreamer-plugins-base-devel >= 0.10
 %if 0%{?fedora} || 0%{?rhel} >= 4 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_xine 1
 %if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{pclinuxos}
+%if 0%{?pclinuxos}
 BuildRequires: %{_lib}xine-devel
 %else
 BuildRequires: %{_lib}xine1.2-devel
diff --git a/redhat/build/build_rpm_package.sh b/redhat/build/build_rpm_package.sh
index 5d9a7d6cd..d55075ffa 100755
--- a/redhat/build/build_rpm_package.sh
+++ b/redhat/build/build_rpm_package.sh
@@ -29,6 +29,7 @@ fi
 [ -d "${BUILDDIR}" ] || mkdir -p "${BUILDDIR}"
 
 RPMDIR="$(rpm -E %{_rpmdir}.tde-${TDE_VERSION})"
+SRPMDIR="$(rpm -E %{_srcrpmdir}.tde-${TDE_VERSION})"
 
 rpmbuild -ba \
   --define "_specdir ${TEMPDIR}" \
@@ -36,6 +37,7 @@ rpmbuild -ba \
   --define "_builddir ${BUILDDIR}" \
   --define "_buildrootdir ${BUILDROOTDIR}" \
   --define "_rpmdir ${RPMDIR}" \
+  --define "_srcrpmdir ${SRPMDIR}" \
   --define "tde_version ${TDE_VERSION}" \
   --define "tde_prefix /opt/trinity" \
   --define "preversion ${PREVERSION}" \
diff --git a/redhat/build/configure_repository.sh b/redhat/build/configure_repository.sh
index 2456b1a6a..22ddaf4f7 100755
--- a/redhat/build/configure_repository.sh
+++ b/redhat/build/configure_repository.sh
@@ -1,9 +1,10 @@
-#!/bin/bash
+#!/bin/bash -x
 
 TDE_VERSION=${1:-14.0.0}
-ARCH=$(uname -i)
+ARCH=$(rpm -E %_target_cpu)
 RPMDIR=$(rpm -E %{_rpmdir}.tde-${TDE_VERSION})
 
+# RHEL / CentOS / Fedora
 if [ -x /usr/bin/yum ]; then
   cat <<EOF >/tmp/rpmbuild-tde.repo
 [rpmbuild.${ARCH}]
@@ -20,3 +21,10 @@ gpgcheck=0
 EOF
   sudo mv -f /tmp/rpmbuild-tde.repo /etc/yum.repos.d/
 fi
+
+# Mageia / Mandriva
+if [ -x /usr/sbin/urpmi ]; then
+  sudo urpmi.removemedia -y "rpmbuild"
+  sudo urpmi.addmedia rpmbuild.${ARCH} ${RPMDIR}/${ARCH}
+  sudo urpmi.addmedia rpmbuild.noarch ${RPMDIR}/noarch
+fi
diff --git a/redhat/build/get_installed_package_version.sh b/redhat/build/get_installed_package_version.sh
index 62dbb1ff0..c7c5540cb 100755
--- a/redhat/build/get_installed_package_version.sh
+++ b/redhat/build/get_installed_package_version.sh
@@ -7,7 +7,7 @@ PKGNAME="${1##*/}"
 
 # Language package: install only French language package
 case ${PKGNAME} in
-  "k3b-i18n"|"koffice-i18n"|"tde-i18n") PKGNAME="${PKGNAME}-French";;
+  "k3b-i18n"|"koffice-i18n"|"tde-i18n") PKGNAME="trinity-${PKGNAME}-French";;
   "koffice") PKGNAME="${PKGNAME}-suite";;
   "trinity-"*) PKGNAME="${PKGNAME#trinity-}";;
   "qt3") [ -r /etc/mandriva-release ] && PKGNAME="qt3-common";;
diff --git a/redhat/build/get_latest_tarball_version.sh b/redhat/build/get_latest_tarball_version.sh
index b12d63cdd..6c41f0afa 100755
--- a/redhat/build/get_latest_tarball_version.sh
+++ b/redhat/build/get_latest_tarball_version.sh
@@ -7,7 +7,7 @@ TDE_VERSION="${2:-14.0.0}"
 
 TARBALL=$(get_latest_tarball_filename.sh "${PKGNAME}" ${TDE_VERSION})
 
-[ ! -r "${TARBALL}" ] && echo "No tarball found for '${PKGNAME}' !" && exit 2
+[ ! -r "${TARBALL}" ] && exit 2
 
 VERSION=${TARBALL##*/}
 VERSION=${VERSION#trinity-}
diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh
index 14a32f2d7..712732911 100755
--- a/redhat/build/get_rpm_package_name.sh
+++ b/redhat/build/get_rpm_package_name.sh
@@ -31,7 +31,7 @@ echo "${PREFIX}${PKGNAME}"
 
 if [ -n "${DEVEL}" ]; then
   # Check if development package is required.
-  # Applications do NOT have development packages
+  # Applications do NOT have development packages, except K3B
   case "${PKGCATEGORY}" in
     "applications") if [ "${PKGNAME}" != "k3b" ]; then exit 0; fi;;
   esac
diff --git a/redhat/build/install_requires.sh b/redhat/build/install_requires.sh
new file mode 100755
index 000000000..9c901ac50
--- /dev/null
+++ b/redhat/build/install_requires.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+PKGFILE="packages$(rpm -E %dist)"
+
+# Under Mageia/Mandriva, do not forget to enable "Tainted" and "Nonfree" repositories !
+if [ -x /usr/sbin/urpmi ]; then
+  if [ "$(uname -i)" = "x86_64" ]; then
+    PKGS="$(<${PKGFILE})"
+  else
+    PKGS="$(sed -e "s|lib64|lib|" ${PKGFILE} | sort -u)"
+  fi
+
+  sudo urpmi ${PKGS} 2>&1
+fi
diff --git a/redhat/build/is_latest_package_built.sh b/redhat/build/is_latest_package_built.sh
index 1950aa9d3..5f9a442a7 100755
--- a/redhat/build/is_latest_package_built.sh
+++ b/redhat/build/is_latest_package_built.sh
@@ -5,6 +5,7 @@ TDE_VERSION="${2:-14.0.0}"
 
 BUILT=$(get_latest_built_package_version.sh ${PKGNAME} ${TDE_VERSION})
 TARBALL=$(get_latest_tarball_version.sh ${PKGNAME} ${TDE_VERSION})
+RPM_PKGNAME="$(get_rpm_package_name.sh ${PKGNAME})"
 
 # If package version contains a "~": it's a pre-release
 if [ "${BUILT/\~/}" != "${BUILT}" ]; then
diff --git a/redhat/build/update_repository.sh b/redhat/build/update_repository.sh
index c651fc3f5..1f2216152 100755
--- a/redhat/build/update_repository.sh
+++ b/redhat/build/update_repository.sh
@@ -9,14 +9,20 @@ while [ -e "${LOCKFILE}" ]; do
   sleep 3
 done
 
+ARCH="$(rpm -E %{_target_cpu})"
+RPMDIR=$(rpm -E %{_rpmdir}.tde-${TDE_VERSION})
+
+[ -d "${RPMDIR}/noarch" ] || mkdir -p "${RPMDIR}/noarch"
+[ -d "${RPMDIR}/${ARCH}" ] || mkdir -p "${RPMDIR}/${ARCH}"
+
 if [ -x /usr/sbin/urpmi ]; then
-  REPOUPDATE='(cd $(rpm -E %{_rpmdir}.tde-${TDE_VERSION}); genhdlist2 --clean --allow-empty noarch; genhdlist2 --clean --allow-empty $(uname -i); sudo urpmi.update rpmbuild.$(uname -i) rpmbuild.noarch)'
+  REPOUPDATE='(cd ${RPMDIR}; genhdlist2 --clean --allow-empty noarch & genhdlist2 --clean --allow-empty ${ARCH} & wait; sudo urpmi.update rpmbuild.${ARCH} rpmbuild.noarch)'
 elif [ -x /usr/bin/zypper ]; then
-  REPOUPDATE='(cd $(rpm -E %{_rpmdir}.tde-${TDE_VERSION}); createrepo --workers=${WORKERS} $(uname -i); createrepo --workers=${WORKERS} noarch; sudo zypper refresh rpmbuild.$(uname -i) rpmbuild.noarch)'
+  REPOUPDATE='(cd ${RPMDIR}; createrepo --workers=${WORKERS} ${ARCH} & createrepo --workers=${WORKERS} noarch & wait; sudo zypper refresh rpmbuild.${ARCH} rpmbuild.noarch)'
 elif [ -x /usr/bin/yum ]; then
-  REPOUPDATE='(cd $(rpm -E %{_rpmdir}.tde-${TDE_VERSION}); createrepo $(uname -i); createrepo noarch; sudo yum clean all --disablerepo="*" --enablerepo="rpmbuild*")'
+  REPOUPDATE='(cd ${RPMDIR}; createrepo ${ARCH} & createrepo noarch & wait; sudo yum clean all --disablerepo="*" --enablerepo="rpmbuild*")'
 elif [ -x /usr/bin/apt-get ]; then
-  REPOUPDATE='(cd $(rpm -E %{_rpmdir}.tde-${TDE_VERSION}); genpkglist $PWD noarch; genpkglist $PWD i586; genpkglist $PWD x86_64; genbasedir $PWD i586 x86_64 noarch; sudo apt-get update)'
+  REPOUPDATE='(cd ${RPMDIR}; genpkglist $PWD noarch & genpkglist $PWD ${ARCH} & wait; genbasedir $PWD ${ARCH} noarch; sudo apt-get update)'
 fi
 
-eval "${REPOUPDATE}; rm -f ${LOCKFILE}"|| exit 1
+eval "${REPOUPDATE}; rm -f ${LOCKFILE}" || exit 1
diff --git a/redhat/extras/trinity-desktop/trinity-desktop-3.5.13.2.spec b/redhat/extras/trinity-desktop/trinity-desktop-3.5.13.2.spec
index fa69466f0..2a03dabce 100644
--- a/redhat/extras/trinity-desktop/trinity-desktop-3.5.13.2.spec
+++ b/redhat/extras/trinity-desktop/trinity-desktop-3.5.13.2.spec
@@ -162,14 +162,15 @@ Requires: trinity-tdeio-apt
 Requires: trinity-tdeio-locate
 Requires: trinity-tdeio-umountwrapper
 Requires: trinity-tderadio
-%if 0%{?pclinuxos} == 0
-Requires: trinity-tdesudo
-%endif
 Requires: trinity-tdmtheme
 Requires: trinity-tellico
 Requires: trinity-wlassistant
 Requires: trinity-yakuake
 
+# PCLinuxOS does not have sudo ...
+%if 0%{?pclinuxos} == 0
+Requires: trinity-tdesudo
+%endif
 
 # Disabled applications for RHEL5
 %if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
@@ -185,7 +186,7 @@ Requires: trinity-kpilot
 
 # This one causes several crashes . Obsolete.
 #Requires: trinity-kgtk-qt3
-Obsoletes: trinity-kgtk-qt3
+#Obsoletes: trinity-kgtk-qt3
 
 # OBSOLETE: beagle does not exist anymore. Kerry is now useless.
 # RHEL, openSUSE 12: no Beagle library
diff --git a/redhat/packages.mga b/redhat/packages.mga
index aa4757f32..bc3ae9dbe 100644
--- a/redhat/packages.mga
+++ b/redhat/packages.mga
@@ -1,326 +1,225 @@
-rpm-build
+GraphicsMagick-devel
+ImageMagick-devel
+NetworkManager-glib-devel
+OpenEXR-devel
+SDL-devel
+X11-devel
+alsa-lib-devel
+aspell
+aspell-devel
+audiofile-devel
+bind-devel
+bison
+boost-devel
+bzip2-devel
 ccache
+ccrtp-devel
+cdparanoia
+chrpath
 cmake
-mysql-devel
-unixODBC-devel
-libpq-devel
-freetype2-devel
-mesaglu-devel
-libsm-devel
-libice-devel
-libx11-devel
-libxcursor-devel
-libxext-devel
-libxft-devel
-libxinerama-devel
-libxmu-devel
-libxrandr-devel
-libxrender-devel
-fontconfig-devel
-bzip2-devel
-libjpeg-devel
-libmng-devel
-pkgconfig(libpng15)
-zlib-devel
-nas-devel
-libiodbc-devel
-glib2-devel
-python-devel
-perl(XML::Parser)
-gtk-doc
-libblkid-devel
-pciutils-devel
-xmlto
-gperf
-libv4l-devel
-expat-devel
+cmake 
+cups-devel
+curl-devel
+db5-devel
 dbus-devel
 dbus-glib
 dbus-glib-devel
-libusb-devel
-libudev-devel
-cups-devel
-cmake
-libgsf-devel
-pth-devel
-libxi-devel
-audiofile-devel
-gsl-devel
-alsa-lib-devel
-libvorbis-devel
+djvulibre
+docbook-dtd412-xml
+docbook-style-xsl
+docbook-utils
+doxygen
+drakconf
+dssi-devel
 esound-devel
-libjack-devel
-libmad-devel
-pkgconfig(audiofile)
+expat-devel
+fftw-devel
+flex
+fontconfig-devel
+freetype-devel
+freetype2-devel
+fribidi-devel
+gamin-devel
 gettext-devel
-libcurl-devel
+glib2-devel
+gnokii-devel
+gperf
+gpgme-devel
+gphoto2-devel
+gsl-devel
+gtk-doc
 gtk2-devel
-libxslt-devel
-libart_lgpl-devel
-aspell
-aspell-devel
-gamin-devel
-libutempter-devel
-hspell-devel
-libjasper-devel
-OpenEXR-devel
-libraw1394-devel
-lm_sensors-devel
 hal-devel
-libxscrnsaver1-devel
-lib64xscrnsaver1-devel
-libsmbclient-devel
+hspell-devel
 imake
-libxkbfile-devel
-libfontenc-devel
-libxtst6-devel
-lib64xtst6-devel
-x11-font-util
-xulrunner-devel
-ruby-devel
-java-openjdk
-java-devel
+imlib1-devel
+java-1.6.0-openjdk-devel
 java-1.7.0-openjdk-devel
-perl-devel
-libtheora-devel
-taglib-devel
-cdparanoia
-libcdda-devel
-libflac-devel
+java-devel
+java-openjdk
+karma-sharp
+lib64OpenSP5-devel
+lib64binutils-devel
+lib64clucene-devel
+lib64commoncpp-devel
+lib64curl-devel
+lib64dvdread-devel
+lib64exiv2-devel
+lib64expat1-devel
+lib64ffmpeg-devel
+lib64flac++-devel
 lib64flac-devel
-libgstreamer0.10-devel
 lib64gstreamer0.10-devel
-libxxf86dga-devel
-lib64xxf86dga-devel
-libxine1.2-devel
-lib64xine1.2-devel
-gnokii-devel
-gpgme-devel
-flex
-libical-devel
-boost-devel
-rpm-devel
-lilo
-xscreensaver
-xscreensaver-base
-xscreensaver-extrusion
-xscreensaver-gl
-net-snmp-devel
-libungif-devel
-gphoto2-devel
-libpaper-devel
-libt1lib-devel
-libsane1-devel
-freetype-devel
-libpoppler-devel
-fribidi-devel
-lib64sane1-devel
+lib64inotifytools-devel
+lib64iw29-devel
+lib64jasper-devel
+lib64lame-devel
+lib64mad-devel
+lib64paper-devel
 lib64poppler-devel
-ocaml
-subversion-devel
-neon-devel
-lib64binutils-devel
-SDL-devel
-db5-devel
-sqlite-devel
-sqlite3-devel
-libgadu-devel
-libiw-devel
-openslp-devel
-valgrind
+lib64pulseaudio-devel
+lib64sane1-devel
+lib64t1lib-devel
+lib64twolame-devel
+lib64v4l-devel
+lib64xaw-devel
+lib64xi-devel
+lib64xine1.2-devel
+lib64xscrnsaver1-devel
+lib64xtst6-devel
+lib64xxf86dga-devel
+lib64yaz-devel
+libOpenSP5-devel
+libart_lgpl-devel
+libblkid-devel
+libcdda-devel
+libclucene-devel
+libcommoncpp-devel
+libcurl-devel
+libdvdread-devel
 libexiv2-devel
-transfig
-djvulibre
-librsvg
-libwmf-devel
-netpbm
-python-sip
-python-qt
-bison
-libtiff-devel
+libffmpeg-devel
+libflac++-devel
+libflac-devel
+libfontenc-devel
+libgadu-devel
+libgpod-devel
+libgsf-devel
+libgstreamer-plugins-base-devel
+libgstreamer0.10-devel
+libhd-devel
+libical-devel
+libice-devel
 libifp-devel
+libinotifytools-devel
+libiodbc-devel
+libiw-devel
+libjack-devel
+libjasper-devel
+libjpeg-devel
 libkarma-devel
-karma-sharp
-libgpod-devel
+liblame-devel
+liblo-devel
+liblrdf-devel
+libmad-devel
+libmng-devel
+libmp4v2-devel
+libmpcdec-devel
 libmtp-devel
 libmusicbrainz-devel
 libnjb-devel
-libvisual-devel
-libinotifytools-devel
-libmp4v2-devel
-libclucene-devel
-sword-devel
-libmpcdec-devel
-libsndfile-devel
-libdvdread-devel
-libflac++-devel
-liblame-devel
-libffmpeg-devel
-libgstreamer-plugins-base-devel
-ImageMagick-devel
-doxygen
-GraphicsMagick-devel
-libwpd-devel
-wv2-devel
-recode
 libofx-devel
-libOpenSP5-devel
-docbook-style-xsl
 libotr-devel
-yaz
-lib64yaz-devel
-subversion-devel
-dssi-devel
-liblo-devel
-liblrdf-devel
-lirc-devel
-scons
-subversion-devel
-pilot-link-devel
-libhd-devel
-lib64commoncpp-devel
-ccrtp-devel
-libzrtpcpp-devel
-bind-devel
-libcommoncpp-devel
-unixODBC-devel
+libotr3-devel
+libpaper-devel
+libpoppler-devel
 libpq-devel
-mesaglu-devel
-libxmu-devel
-bzip2-devel
-pkgconfig(libpng15)
-nas-devel
-libiodbc-devel
-postgresql9.2-devel
-cups-devel
-cmake 
-pth-devel
-lib64xi-devel
-gsl-devel
-lib64mad-devel
-esound-devel
-libmad-devel
-docbook-dtd412-xml
-docbook-utils
-gettext-devel
-lib64expat1-devel
-libxslt-devel
-aspell
-aspell-devel
-libutempter-devel
-hspell-devel
-lib64jasper-devel
-OpenEXR-devel
 libraw1394-devel
-pam-devel
-libusb-devel
-openldap-devel
-lm_sensors-devel
-libudev-devel
-hal-devel
-lib64xscrnsaver1-devel
+librsvg
+libsane1-devel
+libsm-devel
 libsmbclient-devel
-imake
+libsndfile-devel
+libt1lib-devel
+libtheora-devel
+libtiff-devel
+libtunepimp-devel
+libudev-devel
+libungif-devel
+libusb-devel
+libutempter-devel
+libv4l-devel
+libvisual-devel
+libvorbis-devel
+libwmf-devel
+libwpd-devel
+libx11-devel
+libxcursor-devel
+libxext-devel
+libxft-devel
+libxi-devel
+libxine1.2-devel
+libxinerama-devel
 libxkbfile-devel
-libfontenc-devel
+libxmu-devel
+libxrandr-devel
+libxrender-devel
+libxscrnsaver1-devel
+libxslt-devel
 libxtst-devel
-x11-font-util
-gnokii-devel
-gpgme-devel
-libical-devel
-boost-devel
-curl-devel
-gtk2-devel
-lib64curl-devel
-lib64flac-devel
-lib64pulseaudio-devel
+libxtst6-devel
+libxv-devel
+libxxf86dga-devel
+libyaz-devel
+libzrtpcpp-devel
+lilo
+lirc-devel
+lm_sensors-devel
+mesaglu-devel
+mysql-devel
+nas-devel
+neon-devel
+net-snmp-devel
+netpbm
+ocaml
+openldap-devel
+openslp-devel
+opensp-devel
+pam-devel
+pciutils-devel
+perl(XML::Parser)
+perl-devel
+pilot-link-devel
+pkgconfig(audiofile)
+pkgconfig(libpng15)
+pkgconfig(libpng16)
+postgresql9.2-devel
+pth-devel
+python-devel
+python-qt
+python-sip
+readline-devel
+recode
+rpm-build
+rpm-devel
+ruby-devel
+scons
 speex-devel
-libtheora-devel
+sqlite-devel
+sqlite3-devel
+subversion-devel
+sword-devel
 taglib-devel
-cdparanoia
-libcdda-devel
-lib64gstreamer0.10-devel
-lib64xxf86dga-devel
-lib64lame-devel
-rpm-devel
-SDL-devel
+transfig
+unixODBC-devel
+valgrind
+wv2-devel
+x11-font-util
+xmlto
+xscreensaver
 xscreensaver-base
 xscreensaver-extrusion
 xscreensaver-gl
 xulrunner-devel
-ruby-devel
-java-openjdk
-java-devel
-java-1.6.0-openjdk-devel
-perl-devel
-ocaml
-libgadu-devel
-lib64iw29-devel
-openslp-devel
-lib64v4l-devel
-subversion-devel
-neon-devel
-lib64binutils-devel
-net-snmp-devel
-libungif-devel
-gphoto2-devel
-lib64paper-devel
-lib64t1lib-devel
-lib64sane1-devel
-freetype-devel
-lib64poppler-devel
-fribidi-devel
-lib64exiv2-devel
-transfig
-djvulibre
-librsvg
-libwmf-devel
-X11-devel
-lib64commoncpp-devel
-readline-devel
-bind-devel
-bison
-doxygen
-libcommoncpp-devel
-ImageMagick-devel
-GraphicsMagick-devel
-libwpd-devel
-wv2-devel
-libmpcdec-devel
-libmusicbrainz-devel
-lib64dvdread-devel
-lib64flac++-devel
-lib64ffmpeg-devel
-chrpath
 yaz
-libyaz-devel
-pilot-link-devel
-fftw-devel
-dssi-devel
-liblo-devel
-liblrdf-devel
-lirc-devel
-libotr3-devel
-scons
-libifp-devel
-libkarma-devel
-karma-sharp
-libgpod-devel
-libmtp-devel
-libnjb-devel
-libvisual-devel
-libtunepimp-devel
-lib64inotifytools-devel
-libmp4v2-devel
-lib64twolame-devel
-docbook-style-xsl
-recode
-libofx-devel
-lib64OpenSP5-devel
-lib64clucene-devel
-sword-devel
-drakconf
-imlib1-devel
-NetworkManager-glib-devel
-lib64xaw-devel
-libxv-devel
+zlib-devel
diff --git a/redhat/packages.mga4 b/redhat/packages.mga4
new file mode 100644
index 000000000..ba8535406
--- /dev/null
+++ b/redhat/packages.mga4
@@ -0,0 +1,199 @@
+GraphicsMagick-devel
+ImageMagick-devel
+NetworkManager-glib-devel
+OpenEXR-devel
+SDL-devel
+alsa-lib-devel
+aspell
+aspell-devel
+audiofile-devel
+bind-devel
+bison
+boost-devel
+bzip2-devel
+ccache
+cdparanoia
+chrpath
+cmake
+cups-devel
+curl-devel
+db5-devel
+dbus-devel
+dbus-glib
+dbus-glib-devel
+djvulibre
+docbook-dtd412-xml
+docbook-style-xsl
+docbook-utils
+doxygen
+drakconf
+dssi-devel
+expat-devel
+fftw-devel
+flex
+fontconfig-devel
+freetype-devel
+freetype2-devel
+fribidi-devel
+gamin-devel
+gettext-devel
+glib2-devel
+gnokii-devel
+gperf
+gpgme-devel
+gphoto2-devel
+gsl-devel
+gtk-doc
+gtk2-devel
+hspell-devel
+imake
+java-1.7.0-openjdk
+java-1.7.0-openjdk-devel
+karma-sharp
+lcms-devel
+lib64binutils-devel
+lib64clucene-devel
+lib64commoncpp-devel
+lib64curl-devel
+lib64dvdread-devel
+lib64ecpg9.3_6
+lib64exiv2-devel
+lib64ffmpeg-devel
+lib64flac++-devel
+lib64flac-devel
+lib64fontenc-devel
+lib64gstreamer0.10-devel
+lib64inotifytools-devel
+lib64jasper-devel
+lib64jpeg-devel
+lib64lame-devel
+lib64mad-devel
+lib64paper-devel
+lib64poppler-devel
+lib64pulseaudio-devel
+lib64sane1-devel
+lib64t1lib-devel
+lib64tiff-devel
+lib64twolame-devel
+lib64udev-devel
+lib64usb-devel
+lib64v4l-devel
+lib64xaw-devel
+lib64xi-devel
+lib64xine1.2-devel
+lib64xscrnsaver-devel
+lib64xtst-devel
+lib64xxf86dga-devel
+lib64yaz-devel
+libart_lgpl-devel
+libblkid-devel
+libcdda-devel
+libclucene-devel
+libcommoncpp-devel
+libcurl-devel
+libdvdread-devel
+libffmpeg-devel
+libflac++-devel
+libflac-devel
+libgadu-devel
+libgpod-devel
+libgsf-devel
+libgstreamer-plugins-base-devel
+libhd-devel
+libical-devel
+libice-devel
+libifp-devel
+libinotifytools-devel
+libiodbc-devel
+libiw-devel
+libjack-devel
+libjasper-devel
+libkarma-devel
+liblame-devel
+liblo-devel
+liblrdf-devel
+libmad-devel
+libmng-devel
+libmp4v2-devel
+libmpcdec-devel
+libmtp-devel
+libmusicbrainz-devel
+libnjb-devel
+libofx-devel
+libpaper-devel
+libraw1394-devel
+librsvg
+libsm-devel
+libsmbclient-devel
+libsndfile-devel
+libt1lib-devel
+libtheora-devel
+libungif-devel
+libutempter-devel
+libvisual-devel
+libvorbis-devel
+libwmf-devel
+libwpd-devel
+libx11-devel
+libxcursor-devel
+libxext-devel
+libxft-devel
+libxi-devel
+libxinerama-devel
+libxkbfile-devel
+libxmu-devel
+libxrandr-devel
+libxrender-devel
+libxslt-devel
+libxv-devel
+libxxf86dga-devel
+libyaz-devel
+lilo
+lirc-devel
+lm_sensors-devel
+mesaglu-devel
+mysql-devel
+nas-devel
+neon-devel
+net-snmp-devel
+netpbm
+ocaml
+openldap-devel
+openslp-devel
+opensp-devel
+pam-devel
+pciutils-devel
+perl(XML::Parser)
+perl-devel
+pilot-link-devel
+pkgconfig(audiofile)
+pkgconfig(libpng16)
+postgresql9.3
+postgresql9.3-devel
+pth-devel
+python-devel
+python-sip
+readline-devel
+recode
+rpm-build
+rpm-devel
+ruby-devel
+scons
+speex-devel
+sqlite-devel
+sqlite3-devel
+subversion-devel
+sword-devel
+taglib-devel
+transfig
+unixODBC-devel
+valgrind
+wv2-devel
+x11-font-util
+xmlto
+xscreensaver
+xscreensaver-base
+xscreensaver-extrusion
+xscreensaver-gl
+yaz
+zlib-devel
diff --git a/redhat/packages.oss b/redhat/packages.oss
index 445bec9a3..cb6bc6dd2 100644
--- a/redhat/packages.oss
+++ b/redhat/packages.oss
@@ -167,3 +167,4 @@ recode
 NetworkManager-devel
 update-desktop-files
 pcsc-lite-devel
+libconfig-devel
diff --git a/redhat/tdebase/tdebase-3.5.13.2.spec b/redhat/tdebase/tdebase-3.5.13.2.spec
index e8167a10b..8aab6a970 100644
--- a/redhat/tdebase/tdebase-3.5.13.2.spec
+++ b/redhat/tdebase/tdebase-3.5.13.2.spec
@@ -3539,7 +3539,11 @@ NAME=TDM
 DESCRIPTION=TDM (Trinity Display Manager)
 PACKAGE=trinity-tdm
 EXEC=%{tde_bindir}/kdm
+%if 0%{?pclinuxos}
 FNDSESSION_EXEC="/usr/sbin/chksession -k"
+%else
+FNDSESSION_EXEC="/usr/sbin/chksession --generate=/usr/share/xsessions"
+%endif
 EOF
 %endif
 
diff --git a/redhat/tdemultimedia/tdemultimedia-3.5.13.2.spec b/redhat/tdemultimedia/tdemultimedia-3.5.13.2.spec
index 2f7ae3e4e..9e5978c22 100644
--- a/redhat/tdemultimedia/tdemultimedia-3.5.13.2.spec
+++ b/redhat/tdemultimedia/tdemultimedia-3.5.13.2.spec
@@ -134,15 +134,17 @@ BuildRequires:	libXt-devel
 # XINE support
 %if 0%{?fedora} || 0%{?rhel} >= 4 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_xine 1
-%if 0%{?pclinuxos} == 0
 %if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?pclinuxos}
+BuildRequires: %{_lib}xine-devel
+%else
 BuildRequires: %{_lib}xine1.2-devel
 %endif
 %endif
 %if 0%{?fedora} || 0%{?rhel}
 BuildRequires: xine-lib-devel
 %endif
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?suse_version}
 BuildRequires: libxine-devel
 %endif
 %endif
@@ -172,7 +174,7 @@ Requires: trinity-kaudiocreator = %{version}-%{release}
 Requires: %{name}-kfile-plugins = %{version}-%{release}
 Requires: %{name}-kappfinder-data = %{version}-%{release}
 Requires: %{name}-tdeio-plugins = %{version}-%{release}
-Requires: trinity-kmid = %{version}-%{release}
+Requires: trinity-tdemid = %{version}-%{release}
 Requires: trinity-kmix = %{version}-%{release}
 Requires: trinity-krec = %{version}-%{release}
 Requires: trinity-kscd = %{version}-%{release}
@@ -191,7 +193,7 @@ System. The %{name} package contains multimedia applications for
 TDE, including:
   artsbuilder, Synthesizer designer for aRts
   juk, a media player
-  kmid, a midi player
+  tdemid, a midi player
   kmix, an audio mixer
   arts, additional functionality for the aRts sound system
   krec, a recording tool
@@ -622,14 +624,17 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 ##########
 
-%package -n trinity-kmid
+%package -n trinity-tdemid
 Summary:	MIDI/karaoke player for Trinity
 Group:		Applications/Multimedia
 
-%description -n trinity-kmid
+Obsoletes:	trinity-kmid < %{version}-%{release}
+Provides:	trinity-kmid = %{version}-%{release}
+
+%description -n trinity-tdemid
 This package provides a MIDI and karaoke player for TDE.
 
-%files -n trinity-kmid
+%files -n trinity-tdemid
 %defattr(-,root,root,-)
 %{tde_bindir}/kmid
 %{tde_tdelibdir}/libkmidpart.la
@@ -642,7 +647,7 @@ This package provides a MIDI and karaoke player for TDE.
 %{tde_datadir}/servicetypes/audiomidi.desktop
 %{tde_tdedocdir}/HTML/en/kmid/
 
-%post -n trinity-kmid
+%post -n trinity-tdemid
 /sbin/ldconfig
 for f in hicolor ; do
   touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
@@ -650,7 +655,7 @@ for f in hicolor ; do
 done
 update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
-%postun -n trinity-kmid
+%postun -n trinity-tdemid
 /sbin/ldconfig
 for f in hicolor ; do
   touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
@@ -1142,6 +1147,12 @@ noatun plugins.
 
 ##########
 
+# FIXME 2014/03/15: FTBFS on PCLINUXOS  ... Need to remove -fstack-protector
+# UPDATE 2014/04/07: FBTFS on Mageia 4 too !
+%if 0%{?pclinuxos} || 0%{?mgaversion} >= 4
+%define _ssp_cflags -fno-stack-protector --param=ssp-buffer-size=4%{?_serverbuild_flags: %_serverbuild_flags}
+%endif
+
 
 %prep
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
@@ -1154,7 +1165,8 @@ noatun plugins.
 
 
 %build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
+unset QTDIR QTINC QTLIB
+. /etc/profile.d/qt3.sh
 export PATH="%{tde_bindir}:${PATH}"
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
 
@@ -1195,7 +1207,7 @@ fi
   %{?_with_taglib} %{!?_with_taglib:--without-taglib} \
   %{?with_xine:--with-xine} %{!?with_xine:--without-xine}
 
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
 
 
 %install