From 27672bcddc9ea3c23e0619029995b28e0becf582 Mon Sep 17 00:00:00 2001 From: Sam Kottler Date: Tue, 8 Oct 2013 14:51:55 -0400 Subject: [PATCH] Move enabled_check into its own conditional and disabled it on F20+ --- facter.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/facter.spec b/facter.spec index cb71768..bb54cec 100644 --- a/facter.spec +++ b/facter.spec @@ -1,10 +1,14 @@ # F-17 and above have ruby-1.9.x, and place libs in a different location # The checks also fail on older releases, due to an older mocha gem, it appears +%if (0%{?fedora} >= 17 && 0%{?fedora} <= 19) +%global enable_check 1 +%else +%global enable_check 0 +%endif + %if 0%{?fedora} >= 17 -%global enable_check 1 %global facter_libdir %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["vendorlibdir"]') %else -%global enable_check 0 %global facter_libdir %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["sitelibdir"]') %endif