[rubygem-glib2/f17: 3/4] Fix conditionals for F17 to work for RHEL 7 as well.

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


commit 854c9272d477315e9f9c97f73d15826ec3b381eb
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Tue Apr 3 09:34:16 2012 +0200

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

 rubygem-glib-1.0.3-test-with-new-glib.patch        |   16 ----------------
 ...m-glib2-0.90.8-include-dsl-for-newer-rake.patch |   10 ----------
 rubygem-glib2.spec                                 |    7 +++++--
 3 files changed, 5 insertions(+), 28 deletions(-)
---
diff --git a/rubygem-glib2.spec b/rubygem-glib2.spec
index 6a3c3ee..87ce9b3 100644
--- a/rubygem-glib2.spec
+++ b/rubygem-glib2.spec
@@ -1,4 +1,4 @@
-%if 0%{?fedora} >= 17
+%if %{?fedora:0%{fedora} >= 17}%{?rhel:0%{rhel} >= 7}
 %global	rubyabi	1.9.1
 %global	header_dir	%{ruby_vendorarchdir}
 %global	ruby19	1
@@ -18,7 +18,7 @@
 Summary:	Ruby binding of GLib-2.x
 Name:		rubygem-%{gem_name}
 Version:	1.1.2
-Release:	5%{?dist}
+Release:	6%{?dist}
 Group:		Development/Languages
 # from README
 License:	LGPLv2
@@ -357,6 +357,9 @@ popd
 
 
 %changelog
+* Tue Apr 03 2012 Bohuslav Kabrda <bkabrda at redhat.com> - 1.1.2-6
+- Fix conditionals for F17 to work for RHEL 7 as well.
+
 * Tue Mar 27 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1.1.2-5
 - Fix UTF-{16,32} related test failure on ppc{,64}
   (bug 804319, upstream bug 107)


More information about the scm-commits mailing list