diff options
| author | lutter <lutter@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-11-21 02:08:46 +0000 |
|---|---|---|
| committer | lutter <lutter@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-11-21 02:08:46 +0000 |
| commit | c301b1b8f7fb417cf61b6ad4975eaa3714100306 (patch) | |
| tree | 4ed5ca809f1b19d55eb8a936283a5f2f5c6ae22b | |
| parent | 3e3f70ec2a0dd8fc4f5718d3a97fec410493d638 (diff) | |
| download | puppet-c301b1b8f7fb417cf61b6ad4975eaa3714100306.tar.gz puppet-c301b1b8f7fb417cf61b6ad4975eaa3714100306.tar.xz puppet-c301b1b8f7fb417cf61b6ad4975eaa3714100306.zip | |
Make spec file work for Fedora < 5 and RHEL < 5
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1893 980ebf18-57e1-0310-9a29-db15c13687c0
| -rw-r--r-- | conf/redhat/puppet.spec | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/conf/redhat/puppet.spec b/conf/redhat/puppet.spec index 2266f8a99..080741029 100644 --- a/conf/redhat/puppet.spec +++ b/conf/redhat/puppet.spec @@ -2,10 +2,13 @@ %define pbuild %{_builddir}/%{name}-%{version} %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.20.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Base @@ -13,10 +16,14 @@ URL: http://reductivelabs.com/projects/puppet/ Source: http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tgz Requires: ruby >= 1.8.1 +%if %has_ruby_abi Requires: ruby(abi) = 1.8 +%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 @@ -127,6 +134,13 @@ fi %{__rm} -rf %{buildroot} %changelog +* Mon Nov 20 2006 David Lutterkort <dlutter@redhat.com> - 0.20.1-2 +- Make require ruby(abi) and buildarch: noarch conditional for fedora 5 or + later to allow building on older fedora releases + +* Mon Nov 13 2006 David Lutterkort <dlutter@redhat.com> - 0.20.1-1 +- New version + * Mon Oct 23 2006 David Lutterkort <dlutter@redhat.com> - 0.20.0-1 - New version |