[gnome-panel/f14/master] Require gnome-shell

[Matthias Clasen]

commit 66f8f276a5f6532222ae1e7153aa41e2b3fb406c
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Sun Jan 23 10:15:40 2011 -0500

    Require gnome-shell

 gnome-panel.spec |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/gnome-panel.spec b/gnome-panel.spec
index aeb4ca8..a5457f3 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.32.0.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://www.gnome.org
 #VCS: git:git://git.gnome.org/gnome-panel
 Source0: http://download.gnome.org/sources/gnome-panel/2.32/%{name}-%{version}.tar.bz2
@@ -41,6 +41,12 @@ Requires: evolution-data-server >= %{evolution_data_server_version}
 Requires: gnome-session-xsession
 Requires: %{name}-libs = %{version}-%{release}
 
+# This is somewhat artificial, but ensures that everybody who
+# had a gnome desktop in <= F14 will get the shell in F15.
+# Putting the dependency in gnome-session would be more natural,
+# but would affect other spins, since gdm depends on gnome-session.
+Requires: gnome-shell
+
 Requires(post): GConf2 >= %{gconf_version}
 Requires(post): hicolor-icon-theme
 Requires(pre): GConf2 >= %{gconf_version}
@@ -360,6 +366,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null || :
 %{_datadir}/gir-1.0/PanelApplet-3.0.gir
 
 %changelog
+* Sun Jan 23 2011 Matthias Clasen <mclasen at redhat.com> - 2.32.0.2-3
+- Require gnome-shell
+
 * Thu Jan 13 2011 Matthias Clasen <mclasen at redhat.com> - 2.32.0.2-2
 - Drop unnecessary explicit requires