From 8a3ff98fa5019a3a2df8d402de01577c34dd7f8c Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: May 26 2011 16:35:43 +0000 Subject: Improve Scientific Linux support, courtesy of Orion Poplawski This is upstream issue #7682: http://projects.puppetlabs.com/issues/7682 --- diff --git a/facter-1.5.9-sl.patch b/facter-1.5.9-sl.patch new file mode 100644 index 0000000..d5921ed --- /dev/null +++ b/facter-1.5.9-sl.patch @@ -0,0 +1,83 @@ +diff -up facter-1.5.9/lib/facter/hardwareisa.rb.sl facter-1.5.9/lib/facter/hardwareisa.rb +--- facter-1.5.9/lib/facter/hardwareisa.rb.sl 2011-05-20 12:06:13.000000000 -0600 ++++ facter-1.5.9/lib/facter/hardwareisa.rb 2011-05-26 09:10:20.234403286 -0600 +@@ -1,4 +1,4 @@ + Facter.add(:hardwareisa) do + setcode 'uname -p', '/bin/sh' +- confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE SLES Debian Ubuntu Gentoo FreeBSD OpenBSD NetBSD OEL OVS GNU/kFreeBSD} ++ confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS Scientific SuSE SLES Debian Ubuntu Gentoo FreeBSD OpenBSD NetBSD OEL OVS GNU/kFreeBSD} + end +diff -up facter-1.5.9/lib/facter/lsbmajdistrelease.rb.sl facter-1.5.9/lib/facter/lsbmajdistrelease.rb +--- facter-1.5.9/lib/facter/lsbmajdistrelease.rb.sl 2011-05-20 12:06:13.000000000 -0600 ++++ facter-1.5.9/lib/facter/lsbmajdistrelease.rb 2011-05-26 09:10:27.690134946 -0600 +@@ -3,7 +3,7 @@ + require 'facter' + + Facter.add("lsbmajdistrelease") do +- confine :operatingsystem => %w{Linux Fedora RedHat CentOS SuSE SLES Debian Ubuntu Gentoo OEL OVS GNU/kFreeBSD} ++ confine :operatingsystem => %w{Linux Fedora RedHat CentOS Scientific SuSE SLES Debian Ubuntu Gentoo OEL OVS GNU/kFreeBSD} + setcode do + if /(\d*)\./i =~ Facter.value(:lsbdistrelease) + result=$1 +diff -up facter-1.5.9/lib/facter/macaddress.rb.sl facter-1.5.9/lib/facter/macaddress.rb +--- facter-1.5.9/lib/facter/macaddress.rb.sl 2011-05-20 12:06:13.000000000 -0600 ++++ facter-1.5.9/lib/facter/macaddress.rb 2011-05-26 09:10:35.028870874 -0600 +@@ -1,7 +1,7 @@ + require 'facter/util/macaddress' + + Facter.add(:macaddress) do +- confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE SLES Debian Gentoo Ubuntu OEL OVS GNU/kFreeBSD} ++ confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS Scientific SuSE SLES Debian Gentoo Ubuntu OEL OVS GNU/kFreeBSD} + setcode do + ether = [] + output = %x{/sbin/ifconfig -a} +diff -up facter-1.5.9/lib/facter/operatingsystemrelease.rb.sl facter-1.5.9/lib/facter/operatingsystemrelease.rb +--- facter-1.5.9/lib/facter/operatingsystemrelease.rb.sl 2011-05-20 12:06:13.000000000 -0600 ++++ facter-1.5.9/lib/facter/operatingsystemrelease.rb 2011-05-26 09:11:08.932650813 -0600 +@@ -1,8 +1,8 @@ + Facter.add(:operatingsystemrelease) do +- confine :operatingsystem => %w{CentOS Fedora oel ovs RedHat MeeGo} ++ confine :operatingsystem => %w{CentOS Fedora oel ovs RedHat MeeGo Scientific} + setcode do + case Facter.value(:operatingsystem) +- when "CentOS", "RedHat" ++ when "CentOS", "RedHat", "Scientific" + releasefile = "/etc/redhat-release" + when "Fedora" + releasefile = "/etc/fedora-release" +diff -up facter-1.5.9/lib/facter/uniqueid.rb.sl facter-1.5.9/lib/facter/uniqueid.rb +--- facter-1.5.9/lib/facter/uniqueid.rb.sl 2011-04-22 14:06:55.000000000 -0600 ++++ facter-1.5.9/lib/facter/uniqueid.rb 2011-05-26 09:11:17.418345424 -0600 +@@ -1,4 +1,4 @@ + Facter.add(:uniqueid) do + setcode 'hostid', '/bin/sh' +- confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE SLES Debian Ubuntu Gentoo AIX OEL OVS GNU/kFreeBSD} ++ confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS Scientific SuSE SLES Debian Ubuntu Gentoo AIX OEL OVS GNU/kFreeBSD} + end +diff -up facter-1.5.9/spec/unit/operatingsystemrelease_spec.rb.sl facter-1.5.9/spec/unit/operatingsystemrelease_spec.rb +--- facter-1.5.9/spec/unit/operatingsystemrelease_spec.rb.sl 2011-04-22 14:06:55.000000000 -0600 ++++ facter-1.5.9/spec/unit/operatingsystemrelease_spec.rb 2011-05-26 09:11:39.517550163 -0600 +@@ -15,14 +15,15 @@ describe "Operating System Release fact" + end + + test_cases = { +- "CentOS" => "/etc/redhat-release", +- "RedHat" => "/etc/redhat-release", +- "Fedora" => "/etc/fedora-release", +- "MeeGo" => "/etc/meego-release", +- "OEL" => "/etc/enterprise-release", +- "oel" => "/etc/enterprise-release", +- "OVS" => "/etc/ovs-release", +- "ovs" => "/etc/ovs-release", ++ "CentOS" => "/etc/redhat-release", ++ "RedHat" => "/etc/redhat-release", ++ "Scientific" => "/etc/redhat-release", ++ "Fedora" => "/etc/fedora-release", ++ "MeeGo" => "/etc/meego-release", ++ "OEL" => "/etc/enterprise-release", ++ "oel" => "/etc/enterprise-release", ++ "OVS" => "/etc/ovs-release", ++ "ovs" => "/etc/ovs-release", + } + + test_cases.each do |system, file| diff --git a/facter.spec b/facter.spec index 5b06f3b..892f1b0 100644 --- a/facter.spec +++ b/facter.spec @@ -12,6 +12,9 @@ Group: System Environment/Base URL: http://www.puppetlabs.com/puppet/related-projects/%{name}/ Source0: http://puppetlabs.com/downloads/%{name}/%{name}-%{version}.tar.gz Source1: http://puppetlabs.com/downloads/%{name}/%{name}-%{version}.tar.gz.asc +# http://projects.puppetlabs.com/issues/7682 +# Improve Scientific Linux support, courtesy of Orion Poplawski +Patch0: http://projects.puppetlabs.com/attachments/download/1388/facter-1.5.9-sl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if %has_ruby_noarch @@ -32,6 +35,7 @@ operating system. Additional facts can be added through simple Ruby scripts %prep %setup -q +%patch0 -p1 %build @@ -54,6 +58,7 @@ rm -rf %{buildroot} %changelog * Thu May 26 2011 Todd Zullinger - 1.5.9-1 - Update to 1.5.9 +- Improve Scientific Linux support, courtesy of Orion Poplawski (upstream #7682) * Tue Feb 08 2011 Fedora Release Engineering - 1.5.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild