diff --git a/.gitignore b/.gitignore index 95d8a48..d4527db 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,4 @@ gnome-session-2.31.6.tar.bz2 /gnome-session-3.9.91.tar.xz /gnome-session-3.10.0.tar.xz /gnome-session-3.10.1.tar.xz +/gnome-session-3.11.1.tar.xz diff --git a/0001-Only-support-UPower-0.9.patch b/0001-Only-support-UPower-0.9.patch deleted file mode 100644 index 39dcc73..0000000 --- a/0001-Only-support-UPower-0.9.patch +++ /dev/null @@ -1,119 +0,0 @@ -From 3b518cadecf07f3885b2207152fff92e4f4aaff1 Mon Sep 17 00:00:00 2001 -From: Colin Walters -Date: Thu, 17 Oct 2013 08:41:51 -0400 -Subject: [PATCH] Only support UPower 0.9 - -Newer UPower drops support for APIs that duplicate systemd/logind, so -if we detect it, then require consumers to use the systemd backend. - -https://bugzilla.gnome.org/show_bug.cgi?id=710383 ---- - configure.ac | 10 +++++++++- - gnome-session/Makefile.am | 8 ++++++-- - gnome-session/gsm-system.c | 4 ++++ - 3 files changed, 19 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index bb3d02b..b470d3d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -64,11 +64,18 @@ PKG_CHECK_MODULES(GNOME_SESSION, - glib-2.0 >= $GLIB_REQUIRED - gio-2.0 >= $GLIB_REQUIRED - dbus-glib-1 >= $DBUS_GLIB_REQUIRED -- upower-glib >= $UPOWER_REQUIRED - json-glib-1.0 >= $JSON_GLIB_REQUIRED - gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED - ) - -+dnl We can only support old upower -+dnl https://bugzilla.gnome.org/show_bug.cgi?id=710383 -+PKG_CHECK_MODULES(UPOWER, upower-glib <= 0.9.22, have_old_upower=yes, have_old_upower=no) -+AS_IF([test x$have_old_upower = xyes], [ -+ AC_DEFINE([HAVE_OLD_UPOWER], [1], [Define if we have an older upower]) -+]) -+AM_CONDITIONAL(HAVE_OLD_UPOWER, test x$have_old_upower = xyes) -+ - PKG_CHECK_MODULES(SESSION_PROPERTIES, - glib-2.0 >= $GLIB_REQUIRED - gtk+-3.0 >= $GTK3_REQUIRED -@@ -363,6 +370,7 @@ echo " - XRender support: ${have_xrender} - XSync support: ${have_xsync} - XTest support: ${have_xtest} -+ Legacy UPower backend: ${have_old_upower} - Build Docbook: ${enable_docbook_docs} - Build manpages: ${enable_man} - -diff --git a/gnome-session/Makefile.am b/gnome-session/Makefile.am -index 977a398..c7ae617 100644 ---- a/gnome-session/Makefile.am -+++ b/gnome-session/Makefile.am -@@ -10,6 +10,7 @@ noinst_PROGRAMS = \ - AM_CPPFLAGS = \ - $(GTK3_CFLAGS) \ - $(GNOME_SESSION_CFLAGS) \ -+ $(UPOWER_CFLAGS) \ - $(DISABLE_DEPRECATED_CFLAGS) - - AM_CFLAGS = $(WARN_CFLAGS) -@@ -29,8 +30,6 @@ gnome_session_SOURCES = \ - gsm-fail-whale.c \ - gsm-system.h \ - gsm-system.c \ -- gsm-consolekit.c \ -- gsm-consolekit.h \ - gsm-systemd.h \ - gsm-systemd.c \ - gsm-presence.h \ -@@ -60,6 +59,10 @@ gnome_session_SOURCES = \ - gsm-xsmp-server.c \ - gsm-xsmp-server.h - -+if HAVE_OLD_UPOWER -+gnome_session_SOURCES += gsm-consolekit.c gsm-consolekit.h -+endif -+ - gnome_session_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - $(X11_CFLAGS) \ -@@ -85,6 +88,7 @@ gnome_session_LDADD = \ - $(XTEST_LIBS) \ - $(XEXT_LIBS) \ - $(GNOME_SESSION_LIBS) \ -+ $(UPOWER_LIBS) \ - $(GCONF_LIBS) \ - $(SYSTEMD_LIBS) \ - $(GIOUNIX_LIBS) \ -diff --git a/gnome-session/gsm-system.c b/gnome-session/gsm-system.c -index 0be1bf7..c0ad962 100644 ---- a/gnome-session/gsm-system.c -+++ b/gnome-session/gsm-system.c -@@ -24,7 +24,9 @@ - #include - - #include "gsm-system.h" -+#ifdef HAVE_OLD_UPOWER - #include "gsm-consolekit.h" -+#endif - #include "gsm-systemd.h" - - enum { -@@ -202,12 +204,14 @@ gsm_get_system (void) - g_debug ("Using systemd for session tracking"); - } - } -+#ifdef HAVE_OLD_UPOWER - if (system == NULL) { - system = GSM_SYSTEM (gsm_consolekit_new ()); - if (system != NULL) { - g_debug ("Using ConsoleKit for session tracking"); - } - } -+#endif - - return g_object_ref (system); - } --- -1.8.4.2 - diff --git a/gnome-session.spec b/gnome-session.spec index bbd88ae..6b8c766 100644 --- a/gnome-session.spec +++ b/gnome-session.spec @@ -10,19 +10,17 @@ Summary: GNOME session manager Name: gnome-session -Version: 3.10.1 -Release: 2%{?dist} +Version: 3.11.1 +Release: 1%{?dist} URL: http://www.gnome.org #VCS: git:git://git.gnome.org/gnome-session -Source0: http://download.gnome.org/sources/gnome-session/3.10/%{name}-%{version}.tar.xz +Source0: http://download.gnome.org/sources/gnome-session/3.11/%{name}-%{version}.tar.xz # Blacklist NV30: https://bugzilla.redhat.com/show_bug.cgi?id=745202 Patch1: gnome-session-3.3.92-nv30.patch Patch2: 0001-main-Set-XDG_MENU_PREFIX.patch Patch3: gnome-session-3.6.2-swrast.patch -Patch4: 0001-Only-support-UPower-0.9.patch - License: GPLv2+ Group: User Interface/Desktops @@ -85,8 +83,6 @@ Desktop file to add GNOME to display manager session menu. %patch2 -p1 -b .set-xdg-menu-prefix %patch3 -p1 -b .swrast -%patch4 -p1 -b .upower1 - echo "ACLOCAL_AMFLAGS = -I m4" >> Makefile.am autoreconf -i -f @@ -104,9 +100,6 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" %find_lang %{po_package} -%check -desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/gnome-session-properties.desktop - %post /sbin/ldconfig touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : @@ -129,7 +122,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %files -f %{po_package}.lang %doc AUTHORS COPYING NEWS README %doc %{_mandir}/man*/* -%{_datadir}/applications/gnome-session-properties.desktop %{_bindir}/* %{_libexecdir}/gnome-session-check-accelerated %{_libexecdir}/gnome-session-check-accelerated-helper @@ -142,6 +134,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %{_datadir}/glib-2.0/schemas/org.gnome.SessionManager.gschema.xml %changelog +* Sun Nov 03 2013 Kalev Lember - 3.11.1-1 +- Update to 3.11.1 + * Fri Nov 01 2013 Kalev Lember - 3.10.1-2 - Backport patch for UPower 1.0 support diff --git a/sources b/sources index de4659a..0ddca97 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f77a89c38bc17b64829a2f2811bc5f34 gnome-session-3.10.1.tar.xz +173300137f786c32e2070b2162928792 gnome-session-3.11.1.tar.xz