[camorama] Fix building with latest glib2

[Hans de Goede]

commit 622a5bd782faed71cfe1decd21c1b683c1239b98
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Sat Dec 10 08:55:32 2011 +0100

    Fix building with latest glib2

 camorama-0.19-new-glib.patch |   32 ++++++++++++++++++++++++++++++++
 camorama.spec                |    7 ++++++-
 2 files changed, 38 insertions(+), 1 deletions(-)
---
diff --git a/camorama-0.19-new-glib.patch b/camorama-0.19-new-glib.patch
new file mode 100644
index 0000000..407700c
--- /dev/null
+++ b/camorama-0.19-new-glib.patch
@@ -0,0 +1,32 @@
+--- camorama-0.19/src/camorama-stock-items.h	2007-06-14 16:05:33.000000000 +0200
++++ camorama-0.19.new/src/camorama-stock-items.h	2011-12-10 08:32:09.856317100 +0100
+@@ -1,7 +1,7 @@
+ #ifndef CAMORAMA_STOCK_ITEMS_H
+ #define CAMORAMA_STOCK_ITEMS_H
+ 
+-#include <glib/gmacros.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
+--- camorama-0.19/src/camorama-window.c	2011-12-10 08:51:10.552056445 +0100
++++ camorama-0.19.new/src/camorama-window.c	2011-12-10 08:50:52.068287522 +0100
+@@ -28,6 +28,7 @@
+ # include <config.h>
+ #endif
+ 
++#include <glib.h>
+ #include <glib/gi18n.h>
+ #include <libgnomeui/gnome-file-entry.h>
+ #include "callbacks.h"
+--- camorama-0.19/src/glib-helpers.h	2007-06-14 16:05:33.000000000 +0200
++++ camorama-0.19.new/src/glib-helpers.h	2011-12-10 08:33:22.534408498 +0100
+@@ -24,7 +24,7 @@
+ #ifndef GLIB_HELPERS_H
+ #define GLIB_HELPERS_H
+ 
+-#include <glib/gmacros.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
diff --git a/camorama.spec b/camorama.spec
index b354dd2..9dd22be 100644
--- a/camorama.spec
+++ b/camorama.spec
@@ -1,6 +1,6 @@
 Name:           camorama
 Version:        0.19
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Gnome webcam viewer
 Group:          Amusements/Graphics
 License:        GPLv2+
@@ -15,6 +15,7 @@ Patch1:         camorama-0.19-desktop.patch
 # Make it use libv4l1 so it will work with v4l2 devices too
 Patch2:         camorama-0.19-libv4l.patch
 Patch3:         camorama-0.19-no-more-videodev_h.patch
+Patch4:         camorama-0.19-new-glib.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libgnomeui-devel ORBit2-devel gettext-devel libv4l-devel
 BuildRequires:  intltool desktop-file-utils
@@ -32,6 +33,7 @@ A simple Gnome webcam viewer, with the ability to apply some video effects.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 
 %build
@@ -105,6 +107,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Sat Dec 10 2011 Hans de Goede <hdegoede at redhat.com> - 0.19-6
+- Fix building with latest glib2
+
 * Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 0.19-5
 - Rebuild for new libpng