[ruby-shadow] Update ruby requires conditionals for EPEL7

Orion Poplawski orion at fedoraproject.org
Thu Jan 23 17:05:27 UTC 2014


commit 3c2fd537eda9cc537a77c5b4e5a5f19be1fd9639
Author: Orion Poplawski <orion at nwra.com>
Date:   Thu Jan 23 10:05:45 2014 -0700

    Update ruby requires conditionals for EPEL7

 ruby-shadow.spec |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/ruby-shadow.spec b/ruby-shadow.spec
index 538bed4..b9f56f6 100644
--- a/ruby-shadow.spec
+++ b/ruby-shadow.spec
@@ -6,7 +6,7 @@
 
 Name:           ruby-shadow
 Version:        1.4.1
-Release:        20%{?dist}
+Release:        21%{?dist}
 Summary:        Ruby bindings for shadow password access
 Group:          System Environment/Libraries
 License:        Public Domain
@@ -17,12 +17,8 @@ Patch1:         ruby-shadow-1.4.1-cflags.patch
 Patch2:         ruby-shadow-2.2.0-Add-support-for-ruby-2.0.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ruby-devel
-%if 0%{?fedora}
-%if 0%{?fedora} <= 18
-Requires:       ruby(abi) = 1.9.1
-%else
+%if 0%{?fedora} || 0%{?rhel} >= 7
 Requires:       ruby(release)
-%endif
 %else
 Requires:       ruby(abi) = 1.8
 %endif
@@ -55,6 +51,9 @@ rm -rf %{buildroot}
 %{ruby_archdir}/shadow.so
 
 %changelog
+* Thu Jan 23 2014 Orion Poplawski <orion at cora.nwra.com> - 1.4.1-21
+- Update ruby requires conditionals for EPEL7
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.1-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list