From 458061ee1c25a3389396f21abf5d3152503e4782b19835fdfd69e6f8e41a983c Mon Sep 17 00:00:00 2001 From: andrea florio Date: Sun, 30 Nov 2014 10:24:00 +0000 Subject: [PATCH] Accepting request 263502 from home:jcsl:LXDE - New upstream version 0.5.2 * Fixed bugs #692, #697, and #705 * Merged patches #454, #453, and #456 * Added ESCAPE key to close the lxsession-logout menu * Added some environment variables for LXQt and Qt * Translation updates * patches removed since now in upstream code + lxsession-0.5.1-duplicate-lxpolkit-invocation-fix.patch + lxsession-0.5.1-lxsession-db-SF692-fix.patch * Raise VALAC version requirement to 0.16 * Applied spec-clean OBS-URL: https://build.opensuse.org/request/show/263502 OBS-URL: https://build.opensuse.org/package/show/X11:lxde/lxsession?expand=0&rev=77 --- ....1-duplicate-lxpolkit-invocation-fix.patch | 25 -------- lxsession-0.5.1-lxsession-db-SF692-fix.patch | 57 ------------------- lxsession-0.5.1.tar.xz | 3 - lxsession-0.5.2.tar.xz | 3 + lxsession.changes | 29 ++++++++++ lxsession.spec | 19 +++---- 6 files changed, 40 insertions(+), 96 deletions(-) delete mode 100644 lxsession-0.5.1-duplicate-lxpolkit-invocation-fix.patch delete mode 100644 lxsession-0.5.1-lxsession-db-SF692-fix.patch delete mode 100644 lxsession-0.5.1.tar.xz create mode 100644 lxsession-0.5.2.tar.xz diff --git a/lxsession-0.5.1-duplicate-lxpolkit-invocation-fix.patch b/lxsession-0.5.1-duplicate-lxpolkit-invocation-fix.patch deleted file mode 100644 index 598ec25..0000000 --- a/lxsession-0.5.1-duplicate-lxpolkit-invocation-fix.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 486e8b5221d214a491ac41e8b0ee1adba8f0a8d6 Mon Sep 17 00:00:00 2001 -From: Andriy Grytsenko -Date: Mon, 20 Oct 2014 15:34:20 +0300 -Subject: [PATCH] Fix duplicate lxpolkit invocation by setting Hidden=true in - lxpolkit.desktop. - -It supposed to be autostarted if set to, but lxsession even without -built-in one handles that differently. So let it be hidden always. ---- - data/lxpolkit.desktop.in.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/data/lxpolkit.desktop.in.in b/data/lxpolkit.desktop.in.in -index 40c1269..b86b1df 100644 ---- a/data/lxpolkit.desktop.in.in -+++ b/data/lxpolkit.desktop.in.in -@@ -6,4 +6,4 @@ Exec=lxpolkit - TryExec=lxpolkit - Icon=gtk-dialog-authentication - NotShowIn=GNOME;KDE; --Hidden=@HIDE_LXPOLKIT_AUTOSTART@ -+Hidden=true --- -1.7.10.4 - diff --git a/lxsession-0.5.1-lxsession-db-SF692-fix.patch b/lxsession-0.5.1-lxsession-db-SF692-fix.patch deleted file mode 100644 index 9c3385b..0000000 --- a/lxsession-0.5.1-lxsession-db-SF692-fix.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 04a5a75ba10adeee261dc46a78314a08cfe093f3 Mon Sep 17 00:00:00 2001 -From: Julien Lavergne -Date: Mon, 20 Oct 2014 00:17:36 +0200 -Subject: [PATCH] Correctly connect and emit signals for lxsession-db (sould - really fix #692) - ---- - lxsession-db/desktop-files-backend.vala | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/lxsession-db/desktop-files-backend.vala b/lxsession-db/desktop-files-backend.vala -index be9622b..1e538e4 100644 ---- a/lxsession-db/desktop-files-backend.vala -+++ b/lxsession-db/desktop-files-backend.vala -@@ -186,7 +186,7 @@ namespace Lxsession - - public void on_finish_scanning_installed() - { -- message("Signal finish scanning with mode: %s",this.mode); -+ message("Signal finish scanning installed with mode: %s",this.mode); - if (this.mode == "display") - { - print_values_installed (); -@@ -206,7 +206,7 @@ namespace Lxsession - - public void on_finish_scanning_available() - { -- message("Signal finish scanning with mode: %s",this.mode); -+ message("Signal finish scanning available with mode: %s",this.mode); - if (this.mode == "display") - { - global_db.print_values_available (); -@@ -263,6 +263,7 @@ namespace Lxsession - else - { - message ("%s doesn't exist. Pass", folder); -+ finish_scanning_available(); - } - } - } -@@ -274,11 +275,11 @@ namespace Lxsession - - public void update () - { -- update_installed(); - finish_scanning_installed.connect(on_finish_scanning_installed); -+ finish_scanning_available.connect(on_finish_scanning_available); - -+ update_installed(); - update_available(); -- finish_scanning_available.connect(on_finish_scanning_available); - } - - private async void list_desktop_files (string path, string mode) --- -1.7.10.4 - diff --git a/lxsession-0.5.1.tar.xz b/lxsession-0.5.1.tar.xz deleted file mode 100644 index 68e5cac..0000000 --- a/lxsession-0.5.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7a9c58a0d9cecc943441c0e8c4cde06516d14b7e370f9aeacebafd9f386badc7 -size 345568 diff --git a/lxsession-0.5.2.tar.xz b/lxsession-0.5.2.tar.xz new file mode 100644 index 0000000..9a08f88 --- /dev/null +++ b/lxsession-0.5.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2d55e9ea80057fe5ffd68a91a15bb004ad7bf019e50807a8bb9b342115efaada +size 354092 diff --git a/lxsession.changes b/lxsession.changes index 20fdac5..690c996 100644 --- a/lxsession.changes +++ b/lxsession.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Sun Nov 30 09:08:33 UTC 2014 - trcs@gmx.com + +- New upstream version 0.5.2 + * Use _CPPFLAGS instead of _CFLAGS + * If .c files are in CLEANFILES then .stamp files should be there + too + * Fix FSF address (fix #697) + * Fix lock in lxsession-default and add lock_manager option in + lxsession-default (fix #705) + * Fix gtk3 compilation, and merge patches #454 and #453 + * Add .c files generated by vala, to be able to pass --enable + flags + * Create lock file to prevent more than one logout dialog (patch + from Martin Thornton #456) + * Added ESCAPE key to close the lxsession-logout menu + * Add some environment variables for LXQt and Qt + * Fix duplicate lxpolkit invocation by setting Hidden=true in + lxpolkit.desktop. + * Correctly connect and emit signals for lxsession-db (should + really fix #692) + * Translation updates + * patches removed since now in upstream code + + lxsession-0.5.1-duplicate-lxpolkit-invocation-fix.patch + + lxsession-0.5.1-lxsession-db-SF692-fix.patch + * Raise VALAC version requirement, it doesn't compile with 0.14, + needs 0.16 + * Applied spec-clean + ------------------------------------------------------------------- Thu Oct 23 18:39:34 UTC 2014 - trcs@gmx.com diff --git a/lxsession.spec b/lxsession.spec index 8d502a8..1998e30 100644 --- a/lxsession.spec +++ b/lxsession.spec @@ -1,7 +1,7 @@ # # spec file for package lxsession # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,15 +17,13 @@ Name: lxsession -Version: 0.5.1 +Version: 0.5.2 Release: 0 Summary: LXDE Session Manager, required for running the desktop environment License: GPL-2.0 Group: System/GUI/LXDE Url: http://www.lxde.org/ Source: %{name}-%{version}.tar.xz -Patch0: lxsession-0.5.1-duplicate-lxpolkit-invocation-fix.patch -Patch1: lxsession-0.5.1-lxsession-db-SF692-fix.patch BuildRequires: dbus-1-glib-devel BuildRequires: docbook-utils BuildRequires: docbook-xsl-stylesheets @@ -34,14 +32,15 @@ BuildRequires: gtk2-devel BuildRequires: intltool BuildRequires: libgee-devel BuildRequires: libtool +BuildRequires: libunique1-devel BuildRequires: libxslt BuildRequires: pkg-config BuildRequires: polkit-devel -BuildRequires: vala >= 0.14 -Obsoletes: lxsession-edit <= 0.2.0 -Obsoletes: lxpolkit <= 0.1.0 -Provides: lxsession-edit > 0.2.0 -Provides: lxpolkit > 0.1.0 +BuildRequires: vala >= 0.16 +Obsoletes: lxsession-edit <= 0.2.0 +Obsoletes: lxpolkit <= 0.1.0 +Provides: lxsession-edit > 0.2.0 +Provides: lxpolkit > 0.1.0 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -52,8 +51,6 @@ use when a user logs out and to restart them the next time the user logs in. %prep %setup -q -%patch0 -p1 -%patch1 -p1 %build %configure \