| author | Shawn Ferry <shawn.ferry@oracle.com> |
| Wed, 10 Feb 2016 22:10:43 -0500 | |
| changeset 5438 | c068f8c677e8 |
| parent 2054 | 5f403d9bcaad |
| permissions | -rw-r--r-- |
|
2054
5f403d9bcaad
PSARC/2014/275 Hiera 1.3.4
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
diff
changeset
|
1 |
Oracle customization - non upstream patch |
|
5f403d9bcaad
PSARC/2014/275 Hiera 1.3.4
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
diff
changeset
|
2 |
Modify hiera dependency to use json instead of json_pure |
|
5f403d9bcaad
PSARC/2014/275 Hiera 1.3.4
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
diff
changeset
|
3 |
|
|
5438
c068f8c677e8
PSARC/2016/016 Rename/Refactor Puppet and Puppet Module Packages
Shawn Ferry <shawn.ferry@oracle.com>
parents:
2054
diff
changeset
|
4 |
--- hiera-1.3.4/hiera.gemspec Wed Dec 2 19:05:29 2015 |
|
c068f8c677e8
PSARC/2016/016 Rename/Refactor Puppet and Puppet Module Packages
Shawn Ferry <shawn.ferry@oracle.com>
parents:
2054
diff
changeset
|
5 |
+++ hiera-1.3.4/hiera.gemspec.orig Wed Dec 2 19:04:47 2015 |
|
c068f8c677e8
PSARC/2016/016 Rename/Refactor Puppet and Puppet Module Packages
Shawn Ferry <shawn.ferry@oracle.com>
parents:
2054
diff
changeset
|
6 |
@@ -22,12 +22,12 @@ |
|
c068f8c677e8
PSARC/2016/016 Rename/Refactor Puppet and Puppet Module Packages
Shawn Ferry <shawn.ferry@oracle.com>
parents:
2054
diff
changeset
|
7 |
s.specification_version = 4 |
|
c068f8c677e8
PSARC/2016/016 Rename/Refactor Puppet and Puppet Module Packages
Shawn Ferry <shawn.ferry@oracle.com>
parents:
2054
diff
changeset
|
8 |
|
|
c068f8c677e8
PSARC/2016/016 Rename/Refactor Puppet and Puppet Module Packages
Shawn Ferry <shawn.ferry@oracle.com>
parents:
2054
diff
changeset
|
9 |
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
|
|
c068f8c677e8
PSARC/2016/016 Rename/Refactor Puppet and Puppet Module Packages
Shawn Ferry <shawn.ferry@oracle.com>
parents:
2054
diff
changeset
|
10 |
- s.add_runtime_dependency(%q<json_pure>, [">= 0"]) |
|
c068f8c677e8
PSARC/2016/016 Rename/Refactor Puppet and Puppet Module Packages
Shawn Ferry <shawn.ferry@oracle.com>
parents:
2054
diff
changeset
|
11 |
+ s.add_runtime_dependency(%q<json>, [">= 0"]) |
|
c068f8c677e8
PSARC/2016/016 Rename/Refactor Puppet and Puppet Module Packages
Shawn Ferry <shawn.ferry@oracle.com>
parents:
2054
diff
changeset
|
12 |
else |
|
c068f8c677e8
PSARC/2016/016 Rename/Refactor Puppet and Puppet Module Packages
Shawn Ferry <shawn.ferry@oracle.com>
parents:
2054
diff
changeset
|
13 |
- s.add_dependency(%q<json_pure>, [">= 0"]) |
|
c068f8c677e8
PSARC/2016/016 Rename/Refactor Puppet and Puppet Module Packages
Shawn Ferry <shawn.ferry@oracle.com>
parents:
2054
diff
changeset
|
14 |
+ s.add_dependency(%q<json>, [">= 0"]) |
|
c068f8c677e8
PSARC/2016/016 Rename/Refactor Puppet and Puppet Module Packages
Shawn Ferry <shawn.ferry@oracle.com>
parents:
2054
diff
changeset
|
15 |
end |
|
c068f8c677e8
PSARC/2016/016 Rename/Refactor Puppet and Puppet Module Packages
Shawn Ferry <shawn.ferry@oracle.com>
parents:
2054
diff
changeset
|
16 |
else |
|
c068f8c677e8
PSARC/2016/016 Rename/Refactor Puppet and Puppet Module Packages
Shawn Ferry <shawn.ferry@oracle.com>
parents:
2054
diff
changeset
|
17 |
- s.add_dependency(%q<json_pure>, [">= 0"]) |
|
c068f8c677e8
PSARC/2016/016 Rename/Refactor Puppet and Puppet Module Packages
Shawn Ferry <shawn.ferry@oracle.com>
parents:
2054
diff
changeset
|
18 |
+ s.add_dependency(%q<json>, [">= 0"]) |
|
c068f8c677e8
PSARC/2016/016 Rename/Refactor Puppet and Puppet Module Packages
Shawn Ferry <shawn.ferry@oracle.com>
parents:
2054
diff
changeset
|
19 |
end |
|
c068f8c677e8
PSARC/2016/016 Rename/Refactor Puppet and Puppet Module Packages
Shawn Ferry <shawn.ferry@oracle.com>
parents:
2054
diff
changeset
|
20 |
end |
|
c068f8c677e8
PSARC/2016/016 Rename/Refactor Puppet and Puppet Module Packages
Shawn Ferry <shawn.ferry@oracle.com>
parents:
2054
diff
changeset
|
21 |