up to 1.6.6

diff --git a/ruby-facter.spec b/ruby-facter.spec
index 5037f9cb8e55cb45274453bccd5204b3077df066..d941fbdea3009175c1b2477f6d8816eb604dad7f 100644 (file)
--- a/ruby-facter.spec
+++ b/ruby-facter.spec
@@ -1,19 +1,24 @@
 %define                pkgname facter
-%define                subver  rc5
-%define                rel             1
 Summary:       Ruby module for collecting simple facts about a host operating system
 Name:          ruby-%{pkgname}
-Version:       1.5.9
-Release:       0.%{subver}.%{rel}
+Version:       1.6.6
+Release:       1
 License:       GPL v2+
 Group:         Networking/Admin
-Source0:       http://puppetlabs.com/downloads/facter/%{pkgname}-%{version}%{subver}.tar.gz
-# Source0-md5: 9fe23f971d2659122df387804bdff77a
+Source0:       http://downloads.puppetlabs.com/%{pkgname}/%{pkgname}-%{version}.tar.gz
+# Source0-md5: 47670a59301d6c3e31a1c68747b139c8
 URL:           http://www.puppetlabs.com/puppet/related-projects/facter/
 BuildRequires: docutils
 BuildRequires: rpmbuild(macros) >= 1.484
 BuildRequires: ruby >= 1:1.8.6
 BuildRequires: ruby-modules
+Requires:      net-tools
+Requires:      which
+# dmidecode and pciutils are not available on all arches
+%ifarch %{ix86} %{x8664} ia64
+Requires:      dmidecode
+Requires:      pciutils
+%endif
 Obsoletes:     facter
 %{?ruby_mod_ver_requires_eq}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -22,15 +27,18 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                _enable_debug_packages  0
 
 %description
-Ruby module for collecting simple facts about a host Operating system.
-Some of the facts are preconfigured, such as the hostname and the
-operating system. Additional facts can be added through simple Ruby
-scripts
+Facter is a lightweight program that gathers basic node information
+about the hardware and operating system. Facter is especially useful
+for retrieving things like operating system names, hardware
+characteristics, IP addresses, MAC addresses, and SSH keys.
 
-%prep
-%setup -q -n %{pkgname}-%{version}%{subver}
+Facter is extensible and allows gathering of node information that may
+be custom or site specific. It is easy to extend by including your own
+custom facts. Facter can also be used to create conditional
+expressions in Puppet that key off the values returned by facts.
 
-%build
+%prep
+%setup -q -n %{pkgname}-%{version}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -46,7 +54,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README TODO etc/facter.conf
+%doc CHANGELOG README.md etc/facter.conf
 %attr(755,root,root) %{_bindir}/facter
 %{ruby_sitelibdir}/facter
 %{ruby_sitelibdir}/facter.rb