Skip to content

Commit 1deddfe

Browse files
dyarnellmckern
authored andcommitted
Adds support for building facter on RHEL7 via spec.
1 parent 5e3d6f3 commit 1deddfe

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

ext/redhat/facter.spec.erb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# Fedora 17 ships with ruby 1.9, which uses vendorlibdir instead
1+
# Fedora 17 ships with ruby 1.9, RHEL 7 with ruby 2.0, which use vendorlibdir instead
22
# of sitelibdir
3-
%if 0%{?fedora} >= 17
3+
%if 0%{?fedora} >= 17 || 0%{?rhel} >= 7
44
%global facter_libdir %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["vendorlibdir"]')
55
%else
66
%global facter_libdir %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["sitelibdir"]')
@@ -35,8 +35,8 @@ Requires: virt-what
3535
Requires: ruby >= 1.8.5
3636
BuildRequires: ruby >= 1.8.5
3737

38-
# In Fedora 17 ruby-rdoc is called rubygem-rdoc
39-
%if 0%{?fedora} >= 17
38+
# In Fedora 17+ or RHEL 7+ ruby-rdoc is called rubygem-rdoc
39+
%if 0%{?fedora} >= 17 || 0%{?rhel} >= 7
4040
BuildRequires: rubygem-rdoc
4141
%else
4242
BuildRequires: ruby-rdoc

0 commit comments

Comments
 (0)