summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorTodd Zullinger <tmz@pobox.com>2009-05-22 19:59:04 -0400
committerJames Turnbull <james@lovedthanlost.net>2009-05-28 00:16:48 +1000
commitd97a63ed0aec1a9541be6754f6cc0efddc3d01f5 (patch)
tree2878fc9ad9c2e70ff0768134b4da6636f88d2214 /conf
parentdad4569dd715e4cd6176329503e8502768bca47b (diff)
downloadfacter-d97a63ed0aec1a9541be6754f6cc0efddc3d01f5.tar.gz
facter-d97a63ed0aec1a9541be6754f6cc0efddc3d01f5.tar.xz
facter-d97a63ed0aec1a9541be6754f6cc0efddc3d01f5.zip
Sync rpm spec file with latest from Fedora/EPEL
The spec file now uses the install.rb script rather than manually installing files.
Diffstat (limited to 'conf')
-rw-r--r--conf/redhat/facter.spec28
1 files changed, 11 insertions, 17 deletions
diff --git a/conf/redhat/facter.spec b/conf/redhat/facter.spec
index efcb7af..b907d5b 100644
--- a/conf/redhat/facter.spec
+++ b/conf/redhat/facter.spec
@@ -5,12 +5,12 @@
Summary: Ruby module for collecting simple facts about a host operating system
Name: facter
-Version: 1.5.2
+Version: 1.5.5
Release: 1%{?dist}
License: GPLv2+
Group: System Environment/Base
URL: http://reductivelabs.com/projects/facter
-Source0: http://reductivelabs.com/downloads/facter/%{name}-%{version}.tgz
+Source0: http://reductivelabs.com/downloads/facter/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if %has_ruby_noarch
BuildArch: noarch
@@ -32,24 +32,10 @@ operating system. Additional facts can be added through simple Ruby scripts
%setup -q
%build
-sed -i -e 's@^#!.*$@#! /usr/bin/ruby@' bin/facter
%install
rm -rf %{buildroot}
-mkdir -p %{buildroot}
-
-%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}
-%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter
-%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter/util
-%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter/util/plist
-%{__install} -d -m0755 %{buildroot}%{_bindir}
-%{__install} -d -m0755 %{buildroot}%{_docdir}/%{name}-%{version}
-
-%{__install} -p -m0644 lib/*.rb %{buildroot}%{ruby_sitelibdir}
-%{__install} -p -m0644 lib/facter/*.rb %{buildroot}%{ruby_sitelibdir}/facter
-%{__install} -p -m0644 lib/facter/util/*.rb %{buildroot}%{ruby_sitelibdir}/facter/util
-%{__install} -p -m0644 lib/facter/util/plist/*.rb %{buildroot}%{ruby_sitelibdir}/facter/util/plist
-%{__install} -p -m0755 bin/facter %{buildroot}%{_bindir}
+ruby install.rb --destdir=%{buildroot} --quick --no-rdoc
%clean
rm -rf %{buildroot}
@@ -64,6 +50,14 @@ rm -rf %{buildroot}
%changelog
+* Fri May 22 2009 Todd Zullinger <tmz@pobox.com> - 1.5.5-1
+- Update to 1.5.5
+- Drop upstreamed libperms patch
+
+* Sat Feb 28 2009 Todd Zullinger <tmz@pobox.com> - 1.5.4-1
+- New version
+- Use upstream install script
+
* Tue Sep 09 2008 Todd Zullinger <tmz@pobox.com> - 1.5.2-1
- New version
- Simplify spec file checking for Fedora and RHEL versions