From 0817dce74f787f54bc50b46391301ebbc1c534c0 Mon Sep 17 00:00:00 2001
From: Alexander Pyhalov <apyhalov@gmail.com>
Date: Thu, 01 Dec 2016 15:21:26 +0100
Subject: [PATCH] hiera: ship ruby 2.3 module
---
components/ruby/hiera/patches/hiera-00-dependency.patch | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/components/ruby/hiera/patches/hiera-00-dependency.patch b/components/ruby/hiera/patches/hiera-00-dependency.patch
index f6c9c8dcf..6dceeab 100644
--- a/components/ruby/hiera/patches/hiera-00-dependency.patch
+++ b/components/ruby/hiera/patches/hiera-00-dependency.patch
@@ -1,14 +1,21 @@
Oracle customization - non upstream patch
Modify hiera dependency to use json instead of json_pure
---- hiera-1.3.4/hiera.gemspec.~1~ 2014-11-24 12:46:11.150725031 +0300
-+++ hiera-1.3.4/hiera.gemspec 2014-11-24 12:48:44.071783548 +0300
-@@ -13,7 +13,7 @@
- date: 2014-06-06 00:00:00.000000000 Z
- dependencies:
- - !ruby/object:Gem::Dependency
-- name: json_pure
-+ name: json
- requirement: !ruby/object:Gem::Requirement
- requirements:
- - - ! '>='
+--- hiera-1.3.4/hiera.gemspec.~1~ 2016-11-29 22:20:24.479863134 +0300
++++ hiera-1.3.4/hiera.gemspec 2016-11-29 22:21:27.057685184 +0300
+@@ -22,12 +22,12 @@
+ s.specification_version = 4
+
+ if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+- s.add_runtime_dependency(%q<json_pure>.freeze, [">= 0"])
++ s.add_runtime_dependency(%q<json>.freeze, [">= 0"])
+ else
+- s.add_dependency(%q<json_pure>.freeze, [">= 0"])
++ s.add_dependency(%q<json>.freeze, [">= 0"])
+ end
+ else
+- s.add_dependency(%q<json_pure>.freeze, [">= 0"])
++ s.add_dependency(%q<json>.freeze, [">= 0"])
+ end
+ end
+
--
Gitblit v1.9.3