Update to 3.18.1.1

This commit is contained in:
Kalev Lember 2015-10-15 08:02:26 +02:00
parent bdd7d27e2a
commit 9d191dd4b2
4 changed files with 6 additions and 44 deletions

1
.gitignore vendored
View File

@ -67,3 +67,4 @@ gnome-session-2.31.6.tar.bz2
/gnome-session-3.17.92.tar.xz
/gnome-session-3.18.0.tar.xz
/gnome-session-3.18.1.tar.xz
/gnome-session-3.18.1.1.tar.xz

View File

@ -1,38 +0,0 @@
From c9eec29ea4228de8f90f94e9a2124a6cbc1ebf00 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Wed, 14 Oct 2015 14:32:03 -0400
Subject: [PATCH] main: fix typos I introduced
I reworked some of Giovanni's code and introduced
a few typos in commit 6b8d94ae13b2bec1db1bcff4ab4cc67bf63fda9f
https://bugzilla.gnome.org/show_bug.cgi?id=756324
---
gnome-session/main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnome-session/main.c b/gnome-session/main.c
index 074f53e..4bc8cd0 100644
--- a/gnome-session/main.c
+++ b/gnome-session/main.c
@@ -243,7 +243,7 @@ initialize_gio (void)
char *use_vfs = NULL;
disable_fuse = g_strdup (g_getenv ("GVFS_DISABLE_FUSE"));
- use_vfs = g_strdup (g_getenv ("GVFS_USE_VFS"));
+ use_vfs = g_strdup (g_getenv ("GIO_USE_VFS"));
g_setenv ("GVFS_DISABLE_FUSE", "1", TRUE);
g_setenv ("GIO_USE_VFS", "local", TRUE);
@@ -257,7 +257,7 @@ initialize_gio (void)
}
if (disable_fuse) {
- g_setenv ("GIO_DISABLE_FUSE", use_vfs, TRUE);
+ g_setenv ("GVFS_DISABLE_FUSE", use_vfs, TRUE);
g_free (disable_fuse);
} else {
g_unsetenv ("GVFS_DISABLE_FUSE");
--
2.5.0

View File

@ -9,15 +9,12 @@
Summary: GNOME session manager
Name: gnome-session
Version: 3.18.1
Version: 3.18.1.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.18/%{name}-%{version}.tar.xz
# Backported from upstream
Patch0: gnome-session-fix-env-var-names.patch
# Blacklist NV30: https://bugzilla.redhat.com/show_bug.cgi?id=745202
Patch1: gnome-session-3.3.92-nv30.patch
Patch3: gnome-session-3.6.2-swrast.patch
@ -85,7 +82,6 @@ Desktop file to add GNOME on wayland to display manager session menu.
%prep
%setup -q
%patch0 -p1
%patch1 -p1 -b .nv30
%patch3 -p1 -b .swrast
@ -143,6 +139,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
%{_datadir}/glib-2.0/schemas/org.gnome.SessionManager.gschema.xml
%changelog
* Thu Oct 15 2015 Kalev Lember <klember@redhat.com> - 3.18.1.1-1
- Update to 3.18.1.1
* Wed Oct 14 2015 Kalev Lember <klember@redhat.com> - 3.18.1-1
- Update to 3.18.1

View File

@ -1 +1 @@
4a0ca0afe1a313a7e7fb10d09ee32491 gnome-session-3.18.1.tar.xz
5e3f669ef88ce58aa05154e5d38baa49 gnome-session-3.18.1.1.tar.xz