diff --git a/lxsession-0.4.4-fix-bnc623192.patch b/lxsession-0.4.4-fix-bnc623192.patch new file mode 100644 index 0000000..e726a19 --- /dev/null +++ b/lxsession-0.4.4-fix-bnc623192.patch @@ -0,0 +1,24 @@ +From b87979e4dfe4279be4f96f7e010ea4c8557f50a6 Mon Sep 17 00:00:00 2001 +From: Marty Jack +Date: Fri, 16 Jul 2010 16:46:58 -0400 +Subject: [PATCH] Soften from g_error to fprintf(stderr) to quiet abrt (Bug3030576) + +--- + lxsession/lxsession.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/lxsession/lxsession.c b/lxsession/lxsession.c +index 17e3ff7..026a30b 100644 +--- a/lxsession/lxsession.c ++++ b/lxsession/lxsession.c +@@ -289,7 +289,7 @@ int main(int argc, char** argv) + else if( G_UNLIKELY( !single_instance_check()) ) + { + /* only one instance is allowed for each X. */ +- g_error( "Only one lxsession can be executed at a time." ); ++ fprintf(stderr, "Only one lxsession can be executed at a time"); + return 1; + } + +-- +1.6.3 diff --git a/lxsession.changes b/lxsession.changes index 6471bff..47627b6 100644 --- a/lxsession.changes +++ b/lxsession.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Jul 17 08:21:07 UTC 2010 - andrea@opensuse.org + +- added lxsession-0.4.4-fix-bnc623192.patch to fix upstream + bug sf#3030576 (bnc#623192) + ------------------------------------------------------------------- Wed Jul 14 08:44:53 UTC 2010 - andrea@opensuse.org diff --git a/lxsession.spec b/lxsession.spec index c8c346f..69fc450 100644 --- a/lxsession.spec +++ b/lxsession.spec @@ -29,6 +29,9 @@ Source0: %{name}-%{version}.tar.bz2 # PATCH-FIX-UPSTREAM lxsession-0.4.4-lock-screen-bnc622083.patch bnc#622083 guido+opensuse.org@berhoerster.name # lxsession-logout should lock the screen before suspending/hibernating/switching users Patch0: %name-0.4.4-lock-screen-bnc622083.patch +# PATCH-FIX-UPSTREAM lxsession-0.4.4-fix-bnc623192.patch bnc#623192 andrea@opensuse.org +# lxsession crasch with signal 6 (SIGABRT) +Patch1: %name-0.4.4-fix-bnc623192.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-glib-devel fdupes gtk2-devel intltool pkg-config BuildRequires: docbook-utils docbook-xsl-stylesheets hal-devel libxslt @@ -46,6 +49,7 @@ Authors: %prep %setup -q -n %name-%version %patch0 -p1 +%patch1 -p1 %build export CFLAGS="$RPM_OPT_FLAGS"