Accepting request 321642 from X11:Utilities

1

OBS-URL: https://build.opensuse.org/request/show/321642
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/x11-tools?expand=0&rev=41

x11-tools.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Aug 10 16:21:52 CEST 2015 - tiwai@suse.de
+
+- Revert xim shebang back to /bin/bash; otherwise too many xim.d
+  scripts got broken (boo#941052)
+
+-------------------------------------------------------------------
+Sun Aug  9 12:55:18 UTC 2015 - ftake@geeko.jp
+
+- fix a bashism in xim (boo#941052)
+
 -------------------------------------------------------------------
 Fri Jul  3 20:24:13 UTC 2015 - eich@suse.com
 

x11-tools.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package x11-tools
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed

xim

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # $Id: xim,v 1.28 2004/12/07 11:04:59 mfabian Exp $
 #
@@ -170,7 +170,7 @@ tmplang=${LC_ALL-${LC_CTYPE-${LANG-en_US}}}
 echo "Trying to start a default input method for the locale $tmplang ..."
 
 subdirlist=$tmplang
-while [ "$tmplang" != ${tmplang%[_.@]*} ]
+while [ "$tmplang" != "${tmplang%[_.@]*}" ]
 do
    tmplang=${tmplang%[_.@]*}
    subdirlist="$subdirlist $tmplang"