From 5f43d01564939696b8d1e072b41ff7c3b991997e2d8da14b243c415c4cb1d388 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 26 Apr 2011 09:56:34 +0000 Subject: [PATCH] Accepting request 68151 from home:vuntz:branches:GNOME:Factory OBS-URL: https://build.opensuse.org/request/show/68151 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-desktop?expand=0&rev=107 --- gnome-desktop.changes | 9 ++++++++- gnome-desktop.spec | 7 ++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/gnome-desktop.changes b/gnome-desktop.changes index 34c668d..974eaa6 100644 --- a/gnome-desktop.changes +++ b/gnome-desktop.changes @@ -1,7 +1,14 @@ +------------------------------------------------------------------- +Fri Apr 22 11:00:36 CEST 2011 - vuntz@opensuse.org + +- Move gnome-about Obsoletes to gnome-version subpackage as this is + really the one providing the same kind of data. + ------------------------------------------------------------------- Tue Apr 12 16:18:26 UTC 2011 - dimstar@opensuse.org -- Set IS_DEFAULT_GNOME_DESKTOP to 1 and Obsolete gnome-about. +- Set IS_DEFAULT_GNOME_DESKTOP to 1 and add gnome-about Obsoletes + to libgnome-desktop-3-0. ------------------------------------------------------------------- Tue Apr 5 11:11:24 UTC 2011 - fcrozat@novell.com diff --git a/gnome-desktop.spec b/gnome-desktop.spec index 6439dcf..b8b4417 100644 --- a/gnome-desktop.spec +++ b/gnome-desktop.spec @@ -46,8 +46,7 @@ BuildRequires: gtk-doc BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -This package contains the gnome-about program as well as some -desktop-wide documents. +This package contains the desktop-wide files. %if %IS_DEFAULT_GNOME_DESKTOP || 0%{?BUILD_FROM_VCS} @@ -55,6 +54,9 @@ desktop-wide documents. License: LGPLv2.1+ Summary: GNOME version Group: System/GUI/GNOME +%if %IS_DEFAULT_GNOME_DESKTOP +Obsoletes: gnome-about < %{version} +%endif %description -n gnome-version This package contains information on the version of GNOME that is installed. @@ -69,7 +71,6 @@ Recommends: %{name}-lang Provides: %{name} = %{version} %if %IS_DEFAULT_GNOME_DESKTOP Obsoletes: %{name} < %{version} -Obsoletes: gnome-about < %{version} %endif %description -n libgnome-desktop-3-0