RPM Packaging: updates for 3.5.13.2

17 files changed, 635 insertions, 66 deletions

diff --git a/redhat/applications/k3b/k3b-3.5.13.2-fix_ffmpeg_support.patch b/redhat/applications/k3b/k3b-3.5.13.2-fix_ffmpeg_support.patch
new file mode 100644
index 000000000..bd3bfdebf
--- /dev/null
+++ b/redhat/applications/k3b/k3b-3.5.13.2-fix_ffmpeg_support.patch
@@ -0,0 +1,11 @@
+--- trinity-k3b-3.5.13.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.ORI	2013-09-07 12:10:15.846286823 +0200
++++ trinity-k3b-3.5.13.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp	2013-09-07 12:11:08.020207223 +0200
+@@ -49,7 +49,7 @@
+   K3b::Msf length;
+ 
+   // for decoding
+-  char outputBuffer[AVCODEC_MAX_AUDIO_FRAME_SIZE];
++  char outputBuffer[192000];
+   char* outputBufferPos;
+   int outputBufferSize;
+   AVPacket packet;
diff --git a/redhat/applications/k3b/k3b-3.5.13.2.spec b/redhat/applications/k3b/k3b-3.5.13.2.spec
index 3e3b1578c..312876331 100644
--- a/redhat/applications/k3b/k3b-3.5.13.2.spec
+++ b/redhat/applications/k3b/k3b-3.5.13.2.spec
@@ -43,12 +43,16 @@ License:		GPLv2+
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 Source2:		k3brc
 
+# Fix FTBFS because AVCODEC_MAX_AUDIO_FRAME_SIZE is obsolete
+Patch1:			k3b-3.5.13.2-fix_ffmpeg_support.patch
+
 # Legacy RedHat / Fedora patches
 # manual bufsize (upstream?)
 Patch4:			k3b-1.0.4-manualbufsize.patch
 # RHEL6: Fix K3B icon
 Patch106:	trinity-k3b-icons.patch
 
+
 BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
 BuildRequires:	trinity-arts-devel >= 1:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
@@ -388,7 +392,7 @@ and a generic audio and video file converter.
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-# set in k3brc too 
+%patch1 -p1 -b .ffmpeg
 %patch4 -p1 -b .manualbufsize
 %patch106 -p1 -b .desktopfile
 
diff --git a/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec b/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec
index e92892bfe..d75eca278 100644
--- a/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec
+++ b/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec
@@ -82,7 +82,7 @@ BuildRequires: libxcb-devel
 %if 0%{?rhel} >= 5 || 0%{?suse_version} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gstreamer 1
 %if 0%{?suse_version}
-BuildRequires:	gstreamer-devel
+BuildRequires:	gstreamer-0_10-devel
 BuildRequires:	gstreamer-0_10-plugins-base-devel
 %endif
 %if 0%{?rhel} == 4
diff --git a/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec b/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec
index 85470704d..5f67030ba 100644
--- a/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec
+++ b/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec
@@ -70,7 +70,7 @@ BuildRequires:	gstreamer-devel
 BuildRequires:	gstreamer-plugins-base-devel
 %endif
 %if 0%{?suse_version}
-BuildRequires:	gstreamer-devel
+BuildRequires:	gstreamer-0_10-devel
 BuildRequires:	gstreamer-0_10-plugins-base-devel
 %endif
 
diff --git a/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13.2.spec b/redhat/applications/knetworkmanager8/knetworkmanager8-3.5.13.2.spec
index aec76bc3f..bc485eccf 100644
--- a/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13.2.spec
+++ b/redhat/applications/knetworkmanager8/knetworkmanager8-3.5.13.2.spec
@@ -1,17 +1,13 @@
 # Default version for this component
-%define tdecomp knetworkmanager
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion}
-%define version 0.9
-%else
-%define version 0.8
-%endif
+%define tde_pkg knetworkmanager8
+%define tde_version 3.5.13.2
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
 %endif
 
-# TDE 3.5.13 specific building variables
+# TDE specific building variables
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
@@ -28,41 +24,47 @@
 %define _docdir %{tde_tdedocdir}
 
 
-Name:			trinity-%{tdecomp}
-Version:		%{?version}
-Release:		5%{?dist}%{?_variant}
+Name:			trinity-%{tde_pkg}
+Version:		0.8
+Release:		%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
 
-Summary:        Trinity applet for Network Manager
+Summary:		Trinity applet for Network Manager
 
-Group:          Applications/Internet
-License:        GPLv2+
-URL:            http://en.opensuse.org/Projects/KNetworkManager
+Group:			Applications/Internet
+License:		GPLv2+
+URL:			http://en.opensuse.org/Projects/KNetworkManager
 
-%if "%{?version}" == "0.9"
-Source0:	trinity-knetworkmanager9-3.5.13.2.tar.gz
-%else
-Source0:	trinity-knetworkmanager8-3.5.13.2.tar.gz
-%endif
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
 Patch0:			knetworkmanager-3.5.13-missing_includes.patch
 
 # For knetworkmanager 0.9 only !
 Patch10:		knetworkmanager-3.5.13-subdir_version.patch
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#Requires:       kde-filesystem
-BuildRequires:  desktop-file-utils
+BuildRequires:	desktop-file-utils
 
+# NETWORKMANAGER support
 %if 0%{?rhel} || 0%{?fedora}
-Requires:       NetworkManager-gnome
-%else
-Requires:       networkmanager
+Requires:		NetworkManager-gnome
 %endif
-
-BuildRequires:	trinity-dbus-1-tqt-devel
-BuildRequires:	trinity-dbus-tqt-devel
+%if 0%{?mdkversion} || 0%{?mgaversion}
+Requires:		networkmanager
+%endif
+%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
 BuildRequires:	NetworkManager-glib-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires:	NetworkManager-devel
+Requires:		NetworkManager
+%endif
+
+BuildRequires:	trinity-dbus-1-tqt-devel >= 1:0.9
+BuildRequires:	trinity-dbus-tqt-devel >= 1:0.63
+
+Obsoletes:		trinity-knetworkmanager < %{version}-%{release}
+Provides:		trinity-knetworkmanager = %{version}-%{release}
 
 %description
 KNetworkManager is a system tray applet for controlling network
@@ -70,9 +72,12 @@ connections on systems that use the NetworkManager daemon.
 
 
 %package devel
-Summary:        Common data shared among the MySQL GUI Suites
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Summary:		Common data shared among the MySQL GUI Suites
+Group:			Development/Libraries
+Requires:		%{name} = %{version}-%{release}
+
+Obsoletes:		trinity-knetworkmanager-devel < %{version}-%{release}
+Provides:		trinity-knetworkmanager-devel = %{version}-%{release}
 
 %description devel
 Development headers for knetworkmanager
@@ -84,11 +89,7 @@ Development headers for knetworkmanager
 
 
 %prep 
