From 895ea4956fba1e38d98259050eb0e4a409070cc9194124e1fab73675520f36ad Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 6 Jan 2011 01:37:55 +0000 Subject: [PATCH] Accepting request 57218 from home:vuntz:branches:GNOME:Factory ok OBS-URL: https://build.opensuse.org/request/show/57218 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdk-pixbuf?expand=0&rev=20 --- gdk-pixbuf.changes | 5 ++--- gdk-pixbuf.spec | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/gdk-pixbuf.changes b/gdk-pixbuf.changes index 625f008..f81e152 100644 --- a/gdk-pixbuf.changes +++ b/gdk-pixbuf.changes @@ -3,11 +3,10 @@ Tue Dec 28 22:20:56 UTC 2010 - dimstar@opensuse.org - Add gdk-pixbuf-add-gir_PACKAGES.patch: vapigen 0.12 parses the .gir and the .vapi file, complaining about duplicate definitions. - The error is seen in packages building against gdk-pixgbuf and + The error is seen in packages building against gdk-pixbuf and using vala-unstable to create own vala bindings. - Add gnome-common BuildRequires, because the patch touches - Makefile.am -- Add call to gnome-autogen.sh in the build section. + Makefile.am, and call to gnome-autogen.sh in the build section. ------------------------------------------------------------------- Sat Nov 6 19:05:40 CET 2010 - dimstar@opensuse.org diff --git a/gdk-pixbuf.spec b/gdk-pixbuf.spec index 3199c6d..d5909c8 100644 --- a/gdk-pixbuf.spec +++ b/gdk-pixbuf.spec @@ -31,6 +31,7 @@ Source2: README.SUSE Source99: baselibs.conf # PATCH-FIX-UPSTREAM gdk-pixbuf-add-gir_PACKAGES.patch bgo#635364 dimstar@opensuse.org -- Add gir_PACKAGES. This helps vapigen 0.12 to add proper package information, needed to bind .vapi and .gir files, in case both are installed. Patch0: gdk-pixbuf-add-gir_PACKAGES.patch +# Needed for patch0 BuildRequires: gnome-common BuildRequires: libjasper-devel BuildRequires: libjpeg-devel @@ -95,6 +96,7 @@ cp -a %{S:2} . %patch0 -p1 %build +# Needed for patch0 NOCONFIGURE=1 gnome-autogen.sh %configure \ --disable-static \