This commit is contained in:
Matthias Clasen 2009-07-15 18:15:28 +00:00
parent 9747010529
commit a49fa03b24
4 changed files with 12 additions and 14 deletions

View File

@ -1 +1 @@
gnome-session-2.26.1.tar.bz2 gnome-session-2.27.4.tar.bz2

View File

@ -9,19 +9,16 @@
Summary: GNOME session manager Summary: GNOME session manager
Name: gnome-session Name: gnome-session
Version: 2.26.1 Version: 2.27.4
Release: 5%{?dist} Release: 1%{?dist}
URL: http://www.gnome.org URL: http://www.gnome.org
Source0: http://download.gnome.org/sources/gnome-session/2.26/%{name}-%{version}.tar.bz2 Source0: http://download.gnome.org/sources/gnome-session/2.27/%{name}-%{version}.tar.bz2
Source2: gnome.desktop Source2: gnome.desktop
# http://bugzilla.redhat.com/show_bug.cgi?id=497619 # http://bugzilla.redhat.com/show_bug.cgi?id=497619
# http://bugzilla.gnome.org/show_bug.cgi?id=585614 # http://bugzilla.gnome.org/show_bug.cgi?id=585614
Patch0: polkit1.patch Patch0: polkit1.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=588247
Patch1: watch-spew.patch
License: GPLv2+ License: GPLv2+
Group: User Interface/Desktops Group: User Interface/Desktops
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -61,7 +58,6 @@ BuildRequires: libtool
BuildRequires: gettext BuildRequires: gettext
BuildRequires: libX11-devel libXt-devel BuildRequires: libX11-devel libXt-devel
BuildRequires: libXtst-devel BuildRequires: libXtst-devel
BuildRequires: PolicyKit-gnome-devel
BuildRequires: xmlto BuildRequires: xmlto
Requires(pre): GConf2 >= %{gconf2_version} Requires(pre): GConf2 >= %{gconf2_version}
@ -84,7 +80,6 @@ Desktop file to add GNOME to display manager session menu.
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .polkit1 %patch0 -p1 -b .polkit1
%patch1 -p1 -b .watch-spew
#workaround broken perl-XML-Parser on 64bit arches #workaround broken perl-XML-Parser on 64bit arches
export PERL5LIB=/usr/lib64/perl5/vendor_perl/5.8.2 perl export PERL5LIB=/usr/lib64/perl5/vendor_perl/5.8.2 perl
@ -177,6 +172,9 @@ fi
%changelog %changelog
* Wed Jul 15 2009 Matthias Clasen <mclasen@redhat.com> - 2.27.4-1
- Update to 2.27.4
* Fri Jul 10 2009 Matthias Clasen <mclasen@redhat.com> - 2.26.1-5 * Fri Jul 10 2009 Matthias Clasen <mclasen@redhat.com> - 2.26.1-5
- Avoid pointless warnings - Avoid pointless warnings

View File

@ -1 +1 @@
aa280939a3e07209081095e8e10fe619 gnome-session-2.26.1.tar.bz2 bf4d141f72c182d8eadc68e42a4a5343 gnome-session-2.27.4.tar.bz2

View File

@ -1,12 +1,12 @@
diff -up gnome-session-2.26.1/gnome-session/gs-idle-monitor.c.watch-spew gnome-session-2.26.1/gnome-session/gs-idle-monitor.c diff -up gnome-session-2.26.1/gnome-session/gs-idle-monitor.c.watch-spew gnome-session-2.26.1/gnome-session/gs-idle-monitor.c
--- gnome-session-2.26.1/gnome-session/gs-idle-monitor.c.watch-spew 2009-07-10 09:54:42.872161348 -0400 --- gnome-session-2.26.1/gnome-session/gs-idle-monitor.c.watch-spew 2009-04-14 11:31:45.000000000 -0400
+++ gnome-session-2.26.1/gnome-session/gs-idle-monitor.c 2009-07-10 09:54:53.169623355 -0400 +++ gnome-session-2.26.1/gnome-session/gs-idle-monitor.c 2009-07-13 16:30:09.454700964 -0400
@@ -188,7 +188,7 @@ handle_alarm_notify_event (GSIdleMonitor @@ -188,7 +188,7 @@ handle_alarm_notify_event (GSIdleMonitor
watch = find_watch_for_alarm (monitor, alarm_event->alarm); watch = find_watch_for_alarm (monitor, alarm_event->alarm);
if (watch == NULL) { if (watch == NULL) {
- g_warning ("Unable to find watch for alarm %d, counter value %d, alarm value %d, time %d state %d", (int)alarm_event->alarm, alarm_event->counter_value.lo, alarm_event->alarm_value.lo, time, state); - g_warning ("Unable to find watch for alarm %d", (int)alarm_event->alarm);
+ g_debug ("Unable to find watch for alarm %d, counter value %d, alarm value %d, time %d state %d", (int)alarm_event->alarm, alarm_event->counter_value.lo, alarm_event->alarm_value.lo, time, state); + g_debug ("Unable to find watch for alarm %d", (int)alarm_event->alarm);
return; return;
} }