components/ruby/hiera/patches/hiera-00-json.patch
author Shawn Ferry <shawn.ferry@oracle.com>
Fri, 03 Feb 2017 12:49:15 -0800
changeset 7651 70c0daa6928d
permissions -rw-r--r--
25463219 puppet modules need to declare a minimum puppet version dependency 25471549 Puppet 4: package resource "ensure => latest" results in stack trace 25476627 hiera lists an obsolete dependency on json_pure 25497490 revert 21815619 (puppet does not install latest pkg) and rework solution 25506345 puppet cli commands spam messages about SMF services
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
7651
70c0daa6928d 25463219 puppet modules need to declare a minimum puppet version dependency
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff changeset
     1
Patch mirrors upstream 3.2.1 removes json dependency required for ruby 1.8.7
70c0daa6928d 25463219 puppet modules need to declare a minimum puppet version dependency
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff changeset
     2
70c0daa6928d 25463219 puppet modules need to declare a minimum puppet version dependency
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff changeset
     3
--- b/hiera.gemspec	2017-01-31 12:08:33.457351799 +0000
70c0daa6928d 25463219 puppet modules need to declare a minimum puppet version dependency
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff changeset
     4
+++ hiera.gemspec	2017-01-31 12:10:58.865568567 +0000
70c0daa6928d 25463219 puppet modules need to declare a minimum puppet version dependency
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff changeset
     5
@@ -17,17 +17,5 @@
70c0daa6928d 25463219 puppet modules need to declare a minimum puppet version dependency
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff changeset
     6
   s.rubygems_version = "2.2.3"
70c0daa6928d 25463219 puppet modules need to declare a minimum puppet version dependency
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff changeset
     7
   s.summary = "Light weight hierarchical data store"
70c0daa6928d 25463219 puppet modules need to declare a minimum puppet version dependency
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff changeset
     8
   s.test_files = ["spec/unit/interpolate_spec.rb", "spec/unit/fixtures/override/config/hiera.yaml", "spec/unit/fixtures/override/data/alternate.yaml", "spec/unit/fixtures/override/data/common.yaml", "spec/unit/fixtures/interpolate/config/hiera_iplm_hiera.yaml", "spec/unit/fixtures/interpolate/config/hiera_iplm_hiera_bad.yaml", "spec/unit/fixtures/interpolate/config/hiera.yaml", "spec/unit/fixtures/interpolate/data/niltest.yaml", "spec/unit/fixtures/interpolate/data/complex.yaml", "spec/unit/fixtures/interpolate/data/frontend.json", "spec/unit/fixtures/interpolate/data/role.json", "spec/unit/fixtures/interpolate/data/bad_interpolation.yaml", "spec/unit/fixtures/interpolate/data/dotted_keys.yaml", "spec/unit/fixtures/interpolate/data/weird_keys.yaml", "spec/unit/fixtures/interpolate/data/empty_interpolation.yaml", "spec/unit/fixtures/interpolate/data/recursive.yaml", "spec/unit/backend_spec.rb", "spec/unit/filecache_spec.rb", "spec/unit/config_spec.rb", "spec/unit/backend/yaml_backend_spec.rb", "spec/unit/backend/json_backend_spec.rb", "spec/unit/puppet_logger_spec.rb", "spec/unit/console_logger_spec.rb", "spec/unit/version_spec.rb", "spec/unit/fallback_logger_spec.rb", "spec/unit/util_spec.rb", "spec/unit/hiera_spec.rb", "spec/spec_helper.rb"]
70c0daa6928d 25463219 puppet modules need to declare a minimum puppet version dependency
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff changeset
     9
-
70c0daa6928d 25463219 puppet modules need to declare a minimum puppet version dependency
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff changeset
    10
-  if s.respond_to? :specification_version then
70c0daa6928d 25463219 puppet modules need to declare a minimum puppet version dependency
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff changeset
    11
-    s.specification_version = 3
70c0daa6928d 25463219 puppet modules need to declare a minimum puppet version dependency
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff changeset
    12
-
70c0daa6928d 25463219 puppet modules need to declare a minimum puppet version dependency
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff changeset
    13
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
70c0daa6928d 25463219 puppet modules need to declare a minimum puppet version dependency
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff changeset
    14
-      s.add_runtime_dependency(%q<json_pure>, [">= 0"])
70c0daa6928d 25463219 puppet modules need to declare a minimum puppet version dependency
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff changeset
    15
-    else
70c0daa6928d 25463219 puppet modules need to declare a minimum puppet version dependency
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff changeset
    16
-      s.add_dependency(%q<json_pure>, [">= 0"])
70c0daa6928d 25463219 puppet modules need to declare a minimum puppet version dependency
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff changeset
    17
-    end
70c0daa6928d 25463219 puppet modules need to declare a minimum puppet version dependency
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff changeset
    18
-  else
70c0daa6928d 25463219 puppet modules need to declare a minimum puppet version dependency
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff changeset
    19
-    s.add_dependency(%q<json_pure>, [">= 0"])
70c0daa6928d 25463219 puppet modules need to declare a minimum puppet version dependency
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff changeset
    20
-  end
70c0daa6928d 25463219 puppet modules need to declare a minimum puppet version dependency
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff changeset
    21
 end
70c0daa6928d 25463219 puppet modules need to declare a minimum puppet version dependency
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff changeset
    22