From a5cca4b3ee4b5dac8d8f6e73e591aed601420df8f8065509581a66eb3e54c5ee Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 6 Apr 2012 15:06:10 +0000 Subject: [PATCH] Accepting request 112869 from home:vuntz:branches:GNOME:Factory cleanup OBS-URL: https://build.opensuse.org/request/show/112869 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=141 --- gnome-control-center.changes | 2 +- gnome-control-center.spec | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gnome-control-center.changes b/gnome-control-center.changes index 792a157..537070e 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -2,7 +2,7 @@ Sun Apr 1 14:15:28 UTC 2012 - dimstar@opensuse.org - Change /usr/bin/glxinfo Recommends to Mesa-demo-x Requires. Since - bnc#748373 has been resolved we can require the real package + bnc#748373 has been resolved, we can require the real package again. ------------------------------------------------------------------- diff --git a/gnome-control-center.spec b/gnome-control-center.spec index 80f99da..58d52cf 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -82,6 +82,7 @@ BuildRequires: pkgconfig(xcursor) BuildRequires: pkgconfig(xft) BuildRequires: pkgconfig(xi) >= 1.2 Requires: %{name}-branding = %{version} +# needed for glxinfo, used by System info panel Requires: Mesa-demo-x # needed for printers panel Requires: cups-pk-helper @@ -118,8 +119,8 @@ Group: System/GUI/GNOME Requires: %{name} = %{version} Supplements: packageand(%{name}:branding-upstream) Provides: %{name}-branding = %{version} -BuildArch: noarch Conflicts: otherproviders(%{name}-branding) +BuildArch: noarch #BRAND: This package contains the definitions of the content appearing #BRAND: in the shell (/etc/xdg/menus/gnomecc.menu).