diff options
-rw-r--r-- | puppet.spec | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/puppet.spec b/puppet.spec index e61b332..1c2e4fb 100644 --- a/puppet.spec +++ b/puppet.spec @@ -1,9 +1,6 @@ %{!?ruby_sitelibdir: %define ruby_sitelibdir %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')} %define confdir conf/redhat -%define has_ruby_abi 0%{?fedora:%fedora} >= 5 || 0%{?rhel:%rhel} >= 5 -%define has_ruby_noarch %has_ruby_abi - Summary: A network tool for managing many disparate systems Name: puppet Version: 0.24.5 @@ -15,14 +12,12 @@ URL: http://puppet.reductivelabs.com/ Source: http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tgz Requires: ruby >= 1.8.1 -%if %has_ruby_abi +%if 0%{?fedora} || 0%{?rhel} >= 5 Requires: ruby(abi) = 1.8 +BuildArch: noarch %endif Requires: facter >= 1.1.4 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%if %has_ruby_noarch -BuildArchitectures: noarch -%endif BuildRequires: ruby >= 1.8.1 %description @@ -170,6 +165,7 @@ rm -rf %{buildroot} %changelog * Wed Oct 01 2008 Todd Zullinger <tmz@pobox.com> - 0.24.5-2 +- Simplify Fedora/RHEL version checks for ruby(abi) and BuildArch - Remove useless %%pbuild macro * Mon Jul 28 2008 David Lutterkort <dlutter@redhat.com> - 0.24.5-1 |