[rubygem-rubyforge/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:50:12 UTC 2012


commit 3cee152e9aee47b317b3ab73562d23253b2943dd
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Tue Apr 3 09:49:46 2012 +0200

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

 rubygem-rubyforge.spec |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/rubygem-rubyforge.spec b/rubygem-rubyforge.spec
index 9375a11..5b730cd 100644
--- a/rubygem-rubyforge.spec
+++ b/rubygem-rubyforge.spec
@@ -8,17 +8,20 @@
 # is needed
 %global enable_test 1
 
-%if 0%{?fedora} >= 17
+%if %{?fedora:0%{fedora} >= 17}%{?rhel:0%{rhel} >= 7}
 %global	gem_name	%{gemname}
 %global	gemdir	%{gem_dir}
 %global	geminstdir	%{gem_instdir}
 %global	rubyabi	1.9.1
+%global	ruby19	1
+%else
+%global	ruby19	0
 %endif
 
 Summary:       A script which automates a limited set of rubyforge operations
 Name:          rubygem-%{gemname}
 Version:       2.0.4
-Release:       5%{?dist}
+Release:       6%{?dist}
 Group:         Development/Languages
 License:       MIT
 URL:           http://rubyforge.org/projects/codeforpeople
@@ -36,7 +39,7 @@ BuildRequires: rubygem(minitest)
 # The following line causes dependency loop
 BuildRequires: rubygem(hoe)
 %endif
-%if 0%{?fedora} >= 17
+%if 0%{?ruby19} > 0
 BuildRequires: rubygems-devel
 %endif
 BuildArch:     noarch
@@ -114,6 +117,9 @@ popd
 
 
 %changelog
+* Tue Apr 03 2012 Bohuslav Kabrda <bkabrda at redhat.com> - 2.0.4-6
+- Fix conditionals for F17 to work for RHEL 7 as well.
+
 * Tue Jan 24 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 2.0.4-5
 - F-17: rebuild against ruby 19
 


More information about the scm-commits mailing list