RPM packaging: update 3.5.13.2 packages

diff --git a/redhat/applications/kpilot/kpilot-3.5.13.2.spec b/redhat/applications/kpilot/kpilot-3.5.13.2.spec
index 6491fd2..1959578 100644
--- a/redhat/applications/kpilot/kpilot-3.5.13.2.spec
+++ b/redhat/applications/kpilot/kpilot-3.5.13.2.spec
@@ -48,8 +48,9 @@
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
+BuildRequires:	flex-devel
 BuildRequires:	gettext
-BuildRequires:	pilot-link-devel
+BuildRequires:	pilot-link-devel >= 0.12
 BuildRequires:	trinity-tdepim-devel >= %{tde_version}
 
 %description
@@ -73,7 +74,8 @@
 
 
 %build
-unset QTDIR; . /etc/profile.d/qt3.sh
+unset QTDIR QTINC QTLIB
+. /etc/profile.d/qt3.sh
 export PATH="%{tde_bindir}:${PATH}"
 
 %configure \
diff --git a/redhat/tdeaddons/tdeaddons-3.5.13.2.spec b/redhat/tdeaddons/tdeaddons-3.5.13.2.spec
index 87138e3..4dca62c 100644
--- a/redhat/tdeaddons/tdeaddons-3.5.13.2.spec
+++ b/redhat/tdeaddons/tdeaddons-3.5.13.2.spec
@@ -55,7 +55,7 @@
 BuildRequires: alsa-lib-devel
 BuildRequires: openssl-devel
 
-# DB4 support
+# DB4/DB5 support
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1220 || 0%{?mdkversion} || 0%{?mgaversion}
 %define with_db 1
 %if 0%{?mgaversion} || 0%{?mdkversion}
@@ -86,7 +86,7 @@
 Requires: trinity-atlantikdesigner = %{version}-%{release}
 Requires: trinity-kaddressbook-plugins = %{version}-%{release}
 Requires: trinity-kate-plugins = %{version}-%{release}
-Requires: trinity-tdeaddons-kfile-plugins = %{version}-%{release}
+Requires: trinity-tdeaddons-tdefile-plugins = %{version}-%{release}
 Requires: trinity-kicker-applets = %{version}-%{release}
 Requires: trinity-knewsticker-scripts = %{version}-%{release}
 Requires: trinity-konq-plugins = %{version}-%{release}
@@ -244,11 +244,14 @@
 
 ##########
 
-%package kfile-plugins
+%package tdefile-plugins
 Summary:	Trinity file dialog plugins for text files and folders
 Group:		Applications/Utilities
 
-%description kfile-plugins
+Obsoletes:	trinity-tdeaddons-kfile-plugins < %{version}-%{release}
+Provides:	trinity-tdeaddons-kfile-plugins = %{version}-%{release}
+
+%description tdefile-plugins
 This is a collection of plugins for the TDE file dialog.  These plugins
 extend the file dialog to offer advanced meta-information for text,
 HTML and desktop files, as well as for folders, Windows .lnk files,
@@ -259,7 +262,7 @@
 decision regarding conflicting filenames.  Rename dialog plugins are
 provided for audio and image files.
 
-%files kfile-plugins
+%files tdefile-plugins
 %defattr(-,root,root,-)
 %doc kfile-plugins/lnk/README
 %{tde_bindir}/lnkforward
@@ -612,7 +615,7 @@
 
 %description -n trinity-noatun-plugins
 This package contains a variety of useful plugins for Noatun, the audio and
-video media player for TDE.  These plugins can be loaded through the plugin
+video media player for TDE. These plugins can be loaded through the plugin
 manager in Noatun settings.
 
 Highlights include an alarm clock, guessing tags from filenames, adjustable
diff --git a/redhat/tdeartwork/tdeartwork-3.5.13.2.spec b/redhat/tdeartwork/tdeartwork-3.5.13.2.spec
index 3321721..e3f124d 100644
--- a/redhat/tdeartwork/tdeartwork-3.5.13.2.spec
+++ b/redhat/tdeartwork/tdeartwork-3.5.13.2.spec
@@ -468,10 +468,6 @@
 You are specially discouraged to install this package if you are using 
 your computer in a working environment or in an environment with children.
 
-If you still want to install this package, please read the file
-/usr/share/doc/kscreensaver-xsavers-webcollage/README.Debian after the 
-installation.
-
 This package is part of Trinity, and a component of the TDE artwork module.
 
 %files -n trinity-tdescreensaver-xsavers-webcollage

RPM packaging: update R14 packages

diff --git a/redhat/applications/bibletime/bibletime-14.0.0.spec b/redhat/applications/bibletime/bibletime-14.0.0.spec
index 62ef360..02b0f8a 100644
--- a/redhat/applications/bibletime/bibletime-14.0.0.spec
+++ b/redhat/applications/bibletime/bibletime-14.0.0.spec
@@ -53,11 +53,7 @@
 BuildRequires:	clucene-core-devel
 %endif
 %if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos}
 BuildRequires:	%{_lib}clucene-devel
-%else
-BuildRequires:	%{_lib}clucene-devel
-%endif
 %endif
 
 # Requires: sword
@@ -106,7 +102,7 @@
   --enable-rpath \
   --disable-gcc-hidden-visibility \
   \
-%if 0%{?fedora} >= 20 || 0%{?pclinuxos}
+%if 0%{?fedora} >= 20 || 0%{?pclinuxos} || 0%{?rhel} >= 7
   --with-sword-dir=%{tde_prefix}
 %endif
 
