[puppet/epel7: 2/2] Merge branch 'master' into epel7

[Pádraig Brady]

commit 681de69c9f4447df5385c7529ab2855c161b23b0
Merge: af970a1 6c0d425
Author: Pádraig Brady <P at draigBrady.com>
Date:   Tue Jul 1 01:16:42 2014 +0100

    Merge branch 'master' into epel7
    
    Conflicts:
    	puppet.spec

 puppet.spec           |    7 +++++-
 yum_proxy_none_.patch |   50 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 1 deletions(-)
---
diff --cc puppet.spec
index 67416a0,9ff1c22..a811444
--- a/puppet.spec
+++ b/puppet.spec
@@@ -16,8 -16,7 +16,8 @@@
  
  Name:           puppet
  Version:        3.6.2
- Release:        1%{?dist}
+ Release:        2%{?dist}
 +Group:          System Environment/Base
  Summary:        A network tool for managing many disparate systems
  License:        ASL 2.0
  URL:            http://puppetlabs.com
@@@ -26,7 -25,10 +26,8 @@@ Source1:        http://downloads.puppet
  Source2:        puppet-nm-dispatcher
  Source3:        puppet-nm-dispatcher.systemd
  Source4:        start-puppet-wrapper
+ Patch0:         yum_proxy_none_.patch
  
 -Group:          System Environment/Base
 -
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
  BuildRequires:  facter >= 1.6.6
@@@ -103,11 -105,9 +104,12 @@@ The server can also function as a certi
  
  %prep
  %setup -q
+ %patch0 -p1
  chmod +x ext/puppet-load.rb ext/regexp_nodes/regexp_nodes.rb
  
 +# Fixes BZ#952955
 +sed -i '/include-dependencies/d' lib/puppet/provider/package/gem.rb
 +
  %build
  # Nothing to build