[hiera/epel7] Fix meta ruby conditional for EPEL7
Sam Kottler
skottler at fedoraproject.org
Mon Jan 27 10:12:05 UTC 2014
commit 766cd7773e46462ac10d7666ec1d5eff2195fef1
Author: Sam Kottler <shk at redhat.com>
Date: Mon Jan 27 11:12:23 2014 +0100
Fix meta ruby conditional for EPEL7
hiera.spec | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
---
diff --git a/hiera.spec b/hiera.spec
index 6eb3e95..c894961 100644
--- a/hiera.spec
+++ b/hiera.spec
@@ -25,14 +25,10 @@ BuildRequires: rubygem(rspec)
BuildRequires: rubygem(mocha)
%endif
BuildRequires: ruby-devel
-%if 0%{?el5}%{?el6}%{?fc16}
+%if 0%{?el5}%{?el6}
Requires: ruby(abi) = 1.8
%else
-%if 0%{?fedora} >= 19
Requires: ruby(release)
-%else
-Requires: ruby(abi) = 1.9.1
-%endif
%endif
%description
@@ -49,8 +45,8 @@ rm -rf %{buildroot}
mkdir -p %{buildroot}%{ruby_vendorlibdir}
mkdir -p %{buildroot}%{_sysconfdir}
mkdir -p %{buildroot}%{_bindir}
-cp -pr lib/hiera %{buildroot}%{ruby_vendorlibdir}
-cp -pr lib/hiera.rb %{buildroot}%{ruby_vendorlibdir}
+cp -pr lib/hiera %{buildroot}%{ruby_vendorlibdir}
+cp -pr lib/hiera.rb %{buildroot}%{ruby_vendorlibdir}
install -p -m0755 bin/hiera %{buildroot}%{_bindir}
install -p -m0644 ext/hiera.yaml %{buildroot}%{_sysconfdir}
mkdir -p %{buildroot}%{_var}/lib/hiera
More information about the scm-commits
mailing list