rpms/gnome-desktop/F-12 gnome-desktop.spec,1.235,1.236

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-desktop/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26215

Modified Files:
	gnome-desktop.spec 
Log Message:
Fix a crash



Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/F-12/gnome-desktop.spec,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -p -r1.235 -r1.236
--- gnome-desktop.spec	17 Dec 2009 15:37:29 -0000	1.235
+++ gnome-desktop.spec	8 Jan 2010 18:15:18 -0000	1.236
@@ -12,7 +12,7 @@
 Summary: Shared code among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
 Version: 2.28.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.28/%{name}-%{version}.tar.bz2
 Patch1: concatenate-edid-descriptors.patch
@@ -25,6 +25,9 @@ Patch4: per-monitor-background.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=601753
 Patch5: slideshow.patch
 
+#
+Patch6: gnome-desktop-crash.patch
+
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -87,6 +90,7 @@ libgnomedesktop.
 %patch3 -p1 -b .ignore-xrandr-badmatch
 %patch4 -p1 -b .per-monitor-background
 %patch5 -p1 -b .slideshow
+%patch6 -p1 -b .crash
 
 %build
 %configure --with-gnome-distributor="Red Hat, Inc" \
@@ -134,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Fri Jan  8 2010 Matthias Clasen <mclasen at redhat.com> - 2.28.2-2
+- Fix a crash in gnome-settings-daemon (#381629)
+
 * Thu Dec 17 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.2-1
 - Update to 2.28.2
 - See http://download.gnome.org/sources/gnome-desktop/2.28/gnome-desktop-2.28.2.news