rpms/gnome-desktop/devel detect-monitors-dammit.patch, NONE, 1.1 gnome-desktop.spec, 1.200, 1.201

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22893

Modified Files:
	gnome-desktop.spec 
Added Files:
	detect-monitors-dammit.patch 
Log Message:
Fix the Detect Monitors button


detect-monitors-dammit.patch:

--- NEW FILE detect-monitors-dammit.patch ---
diff -up gnome-desktop-2.25.91/libgnome-desktop/gnome-rr.c.detect-monitors-dammit gnome-desktop-2.25.91/libgnome-desktop/gnome-rr.c
--- gnome-desktop-2.25.91/libgnome-desktop/gnome-rr.c.detect-monitors-dammit	2009-02-19 22:28:03.396165019 -0500
+++ gnome-desktop-2.25.91/libgnome-desktop/gnome-rr.c	2009-02-19 22:28:12.504914496 -0500
@@ -362,11 +362,7 @@ fill_out_screen_info (Display *xdisplay,
 	     screen->min_height, screen->max_height);
 #endif
     
-#if (RANDR_MAJOR == 1 && RANDR_MINOR >= 3)
-    resources = XRRGetScreenResourcesCurrent (xdisplay, xroot);
-#else
     resources = XRRGetScreenResources (xdisplay, xroot);
-#endif
     
     if (resources)
     {


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- gnome-desktop.spec	19 Feb 2009 05:42:59 -0000	1.200
+++ gnome-desktop.spec	20 Feb 2009 03:31:15 -0000	1.201
@@ -12,7 +12,7 @@
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
 Version: 2.25.91
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.25/%{name}-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+
@@ -43,6 +43,9 @@
 BuildRequires: gtk-doc >= %{gtk_doc_version}
 BuildRequires: automake autoconf libtool intltool
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=568160
+Patch0: detect-monitors-dammit.patch
+
 %description
 
 The gnome-desktop package contains an internal library
@@ -72,8 +75,7 @@
 
 %prep
 %setup -q
-
-autoreconf -i -f
+%patch -p0 -b .detect-monitors-dammit
 
 %build
 %configure --with-gnome-distributor="Red Hat, Inc" --disable-scrollkeeper
@@ -119,6 +121,9 @@
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Thu Feb 19 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.91-2
+- Fix the Detect Monitors button
+
 * Thu Feb 19 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.91-1
 - Update to 2.25.91