diff --git a/redhat/applications/kpilot/kpilot-14.0.0.spec b/redhat/applications/kpilot/kpilot-14.0.0.spec
index f7557a3..cf3f4dd 100644
--- a/redhat/applications/kpilot/kpilot-14.0.0.spec
+++ b/redhat/applications/kpilot/kpilot-14.0.0.spec
@@ -48,6 +48,7 @@
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
+BuildRequires:	flex-devel
 BuildRequires:	gettext
 BuildRequires:	pilot-link-devel >= 0.12
 BuildRequires:	trinity-tdepim-devel >= %{tde_version}
diff --git a/redhat/applications/tdeio-sword/tdeio-sword-14.0.0.spec b/redhat/applications/tdeio-sword/tdeio-sword-14.0.0.spec
index d1e1f42..5ff8037 100644
--- a/redhat/applications/tdeio-sword/tdeio-sword-14.0.0.spec
+++ b/redhat/applications/tdeio-sword/tdeio-sword-14.0.0.spec
@@ -83,7 +83,7 @@
   --enable-rpath \
   --disable-gcc-hidden-visibility \
   \
-%if 0%{?fedora} >= 20 || 0%{?pclinuxos}
+%if 0%{?fedora} >= 20 || 0%{?pclinuxos} || 0%{?rhel} >= 7
   --with-sword-dir=%{tde_prefix}
 %endif
 
diff --git a/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec b/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec
index 48a4b27..aa21945 100644
--- a/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec
+++ b/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec
@@ -79,7 +79,7 @@
 %if 0%{?fedora} || 0%{?rhel} 
 BuildRequires:	librsvg2
 %endif
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} >= 7
 BuildRequires:	librsvg2-tools
 %endif
 %if 0%{?mgaversion} || 0%{?mdkversion}
diff --git a/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec b/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec
index aef25b1..cdacd64 100644
--- a/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec
+++ b/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec
@@ -84,13 +84,6 @@
 BuildRequires:	xorg-x11-devel
 %endif
 
-# Broken PNG images
-%if 0%{?mgaversion} >= 4 || 0%{?fedora} >= 20
-BuildRequires:	kde-dev-scripts
-BuildRequires:	optipng
-BuildRequires:	advancecomp
-%endif
-
 Obsoletes:		trinity-kdeaccessibility < %{version}-%{release}
 Provides:		trinity-kdeaccessibility = %{version}-%{release}
 Obsoletes:		trinity-kdeaccessibility-libs < %{version}-%{release}
diff --git a/redhat/tdeaddons/tdeaddons-14.0.0.spec b/redhat/tdeaddons/tdeaddons-14.0.0.spec
index 40270cf..2ac162e 100644
--- a/redhat/tdeaddons/tdeaddons-14.0.0.spec
+++ b/redhat/tdeaddons/tdeaddons-14.0.0.spec
@@ -65,14 +65,14 @@
 BuildRequires:	db5-devel
 %endif
 %endif
-%if 0%{?fedora} >= 18
+%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
 BuildRequires:	libdb-devel
 BuildRequires:	libdb-cxx-devel
 %endif
 %if 0%{?suse_version}
 BuildRequires:	libdb-4_8-devel
 %endif
-%if 0%{?rhel}
+%if 0%{?rhel} && 0%{?rhel} <= 6
 BuildRequires:	db4-devel
 %endif
 %endif
@@ -391,7 +391,7 @@
 %if 0%{?rhel} || 0%{?fedora}
 Requires:	libjpeg
 %endif
-%if 0%{?suse_version} >= 1220
+%if 0%{?suse_version} == 1220
 Requires:	libjpeg62
 %endif
 %if 0%{?pclinuxos}
@@ -669,7 +669,6 @@
 %endif
 
 ##########
-
 
 %prep
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
diff --git a/redhat/tdeartwork/tdeartwork-14.0.0.spec b/redhat/tdeartwork/tdeartwork-14.0.0.spec
index 78ee69c..e8c8121 100644
--- a/redhat/tdeartwork/tdeartwork-14.0.0.spec
+++ b/redhat/tdeartwork/tdeartwork-14.0.0.spec
@@ -60,6 +60,7 @@
 
 # XSCREENSAVER support
 %if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
+%if 0%{?rhel} == 0 || 0%{?rhel} <= 6
 %define with_xscreensaver 1
 %if 0%{?mgaversion} || 0%{?mdkversion}
 %if 0%{?mgaversion} >= 4
@@ -92,6 +93,7 @@
 %define with_webcollage 1
 %endif
 
+%endif
 %endif
 
 # JACK support
@@ -431,6 +433,11 @@
 %{tde_datadir}/applnk/System/ScreenSavers/photopile.desktop
 %{tde_datadir}/applnk/System/ScreenSavers/skytentacles.desktop
 
+# These screensavers do not exist on Mageia 2
+%if 0%{?mgaversion} == 0 && 0%{?mdkversion} == 0
+%{tde_datadir}/applnk/System/ScreenSavers/glmatrix.desktop
+%endif
+
 ##########
 
 %if 0%{?with_webcollage}
@@ -455,10 +462,6 @@
 you might find inappropriate and offensive.
 ** Diff limit reached (max: 250 lines) **

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

 ** Diff limit reached (max: 250 lines) **