Upstream 5.5.1

Unmaintained editor extensions were removed upstream (PUP-7558)
Deprecated commands were removed: inspect (PUP-893), extlookup2hiera (PUP-3478)
Refreshed patches

0001-Fix-puppet-paths.patch

@@ -1,17 +1,17 @@
-From 92ec714fc77a5cc5c743367be39cd83afa2356b6 Mon Sep 17 00:00:00 2001
+From 55933c8bd4ee983f048d1b4c90674e3dfd2583c4 Mon Sep 17 00:00:00 2001
 From: Haikel Guemar <hguemar@redhat.com>
 Date: Wed, 29 Apr 2015 01:38:35 +0200
-Subject: [PATCH 1/2] Fix puppet paths
+Subject: [PATCH 1/3] Fix puppet paths
 
 ---
  lib/puppet/util/run_mode.rb | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/lib/puppet/util/run_mode.rb b/lib/puppet/util/run_mode.rb
-index 453095c..bcdde95 100644
+index cf6c461..777156a 100644
 --- a/lib/puppet/util/run_mode.rb
 +++ b/lib/puppet/util/run_mode.rb
-@@ -72,23 +72,23 @@ module Puppet
+@@ -59,23 +59,23 @@ module Puppet
  
      class UnixRunMode < RunMode
        def conf_dir
@@ -41,5 +41,5 @@ index 453095c..bcdde95 100644
      end
  
 -- 
-2.4.0
+2.17.1
 

0002-Revert-maint-Remove-puppetmaster.service.patch

@@ -1,7 +1,7 @@
-From f3d931b6c68e4305ce612949ec59dca460e578d7 Mon Sep 17 00:00:00 2001
+From fc00c9d0c99e977cda8bb4a9a89952dfae5523dc Mon Sep 17 00:00:00 2001
 From: Gael Chamoulaud <gchamoul@redhat.com>
 Date: Wed, 29 Jul 2015 21:58:48 +0200
-Subject: [PATCH] Revert "(maint) Remove puppetmaster.service"
+Subject: [PATCH 2/3] Revert "(maint) Remove puppetmaster.service"
 
 This reverts commit c0e30daa53b6267c1c86b6e27c01b1c26cf49af5.
 ---
@@ -11,10 +11,10 @@ This reverts commit c0e30daa53b6267c1c86b6e27c01b1c26cf49af5.
  create mode 100644 ext/systemd/puppetmaster.service
 
 diff --git a/ext/systemd/puppet.service b/ext/systemd/puppet.service
-index 61b0313..c7f063e 100644
+index 7c16615..36769ac 100644
 --- a/ext/systemd/puppet.service
 +++ b/ext/systemd/puppet.service
-@@ -1,7 +1,7 @@
+@@ -11,7 +11,7 @@
  [Unit]
  Description=Puppet agent
  Wants=basic.target
@@ -42,5 +42,5 @@ index 0000000..dbbd627
 +[Install]
 +WantedBy=multi-user.target
 -- 
-2.4.3
+2.17.1
 

0003-Remove-Fedora-release-restrictions-from-DNF-provider.patch

@@ -0,0 +1,27 @@
+From 320d9dd4a87266d40c5b73d6e020bb77ca4e4d9b Mon Sep 17 00:00:00 2001
+From: Dominic Cleal <dominic@cleal.org>
+Date: Wed, 31 May 2017 10:07:04 +0100
+Subject: [PATCH 3/3] 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 535aa6c..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..30).to_a
++  defaultfor :operatingsystem => :fedora
+ 
+   def self.update_command
+     # In DNF, update is deprecated for upgrade
+-- 
+2.17.1
+

puppet.spec

@@ -18,7 +18,7 @@
 %global pending_upgrade_file %{pending_upgrade_path}/upgrade_pending
 
 Name:           puppet
-Version:        4.10.10
+Version:        5.5.1
 Release:        1%{?dist}
 Summary:        A network tool for managing many disparate systems
 License:        ASL 2.0
@@ -32,7 +32,7 @@ Source4:        start-puppet-wrapper
 # Puppetlabs messed up with default paths
 Patch01:        0001-Fix-puppet-paths.patch
 Patch02:        0002-Revert-maint-Remove-puppetmaster.service.patch
-Patch06:        0006-Remove-Fedora-release-restrictions-from-DNF-provider.patch
+Patch03:        0003-Remove-Fedora-release-restrictions-from-DNF-provider.patch
 Group:          System Environment/Base
 
 
@@ -91,9 +91,7 @@ Provides:       hiera-puppet = %{version}-%{release}
 
 Requires(pre):  shadow-utils
 %if 0%{?_with_systemd}
-Requires(post): systemd
+%{?systemd_requires}
-Requires(preun): systemd
-Requires(postun): systemd
 BuildRequires: systemd
 %else
 Requires(post): chkconfig
@@ -115,9 +113,7 @@ Group:          System Environment/Base
 Summary:        Server for the puppet system management tool
 Requires:       puppet = %{version}-%{release}
 %if 0%{?_with_systemd}
-Requires(post): systemd
+%{?systemd_requires}
-Requires(preun): systemd
-Requires(postun): systemd
 BuildRequires: systemd
 %else
 Requires(post): chkconfig
@@ -134,9 +130,16 @@ The server can also function as a certificate authority and file server.
 %setup -q
 %patch01 -p1 -b .paths
 %patch02 -p1 -b .server
-%patch06 -p1
+%patch03 -p1
 # Unbundle