-%if "%{?version}" == "0.9"
-%setup -q -n %{name}9-3.5.13.2
-%else
-%setup -q -n %{name}8-3.5.13.2
-%endif
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
 %if "%{?version}" == "0.9"
 %patch10 -p1
@@ -103,25 +104,29 @@ cd knetworkmanager-0.*/src
 unset QTDIR || : ; . /etc/profile.d/qt3.sh
 export PATH="%{tde_bindir}:${PATH}"
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
-export LD_LIBRARY_PATH="%{tde_libdir}"
 
 # Missing TDE macros
 %__mkdir_p cmake
 %__ln_s %{tde_datadir}/cmake cmake/modules
 
-%if 0%{?rhel} || 0%{?fedora}
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
 %__mkdir_p build
 cd build
 %endif
 
 %cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  \
   -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
   -DBIN_INSTALL_DIR=%{tde_bindir} \
   -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
   -DLIB_INSTALL_DIR=%{tde_libdir} \
   -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  -DCMAKE_SKIP_RPATH="OFF" \
   ..
   
 %__make %{?_smp_mflags} 
@@ -141,18 +146,22 @@ update-desktop-database %{tde_appdir} > /dev/null
 touch --no-create %{tde_datadir}/icons/hicolor || :
 gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
+
 %postun
 update-desktop-database %{tde_appdir} > /dev/null
 /sbin/ldconfig
 touch --no-create %{tde_datadir}/icons/hicolor || :
 gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
+
 %post devel
 /sbin/ldconfig
 
+
 %postun devel
 /sbin/ldconfig
 
+
 %files 
 %defattr(-,root,root,-)
 %{tde_bindir}/knetworkmanager
