From 304a4343ab0ff3aa9d54964729782662bb68cc14 Mon Sep 17 00:00:00 2001
From: Brett Porter <brett@apache.org>
Date: Mon, 5 Aug 2013 13:52:09 +1000
Subject: [PATCH] Support Scientific Linux

Addresses issue #37
---
 CHANGELOG                 | 5 +++++
 manifests/params.pp       | 2 +-
 spec/classes/java_spec.rb | 6 ++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 119194d..42b6a39 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+1.0.2 ()
+
+Brett Porter <brett@apache.org>
+* Support Scientific Linux
+
 1.0.1 (2013-08-01)
 
 Matthaus Owens <matthaus@puppetlabs.com>
diff --git a/manifests/params.pp b/manifests/params.pp
index 5f8f81b..23e421e 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -17,7 +17,7 @@ class java::params {
     'RedHat': {
       case $::operatingsystem {
         default: { fail("unsupported os ${::operatingsystem}") }
-        'RedHat', 'CentOS', 'OracleLinux': {
+        'RedHat', 'CentOS', 'OracleLinux', 'Scientific': {
           if (versioncmp($::operatingsystemrelease, '5.0') < 0) {
             $jdk_package = 'java-1.6.0-sun-devel'
             $jre_package = 'java-1.6.0-sun'
diff --git a/spec/classes/java_spec.rb b/spec/classes/java_spec.rb
index d77e657..f057783 100644
--- a/spec/classes/java_spec.rb
+++ b/spec/classes/java_spec.rb
@@ -101,6 +101,12 @@ describe 'java', :type => :class do
     it { should contain_package('java').with_name('java-1.7.0-openjdk') }
   end
 
+  context 'select passed value for Scientific Linux' do
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Scientific', :operatingsystemrelease => '6.4'} }
+    let(:params) { { 'distribution' => 'jre' } }
+    it { should contain_package('java').with_name('java-1.7.0-openjdk') }
+  end
+
   context 'select default for OpenSUSE 12.3' do
     let(:facts) { {:osfamily => 'Suse', :operatingsystem => 'OpenSUSE', :operatingsystemrelease => '12.3'}}
     it { should contain_package('java').with_name('java-1_7_0-openjdk-devel')}