Accepting request 644282 from home:sndirsch:branches:X11:Utilities

- remove hostname's '-f' option since it may fail or - even worse -
  causes timeouts (boo#1113087)

OBS-URL: https://build.opensuse.org/request/show/644282
OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/x11-tools?expand=0&rev=42
This commit is contained in:
Ondřej Súkup 2018-11-06 11:49:16 +00:00 committed by Git OBS Bridge
parent d2ef191268
commit a7b3f25b73
3 changed files with 9 additions and 3 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Oct 24 12:48:26 UTC 2018 - sndirsch@suse.com
- remove hostname's '-f' option since it may fail or - even worse -
causes timeouts (boo#1113087)
-------------------------------------------------------------------
Thu Nov 23 13:54:15 UTC 2017 - rbrown@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package x11-tools
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2018 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
@ -30,7 +30,7 @@ Obsoletes: xf86tools
Version: 0.1
Release: 0
Summary: Tools for the X Window System
License: GPL-2.0+ and MIT
License: GPL-2.0-or-later AND MIT
Group: System/X11/Utilities
Source2: xf86debug
Source31: xim

2
xim
View File

@ -63,7 +63,7 @@ echo "/etc/X11/xim: Checking whether an input method should be started."
adduserenv () {
local cur var=${1+"$@"}
: ${HOSTNAME:=$(hostname -f)}
: ${HOSTNAME:=$(hostname)}
# Use ~/.i18n
if test -e "$HOME/.i18n"; then
echo "/etc/X11/xim: Checking whether an input method is specified in $HOME/.i18n."