From 05c63323ada7f89ca773ffdefd9f92daf4859dd67930943bdc5b2cb118cef27c Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 23 Nov 2012 09:10:47 +0000 Subject: [PATCH] Accepting request 142537 from home:dimstar:branches:GNOME:Factory typo OBS-URL: https://build.opensuse.org/request/show/142537 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk2?expand=0&rev=179 --- baselibs.conf | 3 --- gtk2.changes | 8 ++++++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index 8553012..2c13368 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,7 +1,6 @@ gtk2-devel requires -gtk2- requires "libgtk-2_0-0- = " - requires "typelib-1_0-Gtk-2_0- = " gtk2-tools +/usr/bin/gtk-query-immodules-2.0(-64)? post "%if "%_lib" == "lib64"" @@ -104,5 +103,3 @@ gtk2-immodule-xim postun "%else" postun "%{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/gtk.immodules" postun "%endif" -typelib-1_0-Gtk-2_0 - +/usr/lib(64)?/girepository-1.0 diff --git a/gtk2.changes b/gtk2.changes index 7e82a2c..f7bb530 100644 --- a/gtk2.changes +++ b/gtk2.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Nov 21 20:54:17 UTC 2012 - dimstar@opensuse.org + +- Do not provide typelib-1_0-Gtk-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. + ------------------------------------------------------------------- Wed Oct 24 19:18:57 UTC 2012 - jengelh@inai.de