diff --git a/facter-1.5.8.tar.gz.sign b/facter-1.5.8.tar.gz.sign deleted file mode 100644 index 3d90e70..0000000 --- a/facter-1.5.8.tar.gz.sign +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.10 (GNU/Linux) - -iQIcBAABAgAGBQJMeFGrAAoJEBBUt6JL1uwwFJ8P/2a7qg3wataDTQF8gcmbDhN+ -sz64qzF5gLU2wCwfjTo8I2g1ZHUE0Sh9rNCHVdsNyeW9BG6EApD8qZGh50O/F4FN -NI6jdD1RRSCspBxC8UJm3FzStFaJPDDTYYBOVixyW/KscddClxuOfRgdlywP1IaW -j+v9f/Q0Uojwj2B4/QeV/+idz0zwJ6G91AvUFtrMzx4dcFC4cZK8lqWDYFAjma66 -7doVFSzq3nAdcda3yGHE9EeAPqF86s5OUcQ5e8IvZiXAydP+nudgwXsXmjBD/0ut -7pRfIbArGyNx79H5l0qhVAssxB02rKS5iMU16XMdcWETEXmN2AQtI2xmZWxhmZ21 -PLJ5xQ7KoEGVB+zGuYegxgZQ6dOYTmI9wd08sbChiS3VhSrftR0xmB+le0fkFopc -SitEB8C8pNo1kIx6zzkFSdSD0VFOKEg0p/8US4TwNGaF74/IZbaJZbQ4B1Hv/rC8 -D3SVuNw7pch0RjydWr8dGtivzHDkRa1n8YClodi0Rw0owGrmAanXC8EcwuRjjOiX -jBFJ9CkClRTwVvgXKozQKwdh9B1MvoRU2ZNyfM/x+p4cyv6OsVve7KRkP7KFjqJm -VRAabQRkS860SYgJ46VrhsdWGXg2pQF+78l5lt1LjTWPqNUZ8CrRiNNf8mbNHb1s -qwJsTWPlKXabPADldWv9 -=Ecby ------END PGP SIGNATURE----- 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-1.5.9.tar.gz.asc b/facter-1.5.9.tar.gz.asc new file mode 100644 index 0000000..03c195f --- /dev/null +++ b/facter-1.5.9.tar.gz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.10 (GNU/Linux) + +iQIcBAABAgAGBQJN1q+UAAoJEBBUt6JL1uwwiG0QAJXUCh2I+2qQDrj0SOheNkDj +va5e4ezl1uKgs6LTKtIyxnN+DnA1dcSHMVYjxoHiQz/sCA28B6/n1h67bnAD7tGo +TJ9JC/Jhk+vrimy/PLD3f5v9WdwlTBBvE3I+WHGtLn69KXswhzi01rh7Ge8q8oX4 +A8eqShiesNhyWr5fKFw6Q9dVuobji0zSC+Hq3TmkywivGu5QhTdH+Wl7MJZsc3c2 +rRDQTS+4ZyZ8l2585gQyllLuooBy+nCeq8IwNlMQxHqWlN8L6f7iIkv1P7Md+4BL +KplOY/Y6PvZk6AH9lNq9r1uXFtAmcnEk0iSNmwZQw1r5FUDhqs+eB3xQM9caxbo4 +Bpo3VegXgHVslXPG8okd9ibXke7PvPBNP05ChGZzUrUbczR5Yf3JpAsxX/UlOm4w +CYOqVEBzE6kLfjjxpgrQuxGWGIbw1Q5fEIqaFh+jAPfNkY2eZeDXHBWKaDAmEWEJ +eYxkiY8TrrGkzt30regpcwHzwirsB37Z4bg1f4cyzH/KC0ugLyAf70nj5SAqMhus +ZOFmBFqUuvclVRPn4KF+/GINglZDMF/Ow4fae5yfiExc+YlEx2lktLt2xj3DiJYB +0WJiGnS/Sc10dZ8yDf6WGZ/JrlFzihMJNP4ZY47fxNR4BKqs2/Tuj5OJ9Xa79ueV +nZrE3s/Ep0dGIJriF91J +=r8hv +-----END PGP SIGNATURE----- diff --git a/facter.spec b/facter.spec index 1148fd3..892f1b0 100644 --- a/facter.spec +++ b/facter.spec @@ -5,13 +5,16 @@ Summary: Ruby module for collecting simple facts about a host operating system Name: facter -Version: 1.5.8 +Version: 1.5.9 Release: 1%{?dist} License: GPLv2+ 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.sign +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 @@ -52,6 +56,13 @@ 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 + * Sat Aug 28 2010 Todd Zullinger - 1.5.8-1 - Update to 1.5.8 diff --git a/sources b/sources index 1404bce..a07c8c7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4dd4daebc59fa985b8aa7eb247ac4030 facter-1.5.8.tar.gz +435553aace9781ecff5dae593abc15fa facter-1.5.9.tar.gz