diff --git a/0006-Remove-Fedora-release-restrictions-from-DNF-provider.patch b/0006-Remove-Fedora-release-restrictions-from-DNF-provider.patch new file mode 100644 index 0000000..ae82d25 --- /dev/null +++ b/0006-Remove-Fedora-release-restrictions-from-DNF-provider.patch @@ -0,0 +1,27 @@ +From ffd3da258dd526369d63df022a2fa57f6ed6c473 Mon Sep 17 00:00:00 2001 +From: Dominic Cleal +Date: Wed, 31 May 2017 10:07:04 +0100 +Subject: [PATCH] Remove Fedora release restrictions from DNF provider + +Ensure DNF provider will be used on all versions of Fedora, without new +ones being excluded. +--- + lib/puppet/provider/package/dnf.rb | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/puppet/provider/package/dnf.rb b/lib/puppet/provider/package/dnf.rb +index e144a1a..c0ed877 100644 +--- a/lib/puppet/provider/package/dnf.rb ++++ b/lib/puppet/provider/package/dnf.rb +@@ -28,7 +28,7 @@ Puppet::Type.type(:package).provide :dnf, :parent => :yum do + end + end + +- defaultfor :operatingsystem => :fedora, :operatingsystemmajrelease => ['22', '23', '24'] ++ defaultfor :operatingsystem => :fedora + + def self.update_command + # In DNF, update is deprecated for upgrade +-- +2.7.4 + diff --git a/puppet.spec b/puppet.spec index 2970631..fed90ac 100644 --- a/puppet.spec +++ b/puppet.spec @@ -19,7 +19,7 @@ Name: puppet Version: 4.8.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -34,6 +34,7 @@ Patch01: 0001-Fix-puppet-paths.patch Patch02: 0002-Revert-maint-Remove-puppetmaster.service.patch Patch04: 0004-PUP-7383-Skip-cipher-monkey-patch-on-ruby-2.4.patch Patch05: 0005-PUP-7483-Reject-all-fact-formats-except-PSON.patch +Patch06: 0006-Remove-Fedora-release-restrictions-from-DNF-provider.patch Group: System Environment/Base BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -128,6 +129,7 @@ The server can also function as a certificate authority and file server. %patch02 -p1 -b .server %patch04 -p1 %patch05 -p1 +%patch06 -p1 # Unbundle rm -r lib/puppet/vendor/*{pathspec,rgen}* @@ -396,6 +398,9 @@ exit 0 rm -rf %{buildroot} %changelog +* Wed May 31 2017 Dominic Cleal - 4.8.2-2 +- Remove Fedora release restrictions from DNF package provider + * Thu May 25 2017 Dominic Cleal - 4.8.2-1 - Update to 4.8.2