-rm -r lib/puppet/vendor/*{pathspec,rgen}*
+rm -r lib/puppet/vendor/pathspec
+# Note(hguemar): remove unrelated OS/distro specific folders
+# These mess-up with RPM automatic dependencies compute by adding
+# unnecessary deps like /sbin/runscripts
+rm -r ext/{debian,freebsd,gentoo,ips,osx,solaris,suse,windows}
+rm ext/redhat/*.init
+rm ext/{build_defaults.yaml,project_data.yaml}
+
 
 %build
 # Nothing to build
@@ -177,6 +180,9 @@ install -Dp -m0644 %{confdir}/fileserver.conf %{buildroot}%{_sysconfdir}/puppet/
 install -Dp -m0644 %{confdir}/puppet.conf %{buildroot}%{_sysconfdir}/puppet/puppet.conf
 install -Dp -m0644 ext/redhat/logrotate %{buildroot}%{_sysconfdir}/logrotate.d/puppet
 
+# Note(hguemar): Conflicts with config file from hiera package
+rm %{buildroot}%{_sysconfdir}/puppet/hiera.yaml
+
 # Install a NetworkManager dispatcher script to pickup changes to
 # /etc/resolv.conf and such (https://bugzilla.redhat.com/532085).
 %if 0%{?_with_systemd}
@@ -190,23 +196,6 @@ install -Dpv %{SOURCE2} \
 # Install the ext/ directory to %%{_datadir}/%%{name}
 install -d %{buildroot}%{_datadir}/%{name}
 cp -a ext/ %{buildroot}%{_datadir}/%{name}
-# emacs and vim bits are installed elsewhere
-rm -rf %{buildroot}%{_datadir}/%{name}/ext/{emacs,vim}
-# remove misc packaging artifacts in source not applicable to rpm
-rm -rf %{buildroot}%{_datadir}/%{name}/ext/{gentoo,freebsd,solaris,suse,windows,osx,ips,debian}
-rm -f %{buildroot}%{_datadir}/%{name}/ext/{build_defaults.yaml,project_data.yaml}
-rm -f %{buildroot}%{_datadir}/%{name}/ext/redhat/*.init
-
-# Install emacs mode files
-emacsdir=%{buildroot}%{_datadir}/emacs/site-lisp
-install -Dp -m0644 ext/emacs/puppet-mode.el $emacsdir/puppet-mode.el
-install -Dp -m0644 ext/emacs/puppet-mode-init.el \
-    $emacsdir/site-start.d/puppet-mode-init.el
-
-# Install vim syntax files
-vimdir=%{buildroot}%{_datadir}/vim/vimfiles
-install -Dp -m0644 ext/vim/ftdetect/puppet.vim $vimdir/ftdetect/puppet.vim
-install -Dp -m0644 ext/vim/syntax/puppet.vim $vimdir/syntax/puppet.vim
 
 # Install wrappers for SELinux
 install -Dp -m0755 %{SOURCE4} %{buildroot}%{_bindir}/start-puppet-agent
@@ -236,7 +225,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules
 %license LICENSE
 %{_bindir}/puppet
 %{_bindir}/start-puppet-*
-%{_bindir}/extlookup2hiera
 %{puppet_libdir}/*
 %if 0%{?_with_systemd}
 %{_unitdir}/puppet.service
@@ -256,9 +244,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules
 %dir %{_sysconfdir}/NetworkManager
 %dir %{_sysconfdir}/NetworkManager/dispatcher.d
 %{_sysconfdir}/NetworkManager/dispatcher.d/98-puppet
-# We don't want to require emacs or vim, so we need to own these dirs
-%{_datadir}/emacs
-%{_datadir}/vim
 %{_datadir}/%{name}
 # These need to be owned by puppet so the server can
 # write to them
@@ -281,11 +266,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules
 %{_mandir}/man8/puppet-device.8.gz
 %{_mandir}/man8/puppet-doc.8.gz
 %{_mandir}/man8/puppet-facts.8.gz
-%{_mandir}/man8/puppet-file.8.gz
 %{_mandir}/man8/puppet-filebucket.8.gz
 %{_mandir}/man8/puppet-generate.8.gz
 %{_mandir}/man8/puppet-help.8.gz
-%{_mandir}/man8/puppet-inspect.8.gz
 #%{_mandir}/man8/puppet-instrumentation_data.8.gz
 #%{_mandir}/man8/puppet-instrumentation_listener.8.gz
 #%{_mandir}/man8/puppet-instrumentation_probe.8.gz
@@ -299,10 +282,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules
 %{_mandir}/man8/puppet-plugin.8.gz
 %{_mandir}/man8/puppet-report.8.gz
 %{_mandir}/man8/puppet-resource.8.gz
-%{_mandir}/man8/puppet-resource_type.8.gz
 #%{_mandir}/man8/puppet-secret_agent.8.gz
+%{_mandir}/man8/puppet-script.8.gz
 %{_mandir}/man8/puppet-status.8.gz
-%{_mandir}/man8/extlookup2hiera.8.gz
 
 %files server
 %defattr(-, root, root, 0755)
@@ -403,6 +385,12 @@ fi
 exit 0
 
 %changelog
+* Tue May  8 2018 Haïkel Guémar <hguemar@fedoraproject.org> - 5.5.1-1
+- Upstream 5.5.1
+- Unmaintained editor extensions were removed upstream (PUP-7558)
+- Deprecated commands were removed: inspect (PUP-893), extlookup2hiera (PUP-3478)
+- Refreshed patches
+
 * Thu Mar 15 2018 Terje Rosten <terje.rosten@ntnu.no> - 4.10.10-1
 - Update to 4.10.10