Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package yast2-country for openSUSE:Factory
checked in at 2021-05-07 16:44:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-country (Old)
and /work/SRC/openSUSE:Factory/.yast2-country.new.2988 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-country"
Fri May 7 16:44:56 2021 rev:221 rq:890360 version:4.4.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-country/yast2-country.changes
2021-03-30 20:50:03.564026204 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-country.new.2988/yast2-country.changes
2021-05-07 16:45:00.732435352 +0200
@@ -1,0 +2,11 @@
+Tue Apr 20 13:51:55 UTC 2021 - Ladislav Slez??k <lsle...@suse.cz>
+
+- 4.4.0 (bsc#1185510)
+
+-------------------------------------------------------------------
+Thu Mar 11 14:13:56 UTC 2021 - Josef Reidinger <jreidin...@suse.com>
+
+- Fix wrong xkb codes (bsc#1181952)
+- 4.3.14
+
+-------------------------------------------------------------------
Old:
----
yast2-country-4.3.13.tar.bz2
New:
----
yast2-country-4.4.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-country.spec ++++++
--- /var/tmp/diff_new_pack.sWbf1C/_old 2021-05-07 16:45:01.240433012 +0200
+++ /var/tmp/diff_new_pack.sWbf1C/_new 2021-05-07 16:45:01.244432994 +0200
@@ -17,7 +17,7 @@
Name: yast2-country
-Version: 4.3.13
+Version: 4.4.0
Release: 0
Summary: YaST2 - Country Settings (Language, Keyboard, and Timezone)
License: GPL-2.0-only
@@ -38,6 +38,9 @@
BuildRequires: yast2-ruby-bindings >= 3.1.26
# Yast2::CommandLine readonly parameter
BuildRequires: yast2 >= 4.2.57
+# systemd-mini does not add the xkb generated map which is needed by
+# the Keyboards.all_keyboards unit/integration test
+BuildRequires: systemd
Requires: timezone
Requires: yast2-perl-bindings
++++++ yast2-country-4.3.13.tar.bz2 -> yast2-country-4.4.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-country-4.3.13/keyboard/src/data/keyboards.rb
new/yast2-country-4.4.0/keyboard/src/data/keyboards.rb
--- old/yast2-country-4.3.13/keyboard/src/data/keyboards.rb 2021-03-10
10:41:02.000000000 +0100
+++ new/yast2-country-4.4.0/keyboard/src/data/keyboards.rb 2021-05-04
15:00:31.000000000 +0200
@@ -207,7 +207,7 @@
},
{ "description" => _("Ukrainian"),
"alias" => "ukrainian",
- "code" => "ua"
+ "code" => "ua-utf"
},
{ "description" => _("Khmer"),
"alias" => "khmer",
@@ -227,11 +227,11 @@
},
{ "description" => _("Traditional Chinese"),
"alias" => "taiwanese",
- "code" => "taiwanese"
+ "code" => "tw"
},
{ "description" => _("Simplified Chinese"),
"alias" => "chinese",
- "code" => "chinese"
+ "code" => "cn"
},
{ "description" => _("Romanian"),
"alias" => "romanian",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-country-4.3.13/keyboard/src/lib/y2keyboard/strategies/kb_strategy.rb
new/yast2-country-4.4.0/keyboard/src/lib/y2keyboard/strategies/kb_strategy.rb
---
old/yast2-country-4.3.13/keyboard/src/lib/y2keyboard/strategies/kb_strategy.rb
2021-03-10 10:41:02.000000000 +0100
+++
new/yast2-country-4.4.0/keyboard/src/lib/y2keyboard/strategies/kb_strategy.rb
2021-05-04 15:00:31.000000000 +0200
@@ -78,7 +78,7 @@
x11data = get_x11_data(keyboard_code)
return if x11data.empty?
- Kernel.system("/usr/bin/setxkbmap " + x11data["Apply"])
+ Yast::Execute.locally("/usr/bin/setxkbmap", *x11data["Apply"].split("
"))
# bnc#885271: set udev rule to handle incoming attached keyboards
# While installation/update only.
@@ -109,9 +109,8 @@
x11data = {}
if File.executable?(cmd)
- file = File.join(Yast::Directory.tmpdir, "xkbctrl.out")
- Kernel.system("#{cmd} #{keymap.shellescape} >#{file}")
- x11data = Yast::SCR.Read(Yast::path(".target.ycp"), file)
+ xkbctrl = Yast::Execute.locally(cmd, keymap, stdout: :capture)
+ x11data = read_ycp_string(xkbctrl)
else
log.warn("#{cmd} not found on system.")
end
@@ -139,6 +138,16 @@
Yast::SCR.Write(Yast::path(".target.string"), UDEV_FILE, nil)
end
end
+
+ # Parses the given YCP data structure
+ #
+ # @param str [String] string containing a YCP data structure
+ # @return [Hash]
+ def read_ycp_string(str)
+ file = File.join(Yast::Directory.tmpdir, "content.ycp")
+ File.write(file, str)
+ Yast::SCR.Read(Yast::path(".target.ycp"), file)
+ end
end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-country-4.3.13/keyboard/test/data/keyboard_test.rb
new/yast2-country-4.4.0/keyboard/test/data/keyboard_test.rb
--- old/yast2-country-4.3.13/keyboard/test/data/keyboard_test.rb
1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-country-4.4.0/keyboard/test/data/keyboard_test.rb 2021-05-04
15:00:31.000000000 +0200
@@ -0,0 +1,19 @@
+#!/usr/bin/env rspec
+# coding: utf-8
+
+require_relative "../test_helper"
+require_relative "../../src/data/keyboards"
+
+describe Keyboards do
+ describe ".all_keyboards" do
+ it "returns list with all code valid" do
+ # read valid codes from systemd as xkbctrl read it from there
+ valid_codes = File.readlines("/usr/share/systemd/kbd-model-map")
+ valid_codes.map! { |l| l.strip.sub(/^(\S+)\s+.*$/, "\\1") }
+ Keyboards.all_keyboards.each do |kb_map|
+ code = kb_map["code"]
+ expect(valid_codes).to include(code)
+ end
+ end
+ end
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-country-4.3.13/keyboard/test/kb_strategy_spec.rb
new/yast2-country-4.4.0/keyboard/test/kb_strategy_spec.rb
--- old/yast2-country-4.3.13/keyboard/test/kb_strategy_spec.rb 2021-03-10
10:41:02.000000000 +0100
+++ new/yast2-country-4.4.0/keyboard/test/kb_strategy_spec.rb 2021-05-04
15:00:31.000000000 +0200
@@ -55,8 +55,8 @@
"XkbModel" => "microsoftpro",
"XkbOptions" => "terminate:ctrl_alt_bksp",
"Apply" => arguments_to_apply})
- expect(Kernel).to receive(:system).with(
- "/usr/bin/setxkbmap #{arguments_to_apply}")
+ expect(Yast::Execute).to receive(:locally).with(
+ "/usr/bin/setxkbmap", *arguments_to_apply.split)
expect(kb_strategy).to receive(:write_udev_rule)
kb_strategy.set_layout("es")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-country-4.3.13/package/yast2-country.changes
new/yast2-country-4.4.0/package/yast2-country.changes
--- old/yast2-country-4.3.13/package/yast2-country.changes 2021-03-10
10:41:02.000000000 +0100
+++ new/yast2-country-4.4.0/package/yast2-country.changes 2021-05-04
15:00:31.000000000 +0200
@@ -1,4 +1,15 @@
-------------------------------------------------------------------
+Tue Apr 20 13:51:55 UTC 2021 - Ladislav Slez??k <lsle...@suse.cz>
+
+- 4.4.0 (bsc#1185510)
+
+-------------------------------------------------------------------
+Thu Mar 11 14:13:56 UTC 2021 - Josef Reidinger <jreidin...@suse.com>
+
+- Fix wrong xkb codes (bsc#1181952)
+- 4.3.14
+
+-------------------------------------------------------------------
Tue Mar 9 16:42:21 UTC 2021 - Josef Reidinger <jreidin...@suse.com>
- Adapt keyboard layout dialog to work in firstboot (bsc#1183162)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-country-4.3.13/package/yast2-country.spec
new/yast2-country-4.4.0/package/yast2-country.spec
--- old/yast2-country-4.3.13/package/yast2-country.spec 2021-03-10
10:41:02.000000000 +0100
+++ new/yast2-country-4.4.0/package/yast2-country.spec 2021-05-04
15:00:31.000000000 +0200
@@ -15,9 +15,8 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
-
Name: yast2-country
-Version: 4.3.13
+Version: 4.4.0
Release: 0
Summary: YaST2 - Country Settings (Language, Keyboard, and Timezone)
License: GPL-2.0-only
@@ -38,6 +37,9 @@
BuildRequires: yast2-ruby-bindings >= 3.1.26
# Yast2::CommandLine readonly parameter
BuildRequires: yast2 >= 4.2.57
+# systemd-mini does not add the xkb generated map which is needed by
+# the Keyboards.all_keyboards unit/integration test
+BuildRequires: systemd
Requires: timezone
Requires: yast2-perl-bindings
