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 2023-10-12 23:39:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-country (Old) and /work/SRC/openSUSE:Factory/.yast2-country.new.1807 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-country" Thu Oct 12 23:39:12 2023 rev:240 rq:1116836 version:5.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-country/yast2-country.changes 2023-08-11 15:55:11.463640373 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-country.new.1807/yast2-country.changes 2023-10-12 23:39:41.423644312 +0200 @@ -1,0 +2,12 @@ +Tue Oct 10 09:38:22 UTC 2023 - Martin Vidner <[email protected]> + +- use also kbd-model-map.xkb-generated (bsc#1211104) +- sort the selection box of keyboard layouts alphabetically +- 5.0.1 + +------------------------------------------------------------------- +Wed Aug 30 20:16:10 UTC 2023 - Josef Reidinger <[email protected]> + +- 5.0.0 (#bsc1185510) + +------------------------------------------------------------------- Old: ---- yast2-country-4.6.3.tar.bz2 New: ---- yast2-country-5.0.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-country.spec ++++++ --- /var/tmp/diff_new_pack.GhG9ND/_old 2023-10-12 23:39:42.031666321 +0200 +++ /var/tmp/diff_new_pack.GhG9ND/_new 2023-10-12 23:39:42.035666466 +0200 @@ -17,7 +17,7 @@ Name: yast2-country -Version: 4.6.3 +Version: 5.0.1 Release: 0 Summary: YaST2 - Country Settings (Language, Keyboard, and Timezone) License: GPL-2.0-only ++++++ yast2-country-4.6.3.tar.bz2 -> yast2-country-5.0.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.6.3/keyboard/src/lib/y2keyboard/dialogs/layout_selector.rb new/yast2-country-5.0.1/keyboard/src/lib/y2keyboard/dialogs/layout_selector.rb --- old/yast2-country-4.6.3/keyboard/src/lib/y2keyboard/dialogs/layout_selector.rb 2023-08-10 13:24:25.000000000 +0200 +++ new/yast2-country-5.0.1/keyboard/src/lib/y2keyboard/dialogs/layout_selector.rb 2023-10-11 10:48:17.000000000 +0200 @@ -36,6 +36,7 @@ def initialize textdomain "country" @keyboard_layouts = KeyboardLayout.all + @keyboard_layouts.sort! { |a, b| Yast.strcoll(a.description, b.description) } @previous_selected_layout = KeyboardLayout.current_layout end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.6.3/keyboard/src/lib/y2keyboard/keyboards.rb new/yast2-country-5.0.1/keyboard/src/lib/y2keyboard/keyboards.rb --- old/yast2-country-4.6.3/keyboard/src/lib/y2keyboard/keyboards.rb 2023-08-10 13:24:25.000000000 +0200 +++ new/yast2-country-5.0.1/keyboard/src/lib/y2keyboard/keyboards.rb 2023-10-11 10:48:17.000000000 +0200 @@ -334,6 +334,19 @@ ] end + # @return [Array<String>] + def self.kbd_model_map_lines + filenames = [ + "/usr/share/systemd/kbd-model-map", + # https://bugzilla.suse.com/show_bug.cgi?id=1211104 + "/usr/share/systemd/kbd-model-map.xkb-generated" + ] + lines = filenames.map do |fn| + File.exist?(fn) ? File.readlines(fn) : [] + end.flatten + lines + end + # Some keyboards are present in new openSUSE releases but not in older SLE # @see all_keyboards def self.optional_keyboards @@ -345,8 +358,7 @@ # The afnor layout was added to xkeyboard-config in 2019-06 # but SLE15-SP4 only has 2.23 released in 2018 afnor_test = lambda do - kmm = File.read("/usr/share/systemd/kbd-model-map") rescue "" - kmm.match?("^fr-afnor") + kbd_model_map_lines.any?(/^fr-afnor/) end afnor = { "description" => _("French (AFNOR)"), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.6.3/keyboard/test/keyboards_spec.rb new/yast2-country-5.0.1/keyboard/test/keyboards_spec.rb --- old/yast2-country-4.6.3/keyboard/test/keyboards_spec.rb 2023-08-10 13:24:25.000000000 +0200 +++ new/yast2-country-5.0.1/keyboard/test/keyboards_spec.rb 2023-10-11 10:48:17.000000000 +0200 @@ -20,7 +20,7 @@ it "returns a list with all valid models from systemd" do # read valid codes from systemd as xkbctrl read it from there - valid_codes = File.readlines("/usr/share/systemd/kbd-model-map") + valid_codes = Keyboards.kbd_model_map_lines valid_codes.map! { |l| l.strip.sub(/^(\S+)\s+.*$/, "\\1") } Keyboards.all_keyboards.each do |kb_map| code = kb_map["code"] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.6.3/package/yast2-country.changes new/yast2-country-5.0.1/package/yast2-country.changes --- old/yast2-country-4.6.3/package/yast2-country.changes 2023-08-10 13:24:25.000000000 +0200 +++ new/yast2-country-5.0.1/package/yast2-country.changes 2023-10-11 10:48:17.000000000 +0200 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Tue Oct 10 09:38:22 UTC 2023 - Martin Vidner <[email protected]> + +- use also kbd-model-map.xkb-generated (bsc#1211104) +- sort the selection box of keyboard layouts alphabetically +- 5.0.1 + +------------------------------------------------------------------- +Wed Aug 30 20:16:10 UTC 2023 - Josef Reidinger <[email protected]> + +- 5.0.0 (#bsc1185510) + +------------------------------------------------------------------- Thu Aug 10 10:00:35 UTC 2023 - Stefan Hundhammer <[email protected]> - Allow changing date to a later year than 2032 (bsc#1214144) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.6.3/package/yast2-country.spec new/yast2-country-5.0.1/package/yast2-country.spec --- old/yast2-country-4.6.3/package/yast2-country.spec 2023-08-10 13:24:25.000000000 +0200 +++ new/yast2-country-5.0.1/package/yast2-country.spec 2023-10-11 10:48:17.000000000 +0200 @@ -16,7 +16,7 @@ # Name: yast2-country -Version: 4.6.3 +Version: 5.0.1 Release: 0 Summary: YaST2 - Country Settings (Language, Keyboard, and Timezone) License: GPL-2.0-only
