Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package live-langset-data for
openSUSE:Factory checked in at 2024-05-09 12:07:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/live-langset-data (Old)
and /work/SRC/openSUSE:Factory/.live-langset-data.new.1880 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "live-langset-data"
Thu May 9 12:07:22 2024 rev:20 rq:1172452 version:3.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/live-langset-data/live-langset-data.changes
2022-12-25 15:14:23.745217820 +0100
+++
/work/SRC/openSUSE:Factory/.live-langset-data.new.1880/live-langset-data.changes
2024-05-09 12:07:25.076881963 +0200
@@ -1,0 +2,12 @@
+Tue May 7 09:30:42 UTC 2024 - Fabian Vogt <[email protected]>
+
+- Switch from yast2-country (getcountrydata.rb) to python-langtable
+ (getcountrydata.py). Effective changes:
+ * Remove writing to /etc/sysconfig/{console,keyboard}
+ * Remove CONSOLE_SCREENMAP, CONSOLE_UNICODEMAP, CONSOLE_MAGIC
+ and RC_LC_MESSAGES
+ * Uses different keyboard layouts and console fonts for some locales
+ * Drops the file extension from CONSOLE_FONT
+- Relicense to GPL-3.0-or-later
+
+-------------------------------------------------------------------
Old:
----
getcountrydata.rb
gpl-2.0.txt
New:
----
getcountrydata.py
gpl-3.0.txt
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ live-langset-data.spec ++++++
--- /var/tmp/diff_new_pack.1ze0JL/_old 2024-05-09 12:07:28.805017455 +0200
+++ /var/tmp/diff_new_pack.1ze0JL/_new 2024-05-09 12:07:28.805017455 +0200
@@ -1,7 +1,7 @@
#
# spec file for package live-langset-data
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,21 +17,19 @@
Name: live-langset-data
-Version: 2.0
+Version: 3.0
Release: 0
Summary: Scripts and data to allow locale switching in live media
-License: GPL-2.0-only
+License: GPL-3.0-or-later
Group: System/YaST
-URL:
https://build.opensuse.org/package/show/openSUSE:Factory:Live/live-langset-data
+URL:
https://build.opensuse.org/package/show/system:install:head/live-langset-data
Source1: langset.sh
Source2: langset.service
-Source3: getcountrydata.rb
-Source4: gpl-2.0.txt
+Source3: getcountrydata.py
+Source4: gpl-3.0.txt
BuildRequires: coreutils
+BuildRequires: python3-langtable
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
@@ -42,8 +40,8 @@
%{?systemd_requires}
%description
-This package contains scripts and data to allow setting the locale (+ console
font and keyboard
-layout) on live media.
+This package contains scripts and data to allow setting the locale (+ console
font, keyboard
+layout and timezone) on live media.
%prep
%setup -q -T -c
@@ -51,12 +49,13 @@
%build
mkdir output
-OUTPUTDIR=$PWD/output %{_prefix}/lib/YaST2/bin/y2start %{SOURCE3} UI
+cd output
+python3 %{SOURCE3}
%install
pushd output
for i in *; do
- install -Dm 644 $i %{buildroot}/%{_datadir}/langset/${i/.UTF-8}
+ install -Dm 644 $i %{buildroot}/%{_datadir}/langset/${i}
done
popd
install -Dm 755 %{SOURCE1} %{buildroot}%{_sbindir}/langset.sh
@@ -75,7 +74,7 @@
%service_del_postun langset.service
%files
-%doc gpl-2.0.txt
+%doc gpl-3.0.txt
%{_datadir}/langset
%{_sbindir}/langset.sh
%{_unitdir}/langset.service
++++++ getcountrydata.py ++++++
import langtable
# Originally from YaST's list
locales = ["af_ZA", "ar_EG", "ast_ES", "bg_BG", "bn_BD", "bs_BA", "ca_ES",
"cs_CZ", "cy_GB",
"da_DK", "de_DE", "el_GR", "en_GB", "en_US", "es_ES", "et_EE",
"fa_IR", "fi_FI",
"fr_FR", "gl_ES", "gu_IN", "he_IL", "hi_IN", "hr_HR", "hu_HU",
"id_ID", "it_IT",
"ja_JP", "ka_GE", "km_KH", "ko_KR", "lt_LT", "mk_MK", "mr_IN",
"nb_NO", "nl_NL",
"nn_NO", "pa_IN", "pl_PL", "pt_BR", "pt_PT", "ro_RO", "ru_RU",
"si_LK", "sk_SK",
"sl_SI", "sr_RS", "sv_SE", "ta_IN", "tg_TJ", "th_TH", "tr_TR",
"uk_UA", "vi_VN",
"wa_BE", "xh_ZA", "zh_CN", "zh_TW", "zu_ZA"]
for locale in locales:
consolefont = langtable.list_consolefonts(languageId=locale)[0]
keytable = langtable.list_keyboards(languageId=locale)[0]
keytable = keytable.translate(str.maketrans('(', '-', ')')) # fr(oss) ->
fr-oss
timezone = langtable.list_timezones(languageId=locale)[0]
with open(locale, "w") as f:
f.write(f"""RC_LANG='{locale}.UTF-8'
CONSOLE_FONT='{consolefont}'
KEYTABLE='{keytable}'
TIMEZONE='{timezone}'
""")
++++++ gpl-2.0.txt -> gpl-3.0.txt ++++++
++++ 954 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/live-langset-data/gpl-2.0.txt
++++ and /work/SRC/openSUSE:Factory/.live-langset-data.new.1880/gpl-3.0.txt
++++++ langset.sh ++++++
--- /var/tmp/diff_new_pack.1ze0JL/_old 2024-05-09 12:07:28.893020654 +0200
+++ /var/tmp/diff_new_pack.1ze0JL/_new 2024-05-09 12:07:28.897020799 +0200
@@ -45,12 +45,8 @@
# Read all values of the langset data files
. "$file"
-# Chop the extension off
-KEYTABLE="${KEYTABLE%%.map*}"
-
# Apply all options
-[ -n "$RC_LC_MESSAGES" ] || RC_LC_MESSAGES=$RC_LANG
-[ -z "$RC_LANG" ] || localectl set-locale LANG=$RC_LANG
LC_MESSAGES=$RC_LC_MESSAGES
+[ -z "$RC_LANG" ] || localectl set-locale LANG=$RC_LANG
# set_vconsole_option KEY value
set_vconsole_option() {
@@ -61,26 +57,6 @@
}
[ -z "$CONSOLE_FONT" ] || set_vconsole_option FONT "$CONSOLE_FONT"
-[ -z "$CONSOLE_SCREENMAP" ] || set_vconsole_option FONT_MAP
"$CONSOLE_SCREENMAP"
-[ -z "$CONSOLE_UNICODEMAP" ] || set_vconsole_option FONT_UNIMAP
"$CONSOLE_UNICODEMAP"
-
-# set_sysconfig_option KEY value
-set_sysconfig_option() {
- sed -i -e "s#$1=\".*#$1=\"$2\"#" /etc/sysconfig/keyboard
- sed -i -e "s#$1=\".*#$1=\"$2\"#" /etc/sysconfig/console
-}
-
-# Set legacy sysconfig values for backwards-compat
-if [ -e /etc/sysconfig/console ]; then
- [ -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"
-fi
-
-if [ -e /etc/sysconfig/keyboard ]; then
- [ -z "$KEYTABLE" ] || set_sysconfig_option KEYTABLE "$KEYTABLE"
- [ -z "$COMPOSETABLE" ] || set_sysconfig_option COMPOSETABLE
"$COMPOSETABLE"
-fi
# Try the lang-provided keytable first
[ -z "$KEYTABLE" ] || localectl set-keymap $KEYTABLE
