Merge remote-tracking branch 'origin/SLE-12-SP2' into sp2_merge

.gitignore

@@ -1,3 +1,6 @@
+*.pot
+*.log
+*.trs
 Makefile
 /Makefile.am
 Makefile.am.common
@@ -12,6 +15,7 @@ config.*
 configure
 configure.in
 configure.ac
+coverage/
 install-sh
 pluglib-bindings.ami
 */.dep

.travis.yml

@@ -5,6 +5,9 @@ services:
 
 before_install:
   - docker build -t yast-yast2-image .
+  # list the installed packages (just for easier debugging)
+  - docker run --rm -it yast-yast2-image rpm -qa | sort
+
 script:
   # 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

package/yast2.spec

@@ -36,9 +36,13 @@ BuildRequires:  rubygem(%{rb_default_ruby_abi}:abstract_method)
 BuildRequires:  rubygem(%{rb_default_ruby_abi}:cfa)
 # for running scripts
 BuildRequires:  rubygem(%{rb_default_ruby_abi}:cheetah)
+<<<<<<< HEAD
 BuildRequires:  update-desktop-files
+=======
+>>>>>>> origin/SLE-12-SP2
 # For running RSpec tests during build
 BuildRequires:  rubygem(%{rb_default_ruby_abi}:rspec)
+BuildRequires:  update-desktop-files
 # Needed already in build time
 BuildRequires:  yast2-core >= 2.18.12
 BuildRequires:  yast2-devtools >= 3.1.10
@@ -66,9 +70,13 @@ Requires:       perl-XML-Simple
 Requires:       rubygem(%{rb_default_ruby_abi}:abstract_method)
 # for file access using augeas
 Requires:       rubygem(%{rb_default_ruby_abi}:cfa)
+<<<<<<< HEAD
 Requires:       sysconfig >= 0.80.0
+=======
+>>>>>>> origin/SLE-12-SP2
 # for running scripts
 Requires:       rubygem(%{rb_default_ruby_abi}:cheetah)
+Requires:       sysconfig >= 0.80.0
 # ag_ini section_private
 # ag_ini with (un)quoting support
 Requires:       yast2-core >= 2.23.0