RHEL/Fedora: updates main components

3 files changed, 52 insertions, 3 deletions

diff --git a/redhat/kdepim/kdepim-3.5.13-fix_check_mail.patch b/redhat/kdepim/kdepim-3.5.13-fix_check_mail.patch
new file mode 100644
index 000000000..b5558cd19
--- /dev/null
+++ b/redhat/kdepim/kdepim-3.5.13-fix_check_mail.patch
@@ -0,0 +1,21 @@
+commit 2d5f15c865de75f3147bd849ef81d3ed034f8104
+Author: Darrell Anderson <humanreadable@yahoo.com>
+Date:   1335654338 -0500
+
+    Reverse patch from GIT hash 33e649c9.
+    This resolves bug report 406.
+    Thanks to Slavek Banko.
+
+diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp
+index 227f48c..cb9db70 100644
+--- a/kmail/kmcomposewin.cpp
++++ b/kmail/kmcomposewin.cpp
+@@ -4351,8 +4351,6 @@ void KMComposeWin::slotContinueDoSend( bool sentOk )
+       }
+       (*it)->cleanupHeader();
+       sentOk = kmkernel->msgSender()->send((*it), mSendMethod);
+-      if (sentOk)
+-          kmkernel->acctMgr()->checkMail(true);
+     }
+ 
+     if (!sentOk)
diff --git a/redhat/kdepim/kdepim-3.5.13-fix_composer_crash.patch b/redhat/kdepim/kdepim-3.5.13-fix_composer_crash.patch
new file mode 100644
index 000000000..4ee139a44
--- /dev/null
+++ b/redhat/kdepim/kdepim-3.5.13-fix_composer_crash.patch
@@ -0,0 +1,20 @@
+commit 84f29704e3fadcf1afb22da208e1dbb87feb7718
+Author: Serghei Amelian <serghei.amelian@gmail.com>
+Date:   1333065429 +0300
+
+    [kmail] fixed composer crash
+
+diff --git a/kmail/mailcomposerIface.h b/kmail/mailcomposerIface.h
+index 2858657..4cba7f3 100644
+--- a/kmail/mailcomposerIface.h
++++ b/kmail/mailcomposerIface.h
+@@ -13,6 +13,9 @@
+ class MailComposerIface : virtual public DCOPObject
+ {
+     K_DCOP
++
++    public: MailComposerIface() : DCOPObject("MailComposerIface") {}
++
+   k_dcop:
+     /**
+       Send message.      
diff --git a/redhat/kdepim/trinity-kdepim-3.5.13.spec b/redhat/kdepim/trinity-kdepim-3.5.13.spec
index 3cbfc506a..0f93717a4 100644
--- a/redhat/kdepim/trinity-kdepim-3.5.13.spec
+++ b/redhat/kdepim/trinity-kdepim-3.5.13.spec
@@ -7,7 +7,7 @@
 # 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
@@ -40,6 +40,11 @@ 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
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -87,6 +92,8 @@ Development files for %{name}.
 %prep
 %setup -q -n kdepim
 %patch1 -p1 -b .gcc47
+%patch2 -p1
+%patch3 -p1
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -122,8 +129,7 @@ cd build
   -DBUILD_ALL=ON \
   ..
 
-# Do not use %{?_smp_mflags} !
-%__make 
+%__make  %{?_smp_mflags}
 
 %install
 export PATH="%{_bindir}:${PATH}"
@@ -172,6 +178,8 @@ export PATH="%{_bindir}:${PATH}"
 %changelog
 * 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]
+- Fix kmail composer crash [Bug #953]
 
 * Sun Nov 27 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
 - Add missing files '*.la'