From 02a3ae49e9ebdca1b867ee006063e69f1b407093 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sun, 16 Nov 2014 16:06:08 +0100 Subject: [PATCH] Obsolete compat-gnome-desktop310 from rhughes-f20-gnome-3-12 copr --- gnome-desktop3.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnome-desktop3.spec b/gnome-desktop3.spec index 78c4619..c5ade0b 100644 --- a/gnome-desktop3.spec +++ b/gnome-desktop3.spec @@ -7,7 +7,7 @@ Summary: Shared code among gnome-panel, gnome-session, nautilus, etc Name: gnome-desktop3 Version: 3.14.2 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/gnome-desktop/3.14/gnome-desktop-%{version}.tar.xz Patch0: 0001-default-input-sources-Switch-ja_JP-default-to-ibus-k.patch @@ -40,6 +40,11 @@ BuildRequires: iso-codes-devel # GnomeIdleMonitor API change breaks older gnome-shell versions Conflicts: gnome-shell < 3.7.90 +%if 0%{?fedora} +# From rhughes-f20-gnome-3-12 copr +Obsoletes: compat-gnome-desktop310 < 3.12 +%endif + %description The %{name} package contains an internal library @@ -108,6 +113,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_datadir}/installed-tests %changelog +* Sun Nov 16 2014 Kalev Lember - 3.14.2-2 +- Obsolete compat-gnome-desktop310 from rhughes-f20-gnome-3-12 copr + * Wed Nov 12 2014 Kalev Lember - 3.14.2-1 - Update to 3.14.2