From c6a860795dc074adcf9f9e6db44cd7a681b4f1f9 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Feb 20 2013 23:40:24 +0000 Subject: Conflict with older gnome-shell versions Added expicit Conflicts with gnome-shell < 3.7.90 to ensure both gnome-shell and gnome-desktop3 get updated in lockstep. We don't have new gnome-shell in rawhide yet and the gnome-desktop3 3.7.90 update would break older gnome-shell versions because of the GnomeIdleMonitor API change. --- diff --git a/gnome-desktop3.spec b/gnome-desktop3.spec index 0993fd3..4807a20 100644 --- a/gnome-desktop3.spec +++ b/gnome-desktop3.spec @@ -8,7 +8,7 @@ Summary: Shared code among gnome-panel, gnome-session, nautilus, etc Name: gnome-desktop3 Version: 3.7.90 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/gnome-desktop/3.7/gnome-desktop-%{version}.tar.xz @@ -43,6 +43,9 @@ BuildRequires: automake autoconf libtool intltool BuildRequires: itstool BuildRequires: iso-codes-devel +# GnomeIdleMonitor API change breaks older gnome-shell versions +Conflicts: gnome-shell < 3.7.90 + %description The gnome-desktop package contains an internal library @@ -102,6 +105,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.a %doc %{_datadir}/gtk-doc/html/gnome-desktop3/ %changelog +* Thu Feb 21 2013 Kalev Lember - 3.7.90-2 +- Conflict with older gnome-shell versions + * Wed Feb 20 2013 Richard Hughes - 3.7.90-1 - Update to 3.7.90