diff --git a/redhat/applications/krusader/krusader-3.5.13.2-tmpvfs-ftbfs.patch b/redhat/applications/krusader/krusader-3.5.13.2-tmpvfs-ftbfs.patch
new file mode 100644
index 000000000..eb1f41ffd
--- /dev/null
+++ b/redhat/applications/krusader/krusader-3.5.13.2-tmpvfs-ftbfs.patch
@@ -0,0 +1,62 @@
+diff --git a/krusader/VFS/temp_vfs.cpp b/krusader/VFS/temp_vfs.cpp
+index 25f3a15..ee68521 100644
+--- a/krusader/VFS/temp_vfs.cpp
++++ b/krusader/VFS/temp_vfs.cpp
+@@ -56,7 +56,7 @@ temp_vfs::temp_vfs( TQString origin, TQString type, TQWidget* panel, bool ):
+ }
+ 
+ temp_vfs::~temp_vfs(){
+-	if( vfs_type == "-iso" ){
++	if( tmpvfs_type == ISO ){
+ 		// unmount the ISO image
+     KShellProcess umount;
+ 		umount << "umount -f" << tmpDir;
+@@ -94,6 +94,13 @@ bool temp_vfs::vfs_refresh(const KURL& origin){
+ }
+ 
+ void temp_vfs::handleAceArj(TQString origin, TQString type){
++    if (type == "-ace") {
++	tmpvfs_type = ACE;
++    }
++    else if (type == "-arj") {
++	tmpvfs_type = ARJ;
++    }
++
+ 	// for ace and arj we just unpack to the tmpDir
+ 	if( !KRarcHandler::arcHandled(type) ){
+   	if (!quietMode) KMessageBox::error(krApp,"This archive type is NOT supported");
+@@ -117,6 +124,7 @@ void temp_vfs::handleRpm(TQString origin){
+ 	rpm.clearArguments();
+ 	rpm << "rpm -lpq"<<"\""+origin+"\""+" > "+tmpDir+"/filelist.txt";
+ 	rpm.start(KProcess::Block);
++	tmpvfs_type = RPM;
+ }
+ 
+ void temp_vfs::handleIso(TQString origin){
+@@ -124,4 +132,5 @@ void temp_vfs::handleIso(TQString origin){
+ 	KShellProcess mount;
+ 	mount << KrServices::fullPathName( "mount" ) << "-o loop" << origin << tmpDir;
+ 	mount.start(KProcess::Block);
++	tmpvfs_type = ISO;
+ }
+diff --git a/krusader/VFS/temp_vfs.h b/krusader/VFS/temp_vfs.h
+index 3b94248..d35169b 100644
+--- a/krusader/VFS/temp_vfs.h
++++ b/krusader/VFS/temp_vfs.h
+@@ -37,6 +37,8 @@
+ 
+ class temp_vfs : public normal_vfs  {
+ public: 
++	enum TMPVFS_TYPE{ERROR=0,ACE,ARJ,RPM,ISO};
++
+ 	temp_vfs( TQString origin, TQString type, TQWidget* panel, bool writeable);
+ 	~temp_vfs();
+ 	TQString vfs_workingDir();
+@@ -50,6 +52,7 @@ protected:
+ 	void handleAceArj(TQString origin, TQString type);
+ 	void handleRpm(TQString origin);
+ 	void handleIso(TQString origin);
++	TMPVFS_TYPE tmpvfs_type;     //< the tmp vfs type.
+   TQString tmpDir;
+ 
+ };
diff --git a/redhat/applications/krusader/krusader-3.5.13.2.spec b/redhat/applications/krusader/krusader-3.5.13.2.spec
index 2df09636c..a5e2f7623 100644
--- a/redhat/applications/krusader/krusader-3.5.13.2.spec
+++ b/redhat/applications/krusader/krusader-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
 
-Patch0:			krusader-tmpvfs-ftbfs.diff
+Patch0:			krusader-3.5.13.2-tmpvfs-ftbfs.patch
 
 BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
 BuildRequires:	trinity-arts-devel >= 1:1.5.10
diff --git a/redhat/applications/kvirc/kvirc-3.5.13.2.spec b/redhat/applications/kvirc/kvirc-3.5.13.2.spec
index fcade0876..c285b9265 100644
--- a/redhat/applications/kvirc/kvirc-3.5.13.2.spec
+++ b/redhat/applications/kvirc/kvirc-3.5.13.2.spec
@@ -164,8 +164,8 @@ export PATH="%{tde_bindir}:${PATH}"
 
 # Debian maintainer has renamed 'COPYING' file to 'EULA', so we do the same ...
 %__mv \
-  %{?buildroot}%{tde_libdir}/kvirc/3.4/license/COPYING \
-  %{?buildroot}%{tde_libdir}/kvirc/3.4/license/EULA
+  %{?buildroot}%{tde_datadir}/kvirc/3.4/license/COPYING \
+  %{?buildroot}%{tde_datadir}/kvirc/3.4/license/EULA
 
 
 %clean
@@ -199,7 +199,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 %{tde_datadir}/icons/hicolor/*/*/*.png
 %{tde_datadir}/icons/hicolor/*/*/*.svgz
 %{tde_datadir}/icons/hicolor/*/*/*.xpm
-#%{tde_datadir}/kvirc
+%{tde_datadir}/kvirc
 %{tde_datadir}/mimelnk/text/*.desktop
 %{tde_datadir}/services/*.protocol
 %{tde_mandir}/man1/kvirc.1
@@ -210,7 +210,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 %{tde_includedir}/kvirc/
 %{tde_libdir}/*.la
 %{tde_libdir}/*.so
-#%{tde_libdir}/kvirc/*/modules/*.la
+%{tde_libdir}/kvirc/*/modules/*.la
 
 
 %changelog
diff --git a/redhat/extras/jpegint.h.el6 b/redhat/extras/jpegint.h.el6
new file mode 100644
index 000000000..78717482e
--- /dev/null
+++ b/redhat/extras/jpegint.h.el6
@@ -0,0 +1,401 @@
+/*
+ * jpegint.h
+ *
+ * Copyright (C) 1991-1997, Thomas G. Lane.
+ * Modified 1997-2009 by Guido Vollbeding.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file provides common declarations for the various JPEG modules.
+ * These declarations are considered internal to the JPEG library; most
+ * applications using the library shouldn't need to include this file.
+ */
+
+
+/* Declarations for both compression & decompression */
+
+typedef enum {			/* Operating modes for buffer controllers */
+	JBUF_PASS_THRU,		/* Plain stripwise operation */
+	/* Remaining modes require a full-image buffer to have been created */
+	JBUF_SAVE_SOURCE,	/* Run source subobject only, save output */
+	JBUF_CRANK_DEST,	/* Run dest subobject only, using saved data */
+	JBUF_SAVE_AND_PASS	/* Run both subobjects, save output */
+} J_BUF_MODE;
+
+/* Values of global_state field (jdapi.c has some dependencies on ordering!) */
+#define CSTATE_START	100	/* after create_compress */
+#define CSTATE_SCANNING	101	/* start_compress done, write_scanlines OK */
+#define CSTATE_RAW_OK	102	/* start_compress done, write_raw_data OK */
+#define CSTATE_WRCOEFS	103	/* jpeg_write_coefficients done */
+#define DSTATE_START	200	/* after create_decompress */
+#define DSTATE_INHEADER	201	/* reading header markers, no SOS yet */
+#define DSTATE_READY	202	/* found SOS, ready for start_decompress */
+#define DSTATE_PRELOAD	203	/* reading multiscan file in start_decompress*/
+#define DSTATE_PRESCAN	204	/* performing dummy pass for 2-pass quant */
+#define DSTATE_SCANNING	205	/* start_decompress done, read_scanlines OK */
+#define DSTATE_RAW_OK	206	/* start_decompress done, read_raw_data OK */
+#define DSTATE_BUFIMAGE	207	/* expecting jpeg_start_output */
+#define DSTATE_BUFPOST	208	/* looking for SOS/EOI in jpeg_finish_output */
+#define DSTATE_RDCOEFS	209	/* reading file in jpeg_read_coefficients */
+#define DSTATE_STOPPING	210	/* looking for EOI in jpeg_finish_decompress */
+
+
+/* Declarations for compression modules */
+
+/* Master control module */
+struct jpeg_comp_master {
+  JMETHOD(void, prepare_for_pass, (j_compress_ptr cinfo));
+  JMETHOD(void, pass_startup, (j_compress_ptr cinfo));
+  JMETHOD(void, finish_pass, (j_compress_ptr cinfo));
+
+  /* State variables made visible to other modules */
+  boolean call_pass_startup;	/* True if pass_startup must be called */
+  boolean is_last_pass;		/* True during last pass */
+};
+
+/* Main buffer control (downsampled-data buffer) */
+struct jpeg_c_main_controller {
+  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
+  JMETHOD(void, process_data, (j_compress_ptr cinfo,
+			       JSAMPARRAY input_buf, JDIMENSION *in_row_ctr,
+			       JDIMENSION in_rows_avail));
+};
+
+/* Compression preprocessing (downsampling input buffer control) */
+struct jpeg_c_prep_controller {
+  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
+  JMETHOD(void, pre_process_data, (j_compress_ptr cinfo,
+				   JSAMPARRAY input_buf,
+				   JDIMENSION *in_row_ctr,
+				   JDIMENSION in_rows_avail,
+				   JSAMPIMAGE output_buf,
+				   JDIMENSION *out_row_group_ctr,
+				   JDIMENSION out_row_groups_avail));
+};
+
+/* Coefficient buffer control */
+struct jpeg_c_coef_controller {
+  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
+  JMETHOD(boolean, compress_data, (j_compress_ptr cinfo,
+				   JSAMPIMAGE input_buf));
+};
+
+/* Colorspace conversion */
+struct jpeg_color_converter {
+  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
+  JMETHOD(void, color_convert, (j_compress_ptr cinfo,
+				JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
+				JDIMENSION output_row, int num_rows));
+};
+
+/* Downsampling */
+struct jpeg_downsampler {
+  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
+  JMETHOD(void, downsample, (j_compress_ptr cinfo,
+			     JSAMPIMAGE input_buf, JDIMENSION in_row_index,
+			     JSAMPIMAGE output_buf,
+			     JDIMENSION out_row_group_index));
+
+  boolean need_context_rows;	/* TRUE if need rows above & below */
+};
+
+/* Forward DCT (also controls coefficient quantization) */
+struct jpeg_forward_dct {
+  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
+  /* perhaps this should be an array??? */
+  JMETHOD(void, forward_DCT, (j_compress_ptr cinfo,
+			      jpeg_component_info * compptr,
+			      JSAMPARRAY sample_data, JBLOCKROW coef_blocks,
+			      JDIMENSION start_row, JDIMENSION start_col,
+			      JDIMENSION num_blocks));
+};
+
+/* Entropy encoding */
+struct jpeg_entropy_encoder {
+  JMETHOD(void, start_pass, (j_compress_ptr cinfo, boolean gather_statistics));
+  JMETHOD(boolean, encode_mcu, (j_compress_ptr cinfo, JBLOCKROW *MCU_data));
+  JMETHOD(void, finish_pass, (j_compress_ptr cinfo));
+};
+
+/* Marker writing */
+struct jpeg_marker_writer {
+  JMETHOD(void, write_file_header, (j_compress_ptr cinfo));
+  JMETHOD(void, write_frame_header, (j_compress_ptr cinfo));
+  JMETHOD(void, write_scan_header, (j_compress_ptr cinfo));
+  JMETHOD(void, write_file_trailer, (j_compress_ptr cinfo));
+  JMETHOD(void, write_tables_only, (j_compress_ptr cinfo));
+  /* These routines are exported to allow insertion of extra markers */
+  /* Probably only COM and APPn markers should be written this way */
+  JMETHOD(void, write_marker_header, (j_compress_ptr cinfo, int marker,
+				      unsigned int datalen));
+  JMETHOD(void, write_marker_byte, (j_compress_ptr cinfo, int val));
+};
+
+
+/* Declarations for decompression modules */
+
+/* Master control module */
+struct jpeg_decomp_master {
+  JMETHOD(void, prepare_for_output_pass, (j_decompress_ptr cinfo));
+  JMETHOD(void, finish_output_pass, (j_decompress_ptr cinfo));
+
+  /* State variables made visible to other modules */
+  boolean is_dummy_pass;	/* True during 1st pass for 2-pass quant */
+};
+
+/* Input control module */
+struct jpeg_input_controller {
+  JMETHOD(int, consume_input, (j_decompress_ptr cinfo));
+  JMETHOD(void, reset_input_controller, (j_decompress_ptr cinfo));
+  JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo));
+  JMETHOD(void, finish_input_pass, (j_decompress_ptr cinfo));
+
+  /* State variables made visible to other modules */
+  boolean has_multiple_scans;	/* True if file has multiple scans */
+  boolean eoi_reached;		/* True when EOI has been consumed */
+};
+
+/* Main buffer control (downsampled-data buffer) */
+struct jpeg_d_main_controller {
+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
+  JMETHOD(void, process_data, (j_decompress_ptr cinfo,
+			       JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
+			       JDIMENSION out_rows_avail));
+};
+
+/* Coefficient buffer control */
+struct jpeg_d_coef_controller {
+  JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo));
+  JMETHOD(int, consume_data, (j_decompress_ptr cinfo));
+  JMETHOD(void, start_output_pass, (j_decompress_ptr cinfo));
+  JMETHOD(int, decompress_data, (j_decompress_ptr cinfo,
+				 JSAMPIMAGE output_buf));
+  /* Pointer to array of coefficient virtual arrays, or NULL if none */
+  jvirt_barray_ptr *coef_arrays;
+};
+
+/* Decompression postprocessing (color quantization buffer control) */
+struct jpeg_d_post_controller {
+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
+  JMETHOD(void, post_process_data, (j_decompress_ptr cinfo,
+				    JSAMPIMAGE input_buf,
+				    JDIMENSION *in_row_group_ctr,
+				    JDIMENSION in_row_groups_avail,
+				    JSAMPARRAY output_buf,
+				    JDIMENSION *out_row_ctr,
+				    JDIMENSION out_rows_avail));
+};
+
+/* Marker reading & parsing */
+struct jpeg_marker_reader {
+  JMETHOD(void, reset_marker_reader, (j_decompress_ptr cinfo));
+  /* Read markers until SOS or EOI.
+   * Returns same codes as are defined for jpeg_consume_input:
+   * JPEG_SUSPENDED, JPEG_REACHED_SOS, or JPEG_REACHED_EOI.
+   */
+  JMETHOD(int, read_markers, (j_decompress_ptr cinfo));
+  /* Read a restart marker --- exported for use by entropy decoder only */
+  jpeg_marker_parser_method read_restart_marker;
+
+  /* State of marker reader --- nominally internal, but applications
+   * supplying COM or APPn handlers might like to know the state.
+   */
+  boolean saw_SOI;		/* found SOI? */
+  boolean saw_SOF;		/* found SOF? */
+  int next_restart_num;		/* next restart number expected (0-7) */
+  unsigned int discarded_bytes;	/* # of bytes skipped looking for a marker */
+};
+
+/* Entropy decoding */
+struct jpeg_entropy_decoder {
+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
+  JMETHOD(boolean, decode_mcu, (j_decompress_ptr cinfo,
+				JBLOCKROW *MCU_data));
+
+  /* This is here to share code between baseline and progressive decoders; */
+  /* other modules probably should not use it */
+  boolean insufficient_data;	/* set TRUE after emitting warning */
+};
+
+/* Inverse DCT (also performs dequantization) */
+typedef JMETHOD(void, inverse_DCT_method_ptr,
+		(j_decompress_ptr cinfo, jpeg_component_info * compptr,
+		 JCOEFPTR coef_block,
+		 JSAMPARRAY output_buf, JDIMENSION output_col));
+
+struct jpeg_inverse_dct {
+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
+  /* It is useful to allow each component to have a separate IDCT method. */
+  inverse_DCT_method_ptr inverse_DCT[MAX_COMPONENTS];
+};
+
+/* Upsampling (note that upsampler must also call color converter) */
+struct jpeg_upsampler {
+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
+  JMETHOD(void, upsample, (j_decompress_ptr cinfo,
+			   JSAMPIMAGE input_buf,
+			   JDIMENSION *in_row_group_ctr,
+			   JDIMENSION in_row_groups_avail,
+			   JSAMPARRAY output_buf,
+			   JDIMENSION *out_row_ctr,
+			   JDIMENSION out_rows_avail));
+
+  boolean need_context_rows;	/* TRUE if need rows above & below */
+};
+
+/* Colorspace conversion */
+struct jpeg_color_deconverter {
+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
+  JMETHOD(void, color_convert, (j_decompress_ptr cinfo,
+				JSAMPIMAGE input_buf, JDIMENSION input_row,
+				JSAMPARRAY output_buf, int num_rows));
+};
+
+/* Color quantization or color precision reduction */
+struct jpeg_color_quantizer {
+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, boolean is_pre_scan));
+  JMETHOD(void, color_quantize, (j_decompress_ptr cinfo,
+				 JSAMPARRAY input_buf, JSAMPARRAY output_buf,
+				 int num_rows));
+  JMETHOD(void, finish_pass, (j_decompress_ptr cinfo));
+  JMETHOD(void, new_color_map, (j_decompress_ptr cinfo));
+};
+
+
+/* Miscellaneous useful macros */
+
+#undef MAX
+#define MAX(a,b)	((a) > (b) ? (a) : (b))
+#undef MIN
+#define MIN(a,b)	((a) < (b) ? (a) : (b))
+
+
+/* We assume that right shift corresponds to signed division by 2 with
+ * rounding towards minus infinity.  This is correct for typical "arithmetic
+ * shift" instructions that shift in copies of the sign bit.  But some
+ * C compilers implement >> with an unsigned shift.  For these machines you
+ * must define RIGHT_SHIFT_IS_UNSIGNED.
+ * RIGHT_SHIFT provides a proper signed right shift of an INT32 quantity.
+ * It is only applied with constant shift counts.  SHIFT_TEMPS must be
+ * included in the variables of any routine using RIGHT_SHIFT.
+ */
+
+#ifdef RIGHT_SHIFT_IS_UNSIGNED
+#define SHIFT_TEMPS	INT32 shift_temp;
+#define RIGHT_SHIFT(x,shft)  \
+	((shift_temp = (x)) < 0 ? \
+	 (shift_temp >> (shft)) | ((~((INT32) 0)) << (32-(shft))) : \
+	 (shift_temp >> (shft)))
+#else
+#define SHIFT_TEMPS
+#define RIGHT_SHIFT(x,shft)	((x) >> (shft))
+#endif
+
+
+/* Short forms of external names for systems with brain-damaged linkers. */
+
+#ifdef NEED_SHORT_EXTERNAL_NAMES
+#define jinit_compress_master	jICompress
+#define jinit_c_master_control	jICMaster
+#define jinit_c_main_controller	jICMainC
+#define jinit_c_prep_controller	jICPrepC
+#define jinit_c_coef_controller	jICCoefC
+#define jinit_color_converter	jICColor
+#define jinit_downsampler	jIDownsampler
+#define jinit_forward_dct	jIFDCT
+#define jinit_huff_encoder	jIHEncoder
+#define jinit_phuff_encoder	jIPHEncoder
+#define jinit_arith_encoder	jIAEncoder
+#define jinit_marker_writer	jIMWriter
+#define jinit_master_decompress	jIDMaster
+#define jinit_d_main_controller	jIDMainC
+#define jinit_d_coef_controller	jIDCoefC
+#define jinit_d_post_controller	jIDPostC
+#define jinit_input_controller	jIInCtlr
+#define jinit_marker_reader	jIMReader
+#define jinit_huff_decoder	jIHDecoder
+#define jinit_phuff_decoder	jIPHDecoder
+#define jinit_arith_decoder	jIADecoder
+#define jinit_inverse_dct	jIIDCT
+#define jinit_upsampler		jIUpsampler
+#define jinit_color_deconverter	jIDColor
+#define jinit_1pass_quantizer	jI1Quant
+#define jinit_2pass_quantizer	jI2Quant
+#define jinit_merged_upsampler	jIMUpsampler
+#define jinit_memory_mgr	jIMemMgr
+#define jdiv_round_up		jDivRound
+#define jround_up		jRound
+#define jcopy_sample_rows	jCopySamples
+#define jcopy_block_row		jCopyBlocks
+#define jzero_far		jZeroFar
+#define jpeg_zigzag_order	jZIGTable
+#define jpeg_natural_order	jZAGTable
+#define jpeg_aritab		jAriTab
+#endif /* NEED_SHORT_EXTERNAL_NAMES */
+
+
+/* Compression module initialization routines */
+EXTERN(void) jinit_compress_master JPP((j_compress_ptr cinfo));
+EXTERN(void) jinit_c_master_control JPP((j_compress_ptr cinfo,
+					 boolean transcode_only));
+EXTERN(void) jinit_c_main_controller JPP((j_compress_ptr cinfo,
+					  boolean need_full_buffer));
+EXTERN(void) jinit_c_prep_controller JPP((j_compress_ptr cinfo,
+					  boolean need_full_buffer));
+EXTERN(void) jinit_c_coef_controller JPP((j_compress_ptr cinfo,
+					  boolean need_full_buffer));
+EXTERN(void) jinit_color_converter JPP((j_compress_ptr cinfo));
+EXTERN(void) jinit_downsampler JPP((j_compress_ptr cinfo));
+EXTERN(void) jinit_forward_dct JPP((j_compress_ptr cinfo));
+EXTERN(void) jinit_huff_encoder JPP((j_compress_ptr cinfo));
+EXTERN(void) jinit_phuff_encoder JPP((j_compress_ptr cinfo));
+EXTERN(void) jinit_arith_encoder JPP((j_compress_ptr cinfo));
+EXTERN(void) jinit_marker_writer JPP((j_compress_ptr cinfo));
+/* Decompression module initialization routines */
+EXTERN(void) jinit_master_decompress JPP((j_decompress_ptr cinfo));
+EXTERN(void) jinit_d_main_controller JPP((j_decompress_ptr cinfo,
+					  boolean need_full_buffer));
+EXTERN(void) jinit_d_coef_controller JPP((j_decompress_ptr cinfo,
+					  boolean need_full_buffer));
+EXTERN(void) jinit_d_post_controller JPP((j_decompress_ptr cinfo,
+					  boolean need_full_buffer));
+EXTERN(void) jinit_input_controller JPP((j_decompress_ptr cinfo));
+EXTERN(void) jinit_marker_reader JPP((j_decompress_ptr cinfo));
+EXTERN(void) jinit_huff_decoder JPP((j_decompress_ptr cinfo));
+EXTERN(void) jinit_phuff_decoder JPP((j_decompress_ptr cinfo));
+EXTERN(void) jinit_arith_decoder JPP((j_decompress_ptr cinfo));
+EXTERN(void) jinit_inverse_dct JPP((j_decompress_ptr cinfo));
+EXTERN(void) jinit_upsampler JPP((j_decompress_ptr cinfo));
+EXTERN(void) jinit_color_deconverter JPP((j_decompress_ptr cinfo));
+EXTERN(void) jinit_1pass_quantizer JPP((j_decompress_ptr cinfo));
+EXTERN(void) jinit_2pass_quantizer JPP((j_decompress_ptr cinfo));
+EXTERN(void) jinit_merged_upsampler JPP((j_decompress_ptr cinfo));
+/* Memory manager initialization */
+EXTERN(void) jinit_memory_mgr JPP((j_common_ptr cinfo));
+
+/* Utility routines in jutils.c */
+EXTERN(long) jdiv_round_up JPP((long a, long b));
+EXTERN(long) jround_up JPP((long a, long b));
+EXTERN(void) jcopy_sample_rows JPP((JSAMPARRAY input_array, int source_row,
+				    JSAMPARRAY output_array, int dest_row,
+				    int num_rows, JDIMENSION num_cols));
+EXTERN(void) jcopy_block_row JPP((JBLOCKROW input_row, JBLOCKROW output_row,
+				  JDIMENSION num_blocks));
+EXTERN(void) jzero_far JPP((void FAR * target, size_t bytestozero));
+/* Constant tables in jutils.c */
+#if 0				/* This table is not actually needed in v6a */
+extern const int jpeg_zigzag_order[]; /* natural coef order to zigzag order */
+#endif
+extern const int jpeg_natural_order[]; /* zigzag coef order to natural order */
+
+/* Arithmetic coding probability estimation tables in jaricom.c */
+extern const INT32 jpeg_aritab[];
+
+/* Suppress undefined-structure complaints if necessary. */
+
+#ifdef INCOMPLETE_TYPES_BROKEN
+#ifndef AM_MEMORY_MANAGER	/* only jmemmgr.c defines these */
+struct jvirt_sarray_control { long dummy; };
+struct jvirt_barray_control { long dummy; };
+#endif
+#endif /* INCOMPLETE_TYPES_BROKEN */
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 72e7254c2..98fcf9277 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
@@ -112,7 +112,7 @@ Requires: trinity-digikam
 Requires: trinity-dolphin
 Requires: trinity-filelight
 Requires: trinity-gwenview
