[NetworkManager-openconnect] fix build failure

[David Woodhouse]

commit 2f9b2d6197b33dcd688b279d08fe2307a717ae82
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Thu Nov 10 23:28:03 2011 +0000

    fix build failure

 ...ailure-include-glib.h-not-glib-gtypes.h-d.patch |   27 ++++++++++++++++++++
 NetworkManager-openconnect.spec                    |    7 ++++-
 2 files changed, 33 insertions(+), 1 deletions(-)
---
diff --git a/0001-Fix-build-failure-include-glib.h-not-glib-gtypes.h-d.patch b/0001-Fix-build-failure-include-glib.h-not-glib-gtypes.h-d.patch
new file mode 100644
index 0000000..5164823
--- /dev/null
+++ b/0001-Fix-build-failure-include-glib.h-not-glib-gtypes.h-d.patch
@@ -0,0 +1,27 @@
+From ca8a39d1bb999ba98ead45e53041fc3ea28ecd5c Mon Sep 17 00:00:00 2001
+From: David Woodhouse <David.Woodhouse at intel.com>
+Date: Thu, 10 Nov 2011 23:19:32 +0000
+Subject: [PATCH] Fix build failure: include <glib.h>, not <glib/gtypes.h>
+ directly.
+
+---
+ src/nm-openconnect-service.h |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/src/nm-openconnect-service.h b/src/nm-openconnect-service.h
+index e454f82..684a5b3 100644
+--- a/src/nm-openconnect-service.h
++++ b/src/nm-openconnect-service.h
+@@ -25,8 +25,7 @@
+ #ifndef NM_OPENCONNECT_PLUGIN_H
+ #define NM_OPENCONNECT_PLUGIN_H
+ 
+-#include <glib/gtypes.h>
+-#include <glib-object.h>
++#include <glib.h>
+ #include <nm-vpn-plugin.h>
+ 
+ #define NM_TYPE_OPENCONNECT_PLUGIN            (nm_openconnect_plugin_get_type ())
+-- 
+1.7.7
+
diff --git a/NetworkManager-openconnect.spec b/NetworkManager-openconnect.spec
index 9698dda..670acaf 100644
--- a/NetworkManager-openconnect.spec
+++ b/NetworkManager-openconnect.spec
@@ -9,12 +9,13 @@
 Summary:   NetworkManager VPN integration for openconnect
 Name:      NetworkManager-openconnect
 Version:   0.9.0
-Release:   3%{snapshot}%{?dist}
+Release:   4%{snapshot}%{?dist}
 License:   GPLv2+, LGPLv2.1
 Group:     System Environment/Base
 URL:       http://www.gnome.org/projects/NetworkManager/
 Source:    %{name}-%{realversion}%{snapshot}.tar.bz2
 Patch0:    0001-Look-for-openconnect-binary-in-usr-sbin-too.patch
+Patch1:    0001-Fix-build-failure-include-glib.h-not-glib-gtypes.h-d.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -47,6 +48,7 @@ with NetworkManager and the GNOME desktop
 %prep
 %setup -q -n NetworkManager-openconnect-%{realversion}
 %patch0 -p1
+%patch1 -p1
 
 %build
 autoreconf
@@ -103,6 +105,9 @@ fi
 %{_datadir}/gnome-vpn-properties/openconnect/nm-openconnect-dialog.ui
 
 %changelog
+* Tue Nov 08 2011 David Woodhouse <David.Woodhouse at intel.com> - 0.9.0-4
+- Fix build failure due to including <glib/gtypes.h> directly.
+
 * Tue Nov 08 2011 David Woodhouse <David.Woodhouse at intel.com> - 0.9.0-3
 - Look for openconnect in /usr/sbin too