Hello community, here is the log from the commit of package rubygem-puppet for openSUSE:Factory checked in at 2015-09-03 18:05:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-puppet (Old) and /work/SRC/openSUSE:Factory/.rubygem-puppet.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-puppet" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-puppet/rubygem-puppet.changes 2015-05-29 10:41:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rubygem-puppet.new/rubygem-puppet.changes 2015-09-03 18:12:41.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Sep 2 07:59:57 UTC 2015 - [email protected] + +- Added puppet-systemd-default-on-new-suse.patch, rebased from the + master branch, that uses the systemd provider on a SuSE variants + with version >= 12 ( boo#931703 ) + +------------------------------------------------------------------- New: ---- puppet-systemd-default-on-new-suse.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-puppet.spec ++++++ --- /var/tmp/diff_new_pack.t3MF2h/_old 2015-09-03 18:12:48.000000000 +0200 +++ /var/tmp/diff_new_pack.t3MF2h/_new 2015-09-03 18:12:48.000000000 +0200 @@ -67,6 +67,7 @@ Patch0: %{mod_name}-zypper-lu.patch Patch1: %{mod_name}-systemd-default.patch Patch2: %{mod_name}-ruby-2_2.patch +Patch3: %{mod_name}-systemd-default-on-new-suse.patch # /MANUAL Summary: A network tool for managing many disparate systems License: Apache-2.0 @@ -84,6 +85,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %gem_build %build ++++++ gem2rpm.yml ++++++ --- /var/tmp/diff_new_pack.t3MF2h/_old 2015-09-03 18:12:48.000000000 +0200 +++ /var/tmp/diff_new_pack.t3MF2h/_new 2015-09-03 18:12:48.000000000 +0200 @@ -13,6 +13,7 @@ '%{mod_name}-zypper-lu.patch': -p1 '%{mod_name}-systemd-default.patch': -p1 '%{mod_name}-ruby-2_2.patch': -p1 + '%{mod_name}-systemd-default-on-new-suse.patch': -p1 :main: :preamble: |- Provides: %{mod_name} = %{version}-%{release} ++++++ puppet-systemd-default-on-new-suse.patch ++++++ >From 2532e38589fc0b3b6c02e72071d5cc8b1e92558d Mon Sep 17 00:00:00 2001 From: Kylo Ginsberg <[email protected]> Date: Tue, 1 Sep 2015 11:24:08 -0700 Subject: [PATCH] (PUP-4697) Make systemd the default service provider for all suse's *except* 10 and 11 Previously, the default service provider for suse was 'redhat' with an override of 'systemd' for suse 12 and 13. However this doesn't work for the rolling release of suse (tumbleweed) or the next (leap), which are both systemd based. This reverses the logic so the default service provider is 'systemd' with overrides for suse 10 and suse 11. Thanks to Robert Monteanu for researching what suse versions are using what init systems. I also updated some unrelated spec tests in provider/service/systemd_spec.rb to use 'stubs' rather than 'expects' - the latter made the tests unnecessarily brittle and was testing implementation rather than behavior. --- lib/puppet/provider/service/redhat.rb | 3 +- lib/puppet/provider/service/systemd.rb | 2 +- spec/unit/provider/service/redhat_spec.rb | 9 ++++- spec/unit/provider/service/systemd_spec.rb | 64 ++++++++++++++++-------------- 4 files changed, 46 insertions(+), 32 deletions(-) diff --git a/lib/puppet/provider/service/redhat.rb b/lib/puppet/provider/service/redhat.rb index 6e49a8f..4f3f9b8 100644 --- a/lib/puppet/provider/service/redhat.rb +++ b/lib/puppet/provider/service/redhat.rb @@ -8,7 +8,8 @@ commands :chkconfig => "/sbin/chkconfig", :service => "/sbin/service" - defaultfor :osfamily => [:redhat, :suse] + defaultfor :osfamily => :redhat + defaultfor :osfamily => :suse, :operatingsystemmajrelease => ["10", "11"] # Remove the symlinks def disable diff --git a/lib/puppet/provider/service/systemd.rb b/lib/puppet/provider/service/systemd.rb index 17766e2..94a4f61 100644 --- a/lib/puppet/provider/service/systemd.rb +++ b/lib/puppet/provider/service/systemd.rb @@ -8,7 +8,7 @@ defaultfor :osfamily => [:archlinux] defaultfor :osfamily => :redhat, :operatingsystemmajrelease => "7" defaultfor :osfamily => :redhat, :operatingsystem => :fedora, :operatingsystemmajrelease => ["17", "18", "19", "20", "21"] - defaultfor :osfamily => :suse, :operatingsystemmajrelease => ["12", "13"] + defaultfor :osfamily => :suse def self.instances i = []
