[evolution-mapi] Add patch to enable GLib deprecated stuff (due to G_CONST_RETURN deprecation)

[Milan Crha]

commit 3b8f4af5a8f855ece5262c9b5ef91a7aecfc6f9c
Author: Milan Crha <mcrha at redhat.com>
Date:   Wed Jun 15 10:06:54 2011 +0200

    Add patch to enable GLib deprecated stuff (due to G_CONST_RETURN deprecation)

 evolution-mapi-3.1.2-g_const_return.patch |   13 +++++++++++++
 evolution-mapi.spec                       |   14 +++++++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)
---
diff --git a/evolution-mapi-3.1.2-g_const_return.patch b/evolution-mapi-3.1.2-g_const_return.patch
new file mode 100644
index 0000000..40f966e
--- /dev/null
+++ b/evolution-mapi-3.1.2-g_const_return.patch
@@ -0,0 +1,13 @@
+diff -up evolution-mapi-3.1.2/configure.ac.g_const_return evolution-mapi-3.1.2/configure.ac
+--- evolution-mapi-3.1.2/configure.ac.g_const_return	2011-06-15 10:02:12.536844780 +0200
++++ evolution-mapi-3.1.2/configure.ac	2011-06-15 10:05:47.481373439 +0200
+@@ -53,8 +53,7 @@ dnl ***********************
+ dnl Compiler Warning Flags
+ dnl ***********************
+ AS_COMPILER_FLAGS(WARNING_FLAGS,
+-	"-DG_DISABLE_DEPRECATED
+-	-DPANGO_DISABLE_DEPRECATED
++	"-DPANGO_DISABLE_DEPRECATED
+ 	-DGDK_DISABLE_DEPRECATED
+ 	-DGDK_PIXBUF_DISABLE_DEPRECATED
+ 	-DGTK_DISABLE_DEPRECATED
diff --git a/evolution-mapi.spec b/evolution-mapi.spec
index 1ce55a3..d04f7c4 100644
--- a/evolution-mapi.spec
+++ b/evolution-mapi.spec
@@ -19,12 +19,12 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 ### Patches ###
 
-#Patch1: evolution-mapi-0.31.91-gn627999.patch
-
 # Add an rpath to the addressbook and calendar backends, which we
 # then override in %%post so it can find libsamba-util-common.so.
 Patch2: evolution-mapi-3.0.0-add-rpath.patch
 
+Patch3: evolution-mapi-3.1.2-g_const_return.patch
+
 ### Dependencies ###
 
 Requires(post): chrpath
@@ -34,11 +34,15 @@ Requires: evolution-data-server >= %{version}
 
 ### Build Dependencies ###
 
+BuildRequires: autoconf
+BuildRequires: automake
 BuildRequires: evolution-data-server-devel >= %{version}
 BuildRequires: evolution-devel >= %{version}
 BuildRequires: gettext
+BuildRequires: gnome-common
 BuildRequires: intltool >= %{intltool_version}
 BuildRequires: libtalloc-devel
+BuildRequires: libtool >= 1.5
 BuildRequires: openchange-devel >= %{libmapi_version}
 BuildRequires: samba4-devel
 
@@ -58,8 +62,8 @@ Development files needed for building things which link against %{name}.
 
 %prep
 %setup -q
-#%patch1 -p1 -b .gn627999
 %patch2 -p1 -b .add-rpath
+%patch3 -p1 -b .g_const_return
 
 %build
 
@@ -82,6 +86,9 @@ CFLAGS="$CFLAGS \
 	-Werror-implicit-function-declaration"
 %endif
 
+# Regenerate configure to pick up changes
+autoreconf --force --install
+
 %configure
 make %{?_smp_mflags}
 
@@ -125,6 +132,7 @@ chrpath --replace %{_libdir}/samba $RPM_BUILD_ROOT%{_libdir}/evolution-data-serv
 %changelog
 * Tue Jun 14 2011 Milan Crha <mcrha at redhat.com> - 3.1.2-1
 - Update to 3.1.2
+- Add patch to enable GLib deprecated stuff (due to G_CONST_RETURN deprecation)
 
 * Mon May 09 2011 Milan Crha <mcrha at redhat.com> - 3.1.1-1
 - Update to 3.1.1