From 548e6f9f4fa108bc263822aa395e4edbd91c53f1564414eb80f5020b86919b88 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 9 Sep 2010 22:37:29 +0000 Subject: [PATCH] Accepting request 47658 from home:vuntz:branches:GNOME:Factory ok OBS-URL: https://build.opensuse.org/request/show/47658 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-desktop?expand=0&rev=84 --- gnome-desktop.changes | 8 ++++++++ gnome-desktop.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/gnome-desktop.changes b/gnome-desktop.changes index c4a17bf..5f8b271 100644 --- a/gnome-desktop.changes +++ b/gnome-desktop.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Sep 10 00:34:48 CEST 2010 - vuntz@opensuse.org + +- Always make libgnome-desktop-3-0 provide gnome-desktop = + %{version} to make lang package installable. However, the + Obsoletes is only there if %IS_DEFAULT_GNOME_DESKTOP is set: we + don't want to obsolete it if it's not the default. + ------------------------------------------------------------------- Wed Sep 8 20:13:21 CEST 2010 - vuntz@opensuse.org diff --git a/gnome-desktop.spec b/gnome-desktop.spec index 23205ea..c1074de 100644 --- a/gnome-desktop.spec +++ b/gnome-desktop.spec @@ -63,8 +63,8 @@ License: LGPLv2.1+ Summary: The GNOME Desktop API Library Group: System/GUI/GNOME Recommends: %{name}-lang -%if %IS_DEFAULT_GNOME_DESKTOP Provides: %{name} = %{version} +%if %IS_DEFAULT_GNOME_DESKTOP Obsoletes: %{name} < %{version} %endif