[claws-mail] 3.7.10-6 fix for new glib2 where only glib.h must be included (#755308)

[Michael Schwendt]

commit 56f92938b4cb5a88a5cee2aea0cde28aef54208d
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Fri Nov 25 03:02:54 2011 +0100

    3.7.10-6
    fix for new glib2 where only glib.h must be included (#755308)

 claws-mail-3.7.10-glib2-include.patch       |   12 ++++++++++++
 claws-mail-3.7.9-startup-notification.patch |   18 ------------------
 claws-mail-3.7.9cvs2.patch                  |   11 -----------
 claws-mail.spec                             |    9 +++++++--
 4 files changed, 19 insertions(+), 31 deletions(-)
---
diff --git a/claws-mail-3.7.10-glib2-include.patch b/claws-mail-3.7.10-glib2-include.patch
new file mode 100644
index 0000000..3993bbc
--- /dev/null
+++ b/claws-mail-3.7.10-glib2-include.patch
@@ -0,0 +1,12 @@
+diff -Nur claws-mail-3.7.10-orig/src/common/defs.h claws-mail-3.7.10/src/common/defs.h
+--- claws-mail-3.7.10-orig/src/common/defs.h	2011-08-27 08:58:14.000000000 +0200
++++ claws-mail-3.7.10/src/common/defs.h	2011-11-25 02:35:21.422280324 +0100
+@@ -24,7 +24,7 @@
+ #  include "config.h"
+ #endif
+ 
+-#include <glibconfig.h>
++#include <glib.h>
+ 
+ #ifdef G_OS_WIN32
+ #  include <glib/gwin32.h>
diff --git a/claws-mail.spec b/claws-mail.spec
index 565bf4b..2c83e96 100644
--- a/claws-mail.spec
+++ b/claws-mail.spec
@@ -2,7 +2,7 @@
 
 Name:           claws-mail
 Version:        3.7.10
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        The extended version of Sylpheed
 Group:          Applications/Internet
 License:        GPLv3+
@@ -10,11 +10,11 @@ URL:            http://claws-mail.org
 Source0:        http://downloads.sourceforge.net/sylpheed-claws/%{name}-%{version}.tar.bz2
 # http://www.thewildbeast.co.uk/claws-mail/bugzilla/attachment.cgi?id=960
 Patch0:         claws-gnome-shell-dont-start-minimized.patch
+Patch1:         claws-mail-3.7.10-glib2-include.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  flex, bison
 BuildRequires:  glib2-devel >= 2.6.2
 BuildRequires:  gtk2-devel >= 2.10.0
-BuildRequires:  compface >= 1.4
 BuildRequires:  gnutls-devel
 BuildRequires:  openldap-devel >= 2.0.7
 BuildRequires:  enchant-devel
@@ -148,6 +148,7 @@ mails, verify signatures or sign and encrypt your own mails.
 %prep
 %setup -q
 %patch0 -p1 -b.3.7.9cvs2
+%patch1 -p1 -b .glib2-include
 
 # guard for pluginapi
 SOURCEAPI=$(grep -A 1 VERSION_NUMERIC src/common/version.h | tr -d '\n' | perl -ne 's/[\\\s]//g; m/(\d+),(\d+),(\d+),(\d+)/; print("$1.$2.$3.$4");')
@@ -264,6 +265,10 @@ rm -rf %{buildroot}
 %{_libdir}/claws-mail/plugins/smime.deps
 
 %changelog
+* Fri Nov 25 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 3.7.10-6
+- 3.7.10-6
+- fix for new glib2 where only glib.h must be included (#755308)
+
 * Wed Sep 28 2011 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 3.7.10-5
 - drop unneeded plugin requires