From d95a8397a2b2ba012cdc7221e9ee97ecf4f9d465 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 29 Jul 2009 03:09:12 +0000 Subject: [PATCH] 2.27.5 --- .cvsignore | 2 +- gnome-session.spec | 8 ++++++-- polkit1.patch | 41 +++++++++++++++++++++-------------------- sources | 2 +- 4 files changed, 29 insertions(+), 24 deletions(-) diff --git a/.cvsignore b/.cvsignore index 083ea75..1de98d5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gnome-session-2.27.4.tar.bz2 +gnome-session-2.27.5.tar.bz2 diff --git a/gnome-session.spec b/gnome-session.spec index 3f2ce2c..1c13f03 100644 --- a/gnome-session.spec +++ b/gnome-session.spec @@ -9,8 +9,8 @@ Summary: GNOME session manager Name: gnome-session -Version: 2.27.4 -Release: 3%{?dist} +Version: 2.27.5 +Release: 1%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/gnome-session/2.27/%{name}-%{version}.tar.bz2 Source2: gnome.desktop @@ -174,6 +174,10 @@ fi %changelog +* Tue Jul 28 2009 Matthias Clasen - 2.27.5-1 +- Update to 2.27.5 + +:a * Fri Jul 24 2009 Fedora Release Engineering - 2.27.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/polkit1.patch b/polkit1.patch index 0eec491..5251476 100644 --- a/polkit1.patch +++ b/polkit1.patch @@ -1,7 +1,7 @@ -diff -up gnome-session-2.27.4/configure.in.polkit1 gnome-session-2.27.4/configure.in ---- gnome-session-2.27.4/configure.in.polkit1 2009-07-15 10:53:06.000000000 -0400 -+++ gnome-session-2.27.4/configure.in 2009-07-15 19:52:55.779086207 -0400 -@@ -32,7 +32,7 @@ AC_ARG_WITH(at-spi-registryd-directory, +diff -up gnome-session-2.27.5/configure.in.polkit1 gnome-session-2.27.5/configure.in +--- gnome-session-2.27.5/configure.in.polkit1 2009-07-28 21:51:22.000000000 -0400 ++++ gnome-session-2.27.5/configure.in 2009-07-28 23:05:25.662498945 -0400 +@@ -33,7 +33,7 @@ AC_ARG_WITH(at-spi-registryd-directory, AT_SPI_REGISTRYD_DIR=$with_at_spi_registryd_directory AC_SUBST(AT_SPI_REGISTRYD_DIR) @@ -10,15 +10,15 @@ diff -up gnome-session-2.27.4/configure.in.polkit1 gnome-session-2.27.4/configur AC_ARG_ENABLE(deprecations, [AC_HELP_STRING([--enable-deprecations], -@@ -48,7 +48,6 @@ GLIB_REQUIRED=2.16.0 +@@ -49,7 +49,6 @@ GLIB_REQUIRED=2.16.0 LIBGNOMEUI_REQUIRED=2.2.0 GTK_REQUIRED=2.12.0 DBUS_GLIB_REQUIRED=0.76 -POLKIT_GNOME_REQUIRED=0.7 + DEVKIT_POWER_REQUIRED=008 dnl ==================================================================== - dnl Dependency Checks -@@ -86,21 +85,6 @@ PKG_CHECK_MODULES(GCONF, gconf-2.0) +@@ -89,22 +88,6 @@ PKG_CHECK_MODULES(GCONF, gconf-2.0) PKG_CHECK_MODULES(EGG_SMCLIENT, gtk+-2.0) @@ -37,12 +37,13 @@ diff -up gnome-session-2.27.4/configure.in.polkit1 gnome-session-2.27.4/configur -if test "x$have_polkit" = "xyes"; then - AC_DEFINE(HAVE_POLKIT_GNOME, [1], [whether PolKit GNOME was found]) -fi - +- dnl ==================================================================== - dnl GConf Checks -diff -up gnome-session-2.27.4/gnome-session/gsm-consolekit.c.polkit1 gnome-session-2.27.4/gnome-session/gsm-consolekit.c ---- gnome-session-2.27.4/gnome-session/gsm-consolekit.c.polkit1 2009-07-01 08:45:30.000000000 -0400 -+++ gnome-session-2.27.4/gnome-session/gsm-consolekit.c 2009-07-15 19:57:50.969319136 -0400 + dnl Option to set the default window manager + dnl ==================================================================== +diff -up gnome-session-2.27.5/gnome-session/gsm-consolekit.c.polkit1 gnome-session-2.27.5/gnome-session/gsm-consolekit.c +--- gnome-session-2.27.5/gnome-session/gsm-consolekit.c.polkit1 2009-07-28 21:29:27.000000000 -0400 ++++ gnome-session-2.27.5/gnome-session/gsm-consolekit.c 2009-07-28 22:58:49.369736767 -0400 @@ -31,10 +31,6 @@ #include #include @@ -54,7 +55,7 @@ diff -up gnome-session-2.27.4/gnome-session/gsm-consolekit.c.polkit1 gnome-sessi #include "gsm-marshal.h" #include "gsm-consolekit.h" -@@ -413,177 +409,6 @@ emit_stop_complete (GsmConsolekit *manag +@@ -465,177 +461,6 @@ emit_stop_complete (GsmConsolekit *manag } } @@ -232,7 +233,7 @@ diff -up gnome-session-2.27.4/gnome-session/gsm-consolekit.c.polkit1 gnome-sessi void gsm_consolekit_attempt_restart (GsmConsolekit *manager) { -@@ -600,16 +425,16 @@ gsm_consolekit_attempt_restart (GsmConso +@@ -652,16 +477,16 @@ gsm_consolekit_attempt_restart (GsmConso return; } @@ -257,7 +258,7 @@ diff -up gnome-session-2.27.4/gnome-session/gsm-consolekit.c.polkit1 gnome-sessi g_error_free (error); } else { emit_restart_complete (manager, NULL); -@@ -632,16 +457,16 @@ gsm_consolekit_attempt_stop (GsmConsolek +@@ -684,16 +509,16 @@ gsm_consolekit_attempt_stop (GsmConsolek return; } @@ -282,7 +283,7 @@ diff -up gnome-session-2.27.4/gnome-session/gsm-consolekit.c.polkit1 gnome-sessi g_error_free (error); } else { emit_stop_complete (manager, NULL); -@@ -907,347 +732,78 @@ gsm_consolekit_can_switch_user (GsmConso +@@ -969,347 +794,78 @@ gsm_consolekit_can_switch_user (GsmConso return ret; } @@ -673,10 +674,10 @@ diff -up gnome-session-2.27.4/gnome-session/gsm-consolekit.c.polkit1 gnome-sessi } gchar * -diff -up gnome-session-2.27.4/gnome-session/Makefile.am.polkit1 gnome-session-2.27.4/gnome-session/Makefile.am ---- gnome-session-2.27.4/gnome-session/Makefile.am.polkit1 2009-07-01 08:45:30.000000000 -0400 -+++ gnome-session-2.27.4/gnome-session/Makefile.am 2009-07-15 19:53:08.955071147 -0400 -@@ -17,7 +17,6 @@ INCLUDES = \ +diff -up gnome-session-2.27.5/gnome-session/Makefile.am.polkit1 gnome-session-2.27.5/gnome-session/Makefile.am +--- gnome-session-2.27.5/gnome-session/Makefile.am.polkit1 2009-07-28 21:51:22.000000000 -0400 ++++ gnome-session-2.27.5/gnome-session/Makefile.am 2009-07-28 22:58:49.370735427 -0400 +@@ -16,7 +16,6 @@ INCLUDES = \ $(ICE_CFLAGS) \ $(GNOME_SESSION_CFLAGS) \ $(GCONF_CFLAGS) \ diff --git a/sources b/sources index 6b9ea43..f4a418f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bf4d141f72c182d8eadc68e42a4a5343 gnome-session-2.27.4.tar.bz2 +d0512f7f514262c52fe27228bdbba804 gnome-session-2.27.5.tar.bz2