1
0
forked from pool/xfce4-session

Accepting request 259713 from home:Ledest:misc

fix bashisms in startxfce4 script

OBS-URL: https://build.opensuse.org/request/show/259713
OBS-URL: https://build.opensuse.org/package/show/X11:xfce/xfce4-session?expand=0&rev=121
This commit is contained in:
Guido Berhoerster 2014-11-05 07:44:05 +00:00 committed by Git OBS Bridge
parent 3da151789e
commit 8fe49b35b8
3 changed files with 30 additions and 0 deletions

View File

@ -0,0 +1,21 @@
diff -Ndurp xfce4-session-4.10.1/scripts/startxfce4.in xfce4-session-4.10.1-fix-bashisms/scripts/startxfce4.in
--- xfce4-session-4.10.1/scripts/startxfce4.in 2013-05-05 18:33:55.000000000 +0300
+++ xfce4-session-4.10.1-fix-bashisms/scripts/startxfce4.in 2014-10-19 21:33:03.205621315 +0300
@@ -24,7 +24,7 @@ then
OPTS=""
for OPT in $*
do
- if test "x$OPT" == "x--help"
+ if [ "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 [ "x$OPT" = "x--with-ck-launch" ]
then
# try to launch xfce4-session with ck-launch-session in xinitrc
XFCE4_SESSION_WITH_CK="1"

View File

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

View File

@ -34,6 +34,7 @@ Patch1: xfce4-session-adapt-session-scripts.patch
Patch2: xfce4-session-systemd-suspend-hibernate-support.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 # 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 Patch3: xfce4-session-set-desktop-name.patch
Patch4: xfce4-session-4.10.1-fix-bashisms.patch
BuildRequires: iceauth BuildRequires: iceauth
BuildRequires: intltool BuildRequires: intltool
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
@ -123,6 +124,7 @@ This package provides the upstream look and feel for the Xfce Session Manager.
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1
%build %build
xdt-autogen xdt-autogen