From 60fa8da6ab6179110054e35b92bf292ee6b3dba9 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Mon, 5 May 2014 11:36:21 +0200 Subject: [PATCH] Fix el7 conditionals as suggested by Orion Poplawski (BZ #1087946) --- facter.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/facter.spec b/facter.spec index bf5f2bd..67acfa5 100644 --- a/facter.spec +++ b/facter.spec @@ -1,5 +1,5 @@ # F-17 and above have ruby-1.9.x, and place libs in a different location -%if 0%{?fedora} >= 17 +%if 0%{?fedora} >= 17 || 0%{?rhel} >= 7 %global facter_libdir %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["vendorlibdir"]') %else %global facter_libdir %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["sitelibdir"]') @@ -20,7 +20,7 @@ Name: facter Version: 2.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Command and ruby library for gathering system information Group: System Environment/Base @@ -48,7 +48,7 @@ Requires: virt-what Requires: net-tools # Work around the lack of ruby in the default mock buildroot %if "%{ruby_version}" -%if 0%{?fedora} >= 19 +%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7 Requires: ruby(release) %else Requires: ruby(abi) = %{ruby_version} @@ -115,6 +115,9 @@ rspec spec %changelog +* Mon May 05 2014 Lubomir Rintel - 2.0.1-2 +- Fix el7 conditionals as suggested by Orion Poplawski (BZ #1087946) + * Tue Apr 29 2014 Sam Kottler - 2.0.1-1 - Update to to 2.0.1