commit rubygem-facter for openSUSE:Factory
Hello community, here is the log from the commit of package rubygem-facter for openSUSE:Factory checked in at 2017-06-29 15:20:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-facter (Old) and /work/SRC/openSUSE:Factory/.rubygem-facter.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-facter" Thu Jun 29 15:20:51 2017 rev:9 rq:506981 version:2.4.6 Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-facter/rubygem-facter.changes 2016-10-10 16:21:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rubygem-facter.new/rubygem-facter.changes 2017-06-29 15:21:06.330247844 +0200 @@ -1,0 +2,6 @@ +Tue Jun 27 16:12:10 UTC 2017 - kstreitova@suse.com + +- add facter-vlan_interfaces.patch in order to recognize VLAN + tagged interfaces correctly [bsc#1040363] + +------------------------------------------------------------------- New: ---- facter-vlan_interfaces.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-facter.spec ++++++ --- /var/tmp/diff_new_pack.Cu5C0T/_old 2017-06-29 15:21:08.173987224 +0200 +++ /var/tmp/diff_new_pack.Cu5C0T/_new 2017-06-29 15:21:08.173987224 +0200 @@ -1,7 +1,7 @@ # # spec file for package rubygem-facter # -# 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 @@ -37,12 +37,13 @@ BuildRequires: %{rubygem gem2rpm} BuildRequires: update-alternatives Url: https://github.com/puppetlabs/facter -Source: http://rubygems.org/gems/%{mod_full_name}.gem +Source: https://rubygems.org/gems/%{mod_full_name}.gem Source1: %{mod_name}.8 Source2: gem2rpm.yml # MANUAL Patch0: %{mod_name}-ip-interface.patch Patch1: %{mod_name}-detect-recent-opensuse.patch +Patch2: %{mod_name}-vlan_interfaces.patch # /MANUAL Summary: Facter, a system inventory tool License: Apache-2.0 @@ -56,6 +57,7 @@ %gem_unpack %patch0 -p1 %patch1 -p1 +%patch2 -p0 find -type f -print0 | xargs -0 touch -r %{S:0} %gem_build ++++++ facter-vlan_interfaces.patch ++++++ --- lib/facter/util/ip.rb.orig 2017-06-27 18:24:06.427331472 +0200 +++ lib/facter/util/ip.rb 2017-06-27 18:24:14.203440910 +0200 @@ -83,6 +83,7 @@ when 'Linux' output = Facter::Util::IP.exec_ip(["link"]) output.gsub!(/^\d+:\s*/, "") # delete leading number + output.gsub!(/@[^:]+/, "") # delete physical interface name in case of tagged vlan like "vlan100@bond0" when 'OpenBSD', 'NetBSD', 'FreeBSD', 'Darwin', 'GNU/kFreeBSD', 'DragonFly', 'AIX' output = Facter::Util::IP.exec_ifconfig(["-a","2>/dev/null"]) when 'SunOS' ++++++ gem2rpm.yml ++++++ --- /var/tmp/diff_new_pack.Cu5C0T/_old 2017-06-29 15:21:08.237978180 +0200 +++ /var/tmp/diff_new_pack.Cu5C0T/_new 2017-06-29 15:21:08.237978180 +0200 @@ -25,6 +25,8 @@ '%{mod_name}-ip-interface.patch': -p1 # PATCH-FIX-UPSTREAM - FACT-1496 '%{mod_name}-detect-recent-opensuse.patch': -p1 + # PATCH-FIX-SUSE - bsc#1040363 + '%{mod_name}-vlan_interfaces.patch': -p0 :post_install: |- mkdir -p %{buildroot}%{_sysconfdir}/%{mod_name}/facts.d install -Dm0444 %{SOURCE1} %{buildroot}%{_mandir}/man8/%{mod_name}.8
participants (1)
-
root@hilbert.suse.de