Hello community,
here is the log from the commit of package xfce4-session for openSUSE:Factory
checked in at 2014-11-06 16:50:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xfce4-session (Old)
and /work/SRC/openSUSE:Factory/.xfce4-session.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfce4-session"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xfce4-session/xfce4-session.changes
2014-10-22 16:23:15.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xfce4-session.new/xfce4-session.changes
2014-11-06 16:50:58.000000000 +0100
@@ -7,0 +8,8 @@
+Sun Oct 19 18:35:00 UTC 2014 - Led <led...@gmail.com>
+
+- fix bashisms in startxfce4 script (bxo#10828)
+- add patches:
+ * xfce4-session-4.10.1-fix-bashisms.patch (backported from
+ upstream git)
+
+-------------------------------------------------------------------
New:
----
xfce4-session-4.10.1-fix-bashisms.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xfce4-session.spec ++++++
--- /var/tmp/diff_new_pack.l3bPgK/_old 2014-11-06 16:51:00.000000000 +0100
+++ /var/tmp/diff_new_pack.l3bPgK/_new 2014-11-06 16:51:00.000000000 +0100
@@ -34,6 +34,8 @@
Patch2: xfce4-session-systemd-suspend-hibernate-support.patch
# PATCH-FIX-UPSTREAM xfce4-session-set-desktop-name.patch bxo#11239
g...@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
led...@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 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%build
xdt-autogen
++++++ xfce4-session-4.10.1-fix-bashisms.patch ++++++
>From c55ce35bcdb030cd11ac5fe98ec749918e434157 Mon Sep 17 00:00:00 2001
From: Eric Koegel <eric.koe...@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
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
