diff options
author | Todd Zullinger <tmz@pobox.com> | 2011-03-16 17:01:09 -0400 |
---|---|---|
committer | Todd Zullinger <tmz@pobox.com> | 2011-03-16 17:01:09 -0400 |
commit | 97a1f9e0c101fb87e10c7a299537adbda9532fd6 (patch) | |
tree | d53ae5a85de2161648815a3f342260d4247187c0 /puppet.spec | |
parent | 9bfa9137f0d797cefc7fd74239679c62010cd0f1 (diff) | |
download | puppet-package-97a1f9e0c101fb87e10c7a299537adbda9532fd6.tar.gz puppet-package-97a1f9e0c101fb87e10c7a299537adbda9532fd6.tar.xz puppet-package-97a1f9e0c101fb87e10c7a299537adbda9532fd6.zip |
Apply a few upstream fixes for 0.25.5 regressions
The patches are from 2.6.7rc1.
(#4922) Don't truncate remotely-sourced files on 404
(#5073) Download plugins even if you're filtering on tags
(#5428) More fully "stub" Puppet::Resource::Reference for use with
storedconfigs
Diffstat (limited to 'puppet.spec')
-rw-r--r-- | puppet.spec | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/puppet.spec b/puppet.spec index c40c54c..b00f5a5 100644 --- a/puppet.spec +++ b/puppet.spec @@ -12,6 +12,12 @@ License: GPLv2 URL: http://puppetlabs.com Source0: http://puppetlabs.com/downloads/%{name}/%{name}-%{version}.tar.gz Source1: http://puppetlabs.com/downloads/%{name}/%{name}-%{version}.tar.gz.sign +# http://projects.puppetlabs.com/issues/5428 +Patch0: 0001-5428-More-fully-stub-Puppet-Resource-Reference-for-u.patch +# http://projects.puppetlabs.com/issues/4922 +Patch1: 0001-4922-Don-t-truncate-remotely-sourced-files-on-404.patch +# http://projects.puppetlabs.com/issues/5073 +Patch2: 0001-5073-Download-plugins-even-if-you-re-filtering-on-ta.patch Group: System Environment/Base @@ -66,6 +72,9 @@ The server can also function as a certificate authority and file server. %prep %setup -q +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 patch -s -p1 < conf/redhat/rundir-perms.patch @@ -261,6 +270,7 @@ rm -rf %{buildroot} - Properly restart puppet agent/master daemons on upgrades from 0.25.x - Require libselinux-utils when selinux support is enabled - Support tmpfiles.d for Fedora >= 15 (#656677) +- Apply a few upstream fixes for 0.25.5 regressions * Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.25.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild |