diff --git a/redhat/extras/trinity-desktop/trinity-desktop-3.5.13.tar.gz b/redhat/extras/trinity-desktop/trinity-desktop-3.5.13.tar.gz
deleted file mode 100644
index e69de29bb..000000000
diff --git a/redhat/extras/trinity-live/trinity-live-3.5.13.tar.gz b/redhat/extras/trinity-live/trinity-live-3.5.13.tar.gz
deleted file mode 100644
index e69de29bb..000000000
diff --git a/redhat/kdeaddons/kdeaddons-3.5.13-sru-20120809.patch.gz b/redhat/kdeaddons/kdeaddons-3.5.13-sru-20120809.patch.gz
new file mode 100644
index 000000000..47b2c4451
Binary files /dev/null and b/redhat/kdeaddons/kdeaddons-3.5.13-sru-20120809.patch.gz differ
diff --git a/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec b/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec
index 6f24499b2..f9c2db0ac 100644
--- a/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec
+++ b/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec
@@ -42,7 +42,7 @@ Source1: metabar-fedora.tar.bz2
Source2: metabarrc
# [tdeaddons] Updates from v3.5.13-sru branch
-Patch0: kdeaddons-3.5.13-sru-20120809.patch
+Patch0: kdeaddons-3.5.13-sru-20120809.patch.gz
BuildRequires: autoconf automake libtool m4
BuildRequires: trinity-arts-devel
diff --git a/redhat/kdebase/kdebase-3.5.13-sru-20120806.patch b/redhat/kdebase/kdebase-3.5.13-sru-20120806.patch
deleted file mode 100644
index b1c1ba2d5..000000000
--- a/redhat/kdebase/kdebase-3.5.13-sru-20120806.patch
+++ /dev/null
@@ -1,36954 +0,0 @@
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/applnk/kde-settings.menu v3.5.13-sru/applnk/kde-settings.menu
---- /tmp/stable//kdebase/applnk/kde-settings.menu 2010-08-12 05:28:24.000000000 +0200
-+++ v3.5.13-sru/applnk/kde-settings.menu 2012-07-31 17:17:50.000000000 +0200
-@@ -46,12 +46,19 @@
-
-
-
-
- PowerControl
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/CMakeLists.txt v3.5.13-sru/CMakeLists.txt
---- /tmp/stable//kdebase/CMakeLists.txt 2011-10-24 02:08:24.000000000 +0200
-+++ v3.5.13-sru/CMakeLists.txt 2012-07-31 17:17:50.000000000 +0200
-@@ -27,6 +27,7 @@
- include( CheckLibraryExists )
- include( CheckFunctionExists )
- include( CheckStructHasMember )
-+include( CheckTypeSize )
-
-
- ##### include our cmake modules #################
-@@ -65,6 +66,9 @@
- option( WITH_XRENDER "Enable xrender support" OFF )
- option( WITH_XDAMAGE "Enable xdamage support" OFF )
- option( WITH_XEXT "Enable xext support" OFF )
-+option( WITH_XTEST "Enable xext support" OFF )
-+option( WITH_XSCREENSAVER "Enable xscreensaver support" OFF )
-+option( WITH_LIBART "Enable libart support (for SVG icons and wallpapers)" OFF )
- option( WITH_LIBUSB "Enable control of some mouse models through libusb" OFF )
- option( WITH_LIBRAW1394 "Enable visualization of ieee1394 devices through libraw1394" OFF )
- option( WITH_SUDO_KDESU_BACKEND "Use sudo as backend for kdesu (default is su)" OFF )
-@@ -149,6 +153,8 @@
- set( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined" )
- set( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined" )
-
-+check_type_size( "long long" LONG_LONG )
-+
-
- ##### kdebase directories #######################
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/config.h.cmake v3.5.13-sru/config.h.cmake
---- /tmp/stable//kdebase/config.h.cmake 2011-10-29 23:02:15.000000000 +0200
-+++ v3.5.13-sru/config.h.cmake 2012-07-31 17:17:50.000000000 +0200
-@@ -1,5 +1,8 @@
- #define VERSION "@VERSION@"
-
-+// Defined if compiler supports long long type.
-+#cmakedefine HAVE_LONG_LONG 1
-+
- // konsole
- #cmakedefine HAVE_PROC_CWD 1
-
-@@ -15,6 +18,15 @@
- // konsole, kdm, kxkb
- #cmakedefine HAVE_XKB 1
-
-+// kxkb
-+#cmakedefine HAVE_XTEST 1
-+
-+// xscreensaver
-+#cmakedefine HAVE_XSCREENSAVER 1
-+
-+// libart
-+#cmakedefine HAVE_LIBART 1
-+
- // kdm, kioslave
- #cmakedefine HAVE_TERMIOS_H 1
-
-@@ -114,6 +126,7 @@
- #cmakedefine HAVE_SYSINFO 1
- #cmakedefine HAVE_STRNLEN 1
- #cmakedefine HAVE_GETIFADDRS 1
-+#cmakedefine HAVE_CRYPT 1
-
- #cmakedefine HAVE_SETUSERCONTEXT 1
- #cmakedefine HAVE_GETUSERSHELL 1
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/ConfigureChecks.cmake v3.5.13-sru/ConfigureChecks.cmake
---- /tmp/stable//kdebase/ConfigureChecks.cmake 2011-09-08 04:06:01.000000000 +0200
-+++ v3.5.13-sru/ConfigureChecks.cmake 2012-07-31 17:17:50.000000000 +0200
-@@ -9,6 +9,8 @@
- #
- #################################################
-
-+tde_setup_architecture_flags( )
-+
- # termios.h (kdm, kioslave)
- if( BUILD_KDM OR BUILD_KIOSLAVES )
- check_include_file( termios.h HAVE_TERMIOS_H )
-@@ -44,6 +46,15 @@
- endif( )
-
-
-+# udev (tsak)
-+if( BUILD_TSAK )
-+ pkg_search_module( UDEV libudev )
-+ if( NOT UDEV_FOUND )
-+ tde_message_fatal( "udev is required, but was not found on your system" )
-+ endif( )
-+endif( )
-+
-+
- # xrender (kdesktop, konsole, kcontrol, kicker, kwin)
- if( WITH_XRENDER OR BUILD_KDESKTOP OR BUILD_KONSOLE OR BUILD_KCONTROL OR BUILD_KICKER )
- pkg_search_module( XRENDER xrender )
-@@ -100,12 +111,45 @@
- # xext (kwin/kompmgr)
- if( WITH_XEXT )
- pkg_search_module( XEXT xext )
-- if( NOT XEXT_FOUND )
-+ if( XEXT_FOUND )
-+ set( HAVE_XEXT 1 )
-+ else( XEXT_FOUND )
- tde_message_fatal( "xext is requested, but was not found on your system" )
- endif( )
- endif( )
-
-
-+# xtest (kxkb)
-+if( WITH_XTEST )
-+ pkg_search_module( XTEST xtst )
-+ if( XTEST_FOUND )
-+ set( HAVE_XTEST 1 )
-+ else( XTEST_FOUND )
-+ tde_message_fatal( "xtest is requested, but was not found on your system" )
-+ endif( )
-+endif( )
-+
-+
-+# xscreensaver ()
-+if( WITH_XSCREENSAVER )
-+ check_library_exists( Xss XScreenSaverQueryInfo "" HAVE_XSSLIB )
-+ if( HAVE_XSSLIB )
-+ pkg_search_module( XSS xscrnsaver )
-+ else( )
-+ check_library_exists( Xext XScreenSaverQueryInfo "" HAVE_XSSLIB )
-+ if( HAVE_XSSLIB )
-+ pkg_search_module( XSS xext )
-+ endif( )
-+ endif( )
-+ check_include_file( X11/extensions/scrnsaver.h HAVE_XSCREENSAVER_H )
-+ if( HAVE_XSSLIB AND HAVE_XSCREENSAVER_H )
-+ set( HAVE_XSCREENSAVER 1 )
-+ else( )
-+ tde_message_fatal( "xscreensaver is requested, but was not found on your system" )
-+ endif( )
-+endif( )
-+
-+
- # GL
- if( BUILD_KDESKTOP OR BUILD_KCONTROL OR BUILD_KSCREENSAVER )
- check_library_exists( GL glXChooseVisual "" HAVE_GLXCHOOSEVISUAL )
-@@ -173,6 +217,16 @@
- set( WITHOUT_ARTS 1 )
- endif( )
-
-+# libart
-+
-+if( WITH_LIBART )
-+ pkg_search_module( LIBART libart-2.0 )
-+ if( NOT LIBART_FOUND )
-+ message(FATAL_ERROR "\nlibart-2.0 support are requested, but not found on your system" )
-+ endif( NOT LIBART_FOUND )
-+ set( HAVE_LIBART 1 )
-+endif( WITH_LIBART )
-+
-
- # required stuff
- find_package( TQt )
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/doc/kcontrol/kcmaccess/index.docbook v3.5.13-sru/doc/kcontrol/kcmaccess/index.docbook
---- /tmp/stable//kdebase/doc/kcontrol/kcmaccess/index.docbook 2010-08-12 05:29:46.000000000 +0200
-+++ v3.5.13-sru/doc/kcontrol/kcmaccess/index.docbook 2012-07-31 17:17:50.000000000 +0200
-@@ -103,8 +103,8 @@
- If this option is enabled, you can press and release the &Shift;,
- &Alt; or &Ctrl; keys, and then press another key to get a key combo
- (example: &Ctrl; &Alt;
--Del could be done with &Ctrl; then &Alt;
--then Del).
-+Delete could be done with &Ctrl; then &Alt;
-+then Delete).
-
-
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/doc/kdm/index.docbook v3.5.13-sru/doc/kdm/index.docbook
---- /tmp/stable//kdebase/doc/kdm/index.docbook 2011-08-21 09:08:15.000000000 +0200
-+++ v3.5.13-sru/doc/kdm/index.docbook 2012-07-31 17:17:50.000000000 +0200
-@@ -18,9 +18,9 @@
- The &kdm; Handbook
-
-
--
--&Oswald.Buddenhagen; &Oswald.Buddenhagen.mail;
--
--
--/sbin/halt. The Restart: command
-+/sbin/halt. The Restart: command
- defaults to
- /sbin/reboot.
-
- When Show boot options is enabled, &kdm;
- will on reboot offer you options for the lilo boot manager. For this
- feature to work, you will need to supply the correct paths to your
--lilo command and to lilo's map file. Note that this
-+lilo command and to lilo's map file. Note that this
- option is not available on all operating systems.
-
-
-@@ -658,7 +712,7 @@
- login window.
-
- You may disable the user list in &kdm; entirely in the
--Show Users section. You can choose from:
-+Show Users section. You can choose from:
-
-
-
-@@ -685,18 +739,18 @@
-
- Independently of the users you specify by name, you can use the
- System UIDs to specify a range of valid
--UIDs that are shown in the list. By default user
-+UIDs that are shown in the list. By default user
- id's under 1000, which are often system or daemon users, and user id's
- over 65000, are not shown.
-
- You can also enable the Sort users
--checkbox, to have the user list sorted alphabetically. If this is
-+checkbox, to have the user list sorted alphabetically. If this is
- disabled, users will appear in the order they are listed in the
--password file. &kdm; will also autocomplete user names if you enable the
-+password file. &kdm; will also autocomplete user names if you enable the
- Autocompletion option.
-
- If you choose to show users, then the login window will show
--images (which you select), of a list of users. When someone is ready
-+images (which you select), of a list of users. When someone is ready
- to login, they may select their user name/image, enter their password,
- and they are granted access.
-
-@@ -704,12 +758,12 @@
- for those images.
-
- You can configure the admin picture here, for each user on the
--system. Depending on the order selected above, users may be able to
-+system. Depending on the order selected above, users may be able to
- override your selection.
-
- If you choose not to show users, then the login window will be
--more traditional. Users will need to type their username and password
--to gain entrance. This is the preferred way if you have many users on
-+more traditional. Users will need to type their username and password
-+to gain entrance. This is the preferred way if you have many users on
- this terminal.
-
-
-@@ -725,13 +779,13 @@
- options. Every option in the Convenience tab is
- well-suited to seriously compromise your system security. Practically,
- these options are only to be used in a completely non-critical
--environment, ⪚ a private computer at home.
-+environment, ⪚ a private computer at home.
-
-
- Automatic Login
-
- Automatic login will give anyone access to a certain account on
--your system without doing any authentication. You can enable it using
-+your system without doing any authentication. You can enable it using
- the option Enable Auto-login.
-
- You can choose the account to be used for automatic login from
-@@ -748,7 +802,7 @@
-
- Below this option you'll see a list of users on the system.
- Enable password-less login for specific users by checking the checkbox
--next to the login names. By default, this feature is disabled for
-+next to the login names. By default, this feature is disabled for
- all users.
-
- Again, this option should only be used in a safe
-@@ -762,7 +816,7 @@
- can choose Previous to have &kdm; default to the
- last successfully logged in user, or you can
- Specify a particular user to always be selected
--from the list. You can also have &kdm; set the focus to the password
-+from the list. You can also have &kdm; set the focus to the password
- field, so that when you reach the &kdm; login screen, you can type the
- password immediately.
-
-@@ -793,7 +847,7 @@
-
- The fundamental thing that controls whether your computer boots to a
- terminal prompt (console mode) or a graphical login prompt is the default
--runlevel. The runlevel is set by the program /sbin/init under the control of the
- configuration file /etc/inittab. The default runlevels
- used by different &UNIX; systems (and different &Linux; distributions) vary,
-@@ -860,7 +914,7 @@
-
-
- If you get a &kdm; login dialog and you are able to log in,
--things are going well. The main thing that can go wrong here is that
-+things are going well. The main thing that can go wrong here is that
- the run-time linker might not find the shared &Qt; or &kde; libraries.
- If you have a binary distribution of the &kde; libraries, make sure
- &kdm; is installed where the libraries believe &kde; is installed and
-@@ -954,7 +1008,7 @@
-
- If this step is unsuccessful the most likely problem is that the
- environment used at boot time differs from the environment that you used for
--testing at the command line. If you are trying to get two versions of &kde;
-+testing at the command line. If you are trying to get two versions of &kde;
- to co-exist, be particularly careful that the settings you use for your
- PATH and LD_LIBRARY_PATH environment variables
- are consistent, and that the startup scripts are not over-riding them in
-@@ -968,7 +1022,7 @@
- Supporting multiple window managers
-
- &kdm; detects most available window manager and desktop environments when
--it is run. Installing a new one should make it automatically available in
-+it is run. Installing a new one should make it automatically available in
- the &kdm; main dialog Session Type:.
-
- If you have a very new window manager, or something that &kdm; does
-@@ -1031,9 +1085,9 @@
- To override a session type, copy the .desktop file from the data dir
- to the config dir and edit it at will. Removing the shipped session types
- can be accomplished by shadowing
them with .desktop files
--containing Hidden=true. For the magic session types no .desktop files exist
-+containing Hidden=true. For the magic session types no .desktop files exist
- by default, but &kdm; pretends they would, so you can override them like any
--other type. I guess you already know how to add a new session type by
-+other type. I guess you already know how to add a new session type by
- now. ;-)
-
-
-@@ -1042,20 +1096,20 @@
- Using &kdm; for Remote Logins (&XDMCP;)
-
- &XDMCP; is the Open Group standard, the X Display Manager
--Control Protocol
. This is used to set up connections between
-+Control Protocol. This is used to set up connections between
- remote systems over the network.
-
- &XDMCP; is useful in multiuser situations where there are users
- with workstations and a more powerful server that can provide the
--resources to run multiple X sessions. For example, &XDMCP; is a good
-+resources to run multiple X sessions. For example, &XDMCP; is a good
- way to reuse old computers - a Pentium or even 486 computer with 16 Mb
- RAM is sufficient to run X itself, and using &XDMCP; such a computer can
--run a full modern &kde; session from a server. For the server part,
-+run a full modern &kde; session from a server. For the server part,
- once a single &kde; (or other environment) session is running, running
- another one requires very few extra resources.
-
- However, allowing another method of login to your machine
--obviously has security implications. You should run this service only
-+obviously has security implications. You should run this service only
- if you need to allow remote X Servers to start login sessions on your
- system. Users with a single &UNIX; computer should not need to run
- this.
-@@ -1079,8 +1133,8 @@
- rw-rw-rw- (0666). This is because some systems don't care
- for the file permission of the socket files.
-
--There are two types of sockets: the global one (dmctl) and the
--per-display ones (dmctl-<display>).
-+There are two types of sockets: the global one (kdmctl) and the
-+per-display ones (kdmctl-<display>).
-
- The global one's subdir is owned by root, the subdirs of the per-display
- ones' are owned by the user currently owning the session (root or the
-@@ -1201,9 +1255,9 @@
- list [all |
- alllocal]
-
--Return a list of running sessions. By default all active sessions are
--listed. if all is specified, passive sessions are
--listed as well. If alllocal is specified, passive
-+Return a list of running sessions. By default all active sessions are
-+listed. if all is specified, passive sessions are
-+listed as well. If alllocal is specified, passive
- sessions are listed as well, but all incoming remote sessions are
- skipped.
- Each session entry is a comma separated tuple of:
-@@ -1272,14 +1326,14 @@
- An OS choice for the next boot may be specified from the list returned
- by listbootoptions
- Shutdowns requested from per-display sockets are executed when the
--current sessino on that display exits. Such a request may pop up a dialog
-+current sessino on that display exits. Such a request may pop up a dialog
- asking for confirmation and/or authentication
- start is the time for which the shutdown is
--scheduled. If it starts with a plus-sign, the current time is added. Zero
-+scheduled. If it starts with a plus-sign, the current time is added. Zero
- means immediately.
- end is the latest time at which the shutdown
--should be performed if active sessions are still running. If it starts with
--a plus-sign, the start time is added. -1 means wait infinitely. If end is
-+should be performed if active sessions are still running. If it starts with
-+a plus-sign, the start time is added. -1 means wait infinitely. If end is
- through and active sessions are still running, &kdm; can do one of the
- following:
-
-@@ -1288,7 +1342,7 @@
- force - shut down
- nonetheless
- forcemy - shut down nonetheless if
--all active sessions belong to the requesting user. Only for per-display sockets.
-+all active sessions belong to the requesting user. Only for per-display sockets.
-
- start and end are
- specified in seconds since the &UNIX; epoch.
-@@ -1297,7 +1351,7 @@
- force and schedule for 0
- -1.
- ask attempts an immediate shutdown and
--interacts with the user if active sessions are still running. Only for
-+interacts with the user if active sessions are still running. Only for
- per-display sockets.
-
-
-@@ -1378,9 +1432,9 @@
-
- Themes
-
--&kdm; has limited support for desktop manager themes. You may enable them
-+&kdm; has limited support for desktop manager themes. You may enable them
- by adding UseTheme=true to kdmrc
--and Theme=/path/to/theme.xml.
-+and Theme=/path/to/theme.xml.
-
- -->
-
-@@ -1405,8 +1459,8 @@
- &kdm; is derived from, and includes code from,
- &xdm; (C) Keith Packard, MIT X Consortium.
-
--&kdm; 0.1 was written by &Matthias.Ettrich;. Later versions till &kde;
--2.0.x were written by &Steffen.Hansen;. Some new features for &kde; 2.1.x and
-+&kdm; 0.1 was written by &Matthias.Ettrich;. Later versions till &kde;
-+2.0.x were written by &Steffen.Hansen;. Some new features for &kde; 2.1.x and
- a major rewrite for &kde; 2.2.x made by &Oswald.Buddenhagen;.
-
- Other parts of the &kdm; code are copyright by the authors, and
-@@ -1428,7 +1482,7 @@
-
- Documentation revised for &kde; 2 by &Neal.Crook; &Neal.Crook.mail;. Last update August 6, 2000
-
--Documentation extended and revised for &kde; 2.2 by &Oswald.Buddenhagen; &Oswald.Buddenhagen.mail;. Last update August,
-+Documentation extended and revised for &kde; 2.2 by &Oswald.Buddenhagen; &Oswald.Buddenhagen.mail;. Last update August,
- 2001
-
-
-@@ -1457,7 +1511,7 @@
-
- entropy
- The entropy of a system is the measure of its
--unpredictability. This is used during the generation of random numbers.
-+unpredictability. This is used during the generation of random numbers.
-
-
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/doc/kdm/tsak.png v3.5.13-sru/doc/kdm/tsak.png
---- /tmp/stable//kdebase/doc/kdm/tsak.png 1970-01-01 01:00:00.000000000 +0100
-+++ v3.5.13-sru/doc/kdm/tsak.png 2012-07-31 17:17:50.000000000 +0200
-@@ -0,0 +1,69 @@
-+PNG
-+
-+
IHDR MX. IDATxu|D.N4V"ݵ@!)Jq(-.Hlw~r9]HI̛wff W%Aq+G
-+2 ҹuUA$Sf]&w?< }Q
*5* MGq6]Q^9A#K S
-+A$+0tBЦ#IMGtA C8=gnS6iA߉Թ
Sz'^ [s٬-SRJ9=VG}EGtTbaqn{yfbK8cYYlݢZOerH
j_(c!؋#k!M)_>nmfD5ئE?_\;oFMu$wз1,K ZgXo*_T|>nrcbn{ԃh.m+Oz͍wV"c&