Remove safe_yaml vendored library

Hardcoded safe_yaml requirement breaks Puppet 4.x.
This patch removes dependency on this rubygem.

Resolves: rhbz#1261091
epel9
Martin Mágr 9 years ago
parent c3e621009b
commit 6e2b94ac46

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

Loading…
Cancel
Save