Hello community, here is the log from the commit of package live-langset-data for openSUSE:Factory checked in at 2017-12-12 21:23:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/live-langset-data (Old) and /work/SRC/openSUSE:Factory/.live-langset-data.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "live-langset-data" Tue Dec 12 21:23:57 2017 rev:3 rq:556456 version:2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/live-langset-data/live-langset-data.changes 2017-12-01 15:54:31.802111364 +0100 +++ /work/SRC/openSUSE:Factory/.live-langset-data.new/live-langset-data.changes 2017-12-12 21:24:03.183289326 +0100 @@ -1,0 +2,9 @@ +Tue Dec 12 09:29:39 UTC 2017 - fvogt@suse.com + +- Bump version to 2.0 +- Do not change sysconfig values anymore, use localectl instead + (boo#1072237) +- Also adjust /etc/localtime based on the TIMEZONE +- Change the internal langset data format to make sourcing possible + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ live-langset-data.spec ++++++ --- /var/tmp/diff_new_pack.OpVn70/_old 2017-12-12 21:24:04.683216918 +0100 +++ /var/tmp/diff_new_pack.OpVn70/_new 2017-12-12 21:24:04.687216725 +0100 @@ -17,7 +17,7 @@ Name: live-langset-data -Version: 1.0 +Version: 2.0 Release: 0 Summary: Scripts and data to allow locale switching in live media License: GPL-2.0 ++++++ getcountrydata.rb ++++++ --- /var/tmp/diff_new_pack.OpVn70/_old 2017-12-12 21:24:04.719215180 +0100 +++ /var/tmp/diff_new_pack.OpVn70/_new 2017-12-12 21:24:04.723214987 +0100 @@ -33,21 +33,21 @@ magic = consolefont[3] || "" timezone = timezonemap[lang] || "" contents = - "RC_LANG: #{fqlanguage}\n" + - "CONSOLE_FONT: #{font}\n" + - "CONSOLE_SCREENMAP: #{screenMap}\n" + - "CONSOLE_UNICODEMAP: #{unicodeMap}\n" + - "CONSOLE_MAGIC: #{magic}\n" + - "KEYTABLE: #{Keyboard.keymap}\n" + - "YAST_KEYBOARD: #{yast_kbd}\n" + - "COMPOSETABLE: #{Keyboard.compose_table}\n" + - "TIMEZONE: #{timezone}\n" + - "CONSOLE_ENCODING: #{WFM.GetEncoding}" + "RC_LANG='#{fqlanguage}'\n" + + "CONSOLE_FONT='#{font}'\n" + + "CONSOLE_SCREENMAP='#{screenMap}'\n" + + "CONSOLE_UNICODEMAP='#{unicodeMap}'\n" + + "CONSOLE_MAGIC='#{magic}'\n" + + "KEYTABLE='#{Keyboard.keymap}'\n" + + "YAST_KEYBOARD='#{yast_kbd}'\n" + + "COMPOSETABLE='#{Keyboard.compose_table}'\n" + + "TIMEZONE='#{timezone}'\n" + + "CONSOLE_ENCODING='#{WFM.GetEncoding}'" - contents << "\nRC_LC_MESSAGES: zh_TW.UTF-8" if lang == "zh_HK" + contents << "\nRC_LC_MESSAGES='zh_TW.UTF-8'" if lang == "zh_HK" x11data = Keyboard.GetX11KeyData(Keyboard.keymap) Builtins.foreach(x11data) do |key, val| - contents << "\n#{key}: #{val}" + contents << "\n#{key}='#{val}'" end contents << "\n" SCR.Write(path(".target.string"), dir + "/" + fqlanguage, contents) ++++++ langset.sh ++++++ --- /var/tmp/diff_new_pack.OpVn70/_old 2017-12-12 21:24:04.775212477 +0100 +++ /var/tmp/diff_new_pack.OpVn70/_new 2017-12-12 21:24:04.775212477 +0100 @@ -18,32 +18,24 @@ file="/usr/share/langset/$Language" fi -layout= -model= -variant= -options= -sed -e 's,: *,:,' "$file" | while read line; do - key=`echo $line | cut -d: -f1` - value=`echo $line | cut -d: -f2-` - - if [ "$key" = "XkbLayout" ]; then - layout="$value" - elif [ "$key" = "XkbModel" ]; then - model="$value" - elif [ "$key" = "XkbVariant" ]; then - variant="$value" - elif [ "$key" = "XkbOptions" ]; then - options="$value" - fi - - sed -i -e "s#$key=\".*#$key=\"$value\"#" /etc/sysconfig/language - sed -i -e "s#$key=\".*#$key=\"$value\"#" /etc/sysconfig/keyboard - sed -i -e "s#$key=\".*#$key=\"$value\"#" /etc/sysconfig/console - - if [ -n "$layout" ] && [ -n "$model" ] && [ -n "$variant" ] && [ -n "$options" ]; then - localectl set-x11-keymap "$layout" "$model" "$variant" "$options" - fi -done +# Read all values of the langset data files +. "$file" + +# 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 "$CONSOLE_FONT" ] || echo "FONT=$CONSOLE_FONT" >> /etc/vconsole.conf +[ -z "$CONSOLE_SCREENMAP" ] || echo "FONT_MAP=$CONSOLE_SCREENMAP" >> /etc/vconsole.conf +[ -z "$CONSOLE_UNICODEMAP" ] || echo "FONT_UNIMAP=$CONSOLE_UNICODEMAP" >> /etc/vconsole.conf + +[ -z "$KEYTABLE" ] || localectl set-keymap $KEYTABLE + +[ -n "$TIMEZONE" ] && [ -f "/usr/share/zoneinfo/$TIMEZONE" ] && rm -f /etc/localtime && ln -s /usr/share/zonezinfo/$TIMEZONE /etc/localtime + +if [ -n "$XkbLayout" ] && [ -n "$XkbModel" ] && [ -n "$XkbVariant" ] && [ -n "$XkbOptions" ]; then + localectl set-x11-keymap "$XkbLayout" "$XkbModel" "$XkbVariant" "$XkbOptions" +fi echo "$Language""_$Country" > /var/lib/zypp/RequestedLocales