From 161c8d7bd5a43a3124cc216187ddd889a83f9609 Mon Sep 17 00:00:00 2001
From: Andreas Bierfert <andreas.bierfert@lowlatency.de>
Date: Feb 03 2015 09:28:30 +0000
Subject: 3.11.1-4


- workaround for crashes in gtk_cmctree (rhbz#1172963, rhbz#1165158)
- enable tnef plugin on epel
- disable bsfilter plugin on epel

---

diff --git a/claws-mail-fixgtkcmctree.patch b/claws-mail-fixgtkcmctree.patch
new file mode 100644
index 0000000..fbda8ef
--- /dev/null
+++ b/claws-mail-fixgtkcmctree.patch
@@ -0,0 +1,15 @@
+--- a/src/summaryview.c	
++++ a/src/summaryview.c	
+@@ -3531,7 +3531,11 @@ static void msginfo_mark_as_read (SummaryView *summaryview, MsgInfo *msginfo,
+ 	if (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)) {
+ 		summary_msginfo_unset_flags
+ 			(msginfo, MSG_NEW | MSG_UNREAD, 0);
+-		summary_set_row_marks(summaryview, row);
++		if (row == summaryview->selected) {
++			summary_set_row_marks(summaryview, row);
++		} else {
++			log_error(LOG_PROTOCOL, _("Synchronization error: summaryview->selected altered!\n"));
++		}
+ 		summary_status_show(summaryview);
+ 	}
+ }
diff --git a/claws-mail.spec b/claws-mail.spec
index 4c20c4a..84399a5 100644
--- a/claws-mail.spec
+++ b/claws-mail.spec
@@ -2,7 +2,7 @@
 
 Name:           claws-mail
 Version:        3.11.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Email client and news reader based on GTK+
 Group:          Applications/Internet
 License:        GPLv3+
@@ -11,6 +11,9 @@ Source0:        http://downloads.sourceforge.net/sylpheed-claws/%{name}-%{versio
 
 # fix rhbz#1182146 and rhbz#1123895
 Patch0:         claws-mail-3.11.1-segfault.patch
+# workaround for rhbz#1172963 and rhbz#1165158
+# see http://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=3375
+Patch1:         claws-mail-fixgtkcmctree.patch
 # rhbz#1079729
 Patch10:        claws-mail-no-internal-libical.patch
 # rhbz#1179279
@@ -44,9 +47,7 @@ BuildRequires:  curl-devel
 BuildRequires:  libxml2-devel expat-devel
 BuildRequires:  libidn-devel
 BuildRequires:  libarchive-devel
-%if !0%{?rhel}
 BuildRequires:  libytnef-devel
-%endif
 BuildRequires:  ghostscript
 BuildRequires:  poppler-glib-devel
 BuildRequires:  webkitgtk-devel
@@ -142,6 +143,7 @@ Requires:       bogofilter
 %description plugins-bogofilter
 %{summary}
 
+%if !0%{?rhel}
 %package plugins-bsfilter
 Summary:        Bayesian spam filtering for Claws Mail
 Group:          Applications/Internet
@@ -150,6 +152,7 @@ Requires:       bsfilter
 
 %description plugins-bsfilter
 Bayesian spam filtering for Claws Mail using Bsfilter.
+%endif
 
 
 %package plugins-clamd
@@ -338,7 +341,6 @@ Requires:       claws-mail(plugin-api)%{?_isa} = %pluginapi
 This plugin for Claws Mail can report spam mail to various places.
 
 
-%if !0%{?rhel}
 %package plugins-tnef
 Summary:        TNEF message parsing for Claws Mail
 Group:          Applications/Internet
@@ -346,7 +348,6 @@ Requires:       claws-mail(plugin-api)%{?_isa} = %pluginapi
 
 %description plugins-tnef
 This plugin allows reading of application/ms-tnef attachments.
-%endif
 
 
 %package plugins-vcalendar
@@ -365,6 +366,8 @@ exporting of your meetings or all your calendars.
 
 %patch0 -p1 -b.segfault
 
+%patch1 -p1 -b.gtkcmctree
+
 # remove bundled libical
 rm -fr src/plugins/vcalendar/libical
 %patch10 -p1 -b.ical
@@ -413,6 +416,9 @@ EOF
 %build
 %configure --disable-dependency-tracking \
            --disable-rpath \
+%if 0%{?rhel}
+           --disable-bsfilter-plugin \
+%endif
            --enable-appdata
 
 make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
@@ -516,9 +522,11 @@ fi
 %{_libdir}/claws-mail/plugins/bogofilter.so
 #%{_datadir}/appdata/claws-mail-bogofilter.metainfo.xml
 
+%if !0%{?rhel}
 %files plugins-bsfilter
 %{_libdir}/claws-mail/plugins/bsfilter*
 #%{_datadir}/appdata/claws-mail-bsfilter.metainfo.xml
+%endif
 
 %files plugins-clamd
 %{_libdir}/claws-mail/plugins/clamd*
@@ -608,20 +616,22 @@ fi
 %{_libdir}/claws-mail/plugins/spamreport.so
 #%{_datadir}/appdata/claws-mail-spam_report.metainfo.xml
 
-
-%if !0%{?rhel}
 %files plugins-tnef
 %{_libdir}/claws-mail/plugins/tnef*
 #%{_datadir}/appdata/claws-mail-tnef_parse.metainfo.xml
 
-%endif
-
 %files plugins-vcalendar
 %{_libdir}/claws-mail/plugins/vcalendar*
 #%{_datadir}/appdata/claws-mail-vcalendar.metainfo.xml
 
 
 %changelog
+* Tue Feb 03 2015 Andreas Bierfert <andreas.bierfert@lowlatency.de>
+- 3.11.1-4
+- workaround for crashes in gtk_cmctree (rhbz#1172963, rhbz#1165158)
+- enable tnef plugin on epel
+- disable bsfilter plugin on epel
+
 * Thu Jan 15 2015 Andreas Bierfert <andreas.bierfert@lowlatency.de>
 - 3.11.1-3
 - fix segfault in wizard and account prefs (rhbz#1123895, rhbz#1182146)