Merge pull request #616 from mckern/add-el7-to-stable

Apply the RHEL7 work and merge it into stable
puppetlabs · Jan 28, 2014 · 6c77fd9 · 6c77fd9
2 parents 5e3d6f3 + 865b4ca
commit 6c77fd9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/ext/build_defaults.yaml b/ext/build_defaults.yaml
@@ -9,7 +9,7 @@ gpg_name: '[email protected]'
 gpg_key: '4BD6EC30'
 sign_tar: FALSE
 # a space separated list of mock configs
-final_mocks: 'pl-el-5-i386 pl-el-5-x86_64 pl-el-6-i386 pl-el-6-x86_64 pl-fedora-18-i386 pl-fedora-18-x86_64 pl-fedora-19-i386 pl-fedora-19-x86_64 pl-fedora-20-i386 pl-fedora-20-x86_64'
+final_mocks: 'pl-el-5-i386 pl-el-5-x86_64 pl-el-6-i386 pl-el-6-x86_64 pl-el-7-x86_64 pl-fedora-18-i386 pl-fedora-18-x86_64 pl-fedora-19-i386 pl-fedora-19-x86_64 pl-fedora-20-i386 pl-fedora-20-x86_64'
 yum_host: 'yum.puppetlabs.com'
 yum_repo_path: '/opt/repository/yum/'
 build_gem: TRUE

diff --git 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