[gmime] Fix gpg-error linking and mono bindings path

[Tomas Bzatek]

commit cc051e75a9ee3721693e90bdcfb224011e238c17
Author: Tomas Bzatek <tbzatek at redhat.com>
Date:   Fri Jun 17 15:36:33 2011 +0200

    Fix gpg-error linking and mono bindings path

 gmime-2.5.8-gpg-error.patch |   23 +++++++++++++++++++++++
 gmime.spec                  |    9 +++++++--
 2 files changed, 30 insertions(+), 2 deletions(-)
---
diff --git a/gmime-2.5.8-gpg-error.patch b/gmime-2.5.8-gpg-error.patch
new file mode 100644
index 0000000..7e01195
--- /dev/null
+++ b/gmime-2.5.8-gpg-error.patch
@@ -0,0 +1,23 @@
+diff -up gmime-2.5.8/tests/Makefile.am.bak gmime-2.5.8/tests/Makefile.am
+--- gmime-2.5.8/tests/Makefile.am.bak	2011-06-17 15:31:05.000000000 +0200
++++ gmime-2.5.8/tests/Makefile.am	2011-06-17 15:30:40.000000000 +0200
+@@ -39,7 +39,7 @@ endif
+ noinst_PROGRAMS = $(AUTOMATED_TESTS) $(MANUAL_TESTS)
+ 
+ DEPS = $(top_builddir)/gmime/libgmime-$(GMIME_API_VERSION).la
+-LDADDS = $(top_builddir)/gmime/libgmime-$(GMIME_API_VERSION).la $(GLIB_LIBS)
++LDADDS = $(top_builddir)/gmime/libgmime-$(GMIME_API_VERSION).la -lgpg-error $(GLIB_LIBS)
+ 
+ test_best_SOURCES = test-best.c
+ test_best_LDFLAGS = 
+diff -up gmime-2.5.8/tests/test-pkcs7.c.bak gmime-2.5.8/tests/test-pkcs7.c
+--- gmime-2.5.8/tests/test-pkcs7.c.bak	2011-03-18 04:44:35.000000000 +0100
++++ gmime-2.5.8/tests/test-pkcs7.c	2011-06-17 15:30:15.000000000 +0200
+@@ -32,6 +32,7 @@
+ 
+ #include <gmime/gmime.h>
+ #include <gmime/gmime-pkcs7-context.h>
++#include <gpg-error.h>
+ 
+ #include "testsuite.h"
+ 
diff --git a/gmime.spec b/gmime.spec
index 815b5f2..b7e45ab 100644
--- a/gmime.spec
+++ b/gmime.spec
@@ -12,10 +12,13 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel >= 2.18.0
 BuildRequires:  gpgme-devel
+BuildRequires:  libgpg-error-devel
 BuildRequires:  zlib-devel >= 1.2.1.1
 BuildRequires:  gettext-devel, gtk-doc
+BuildRequires:  automake autoconf
 
 Patch2: libdir.patch
+Patch3: gmime-2.5.8-gpg-error.patch
 
 # mono available only on selected architectures
 %ifarch %ix86 x86_64 ia64 armv4l sparcv9 alpha s390x ppc ppc64
@@ -64,8 +67,10 @@ for developing mono applications that use libgmime.
 %prep
 %setup -q
 %patch2 -p1 -b .libdir
+%patch3 -p1 -b .gpg-error
 
 %build
+autoreconf
 MONO_ARGS="--enable-mono=no"
 %if 0%buildmono
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
@@ -115,8 +120,8 @@ rm -rf $RPM_BUILD_ROOT
 %files sharp
 %defattr(-,root,root,-)
 %{_libdir}/pkgconfig/gmime-sharp-2.6.pc
-%{_libdir}/mono/gac/gmime-sharp
-%{_libdir}/mono/gmime-sharp-2.6
+/usr/lib/mono/gac/gmime-sharp
+/usr/lib/mono/gmime-sharp-2.6
 # this went missing ?
 #%{_datadir}/gapi-2.0/gmime-api.xml
 %endif