[xfce4-session/f19] Add patch for fixing bashisms. Fixes bug 1150207

nonamedotc nonamedotc at fedoraproject.org
Wed Oct 8 23:38:10 UTC 2014


commit 90c221352f726e26d1c388aee8463885f4c5f2ee
Author: nonamedotc <nonamedotc at fedoraproject.org>
Date:   Wed Oct 8 18:38:04 2014 -0500

    Add patch for fixing bashisms. Fixes bug 1150207

 xfce4-session-4.10.1-bashisms.patch |   21 +++++++++++++++++++++
 xfce4-session.spec                  |   11 ++++++++++-
 2 files changed, 31 insertions(+), 1 deletions(-)
---
diff --git a/xfce4-session-4.10.1-bashisms.patch b/xfce4-session-4.10.1-bashisms.patch
new file mode 100644
index 0000000..393e051
--- /dev/null
+++ b/xfce4-session-4.10.1-bashisms.patch
@@ -0,0 +1,21 @@
+diff -Naur xfce4-session-4.10.1.orig/scripts/startxfce4.in xfce4-session-4.10.1/scripts/startxfce4.in
+--- xfce4-session-4.10.1.orig/scripts/startxfce4.in	2014-10-07 18:38:25.720027657 +0200
++++ xfce4-session-4.10.1/scripts/startxfce4.in	2014-10-07 18:40:09.522178389 +0200
+@@ -24,7 +24,7 @@
+   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 @@
+       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"
diff --git a/xfce4-session.spec b/xfce4-session.spec
index 66e3650..193f986 100644
--- a/xfce4-session.spec
+++ b/xfce4-session.spec
@@ -2,7 +2,7 @@
 
 Name:           xfce4-session
 Version:        4.10.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Xfce session manager
 
 Group:          User Interface/Desktops
@@ -13,6 +13,10 @@ Source0:        http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-
 # taken from polkit-gnome, license is LGPLv2+, requires because of
 # http://lists.fedoraproject.org/pipermail/devel-announce/2011-February/000758.html
 Source1:        polkit-gnome-authentication-agent-1.desktop
+# patch to fix bashisms in xfce4-session
+# fixes bug report 1150207 - patch provided by Ralf Corsepius
+# Fix in upstream already done with respect to another bug report - https://bugzilla.xfce.org/show_bug.cgi?id=10828
+Patch3:		xfce4-session-4.10.1-bashisms.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -71,6 +75,8 @@ Additional splash screen engines for the Xfce Session Manager.
 %prep
 %setup -q
 
+%patch3 -p1
+
 %build
 %configure \
 %if 0%{?rhel} > 6 || 0%{?fedora} > 18
@@ -151,6 +157,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/themes/Default/balou/
 
 %changelog
+* Wed Oct 08 2014 Mukundan Ragavan <nonamedotc at fedoraproject.org> - 4.10.1-2
+- Add patch for fixing bashisms. Fixes bug 1150207
+
 * Sun May 05 2013 Kevin Fenzi <kevin at scrye.com> 4.10.1-1
 - Update to 4.10.1, drop upstreamed patches. 
 


More information about the scm-commits mailing list