-Requires: trinity-gwenview-i18n
+#Requires: trinity-gwenview-i18n
 Requires: trinity-k3b
 Requires: trinity-kaffeine
 Requires: trinity-kaffeine-mozilla
@@ -192,11 +192,13 @@ Obsoletes: trinity-kgtk-qt3
 # RHEL, openSUSE 12: no Beagle library
 Obsoletes: trinity-kerry
 
-# RHEL 6 only: knetworkmanager8
-#  knetworkmanager9 is too unstable for now.
+# RHEL 6 and openSUSE 11.x: knetworkmanager8
 %if 0%{?rhel} == 6
 Requires: trinity-knetworkmanager
 %endif
+%if 0%{?suse_version} && 0%{?suse_version} <= 1140
+Requires: trinity-knetworkmanager
+%endif
 
 # RHEL 4
 %if 0%{?rhel} >= 5 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
@@ -218,6 +220,8 @@ Requires: trinity-tdesvn
 
 ##########
 
+%if 0
+
 %package extras
 Group:		User Interface/Desktops
 Summary:	Meta-package to install all extras (unofficial) TDE packages
@@ -256,6 +260,8 @@ Requires:	trinity-twinkle
 
 %files extras
 
+%endif
+
 ##########
 
 %package all
diff --git a/redhat/tdeaddons/tdeaddons-3.5.13.2.spec b/redhat/tdeaddons/tdeaddons-3.5.13.2.spec
index 8266a566e..47256ca84 100644
--- a/redhat/tdeaddons/tdeaddons-3.5.13.2.spec
+++ b/redhat/tdeaddons/tdeaddons-3.5.13.2.spec
@@ -57,16 +57,20 @@ BuildRequires: openssl-devel
 
 # DB4 support
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1220 || 0%{?mdkversion} || 0%{?mgaversion}
-%define with_db4 1
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion}
-BuildRequires:	db4-devel
+%define with_db 1
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	db5-devel
 %endif
 %if 0%{?fedora} >= 18
