From d8d1b0eac9fbd2ff554160470175a8b6e65a6d48 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Apr 08 2009 15:49:57 +0000
Subject: 2.26.0.90


---

diff --git a/.cvsignore b/.cvsignore
index 8ce6e08..1c8a390 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-session-2.26.0.tar.bz2
+gnome-session-2.26.0.90.tar.bz2
diff --git a/gnome-session-alarm-warning.patch b/gnome-session-alarm-warning.patch
deleted file mode 100644
index c8acc16..0000000
--- a/gnome-session-alarm-warning.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up gnome-session-2.26.0/gnome-session/gs-idle-monitor.c.alarm-warning gnome-session-2.26.0/gnome-session/gs-idle-monitor.c
---- gnome-session-2.26.0/gnome-session/gs-idle-monitor.c.alarm-warning	2009-04-05 01:31:17.238537050 -0400
-+++ gnome-session-2.26.0/gnome-session/gs-idle-monitor.c	2009-04-05 01:32:57.511751140 -0400
-@@ -181,6 +181,10 @@ handle_alarm_notify_event (GSIdleMonitor
-         gboolean            res;
-         gboolean            condition;
- 
-+        if (alarm_event->state == XSyncAlarmDestroyed) {
-+                return;
-+        }
-+
-         watch = find_watch_for_alarm (monitor, alarm_event->alarm);
- 
-         if (watch == NULL) {
diff --git a/gnome-session-debug-spew.patch b/gnome-session-debug-spew.patch
deleted file mode 100644
index f9336d6..0000000
--- a/gnome-session-debug-spew.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up gnome-session-2.25.92/gnome-session/main.c.debug-spew gnome-session-2.25.92/gnome-session/main.c
---- gnome-session-2.25.92/gnome-session/main.c.debug-spew	2009-03-06 12:10:21.724791954 -0500
-+++ gnome-session-2.25.92/gnome-session/main.c	2009-03-06 12:10:46.640936065 -0500
-@@ -57,7 +57,7 @@
- 
- static gboolean failsafe = FALSE;
- static gboolean show_version = FALSE;
--static gboolean debug = TRUE;
-+static gboolean debug = FALSE;
- 
- static void
- on_bus_name_lost (DBusGProxy *bus_proxy,
diff --git a/gnome-session.spec b/gnome-session.spec
index 6b40002..2d81331 100644
--- a/gnome-session.spec
+++ b/gnome-session.spec
@@ -9,8 +9,8 @@
 
 Summary: GNOME session manager
 Name: gnome-session
-Version: 2.26.0
-Release: 2%{?dist}
+Version: 2.26.0.90
+Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-session/2.26/%{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -62,7 +62,6 @@ Requires(pre): GConf2 >= %{gconf2_version}
 Requires(post): GConf2 >= %{gconf2_version}
 Requires(preun): GConf2 >= %{gconf2_version}
 
-Patch0: gnome-session-alarm-warning.patch
 
 %description
 gnome-session manages a GNOME desktop or GDM login session. It starts up
@@ -78,7 +77,6 @@ Desktop file to add GNOME to display manager session menu.
 
 %prep
 %setup -q
-%patch0 -p1 -b .alarm-warning
 
 #workaround broken perl-XML-Parser on 64bit arches
 export PERL5LIB=/usr/lib64/perl5/vendor_perl/5.8.2 perl
@@ -177,6 +175,9 @@ fi
 
 
 %changelog
+* Wed Apr  8 2009 Matthias Clasen  <mclasen@redhat.com> - 2.26.0.90-1
+- Update to 2.26.0.90
+
 * Sun Apr  5 2009 Matthias Clasen  <mclasen@redhat.com> - 2.26.0-2
 - Avoid some warnings (#493688)
 
diff --git a/sources b/sources
index 04fce92..630c969 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e17dbce7446b3e42fac2b1cea7dedffd  gnome-session-2.26.0.tar.bz2
+b715b1de0de24a49eb91b41a6731919b  gnome-session-2.26.0.90.tar.bz2