Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2018-06-19 11:51:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2 (Old) and /work/SRC/openSUSE:Factory/.yast2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2" Tue Jun 19 11:51:26 2018 rev:429 rq:615156 version:4.0.77 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2018-05-17 19:32:09.657800991 +0200 +++ /work/SRC/openSUSE:Factory/.yast2.new/yast2.changes 2018-06-19 11:51:30.429112705 +0200 @@ -0,0 +1,18 @@ +Wed Jun 6 06:06:10 UTC 2018 - jsr...@suse.cz + +- display proper release notes for product (bsc#1096138) +- 4.0.77 + +------------------------------------------------------------------- +Tue May 29 14:26:11 UTC 2018 - jsr...@suse.cz + +- rename SLES_HPC -> SLE_HPC (bsc#1095053) +- 4.0.76 + +------------------------------------------------------------------- +Wed May 23 15:25:04 CEST 2018 - sch...@suse.de + +- Calling YAST module: Do not create a post Snapper image if the + pre Snapper image has already been failed (bnc#1093374) +- 4.0.75 + @@ -5,0 +24,6 @@ + +------------------------------------------------------------------- +Mon May 14 09:00:43 UTC 2018 - lsle...@suse.cz + +- Support multiple "system-installation()" provides in one + package (bsc#1092965) Old: ---- yast2-4.0.74.tar.bz2 New: ---- yast2-4.0.77.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.ajB0EI/_old 2018-06-19 11:51:31.281081073 +0200 +++ /var/tmp/diff_new_pack.ajB0EI/_new 2018-06-19 11:51:31.285080925 +0200 @@ -17,10 +17,10 @@ Name: yast2 -Version: 4.0.74 +Version: 4.0.77 Release: 0 Summary: YaST2 - Main Package -License: GPL-2.0 +License: GPL-2.0-only Group: System/YaST Url: https://github.com/yast/yast-yast2 Source0: %{name}-%{version}.tar.bz2 ++++++ yast2-4.0.74.tar.bz2 -> yast2-4.0.77.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.0.74/library/packages/src/lib/y2packager/product_reader.rb new/yast2-4.0.77/library/packages/src/lib/y2packager/product_reader.rb --- old/yast2-4.0.74/library/packages/src/lib/y2packager/product_reader.rb 2018-05-15 13:21:03.000000000 +0200 +++ new/yast2-4.0.77/library/packages/src/lib/y2packager/product_reader.rb 2018-06-08 09:32:51.000000000 +0200 @@ -43,15 +43,18 @@ # There can be more instances of same package in different version. We except that one # package provide same product installation. So we just pick the first one. dependencies = Yast::Pkg.ResolvableDependencies(pkg_name, :package, "").first["deps"] - install_provide = dependencies.find do |d| + install_provides = dependencies.find_all do |d| d["provides"] && d["provides"].match(/system-installation\(\)/) end # parse product name from provides. Format of provide is # `system-installation() = <product_name>` - product_name = install_provide["provides"][/system-installation\(\)\s*=\s*(\S+)/, 1] - log.info "package #{pkg_name} install product #{product_name}" - installation_package_mapping[product_name] = pkg_name + install_provides.each do |install_provide| + product_name = install_provide["provides"][/system-installation\(\)\s*=\s*(\S+)/, 1] + log.info "package #{pkg_name} install product #{product_name}" + installation_package_mapping[product_name] = pkg_name + end + end installation_package_mapping diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.0.74/library/packages/src/lib/y2packager/product_upgrade.rb new/yast2-4.0.77/library/packages/src/lib/y2packager/product_upgrade.rb --- old/yast2-4.0.74/library/packages/src/lib/y2packager/product_upgrade.rb 2018-05-15 13:21:03.000000000 +0200 +++ new/yast2-4.0.77/library/packages/src/lib/y2packager/product_upgrade.rb 2018-06-08 09:32:51.000000000 +0200 @@ -25,9 +25,9 @@ MAPPING = { # SLES12 + HPC module => SLESHPC15 # (a bit tricky, the module became a new base product!) - ["SLES", "sle-module-hpc"] => "SLES_HPC", + ["SLES", "sle-module-hpc"] => "SLE_HPC", # this is an internal product so far... - ["SLE-HPC"] => "SLES_HPC", + ["SLE-HPC"] => "SLE_HPC", # SLES11 => SLES15 ["SUSE_SLES"] => "SLES", # SLED11 => SLED15 @@ -107,7 +107,7 @@ # sort the keys by length, try more products first # to find the most specific upgrade, prefer the - # SLES + sle-module-hpc => SLES_HPC upgrade to plain SLES => SLES upgrade + # SLES + sle-module-hpc => SLE_HPC upgrade to plain SLES => SLES upgrade # (if that would be in the list) upgrade = MAPPING.keys.sort_by(&:size).find do |keys| keys.all? { |name| installed.any? { |p| p.name == name } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.0.74/library/packages/src/lib/y2packager/release_notes_fetchers/rpm.rb new/yast2-4.0.77/library/packages/src/lib/y2packager/release_notes_fetchers/rpm.rb --- old/yast2-4.0.74/library/packages/src/lib/y2packager/release_notes_fetchers/rpm.rb 2018-05-15 13:21:03.000000000 +0200 +++ new/yast2-4.0.77/library/packages/src/lib/y2packager/release_notes_fetchers/rpm.rb 2018-06-08 09:32:51.000000000 +0200 @@ -94,7 +94,8 @@ package_name = release_notes_packages.sort.find do |name| dependencies = Yast::Pkg.ResolvableDependencies(name, :package, "").first["deps"] dependencies.any? do |dep| - dep["provides"].to_s.match(/release-notes\(\)\s*=\s*#{product.name}\s*/) + # mind $ at the end of the regexp, otherwise for SLES you may get RNs of any SLES.* product + dep["provides"].to_s.match(/release-notes\(\)\s*=\s*#{product.name}\s*$/) end end return nil if package_name.nil? diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.0.74/library/packages/test/y2packager/product_upgrade_test.rb new/yast2-4.0.77/library/packages/test/y2packager/product_upgrade_test.rb --- old/yast2-4.0.74/library/packages/test/y2packager/product_upgrade_test.rb 2018-05-15 13:21:03.000000000 +0200 +++ new/yast2-4.0.77/library/packages/test/y2packager/product_upgrade_test.rb 2018-06-08 09:32:51.000000000 +0200 @@ -34,7 +34,7 @@ context "several base products are available" do let(:sles) { Y2Packager::Product.new(name: "SLES") } - let(:sles_hpc) { Y2Packager::Product.new(name: "SLES_HPC") } + let(:sles_hpc) { Y2Packager::Product.new(name: "SLE_HPC") } let(:hpc_module) { Y2Packager::Product.new(name: "sle-module-hpc") } let(:sles11) { Y2Packager::Product.new(name: "SUSE_SLES") } @@ -49,7 +49,7 @@ expect(described_class.new_base_product).to be(sles) end - it "returns SLES_HPC for SLES and HPC module installed" do + it "returns SLE_HPC for SLES and HPC module installed" do expect(Y2Packager::Product).to receive(:installed_products) .and_return([sles, hpc_module]) expect(described_class.new_base_product).to be(sles_hpc) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.0.74/package/yast2.changes new/yast2-4.0.77/package/yast2.changes --- old/yast2-4.0.74/package/yast2.changes 2018-05-15 13:21:03.000000000 +0200 +++ new/yast2-4.0.77/package/yast2.changes 2018-06-08 09:32:51.000000000 +0200 @@ -1,8 +1,32 @@ +Wed Jun 6 06:06:10 UTC 2018 - jsr...@suse.cz + +- display proper release notes for product (bsc#1096138) +- 4.0.77 + +------------------------------------------------------------------- +Tue May 29 14:26:11 UTC 2018 - jsr...@suse.cz + +- rename SLES_HPC -> SLE_HPC (bsc#1095053) +- 4.0.76 + +------------------------------------------------------------------- +Wed May 23 15:25:04 CEST 2018 - sch...@suse.de + +- Calling YAST module: Do not create a post Snapper image if the + pre Snapper image has already been failed (bnc#1093374) +- 4.0.75 + ------------------------------------------------------------------- Tue May 15 09:12:23 UTC 2018 - knut.anders...@suse.com - Replace the deprecated firewallctl command with firewall-cmd for obtaining the firewalld state (bsc#1093111) + +------------------------------------------------------------------- +Mon May 14 09:00:43 UTC 2018 - lsle...@suse.cz + +- Support multiple "system-installation()" provides in one + package (bsc#1092965) - 4.0.74 ------------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.0.74/package/yast2.spec new/yast2-4.0.77/package/yast2.spec --- old/yast2-4.0.74/package/yast2.spec 2018-05-15 13:21:03.000000000 +0200 +++ new/yast2-4.0.77/package/yast2.spec 2018-06-08 09:32:51.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2 # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -15,11 +15,12 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: yast2 -Version: 4.0.74 +Version: 4.0.77 Release: 0 Summary: YaST2 - Main Package -License: GPL-2.0 +License: GPL-2.0-only Group: System/YaST Url: https://github.com/yast/yast-yast2 Source0: %{name}-%{version}.tar.bz2 @@ -34,8 +35,8 @@ # for file access using augeas BuildRequires: rubygem(%{rb_default_ruby_abi}:cfa) # for running scripts -BuildRequires: rubygem(%{rb_default_ruby_abi}:cheetah) BuildRequires: update-desktop-files +BuildRequires: rubygem(%{rb_default_ruby_abi}:cheetah) # For running RSpec tests during build BuildRequires: rubygem(%{rb_default_ruby_abi}:rspec) # For converting to/from punycode strings @@ -51,8 +52,8 @@ BuildRequires: yast2-ycp-ui-bindings >= 3.2.0 # for the PackageExtractor tests, just make sure they are present, # these should be installed in the default build anyway -BuildRequires: rpm BuildRequires: cpio +BuildRequires: rpm # for ag_tty (/bin/stty) # for /usr/bin/md5sum @@ -68,8 +69,8 @@ # for file access using augeas Requires: rubygem(%{rb_default_ruby_abi}:cfa) # For converting to/from punycode strings -Requires: rubygem(%{rb_default_ruby_abi}:simpleidn) Requires: sysconfig >= 0.80.0 +Requires: rubygem(%{rb_default_ruby_abi}:simpleidn) # for running scripts Requires: rubygem(%{rb_default_ruby_abi}:cheetah) # ag_ini section_private @@ -102,8 +103,8 @@ Obsoletes: yast2-devel-doc # for the PackageExtractor class, just make sure they are present, # these should be present even in a very minimal installation -Requires: rpm -Requires: cpio +Requires: cpio +Requires: rpm %description This package contains scripts and data needed for SUSE Linux diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.0.74/scripts/yast2 new/yast2-4.0.77/scripts/yast2 --- old/yast2-4.0.74/scripts/yast2 2018-05-15 13:21:03.000000000 +0200 +++ new/yast2-4.0.77/scripts/yast2 2018-06-08 09:32:51.000000000 +0200 @@ -191,7 +191,7 @@ snapshot_post() { if [ "$1" != "menu" -a "$1" != "migration" ]; then - if [ "$USE_SNAPPER" = "yes" -a -x $SNAPPERBIN ] ; then + if [ "$USE_SNAPPER" = "yes" -a -x $SNAPPERBIN -a "$SNAPSHOT_NUMBER" != '' ] ; then $SNAPPERBIN create --type=post --cleanup-algorithm=number --pre-number=$SNAPSHOT_NUMBER fi fi
