From 4926d34a97564292ff96bf1e9c396f1c43ea57c21ccb8382a2d02586434be415 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.com>
Date: Tue, 15 Nov 2022 11:01:12 +0000
Subject: [PATCH] - Drop support for /etc/sysconfig/language (12.x), it was
 activated   in staging projects by accident ("Tumbleweed 1")

OBS-URL: https://build.opensuse.org/package/show/system:install:head/live-langset-data?expand=0&rev=36
---
 langset.sh                | 10 ----------
 live-langset-data.changes |  6 ++++++
 live-langset-data.spec    |  4 ++++
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/langset.sh b/langset.sh
index 32accaa..20f67a9 100644
--- a/langset.sh
+++ b/langset.sh
@@ -60,7 +60,6 @@ set_vconsole_option() {
 
 # set_sysconfig_option KEY value
 set_sysconfig_option() {
-	sed -i -e "s#$1=\".*#$1=\"$2\"#" /etc/sysconfig/language
 	sed -i -e "s#$1=\".*#$1=\"$2\"#" /etc/sysconfig/keyboard
 	sed -i -e "s#$1=\".*#$1=\"$2\"#" /etc/sysconfig/console
 }
@@ -70,15 +69,6 @@ set_sysconfig_option() {
 [ -z "$CONSOLE_SCREENMAP" ] || set_sysconfig_option CONSOLE_SCREENMAP "$CONSOLE_SCREENMAP"
 [ -z "$CONSOLE_UNICODEMAP" ] || set_sysconfig_option CONSOLE_UNICODEMAP "$CONSOLE_UNICODEMAP"
 
-# 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 8a7e1e3..a3f7abd 100644
--- a/live-langset-data.changes
+++ b/live-langset-data.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Nov 15 10:57:55 UTC 2022 - Fabian Vogt <fvogt@suse.com>
+
+- Drop support for /etc/sysconfig/language (12.x), it was activated
+  in staging projects by accident ("Tumbleweed 1")
+
 -------------------------------------------------------------------
 Mon Sep 26 13:54:57 UTC 2022 - Fabian Vogt <fvogt@suse.com>
 
diff --git a/live-langset-data.spec b/live-langset-data.spec
index 5749c20..aca6ffd 100644
--- a/live-langset-data.spec
+++ b/live-langset-data.spec
@@ -32,6 +32,10 @@ BuildRequires:  systemd-rpm-macros
 BuildRequires:  yast2-country
 # Needed for X11 keyboard data
 BuildRequires:  yast2-x11
+# Support for /etc/sysconfig/language was dropped
+%if 0%{?suse_version} < 1500
+BuildRequires:  newer-distro
+%endif
 Requires:       sed
 Requires:       systemd
 BuildArch:      noarch