RPM Packaging: update 3.5.13.2 for openSUSE 13.1

29 files changed, 382 insertions, 111 deletions

diff --git a/redhat/applications/k3b/k3b-3.5.13.2.spec b/redhat/applications/k3b/k3b-3.5.13.2.spec
index b176dc85b..3e3b1578c 100644
--- a/redhat/applications/k3b/k3b-3.5.13.2.spec
+++ b/redhat/applications/k3b/k3b-3.5.13.2.spec
@@ -71,7 +71,13 @@ Requires(postun): coreutils
 Requires:		%{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:		%{name}-common = %{?epoch:%{epoch}:}%{version}-%{release}
 
-Requires:		cdrecord mkisofs
+%if 0%{?suse_version} >= 1310
+Requires:		wodim
+REquires:		genisoimage
+%else
+Requires:		cdrecord
+REquires:		mkisofs
+%endif
 Requires:		dvd+rw-tools
 
 # CDRDAO support
diff --git a/redhat/applications/k9copy/k9copy-3.5.13.2-avcodec.patch b/redhat/applications/k9copy/k9copy-3.5.13.2-avcodec.patch
index 9fe3142a1..f6a362d40 100644
--- a/redhat/applications/k9copy/k9copy-3.5.13.2-avcodec.patch
+++ b/redhat/applications/k9copy/k9copy-3.5.13.2-avcodec.patch
@@ -4,7 +4,7 @@
  #else
  typedef int (*av_find_stream_info_t)(AVFormatContext *);
  #endif
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 26, 0)
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 26, 0)
 +typedef AVCodec* (*avcodec_find_decoder_t)(enum AVCodecID);
 +#else
  typedef AVCodec* (*avcodec_find_decoder_t)(enum CodecID);
diff --git a/redhat/applications/katapult/katapult-3.5.13.2.spec b/redhat/applications/katapult/katapult-3.5.13.2.spec
index b34f34144..20afee2a5 100644
--- a/redhat/applications/katapult/katapult-3.5.13.2.spec
+++ b/redhat/applications/katapult/katapult-3.5.13.2.spec
@@ -195,7 +195,7 @@ update-desktop-database %{tde_appdir} &> /dev/null
 * Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.3.2.1-2
 - Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
 
-* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.3.2.1-1
+* Wed Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.3.2.1-1
 - Initial release for RHEL 6.0
 - Import to GIT
 
diff --git a/redhat/applications/kmymoney/admin-fix-parallel-test.diff b/redhat/applications/kmymoney/admin-fix-parallel-test.diff
new file mode 100644
index 000000000..9f6f46ba8
--- /dev/null
+++ b/redhat/applications/kmymoney/admin-fix-parallel-test.diff
@@ -0,0 +1,11 @@
+--- trinity-tdebindings-14.0.0~pre214+2cf2b76c/admin/cvs.sh.automake113	2013-06-26 22:35:42.000000000 +0200
++++ trinity-tdebindings-14.0.0~pre214+2cf2b76c/admin/cvs.sh	2013-08-29 22:27:18.546349736 +0200
+@@ -123,7 +123,7 @@
+ fi
+ 
+ echo "*** Creating Makefile templates"
+-$AUTOMAKE || exit 1
++$AUTOMAKE --add-missing || exit 1
+ 
+ if test "$UNSERMAKE" = no; then
+   echo "*** Postprocessing Makefile templates"
diff --git a/redhat/applications/kmymoney/kmymoney-3.5.13.2.spec b/redhat/applications/kmymoney/kmymoney-3.5.13.2.spec
index 972e753e9..a7ccc0a4d 100644
--- a/redhat/applications/kmymoney/kmymoney-3.5.13.2.spec
+++ b/redhat/applications/kmymoney/kmymoney-3.5.13.2.spec
@@ -59,6 +59,9 @@ Source1:		kmymoneytitlelabel.png
 # [kmymoney] Fix FTBFS
 Patch1:		kmymoney-3.5.13.2-ftbfs.patch
 
+# [admin] Fix automake 1.13 build issue
+Patch2:			admin-fix-parallel-test.diff
+
 # [kmymoney] Missing LDFLAGS causing FTBFS
 Patch4:		kmymoney-3.5.13-missing_ldflags.patch
 
@@ -126,14 +129,11 @@ This package contains development files needed for KMyMoney plugins.
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 %patch1 -p1 -b .ftbfs
+%patch2 -p1 -b .automake113
 %if 0%{?mgaversion} || 0%{?mdkversion}
 %patch5 -p1 -b .qtpluginsdir
 %endif
 
