From e0a69aaa6dd922286654502214235c78ecacf53b Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: May 02 2011 18:39:19 +0000
Subject: sync with f15


---

diff --git a/gnome-desktop3.spec b/gnome-desktop3.spec
index 5675433..cda15c6 100644
--- a/gnome-desktop3.spec
+++ b/gnome-desktop3.spec
@@ -10,9 +10,13 @@
 Summary: Shared code among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop3
 Version: 3.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/3.0/gnome-desktop-%{version}.tar.bz2
+
+# Upstream fix
+Patch0: 0001-Don-t-fall-over-if-RANDR-is-missing.patch
+
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
 
@@ -67,6 +71,7 @@ libgnomedesktop.
 
 %prep
 %setup -q -n gnome-desktop-%{version}
+%patch0 -p1 -b .randr-missing
 
 %build
 %configure --with-pnp-ids-path="/usr/share/hwdata/pnp.ids" \
@@ -104,6 +109,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 %doc %{_datadir}/gtk-doc/html/gnome-desktop3/
 
 %changelog
+* Mon May  2 2011 Matthias Clasen <mclasen@redhat.com> - 3.0.1-2
+- Prevent segfaults in gnome-rr users on randr-less displays
+
 * Tue Apr 26 2011 Matthias Clasen <mclasen@redhat.com> - 3.0.1-1
 - Update to 3.0.1