From b8dbec7d9d391aae066c7d9358c542aa024484b9 Mon Sep 17 00:00:00 2001
From: Sam Kottler <shk@redhat.com>
Date: Fri, 26 Jul 2013 22:50:33 -0400
Subject: [PATCH] Add hard dependency on Ruby (fixes BZ #985208)

---
 puppet.spec | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/puppet.spec b/puppet.spec
index 6d429d5..f25e4c1 100644
--- a/puppet.spec
+++ b/puppet.spec
@@ -22,7 +22,7 @@
 
 Name:           puppet
 Version:        3.1.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A network tool for managing many disparate systems
 License:        ASL 2.0
 URL:            http://puppetlabs.com
@@ -55,6 +55,9 @@ Requires:       ruby(release)
 %endif
 Requires:       ruby(shadow)
 
+# Prevents jruby from being pulled in by dependencies (BZ #985208)
+Requires:       ruby
+
 # Pull in ruby selinux bindings where available
 %if 0%{?fedora} || 0%{?rhel} >= 6
 %{!?_without_selinux:Requires: ruby(selinux), libselinux-utils}
@@ -354,6 +357,10 @@ fi
 rm -rf %{buildroot}
 
 %changelog
+=======
+* Fri Jul 26 2013 Sam Kottler <skottler@fedoraproject.org> - 3.1.1-4
+- Add hard dependency on ruby
+
 * Tue Apr 16 2013 Orion Poplawski <orion@cora.nwra.com> - 3.1.1-3
 - Add upstream patch for ruby 2.0 support
 - Fix rhel ruby conditional