summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlutter <lutter@1f5c1d6a-bddf-0310-8f58-fc49e503516a>2006-03-14 03:25:22 +0000
committerlutter <lutter@1f5c1d6a-bddf-0310-8f58-fc49e503516a>2006-03-14 03:25:22 +0000
commitfadc8c562b93512027329972bec1833895d2424b (patch)
tree5bdc694ced01f2eedbe07681e43fb213243a2742
parente3e4a03919d7a48ceffc43708ec7e00bab9531a8 (diff)
downloadfacter-fadc8c562b93512027329972bec1833895d2424b.tar.gz
facter-fadc8c562b93512027329972bec1833895d2424b.tar.xz
facter-fadc8c562b93512027329972bec1833895d2424b.zip
Minor changes for hte Fedora Extras review
git-svn-id: http://reductivelabs.com/svn/facter/trunk@97 1f5c1d6a-bddf-0310-8f58-fc49e503516a
-rw-r--r--conf/redhat/facter.spec30
1 files changed, 19 insertions, 11 deletions
diff --git a/conf/redhat/facter.spec b/conf/redhat/facter.spec
index fc3d7a2..173efa3 100644
--- a/conf/redhat/facter.spec
+++ b/conf/redhat/facter.spec
@@ -1,23 +1,25 @@
-%define rb_ver %(ruby -rrbconfig -e 'puts Config::CONFIG["ruby_version"]')
-%define rubylibdir %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')
-%define _pbuild %{_builddir}/%{name}-%{version}
+%define sitelibdir %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')
-Summary: Facter collects Operating system facts
+Summary: Ruby module for collecting simple facts about a host operating system
Name: facter
Version: 1.1.4
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPL
Group: System Environment/Base
URL: http://reductivelabs.com/projects/facter
-Source0: %{name}-%{version}.tgz
+Source0: http://reductivelabs.com/downloads/facter/%{name}-%{version}.tgz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArchitectures: noarch
+# It's not possible to build ruby noarch packages currently
+# See bz184199
+#BuildArchitectures: noarch
Requires: ruby >= 1.8.1
BuildRequires: ruby >= 1.8.1
-%description
-Facter is a module for collecting simple facts about a host Operating system.
+%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
%prep
%setup -q
@@ -28,6 +30,7 @@ Facter is a module for collecting simple facts about a host Operating system.
rm -rf $RPM_BUILD_ROOT
mkdir $RPM_BUILD_ROOT
DESTDIR=$RPM_BUILD_ROOT ruby install.rb --no-tests
+chmod a-x $RPM_BUILD_ROOT%{sitelibdir}/*.rb
%clean
rm -rf $RPM_BUILD_ROOT
@@ -36,14 +39,19 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%{_bindir}/facter
-%{rubylibdir}/facter.rb
+%{sitelibdir}/facter.rb
%doc CHANGELOG COPYING INSTALL LICENSE README
%changelog
+* Mon Mar 13 2006 David Lutterkort <dlutter@redhat.com> - 1.1.4-2
+- Commented out noarch; requires fix for bz184199
+
+* Mon Mar 6 2006 David Lutterkort <dlutter@redhat.com> - 1.1.4-1
+- Removed unused macros
+
* Mon Feb 6 2006 David Lutterkort <dlutter@redhat.com> - 1.1.1-2
- Fix BuildRoot. Add dist to release tag
* Wed Jan 11 2006 David Lutterkort <dlutter@redhat.com> - 1.1.1-1
- Initial build.
-