From dbbec2389a41e1f33bbed384524f1966b1de45a0 Mon Sep 17 00:00:00 2001
From: Vít Ondruch <vondruch@redhat.com>
Date: Apr 03 2012 07:51:13 +0000
Subject: Merge branch 'master' into f17


---

diff --git a/rubygem-test-unit.spec b/rubygem-test-unit.spec
index bbcebb5..7f4993f 100644
--- a/rubygem-test-unit.spec
+++ b/rubygem-test-unit.spec
@@ -3,12 +3,14 @@
 %global	geminstdir	%{gemdir}/gems/%{gemname}-%{version}
 
 %global	rubyabi	1.8
+%global	ruby19	0
 
-%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
 %endif
 
 # svn repository
@@ -17,7 +19,7 @@
 Summary:	Improved version of Test::Unit bundled in Ruby 1.8.x
 Name:		rubygem-%{gemname}
 Version:	2.4.5
-Release:	2%{?dist}
+Release:	3%{?dist}
 Group:		Development/Languages
 # lib/test/unit/diff.rb is under GPLv2 or Ruby or Python
 # Other file: GPLv2 or Ruby
@@ -27,7 +29,7 @@ URL:		http://rubyforge.org/projects/test-unit/
 Source0:	http://rubygems.org/gems/%{gemname}-%{version}.gem
 BuildRequires:	ruby(abi) = %{rubyabi}
 BuildRequires:	rubygems
-%if 0%{?fedora} >= 17
+%if 0%{?ruby19} > 0
 BuildRequires:	rubygems-devel
 %endif
 # For %%check
@@ -115,6 +117,9 @@ popd
 %{gemdir}/doc/%{gemname}-%{version}/
 
 %changelog
+* Tue Apr 03 2012 Bohuslav Kabrda <bkabrda@redhat.com> - 2.4.5-3
+- Fix conditionals for F17 to work for RHEL 7 as well.
+
 * Sun Jan 22 2012 Mamoru Tasaka <mtasaka@fedoraproject.org> - 2.4.5-2
 - 2.4.5