[Pkg-puppet-devel] [SCM] Packaging of Facter for debian branch, upstream, updated. 3a39dd8353b6308cf49522990104cc63e55d7cda

[James Turnbull]

The following commit has been merged in the upstream branch:
commit d97a63ed0aec1a9541be6754f6cc0efddc3d01f5
Author: Todd Zullinger <tmz at pobox.com>
Date:   Fri May 22 19:59:04 2009 -0400

    Sync rpm spec file with latest from Fedora/EPEL
    
    The spec file now uses the install.rb script rather than manually
    installing files.

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 at pobox.com> - 1.5.5-1
+- Update to 1.5.5
+- Drop upstreamed libperms patch
+
+* Sat Feb 28 2009 Todd Zullinger <tmz at pobox.com> - 1.5.4-1
+- New version
+- Use upstream install script
+
 * Tue Sep 09 2008 Todd Zullinger <tmz at pobox.com> - 1.5.2-1
 - New version
 - Simplify spec file checking for Fedora and RHEL versions

-- 
Packaging of Facter for debian