Hello community, here is the log from the commit of package libgnomecups for openSUSE:Factory checked in at 2012-01-06 11:45:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libgnomecups (Old) and /work/SRC/openSUSE:Factory/.libgnomecups.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libgnomecups", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/libgnomecups/libgnomecups.changes 2011-09-23 02:08:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libgnomecups.new/libgnomecups.changes 2012-01-06 11:45:18.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Nov 27 20:40:16 UTC 2011 - [email protected] + +- Add libgnomecups-glib.patch: Only glib.h can be #include'd. + +------------------------------------------------------------------- New: ---- libgnomecups-glib.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgnomecups.spec ++++++ --- /var/tmp/diff_new_pack.thT9rh/_old 2012-01-06 11:45:19.000000000 +0100 +++ /var/tmp/diff_new_pack.thT9rh/_new 2012-01-06 11:45:19.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package libgnomecups (Version 0.2.3) +# spec file for package libgnomecups # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -34,6 +34,8 @@ Patch1: libgnomecups-lpoptions.patch # PATCH-FEATURE-OPENSUSE libgnomecups-ignore-default-ipp-warning.patch Patch2: libgnomecups-ignore-default-ipp-warning.patch +# PATCH-FIX-UPSTREAM libgnomecups-glib.patch bgo#664930 [email protected] -- Fix build with glib 2.31: only glib.h can be included. +Patch3: libgnomecups-glib.patch AutoReqProv: on # bug437293 %ifarch ppc64 @@ -85,6 +87,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build autoreconf -f -i ++++++ libgnomecups-glib.patch ++++++ >From d84eee9450b3b6f6155074915efc61bedcc8d446 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger <[email protected]> Date: Sun, 27 Nov 2011 21:36:41 +0100 Subject: [PATCH] Fix: Only glib.h can be included --- libgnomecups/gnome-cups-i18n.c | 2 +- libgnomecups/gnome-cups-init.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libgnomecups/gnome-cups-i18n.c b/libgnomecups/gnome-cups-i18n.c index 8987c5c..127756d 100644 --- a/libgnomecups/gnome-cups-i18n.c +++ b/libgnomecups/gnome-cups-i18n.c @@ -1,5 +1,5 @@ #include <config.h> -#include <glib/gmacros.h> +#include <glib.h> #include "gnome-cups-i18n.h" #ifdef ENABLE_NLS diff --git a/libgnomecups/gnome-cups-init.h b/libgnomecups/gnome-cups-init.h index 22b682a..c4600fc 100644 --- a/libgnomecups/gnome-cups-init.h +++ b/libgnomecups/gnome-cups-init.h @@ -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 -- 1.7.7 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
