Upstream 4.0.0

0001-Fix-puppet-paths.patch

@@ -1,6 +1,6 @@
-From 9deed392392c229fd8f20fe5e52a4853f8363484 Mon Sep 17 00:00:00 2001
-From: Haikel Guemar <hguemar@fedoraproject.org>
-Date: Thu, 9 Apr 2015 01:38:19 +0200
+From ff5be0d65a5872cd809cee98a34521f335df9412 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
 
 ---
@@ -8,38 +8,38 @@ Subject: [PATCH 1/2] Fix puppet paths
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/lib/puppet/util/run_mode.rb b/lib/puppet/util/run_mode.rb
-index 07e33a6..82b4558 100644
+index 453095c..bb576df 100644
 --- a/lib/puppet/util/run_mode.rb
 +++ b/lib/puppet/util/run_mode.rb
-@@ -55,23 +55,23 @@ module Puppet
+@@ -72,23 +72,23 @@ module Puppet
  
      class UnixRunMode < RunMode
        def conf_dir
--        which_dir("/etc/puppetlabs/puppet", "~/.puppet")
+-        which_dir("/etc/puppetlabs/puppet", "~/.puppetlabs/etc/puppet")
 +        which_dir("/etc/puppet", "~/.puppet")
        end
  
        def code_dir
--        which_dir("/etc/puppetlabs/code", "~/.puppet/code")
+-        which_dir("/etc/puppetlabs/code", "~/.puppetlabs/etc/code")
 +        which_dir("/etc/puppet", "~/.puppet/code")
        end
  
        def var_dir
--        which_dir("/opt/puppetlabs/puppet/cache", "~/.puppet/var")
-+        which_dir("/var/lib/puppet/cache", "~/.puppet/var")
+-        which_dir("/opt/puppetlabs/puppet/cache", "~/.puppetlabs/opt/puppet/cache")
++        which_dir("/var/lib/puppet/cache", "~/.puppet/cache")
        end
  
        def run_dir
--        which_dir("/var/run/puppetlabs", "~/.puppet/var/run")
+-        which_dir("/var/run/puppetlabs", "~/.puppetlabs/var/run")
 +        which_dir("/var/run/puppet", "~/.puppet/var/run")
        end
  
        def log_dir
--        which_dir("/var/log/puppetlabs", "~/.puppet/var/log")
+-        which_dir("/var/log/puppetlabs/puppet", "~/.puppetlabs/var/log")
 +        which_dir("/var/log/puppet", "~/.puppet/var/log")
        end
      end
  
 -- 
-2.3.5
+2.3.6
 

0002-make-systemd-the-default-init-for-fedora-in-puppet.patch

@@ -1,4 +1,4 @@
-From df2058dde597baf6e1534a05dde879f0a7738fdf Mon Sep 17 00:00:00 2001
+From 11c7b82c193d88f82cab8b285cebae5be1f3b2b5 Mon Sep 17 00:00:00 2001
 From: Haikel Guemar <hguemar@fedoraproject.org>
 Date: Mon, 13 Apr 2015 14:25:11 +0200
 Subject: [PATCH 2/2] make systemd the default init for fedora in puppet
@@ -21,5 +21,5 @@ index 39ef5ea..89b6b62 100644
  
    def self.instances
 -- 
-2.3.5
+2.3.6
 

puppet.spec

@@ -17,16 +17,14 @@
 %global pending_upgrade_path %{_localstatedir}/lib/rpm-state/puppet
 %global pending_upgrade_file %{pending_upgrade_path}/upgrade_pending
 
-%global prerelease_tag rc1
-
 Name:           puppet
 Version:        4.0.0
-Release:        0.1%{prerelease_tag}%{?dist}
+Release:        1%{?dist}
 Summary:        A network tool for managing many disparate systems
 License:        ASL 2.0
 URL:            http://puppetlabs.com
-Source0:        http://downloads.puppetlabs.com/%{name}/%{name}-%{version}-%{prerelease_tag}.tar.gz
-Source1:        http://downloads.puppetlabs.com/%{name}/%{name}-%{version}-%{prerelease_tag}.tar.gz.asc
+Source0:        http://downloads.puppetlabs.com/%{name}/%{name}-%{version}.tar.gz
+Source1:        http://downloads.puppetlabs.com/%{name}/%{name}-%{version}.tar.gz.asc
 Source2:        puppet-nm-dispatcher
 Source3:        puppet-nm-dispatcher.systemd
 Source4:        start-puppet-wrapper
@@ -120,7 +118,7 @@ Provides the central puppet server daemon which provides manifests to clients.
 The server can also function as a certificate authority and file server.
 
 %prep
-%setup -q -n %{name}-%{version}-%{prerelease_tag}
+%setup -q
 %patch01 -p1 -b .paths
 %patch02 -p1 -b .systemd
 # Unbundle
@@ -391,6 +389,9 @@ exit 0
 rm -rf %{buildroot}
 
 %changelog
+* Tue Apr 28 2015 Haïkel Guémar <hguemar@fedoraproject.org> - 4.0.0-1
+- Upstream 4.0.0
+
 * Mon Apr 27 2015 Haïkel Guémar <hguemar@fedoraproject.org> - 4.0.0-0.1rc1
 - Upstream 4.0.0
 - Fix issue codedir path