From 9dcb9c9793be16a4d32e3677190bf6cfc7f7d206e9866f2d3c3d6db17e91124b Mon Sep 17 00:00:00 2001 From: andrea florio Date: Fri, 29 Jul 2011 09:09:14 +0000 Subject: [PATCH] - upstream bugfix release 0.4.6.1 - removed %name-0.4.6-fix-crash-on-start.patch now in upstream code OBS-URL: https://build.opensuse.org/package/show/X11:lxde/lxsession?expand=0&rev=50 --- lxsession-0.4.6-fix-crash-on-start.patch | 20 -------------------- lxsession-0.4.6.1.tar.bz2 | 3 +++ lxsession-0.4.6.tar.bz2 | 3 --- lxsession.changes | 7 +++++++ lxsession.spec | 4 +--- 5 files changed, 11 insertions(+), 26 deletions(-) delete mode 100644 lxsession-0.4.6-fix-crash-on-start.patch create mode 100644 lxsession-0.4.6.1.tar.bz2 delete mode 100644 lxsession-0.4.6.tar.bz2 diff --git a/lxsession-0.4.6-fix-crash-on-start.patch b/lxsession-0.4.6-fix-crash-on-start.patch deleted file mode 100644 index 46be840..0000000 --- a/lxsession-0.4.6-fix-crash-on-start.patch +++ /dev/null @@ -1,20 +0,0 @@ -From: Julien Lavergne -Date: Sat, 23 Jul 2011 23:14:03 +0000 (+0200) -Subject: Fix crash on start -X-Git-Url: http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde%2Flxsession;a=commitdiff_plain;h=82e5901fb68acfead807b8e824310edda2437744 - -Fix crash on start ---- - -diff --git a/lxsession/xdg-autostart.c b/lxsession/xdg-autostart.c -index 39f0d2a..b0f922a 100644 ---- a/lxsession/xdg-autostart.c -+++ b/lxsession/xdg-autostart.c -@@ -283,7 +283,6 @@ static void get_autostart_files_in_dir( GHashTable* hash, const char* de_name, c - path = g_build_filename( dir_path, name, NULL ); - g_hash_table_replace( hash, g_strdup(name), path ); - } -- g_free( name ); - } - g_dir_close( dir ); - } diff --git a/lxsession-0.4.6.1.tar.bz2 b/lxsession-0.4.6.1.tar.bz2 new file mode 100644 index 0000000..cdb32fa --- /dev/null +++ b/lxsession-0.4.6.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:83be724bb3ae078caf138afbcb870361b9d643737f6b9e9dad10f36a000c54db +size 310754 diff --git a/lxsession-0.4.6.tar.bz2 b/lxsession-0.4.6.tar.bz2 deleted file mode 100644 index 49e0b80..0000000 --- a/lxsession-0.4.6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1f8c405968425557d9a1d7ab6ea6fa14eb9461e98aa7effcd3e1a8acb68998e1 -size 310571 diff --git a/lxsession.changes b/lxsession.changes index a393b4d..8ae28d0 100644 --- a/lxsession.changes +++ b/lxsession.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Jul 29 09:06:25 UTC 2011 - andrea@opensuse.org + +- upstream bugfix release 0.4.6.1 +- removed %name-0.4.6-fix-crash-on-start.patch now in + upstream code + ------------------------------------------------------------------- Sun Jul 24 12:05:44 UTC 2011 - andrea@opensuse.org diff --git a/lxsession.spec b/lxsession.spec index 07a085b..a1ae071 100644 --- a/lxsession.spec +++ b/lxsession.spec @@ -19,14 +19,13 @@ Name: lxsession -Version: 0.4.6 +Version: 0.4.6.1 Release: 14 Summary: LXDE Session Manager, required for running the desktop environment Group: System/GUI/LXDE License: GPLv2 Url: http://www.lxde.org/ Source0: %{name}-%{version}.tar.bz2 -Patch0: %name-0.4.6-fix-crash-on-start.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-glib-devel fdupes gtk2-devel intltool pkg-config BuildRequires: docbook-utils docbook-xsl-stylesheets libxslt @@ -43,7 +42,6 @@ Authors: %prep %setup -q -n %name-%version -%patch0 -p1 %build %configure --enable-man