[evolution/f16] Add patch for Gnome bug #667346 (build with libpst-0.6.54)

[Milan Crha]

commit 4c4001e2738ea3a159522994861abb23b4fcba49
Author: Milan Crha <mcrha at redhat.com>
Date:   Mon Jan 9 18:05:05 2012 +0100

    Add patch for Gnome bug #667346 (build with libpst-0.6.54)

 evolution-3.2.3-libpst-0.6.54.patch |   51 +++++++++++++++++++++++++++++++++++
 evolution.spec                      |    7 ++++-
 2 files changed, 57 insertions(+), 1 deletions(-)
---
diff --git a/evolution-3.2.3-libpst-0.6.54.patch b/evolution-3.2.3-libpst-0.6.54.patch
new file mode 100644
index 0000000..4f61b9d
--- /dev/null
+++ b/evolution-3.2.3-libpst-0.6.54.patch
@@ -0,0 +1,51 @@
+From 270b7b481529b23fced67a0624243da1c75c4c00 Mon Sep 17 00:00:00 2001
+From: Vincent Untz <vuntz at gnome.org>
+Date: Thu, 5 Jan 2012 12:00:07 +0100
+Subject: [PATCH] pst-import: Fix build with libpst 0.6.54 and require this
+ version
+
+pst_open() requires an additional argument now.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=667346
+---
+ configure.ac                      |    4 ++--
+ plugins/pst-import/pst-importer.c |    2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index ce88950..b34ec77 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -47,7 +47,7 @@ m4_define([libgdata_minimum_version], [0.10])
+ m4_define([libsoup_minimum_version], [2.31.2])
+ m4_define([libxml_minimum_version], [2.7.3])
+ m4_define([shared_mime_info_minimum_version], [0.22])
+-m4_define([libpst_minimum_version], [0.6.41])
++m4_define([libpst_minimum_version], [0.6.54])
+ m4_define([libnotify_minimum_version], [0.5.1])
+ 
+ dnl Optional Packages
+@@ -1479,7 +1479,7 @@ AC_ARG_ENABLE([pst-import],
+ 	[enable_pst="$enableval"], [enable_pst=yes])
+ 
+ if test "x$enable_pst" = "xyes"; then
+-	PKG_CHECK_MODULES(LIBPST, libpst, have_pst=yes, have_pst=no)
++	PKG_CHECK_MODULES(LIBPST, libpst >= libpst_minimum_version, have_pst=yes, have_pst=no)
+ 	AC_SUBST(LIBPST_CFLAGS)
+ 	AC_SUBST(LIBPST_LIBS)
+ 
+diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c
+index 5b99053..4305827 100644
+--- a/plugins/pst-import/pst-importer.c
++++ b/plugins/pst-import/pst-importer.c
+@@ -2219,7 +2219,7 @@ pst_init (pst_file *pst,
+ 	DEBUG_REGISTER_CLOSE ();
+ #endif
+ 
+-	if (pst_open (pst, filename) < 0) {
++	if (pst_open (pst, filename, NULL) < 0) {
+ 		pst_error_msg ("Error opening PST file %s", filename);
+ 		return -1;
+ 	}
+-- 
+1.7.7.3
\ No newline at end of file
diff --git a/evolution.spec b/evolution.spec
index 0f043eb..b89fb9c 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -47,6 +47,9 @@ Patch10: evolution-1.4.4-ldap-x86_64-hack.patch
 # RH bug #589555
 Patch11: evolution-2.30.1-help-contents.patch
 
+# Gnome bug #667346 - build with libpst-0.6.54
+Patch12: evolution-3.2.3-libpst-0.6.54.patch
+
 ## Dependencies ###
 
 Requires(pre): GConf2
@@ -115,7 +118,7 @@ BuildRequires: libnotify-devel
 %endif
 
 %if %{libpst_support}
-BuildRequires: libpst-devel
+BuildRequires: libpst-devel >= 0.6.54
 BuildRequires: libytnef-devel
 %endif
 
@@ -203,6 +206,7 @@ This package contains the plugin to import Microsoft Personal Storage Table
 %setup -q -n evolution-%{version}
 %patch10 -p1 -b .ldaphack
 %patch11 -p1 -b .help-contents
+%patch12 -p1 -b .libpst-0.6.54
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -651,6 +655,7 @@ rm -rf $RPM_BUILD_ROOT
 * Mon Jan 09 2012 Milan Crha <mcrha at redhat.com> - 3.2.3-1
 - Update to 3.2.3
 - Remove patch for RH bug #757164 (fixed upstream).
+- Add patch for Gnome bug #667346 (build with libpst-0.6.54)
 
 * Wed Nov 30 2011 Matthew Barnes <mbarnes at redhat.com> - 3.2.2-2
 - Add patch for RH bug #757164 (CVE-2011-3201).