[libgnomecups] Fix build by including glib.h alone
mkasik
mkasik at fedoraproject.org
Wed Nov 30 12:57:48 UTC 2011
commit fbf69311087c21e1c5308f9c55a9a3c663f0e30f
Author: Marek Kasik <mkasik at redhat.com>
Date: Wed Nov 30 13:57:11 2011 +0100
Fix build by including glib.h alone
libgnomecups-glib-header.patch | 21 +++++++++++++++++++++
libgnomecups.spec | 7 ++++++-
2 files changed, 27 insertions(+), 1 deletions(-)
---
diff --git a/libgnomecups-glib-header.patch b/libgnomecups-glib-header.patch
new file mode 100644
index 0000000..73d450f
--- /dev/null
+++ b/libgnomecups-glib-header.patch
@@ -0,0 +1,21 @@
+--- libgnomecups-0.2.3/libgnomecups/gnome-cups-i18n.c 2007-01-02 01:18:51.000000000 +0100
++++ libgnomecups-0.2.3/libgnomecups/gnome-cups-i18n.c 2011-11-30 11:47:02.000000000 +0100
+@@ -1,5 +1,5 @@
+ #include <config.h>
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include "gnome-cups-i18n.h"
+
+ #ifdef ENABLE_NLS
+--- libgnomecups-0.2.3/libgnomecups/gnome-cups-init.h 2007-01-02 01:18:51.000000000 +0100
++++ libgnomecups-0.2.3/libgnomecups/gnome-cups-init.h 2011-11-30 11:47:26.000000000 +0100
+@@ -1,8 +1,7 @@
+ #ifndef GNOME_CUPS_INIT
+ #define GNOME_CUPS_INIT
+
+-#include <glib/gtypes.h>
+-#include <glib/gmacros.h>
++#include <glib.h>
+
+ G_BEGIN_DECLS
+
diff --git a/libgnomecups.spec b/libgnomecups.spec
index e945d9d..535e1e1 100644
--- a/libgnomecups.spec
+++ b/libgnomecups.spec
@@ -1,7 +1,7 @@
Summary: GNOME library for CUPS integration
Name: libgnomecups
Version: 0.2.3
-Release: 9%{?dist}
+Release: 10%{?dist}
License: LGPLv2
Group: Development/Libraries
URL: http://www.gnome.org
@@ -21,6 +21,7 @@ Patch3: libgnomecups-dbus.patch
Patch5: libgnomecups-0.1.14-go-direct.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=520449
Patch6: libgnomecups-lpoptions.patch
+Patch7: libgnomecups-glib-header.patch
%description
GNOME library for CUPS integration
@@ -39,6 +40,7 @@ GNOME library for CUPS integration
%patch3 -p1 -b .dbus
%patch5 -p1 -b .go-direct
%patch6 -p1 -b .lpoptions
+%patch7 -p1 -b .glib-header
%build
autoreconf -f -i
@@ -68,6 +70,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
%{_libdir}/*.so
%changelog
+* Wed Nov 30 2011 Marek Kasik <mkasik at redhat.com> - 0.2.3-10
+- Fix build by including glib.h alone
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.3-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list