[sylpheed] Update to 3.2.0 Beta 5 Fix build error on rawhide

[Christoph Wickert]

commit 7207797e03dc13ca5ee429a60200f4e297439984
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Tue Jan 31 00:16:56 2012 +0100

    Update to 3.2.0 Beta 5 Fix build error on rawhide

 .gitignore                     |    1 +
 sources                        |    2 +-
 sylpheed-3.2.0beta5-glib.patch |   12 ++++++++++++
 sylpheed.spec                  |   10 ++++++++--
 4 files changed, 22 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8168f0c..8adc839 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ sylpheed-3.1.0beta3.tar.bz2
 /sylpheed-3.2.0beta1.tar.bz2
 /sylpheed-3.2.0beta2.tar.bz2
 /sylpheed-3.2.0beta3.tar.bz2
+/sylpheed-3.2.0beta5.tar.bz2
diff --git a/sources b/sources
index 47410e1..280245a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4750fee7c48c8a2ed2dd0a51bb30dae1  sylpheed-3.2.0beta3.tar.bz2
+ff9c67da6c5e41a43421e75bd8b08d7f  sylpheed-3.2.0beta5.tar.bz2
diff --git a/sylpheed-3.2.0beta5-glib.patch b/sylpheed-3.2.0beta5-glib.patch
new file mode 100644
index 0000000..171a706
--- /dev/null
+++ b/sylpheed-3.2.0beta5-glib.patch
@@ -0,0 +1,12 @@
+diff -dur sylpheed-3.2.0beta5.orig/libsylph/defs.h sylpheed-3.2.0beta5/libsylph/defs.h
+--- sylpheed-3.2.0beta5.orig/libsylph/defs.h	2011-02-25 07:51:47.000000000 +0100
++++ sylpheed-3.2.0beta5/libsylph/defs.h	2012-01-30 22:29:51.288652658 +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/sylpheed.spec b/sylpheed.spec
index 6e6af6e..15efaa0 100644
--- a/sylpheed.spec
+++ b/sylpheed.spec
@@ -5,7 +5,7 @@
 %global is_prerelease 1
 
 %if 0%{?is_prerelease}
-%global prerelease beta3
+%global prerelease beta5
 %endif
 
 Name:           sylpheed
@@ -16,6 +16,8 @@ Summary:        GTK+ based, lightweight, and fast email client
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://sylpheed.sraoss.jp/
+#VCS:           svn:svn://sylpheed.sraoss.jp/sylpheed/
+
 Source0:        http://sylpheed.sraoss.jp/sylpheed/v3.2beta/%{name}-%{version}%{?prerelease}.tar.bz2
 Source1:        sylpheed.1
 
@@ -40,6 +42,8 @@ Patch1:         sylpheed-3.1.0-defs.h.patch
 Patch2:         sylpheed-2.5.0-desktop.patch
 # customisation for /etc/pki/tls/
 Patch3:         sylpheed-2.5.0-certsdir.patch
+# fix build error with glib on rawhide, yet to be upstreamed (2011-01-31)
+Patch4:         sylpheed-3.2.0beta5-glib.patch
 
 # For xdg-open in patch1
 Requires: xdg-utils
@@ -89,6 +93,7 @@ this package contains development files only
 %patch1 -p1 -b .defs.h
 %patch2 -p1 -b .desktop
 %patch3 -p1 -b .certsdir
+%patch4 -p1 -b .glib
 
 
 %build
@@ -185,7 +190,8 @@ update-desktop-database &> /dev/null || :
 %{_libdir}/*.so
 
 %changelog
-* Mon Jan 30 2012 Christoph Wickert <cwickert at fedoraproject.org> - 3.2.0-0.3.beta3
+* Mon Jan 30 2012 Christoph Wickert <cwickert at fedoraproject.org> - 3.2.0-0.3.beta5
+- Update to 3.2.0 Beta 5
 - Fix plugin installation
 
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.0-0.2.beta3