-BuildRequires:	libdb4-cxx-devel
+BuildRequires:	libdb-devel
+BuildRequires:	libdb-cxx-devel
 %endif
 %if 0%{?suse_version}
 BuildRequires:	libdb-4_8-devel
 %endif
+%if 0%{?rhel}
+BuildRequires:	db4-devel
+%endif
 %endif
 
 # XMMS support: no, always disabled, even on Fedora
@@ -633,7 +637,7 @@ of user interfaces, playlists and visualisation plugins.
 %{tde_tdelibdir}/noatunlyrics.so
 %{tde_tdelibdir}/noatunmadness.la
 %{tde_tdelibdir}/noatunmadness.so
-%if 0%{?with_db4}
+%if 0%{?with_db}
 %{tde_tdelibdir}/noatun_oblique.la
 %{tde_tdelibdir}/noatun_oblique.so
 %endif
@@ -704,15 +708,12 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
   --enable-closure \
   --enable-rpath \
   \
-  --with-extra-includes=%{_includedir}/db4:%{_includedir}/libdb4:%{tde_includedir}/arts \
+  --with-extra-includes=%{_includedir}/db4:%{_includedir}/db53:%{_includedir}/libdb4:%{tde_includedir}/arts \
   \
   %{?with_xmms:--with-xmms} %{?!with_xmms:--without-xmms} \
   --with-sdl \
-%if 0%{?with_db4}
+%if 0%{?with_db}
   --with-berkeley-db \
-%if 0%{?fedora} >= 18
-  --with-db-lib=db_cxx-4 \
-%endif
 %endif
 
 
diff --git a/redhat/tdebase/tdebase-3.5.13.2-fix_tdm_user_path.patch b/redhat/tdebase/tdebase-3.5.13.2-fix_tdm_user_path.patch
new file mode 100644
index 000000000..4f24f6f05
--- /dev/null
+++ b/redhat/tdebase/tdebase-3.5.13.2-fix_tdm_user_path.patch
@@ -0,0 +1,16 @@
+--- trinity-tdebase-3.5.13.2/kdm/config.def.ori	2013-09-07 19:18:58.424732176 +0200
++++ trinity-tdebase-3.5.13.2/kdm/config.def	2013-09-07 19:20:24.310872875 +0200
+@@ -48,10 +48,10 @@
+ #endif
+ 
+ #if defined(BSD) || defined(__linux__)
+-# define DEF_USER_PATH "/usr/local/bin:/opt/trinity/bin:/usr/bin:/bin:/opt/trinity/games:/usr/games"
+-# define DEF_SYSTEM_PATH "/usr/local/sbin:/usr/local/bin:/opt/trinity/sbin:/usr/sbin:/opt/trinity/bin:/usr/bin:/sbin:/bin"
++# define DEF_USER_PATH "/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin:/usr/games"
++# define DEF_SYSTEM_PATH "/usr/local/sbin:/usr/local/bin:/opt/trinity/sbin:/usr/sbin:/opt/trinity/bin:/usr/bin:/sbin:/bin:/usr/X11R6/bin"
+ #else
+-# define DEF_USER_PATH "/usr/local/bin:/opt/trinity/bin:/usr/bin:/bin:/opt/trinity/games:/usr/games:/usr/ucb"
++# define DEF_USER_PATH "/usr/local/bin:/usr/bin:/bin:/usr/games:/usr/ucb"
+ # define DEF_SYSTEM_PATH "/usr/local/sbin:/usr/local/bin:/opt/trinity/sbin:/usr/sbin:/opt/trinity/bin:/usr/bin:/sbin:/bin:/etc:/usr/ucb"
+ #endif
+ 
diff --git a/redhat/tdebase/tdebase-3.5.13.2.spec b/redhat/tdebase/tdebase-3.5.13.2.spec
index adbb2036b..1e0d6f40a 100644
--- a/redhat/tdebase/tdebase-3.5.13.2.spec
+++ b/redhat/tdebase/tdebase-3.5.13.2.spec
@@ -69,6 +69,11 @@ Source6:	suse-displaymanagers-tdm
 Source7:	tdm.service%{?dist}
 %endif
 
+# openSUSE 11.4: overwrite distribution-provided '/etc/init.d/xdm' !!!
+%if 0%{?suse_version} == 1140
+Source7:	xdm.oss114
+%endif
+
 # Fedora 17: special selinux policy required
 %if 0%{?fedora} >= 17 || 0%{?rhel} == 6
 %define with_selinux_policy 1
@@ -102,6 +107,8 @@ Patch11:	kdebase-3.5.13.1-fix_tdm_pid_file.patch
 Patch12:	tdebase-3.5.13.2-kdesu-noignorebutton.patch
 ## [kdebase/applnk] Fix XDG menu to avoid KDE4 conflict
 Patch13:	tdebase-3.5.13.2-fix_xdg_menu.patch
+## [kdebase/tdm] Fix USER_PATH variable in TDM
+Patch14:	tdebase-3.5.13.2-fix_tdm_user_path.patch
 
 # Patches from Mandriva
 Patch101:	tdebase-3.5.13.2-vibrate_dialog.patch
@@ -2067,14 +2074,17 @@ already. Most users won't need this.
 %config(noreplace) %{_sysconfdir}/pam.d/tdm-trinity
 %config(noreplace) %{_sysconfdir}/pam.d/tdm-trinity-np
 %endif
