From f744f0b19228d194b981aaa12d1f575feae6e8c3ce1484ae7f416019fe8ffa7d Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Mon, 7 Jan 2019 16:21:11 +0000 Subject: [PATCH] - Only set RC_LANG and RC_LC_MESSAGES on SLE 12 (bsc#1119420) OBS-URL: https://build.opensuse.org/package/show/system:install:head/live-langset-data?expand=0&rev=23 --- langset.sh | 12 ++++++++++-- live-langset-data.changes | 5 +++++ live-langset-data.spec | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/langset.sh b/langset.sh index 4d7b1fa..2e3f8fb 100644 --- a/langset.sh +++ b/langset.sh @@ -64,8 +64,16 @@ set_sysconfig_option() { [ -z "$CONSOLE_FONT" ] || set_sysconfig_option CONSOLE_FONT "$CONSOLE_FONT" [ -z "$CONSOLE_SCREENMAP" ] || set_sysconfig_option CONSOLE_SCREENMAP "$CONSOLE_SCREENMAP" [ -z "$CONSOLE_UNICODEMAP" ] || set_sysconfig_option CONSOLE_UNICODEMAP "$CONSOLE_UNICODEMAP" -[ -z "$RC_LANG" ] || set_sysconfig_option RC_LANG "$RC_LANG" -[ -z "$RC_LC_MESSAGES" ] || set_sysconfig_option RC_LC_MESSAGES "$RC_LC_MESSAGES" + +# If those are set, locale.conf is ignored - so only set them if necessary (i.e. <= 12 base) +# bsc#1119420 +[ -f /usr/lib/os-release ] && . /usr/lib/os-release +[ -f /etc/os-release ] && . /etc/os-release +if [ -n "$VERSION_ID" ] && [ "${VERSION_ID%%.*}" -le 12 ]; then + [ -z "$RC_LANG" ] || set_sysconfig_option RC_LANG "$RC_LANG" + [ -z "$RC_LC_MESSAGES" ] || set_sysconfig_option RC_LC_MESSAGES "$RC_LC_MESSAGES" +fi + [ -z "$KEYTABLE" ] || set_sysconfig_option KEYTABLE "$KEYTABLE" [ -z "$COMPOSETABLE" ] || set_sysconfig_option COMPOSETABLE "$COMPOSETABLE" diff --git a/live-langset-data.changes b/live-langset-data.changes index 82c2291..d4e769d 100644 --- a/live-langset-data.changes +++ b/live-langset-data.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jan 7 16:19:54 UTC 2019 - Fabian Vogt + +- Only set RC_LANG and RC_LC_MESSAGES on SLE 12 (bsc#1119420) + ------------------------------------------------------------------- Thu Nov 8 12:48:15 UTC 2018 - Fabian Vogt diff --git a/live-langset-data.spec b/live-langset-data.spec index 251cfe6..c65b64a 100644 --- a/live-langset-data.spec +++ b/live-langset-data.spec @@ -1,7 +1,7 @@ # # spec file for package live-langset-data # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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