From 433a8e34c7b01937d2ae04ebeb88253dc0f2e27290589851c004225afc2ccb52 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 23 Nov 2012 09:10:52 +0000 Subject: [PATCH] Accepting request 142538 from home:dimstar:branches:GNOME:Factory typo OBS-URL: https://build.opensuse.org/request/show/142538 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdk-pixbuf?expand=0&rev=51 --- baselibs.conf | 3 --- gdk-pixbuf.changes | 8 ++++++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index c059339..d9715bb 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,7 +1,6 @@ gdk-pixbuf-devel requires -gdk-pixbuf- requires "libgdk_pixbuf-2_0-0- = " - requires "typelib-1_0-GdkPixbuf-2_0- = " gdk-pixbuf-query-loaders +/usr/bin/gdk-pixbuf-query-loaders(-64)? post "%if "%_lib" == "lib64"" @@ -17,5 +16,3 @@ libgdk_pixbuf-2_0-0 post "%else" post "if test -f %{_bindir}/gdk-pixbuf-query-loaders; then %{_bindir}/gdk-pixbuf-query-loaders --update-cache; fi" post "%endif" -typelib-1_0-GdkPixbuf-2_0 - +/usr/lib(64)?/girepository-1.0 diff --git a/gdk-pixbuf.changes b/gdk-pixbuf.changes index 6c9a8c9..9bbd1d7 100644 --- a/gdk-pixbuf.changes +++ b/gdk-pixbuf.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Nov 21 20:59:31 UTC 2012 - dimstar@opensuse.org + +- Do not provide typelib-1_0-GdkPixbuf-2_0-32bit (baselibs.conf): + this only results in a big mess of duplicate provides. Adding + ($HOSTTYPE) to the typelib() symbols does not work, as we'd + otherwise no longer be able to use them against noarch packages. + ------------------------------------------------------------------- Mon Nov 12 21:46:37 UTC 2012 - dimstar@opensuse.org