Hello community, here is the log from the commit of package yast2-country for openSUSE:Factory checked in at 2017-02-04 15:19:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-country (Old) and /work/SRC/openSUSE:Factory/.yast2-country.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-country" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-country/yast2-country.changes 2017-01-04 17:19:48.411636337 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-country.new/yast2-country.changes 2017-02-04 16:52:25.830099172 +0100 @@ -1,0 +2,14 @@ +Mon Jan 30 16:44:12 UTC 2017 - [email protected] + +- If the X11Variant for a given keyboard layout is not specified by + systemd, leave it blank instead of enforcing "basic" + (bsc#1020082, bsc#1022094). +- 3.2.8 + +------------------------------------------------------------------- +Fri Jan 20 16:17:01 UTC 2017 - [email protected] + +- Added Y2Country::Widgets::KeyboardSelectionCombo (FATE#322328) +- 3.2.7 + +------------------------------------------------------------------- Old: ---- yast2-country-3.2.6.tar.bz2 New: ---- yast2-country-3.2.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-country.spec ++++++ --- /var/tmp/diff_new_pack.bAgIMu/_old 2017-02-04 16:52:26.342026284 +0100 +++ /var/tmp/diff_new_pack.bAgIMu/_new 2017-02-04 16:52:26.342026284 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-country # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: yast2-country -Version: 3.2.6 +Version: 3.2.8 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-country-3.2.6.tar.bz2 -> yast2-country-3.2.8.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.2.6/.travis.yml new/yast2-country-3.2.8/.travis.yml --- old/yast2-country-3.2.6/.travis.yml 2016-12-23 09:40:28.049789703 +0100 +++ new/yast2-country-3.2.8/.travis.yml 2017-02-01 18:18:02.853524673 +0100 @@ -1,18 +1,11 @@ -language: cpp -compiler: - - gcc +sudo: required +language: bash +services: + - docker + before_install: - # disable rvm, use system Ruby - - rvm reset - - wget https://raw.githubusercontent.com/yast/yast-devtools/master/travis-tools/travis_setup.sh - - sh ./travis_setup.sh -p "rake yast2-devtools yast2-testsuite yast2 yast2-ruby-bindings yast2-perl-bindings" -g "rspec:3.3.0 yast-rake gettext simplecov coveralls" + - docker build -t yast-country-image . script: - - rake check:syntax - - rake check:pot - - make -s -f Makefile.cvs - - make -s - - sudo make -s install - - make -s check - # evaluate code coverage for RSpec tests - - COVERAGE=1 rake test:unit - + # the "yast-travis-ruby" script is included in the base yastdevel/ruby image + # see https://github.com/yast/docker-yast-ruby/blob/master/yast-travis-ruby + - docker run -it -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-country-image yast-travis-ruby diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.2.6/Dockerfile new/yast2-country-3.2.8/Dockerfile --- old/yast2-country-3.2.6/Dockerfile 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-country-3.2.8/Dockerfile 2017-02-01 18:18:02.853524673 +0100 @@ -0,0 +1,3 @@ +FROM yastdevel/ruby +COPY . /usr/src/app + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.2.6/keyboard/src/lib/y2country/widgets.rb new/yast2-country-3.2.8/keyboard/src/lib/y2country/widgets.rb --- old/yast2-country-3.2.6/keyboard/src/lib/y2country/widgets.rb 2016-12-23 09:40:28.113789703 +0100 +++ new/yast2-country-3.2.8/keyboard/src/lib/y2country/widgets.rb 2017-02-01 18:18:02.857524673 +0100 @@ -26,7 +26,8 @@ module Y2Country module Widgets - class KeyboardSelection < CWM::SelectionBox + # Common parts for {KeyboardSelection} and {KeyboardSelectionCombo}. + module KeyboardSelectionBase # param default [String] ID for default keyboard layout if not selected. # Allowed values are defined in /usr/share/YaST2/data/keyboard_raw.ycp def initialize(default) @@ -80,5 +81,17 @@ ) end end + + class KeyboardSelection < CWM::SelectionBox + include KeyboardSelectionBase + end + + class KeyboardSelectionCombo < CWM::ComboBox + include KeyboardSelectionBase + + def opt + [:notify, :hstretch] + end + end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.2.6/keyboard/src/modules/Keyboard.rb new/yast2-country-3.2.8/keyboard/src/modules/Keyboard.rb --- old/yast2-country-3.2.6/keyboard/src/modules/Keyboard.rb 2016-12-23 09:40:28.113789703 +0100 +++ new/yast2-country-3.2.8/keyboard/src/modules/Keyboard.rb 2017-02-01 18:18:02.857524673 +0100 @@ -526,7 +526,7 @@ @XkbModel = Ops.get_string(x11data, "XkbModel", "pc104") @XkbLayout = Ops.get_string(x11data, "XkbLayout", "") - @XkbVariant = Ops.get_string(x11data, "XkbVariant", "basic") + @XkbVariant = Ops.get_string(x11data, "XkbVariant", "") @XkbOptions = Ops.get_string(x11data, "XkbOptions", "") @LeftAlt = Ops.get_string(x11data, "LeftAlt", "") @RightAlt = Ops.get_string(x11data, "RightAlt", "") @@ -890,19 +890,7 @@ SCR.Write(path(".etc.vconsole_conf"), nil) # flush # Write systemd settings for X11 - if x11_setup_needed - # According to localectl syntax, if one option is empty then skip - # the following ones - args = [@XkbLayout, @XkbModel, @XkbVariant, @XkbOptions] - blank = args.find_index("") - args = args[0, blank] if blank - if !args.empty? - cmd = "/usr/bin/localectl --no-convert set-x11-keymap #{args.join(' ')}" - if SCR.Execute(path(".target.bash"), cmd) != 0 - log.error "X11 configuration not written. Failed to execute '#{cmd}'" - end - end - end + call_set_x11_keymap if x11_setup_needed # As a preliminary step mark all keyboards except the one to be configured # as configured = no and needed = no. Afterwards this one keyboard will be @@ -1553,6 +1541,24 @@ # eval is necessary for translating the texts needed to be translated content ? Builtins.eval(content) : {} end + + def call_set_x11_keymap + args = [@XkbLayout, @XkbModel, @XkbVariant, @XkbOptions] + return if args.all?(&:empty?) + + # The localectl syntax enforces a fixed order for the X11 options. + # Empty options at the end of the command can (must) be skipped. + # Other empty options must be specified as "". + last_idx = args.rindex { |a| !a.empty? } + args = args[0..last_idx] + args.map! { |a| a.empty? ? "\"\"" : a } + + cmd = "/usr/bin/localectl --no-convert set-x11-keymap #{args.join(' ')}" + log.info "Making X11 keyboard persistent: #{cmd}" + if SCR.Execute(path(".target.bash"), cmd) != 0 + log.error "X11 configuration not written. Failed to execute '#{cmd}'" + end + end end Keyboard = KeyboardClass.new diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.2.6/keyboard/test/keyboard_test.rb new/yast2-country-3.2.8/keyboard/test/keyboard_test.rb --- old/yast2-country-3.2.6/keyboard/test/keyboard_test.rb 2016-12-23 09:40:28.137789703 +0100 +++ new/yast2-country-3.2.8/keyboard/test/keyboard_test.rb 2017-02-01 18:18:02.857524673 +0100 @@ -72,7 +72,7 @@ it "writes the configuration" do expect(SCR).to execute_bash( - /localectl --no-convert set-x11-keymap es microsoftpro basic$/ + /localectl --no-convert set-x11-keymap es microsoftpro$/ ) expect(AsciiFile).to receive(:AppendLine).with(anything, ["Keytable:", "es.map.gz"]) @@ -130,7 +130,7 @@ let(:chroot) { "spanish" } it "correctly sets all layout variables" do - expect(SCR).to execute_bash(/loadkeys -C \/dev\/tty.+ ruwin_alt-UTF-8\.map\.gz/) + expect(SCR).to execute_bash(/loadkeys -C \/dev\/tty.* ruwin_alt-UTF-8\.map\.gz/) Keyboard.Set("russian") expect(Keyboard.current_kbd).to eq("russian") @@ -142,7 +142,7 @@ stub_presence_of "/usr/sbin/xkbctrl" allow(XVersion).to receive(:binPath).and_return "/usr/bin" - expect(SCR).to execute_bash(/loadkeys -C \/dev\/tty.+ tr\.map\.gz/) + expect(SCR).to execute_bash(/loadkeys -C \/dev\/tty.* tr\.map\.gz/) # Called twice, for SetConsole and SetX11 expect(SCR).to execute_bash(/xkbctrl tr\.map\.gz/).twice do |p, cmd| dump_xkbctrl(:turkish, cmd.split("> ")[1]) @@ -153,7 +153,7 @@ end it "does not call setxkbmap if graphical system is not installed" do - expect(SCR).to execute_bash(/loadkeys -C \/dev\/tty.+ ruwin_alt-UTF-8\.map\.gz/) + expect(SCR).to execute_bash(/loadkeys -C \/dev\/tty.* ruwin_alt-UTF-8\.map\.gz/) expect(SCR).to execute_bash(/xkbctrl ruwin_alt-UTF-8.map.gz/).never expect(SCR).to execute_bash(/setxkbmap/).never @@ -187,7 +187,7 @@ allow(SCR).to execute_bash(/xset r on$/) rule = "# Generated by Yast to handle the layout of keyboards connected during installation\n" - rule += 'ENV{ID_INPUT_KEYBOARD}=="1", ENV{XKBLAYOUT}="es", ENV{XKBMODEL}="microsoftpro", ENV{XKBVARIANT}="basic"' + rule += 'ENV{ID_INPUT_KEYBOARD}=="1", ENV{XKBLAYOUT}="es", ENV{XKBMODEL}="microsoftpro"' expect(SCR).to receive(:Execute).with(path(".target.remove"), udev_file) expect(SCR).to receive(:Write).with(path(".target.string"), udev_file, "#{rule}\n") expect(SCR).to receive(:Write).with(path(".target.string"), udev_file, nil) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.2.6/package/yast2-country.changes new/yast2-country-3.2.8/package/yast2-country.changes --- old/yast2-country-3.2.6/package/yast2-country.changes 2016-12-23 09:40:28.201789703 +0100 +++ new/yast2-country-3.2.8/package/yast2-country.changes 2017-02-01 18:18:02.869524673 +0100 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Mon Jan 30 16:44:12 UTC 2017 - [email protected] + +- If the X11Variant for a given keyboard layout is not specified by + systemd, leave it blank instead of enforcing "basic" + (bsc#1020082, bsc#1022094). +- 3.2.8 + +------------------------------------------------------------------- +Fri Jan 20 16:17:01 UTC 2017 - [email protected] + +- Added Y2Country::Widgets::KeyboardSelectionCombo (FATE#322328) +- 3.2.7 + +------------------------------------------------------------------- Mon Dec 19 13:03:21 UTC 2016 - [email protected] - Read keyboard and console fonts from different files depending diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.2.6/package/yast2-country.spec new/yast2-country-3.2.8/package/yast2-country.spec --- old/yast2-country-3.2.6/package/yast2-country.spec 2016-12-23 09:40:28.201789703 +0100 +++ new/yast2-country-3.2.8/package/yast2-country.spec 2017-02-01 18:18:02.869524673 +0100 @@ -17,7 +17,7 @@ Name: yast2-country -Version: 3.2.6 +Version: 3.2.8 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build
