[Pkg-puppet-devel] [facter] 187/352: Adds support for building facter on RHEL7 via spec.

[Stig Sandbeck Mathisen]

This is an automated email from the git hooks/post-receive script.

ssm pushed a commit to branch master
in repository facter.

commit 1deddfecba46009cf973870cb7ea4b83936ddf24
Author: Derek Yarnell <derek at umiacs.umd.edu>
Date:   Mon Dec 16 16:18:11 2013 -0500

    Adds support for building facter on RHEL7 via spec.
---
 ext/redhat/facter.spec.erb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ext/redhat/facter.spec.erb b/ext/redhat/facter.spec.erb
index 9e3321a..aeb1289 100644
--- a/ext/redhat/facter.spec.erb
+++ b/ext/redhat/facter.spec.erb
@@ -1,6 +1,6 @@
-# Fedora 17 ships with ruby 1.9, which uses vendorlibdir instead
+# Fedora 17 ships with ruby 1.9, RHEL 7 with ruby 2.0, which use vendorlibdir instead
 # of sitelibdir
-%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"]')
@@ -35,8 +35,8 @@ Requires:       virt-what
 Requires:       ruby >= 1.8.5
 BuildRequires:  ruby >= 1.8.5
 
-# In Fedora 17 ruby-rdoc is called rubygem-rdoc
-%if 0%{?fedora} >= 17
+# In Fedora 17+ or RHEL 7+ ruby-rdoc is called rubygem-rdoc
+%if 0%{?fedora} >= 17 || 0%{?rhel} >= 7
 BuildRequires:  rubygem-rdoc
 %else
 BuildRequires:  ruby-rdoc

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-puppet/facter.git