summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlutter <lutter@1f5c1d6a-bddf-0310-8f58-fc49e503516a>2006-11-21 02:07:46 +0000
committerlutter <lutter@1f5c1d6a-bddf-0310-8f58-fc49e503516a>2006-11-21 02:07:46 +0000
commit0674780cb8e66b63d2a804b61cc6c765e9feded3 (patch)
tree00af8d5eb2946f1fb2eb8188ffaa017cda737da3
parentea65bdd77f664fe9129e46873faa1c549b06e03d (diff)
downloadfacter-0674780cb8e66b63d2a804b61cc6c765e9feded3.tar.gz
facter-0674780cb8e66b63d2a804b61cc6c765e9feded3.tar.xz
facter-0674780cb8e66b63d2a804b61cc6c765e9feded3.zip
Make specfile work for FC < 5 and RHEL < 5
git-svn-id: http://reductivelabs.com/svn/facter/trunk@184 1f5c1d6a-bddf-0310-8f58-fc49e503516a
-rw-r--r--conf/redhat/facter.spec13
1 files changed, 12 insertions, 1 deletions
diff --git a/conf/redhat/facter.spec b/conf/redhat/facter.spec
index 40449c1..54f4a86 100644
--- a/conf/redhat/facter.spec
+++ b/conf/redhat/facter.spec
@@ -1,18 +1,25 @@
%{!?ruby_sitelibdir: %define ruby_sitelibdir %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')}
+%define has_ruby_abi 0%{?fedora:%fedora} >= 5 || 0%{?rhel:%rhel} >= 5
+%define has_ruby_noarch %has_ruby_abi
+
Summary: Ruby module for collecting simple facts about a host operating system
Name: facter
Version: 1.3.5
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPL
Group: System Environment/Base
URL: http://reductivelabs.com/projects/facter
Source0: http://reductivelabs.com/downloads/facter/%{name}-%{version}.tgz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if %has_ruby_noarch
BuildArchitectures: noarch
+%endif
Requires: ruby >= 1.8.1
+%if %has_ruby_abi
Requires: ruby(abi) = 1.8
+%endif
BuildRequires: ruby >= 1.8.1
%description
@@ -52,6 +59,10 @@ rm -rf %{buildroot}
%changelog
+* Mon Nov 20 2006 David Lutterkort <dlutter@redhat.com> - 1.3.5-2
+- Make require ruby(abi) and buildarch: noarch conditional for fedora 5 or
+ later to allow building on older fedora releases
+
* Tue Oct 10 2006 David Lutterkort <dlutter@redhat.com> - 1.3.5-1
- New version