[lxqt-common/f21] - Validate XDG desktop

[Helio Chissini de Castro]

commit bdb6c23effdc79657c4a715c10dc3ed951d44886
Author: Helio Chissini de Castro <helio at kde.org>
Date:   Mon Dec 22 10:52:02 2014 -0200

    - Validate XDG desktop

 lxqt-common-xdg_data_dir.patch |   26 +++++++++++---------------
 lxqt-common.spec               |    5 ++++-
 2 files changed, 15 insertions(+), 16 deletions(-)
---
diff --git a/lxqt-common-xdg_data_dir.patch b/lxqt-common-xdg_data_dir.patch
index b9307df..e3aab9f 100644
--- a/lxqt-common-xdg_data_dir.patch
+++ b/lxqt-common-xdg_data_dir.patch
@@ -1,18 +1,5 @@
-From c2b1bc7515c00a1bc799e4df136ad0c3617117ae Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Lu=C3=ADs=20Pereira?= <luis.artur.pereira at gmail.com>
-Date: Tue, 15 Jul 2014 16:34:01 -0700
-Subject: [PATCH] Defines XDG_DATA_HOME and XDG_DATA_DIRS environment variables
-
-Implements part of XDG Base Directory Specification:
-http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
----
- startlxqt.in | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/startlxqt.in b/startlxqt.in
-index babc330..5ae26fe 100755
---- a/startlxqt.in
-+++ b/startlxqt.in
+--- lxqt-common-0.8.0/startlxqt.in.xdg-data	2014-08-23 06:12:54.000000000 -0300
++++ lxqt-common-0.8.0/startlxqt.in	2014-12-22 10:49:31.458340077 -0200
 @@ -1,9 +1,17 @@
  #!/bin/sh
  
@@ -31,3 +18,12 @@ index babc330..5ae26fe 100755
  # Ensure the existance of the 'Desktop' folder
  if [ -e "$XDG_CONFIG_HOME/user-dirs.dirs" ]; then
  	. "$XDG_CONFIG_HOME/user-dirs.dirs"
+@@ -32,7 +40,7 @@
+ # use lxde-applications.menu for main app menu
+ export XDG_MENU_PREFIX="lxde-"
+ 
+-export XDG_CURRENT_DESKTOP="LXQt"
++export XDG_CURRENT_DESKTOP="X-LXQt"
+ 
+ # Start the LXQt session
+ exec lxqt-session
diff --git a/lxqt-common.spec b/lxqt-common.spec
index 0426aa9..720225f 100644
--- a/lxqt-common.spec
+++ b/lxqt-common.spec
@@ -7,7 +7,7 @@
 Name:    lxqt-common
 Summary: Common resources for LXQt desktop suite
 Version: 0.8.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: LGPLv2+
 URL:     http://lxqt.org/
 Source0: http://lxqt.org/downloads/lxqt/0.8.0/%{name}-%{version}.tar.xz
@@ -69,6 +69,9 @@ done
 %exclude %{_datadir}/apps/kdm/sessions/lxqt.desktop
 
 %changelog
+* Mon Dec 22 2014 Helio Chissini de Castro <hcastro at redhat.com> - 0.8.0-9
+- Validate XDG desktop entry. Reenable regular sessions
+
 * Fri Dec 19 2014 Helio Chissini de Castro <hcastro at redhat.com> - 0.8.0-8
 - Unify naming as discussed on Fedora IRC