-%if 0%{?mgaversion} >= 3 || 0%{?pclinuxos} >= 2013 || 0%{?fedora} >= 19
-%__cp /usr/share/automake-1.13/test-driver admin/
-%endif
-
 %__install -m644 %{SOURCE1} kmymoney2/widgets/
 
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
diff --git a/redhat/applications/koffice/admin-fix-parallel-test.diff b/redhat/applications/koffice/admin-fix-parallel-test.diff
new file mode 100644
index 000000000..9f6f46ba8
--- /dev/null
+++ b/redhat/applications/koffice/admin-fix-parallel-test.diff
@@ -0,0 +1,11 @@
+--- trinity-tdebindings-14.0.0~pre214+2cf2b76c/admin/cvs.sh.automake113	2013-06-26 22:35:42.000000000 +0200
++++ trinity-tdebindings-14.0.0~pre214+2cf2b76c/admin/cvs.sh	2013-08-29 22:27:18.546349736 +0200
+@@ -123,7 +123,7 @@
+ fi
+ 
+ echo "*** Creating Makefile templates"
+-$AUTOMAKE || exit 1
++$AUTOMAKE --add-missing || exit 1
+ 
+ if test "$UNSERMAKE" = no; then
+   echo "*** Postprocessing Makefile templates"
diff --git a/redhat/applications/koffice/koffice-3.5.13.2-fix_ruby2_detection.patch b/redhat/applications/koffice/koffice-3.5.13.2-fix_ruby2_detection.patch
new file mode 100644
index 000000000..f375078cf
--- /dev/null
+++ b/redhat/applications/koffice/koffice-3.5.13.2-fix_ruby2_detection.patch
@@ -0,0 +1,15 @@
+--- trinity-koffice-3.5.13.2/lib/kross/configure.in.in.ori	2013-08-24 20:57:39.878623151 +0200
++++ trinity-koffice-3.5.13.2/lib/kross/configure.in.in	2013-08-24 20:58:50.132123615 +0200
+@@ -42,6 +42,12 @@
+         fi
+       fi
+       if test -z "$RUBY_VERSION"; then
++        RUBY_VERSION=`$PKGCONFIG ruby-2.0 --modversion 2>/dev/null`
++        if test -n "$RUBY_VERSION"; then
++          RUBY_CFLAGS=`$PKGCONFIG ruby-2.0 --cflags`
++        fi
++      fi
++      if test -z "$RUBY_VERSION"; then
+         # pkgconfig file does not exist but might be 1.9.1: RUBY_VERSION defined in ruby/version.h
+         if test -n "$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"rubyhdrdir"@:>@)'"; then
+           # rubyhdrdir parameter works only in >=1.9.1; this is 1.9.1
diff --git a/redhat/applications/koffice/koffice-3.5.13.2.spec b/redhat/applications/koffice/koffice-3.5.13.2.spec
index 5e23a4fe8..34dfb6606 100644
--- a/redhat/applications/koffice/koffice-3.5.13.2.spec
+++ b/redhat/applications/koffice/koffice-3.5.13.2.spec
@@ -27,7 +27,7 @@
 %define _docdir %{tde_docdir}
 
 # Disable Kross support for RHEL <= 5 (python is too old)
-%if 0%{?fedora} > 0 || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
 %define with_kross 1
 %endif
 
@@ -56,6 +56,8 @@ BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
 Patch1:			koffice-3.5.13.2-fix_kformula_ftbfs.patch
+Patch2:			koffice-3.5.13.2-fix_ruby2_detection.patch
+Patch3:			admin-fix-parallel-test.diff
 
 # BuildRequires: world-devel ;)
 BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
@@ -1061,10 +1063,8 @@ This package is part of the TDE Office Suite.
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 %patch1 -p1 -b .ftbfs
-
-%if 0%{?mgaversion} >= 3 || 0%{?pclinuxos} >= 2013 || 0%{?fedora} >= 19
-%__cp /usr/share/automake-1.13/test-driver admin/
-%endif
+%patch2 -p1 -b .ruby2
+%patch3 -p1 -b .automake113
 
 # use LGC variant instead
 %__sed -i.dejavu-lgc \
@@ -1078,7 +1078,7 @@ This package is part of the TDE Office Suite.
 
 
 %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}"
 export KDEDIR="%{tde_prefix}"
diff --git a/redhat/applications/kopete-otr/kopete-otr-3.5.13.2.spec b/redhat/applications/kopete-otr/kopete-otr-3.5.13.2.spec
index 74b353a6e..f90d74100 100644
--- a/redhat/applications/kopete-otr/kopete-otr-3.5.13.2.spec
+++ b/redhat/applications/kopete-otr/kopete-otr-3.5.13.2.spec
@@ -1,3 +1,5 @@
+# openSUSE 12.3: do NOT install libotr-devel, use libotr2-devel instead !
+
 # Default version for this component
 %define tde_pkg kopete-otr
 %define tde_version 3.5.13.2
@@ -82,8 +84,9 @@ users with IM-Cients supporting the OTR encryption method.
 
 
 %build
-unset QTDIR; . /etc/profile.d/qt3.sh
+unset QTDIR QTINC QTLIB; . /etc/profile.d/qt3.sh
 export PATH="%{tde_bindir}:${PATH}"
+export 
 
 %configure \
   --prefix=%{tde_prefix} \
@@ -99,7 +102,9 @@ export PATH="%{tde_bindir}:${PATH}"
   --enable-new-ldflags \
   --enable-final \
   --enable-closure \
-  --enable-rpath
+  --enable-rpath \
+  \
+  --with-extra-includes=/usr/include/tqt
 
 %__make %{_smp_mflags}
 
diff --git a/redhat/applications/ktorrent/ktorrent-3.5.13.2.spec b/redhat/applications/ktorrent/ktorrent-3.5.13.2.spec
index b4c76217d..5324722a6 100644
--- a/redhat/applications/ktorrent/ktorrent-3.5.13.2.spec
+++ b/redhat/applications/ktorrent/ktorrent-3.5.13.2.spec
@@ -52,7 +52,7 @@ BuildRequires:	gettext
 
 # AVAHI support
 #  Disabled on RHEL4 and RHEL5
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
+%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
 %define with_avahi 1
 BuildRequires:	trinity-avahi-tqt-devel
 Requires:		trinity-avahi-tqt
