RHEL/Fedora: various updates

26 files changed, 896 insertions, 135 deletions

diff --git a/redhat/applications/kde-systemsettings/trinity-kde-systemsettings.spec b/redhat/applications/kde-systemsettings/trinity-kde-systemsettings.spec
index bbe54c7e9..710619b6a 100644
--- a/redhat/applications/kde-systemsettings/trinity-kde-systemsettings.spec
+++ b/redhat/applications/kde-systemsettings/trinity-kde-systemsettings.spec
@@ -1,13 +1,11 @@
 # Default version for this component
 %define kdecomp kde-systemsettings
-%define version 0.0svn20070312
-%define release 2
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_prefix}/share/doc
-%define _sysconfdir %{_prefix}/etc
+%define _docdir %{_datadir}/doc
+#define _sysconfdir %{_prefix}/etc
 %endif
 
 # TDE 3.5.13 specific building variables
@@ -19,8 +17,8 @@ BuildRequires: autoconf automake libtool m4
 
 Name:		trinity-systemsettings
 Summary:	easy to use control centre for TDE
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	0.0svn20070312
+Release:	2%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -40,6 +38,7 @@ BuildRequires: trinity-kdelibs-devel
 BuildRequires: trinity-kdebase-devel
 BuildRequires: desktop-file-utils
 
+Requires:	trinity-kde-guidance
 
 %description
 System preferences is a replacement for the TDE
@@ -47,7 +46,6 @@ Control Centre with an improved user interface.
 
 
 %prep
-unset QTDIR; . /etc/profile.d/qt.sh
 %setup -q -n applications/%{kdecomp}
 
 # Ugly hack to modify TQT include directory inside autoconf files.
@@ -62,6 +60,7 @@ unset QTDIR; . /etc/profile.d/qt.sh
 
 
 %build
+unset QTDIR; . /etc/profile.d/qt.sh
 export PATH="%{_bindir}:${PATH}"
 export LDFLAGS="-L%{_libdir} -I%{_includedir}"
 
diff --git a/redhat/components-3.5.13.txt b/redhat/components-3.5.13.txt
index 3d53c4c6a..01784acdb 100644
--- a/redhat/components-3.5.13.txt
+++ b/redhat/components-3.5.13.txt
@@ -52,6 +52,7 @@ applications/kbarcode
 applications/kbfx
 applications/kbookreader
 applications/kchmviewer
+applications/kcmautostart
 applications/kcpuload
 applications/kdbusnotification
 applications/kde-guidance
@@ -103,6 +104,7 @@ applications/kvirc
 applications/kwin-style-crystal
 applications/piklab
 applications/potracegui
+applications/qt4-tqt-theme-engine
 applications/rosegarden
 applications/smartcardauth
 applications/smb4k
diff --git a/redhat/extras/k3b-i18n/k3b-i18n-trinity.patch b/redhat/extras/k3b-i18n/k3b-i18n-trinity.patch
index 0b85e98cf..dccbfa1ae 100644
--- a/redhat/extras/k3b-i18n/k3b-i18n-trinity.patch
+++ b/redhat/extras/k3b-i18n/k3b-i18n-trinity.patch
@@ -1,81 +1,11 @@
---- k3b-i18n-1.0.5/acinclude.m4.ORI	2011-10-30 11:45:36.484658442 +0100
-+++ k3b-i18n-1.0.5/acinclude.m4	2011-10-30 11:53:00.134646577 +0100
-@@ -479,14 +479,14 @@
-     if test "$kde_qtver" = "2"; then
-       kde_moduledir='\${libdir}/kde2'
-     else
--      kde_moduledir='\${libdir}/kde3'
-+      kde_moduledir='\${libdir}/trinity'
-     fi
-   fi
-   if test -z "$kde_styledir"; then
--    kde_styledir='\${libdir}/kde3/plugins/styles'
-+    kde_styledir='\${libdir}/trinity/plugins/styles'
-   fi
-   if test -z "$kde_widgetdir"; then
--    kde_widgetdir='\${libdir}/kde3/plugins/designer'
-+    kde_widgetdir='\${libdir}/trinity/plugins/designer'
-   fi
-   if test -z "$xdg_appsdir"; then
-     xdg_appsdir='\${datadir}/applications/kde'
-@@ -546,7 +546,7 @@
- 
- AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
- [
--    kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
-+    kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/trinity/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
-     test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
-     if test -n "$KDEDIRS"; then
-        kde_save_IFS=$IFS
-@@ -612,7 +612,7 @@
-         KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
- 
-         if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
-- 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
-+ 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/trinity/share /opt/kde3/share /opt/kde/share $prefix/share"
-             test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
-             AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
- 	    if test "$KDE_XSL_STYLESHEET" = "NO"; then
-@@ -1817,7 +1817,7 @@
- 
- if test -z "$1"; then
- 
--kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
-+kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/trinity/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
- test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
- kde_incdirs="$ac_kde_includes $kde_incdirs"
- AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
-@@ -1829,7 +1829,7 @@
- So, check this please and use another prefix!])
- fi
- 
--kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
-+kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/trinity/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
- test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
- kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
- AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
-@@ -1837,7 +1837,7 @@
- 
- kde_widgetdir=NO
- dnl this might be somewhere else
--AC_FIND_FILE("kde3/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
-+AC_FIND_FILE("trinity/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
- 
- if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then
- AC_MSG_ERROR([
-@@ -1845,7 +1845,7 @@
- So, check this please and use another prefix!])
- fi
- 
--if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
-+if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then
- AC_MSG_ERROR([
- I can't find the designer plugins. These are required and should have been installed
- by kdelibs])
-@@ -1852,7 +1852,7 @@
- fi
-
- if test -n "$kde_widgetdir"; then
--    kde_widgetdir="$kde_widgetdir/kde3/plugins/designer"
-+    kde_widgetdir="$kde_widgetdir/trinity/plugins/designer"
- fi
+--- k3b-i18n-1.0.5/admin/cvs.sh.ORI	2012-05-09 19:45:56.106421990 +0200
++++ k3b-i18n-1.0.5/admin/cvs.sh	2012-05-09 19:46:16.264708192 +0200
+@@ -68,7 +68,7 @@
+     echo "*** KDE requires automake $required_automake_version"
+     exit 1
+     ;;
+-  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*)
++  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[0-9]*)
+     echo "*** $AUTOMAKE_STRING found."
+     UNSERMAKE=no
+     ;;
diff --git a/redhat/genrpm.sh b/redhat/genrpm.sh
index 45cffeee6..d80e8da36 100755
--- a/redhat/genrpm.sh
+++ b/redhat/genrpm.sh
@@ -1,11 +1,13 @@
 #!/bin/bash
 
 cd "$( dirname "$0" )"
+ARGS=""
 
 while [ $# -gt 0 ]; do
 	case "$1" in
-		"--auto") AUTO=1;;
-		"--version") REQVERSION="$2"; shift;;
+		"--auto"|"-a") AUTO=1;;
+		"--version"|"-v") REQVERSION="$2"; shift;;
+		"--"*) ARGS="${ARGS} $1";;
 		*) COMP="${1%%/}";;
 	esac
 	shift