-%if 0%{?suse_version}
+
+# Distribution specific stuff
+%if 0%{?suse_version} == 1140
+%{_sysconfdir}/init.d/xdm.tde
+%endif
+%if 0%{?suse_version} >= 1210
 /usr/lib/X11/displaymanagers/tdm
 %endif
 %if 0%{?fedora} >= 18
 /usr/lib/systemd/system/tdm.service
 %endif
-
-# Distribution specific stuff
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
 %{_datadir}/xsessions/tde.desktop
 %endif
@@ -2125,6 +2135,11 @@ if [ "$1" = "1" ]; then
     %__sed -i "%{_sysconfdir}/trinity/kdm/kdmrc" -e "s|^#*Language=.*|Language=${LANG}|"
   fi
 fi
+# openSUSE 11.4 tdm's startup script
+if [ -r "%{_sysconfdir}/init.d/xdm.tde" ]; then
+  cat "%{_sysconfdir}/init.d/xdm.tde" >"%{_sysconfdir}/init.d/xdm"
+fi
+
 
 %posttrans -n trinity-tdm
 # Make sure that TDM configuration files are now under '/etc/trinity/kdm'
@@ -3293,6 +3308,7 @@ Windows and Samba shares.
 %patch11 -p1 -b .tdmpid
 %patch12 -p1 -b .kdesunoignorebutton
 %patch13 -p1 -b .xdgmenu
+%patch14 -p1 -b .tdmuserpath
 
 %patch101 -p1 -b .vibrate_dialog
 %patch102 -p1 -b .kcontrol_menu_entry
@@ -3514,7 +3530,7 @@ EOF
 
 # SUSE: creates DM config file, used by '/etc/init.d/xdm'
 #  You must set 'DISPLAYMANAGER=tdm' in '/etc/sysconfig/displaymanager'
-%if 0%{?suse_version}
+%if 0%{?suse_version} >= 1210
 %__install -D -m 644 "%{SOURCE6}" "%{?buildroot}/usr/lib/X11/displaymanagers/tdm"
 %__sed -i "%{?buildroot}/usr/lib/X11/displaymanagers/tdm" -e "s|/opt/trinity/bin|%{tde_bindir}|g"
 %endif
@@ -3538,6 +3554,11 @@ EOF
 %__install -D -m 644 "%{SOURCE9}" "%{?buildroot}%{tde_datadir}/oxygen/scalable/mgabutton.svg"
 %endif
 
+# openSUSE 11.4: tdm startup script
+%if 0%{?suse_version} == 1140
+%__install -D -m 755 "%{SOURCE7}" "%{?buildroot}%{?_sysconfdir}/init.d/xdm.tde"
+%endif
+
 
 %clean
 %__rm -rf %{?buildroot}
diff --git a/redhat/tdelibs/tdelibs-3.5.13.2-fix-starting-kde4-applications.patch b/redhat/tdelibs/tdelibs-3.5.13.2-fix-starting-kde4-applications.patch
new file mode 100644
index 000000000..2c9c88368
--- /dev/null
+++ b/redhat/tdelibs/tdelibs-3.5.13.2-fix-starting-kde4-applications.patch
@@ -0,0 +1,13 @@
+diff --git a/tdeio/tdeio/kservice.cpp b/tdeio/tdeio/kservice.cpp
+index 67031d0..a4c67f3 100644
+--- a/kio/kio/kservice.cpp
++++ b/kio/kio/kservice.cpp
+@@ -103,7 +103,7 @@ KService::init( KDesktopFile *config )
+     // extract prefix
+     kde4applicationprefix = config->fileName();
+     int pos = kde4applicationprefix.find("/share/applications/kde4/");
+-    kde4applicationprefix.truncate(pos-1);
++    kde4applicationprefix.truncate(pos);
+   }
+ 
+   config->setDesktopGroup();
diff --git a/redhat/tdelibs/tdelibs-3.5.13.2.spec b/redhat/tdelibs/tdelibs-3.5.13.2.spec
index 727c8defd..d490fec26 100644
--- a/redhat/tdelibs/tdelibs-3.5.13.2.spec
+++ b/redhat/tdelibs/tdelibs-3.5.13.2.spec
@@ -36,6 +36,8 @@ Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
 
 # Fix categories in T-menu
 Patch1:			tdelibs-3.5.13.2-fix_xdg_menu.patch
+# Fix startup of KDE4 applications
+Patch2:			tdelibs-3.5.13.2-fix-starting-kde4-applications.patch
 
 # Patches from Mandriva
 Patch101:		tdelibs-3.5.13.2-xdg_dirs_set_path.patch
@@ -371,6 +373,7 @@ applications for TDE.
 %prep
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
 %patch1 -p1 -b .xdg
+%patch2 -p1 -b .kde4
 %patch101 -p1 -b .xdg_path
 %patch102 -p1 -b .cups_by_default
 
diff --git a/redhat/tdenetwork/tdenetwork-3.5.13.2.spec b/redhat/tdenetwork/tdenetwork-3.5.13.2.spec
index ed9aa126f..6190082c4 100644
--- a/redhat/tdenetwork/tdenetwork-3.5.13.2.spec
+++ b/redhat/tdenetwork/tdenetwork-3.5.13.2.spec
@@ -87,7 +87,7 @@ BuildRequires:	libgadu-devel
 %endif
 
 # XTST support
-%if 0%{?fedora} >= 5 || 0%{?rhel} >= 5 || 0%{?suse_version}
+%if 0%{?fedora} >= 5 || 0%{?rhel} >= 5 || 0%{?suse_version} >= 1210
 BuildRequires:	libXtst-devel
 %endif
 %if 0%{?mdkversion} || 0%{?mgaversion}
diff --git a/redhat/tdesdk/tdesdk-3.5.13.2.spec b/redhat/tdesdk/tdesdk-3.5.13.2.spec
index e3261b89f..540d01606 100644
--- a/redhat/tdesdk/tdesdk-3.5.13.2.spec
+++ b/redhat/tdesdk/tdesdk-3.5.13.2.spec
@@ -117,6 +117,7 @@ A collection of applications and tools used by developers, including:
 * umbrello: UML modeller and UML diagram tool
 
 %files
+%defattr(-,root,root,-)
 
 ##########
 
@@ -136,6 +137,7 @@ with the commit dialog.
 This package is part of Trinity, and a component of the TDE SDK module.
 
 %files -n trinity-cervisia
+%defattr(-,root,root,-)
 %{tde_bindir}/cervisia
 %{tde_libdir}/libkdeinit_cervisia.la
 %{tde_libdir}/libkdeinit_cervisia.so
@@ -189,6 +191,7 @@ what the code typically looks like.
 This package is part of Trinity, and a component of the TDE SDK module.
 
 %files -n trinity-kapptemplate
+%defattr(-,root,root,-)
 %{tde_bindir}/kapptemplate
 %{tde_datadir}/apps/kapptemplate/
 
@@ -217,6 +220,7 @@ for common translations.
 This package is part of Trinity, and a component of the TDE SDK module.
 
 %files -n trinity-kbabel
+%defattr(-,root,root,-)
 %{tde_bindir}/catalogmanager
 %{tde_bindir}/kbabel
 %{tde_bindir}/kbabeldict
@@ -355,6 +359,7 @@ This package contains the KBabel development files.
 This package is part of Trinity, and a component of the TDE SDK module.
 
 %files -n trinity-kbabel-devel
+%defattr(-,root,root,-)
 %{tde_tdeincludedir}/kbabel/
 %{tde_libdir}/libkbabelcommon.la
 %{tde_libdir}/libkbabelcommon.so
@@ -381,6 +386,7 @@ variety of options for searching through reports.
 This package is part of Trinity, and a component of the TDE SDK module.
 
 %files -n trinity-kbugbuster
+%defattr(-,root,root,-)
 %{tde_bindir}/kbugbuster
 %{tde_tdelibdir}/kcal_bugzilla.la
 %{tde_tdelibdir}/kcal_bugzilla.so
@@ -423,6 +429,7 @@ can be found in the tdecachegrind-converters package.
 This package is part of Trinity, and a component of the TDE SDK module.
 
 %files -n trinity-tdecachegrind
+%defattr(-,root,root,-)
 %{tde_bindir}/kcachegrind
 %{tde_tdeappdir}/kcachegrind.desktop
 %{tde_datadir}/apps/kcachegrind/
@@ -469,6 +476,7 @@ and plugin architectures are supported.
 This package is part of Trinity, and a component of the TDE SDK module.
 
 %files -n trinity-tdecachegrind-converters
+%defattr(-,root,root,-)
 %{tde_bindir}/dprof2calltree
 %{tde_bindir}/hotshot2calltree
 %{tde_bindir}/memprof2calltree
@@ -489,6 +497,7 @@ patch files and Qt Linguist data.
 This package is part of Trinity, and a component of the TDE SDK module.
 
 %files kfile-plugins
+%defattr(-,root,root,-)
 %{tde_tdelibdir}/kfile_cpp.so
 %{tde_tdelibdir}/kfile_cpp.la
 %{tde_tdelibdir}/kfile_diff.so
@@ -519,6 +528,7 @@ Included are:
 This package is part of Trinity, and a component of the TDE SDK module.
 
 %files misc
+%defattr(-,root,root,-)
 %{tde_tdeincludedir}/kprofilemethod.h
 %{tde_tdelibdir}/kabcformat_kdeaccounts.la
 %{tde_tdelibdir}/kabcformat_kdeaccounts.so
@@ -561,6 +571,7 @@ In addition to these scripts, this package provides:
 This package is part of Trinity, and a component of the TDE SDK module.
 
 %files scripts
+%defattr(-,root,root,-)
 %{tde_bindir}/adddebug
 %{tde_bindir}/build-progress.sh
 %{tde_bindir}/cheatmake
@@ -651,6 +662,7 @@ KMtrace is a TDE tool to assist with malloc debugging using glibc's
 This package is part of Trinity, and a component of the TDE SDK module.
 
 %files -n trinity-kmtrace
+%defattr(-,root,root,-)
 %{tde_bindir}/demangle
 %{tde_bindir}/kminspector
 %{tde_bindir}/kmmatch
@@ -675,6 +687,7 @@ file and/or blend a diff file back into the original documents.
 This package is part of Trinity, and a component of the TDE SDK module.
 
 %files -n trinity-kompare
+%defattr(-,root,root,-)
 %{tde_bindir}/kompare
 %{tde_libdir}/libkompareinterface.la
 %{tde_libdir}/libkompareinterface.so
@@ -730,6 +743,7 @@ loaded dynamically using KLibLoader.
 This package is part of Trinity, and a component of the TDE SDK module.
 
 %files -n trinity-kspy
+%defattr(-,root,root,-)
 %{tde_tdeincludedir}/kspy.h
 %{tde_libdir}/libkspy.la
 %{tde_libdir}/libkspy.so
@@ -757,6 +771,7 @@ The Qt Designer itself is in the package qt3-designer.
 This package is part of Trinity, and a component of the TDE SDK module.
 
 %files -n trinity-kuiviewer
+%defattr(-,root,root,-)
 %{tde_bindir}/kuiviewer
 %{tde_tdelibdir}/libkuiviewerpart.so
 %{tde_tdelibdir}/libkuiviewerpart.la
@@ -800,6 +815,7 @@ DCOP is the Desktop Communication Protocol used throughout TDE.
 This package is part of Trinity, and a component of the TDE SDK module.
 
 %files -n trinity-libcvsservice0
+%defattr(-,root,root,-)
 %{tde_bindir}/cvsaskpass
 %{tde_bindir}/cvsservice
 %{tde_libdir}/libcvsservice.so.*
@@ -836,6 +852,7 @@ Development files for libcvsservice are included in this package.
 This package is part of Trinity, and a component of the TDE SDK module.
 
 %files -n trinity-libcvsservice-devel
+%defattr(-,root,root,-)
 %{tde_tdeincludedir}/cvsjob_stub.h
 %{tde_tdeincludedir}/cvsservice_stub.h
 %{tde_tdeincludedir}/repository_stub.h
@@ -867,6 +884,7 @@ manipulating DocBook XML files, PO-files and PO-template files.
 This package is part of Trinity, and a component of the TDE SDK module.
 
 %files -n trinity-poxml
+%defattr(-,root,root,-)
 %{tde_bindir}/po2xml
 %{tde_bindir}/split2po
 %{tde_bindir}/swappo
@@ -892,6 +910,7 @@ diagrams and deployment diagrams.
 This package is part of Trinity, and a component of the TDE SDK module.
 
 %files -n trinity-umbrello
+%defattr(-,root,root,-)
 %{tde_bindir}/umbodoc
 %{tde_bindir}/umbrello
 %{tde_tdeappdir}/umbrello.desktop
@@ -939,6 +958,7 @@ filesystem, using URLs like svn://hostname/path, or svn+ssh://, etc.
 This package is part of Trinity, and a component of the TDE SDK module.
 
 %files tdeio-plugins
+%defattr(-,root,root,-)
 %{tde_bindir}/kio_svn_helper
 %{tde_tdelibdir}/kded_ksvnd.la
 %{tde_tdelibdir}/kded_ksvnd.so
@@ -1022,6 +1042,7 @@ libraries to create your own testing application.
 This package is part of Trinity, and a component of the TDE SDK module.
 
 %files -n trinity-kunittest
+%defattr(-,root,root,-)
 %{tde_bindir}/kunittest
 %{tde_bindir}/kunittest_debughelper
 %{tde_bindir}/kunittestmod
@@ -1053,6 +1074,7 @@ Provides:	trinity-kdesdk-devel = %{version}-%{release}
 %{summary}.
 
 %files devel
+%defattr(-,root,root,-)
 
 ##########