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 2016-10-10 16:21:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-facter (Old) and /work/SRC/openSUSE:Factory/.rubygem-facter.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-facter" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-facter/rubygem-facter.changes 2016-01-28 17:25:48.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rubygem-facter.new/rubygem-facter.changes 2016-10-10 16:21:51.000000000 +0200 @@ -1,0 +2,13 @@ +Wed Sep 7 11:24:04 UTC 2016 - robert.munteanu@gmail.com + +- Refresh facter-detect-recent-opensuse.patch, now lsbdistid for + TW is 'openSUSE Tumbleweed' + +------------------------------------------------------------------- +Sat Aug 27 20:29:50 UTC 2016 - robert.munteanu@gmail.com + +- Add facter-detect-recent-opensuse.patch, fixed detecting TW + and possibly Leap 42.2 as well, see + https://tickets.puppetlabs.com/browse/FACT-1496 + +------------------------------------------------------------------- New: ---- facter-detect-recent-opensuse.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-facter.spec ++++++ --- /var/tmp/diff_new_pack.aq16Ak/_old 2016-10-10 16:21:54.000000000 +0200 +++ /var/tmp/diff_new_pack.aq16Ak/_new 2016-10-10 16:21:54.000000000 +0200 @@ -42,6 +42,7 @@ Source2: gem2rpm.yml # MANUAL Patch0: %{mod_name}-ip-interface.patch +Patch1: %{mod_name}-detect-recent-opensuse.patch # /MANUAL Summary: Facter, a system inventory tool License: Apache-2.0 @@ -54,6 +55,8 @@ %prep %gem_unpack %patch0 -p1 +%patch1 -p1 +find -type f -print0 | xargs -0 touch -r %{S:0} %gem_build %build ++++++ facter-detect-recent-opensuse.patch ++++++

From 50c045f451a4cd4d82c6cb6a073f525c989657c4 Mon Sep 17 00:00:00 2001 From: Robert Munteanu Date: Sat, 27 Aug 2016 23:24:12 +0300 Subject: [PATCH] FACT-1496 - Facter fails to detect more recent openSUSE versions

Detect openSUSE based on the lsbdistid fact in addition to the now-deprecated /etc/SuSE-release file. --- lib/facter/operatingsystem/linux.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/facter/operatingsystem/linux.rb b/lib/facter/operatingsystem/linux.rb index de7913d..07679e3 100644 --- a/lib/facter/operatingsystem/linux.rb +++ b/lib/facter/operatingsystem/linux.rb @@ -13,6 +13,8 @@ module Facter @operatingsystem ||= "Ubuntu" elsif lsbdistid == "LinuxMint" @operatingsystem ||= "LinuxMint" + elsif lsbdistid.start_with?("openSUSE") + @operatingsystem ||= "openSUSE" else @operatingsystem ||= get_operatingsystem_with_release_files end -- 2.9.3 ++++++ gem2rpm.yml ++++++ --- /var/tmp/diff_new_pack.aq16Ak/_old 2016-10-10 16:21:54.000000000 +0200 +++ /var/tmp/diff_new_pack.aq16Ak/_new 2016-10-10 16:21:54.000000000 +0200 @@ -23,6 +23,8 @@ :patches: # PATCH-FIX-UPSTREAM -- bnc#878129 -- use "ip link" instead of "ifconfig" for interface names '%{mod_name}-ip-interface.patch': -p1 + # PATCH-FIX-UPSTREAM - FACT-1496 + '%{mod_name}-detect-recent-opensuse.patch': -p1 :post_install: |- mkdir -p %{buildroot}%{_sysconfdir}/%{mod_name}/facts.d install -Dm0444 %{SOURCE1} %{buildroot}%{_mandir}/man8/%{mod_name}.8