[gnome-session/f15/master] Fix check-accel utility

Matthias Clasen mclasen at fedoraproject.org
Tue Mar 8 19:10:51 UTC 2011


commit 8c8f36bf8a6908d22324b80a99c14eb64fdc2535
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Tue Mar 8 14:10:18 2011 -0500

    Fix check-accel utility

 0001-Return-0-on-success.patch |   24 ++++++++++++++++++++++++
 gnome-session.spec             |    7 ++++++-
 2 files changed, 30 insertions(+), 1 deletions(-)
---
diff --git a/0001-Return-0-on-success.patch b/0001-Return-0-on-success.patch
new file mode 100644
index 0000000..1f6f6d4
--- /dev/null
+++ b/0001-Return-0-on-success.patch
@@ -0,0 +1,24 @@
+From 01217f38addd7ea47e121fc5e31eb2a35a54f9f8 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen at redhat.com>
+Date: Tue, 8 Mar 2011 14:04:05 -0500
+Subject: [PATCH] Return 0 on success
+
+Booleans and exist status don't go together well...
+---
+ tools/gnome-session-check-accelerated.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/tools/gnome-session-check-accelerated.c b/tools/gnome-session-check-accelerated.c
+index 7b1cb5f..9d4e2d6 100644
+--- a/tools/gnome-session-check-accelerated.c
++++ b/tools/gnome-session-check-accelerated.c
+@@ -99,5 +99,5 @@ main (int argc, char **argv)
+ 
+         gdk_display_sync (display);
+ 
+-        return is_accelerated;
++        return is_accelerated ? 0 : 1;
+ }
+-- 
+1.7.4.1
+
diff --git a/gnome-session.spec b/gnome-session.spec
index ac282eb..4d1574d 100644
--- a/gnome-session.spec
+++ b/gnome-session.spec
@@ -3,7 +3,7 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 2.91.91
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 #VCS: git:git://git.gnome.org/gnome-session
 Source0: http://download.gnome.org/sources/gnome-session/2.91/%{name}-%{version}.tar.bz2
@@ -11,6 +11,7 @@ Source1: gnome-authentication-agent.desktop
 Source2: gnome.desktop
 
 Patch0: gnome-session-libs.patch
+Patch1: 0001-Return-0-on-success.patch
 
 License: GPLv2+
 Group: User Interface/Desktops
@@ -85,6 +86,7 @@ Desktop file to add GNOME to display manager session menu.
 %prep
 %setup -q
 %patch0 -p1 -b .libs
+%patch1 -p1 -b .check-accel
 
 echo "ACLOCAL_AMFLAGS = -I m4" >> Makefile.am
 
@@ -164,6 +166,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas || :
 %{_datadir}/glib-2.0/schemas/org.gnome.SessionManager.gschema.xml
 
 %changelog
+* Tue Mar  8 2011 Matthias Clasen <mclasen at redhat.com> 2.91.91-2
+- Fix the check-accel utility exit status
+
 * Mon Mar  7 2011 Matthias Clasen <mclasen at redhat.com> 2.91.91-1
 - Update to 2.91.91
 


More information about the scm-commits mailing list