diff --git a/puppet.spec b/puppet.spec index 903e9f2..61ff7f3 100644 --- a/puppet.spec +++ b/puppet.spec @@ -19,7 +19,7 @@ Name: puppet Version: 4.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -51,7 +51,6 @@ Requires: ruby(shadow) Requires: rubygem(json) Requires: rubygem(pathspec) -Requires: rubygem(safe_yaml) # Prevents jruby from being pulled in by dependencies (BZ #985208) Requires: ruby @@ -122,7 +121,6 @@ The server can also function as a certificate authority and file server. %patch02 -p1 -b .server # Unbundle rm -r lib/puppet/vendor/*{pathspec,rgen}* -echo "require 'safe_yaml'" > lib/puppet/vendor/require_vendored.rb %build # Nothing to build @@ -388,6 +386,9 @@ exit 0 rm -rf %{buildroot} %changelog +* Wed Jul 29 2015 Gael Chamoulaud - 4.2.1-2 +- Remove usage of vendored library safe_yaml (rhbz#1261091) + * Wed Jul 29 2015 Gael Chamoulaud - 4.2.1-1 - Upstream 4.2.1