[rubygem-isolate/f17: 1/2] Fix conditionals for F17 to work for RHEL 7 as well.

Vít Ondruch vondruch at fedoraproject.org
Tue Apr 3 07:45:46 UTC 2012


commit dc0c4996b71d9f15a30675f63081cd6e954d4c8a
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Tue Apr 3 09:44:29 2012 +0200

    Fix conditionals for F17 to work for RHEL 7 as well.

 rubygem-isolate.spec |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/rubygem-isolate.spec b/rubygem-isolate.spec
index 85ce2a0..b644cf1 100644
--- a/rubygem-isolate.spec
+++ b/rubygem-isolate.spec
@@ -4,18 +4,21 @@
 
 %global	rubyabi	1.8
 
-%if 0%{?fedora} >= 17
+%if %{?fedora:0%{fedora} >= 17}%{?rhel:0%{rhel} >= 7}
 %global	gemdir	%{gem_dir}
 %global	gem_name	%{gemname}
 %global	geminstdir	%{gem_instdir}
 %global	rubyabi	1.9.1
+%global	ruby19	1
+%else
+%global ruby19	0
 %endif
 
 Summary:	Very simple RubyGems sandbox
 
 Name:		rubygem-%{gemname}
 Version:	3.2.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 Group:		Development/Languages
 License:	MIT
 URL:		http://github.com/jbarnette/isolate
@@ -25,7 +28,7 @@ BuildArch:	noarch
 
 BuildRequires:	ruby(abi) = %{rubyabi}
 BuildRequires:	rubygems
-%if 0%{?fedora} >= 17
+%if 0%{?ruby19} > 0
 BuildRequires:	rubygems-devel
 %endif
 # For %%check
@@ -97,6 +100,9 @@ ruby -rubygems %{_bindir}/rake test --trace
 %{gemdir}/doc/%{gemname}-%{version}
 
 %changelog
+* Tue Apr 03 2012 Bohuslav Kabrda <bkabrda at redhat.com> - 3.2.1-4
+- Fix conditionals for F17 to work for RHEL 7 as well.
+
 * Sun Jan 22 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 3.2.1-3
 - Rebuild against ruby 1.9
 


More information about the scm-commits mailing list