diff --git a/facter-1.5.9-sl.patch b/0001-7682-Added-Scientific-Linux-facts.patch similarity index 60% rename from facter-1.5.9-sl.patch rename to 0001-7682-Added-Scientific-Linux-facts.patch index d5921ed..f8388ed 100644 --- a/facter-1.5.9-sl.patch +++ b/0001-7682-Added-Scientific-Linux-facts.patch @@ -1,16 +1,34 @@ -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 @@ +From 6360e5a576f7643ac61577abf01110c7d5689afc Mon Sep 17 00:00:00 2001 +From: Orion Poplawski +Date: Mon, 27 Jun 2011 09:31:31 -0700 +Subject: [PATCH] (#7682) Added Scientific Linux facts + +Added facts to differentiate Scientific Linux from Redhat. +--- + lib/facter/hardwareisa.rb | 2 +- + lib/facter/lsbmajdistrelease.rb | 2 +- + lib/facter/macaddress.rb | 2 +- + lib/facter/operatingsystemrelease.rb | 4 ++-- + lib/facter/uniqueid.rb | 2 +- + spec/unit/operatingsystemrelease_spec.rb | 17 +++++++++-------- + 6 files changed, 15 insertions(+), 14 deletions(-) + +diff --git a/lib/facter/hardwareisa.rb b/lib/facter/hardwareisa.rb +index 9d0830e..87d5391 100644 +--- a/lib/facter/hardwareisa.rb ++++ b/lib/facter/hardwareisa.rb +@@ -12,5 +12,5 @@ + 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 @@ +diff --git a/lib/facter/lsbmajdistrelease.rb b/lib/facter/lsbmajdistrelease.rb +index 3659541..4fa68e9 100644 +--- a/lib/facter/lsbmajdistrelease.rb ++++ b/lib/facter/lsbmajdistrelease.rb +@@ -15,7 +15,7 @@ require 'facter' Facter.add("lsbmajdistrelease") do @@ -19,10 +37,11 @@ diff -up facter-1.5.9/lib/facter/lsbmajdistrelease.rb.sl facter-1.5.9/lib/facter 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 @@ +diff --git a/lib/facter/macaddress.rb b/lib/facter/macaddress.rb +index 54c3c84..1e60064 100644 +--- a/lib/facter/macaddress.rb ++++ b/lib/facter/macaddress.rb +@@ -10,7 +10,7 @@ require 'facter/util/macaddress' Facter.add(:macaddress) do @@ -31,10 +50,13 @@ diff -up facter-1.5.9/lib/facter/macaddress.rb.sl facter-1.5.9/lib/facter/macadd 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 @@ +diff --git a/lib/facter/operatingsystemrelease.rb b/lib/facter/operatingsystemrelease.rb +index 347fe7f..e48330f 100644 +--- a/lib/facter/operatingsystemrelease.rb ++++ b/lib/facter/operatingsystemrelease.rb +@@ -16,10 +16,10 @@ + # + Facter.add(:operatingsystemrelease) do - confine :operatingsystem => %w{CentOS Fedora oel ovs RedHat MeeGo} + confine :operatingsystem => %w{CentOS Fedora oel ovs RedHat MeeGo Scientific} @@ -45,19 +67,21 @@ diff -up facter-1.5.9/lib/facter/operatingsystemrelease.rb.sl facter-1.5.9/lib/f 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 +diff --git a/lib/facter/uniqueid.rb b/lib/facter/uniqueid.rb +index aaeaa12..842d329 100644 +--- a/lib/facter/uniqueid.rb ++++ b/lib/facter/uniqueid.rb @@ -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" +diff --git a/spec/unit/operatingsystemrelease_spec.rb b/spec/unit/operatingsystemrelease_spec.rb +index 739a20a..fb983ce 100755 +--- a/spec/unit/operatingsystemrelease_spec.rb ++++ b/spec/unit/operatingsystemrelease_spec.rb +@@ -15,14 +15,15 @@ describe "Operating System Release fact" do end test_cases = { @@ -81,3 +105,6 @@ diff -up facter-1.5.9/spec/unit/operatingsystemrelease_spec.rb.sl facter-1.5.9/s } test_cases.each do |system, file| +-- +1.7.6.rc1 + diff --git a/facter-1.5.9.tar.gz.asc b/facter-1.5.9.tar.gz.asc deleted file mode 100644 index 03c195f..0000000 --- a/facter-1.5.9.tar.gz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------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-1.6.0.tar.gz.asc b/facter-1.6.0.tar.gz.asc new file mode 100644 index 0000000..4dc977e --- /dev/null +++ b/facter-1.6.0.tar.gz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.11 (Darwin) + +iQIcBAABAgAGBQJOA8J8AAoJEBBUt6JL1uwwpaAP/j3Y7wH1ntedvpKZY71USdvC +74E0rM5D38ePZ8j5u2Kh4n6rw1oPd8ezXiCIqYOjNDifmqi1ieWd/UPvOSPXlK4a +sPMus+N7PNButs3l9rWx5dbvKdLaojSlUhVJQfhBU/PPCPou4W00sTNxchJ07xhR +K/CG0WjA0BbahzU7Erz0LnSkiJXidlZln3mURGj5uNnEcAejvT+YwzkXgAT6cNlj +DyvE6uTuXD64Tlg/cqkH9IXuJtbSelPPaQKxKjCq6HvfrwOX2J5vW/NVruf4fE5d +dFAyC5SQtKC0DEIkYAkqySJR6NpSKYgN16Zys/TIUNsoMzlAepi1hgqeQ/yOYw2K +893DRH7Lr6ebjMK3DwmVeSiRMJ3xR6Mvm6Vk+nXK8xFCiSTPldQxOuoKIYufK/eK +61ugEWWD7sZo1GHqAQmP1kbzAond0jQCUIvAVBi/CtkVuvhPLQ4/QCpvVLBl30Y3 +E0edzRkINtVHfTNvYXiFdowSNTBPf6WOhRs3Zw/Ac4n1y/NaWhr74Gn9t6b5ORPi +bgUh75iBX06b9UdGzueD0r1eTzeof7fJ6+zffGvmMSTCWp1aAh8Iq6XhbCSAdEqi +0BWF84Tizt0QrU5U1BWR4AxlCL7KB6H1WAVt6ESI99c5u+5Mt9SQFIedB30lWSc6 ++cJfbzSb9VjFW5kKFNZu +=ePAN +-----END PGP SIGNATURE----- diff --git a/facter.spec b/facter.spec index 892f1b0..185af32 100644 --- a/facter.spec +++ b/facter.spec @@ -5,7 +5,7 @@ Summary: Ruby module for collecting simple facts about a host operating system Name: facter -Version: 1.5.9 +Version: 1.6.0 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base @@ -14,7 +14,7 @@ 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 +Patch0: 0001-7682-Added-Scientific-Linux-facts.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if %has_ruby_noarch @@ -49,13 +49,15 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -%{_bindir}/facter -%{ruby_sitelibdir}/facter.rb -%{ruby_sitelibdir}/facter -%doc CHANGELOG COPYING INSTALL LICENSE README +%doc CHANGELOG INSTALL LICENSE README.md +%{_bindir}/%{name} +%{ruby_sitelibdir}/%{name}* %changelog +* Thu Jul 14 2011 Todd Zullinger - 1.6.0-1 +- Update to 1.6.0 + * 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) diff --git a/sources b/sources index a07c8c7..d6087e7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -435553aace9781ecff5dae593abc15fa facter-1.5.9.tar.gz +bf7e384bf247935e973cfd7bf5592dfe facter-1.6.0.tar.gz