@@ -110,6 +112,7 @@ LOGFILE=/tmp/log.${COMP##*/}
 set -x
 (
 rpmbuild -ba \
+	${ARGS} \
 	--define "_sourcedir ${PWD}/${COMP}" \
 	--define "_prefix ${PREFIX:-/opt/trinity}" \
 	--define "version ${VERSION:-3.5.13}" \
diff --git a/redhat/kdebase/kdebase-3.5.13-add_drag_drop_to_kate_file_list.patch b/redhat/kdebase/kdebase-3.5.13-add_drag_drop_to_kate_file_list.patch
new file mode 100644
index 000000000..35f271e15
--- /dev/null
+++ b/redhat/kdebase/kdebase-3.5.13-add_drag_drop_to_kate_file_list.patch
@@ -0,0 +1,33 @@
+commit b0fa10df6cf9ba377d6bfdef719efc8ca4fe57a0
+Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Date:   1337062555 -0500
+
+    Add drag and drop to kate file list in manual mode
+
+diff --git a/kate/app/katefilelist.cpp b/kate/app/katefilelist.cpp
+index bc5b0a1..bd2d087 100644
+--- a/kate/app/katefilelist.cpp
++++ b/kate/app/katefilelist.cpp
+@@ -102,7 +102,7 @@ KateFileList::KateFileList (KateMainWindow *main,
+   addColumn("Document Name");
+ 
+   setSelectionMode( TQListView::Single );
+-  setSorting( 0, true );
++  setSortType(KateFileList::sortByID);
+   setShowToolTips( false );
+ 
+   setupActions ();
+@@ -408,9 +408,13 @@ void KateFileList::setSortType (int s)
+   m_sort = s;
+   if (m_sort == KateFileList::sortManual) {
+     setSorting( -1, true );
++    setDragEnabled(true);
++    setAcceptDrops(true);
+   }
+   else {
+     setSorting( 0, true );
++    setDragEnabled(false);
++    setAcceptDrops(false);
+     updateSort ();
+   }
+ }
diff --git a/redhat/kdebase/kdebase-3.5.13-add_reorder_documents_in_kate.patch b/redhat/kdebase/kdebase-3.5.13-add_reorder_documents_in_kate.patch
new file mode 100644
index 000000000..5518f13a9
--- /dev/null
+++ b/redhat/kdebase/kdebase-3.5.13-add_reorder_documents_in_kate.patch
@@ -0,0 +1,167 @@
+commit 46a657f7108284d4f02107d11fa407cbf95b86b9
+Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Date:   1337058308 -0500
+
+    Add the ability to reorder documents in kate
+
+diff --git a/kate/app/katefilelist.cpp b/kate/app/katefilelist.cpp
+index 8d34c38..bc5b0a1 100644
+--- a/kate/app/katefilelist.cpp
++++ b/kate/app/katefilelist.cpp
+@@ -138,8 +138,14 @@ void KateFileList::setupActions ()
+   windowPrev = KStdAction::forward(TQT_TQOBJECT(this), TQT_SLOT(slotNextDocument()), m_main->actionCollection());
+   sortAction = new KSelectAction( i18n("Sort &By"), 0,
+       m_main->actionCollection(), "filelist_sortby"  );
++  listMoveFileUp = new KAction( i18n("Move File Up"), 0, m_main->actionCollection(), "filelist_move_up" );
++  listMoveFileUp->setShortcut(KShortcut(CTRL + SHIFT + Key_Comma));
++  listMoveFileDown = new KAction( i18n("Move File Down"), 0, m_main->actionCollection(), "filelist_move_down" );
++  listMoveFileDown->setShortcut(KShortcut(CTRL + SHIFT + Key_Period));
++  connect( listMoveFileUp, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(moveFileUp()) );
++  connect( listMoveFileDown, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(moveFileDown()) );
+   TQStringList l;
+-  l << i18n("Opening Order") << i18n("Document Name") << i18n("URL");
++  l << i18n("Opening Order") << i18n("Document Name") << i18n("URL") << i18n("Manual Placement");
+   sortAction->setItems( l );
+   connect( sortAction, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(setSortType(int)) );
+ }
+@@ -353,10 +359,25 @@ void KateFileList::slotMenu ( TQListViewItem *item, const TQPoint &p, int /*col*
+   if (!item)
+     return;
+ 
++  m_clickedMenuItem = item;
++  if (m_clickedMenuItem->itemAbove()) {
++    listMoveFileUp->setEnabled(true);
++  }
++  else {
++    listMoveFileUp->setEnabled(false);
++  }
++  if (m_clickedMenuItem->itemBelow()) {
++    listMoveFileDown->setEnabled(true);
++  }
++  else {
++    listMoveFileDown->setEnabled(false);
++  }
++
+   TQPopupMenu *menu = (TQPopupMenu*) ((viewManager->mainWindow())->factory()->container("filelist_popup", viewManager->mainWindow()));
+ 
+-  if (menu)
++  if (menu) {
+     menu->exec(p);
++  }
+ }
+ 
+ TQString KateFileList::tooltip( TQListViewItem *item, int )
+@@ -385,7 +406,45 @@ TQString KateFileList::tooltip( TQListViewItem *item, int )
+ void KateFileList::setSortType (int s)
+ {
+   m_sort = s;
+-  updateSort ();
++  if (m_sort == KateFileList::sortManual) {
++    setSorting( -1, true );
++  }
++  else {
++    setSorting( 0, true );
++    updateSort ();
++  }
++}
++
++void KateFileList::moveFileUp()
++{
++  if (m_clickedMenuItem) {
++    sortAction->setCurrentItem(KateFileList::sortManual);
++    setSortType(KateFileList::sortManual);
++    TQListViewItem* nitemabove = m_clickedMenuItem->itemAbove();
++    if (nitemabove) {
++      nitemabove = nitemabove->itemAbove();
++      if (nitemabove) {
++        m_clickedMenuItem->moveItem(nitemabove);
++      }
++      else {
++        // Qt made this hard
++        nitemabove = m_clickedMenuItem->itemAbove();
++        nitemabove->moveItem(m_clickedMenuItem);
++      }
++    }
++  }
++}
++
++void KateFileList::moveFileDown()
++{
++  if (m_clickedMenuItem) {
++    sortAction->setCurrentItem(KateFileList::sortManual);
++    setSortType(KateFileList::sortManual);
++    TQListViewItem* nitemabove = m_clickedMenuItem->itemBelow();
++    if (nitemabove) {
++      m_clickedMenuItem->moveItem(nitemabove);
++    }
++  }
+ }
+ 
+ void KateFileList::updateSort ()
+@@ -441,6 +500,11 @@ KateFileListItem::KateFileListItem( TQListView* lv,
+     m_edithistpos( 0 ),
+     m_docNumber( _doc->documentNumber() )
+ {
++  // Move this document to the end of the list where it belongs
++  TQListViewItem* lastitem = lv->lastItem();
++  if (lastitem) {
++    moveItem(lastitem);
++  }
+ }
+ 
+ KateFileListItem::~KateFileListItem()
+diff --git a/kate/app/katefilelist.h b/kate/app/katefilelist.h
+index 176898c..e3504cb 100644
+--- a/kate/app/katefilelist.h
++++ b/kate/app/katefilelist.h
+@@ -90,7 +90,8 @@ class KateFileList : public KListView
+     enum sorting {
+       sortByID = 0,
+       sortByName = 1,
+-      sortByURL = 2
++      sortByURL = 2,
++      sortManual = 3
+     };
+ 
+     TQString tooltip( TQListViewItem *item, int );
+@@ -111,6 +112,8 @@ class KateFileList : public KListView
+ 
+   public slots:
+     void setSortType (int s);
++    void moveFileUp();
++    void moveFileDown();
+     void slotNextDocument();
+     void slotPrevDocument();
+ 
+@@ -151,6 +154,8 @@ class KateFileList : public KListView
+     KAction* windowNext;
+     KAction* windowPrev;
+     KSelectAction* sortAction;
++    KAction* listMoveFileUp;
++    KAction* listMoveFileDown;
+ 
+     TQPtrList<KateFileListItem> m_viewHistory;
+     TQPtrList<KateFileListItem> m_editHistory;
+@@ -158,6 +163,8 @@ class KateFileList : public KListView
+     TQColor m_viewShade, m_editShade;
+     bool m_enableBgShading;
+ 
++    TQListViewItem *m_clickedMenuItem;
++
+     class ToolTip *m_tooltip;
+ };
+ 
+diff --git a/kate/data/kateui.rc b/kate/data/kateui.rc
+index 27df006..6e784e9 100644
+--- a/kate/data/kateui.rc
++++ b/kate/data/kateui.rc
+@@ -162,6 +162,9 @@
+   <Action name="file_close"/>
+   <Action name="file_close_all"/>
+   <Separator/>
++  <Action name="filelist_move_up"/>
++  <Action name="filelist_move_down"/>
++  <Separator/>
+   <Action name="filelist_sortby"/>
+ </Menu>
+ 
diff --git a/redhat/kdebase/kdebase-3.5.13-add_usbstorage_panel.patch b/redhat/kdebase/kdebase-3.5.13-add_usbstorage_panel.patch
index 8ac303883..b75f1c84f 100644
--- a/redhat/kdebase/kdebase-3.5.13-add_usbstorage_panel.patch
+++ b/redhat/kdebase/kdebase-3.5.13-add_usbstorage_panel.patch
@@ -2,14 +2,8 @@ Index: kdebase/kioslave/media/kcmodule/managermoduleview.ui
 ===================================================================
 --- kdebase/kioslave/media/kcmodule/managermoduleview.ui	(revision 604326)
 +++ kdebase/kioslave/media/kcmodule/managermoduleview.ui	(working copy)
-@@ -8,10 +8,13 @@
-         <rect>
-             <x>0</x>
-             <y>0</y>
--            <width>600</width>
--            <height>480</height>
-+            <width>340</width>
-+            <height>476</height>
+@@ -12,6 +12,9 @@
+             <height>480</height>
          </rect>
      </property>
 +    <property name="caption">
diff --git a/redhat/kdebase/kdebase-3.5.13-disable_keyboard_shortcuts_for_file_location_moving.patch b/redhat/kdebase/kdebase-3.5.13-disable_keyboard_shortcuts_for_file_location_moving.patch
new file mode 100644
index 000000000..b83bef726
--- /dev/null
+++ b/redhat/kdebase/kdebase-3.5.13-disable_keyboard_shortcuts_for_file_location_moving.patch
@@ -0,0 +1,22 @@
+commit 9a948c1af9c07bfdc0eb079cc3cbc84e6bd597c6
+Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Date:   1337062714 -0500
+
+    Disable keyboard shortcuts for file location moving, as they did not work properly and have very little practical use
+
+diff --git a/kate/app/katefilelist.cpp b/kate/app/katefilelist.cpp
+index bd2d087..d2214a4 100644
+--- a/kate/app/katefilelist.cpp
++++ b/kate/app/katefilelist.cpp
+@@ -139,9 +139,9 @@ void KateFileList::setupActions ()
+   sortAction = new KSelectAction( i18n("Sort &By"), 0,
+       m_main->actionCollection(), "filelist_sortby"  );
+   listMoveFileUp = new KAction( i18n("Move File Up"), 0, m_main->actionCollection(), "filelist_move_up" );
+-  listMoveFileUp->setShortcut(KShortcut(CTRL + SHIFT + Key_Comma));
++  //listMoveFileUp->setShortcut(KShortcut(CTRL + SHIFT + Key_Comma));
+   listMoveFileDown = new KAction( i18n("Move File Down"), 0, m_main->actionCollection(), "filelist_move_down" );
+-  listMoveFileDown->setShortcut(KShortcut(CTRL + SHIFT + Key_Period));
++  //listMoveFileDown->setShortcut(KShortcut(CTRL + SHIFT + Key_Period));
+   connect( listMoveFileUp, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(moveFileUp()) );
+   connect( listMoveFileDown, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(moveFileDown()) );
+   TQStringList l;
diff --git a/redhat/kdebase/kdebase-3.5.13-fix_fancy_logout.patch b/redhat/kdebase/kdebase-3.5.13-fix_fancy_logout.patch
new file mode 100644
index 000000000..793334e24
--- /dev/null
+++ b/redhat/kdebase/kdebase-3.5.13-fix_fancy_logout.patch
@@ -0,0 +1,162 @@
+commit d2f8fca98e6d276f442f90dee48164be15d8e287
+Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Date:   1337223371 -0500
+
+    Fix fancy logout not allowing interaction with save dialogs
+    This closes Bug 922
+    Fix desktop wallpaper export failing when triggered by krootbacking or ksmserver and konsole or kdesktop_lock not previously loaded
+
+diff --git a/krootbacking/krootbacking.cpp b/krootbacking/krootbacking.cpp
+index 8e41b50..fe8574a 100644
+--- a/krootbacking/krootbacking.cpp
++++ b/krootbacking/krootbacking.cpp
+@@ -54,6 +54,8 @@ public:
+ KRootBacking::KRootBacking()
+     : TQObject(KApplication::desktop(), "KRootBacking" ), m_Desk(0), m_timeout(0)
+ {
++    enableExports();
++
+     init();
+ }
+ 
+diff --git a/ksmserver/shutdown.cpp b/ksmserver/shutdown.cpp
+index a4ca020..09cb2d7 100644
+--- a/ksmserver/shutdown.cpp
++++ b/ksmserver/shutdown.cpp
+@@ -189,24 +189,6 @@ void KSMServer::shutdownInternal( KApplication::ShutdownConfirm confirm,
+         // shall we save the session on logout?
+         saveSession = ( config->readEntry( "loginMode", "restorePreviousLogout" ) == "restorePreviousLogout" );
+ 
+-        if (showFancyLogout) {
+-            KSMShutdownIPFeedback::showit(); // hide the UGLY logout process from the user
+-            shutdownNotifierIPDlg = KSMShutdownIPDlg::showShutdownIP();
+-            while (!KSMShutdownIPFeedback::ispainted()) {
+-                tqApp->processEvents();
+-            }
+-        }
+-
+-        // synchronize any folders that were requested for shutdown sync
+-        if (shutdownNotifierIPDlg) {
+-            static_cast<KSMShutdownIPDlg*>(shutdownNotifierIPDlg)->setStatusMessage(i18n("Synchronizing remote folders").append("..."));
+-        }
+-        KRsync krs(this, "");
+-        krs.executeLogoutAutoSync();
+-        if (shutdownNotifierIPDlg) {
+-            static_cast<KSMShutdownIPDlg*>(shutdownNotifierIPDlg)->setStatusMessage(i18n("Saving your settings..."));
+-        }
+-
+         if ( saveSession )
+             sessionGroup = TQString("Session: ") + SESSION_PREVIOUS_LOGOUT;
+ 
+@@ -252,9 +234,9 @@ void KSMServer::shutdownInternal( KApplication::ShutdownConfirm confirm,
+             completeShutdownOrCheckpoint();
+     }
+     else {
+-        if (showFancyLogout) {
+-            KSMShutdownIPFeedback::stop();
+-        }
++       if (showFancyLogout) {
++           KSMShutdownIPFeedback::stop();
++       }
+     }
+     dialogActive = false;
+ }
+@@ -502,6 +484,25 @@ void KSMServer::completeShutdownOrCheckpoint()
+     if ( waitForPhase2 )
+         return;
+ 
++    bool showFancyLogout = KConfigGroup(KGlobal::config(), "Logout").readBoolEntry("showFancyLogout", true);
++    if (showFancyLogout) {
++        KSMShutdownIPFeedback::showit(); // hide the UGLY logout process from the user
++        shutdownNotifierIPDlg = KSMShutdownIPDlg::showShutdownIP();
++        while (!KSMShutdownIPFeedback::ispainted()) {
++            tqApp->processEvents();
++        }
++    }
++
++    // synchronize any folders that were requested for shutdown sync
++    if (shutdownNotifierIPDlg) {
++        static_cast<KSMShutdownIPDlg*>(shutdownNotifierIPDlg)->setStatusMessage(i18n("Synchronizing remote folders").append("..."));
++    }
++    KRsync krs(this, "");
++    krs.executeLogoutAutoSync();
++    if (shutdownNotifierIPDlg) {
++        static_cast<KSMShutdownIPDlg*>(shutdownNotifierIPDlg)->setStatusMessage(i18n("Saving your settings..."));
++    }
++
+     if ( saveSession )
+         storeSession();
+     else
+diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp
+index 163352a..35cae65 100644
+--- a/ksmserver/shutdowndlg.cpp
++++ b/ksmserver/shutdowndlg.cpp
+@@ -528,6 +528,11 @@ KSMShutdownIPFeedback::KSMShutdownIPFeedback()
+ : TQWidget( 0L, "systemmodaldialogclass", Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WStyle_StaysOnTop ), m_timeout(0), m_isPainted(false), m_sharedRootPixmap(NULL), mPixmapTimeout(0)
+ 
+ {
++	setShown(false);
++	hide();
++
++	enableExports();
++
+ 	m_sharedRootPixmap = new KRootPixmap(this);
+ 	m_sharedRootPixmap->setCustomPainting(true);
+ 	connect(m_sharedRootPixmap, TQT_SIGNAL(backgroundUpdated(const TQPixmap &)), this, TQT_SLOT(slotSetBackgroundPixmap(const TQPixmap &)));
+@@ -554,15 +559,36 @@ KSMShutdownIPFeedback::KSMShutdownIPFeedback()
+ 	setBackgroundPixmap( m_root );
+ 	setGeometry( TQApplication::desktop()->geometry() );
+ 	setBackgroundMode( TQWidget::NoBackground );
+-
+-	setShown(true);
+ }
+ 
+ void KSMShutdownIPFeedback::showNow()
+ {
++	setShown(true);
++
+ 	TQTimer::singleShot( 0, this, SLOT(slotPaintEffect()) );
+ }
+ 
++void KSMShutdownIPFeedback::enableExports()
++{
++#ifdef Q_WS_X11
++	kdDebug(270) << k_lineinfo << "activating background exports.\n";
++	DCOPClient *client = kapp->dcopClient();
++	if (!client->isAttached()) {
++		client->attach();
++	}
++	TQByteArray data;
++	TQDataStream args( data, IO_WriteOnly );
++	args << 1;
++	
++	TQCString appname( "kdesktop" );
++	int screen_number = DefaultScreen(qt_xdisplay());
++	if ( screen_number )
++	appname.sprintf("kdesktop-screen-%d", screen_number );
++	
++	client->send( appname, "KBackgroundIface", "setExport(int)", data );
++#endif
++}
++
+ KSMShutdownIPFeedback::~KSMShutdownIPFeedback()
+ {
+ 	if (m_sharedRootPixmap) {
+diff --git a/ksmserver/shutdowndlg.h b/ksmserver/shutdowndlg.h
+index db66c55..05ca991 100644
+--- a/ksmserver/shutdowndlg.h
++++ b/ksmserver/shutdowndlg.h
+@@ -97,6 +97,13 @@
+     void slotSetBackgroundPixmap(const TQPixmap &);
+ 
+ private:
++	/**
++	* Asks KDesktop to export the desktop background as a KSharedPixmap.
++	* This method uses DCOP to call KBackgroundIface/setExport(int).
++	*/
++	void enableExports();
++
++private:
+     static KSMShutdownIPFeedback * s_pSelf;
+     KSMShutdownIPFeedback();
+     int m_currentY;
diff --git a/redhat/kdebase/kdebase-3.5.13-fix_khtml_smooth_scrolling.patch b/redhat/kdebase/kdebase-3.5.13-fix_khtml_smooth_scrolling.patch
new file mode 100644
index 000000000..99256971b
--- /dev/null
+++ b/redhat/kdebase/kdebase-3.5.13-fix_khtml_smooth_scrolling.patch
@@ -0,0 +1,38 @@
+commit b45b4bd730da3196a4658773f7eef46e004a39d6
+Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Date:   1337063762 -0500
+
+    Fix KHTML smooth scrolling control center option
+    This closes Bug 1001
+    Thanks to Roman Savochenko for the patch!
+
+diff --git a/kcontrol/konqhtml/htmlopts.cpp b/kcontrol/konqhtml/htmlopts.cpp
+index 0b81421..9e199cb 100644
+--- a/kcontrol/konqhtml/htmlopts.cpp
++++ b/kcontrol/konqhtml/htmlopts.cpp
+@@ -299,7 +299,7 @@ void KMiscHTMLOptions::load( bool useDefaults )
+     KConfig kdeglobals("kdeglobals", true, false);
+     kdeglobals.setReadDefaults( useDefaults );
+ 	 kdeglobals.setGroup("KDE");
+-    bool smoothScrolling = kdeglobals.readBoolEntry("SmoothScroll", DEFAULT_SMOOTHSCROLL);
++    bool smoothScrolling = kdeglobals.readBoolEntry("SmoothScrolling", DEFAULT_SMOOTHSCROLL);
+     if (smoothScrolling)
+ 	m_pSmoothScrollingCombo->setCurrentItem( SmoothScrollingAlways );
+     else
+@@ -374,13 +374,13 @@ void KMiscHTMLOptions::save()
+     switch(m_pSmoothScrollingCombo->currentItem())
+     {
+       case SmoothScrollingAlways:
+-        kdeglobals.writeEntry( "SmoothScroll", true );
++        kdeglobals.writeEntry( "SmoothScrolling", true );
+         break;
+       case SmoothScrollingNever:
+-        kdeglobals.writeEntry( "SmoothScroll", false );
++        kdeglobals.writeEntry( "SmoothScrolling", false );
+         break;
+       // case SmoothScrollingWhenEfficient:
+-        // kdeglobals.writeEntry( "SmoothScroll", somethingelse );
++        // kdeglobals.writeEntry( "SmoothScrolling", somethingelse );
+         // break;
+     }
+     kdeglobals.sync();
diff --git a/redhat/kdebase/trinity-kdebase-3.5.13.spec b/redhat/kdebase/trinity-kdebase-3.5.13.spec
index c70115656..825c5268b 100644
--- a/redhat/kdebase/trinity-kdebase-3.5.13.spec
+++ b/redhat/kdebase/trinity-kdebase-3.5.13.spec
@@ -130,10 +130,22 @@ Patch50:	kdebase-3.5.13-engage_lock_in_near_real_time.patch
 Patch51:	kdebase-3.5.13-engage_lock_in_near_real_time_continued.patch
 ## [kdebase/kdesktop/lock] Fix desktop lock failure due to race condition within signal handler between qt and xcb [Commit #67a3a8f3]
 Patch52:	kdebase-3.5.13-fix_lock_failure.patch
-## [kdebase/kioslave] Temporary fix for a probable race condition on some systems. [Bug #760]
+## [kdebase/kioslave] Temporary fix for a probable race condition on some systems. [Bug #760] [Commit #d41f5217]
 Patch53:	kdebase-3.5.13-fix_race_condition.patch
 ## [kdebase] Adds USB default mount options in control panel [Bug #986]
 Patch54:	kdebase-3.5.13-add_usbstorage_panel.patch
+## [tdebase] Add the ability to reorder documents in kate [Commit #46a657f7]
+Patch55:	kdebase-3.5.13-add_reorder_documents_in_kate.patch
+## [tdebase] Add drag and drop to kate file list in manual mode [Commit #b0fa10df]
+Patch56:	kdebase-3.5.13-add_drag_drop_to_kate_file_list.patch
+## [tdebase] Disable keyboard shortcuts for file location moving, as they did not work properly 
+##  and have very little practical use [Commit #9a948c1a]
+Patch57:	kdebase-3.5.13-disable_keyboard_shortcuts_for_file_location_moving.patch
+## [tdebase] Fix KHTML smooth scrolling control center option [Bug #1001] [Commit #b45b4bd7]
+Patch58:	kdebase-3.5.13-fix_khtml_smooth_scrolling.patch
+## [tdebase] Fix fancy logout not allowing interaction with save dialogs [Bug #922]
+##   Fix desktop wallpaper export failing when triggered by krootbacking or ksmserver and konsole or kdesktop_lock not previously loaded [Commit #d2f8fca9]
+Patch59:	kdebase-3.5.13-fix_fancy_logout.patch
 
 ### FEDORA / RHEL distribution-specific settings ###
 
@@ -192,6 +204,7 @@ BuildRequires:	cmake >= 2.8
 BuildRequires:	tqtinterface-devel
 BuildRequires:	trinity-arts-devel
 BuildRequires:	trinity-kdelibs-devel
+BuildRequires:	gcc-c++ make
 BuildRequires:	qt%{?_qt_suffix}-devel
 BuildRequires:	openssl-devel
 BuildRequires:	avahi-devel avahi-qt3-devel
@@ -220,6 +233,8 @@ BuildRequires:	libXdamage-devel
 BuildRequires:	xorg-x11-font-utils
 BuildRequires:	jack-audio-connection-kit-devel
 BuildRequires:	nas-devel
+BuildRequires:	pcre-devel
+BuildRequires:	perl-Digest-MD5
 
 %if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
 BuildRequires:	libudev-devel
@@ -380,6 +395,11 @@ Protocol handlers (KIOslaves) for personal information management, including:
 %patch52 -p1
 %patch53 -p1
 %patch54 -p1
+%patch55 -p1
+%patch56 -p1
+%patch57 -p1
+%patch58 -p1
+%patch59 -p1
 
 # Applies an optional distro-specific graphical theme
 %if "%{?tde_bg}" != ""
@@ -768,6 +788,14 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %changelog
 * Sat May 05 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-22
 - Adds panel to choose default mounting options for removable storage [Bug #986]
+- Add the ability to reorder documents in kate [Commit #46a657f7]
+- Add drag and drop to kate file list in manual mode [Commit #b0fa10df]
+- Disable keyboard shortcuts for file location moving, as they did not work properly 
+  and have very little practical use [Commit #9a948c1a]
+- Fix KHTML smooth scrolling control center option [Bug #1001] [Commit #b45b4bd7]
+- Fix fancy logout not allowing interaction with save dialogs [Bug #922]
+  Fix desktop wallpaper export failing when triggered by krootbacking or ksmserver and konsole or 
+  kdesktop_lock not previously loaded [Commit #d2f8fca9]
 
 * Mon Apr 30 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-21
 - Commit the rest of 8d521d0b, not merged due to GIT glitch [Commit #49526413]
@@ -777,7 +805,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 - Start minimal dcop system to support twin in tdm [Commit #66a19439]
 - Update lock process to engage the lock in near real time [Commit #8d521d0b]
 - Fix desktop lock failure due to race condition within signal handler between qt and xcb [Commit #67a3a8f3]
-- Temporary fix for a probable race condition on some systems. [Bug #760]
+- Temporary fix for a probable race condition on some systems. [Bug #760] [Commit #d41f5217]
 
 * Tue Apr 24 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-19
 - Build for Fedora 17
diff --git a/redhat/kdemultimedia/kdemultimedia-3.5.13-fix_kmix_autostart.patch b/redhat/kdemultimedia/kdemultimedia-3.5.13-fix_kmix_autostart.patch
new file mode 100644
index 000000000..7b22862d3
--- /dev/null
+++ b/redhat/kdemultimedia/kdemultimedia-3.5.13-fix_kmix_autostart.patch
@@ -0,0 +1,20 @@
+commit 2cc2e3a2f6d1afd47cc076b89215ac41a0d41a92
+Author: Darrell Anderson <humanreadable@yahoo.com>
+Date:   1336512887 -0500
+
+    Fix kmix not autostarting in the user's session.
+    This resolves bug report 503.
+
+diff --git a/kmix/Makefile.am b/kmix/Makefile.am
+index 5051363..d2da702 100644
+--- a/kmix/Makefile.am
++++ b/kmix/Makefile.am
+@@ -49,7 +49,7 @@ xdg_apps_DATA = kmix.desktop
+ rcdir = $(kde_datadir)/kmix
+ rc_DATA = kmixui.rc
+ 
+-autostart_DATA = restore_kmix_volumes.desktop
++autostart_DATA = kmix.desktop restore_kmix_volumes.desktop
+ autostartdir = $(datadir)/autostart
+ 
+ lnkdir = $(kde_datadir)/kicker/applets
diff --git a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec
index a0c5fd3a4..262776d5b 100644
--- a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec
+++ b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec
@@ -25,7 +25,7 @@
 Name:    trinity-kdemultimedia
 Summary: Multimedia applications for the Trinity Desktop Environment (TDE)
 Version: 3.5.13
-Release: 6%{?dist}%{?_variant}
+Release: 7%{?dist}%{?_variant}
 
 License: GPLv2
 Group:   Applications/Multimedia
@@ -53,7 +53,8 @@ Patch10:	kdemultimedia-3.5.13-fix_mmx_detection.patch
 Patch21:	kdemultimedia-3.5.13-remove_more_applications.patch
 # [tdemultimedia] Fix linear alphabet string errors [Commit #fd6afacf]
 Patch22:	kdemultimedia-3.5.13-fix_linear_alphabet.patch
-
+# [tdemultimedia] Fix kmix not autostarting in the user's session. [Bug #503]
+Patch23:	kdemultimedia-3.5.13-fix_kmix_autostart.patch
 
 Requires: %{name}-libs = %{version}-%{release}
 
@@ -135,8 +136,10 @@ Requires: %{name} = %{version}-%{release}
 %patch3 -p1 -b .xdg
 %patch5 -p1 -b .pthread
 %patch10 -p1
-%patch21 -p1
+%patch21 -p1 -b .moreapplications
 %patch22 -p1
+%patch23 -p1 -b .kmixautostart
+
 
 # Ugly hack to modify TQT include directory inside autoconf files.
 # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
@@ -416,6 +419,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %exclude %{_libdir}/libyafxplayer.so
 
 %changelog
+* Wed May 09 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-7
+- Fix kmix not autostarting in the user's session. [Bug #503]
+
 * Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-6
 - Updates BuildRequires
 - Remove "More Applications" from TDE menu. [Commit #31e44a7b]
diff --git a/redhat/kdepim/kdepim-3.5.13-fix_kio_imap4_addquotes.patch b/redhat/kdepim/kdepim-3.5.13-fix_kio_imap4_addquotes.patch
new file mode 100644
index 000000000..debb6ebd5
--- /dev/null
+++ b/redhat/kdepim/kdepim-3.5.13-fix_kio_imap4_addquotes.patch
@@ -0,0 +1,61 @@
+--- kdepim/libkmime/kmime_util.cpp.addquotes	2012-05-28 22:58:31.257167175 +0200
++++ kdepim/libkmime/kmime_util.cpp	2012-05-29 20:02:19.679233274 +0200
+@@ -436,49 +436,26 @@
+ 
+ void removeQuots(TQCString &str)
+ {
+-  bool inQuote=false;
+-
+-  for (int i=0; i < (int)str.length(); i++) {
+-    if (str[i] == '"') {
+-      str.remove(i,1);
+-      i--;
+-      inQuote = !inQuote;
+-    } else {
+-      if (inQuote && (str[i] == '\\'))
+-        str.remove(i,1);
+-    }
+-  }
++  str.replace(TQRegExp("\\\""), "\"");
++  str.replace(TQRegExp("\\\\"), "\\");
+ }
+ 
+ 
+ void removeQuots(TQString &str)
+ {
+-  bool inQuote=false;
+-
+-  for (int i=0; i < (int)str.length(); i++) {
+-    if (str[i] == '"') {
+-      str.remove(i,1);
+-      i--;
+-      inQuote = !inQuote;
+-    } else {
+-      if (inQuote && (str[i] == '\\'))
+-        str.remove(i,1);
+-    }
+-  }
++  str.replace(TQRegExp("\\\""), "\"");
++  str.replace(TQRegExp("\\\\"), "\\");
+ }
+ 
+ 
+ void addQuotes(TQCString &str, bool forceQuotes)
+ {
+   bool needsQuotes=false;
+-  for (unsigned int i=0; i < str.length(); i++) {
+-    if (strchr("()<>@,.;:[]=\\\"",str[i])!=0)
+-      needsQuotes = true;
+-    if (str[i]=='\\' || str[i]=='\"') {
+-      str.insert(i, '\\');
+-      i++;
+-    }
+-  }
++  if ( TQString( str ) .contains( TQRegExp( TQString( "\"|\\\\|=|\\]|\\[|:|;|,|\\.|,|@|<|>|\\)|\\(" ) ) ) )
++    needsQuotes = true;
++
++  str.replace(TQRegExp("\\"), "\\\\");
++  str.replace(TQRegExp("\""), "\\\"");
+ 
+   if (needsQuotes || forceQuotes) {
+     str.insert(0,'\"');
diff --git a/redhat/kdepim/kdepim-3.5.13-fix_kio_imap4_infinite_loop.patch b/redhat/kdepim/kdepim-3.5.13-fix_kio_imap4_infinite_loop.patch
new file mode 100644
index 000000000..90e0a1269
--- /dev/null
+++ b/redhat/kdepim/kdepim-3.5.13-fix_kio_imap4_infinite_loop.patch
@@ -0,0 +1,17 @@
+--- kdepim/kioslaves/imap4/imapparser.cc.ORI	2012-05-27 23:40:50.101207608 +0200
++++ kdepim/kioslaves/imap4/imapparser.cc	2012-05-27 23:43:23.264547024 +0200
+@@ -277,11 +277,11 @@
+   }
+   cmd = sendCommand (new imapCommand ("AUTHENTICATE", firstCommand.latin1()));
+ 
+-  while ( true )
++  int pl = 0;
++  while ( pl != -1 && !cmd->isComplete () )
+   {
+     //read the next line
+-    while (parseLoop() == 0) ;
+-    if ( cmd->isComplete() ) break;
++    while ((pl = parseLoop()) == 0) ;
+ 
+     if (!continuation.isEmpty())
+     {
diff --git a/redhat/kdepim/kdepim-3.5.13-fix_knotes_after_restored.patch b/redhat/kdepim/kdepim-3.5.13-fix_knotes_after_restored.patch
new file mode 100644
index 000000000..25d6ef993
--- /dev/null
+++ b/redhat/kdepim/kdepim-3.5.13-fix_knotes_after_restored.patch
@@ -0,0 +1,21 @@
+commit 533f494f46d65be366aee3e9973b674320e46bc8
+Author: Darrell Anderson <humanreadable@yahoo.com>
+Date:   1336698215 -0500
+
+    Fix knotes not appearing on the desktop when a session is restored.
+    Thanks to Slavek Banko.
+    This resolves bug report 987.
+
+diff --git a/knotes/knote.cpp b/knotes/knote.cpp
+index 182aee8..08c24b8 100644
+--- a/knotes/knote.cpp
++++ b/knotes/knote.cpp
+@@ -765,7 +765,7 @@ void KNote::slotClose()
+     m_editor->clearFocus();
+     m_config->setHideNote( true );
+     m_config->setPosition( pos() );
+-    m_config->writeConfig();
++
+     // just hide the note so it's still available from the dock window
+     hide();
+ }
diff --git a/redhat/kdepim/kdepim-3.5.13-fix_knotes_on_suspend.patch b/redhat/kdepim/kdepim-3.5.13-fix_knotes_on_suspend.patch
new file mode 100644
index 000000000..7de27843b
--- /dev/null
+++ b/redhat/kdepim/kdepim-3.5.13-fix_knotes_on_suspend.patch
@@ -0,0 +1,20 @@
+commit c48253af15badc7a81db7ea2f22465405a897110
+Author: Slávek Banko <slavek.banko@axis.cz>
+Date:   1337752740 +0200
+
+    Fix knotes to not close notes during saving session.
+    This closes Bug 987
+
+diff --git a/knotes/knote.cpp b/knotes/knote.cpp
+index 08c24b8..e68c8ca 100644
+--- a/knotes/knote.cpp
++++ b/knotes/knote.cpp
+@@ -1267,6 +1267,8 @@ void KNote::resizeEvent( TQResizeEvent *qre )
+ 
+ void KNote::closeEvent( TQCloseEvent *event )
+ {
++    if(kapp->sessionSaving())
++        return;
+     event->ignore(); //We don't want to close (and delete the widget). Just hide it
+     slotClose();
+ }
diff --git a/redhat/kdepim/kdepim-3.5.13-fix_linear_alphabet.patch b/redhat/kdepim/kdepim-3.5.13-fix_linear_alphabet.patch
new file mode 100644
index 000000000..610e62306
--- /dev/null
+++ b/redhat/kdepim/kdepim-3.5.13-fix_linear_alphabet.patch
@@ -0,0 +1,71 @@
+commit 80bc593eb31b3162fd870ee64eceb0ec90fac15c
+Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Date:   1327531088 -0600
+
+    Fix linear alphabet string errors
+
+diff --git a/NewsLog.txt b/NewsLog.txt
+index bc32c09..cc5cdc4 100644
+--- a/NewsLog.txt
++++ b/NewsLog.txt
+@@ -1960,7 +1960,7 @@ Bugfixes
+    deleted without ever having been initialised. Also init some other vars ASAP. (700035)
+  - kolab/issue1712 Update revision when adding new attendees.(663228)
+  - kolab/issue1672 Make sure to open the folder when saving a single message as well.(664661)
+- - Fix lack of double-quotes around folder name, making GEQUOTAROOT fail on folders with a space in the
++ - Fix lack of double-quotes around folder name, making GETQUOTAROOT fail on folders with a space in the
+    name.(665276)
+  - Port the ability to add and remove subfolders from korganizer's resource view from proko2. (665274)
+  - kolab/issue1721 Don't exit when the popup menu is canceled.(665679)
+diff --git a/kioslaves/imap4/rfcdecoder.cc b/kioslaves/imap4/rfcdecoder.cc
+index f91e9f8..08b641b 100644
+--- a/kioslaves/imap4/rfcdecoder.cc
++++ b/kioslaves/imap4/rfcdecoder.cc
+@@ -37,7 +37,7 @@
+ // adapted to QT-Toolkit by Sven Carstens <s.carstens@gmx.de> 2000
+ 
+ static unsigned char base64chars[] =
+-  "ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+,";
++  "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+,";
+ #define UNDEFINED 64
+ #define MAXLINE  76
+ 
+diff --git a/libkmime/kmime_util.cpp b/libkmime/kmime_util.cpp
+index d4c8943..03a14e9 100644
+--- a/libkmime/kmime_util.cpp
++++ b/libkmime/kmime_util.cpp
+@@ -337,7 +337,7 @@ TQCString encodeRFC2047String(const TQString &src, const char *charset,
+ 
+ TQCString uniqueString()
+ {
+-  static char chars[] = "0123456789abcdefghijklmnopqrstuvxyzABCDEFGHIJKLMNOPTQRSTUVWXYZ";
++  static char chars[] = "0123456789abcdefghijklmnopqrstuvxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+   time_t now;
+   TQCString ret;
+   char p[11];
+diff --git a/mimelib/dw_cte.cpp b/mimelib/dw_cte.cpp
+index 127a29a..4498597 100644
+--- a/mimelib/dw_cte.cpp
++++ b/mimelib/dw_cte.cpp
+@@ -353,7 +353,7 @@ static int to_cr(const char* srcBuf, size_t srcLen, char* destBuf,
+ }
+ 
+ 
+-static char base64tab[] = "ABCDEFGHIJKLMNOPTQRSTUVWXYZ"
++static char base64tab[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+     "abcdefghijklmnopqrstuvwxyz0123456789+/";
+ 
+ static char base64idx[128] = {
+diff --git a/mimelib/mediatyp.cpp b/mimelib/mediatyp.cpp
+index 87ee345..7c766fe 100644
+--- a/mimelib/mediatyp.cpp
++++ b/mimelib/mediatyp.cpp
+@@ -231,7 +231,7 @@ void DwMediaType::SetBoundary(const DwString& aStr)
+ void DwMediaType::CreateBoundary(unsigned aLevel)
+ {
+     // Create a random printable string and set it as the boundary parameter
+-    static const char c[] = "ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
++    static const char c[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+     const int cLen = 64;
+     char buf[80];
+     strcpy(buf, "Boundary-");
diff --git a/redhat/kdepim/kdepim-3.5.13-fix_segv.patch b/redhat/kdepim/kdepim-3.5.13-fix_segv.patch
new file mode 100644
index 000000000..10b071c46
--- /dev/null
+++ b/redhat/kdepim/kdepim-3.5.13-fix_segv.patch
@@ -0,0 +1,33 @@
+--- kdepim/kioslaves/imap4/imapparser.cc.segv	2012-05-29 20:22:52.187840588 +0200
++++ kdepim/kioslaves/imap4/imapparser.cc	2012-05-29 20:29:30.723545443 +0200
+@@ -1354,10 +1354,10 @@
+         label = parseOneWordC (inWords);
+       }
+ 
+-      if (inWords[0] == ')')
++      if (!inWords.isEmpty () && inWords[0] == ')')
+         inWords.pos++;
+     }
+-    if (inWords[0] == ']')
++    if (!inWords.isEmpty () && inWords[0] == ']')
+       inWords.pos++;
+     skipWS (inWords);
+ 
+@@ -1479,6 +1479,7 @@
+     {
+       TQCString word = parseLiteralC(inWords, false, true);
+ 
++      if(!word.isEmpty()) {
+       switch (word[0])
+       {
+       case 'E':
+@@ -1602,6 +1603,9 @@
+         parseLiteralC(inWords);
+         break;
+       }
++      } else {
++        parseLiteralC(inWords);
++	  }
+     }
+   }
+ 
diff --git a/redhat/kdepim/kdepim-3.5.13-fix_systray_count.patch b/redhat/kdepim/kdepim-3.5.13-fix_systray_count.patch
new file mode 100644
index 000000000..6e5d983fe
--- /dev/null
+++ b/redhat/kdepim/kdepim-3.5.13-fix_systray_count.patch
@@ -0,0 +1,20 @@
+commit 40c435e566bcfddd3fd69b55efec786b1162a8be
+Author: Slávek Banko <slavek.banko@axis.cz>
+Date:   1337997785 +0200
+
+    Fix KMail counting of unread messages in the system tray icon
+    Thanks to Francois Andriot
+
+diff --git a/kmail/kmsystemtray.cpp b/kmail/kmsystemtray.cpp
+index 001453a..d36bd3e 100644
+--- a/kmail/kmsystemtray.cpp
++++ b/kmail/kmsystemtray.cpp
+@@ -493,7 +493,7 @@ void KMSystemTray::updateNewMessages()
+    * our last known version, and adjust mCount with that difference */
+   else
+   {
+-    int diff = unread - it.data();
++    int diff = unread - unread_it.data();
+     mCount += diff;
+   }
+ 
diff --git a/redhat/kdepim/trinity-kdepim-3.5.13.spec b/redhat/kdepim/trinity-kdepim-3.5.13.spec
index 704718664..5a227ca79 100644
--- a/redhat/kdepim/trinity-kdepim-3.5.13.spec
+++ b/redhat/kdepim/trinity-kdepim-3.5.13.spec
@@ -19,7 +19,7 @@ BuildRequires: cmake >= 2.8
 
 Name:		trinity-kdepim
 Version:	3.5.13
-Release:	4%{?dist}%{?_variant}
+Release:	6%{?dist}%{?_variant}
 License:	GPL
 Group:		Applications/Productivity
 
@@ -33,12 +33,23 @@ Source0:	kdepim-%{version}.tar.gz
 
 # [kdepim] Fix compilation with GCC 4.7 [Bug #958]
 Patch1:		kdepim-3.5.13-fix_gcc47_compilation.patch
-
 # [tdepim] Reverse patch from GIT hash 33e649c9. [Bug #406] [Commit #2d5f15c8]
 Patch2:		kdepim-3.5.13-fix_check_mail.patch
-
 # [tdepim] Fix kmail composer crash [Bug #953]
 Patch3:		kdepim-3.5.13-fix_composer_crash.patch
+# [tdepim] Fix KMail counting of unread messages in the system tray icon [Commit #40c435e5]
+Patch4:		kdepim-3.5.13-fix_systray_count.patch
+# [tdepim] Fix knotes not appearing on the desktop when a session is restored. [Bug #987] [Commit #533f494f]
+Patch5:		kdepim-3.5.13-fix_knotes_after_restored.patch
+# [tdepim] Fix knotes to not close notes during saving session. [Bug #987] [Commit #c48253af]
+Patch6:		kdepim-3.5.13-fix_knotes_on_suspend.patch
+# [tdepim] Fix linear alphabet string errors [Bug 635] [Commit #80bc593e]
+Patch7:		kdepim-3.5.13-fix_linear_alphabet.patch
+# [tdepim] Fix infinite loop on IMAP4 authentication failure [Bug #1007]
+Patch8:		kdepim-3.5.13-fix_kio_imap4_infinite_loop.patch
+# [tdepim] Fix infinite loop on kmime_utils addquotes
+Patch9:		kdepim-3.5.13-fix_kio_imap4_addquotes.patch
+Patch10:	kdepim-3.5.13-fix_segv.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -50,7 +61,11 @@ BuildRequires:	libgpg-error-devel
 BuildRequires:	flex
 BuildRequires:	libical-devel
 BuildRequires:	boost-devel
-BuildRequires:	curl-devel
+BuildRequires:	cyrus-sasl-devel
+BuildRequires:	libXcomposite-devel
+BuildRequires:	pcre-devel
+BuildRequires:	glib2-devel
+BuildRequires:	gcc-c++ make
 
 BuildRequires:	libcaldav-devel
 BuildRequires:	libcarddav-devel
@@ -61,10 +76,11 @@ BuildRequires:	gnokii-devel
 
 %if 0%{?fedora} >= 15
 BuildRequires:	flex-static
-%else
-%if 0%{?rhel} <= 5
-BuildRequires:	trinity-libcurl-devel
 %endif
+%if 0%{?rhel} >= 0 && 0%{?rhel} <= 5
+BuildRequires:	trinity-libcurl-devel
+%else
+BuildRequires:	curl-devel
 %endif
 
 Requires:	trinity-kdelibs
@@ -88,6 +104,14 @@ Development files for %{name}.
 %patch1 -p1 -b .gcc47
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1 -b .addquotes
+%patch10 -p1 -b .segv
+
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -133,6 +157,14 @@ export PATH="%{_bindir}:${PATH}"
 %clean
 %__rm -rf %{?buildroot}
 
+%post
+for f in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+
 %files
 %defattr(-,root,root,-)
 %{_bindir}/*
@@ -170,6 +202,13 @@ export PATH="%{_bindir}:${PATH}"
 %{_datadir}/cmake/*.cmake
 
 %changelog
+* Sun May 27 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5
+- Fix KMail counting of unread messages in the system tray icon [Commit #40c435e5]
+- Fix knotes not appearing on the desktop when a session is restored. [Bug #987] [Commit #533f494f]
+- Fix knotes to not close notes during saving session. [Bug #987] [Commit #c48253af]
+- Fix linear alphabet string errors [Bug 635] [Commit #80bc593e]
+- Fix infinite loop on IMAP4 authentication failure [Bug #1007]
+
 * Wed Apr 25 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
 - Fix compilation with GCC 4.7 [Bug #958]
 - Reverse patch from GIT hash 33e649c9. [Bug #406] [Commit #2d5f15c8]
diff --git a/redhat/libraries/pykdeextensions/pykdeextensions-3.5.13-fix_extra_module_dir.patch b/redhat/libraries/pykdeextensions/pykdeextensions-3.5.13-fix_extra_module_dir.patch
new file mode 100644
index 000000000..3b89e2422
--- /dev/null
+++ b/redhat/libraries/pykdeextensions/pykdeextensions-3.5.13-fix_extra_module_dir.patch
@@ -0,0 +1,19 @@
+--- pykdeextensions/src/kdedistutils.py.libtool	2012-05-11 23:45:11.738618661 +0200
++++ pykdeextensions/src/kdedistutils.py	2012-05-11 23:46:11.469447204 +0200
+@@ -712,6 +712,7 @@
+             
+             # Build the 'stub' code.
+             cppcode = self.cpptemplate % {"moduledir": self.data_dir,
++                                            "extramodule": os.getenv("EXTRA_MODULE_DIR"),
+                                             "modulename": modulename,
+                                             "factoryfunction": factoryfunction,
+                                             "python_version": python_version}
+@@ -855,7 +856,7 @@
+ #include <sip.h>
+ 
+ #define MODULE_DIR "%(moduledir)s"
+-#define EXTRA_MODULE_DIR "/opt/trinity/share/python-support/kde-guidance-trinity"
++#define EXTRA_MODULE_DIR "%(extramodule)s"
+ #define EXTRA_MODULE_DIR_TWO "/opt/trinity/share/python-support/guidance-backends-trinity"
+ #define EXTRA_MODULE_DIR_THREE "/opt/trinity/share/python-support/kde-guidance-powermanager-trinity"
+ #define MODULE_NAME "%(modulename)s"
diff --git a/redhat/libraries/pykdeextensions/pykdeextensions-3.5.13-fix_libtool.patch b/redhat/libraries/pykdeextensions/pykdeextensions-3.5.13-fix_libtool.patch
new file mode 100644
index 000000000..44c50bd06
--- /dev/null
+++ b/redhat/libraries/pykdeextensions/pykdeextensions-3.5.13-fix_libtool.patch
@@ -0,0 +1,20 @@
+--- pykdeextensions/src/kdedistutils.py.libtool	2011-08-21 23:01:12.000000000 +0200
++++ pykdeextensions/src/kdedistutils.py	2012-05-11 23:41:07.326232457 +0200
+@@ -790,6 +791,8 @@
+             cmdlist.append(sysconfig.get_config_var("LDSHARED").split()[0])
+             # link_flags
+             cmdlist.append("-module")
++            cmdlist.append("-avoid-version")
++            cmdlist.append("-shared")
+             cmdlist.append("-export-dynamic")
+             # object
+             cmdlist.append(outputfile)
+@@ -1703,6 +1705,8 @@
+             cmdlist.append(sysconfig.get_config_var("LDSHARED").split()[0])
+             # link_flags
+             cmdlist.append("-module")
++            cmdlist.append("-avoid-version")
++            cmdlist.append("-shared")
+             cmdlist.append("-export-dynamic")
+             # object
+             cmdlist.append(outputfile)
diff --git a/redhat/libraries/pykdeextensions/trinity-pykdeextensions.spec b/redhat/libraries/pykdeextensions/trinity-pykdeextensions.spec
index dd0ad0c51..9a6a44d8c 100644
--- a/redhat/libraries/pykdeextensions/trinity-pykdeextensions.spec
+++ b/redhat/libraries/pykdeextensions/trinity-pykdeextensions.spec
@@ -1,12 +1,9 @@
-# Default version for this component
-%define kdecomp pykdeextensions
-%define version 0.4.0
-%define release 1
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_prefix}/share/doc
+%define _docdir %{_datadir}/doc
 %endif
 
 # TDE 3.5.13 specific building variables
@@ -16,10 +13,10 @@ BuildRequires: autoconf automake libtool m4
 %define tde_libdir %{_libdir}/trinity
 
 
-Name:		trinity-%{kdecomp}
+Name:		trinity-pykdeextensions
 Summary:	Python packages to support KDE applications (scripts) [Trinity]
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	0.4.0
+Release:	2%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -31,7 +28,12 @@ URL:		http://www.simonzone.com/software/pykdeextensions
 Prefix:    %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:	%{kdecomp}-3.5.13.tar.gz
+Source0:	pykdeextensions-3.5.13.tar.gz
+
+# [pykdeextensions] Fix KCM modules versioning [Bug #999]
+Patch1:		pykdeextensions-3.5.13-fix_libtool.patch
+# [pykdeextensions] Fix hardcoded path to Guidance python libraries [Bug #999]
+Patch2:		pykdeextensions-3.5.13-fix_extra_module_dir.patch
 
 BuildRequires:	tqtinterface-devel
 BuildRequires:	trinity-kdelibs-devel
@@ -39,8 +41,12 @@ BuildRequires:	trinity-kdebase-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	PyQt-devel
 BuildRequires:	python-trinity-devel
+%if 0%{?rhel} == 5
+BuildRequires:	trinity-PyQt-devel
+%else
+BuildRequires:	PyQt-devel
+%endif
 
 %description
 PyKDE Extensions is a collection of software and Python packages
@@ -71,26 +77,33 @@ This package contains the libpythonize development files.
 
 
 %prep
-%setup -q -n libraries/%{kdecomp}
+%setup -q -n libraries/pykdeextensions
+%patch1 -p1 -b .libtool
+%patch2 -p1 -b .extramodule
 
 # Changes library directory to 'lib64'
 for f in src/*.py; do
   %__sed -i "${f}" \
-    -e "s,%{_prefix}/lib,%{_libdir},g" \
-    -e "s,/usr/lib/pyshared/python2.6,%{python_sitearch},g" \
+    -e "s|%{_prefix}/lib/|%{_libdir}/|g" \
+    -e "s|/usr/lib/pyshared/python2.6|%{python_sitearch}|g" \
     -e "s|'pykde-dir=',None,|'pykde-dir=','%{python_sitearch}',|g" \
     -e "s|self.pykde_dir = None|self.pykde_dir = \"%{python_sitearch}\"|g" \
     -e "s|/usr/include/tqt|%{_includedir}/tqt|g"
 done
 
 %build
+unset QTDIR; . /etc/profile.d/qt.sh
 export PATH="%{_bindir}:${PATH}"
 export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt
 
 ./setup.py build_libpythonize
 
 %install
+unset QTDIR; . /etc/profile.d/qt.sh
 export PATH="%{_bindir}:${PATH}"
+export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt
+
 %__rm -rf %{buildroot}
 ./setup.py install \
 	--root=%{buildroot} \
@@ -104,14 +117,14 @@ for f in \
 	%{buildroot}%{_datadir}/apps/pykdeextensions/app_templates/kcontrol_module/src/KcontrolModuleWidgetUI.py \
 	%{buildroot}%{_datadir}/apps/pykdeextensions/app_templates/kdeutility/src/KDEUtilityDialogUI.py \
 ; do
-	%__sed -i "${f}" -e "s,%{buildroot},,g"
+	%__sed -i "${f}" -e "s|%{buildroot}||g"
 :
 done
 
 # Moves PYTHON libraries to distribution directory
 %__mkdir_p %{buildroot}%{python_sitearch}
 %__mv -f %{buildroot}%{_prefix}/lib/python*/site-packages/* %{buildroot}%{python_sitearch}
-%__rm -rf %{buildroot}%{_prefix}/lib/python2.7/site-packages
+%__rm -rf %{buildroot}%{_prefix}/lib/python*/site-packages
 
 
 %clean
@@ -145,5 +158,9 @@ done
 
 
 %Changelog
+* Fri May 11 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.0svn20080103-2
+- Fix KCM modules versioning [Bug #999]
+- Fix hardcoded path to Guidance python libraries [Bug #999]
+
 * Thu Dec 01 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.0svn20080103-1
 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/libraries/python-trinity/python-trinity-3.5.13-fix_min_sip_version.patch b/redhat/libraries/python-trinity/python-trinity-3.5.13-fix_min_sip_version.patch
new file mode 100644
index 000000000..dd2877616
--- /dev/null
+++ b/redhat/libraries/python-trinity/python-trinity-3.5.13-fix_min_sip_version.patch
@@ -0,0 +1,11 @@
+--- python-trinity/configure.py.ORI	2012-05-12 10:52:21.457246722 +0200
++++ python-trinity/configure.py	2012-05-12 10:52:43.558700741 +0200
+@@ -74,7 +74,7 @@
+ kde_version_extra  = None
+ kde_max_version    = 0x030503
+ 
+-sip_min_v4_version = 0x040900
++sip_min_v4_version = 0x040400
+ qt_min_version     = 0x030200
+ pyqt_min_version   = 0x031000
+ 
diff --git a/redhat/libraries/python-trinity/python-trinity.spec b/redhat/libraries/python-trinity/python-trinity.spec
index 0a1adfc82..0adf450ff 100644
--- a/redhat/libraries/python-trinity/python-trinity.spec
+++ b/redhat/libraries/python-trinity/python-trinity.spec
@@ -1,12 +1,9 @@
-# Default version for this component
-%define kdecomp python-trinity
-%define version 3.16.3
-%define release 2
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_prefix}/share/doc
+%define _docdir %{_datadir}/doc
 %endif
 
 # TDE 3.5.13 specific building variables
@@ -16,10 +13,10 @@ BuildRequires: autoconf automake libtool m4
 %define tde_libdir %{_libdir}/trinity
 
 
-Name:		%{kdecomp}
+Name:		python-trinity
 Summary:	Trinity bindings for Python [Trinity]
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	3.16.3
+Release:	2%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -31,7 +28,7 @@ URL:		http://www.simonzone.com/software/pykdeextensions
 Prefix:    %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:	%{kdecomp}-3.5.13.tar.gz
+Source0:	python-trinity-3.5.13.tar.gz
 
 ## RHEL/Fedora patches
 Patch1:		python-trinity-3.5.13-install_directories.patch
@@ -46,7 +43,14 @@ BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
 BuildRequires:	python
+
+%if 0%{?rhel} == 5
+BuildRequires:	trinity-sip-devel
+BuildRequires:	trinity-PyQt-devel
+%else
+BuildRequires:	sip-devel
 BuildRequires:	PyQt-devel
+%endif
 
 
 %description
@@ -77,7 +81,7 @@ tips and working code you can use to learn from.
 
 
 %prep
-%setup -q -n libraries/%{kdecomp}
+%setup -q -n libraries/python-trinity
 %patch1 -p1
 %patch2 -p1
 
@@ -89,10 +93,13 @@ tips and working code you can use to learn from.
 export PATH="%{_bindir}:${PATH}"
 export LDFLAGS="-L%{_libdir} -I%{_includedir}"
 
+export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt
+
 %__python configure.py \
 	-k %{_prefix} \
 	-L %{_lib} \
 	-v %{_datadir}/sip/trinity
+
 %__make %{_smp_mflags}
 
 %install
@@ -132,6 +139,7 @@ export PATH="%{_bindir}:${PATH}"
 * Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.16.3-2
 - Rebuild for Fedora 17
 - Fix compilation with GCC 4.7
+- Fix compilation for RHEL 5
  
 * Fri Dec 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.16.3-1
 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16