[claws-mail-plugins] 3.7.10-9 fix missing %doc files in -perl subpackage (#707662) fix for new glib2 where only glib.h mu

[Michael Schwendt]

commit ae6ae3ae8a852197a301335c1b6b03e3233569f5
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Fri Nov 25 05:02:29 2011 +0100

    3.7.10-9
    fix missing %doc files in -perl subpackage (#707662)
    fix for new glib2 where only glib.h must be included

 ...s-mail-extra-plugins-3.7.10-glib2-include.patch |   31 ++++++++++++++++++++
 claws-mail-plugins.spec                            |   12 +++++++-
 2 files changed, 42 insertions(+), 1 deletions(-)
---
diff --git a/claws-mail-extra-plugins-3.7.10-glib2-include.patch b/claws-mail-extra-plugins-3.7.10-glib2-include.patch
new file mode 100644
index 0000000..3cd2bba
--- /dev/null
+++ b/claws-mail-extra-plugins-3.7.10-glib2-include.patch
@@ -0,0 +1,31 @@
+diff -Nur claws-mail-extra-plugins-3.7.10-orig/notification_plugin-0.28/gtkhotkey/gtk-hotkey-error.h claws-mail-extra-plugins-3.7.10/notification_plugin-0.28/gtkhotkey/gtk-hotkey-error.h
+--- claws-mail-extra-plugins-3.7.10-orig/notification_plugin-0.28/gtkhotkey/gtk-hotkey-error.h	2009-10-16 23:23:33.000000000 +0200
++++ claws-mail-extra-plugins-3.7.10/notification_plugin-0.28/gtkhotkey/gtk-hotkey-error.h	2011-11-25 04:30:53.599130281 +0100
+@@ -23,7 +23,7 @@
+ #ifndef __GTK_HOTKEY_ERROR_H__
+ #define __GTK_HOTKEY_ERROR_H__
+ 
+-#include <glib/gquark.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
+diff -Nur claws-mail-extra-plugins-3.7.10-orig/notification_plugin-0.28/gtkhotkey/gtk-hotkey-info.h claws-mail-extra-plugins-3.7.10/notification_plugin-0.28/gtkhotkey/gtk-hotkey-info.h
+diff -Nur claws-mail-extra-plugins-3.7.10-orig/notification_plugin-0.28/gtkhotkey/gtk-hotkey-key-file-registry.h claws-mail-extra-plugins-3.7.10/notification_plugin-0.28/gtkhotkey/gtk-hotkey-key-file-registry.h
+diff -Nur claws-mail-extra-plugins-3.7.10-orig/notification_plugin-0.28/gtkhotkey/gtk-hotkey-listener.h claws-mail-extra-plugins-3.7.10/notification_plugin-0.28/gtkhotkey/gtk-hotkey-listener.h
+diff -Nur claws-mail-extra-plugins-3.7.10-orig/notification_plugin-0.28/gtkhotkey/gtk-hotkey-marshal.c claws-mail-extra-plugins-3.7.10/notification_plugin-0.28/gtkhotkey/gtk-hotkey-marshal.c
+diff -Nur claws-mail-extra-plugins-3.7.10-orig/notification_plugin-0.28/gtkhotkey/gtk-hotkey-marshal.h claws-mail-extra-plugins-3.7.10/notification_plugin-0.28/gtkhotkey/gtk-hotkey-marshal.h
+diff -Nur claws-mail-extra-plugins-3.7.10-orig/notification_plugin-0.28/gtkhotkey/gtk-hotkey-registry.h claws-mail-extra-plugins-3.7.10/notification_plugin-0.28/gtkhotkey/gtk-hotkey-registry.h
+diff -Nur claws-mail-extra-plugins-3.7.10-orig/notification_plugin-0.28/gtkhotkey/gtk-hotkey-x11-listener.h claws-mail-extra-plugins-3.7.10/notification_plugin-0.28/gtkhotkey/gtk-hotkey-x11-listener.h
+diff -Nur claws-mail-extra-plugins-3.7.10-orig/notification_plugin-0.28/gtkhotkey/x11/tomboykeybinder.h claws-mail-extra-plugins-3.7.10/notification_plugin-0.28/gtkhotkey/x11/tomboykeybinder.h
+--- claws-mail-extra-plugins-3.7.10-orig/notification_plugin-0.28/gtkhotkey/x11/tomboykeybinder.h	2009-10-16 23:23:33.000000000 +0200
++++ claws-mail-extra-plugins-3.7.10/notification_plugin-0.28/gtkhotkey/x11/tomboykeybinder.h	2011-11-25 04:33:16.252368165 +0100
+@@ -2,7 +2,7 @@
+ #ifndef __TOMBOY_KEY_BINDER_H__
+ #define __TOMBOY_KEY_BINDER_H__
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
diff --git a/claws-mail-plugins.spec b/claws-mail-plugins.spec
index 5e7ecf0..aff3ab0 100644
--- a/claws-mail-plugins.spec
+++ b/claws-mail-plugins.spec
@@ -24,7 +24,7 @@
 
 Name:           claws-mail-plugins
 Version:        3.7.10
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Additional plugins for claws-mail
 
 Group:          Applications/Internet
@@ -35,6 +35,8 @@ Source1:        gdata-0.2cvs11.tar.bz2
 Source2:        fancy-0.9.14cvs1.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:         claws-mail-extra-plugins-3.7.10-glib2-include.patch
+
 Patch1:         claws-mail-plugins-geolocation-champlain-0.9.patch
 
 BuildRequires:  claws-mail-devel >= %{version}
@@ -353,6 +355,7 @@ exporting of your meetings or all your calendars.
 
 %prep
 %setup -q -n claws-mail-extra-plugins-%{version}
+%patch0 -p1 -b .glib2-include
 
 # guard for pluginapi
 SOURCEAPI=$(grep -A 1 VERSION_NUMERIC %{_includedir}/claws-mail/common/version.h | tr -d '\n' | perl -ne 's/[\\\s]//g; m/(\d+),(\d+),(\d+),(\d+)/; print("$1.$2.$3.$4");')
@@ -813,6 +816,8 @@ rm -rf $RPM_BUILD_ROOT
 %doc perl_plugin-%{perl}/ChangeLog
 %doc perl_plugin-%{perl}/COPYING
 %doc perl_plugin-%{perl}/README
+%doc perl_plugin-%{perl}/NEWS
+%doc perl_plugin-%{perl}/cm_perl.pod
 %{_libdir}/claws-mail/plugins/perl_plugin.so
 
 %files python -f python_plugin.lang
@@ -858,6 +863,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/claws-mail/plugins/vcalendar/
 
 %changelog
+* Fri Nov 25 2011 Michael Schwendt <mschwendt at fedoraproject.org>
+- 3.7.10-9
+- fix missing %%doc files in -perl subpackage (#707662)
+- fix for new glib2 where only glib.h must be included
+
 * Thu Nov 24 2011 Tomas Bzatek <tbzatek at redhat.com>
 - 3.7.10-8
 - Rebuilt for new libarchive and clutter