Commit c3a8e41c authored by Matthaus Owens's avatar Matthaus Owens

Merge pull request #881 from mckern/1.5.x

(maint) Updated RHEL7 support in 1.5.x branch
parents 6ab474bf 00024be5
......@@ -6,7 +6,7 @@
%global open_jdk pe-java
<% else -%>
# Fedora 17 ships with openjdk 1.7.0
%if 0%{?fedora} >= 17 || ( 0%{?suse_version} >= 1200 && %{undefined sles_version} )
%if 0%{?fedora} >= 17 || 0%{?rhel} >= 7 || ( 0%{?suse_version} >= 1200 && %{undefined sles_version} )
%global open_jdk java-1.7.0-openjdk
%else
%if 0%{?sles_version}
......@@ -26,7 +26,7 @@
<% if @pe -%>
%global puppet_libdir %(PATH=/opt/puppet/bin:$PATH ruby -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']")
<% else -%>
%if 0%{?fedora} >= 17
%if 0%{?fedora} >= 17 || 0%{?rhel} >= 7
%global puppet_libdir %(ruby -rrbconfig -e "puts RbConfig::CONFIG['vendorlibdir']")
%else
%global puppet_libdir %(ruby -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment