[cinnamon-session/f19] patch to remove session-migration (ubuntu leftover)

leigh123linux leigh123linux at fedoraproject.org
Thu Jul 25 21:43:32 UTC 2013


commit 998d3615880811d737333ce6260fee33663a49cf
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Thu Jul 25 22:43:23 2013 +0100

    patch to remove session-migration (ubuntu leftover)

 cinnamon-session.spec         |    8 +++++++-
 remove_sessionmigration.patch |   18 ++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletions(-)
---
diff --git a/cinnamon-session.spec b/cinnamon-session.spec
index b50e7a7..86d0dec 100644
--- a/cinnamon-session.spec
+++ b/cinnamon-session.spec
@@ -4,12 +4,14 @@
 Summary: Cinnamon session manager
 Name:    cinnamon-session
 Version: 1.0.0
-Release: 0.5.git%{_internal_version}%{?dist}
+Release: 0.6.git%{_internal_version}%{?dist}
 URL:     http://cinnamon.linuxmint.com
 # To generate tarball
 # wget https://github.com/linuxmint/cinnamon-session/tarball/%%{_internal_version} -O cinnamon-session-%%{version}.git%%{_internal_version}.tar.gz
 Source0: http://leigh123linux.fedorapeople.org/pub/cinnamon-session/source/cinnamon-session-%{version}.git%{_internal_version}.tar.gz
 
+Patch0:  remove_sessionmigration.patch
+
 License: GPLv2+ and LGPLv2+
 Group:   User Interface/Desktops
 
@@ -68,6 +70,7 @@ the other core components and handles logout and saving the session.
 
 %prep
 %setup -q -n linuxmint-cinnamon-session-%{_internal_version}
+%patch0 -p1
 NOCONFIGURE=1 ./autogen.sh
 
 %build
@@ -124,6 +127,9 @@ fi
 %{_datadir}/glib-2.0/schemas/org.cinnamon.SessionManager.gschema.xml
 
 %changelog
+* Thu Jul 25 2013 Leigh Scott <leigh123linux at googlemail.com> - 1.0.0-0.6.git58710ea
+- patch to remove session-migration (ubuntu leftover)
+
 * Wed Jul 24 2013 Leigh Scott <leigh123linux at googlemail.com> - 1.0.0-0.5.git58710ea
 - don't delete the glade file as we need it
 
diff --git a/remove_sessionmigration.patch b/remove_sessionmigration.patch
new file mode 100644
index 0000000..0016080
--- /dev/null
+++ b/remove_sessionmigration.patch
@@ -0,0 +1,18 @@
+--- a/cinnamon-session/csm-session-fill.c
++++ b/cinnamon-session/csm-session-fill.c
+@@ -228,15 +228,6 @@
+ load_standard_apps (CsmManager *manager,
+                     GKeyFile   *keyfile)
+ {
+-        GError *error;
+-
+-        g_debug ("fill: *** Executing user migration");
+-        error = NULL;
+-        if(!g_spawn_command_line_sync ("session-migration", NULL, NULL, NULL, &error)) {
+-                 g_warning ("Error while executing session-migration: %s", error->message);
+-                 g_error_free (error);
+-        }
+-
+         g_debug ("fill: *** Adding required components");
+         handle_required_components (keyfile, !csm_manager_get_failsafe (manager),
+                                     append_required_components_helper, manager);


More information about the scm-commits mailing list