Accepting request 259740 from X11:xfce

- fix bashisms in startxfce4 script (bxo#10828)
- add patches:
  * xfce4-session-4.10.1-fix-bashisms.patch (backported from
    upstream git)

OBS-URL: https://build.opensuse.org/request/show/259740
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xfce4-session?expand=0&rev=70

xfce4-session-4.10.1-fix-bashisms.patch

@@ -0,0 +1,37 @@
+From c55ce35bcdb030cd11ac5fe98ec749918e434157 Mon Sep 17 00:00:00 2001
+From: Eric Koegel <eric.koegel@gmail.com>
+Date: Sun, 20 Jul 2014 18:09:22 +0300
+Subject: Non-POSIX compliant test used in startxfce4 (Bug 10828)
+
+Patch and bug report by seejay
+The command line arguments "--help" and "--with-ck-launch"
+can't be used on systems which have a non-bash /bin/sh
+(e.g. Debian, as far as I'm aware). This is due to the use
+of "=="  instead of "=" in test commands, which is a bash
+extension.
+
+diff --git a/scripts/startxfce4.in b/scripts/startxfce4.in
+index b346d8f..d0a74a9 100644
+--- a/scripts/startxfce4.in
++++ b/scripts/startxfce4.in
+@@ -24,7 +24,7 @@ then
+   OPTS=""
+   for OPT in $*
+   do
+-    if test "x$OPT" == "x--help"
++    if test "x$OPT" = "x--help"
+     then
+       # print help and exit
+       echo "Usage:"
+@@ -37,7 +37,7 @@ then
+       echo
+ 
+       exit 0
+-    elif test "x$OPT" == "x--with-ck-launch"
++    elif test "x$OPT" = "x--with-ck-launch"
+     then
+       # try to launch xfce4-session with ck-launch-session in xinitrc
+       XFCE4_SESSION_WITH_CK="1"
+-- 
+cgit v0.10.1
+

xfce4-session.changes

@@ -4,6 +4,14 @@ Mon Oct 20 19:03:13 UTC 2014 - gber@opensuse.org
 - fix typo in xfce4-session-set-desktop-name.patch.changes,
   DesktopNames instead of DesktopName
 
+-------------------------------------------------------------------
+Sun Oct 19 18:35:00 UTC 2014 - Led <ledest@gmail.com>
+
+- fix bashisms in startxfce4 script (bxo#10828)
+- add patches:
+  * xfce4-session-4.10.1-fix-bashisms.patch (backported from
+    upstream git)
+
 -------------------------------------------------------------------
 Sun Oct 19 08:27:57 UTC 2014 - gber@opensuse.org
 

xfce4-session.spec

@@ -34,6 +34,8 @@ Patch1:         xfce4-session-adapt-session-scripts.patch
 Patch2:         xfce4-session-systemd-suspend-hibernate-support.patch
 # PATCH-FIX-UPSTREAM xfce4-session-set-desktop-name.patch bxo#11239 gber@opensuse.org -- Set DesktopNames property in the xsession file
 Patch3:         xfce4-session-set-desktop-name.patch
+# PATCH-FIX-UPSTREAM xfce4-session-4.10.1-fix-bashisms.patch bxo#10828 ledest@gmail.com -- Fix bashisms in startxfce4 script (backported from upstream git)
+Patch4:         xfce4-session-4.10.1-fix-bashisms.patch
 BuildRequires:  iceauth
 BuildRequires:  intltool
 BuildRequires:  update-desktop-files
@@ -123,6 +125,7 @@ This package provides the upstream look and feel for the Xfce Session Manager.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 xdt-autogen