puppet-labs-stdlib: update to v9.6.0

We also update our gemspec file.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

3 files changed, 34 insertions, 37 deletions

diff --git a/recipes-support/puppetlabs-stdlib/files/Add-gemspec.patch b/recipes-support/puppetlabs-stdlib/files/Add-gemspec.patch
deleted file mode 100644
index fd65da6..0000000
--- a/recipes-support/puppetlabs-stdlib/files/Add-gemspec.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From e23971fcc1425e06a11484e552fbc631c43f44d4 Mon Sep 17 00:00:00 2001
-From: Mark Asselstine <mark.asselstine@windriver.com>
-Date: Tue, 22 Dec 2015 11:05:22 -0500
-Subject: [PATCH] Add gemspec
-
-Started with an example from here
-http://guides.rubygems.org/make-your-own-gem/
-
-Upstream-Status: Inappropriate [embedded specific]
-
-Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
----
- puppetlabs-stdlib.gemspec | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
- create mode 100644 puppetlabs-stdlib.gemspec
-
-diff --git a/puppetlabs-stdlib.gemspec b/puppetlabs-stdlib.gemspec
-new file mode 100644
-index 0000000..6b7eee3
---- /dev/null
-+++ b/puppetlabs-stdlib.gemspec
-@@ -0,0 +1,12 @@
-+Gem::Specification.new do |s|
-+  s.name        = 'puppetlabs-stdlib'
-+  s.version     = '4.10.0'
-+  s.date        = '2015-12-15'
-+  s.summary     = "Puppet Labs Standard Library module"
-+  s.description = s.summary
-+  s.authors     = ["Puppet Labs"]
-+  s.email       = ''
-+  s.files       = %w(LICENSE README.markdown Rakefile) + Dir.glob('{lib,spec}/**/*')
-+  s.homepage    = 'https://github.com/puppetlabs/puppetlabs-stdlib'
-+  s.license     = 'Apache 2.0'
-+end
--- 
-2.1.4
-
diff --git a/recipes-support/puppetlabs-stdlib/files/puppetlabs-stdlib.gemspec b/recipes-support/puppetlabs-stdlib/files/puppetlabs-stdlib.gemspec
new file mode 100644
index 0000000..46b2c9e
--- /dev/null
+++ b/recipes-support/puppetlabs-stdlib/files/puppetlabs-stdlib.gemspec
@@ -0,0 +1,30 @@
+#
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "puppetmodule-stdlib"
+
+  s.version = "4.0.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Puppet Labs"]
+  s.date = "2013-04-10"
+  s.description = "Puppet Labs Standard Library module"
+  s.email = "bruce.ashfield@gmail.com"
+  s.executables = []
+  s.files += Dir['lib/**/*.rb'] + Dir['manifests/**/*.pp'] + Dir['tests/**/*.pp'] + Dir['spec/**/*.rb']
+  s.homepage = "https://github.com/puppetlabs/puppetlabs-stdlib"
+  s.rdoc_options = ["--title", "Puppet Standard Library Module", "--main", "README.markdown", "--line-numbers"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = "puppetmodule-stdlib"
+  s.summary = "This module provides a standard library of resources for developing Puppet Modules."
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end
diff --git a/recipes-support/puppetlabs-stdlib/puppetlabs-stdlib_git.bb b/recipes-support/puppetlabs-stdlib/puppetlabs-stdlib_git.bb
index 41f8c6e..cb343e4 100644
--- a/recipes-support/puppetlabs-stdlib/puppetlabs-stdlib_git.bb
+++ b/recipes-support/puppetlabs-stdlib/puppetlabs-stdlib_git.bb
@@ -8,10 +8,14 @@ SRCREV = "99aebdd57d665ac7e2ba38ab95f3fbdbc2fb56e0"
 
 SRC_URI = " \
     git://github.com/puppetlabs/puppetlabs-stdlib.git;branch=main;protocol=https \
+    file://puppetlabs-stdlib.gemspec \
 "
 
 inherit rubyv2
 
+GEM_NAME = "puppetlabs-std"
+GEM_SPEC_FILE = "puppetlabs-stdlib.gemspec"
+
 S="${WORKDIR}/git"
 
 DEPENDS += " \