From f4ab50bfb7028625de4b972036856b38969dd6a0616a4344ffc6d1caf864d565 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 10 Aug 2015 08:08:44 +0000 Subject: [PATCH 1/2] Accepting request 321468 from home:ftake:branches:X11:Utilities fix for boo#941052 OBS-URL: https://build.opensuse.org/request/show/321468 OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/x11-tools?expand=0&rev=34 --- x11-tools.changes | 5 +++++ xim | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/x11-tools.changes b/x11-tools.changes index eeae36c..a945a1d 100644 --- a/x11-tools.changes +++ b/x11-tools.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/xim b/xim index 5cac093..ce661b2 100644 --- a/xim +++ b/xim @@ -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" From 0ceff1622b6fe4938985dd6387710da83c9aa1ff9c051b49fb97cf3557766402 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Mon, 10 Aug 2015 14:30:25 +0000 Subject: [PATCH 2/2] Accepting request 321639 from home:tiwai:branches:X11:Utilities - Revert xim shebang back to /bin/bash; otherwise too many xim.d scripts got broken (boo#941052) OBS-URL: https://build.opensuse.org/request/show/321639 OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/x11-tools?expand=0&rev=35 --- x11-tools.changes | 6 ++++++ x11-tools.spec | 2 +- xim | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/x11-tools.changes b/x11-tools.changes index a945a1d..c5ad77e 100644 --- a/x11-tools.changes +++ b/x11-tools.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/x11-tools.spec b/x11-tools.spec index ce00cdb..cf9b7ba 100644 --- a/x11-tools.spec +++ b/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 diff --git a/xim b/xim index ce661b2..a458332 100644 --- a/xim +++ b/xim @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # $Id: xim,v 1.28 2004/12/07 11:04:59 mfabian Exp $ #