[gmime] Update to 2.6.9, sync with the f17 branch

[Kalev Lember]

commit 130a027cd0f26847a0adc889638bc5f44eb585a4
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Tue Jul 24 19:31:04 2012 +0300

    Update to 2.6.9, sync with the f17 branch

 .gitignore                  |    2 ++
 gmime-2.5.8-gpg-error.patch |   18 ++++++++++--------
 gmime.spec                  |   15 ++++++++-------
 sources                     |    2 +-
 4 files changed, 21 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 15afb12..1daf65b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@ gmime-2.5.1.tar.bz2
 /gmime-2.5.8.tar.xz
 /gmime-2.6.1.tar.xz
 /gmime-2.6.4.tar.xz
+/gmime-2.6.7.tar.xz
+/gmime-2.6.9.tar.xz
diff --git a/gmime-2.5.8-gpg-error.patch b/gmime-2.5.8-gpg-error.patch
index 7e01195..e4275c2 100644
--- a/gmime-2.5.8-gpg-error.patch
+++ b/gmime-2.5.8-gpg-error.patch
@@ -1,7 +1,8 @@
-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
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 481f168..aabd7ef 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -38,7 +38,7 @@ endif
  noinst_PROGRAMS = $(AUTOMATED_TESTS) $(MANUAL_TESTS)
  
  DEPS = $(top_builddir)/gmime/libgmime-$(GMIME_API_VERSION).la
@@ -10,14 +11,15 @@ diff -up gmime-2.5.8/tests/Makefile.am.bak gmime-2.5.8/tests/Makefile.am
  
  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
+diff --git a/tests/test-pkcs7.c b/tests/test-pkcs7.c
+index 7b49128..4175ff2 100644
+--- a/tests/test-pkcs7.c
++++ b/tests/test-pkcs7.c
 @@ -32,6 +32,7 @@
  
  #include <gmime/gmime.h>
  #include <gmime/gmime-pkcs7-context.h>
 +#include <gpg-error.h>
  
- #include "testsuite.h"
+ #include <gpg-error.h>
  
diff --git a/gmime.spec b/gmime.spec
index d0faed9..53e9346 100644
--- a/gmime.spec
+++ b/gmime.spec
@@ -1,6 +1,6 @@
 Name:           gmime
-Version:        2.6.4
-Release:        2%{?dist}
+Version:        2.6.9
+Release:        1%{?dist}
 Summary:        Library for creating and parsing MIME messages
 
 Group:          System Environment/Libraries
@@ -107,7 +107,6 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README TODO
-%{_bindir}/gmime*
 %{_libdir}/lib*.so.*
 
 %files devel
@@ -121,13 +120,15 @@ 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
-# this went missing ?
-#%{_datadir}/gapi-2.0/gmime-api.xml
+/usr/lib/mono/gac/gmime-sharp
+/usr/lib/mono/gmime-sharp-2.6
+%{_datadir}/gapi-2.0/gmime-api.xml
 %endif
 
 %changelog
+* Tue Jul 24 2012 Kalev Lember <kalevlember at gmail.com> - 2.6.9-1
+- Update to 2.6.9, sync with the f17 branch
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 447b709..09e55c6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fc76389af2ddc82ee69154c6a6efd536  gmime-2.6.4.tar.xz
+9ee3d2ba3b796974787ce357743ee383  gmime-2.6.9.tar.xz