diff --git a/redhat/applications/kuickshow/kuickshow-3.5.13.2.spec b/redhat/applications/kuickshow/kuickshow-3.5.13.2.spec
index 9e08d202f..b34d3ca68 100644
--- a/redhat/applications/kuickshow/kuickshow-3.5.13.2.spec
+++ b/redhat/applications/kuickshow/kuickshow-3.5.13.2.spec
@@ -151,7 +151,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 - Rename obsolete tq methods to standard names [Commit #bdeb8b3a]
 - Remove inadvertent renaming [Commit #d97e403f] [Bug #863]
 
-* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.13-2
+* Wed Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.13-2
 - Import to GIT
 
 * Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.13-1
diff --git a/redhat/applications/piklab/piklab-3.5.13.2.spec b/redhat/applications/piklab/piklab-3.5.13.2.spec
index b8866b682..a44e1fd82 100644
--- a/redhat/applications/piklab/piklab-3.5.13.2.spec
+++ b/redhat/applications/piklab/piklab-3.5.13.2.spec
@@ -78,6 +78,7 @@ unset QTDIR; . /etc/profile.d/qt3.sh
 export PATH="%{tde_bindir}:${PATH}"
 
 # Warning: --enable-final causes FTBFS
+# Warning: RHEL5 FTBFS: https://bugzilla.redhat.com/show_bug.cgi?id=499837
 %configure \
   --prefix=%{tde_prefix} \
   --exec-prefix=%{tde_prefix} \
@@ -92,7 +93,10 @@ export PATH="%{tde_bindir}:${PATH}"
   --disable-final \
   --enable-new-ldflags \
   --enable-closure \
-  --enable-rpath
+  --enable-rpath \
+%if 0%{?rhel} == 5
+  --disable-libreadline \
+%endif
 
 %__make %{?_smp_mflags}
 
@@ -153,7 +157,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 * Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.15.2-4
 - Initial release for TDE 3.5.13.1
 
-* Sun Apr 06 2012 Francois Andriot <francois.andriot@free.fr> - 0.15.2-3
+* Fri Apr 06 2012 Francois Andriot <francois.andriot@free.fr> - 0.15.2-3
 - Fix MAN directory location
 - Fix compilation with GCC 4.7 [Bug #958]
 
diff --git a/redhat/applications/tde-guidance/tde-guidance-3.5.13.2.spec b/redhat/applications/tde-guidance/tde-guidance-3.5.13.2.spec
index df4779921..19df57c69 100644
--- a/redhat/applications/tde-guidance/tde-guidance-3.5.13.2.spec
+++ b/redhat/applications/tde-guidance/tde-guidance-3.5.13.2.spec
@@ -78,18 +78,8 @@ BuildRequires:	sip-devel
 %endif
 
 # PYTHON-QT support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	python-qt
-Requires:	python-qt
-%endif
-%if 0%{?rhel} == 5 || 0%{?suse_version}
-BuildRequires:	trinity-PyQt-devel
-Requires:	trinity-PyQt
-%endif
-%if 0%{?rhel} >= 6 || 0%{?fedora}
-BuildRequires:	PyQt-devel
-Requires:	PyQt
-%endif
+BuildRequires:	python-qt3-devel
+Requires:		python-qt3
 
 Requires:		trinity-python-trinity
 Requires:		trinity-pytdeextensions
@@ -282,7 +272,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 %build
 unset QTDIR; . /etc/profile.d/qt3.sh
 export PATH="%{tde_bindir}:${PATH}"
-export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt
+export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/python-qt3
 export KDEDIR=%{tde_prefix}
 
 # Avoids 'error: byte-compiling is disabled.' on Mandriva/Mageia
@@ -306,7 +296,7 @@ export PATH="%{tde_bindir}:${PATH}"
 export EXTRA_MODULE_DIR="%{python_sitearch}/%{name}"
 
 # For RHEL4 only
-export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt
+export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/python-qt3
 
 # For Mageia/Mandriva: Avoids 'error: byte-compiling must be disabled.
 export PYTHONDONTWRITEBYTECODE=
diff --git a/redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2-ftbfs.patch b/redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2-ftbfs.patch
new file mode 100644
index 000000000..b83b3f3ad
--- /dev/null
+++ b/redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2-ftbfs.patch
@@ -0,0 +1,33 @@
+--- trinity-tdeio-apt-14.0.0~pre105+c7bc8b76/src/apt.cpp.ORI	2013-07-29 11:26:26.740982531 +0200
++++ trinity-tdeio-apt-14.0.0~pre105+c7bc8b76/src/apt.cpp	2013-07-29 11:26:53.970250335 +0200
+@@ -143,10 +143,10 @@
+  */
+ 
+ static const TQString
+-  html_form_begin("\n<form action=\"apt:/\" method=\"GET\">\n"
++  html_form_begin_apt("\n<form action=\"apt:/\" method=\"GET\">\n"
+                   "<table class=\"query\">\n");
+ static const TQString
+-  html_form_end("<tr>\n"
++  html_form_end_apt("<tr>\n"
+                 "\t<td class=\"button\" colspan=\"2\"><input type=\"submit\" value=\"%1\"></td>\n"
+                 "</tr>\n"
+                 "</table>\n"
+@@ -197,7 +197,7 @@
+   if (online)
+     stream << "<table class=\"queryform\"><tr><td>\n";
+ 
+-  stream << html_form_begin;
++  stream << html_form_begin_apt;
+   stream << "<tr><td colspan=\"2\" class=\"title\">" + i18n("Offline search") + "</td></tr>" << endl;
+   stream << make_html_form_line("search", i18n("Package search"));
+   if (ext_form)
+@@ -206,7 +206,7 @@
+       stream << make_html_form_line("fsearch", i18n("File search"));
+     stream << make_html_form_line("show", i18n("Package info"));
+   }
+-  stream << html_form_end.arg( i18n("Search") );
++  stream << html_form_end_apt.arg( i18n("Search") );
+ 
+   if (online)
+   {
diff --git a/redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2.spec b/redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2.spec
index 79429ac17..316566375 100644
--- a/redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2.spec
+++ b/redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2.spec
@@ -41,7 +41,7 @@ BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-Patch1:			tdeio-apt-14.0.0-ftbfs.patch
+Patch1:			tdeio-apt-3.5.13.2-ftbfs.patch
 
 BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
 BuildRequires:	trinity-arts-devel >= 1:1.5.10
diff --git a/redhat/buildall-sru.sh b/redhat/buildall-sru.sh
index a1c095e71..21c274cea 100755
--- a/redhat/buildall-sru.sh
+++ b/redhat/buildall-sru.sh
@@ -1,7 +1,9 @@
 #!/bin/bash
 
+export PATH="$(dirname $0):${PATH}"
+
 tdp='cd ~/tde/tde-packaging/redhat'
-grp='tdp; ./genrpm.sh -v 3.5.13.2 -a'
+grp='./genrpm.sh -v 3.5.13.2 -a'
 
 BUILDDIR="/dev/shm/BUILD${DIST}.$(uname -i)"
 BUILDROOTDIR="/dev/shm/BUILDROOT${DIST}.$(uname -i)"
@@ -43,7 +45,7 @@ is_installed() {
 
 # Build package if not already installed
 grpi() {
-  if ! is_installed "${1##*/}" && ! is_installed trinity-"${1##*/}"; then
+  if ! is_installed trinity-"${1##*/}"; then
     eval ${grp} ${1}
     RET=$?
     if [ $RET -gt 0 ]; then
@@ -54,31 +56,40 @@ grpi() {
 }
 # Build package if not already installed, then update repo
 grpiu() {
-  if ! is_installed "${1##*/}" && ! is_installed trinity-"${1##*/}"; then
+  if ! is_installed trinity-"${1##*/}"; then
     grpi "$1"
-    eval ${REPOUPDATE}
+    eval ${REPOUPDATE} || exit 1
   fi
 }
 # Build package if not already installed, then update repo, then install package
 grpiui() {
-  if ! is_installed "${1##*/}" && ! is_installed trinity-"${1##*/}"; then
+  if ! is_installed trinity-"${1##*/}"; then
     grpiu "$1"
-    eval ${PKGINST} "trinity-${1##*/}"
+    eval ${PKGINST} "trinity-${1##*/}" || exit 1
   fi
 }
 # Build package if not already installed, then update repo, then install -devel package
 grpiud() {
-  if ! is_installed "${1##*/}" && ! is_installed trinity-"${1##*/}"; then
+  if ! is_installed trinity-"${1##*/}"; then
     grpiu "$1"
-    eval ${PKGINST} "trinity-${1##*/}"
-    eval ${PKGINST} "trinity-${1##*/}-devel"
+    eval ${PKGINST} "trinity-${1##*/}" || exit 1
+    eval ${PKGINST} "trinity-${1##*/}-devel" || exit 1
   fi
 }
 
+# Build akode now, required for some packages later ...
+grpiud extras/akode
+
 # Build dependencies
-if ! rpm -q libqt3-devel && ! rpm -q lib64qt3-devel && ! rpm -q qt3-devel; then
+if ! rpm -q libqt3-devel &>/dev/null && ! rpm -q lib64qt3-devel &>/dev/null && ! rpm -q qt3-devel &>/dev/null; then
+  if [ -r /etc/SuSE-release ]; then
+    pushd ../opensuse/core
+  else
+    pushd .
+  fi
   grpiu dependencies/qt3
-  eval ${PKGINST} qt3-devel
+  eval ${PKGINST} qt3-devel || exit 1
+  popd
 fi
 grpiud dependencies/tqtinterface
 grpiud dependencies/arts
@@ -88,10 +99,7 @@ grpiud dependencies/dbus-tqt
 grpiud dependencies/libcaldav
 grpiud dependencies/libcarddav
 grpiud dependencies/tqca
-grpiu dependencies/tqca-tls
-
-# Build akode now, required for some packages later ...
-grpiud extras/akode
+grpiui dependencies/tqca-tls
 
 # Build main
 # basic packages
@@ -112,15 +120,29 @@ grpiui tdeartwork
 grpiui tdeedu
 grpiui tdetoys
 grpiui tdeutils
-grpiu extras/trinity-desktop
-eval ${PKGINST} trinity-desktop
-# Disable trinity repository from here !!!
+
+if ! is_installed trinity-desktop; then
+  grpiu extras/trinity-desktop
+  eval ${PKGINST} trinity-desktop || exit 1
+  # Disable trinity repository from here !!!
+  if [ -r "/etc/yum.repos.d/trinity-3.5.13.repo" ]; then
+    sed -i "/etc/yum.repos.d/trinity-3.5.13.repo" -e "s|enabled=.*|enabled=0|g"
+  fi
+fi
 
 # devel packages
 grpiud tdesdk
 grpiui tdevelop
 grpiui tdewebdev
-eval ${PKGINST} trinity-desktop-devel
+if ! is_installed trinity-desktop-devel; then
+  eval ${PKGINST} trinity-desktop-devel || exit 1
+fi
+
+# Extra libraries
+if ! is_installed python-qt3; then
+  grpiu 3rdparty/python-qt3
+  eval ${PKGINST} python-qt3-devel || exit 1
+fi
 
 # Build libraries
 grpiud libraries/libkdcraw
@@ -149,7 +171,7 @@ grpiui applications/gwenview
 grpiui applications/gwenview-i18n
 if ! is_installed trinity-k3b-i18n-French; then
   grpiu applications/k3b-i18n
-  eval ${PKGINST} trinity-k3b-i18n-French
+  eval ${PKGINST} trinity-k3b-i18n-French || exit 1
 fi
 grpiui applications/k9copy
 grpiui applications/kaffeine
@@ -175,7 +197,9 @@ grpiui applications/kmymoney
 grpiui applications/knemo
 grpiui applications/knetload
 grpiui applications/knetstats
-#grpiui applications/knetworkmanager
+if [ "${DIST}" = ".el6" ]; then
+  grpiui applications/knetworkmanager
+fi
 grpiui applications/knights
 grpiui applications/knowit
 grpiui applications/knutclient
@@ -192,7 +216,7 @@ grpiui applications/kopete-otr
 grpiui applications/kpicosim
 grpiui applications/kpilot
 if [ "${DIST}" != ".el4" ] && [ "${DIST}" != ".el5" ]; then
-grpiui applications/kpowersave
+  grpiui applications/kpowersave
 fi
 grpiui applications/krename
 grpiui applications/krusader
@@ -226,15 +250,20 @@ grpiui applications/tellico
 grpiui applications/twin-style-crystal
 grpiui applications/wlassistant
 grpiui applications/yakuake
-eval ${PKGINST} trinity-desktop-applications
 
 # Decoration-related stuff are distribution-dependant.
 if [ "${DIST}" != ".el4" ] && [ "${DIST}" != ".el5" ]; then
-grpiui applications/gtk-qt-engine
-grpiui applications/kgtk-qt3
+  grpiui applications/gtk-qt-engine
+  #grpiui applications/kgtk-qt3
 fi
 
-eval ${PKGINST} trinity-desktop-all
+if ! is_installed trinity-desktop-applications; then
+  eval ${PKGINST} trinity-desktop-applications || exit 1
+fi
+
+if ! is_installed trinity-desktop-all; then
+  eval ${PKGINST} trinity-desktop-all || exit 1
+fi
 
 exit 0
 
@@ -253,7 +282,8 @@ grpiui extras/kickoff-i18n
 #grpiui extras/knoda
 #grpiui extras/ksensors
 #grpiui extras/kshowmail
-#grpiui extras/mplayerthumbs
+#grpiui extras/mplayerthumbseval ${PKGINST} trinity-desktop-applications || exit 1
+
 grpiui extras/style-ia-ora
 #if ! is_installed trinity-tdeio-ftps-plugin; then
 #  grpiu extras/tdeio-ftps
diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.2.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.2.spec
index cd59347e4..dbfe6c2d7 100644
--- a/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.2.spec
+++ b/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.2.spec
@@ -33,6 +33,7 @@ BuildRequires:	dbus-1-devel
 %if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	dbus-devel
 %endif
+BuildRequires:	libcap-devel
 
 # AVAHI support
 %if 0%{?mgaversion} || 0%{?mdkversion}
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 75864864f..72e7254c2 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
@@ -278,6 +278,7 @@ Requires:	%{name}-devel = %{version}
 %package -n trinity-repo
 Group:		User Interface/Desktops
 Summary:	Yum configuration files for Trinity
+Requires(pre):	coreutils
 
 %description -n trinity-repo
 %{summary}
diff --git a/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2-fix_giflib5_support.patch b/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2-fix_giflib5_support.patch
new file mode 100644
index 000000000..dc65f1928
--- /dev/null
+++ b/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2-fix_giflib5_support.patch
@@ -0,0 +1,114 @@
+--- trinity-libksquirrel-3.5.13.2/kernel/kls_gif/fmt_codec_gif.cpp.giflib5	2013-06-07 20:05:31.000000000 +0200
++++ trinity-libksquirrel-3.5.13.2/kernel/kls_gif/fmt_codec_gif.cpp	2013-08-24 17:58:13.978555540 +0200
+@@ -43,14 +43,26 @@
+ /* libgif 4.2.0 has retired PrintGifError() and added GifErrorString() */ 
+ #if defined(GIFLIB_MAJOR) && defined(GIFLIB_MINOR) && \ 
+         ((GIFLIB_MAJOR == 4 && GIFLIB_MINOR >= 2) || GIFLIB_MAJOR > 4) 
++#if GIFLIB_MAJOR > 4
++static void PrintGifError(int ErrorCode)
++#else
+ static void PrintGifError(void)
++#endif
+ {
++#if GIFLIB_MAJOR > 4
++  char *Err = GifErrorString(ErrorCode);
++#else
+   char *Err = GifErrorString();
++#endif
+ 
+   if (Err != NULL) {
+     fprintf(stderr, "\nGIF-LIB error: %s.\n", Err);
+   } else {
++#if GIFLIB_MAJOR > 4
++    fprintf(stderr, "\nGIF-LIB undefined error %d.\n", ErrorCode);
++#else
+     fprintf(stderr, "\nGIF-LIB undefined error %d.\n", GifError());
++#endif
+   }
+ } 
+ #endif 
+@@ -107,7 +119,12 @@
+     buf = 0;
+     saved = 0;
+ 
++#if GIFLIB_MAJOR > 4
++    int ErrorCode;
++    gif = DGifOpenFileName(file.c_str(), &ErrorCode);
++#else
+     gif = DGifOpenFileName(file.c_str());
++#endif
+ 
+     // for safety...
+     if(!gif)
+@@ -198,7 +215,11 @@
+     {
+         if (DGifGetRecordType(gif, &record) == GIF_ERROR)
+ 	{
++#if GIFLIB_MAJOR > 4
++	    PrintGifError(gif->Error);
++#else
+ 	    PrintGifError();
++#endif
+ 	    return SQE_R_BADFILE;
+ 	}
+ 
+@@ -207,7 +228,11 @@
+ 	    case IMAGE_DESC_RECORD_TYPE:
+ 		if(DGifGetImageDesc(gif) == GIF_ERROR)
+ 		{
++#if GIFLIB_MAJOR > 4
++		    PrintGifError(gif->Error);
++#else
+ 		    PrintGifError();
++#endif
+ 		    return SQE_R_BADFILE;
+ 		}
+ 
+@@ -243,7 +268,11 @@
+ 	    case EXTENSION_RECORD_TYPE:
+ 		if(DGifGetExtension(gif, &ExtCode, &Extension) == GIF_ERROR)
+ 		{
++#if GIFLIB_MAJOR > 4
++		    PrintGifError(gif->Error);
++#else
+ 		    PrintGifError();
++#endif
+ 		    return SQE_R_BADFILE;
+ 		}
+ 
+@@ -287,7 +316,11 @@
+ 		{
+ 		    if(DGifGetExtensionNext(gif, &Extension) == GIF_ERROR)
+ 		    {
++#if GIFLIB_MAJOR > 4
++		    PrintGifError(gif->Error);
++#else
+ 			PrintGifError();
++#endif
+ 			return SQE_R_BADFILE;
+ 		    }
+ 		}
+@@ -366,7 +399,11 @@
+ 	{
+ 	    if(DGifGetLine(gif, buf, Width) == GIF_ERROR)
+ 	    {
++#if GIFLIB_MAJOR > 4
++		    PrintGifError(gif->Error);
++#else
+ 	        PrintGifError();
++#endif
+ 	        memset(scan, 255, im->w * sizeof(RGBA));
+ 	        return SQE_R_BADFILE;
+ 	    }
+@@ -439,7 +476,11 @@
+         if(DGifGetLine(gif, buf, Width) == GIF_ERROR)
+         {
+ 	    memset(scan, 255, im->w * sizeof(RGBA));
++#if GIFLIB_MAJOR > 4
++	    PrintGifError(gif->Error);
++#else
+ 	    PrintGifError();
++#endif
+ 	    return SQE_R_BADFILE;
+ 	}
+ 	else
diff --git a/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec b/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec
index 2d3f5691e..d6794dbd2 100644
--- a/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec
+++ b/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec
@@ -41,6 +41,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 Patch0:		libksquirrel-3.5.13-detect_netpbm.patch
+Patch1:		libksquirrel-3.5.13.2-fix_giflib5_support.patch
 
 BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
 BuildRequires:	trinity-arts-devel >= 1:1.5.10
@@ -155,6 +156,7 @@ Tools for KSquirrel.
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 %patch0 -p1 -b .netpbm
+%patch1 -p1 -b .giflib5
 
 %__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"
diff --git a/redhat/libraries/pytdeextensions/pytdeextensions-3.5.13.2.spec b/redhat/libraries/pytdeextensions/pytdeextensions-3.5.13.2.spec
index 2ba4b2fe6..f26445c40 100644
--- a/redhat/libraries/pytdeextensions/pytdeextensions-3.5.13.2.spec
+++ b/redhat/libraries/pytdeextensions/pytdeextensions-3.5.13.2.spec
@@ -53,17 +53,9 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
+# Python stuff
 BuildRequires:	trinity-python-trinity-devel
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	python-qt
-%else
-%if 0%{?rhel} == 4 || 0%{?rhel} == 5 || 0%{?suse_version}
-BuildRequires:	trinity-PyQt-devel
-%else
-BuildRequires:	PyQt-devel
-%endif
-%endif
+BuildRequires:	python-qt3-devel
 
 Requires:		trinity-libpythonize0 = %{version}-%{release}
 
@@ -176,24 +168,24 @@ if [ -f "%{_libdir}/${LIBPYTHON}" ]; then
     -e "s|#define LIB_PYTHON \".*\"|#define LIB_PYTHON \"%{_libdir}/${LIBPYTHON}\"|"
 fi
 
-if [ -d "%{python_sitearch}/trinity-PyQt" ]; then
-  %__sed -i "src/kdedistutils.py" \
-    -e "s|'pyqt-dir=','%{python_sitearch}'|'pyqt-dir=','%{python_sitearch}/trinity-PyQt'|g" \
-    -e "s|self.pyqt_dir = \"%{python_sitearch}\"|self.pyqt_dir = \"%{python_sitearch}/trinity-PyQt\"|g"
-fi
+# Set PyQt directory to actual directory
+%__sed -i "src/kdedistutils.py" \
+  -e "s|'pyqt-dir=','%{python_sitearch}'|'pyqt-dir=','%{python_sitearch}/python-qt3'|g" \
+  -e "s|self.pyqt_dir = \"%{python_sitearch}\"|self.pyqt_dir = \"%{python_sitearch}/python-qt3\"|g"
+
 
 %build
-unset QTDIR; . /etc/profile.d/qt3.sh
+unset QTDIR QTINC QTLIB; . /etc/profile.d/qt3.sh
 export PATH="%{tde_bindir}:${PATH}"
-export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt
+export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/python-qt3
 
 %__mkdir_p build
 ./setup.py build_libpythonize
 
 %install
-unset QTDIR; . /etc/profile.d/qt3.sh
+unset QTDIR QTINC QTLIB; . /etc/profile.d/qt3.sh
 export PATH="%{tde_bindir}:${PATH}"
-export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt
+export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/python-qt3
 
 # Avoids 'error: byte-compiling is disabled.' on Mandriva/Mageia
 export PYTHONDONTWRITEBYTECODE=
diff --git a/redhat/libraries/python-trinity/python-trinity-3.5.13.2.spec b/redhat/libraries/python-trinity/python-trinity-3.5.13.2.spec
index 3237c399f..a0c0bca9b 100644
--- a/redhat/libraries/python-trinity/python-trinity-3.5.13.2.spec
+++ b/redhat/libraries/python-trinity/python-trinity-3.5.13.2.spec
@@ -54,19 +54,7 @@ BuildRequires:	gettext
 
 # PYTHON support
 BuildRequires:	python
-%if 0%{?rhel} >= 4 && 0%{?rhel} <= 5
-# RHEL 4/5 comes with old version, so we brought ours ...
-BuildRequires:	trinity-PyQt-devel
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	python-qt
-%endif
-%if 0%{?rhel} >= 6 || 0%{?fedora}
-BuildRequires:	PyQt-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:	trinity-PyQt-devel
-%endif
+BuildRequires:	python-qt3-devel
 
 # SIP support
 %if 0%{?rhel} >= 4 && 0%{?rhel} <= 5
@@ -104,7 +92,7 @@ Provides:	python-trinity-devel = %{version}-%{release}
 Development .sip files with definitions of PyTDE classes. They
 are needed to build PyTDE, but also as building blocks of other
 packages based on them. 
-The package also contains kdepyuic, a wrapper script around PyQt's 
+The package also contains kdepyuic, a wrapper script around python-qt3's 
 user interface compiler.
 
 
@@ -138,7 +126,7 @@ export KDEDIR=%{tde_prefix}
 
 export DH_OPTIONS
 
-export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt
+export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/python-qt3
 
 %__python configure.py \
 	-k %{tde_prefix} \
diff --git a/redhat/tdebase/tdebase-3.5.13.2.spec b/redhat/tdebase/tdebase-3.5.13.2.spec
index 82eca290c..adbb2036b 100644
--- a/redhat/tdebase/tdebase-3.5.13.2.spec
+++ b/redhat/tdebase/tdebase-3.5.13.2.spec
@@ -315,6 +315,18 @@ Requires:	opensuse-manuals_en
 %define tde_aboutpage /usr/share/doc/manual/opensuse-manuals_en/book.opensuse.startup.html
 %endif
 
+# OpenSuse 13.1 Theme
+%if "%{?suse_version}" == "1310"
+Requires:	wallpaper-branding
+%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
+Requires:	hicolor-icon-theme-branding
+%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
+
+Requires:	opensuse-manuals_en
+%define tde_aboutlabel OpenSuse 13.1
+%define tde_aboutpage /usr/share/doc/manual/opensuse-manuals_en/book.opensuse.startup.html
+%endif
+
 BuildRequires:	cmake >= 2.8
 BuildRequires:	qt%{?_qt_suffix}-devel >= 3.3.8.d
 BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
diff --git a/redhat/tdebindings/admin-fix-parallel-test.diff b/redhat/tdebindings/admin-fix-parallel-test.diff
new file mode 100644
index 000000000..9f6f46ba8
--- /dev/null
+++ b/redhat/tdebindings/admin-fix-parallel-test.diff
@@ -0,0 +1,11 @@
+--- trinity-tdebindings-14.0.0~pre214+2cf2b76c/admin/cvs.sh.automake113	2013-06-26 22:35:42.000000000 +0200
++++ trinity-tdebindings-14.0.0~pre214+2cf2b76c/admin/cvs.sh	2013-08-29 22:27:18.546349736 +0200
+@@ -123,7 +123,7 @@
+ fi
+ 
+ echo "*** Creating Makefile templates"
+-$AUTOMAKE || exit 1
++$AUTOMAKE --add-missing || exit 1
+ 
+ if test "$UNSERMAKE" = no; then
+   echo "*** Postprocessing Makefile templates"
diff --git a/redhat/tdebindings/tdebindings-3.5.13.2-fix_ruby2_detection.patch b/redhat/tdebindings/tdebindings-3.5.13.2-fix_ruby2_detection.patch
new file mode 100644
index 000000000..67174598e
--- /dev/null
+++ b/redhat/tdebindings/tdebindings-3.5.13.2-fix_ruby2_detection.patch
@@ -0,0 +1,30 @@
+--- ./qtruby/rubylib/qtruby/configure.in.in.ruby2	2013-08-24 15:44:24.933359206 +0200
++++ ./qtruby/rubylib/qtruby/configure.in.in	2013-08-24 15:49:41.820696908 +0200
+@@ -21,6 +21,12 @@
+       fi
+     fi
+     if test -z "$RUBY_VERSION"; then
++      RUBY_VERSION=`$PKGCONFIG ruby-2.0 --modversion 2>/dev/null`
++      if test -n "$RUBY_VERSION"; then
++        RUBY_CFLAGS=`$PKGCONFIG ruby-2.0 --cflags`
++      fi
++    fi
++    if test -z "$RUBY_VERSION"; then
+       # pkgconfig file does not exist but might be 1.9.1: RUBY_VERSION defined in ruby/version.h
+       if test -n "$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"rubyhdrdir"@:>@)'"; then
+         # rubyhdrdir parameter works only in >=1.9.1; this is 1.9.1
+--- ./korundum/rubylib/korundum/configure.in.in.ruby2	2013-08-24 15:44:24.933359206 +0200
++++ ./korundum/rubylib/korundum/configure.in.in	2013-08-24 15:50:46.666333349 +0200
+@@ -19,6 +19,12 @@
+       if test -n "$RUBY_VERSION"; then
+         RUBY_CFLAGS=`$PKGCONFIG ruby-1.9 --cflags`
+       fi
++    fi
++    if test -z "$RUBY_VERSION"; then
++      RUBY_VERSION=`$PKGCONFIG ruby-2.0 --modversion 2>/dev/null`
++      if test -n "$RUBY_VERSION"; then
++        RUBY_CFLAGS=`$PKGCONFIG ruby-2.0 --cflags`
++      fi
+     fi
+     if test -z "$RUBY_VERSION"; then
+       # pkgconfig file does not exist but might be 1.9.1: RUBY_VERSION defined in ruby/version.h
diff --git a/redhat/tdebindings/tdebindings-3.5.13.2.spec b/redhat/tdebindings/tdebindings-3.5.13.2.spec
index d862c9b15..6e553c754 100644
--- a/redhat/tdebindings/tdebindings-3.5.13.2.spec
+++ b/redhat/tdebindings/tdebindings-3.5.13.2.spec
@@ -52,13 +52,19 @@ BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
 
 # [tdebindings] Fix RUBY path ending with '/' causing fail to install
-Patch1:		tdebindings-3.5.13.2-fix_ruby_path.patch
+Patch1:			tdebindings-3.5.13.2-fix_ruby_path.patch
+
+# [tdebindings] Fix ruby 2.x detection
+Patch2:			tdebindings-3.5.13.2-fix_ruby2_detection.patch
+
+# [tdebindings] Fix automake 1.13 build issue
+Patch3:			admin-fix-parallel-test.diff
 
 # [kdebindings] Fix FTBFS in dcopjava/bindings
-Patch7:		kdebindings-3.5.13.1-fix_dcopjava_ldflags.patch
+Patch4:			kdebindings-3.5.13.1-fix_dcopjava_ldflags.patch
 
 # [tdebindings] Function 'rb_frame_this_func' does not exist in RHEL5
-Patch18:	kdebindings-3.5.13.1-fix_rhel5_ftbfs.patch
+Patch5:		kdebindings-3.5.13.1-fix_rhel5_ftbfs.patch
 
 BuildRequires: autoconf automake libtool m4
 BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
@@ -975,19 +981,16 @@ Development files for the TDE bindings.
 %prep
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
 %patch1 -p1 -b .rubypath
-%patch7 -p1 -b .dcopjavaldflags
+%patch2 -p1 -b .ruby2
+%patch3 -p1 -b .automake113
+%patch4 -p1 -b .dcopjavaldflags
 
 %if "%{?perl_vendorarch}" == ""
 exit 1
 %endif
 
 %if 0%{?rhel} >= 4 && 0%{?rhel} <= 5
-%patch18 -p1 -b .ruby
-%endif
-
-# Workarounds strange issue in MGA3
-%if 0%{?mgaversion} == 3 || 0%{?pclinuxos} >= 2013 || 0%{?fedora} >= 19
-%__cp /usr/share/automake-1.13/test-driver admin/
+%patch5 -p1 -b .ruby
 %endif
 
 # Disable kmozilla, it does not build with recent xulrunner (missing 'libmozjs.so')
@@ -1019,6 +1022,11 @@ if [ -d /usr/evolution28 ]; then
   export PKG_CONFIG_PATH="/usr/evolution28/%{_lib}/pkgconfig:${PKG_CONFIG_PATH}"
 fi
 
+# Warning: openSUSE 13.1: /usr/include/ruby-2.0.0/ruby.h
+%if 0%{?suse_version} >= 1310
+EXTRA_INCLUDES="/usr/include/ruby-%{rb20_ver}:/usr/include/ruby-%{rb20_ver}/%{_target}"
+%endif
+
 %configure \
   --prefix=%{tde_prefix} \
   --exec-prefix=%{tde_prefix} \
@@ -1036,7 +1044,7 @@ fi
   --enable-closure \
   --enable-rpath \
   \
-  --with-extra-includes=%{_includedir}/tqscintilla \
+  --with-extra-includes=%{_includedir}/tqscintilla:${EXTRA_INCLUDES} \
   --with-extra-libs=%{tde_libdir} \
   --with-pythondir=%{_usr} \
   \
diff --git a/redhat/tdegraphics/tdegraphics-3.5.13.2.spec b/redhat/tdegraphics/tdegraphics-3.5.13.2.spec
index f00f79290..e77f2cb98 100644
--- a/redhat/tdegraphics/tdegraphics-3.5.13.2.spec
+++ b/redhat/tdegraphics/tdegraphics-3.5.13.2.spec
@@ -1275,10 +1275,11 @@ fi
 cd build
 %endif
 
+# Note: the "-L%{tde_libdir}" is required for RHEL5, where poppler is under /opt/trinity.
 %cmake \
   -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG -L%{tde_libdir}" \
   -DCMAKE_SKIP_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
diff --git a/redhat/tdenetwork/tdenetwork-3.5.13.2.spec b/redhat/tdenetwork/tdenetwork-3.5.13.2.spec
index 71abbb12e..ed9aa126f 100644
--- a/redhat/tdenetwork/tdenetwork-3.5.13.2.spec
+++ b/redhat/tdenetwork/tdenetwork-3.5.13.2.spec
@@ -86,16 +86,21 @@ BuildRequires:	sqlite-devel
 BuildRequires:	libgadu-devel
 %endif
 
+# XTST support
+%if 0%{?fedora} >= 5 || 0%{?rhel} >= 5 || 0%{?suse_version}
+BuildRequires:	libXtst-devel
+%endif
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	libxtst-devel
+%endif
+
+# Other stuff
 %if 0%{?fedora} >= 5 || 0%{?rhel} >= 5
 BuildRequires:	libXmu-devel
 BuildRequires:	libXScrnSaver-devel
-BuildRequires:	libXtst-devel
 BuildRequires:	libXxf86vm-devel
 %endif
 
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-BuildRequires:	libxtst-devel
-%endif
 
 # Wifi support
 %if "%{?_with_wifi:1}" == "1"
diff --git a/redhat/tdepim/tdepim-3.5.13.2.spec b/redhat/tdepim/tdepim-3.5.13.2.spec
index 7b58e1c29..dd7780e53 100644
--- a/redhat/tdepim/tdepim-3.5.13.2.spec
+++ b/redhat/tdepim/tdepim-3.5.13.2.spec
@@ -2218,6 +2218,7 @@ cd build
   -DCMAKE_SKIP_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DCMAKE_PROGRAM_PATH="%{tde_bindir}" \
   \
   -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
   -DBIN_INSTALL_DIR=%{tde_bindir} \