From 3248c1baaac68c11e6d6aa74425852b5a7a78a42 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Jan 28 2014 23:01:45 +0000 Subject: Move definition of enable_check macro This was in the wrong location, making the comment about the lib dir look out of place. --- diff --git a/facter.spec b/facter.spec index bb54cec..3dc5ee7 100644 --- a/facter.spec +++ b/facter.spec @@ -1,17 +1,17 @@ # 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 facter_libdir %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["vendorlibdir"]') %else %global facter_libdir %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["sitelibdir"]') %endif +# Only enable checks on F-19, other releases fail for various reasons +%if (0%{?fedora} >= 17 && 0%{?fedora} <= 19) +%global enable_check 1 +%else +%global enable_check 0 +%endif + %global ruby_version %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["ruby_version"]') # There is nothing useful in debuginfo, facter is only an arch package to