[xfce4-mailwatch-plugin] Make it build with new GnuTLS

[Tomáš Mráz]

commit 123aa985f0eca6dce123dc37707ab182e320ac19
Author: Tomas Mraz <tmraz at fedoraproject.org>
Date:   Thu Mar 7 14:21:00 2013 +0100

    Make it build with new GnuTLS

 xfce4-mailwatch-plugin-1.1.0-gnutls3.patch |   12 ++++++++++++
 xfce4-mailwatch-plugin.spec                |    8 +++++---
 2 files changed, 17 insertions(+), 3 deletions(-)
---
diff --git a/xfce4-mailwatch-plugin-1.1.0-gnutls3.patch b/xfce4-mailwatch-plugin-1.1.0-gnutls3.patch
new file mode 100644
index 0000000..52378ac
--- /dev/null
+++ b/xfce4-mailwatch-plugin-1.1.0-gnutls3.patch
@@ -0,0 +1,12 @@
+diff -up xfce4-mailwatch-plugin-1.1.0/libmailwatch-core/mailwatch-net-conn.c.gnutls3 xfce4-mailwatch-plugin-1.1.0/libmailwatch-core/mailwatch-net-conn.c
+--- xfce4-mailwatch-plugin-1.1.0/libmailwatch-core/mailwatch-net-conn.c.gnutls3	2008-08-30 10:57:36.000000000 +0200
++++ xfce4-mailwatch-plugin-1.1.0/libmailwatch-core/mailwatch-net-conn.c	2013-03-07 14:18:14.468831585 +0100
+@@ -621,8 +621,6 @@ xfce_mailwatch_net_conn_make_secure(Xfce
+                            net_conn->gt_creds);
+     gnutls_transport_set_ptr(net_conn->gt_session,
+                              (gnutls_transport_ptr_t)net_conn->fd);
+-    if(fcntl(net_conn->fd, F_GETFL) & O_NONBLOCK)
+-        gnutls_transport_set_lowat(net_conn->gt_session, 0);
+     
+     if(!xfce_mailwatch_net_conn_tls_handshake(net_conn, error)) {
+ #if 0
diff --git a/xfce4-mailwatch-plugin.spec b/xfce4-mailwatch-plugin.spec
index 06172e8..01cfc1e 100644
--- a/xfce4-mailwatch-plugin.spec
+++ b/xfce4-mailwatch-plugin.spec
@@ -18,10 +18,11 @@ Patch1:         xfce4-mailwatch-plugin-1.1.0-underlink.patch
 # fixed with mbox-refresh-interval.patch by Yves-Alexis Perez from
 # https://bugzilla.xfce.org/show_bug.cgi?id=6947
 Patch2:         xfce4-mailwatch-plugin-1.1.0-mbox-refresh-interval.patch
+Patch3:         xfce4-mailwatch-plugin-1.1.0-gnutls3.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  xfce4-panel-devel >= 4.3.20, libxfcegui4-devel >= 4.2, libxml2-devel
-BuildRequires:  gettext, libtool, xfce4-dev-tools
+BuildRequires:  gettext-devel, intltool, libtool, xfce4-dev-tools
 BuildRequires:  libXt-devel
 # only enable TLS support if a recent version of gnutls is available
 %if 0%{?fedora} > 4
@@ -39,6 +40,7 @@ local mailboxes in Mbox, Maildir and MH-Maildir format as well as Gmail.
 %patch0 -p1 -b .dsofix
 %patch1 -p1 -b .underlink
 %patch2 -p1 -b .mbox-refresh
+%patch3 -p1 -b .gnutls3
 # Fix icon in 'Add new panel item' dialog
 sed -i 's|Icon=xfce-mail|Icon=mail-unread|g' panel-plugin/mailwatch.desktop.in.in
 
@@ -88,8 +90,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/xfce4/doc/C/images/mailwatch-*.png
 
 %changelog
-* Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+* Thu Mar  7 2013 Tomáš Mráz <tmraz at redhat.com> - 1.1.0-15
+- Make it build with new GnuTLS
 
 * Sun Jul 22 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild