[puppet/f18: 6/6] Update F18 Puppet to 3.1.0

[Michael Stahnke]

commit d40fa44259e39891e6f17d715e0ff1a254c8ef59
Merge: 821adb9 bf3db44
Author: Michael Stahnke <stahnma at puppetlabs.com>
Date:   Thu Mar 7 17:31:41 2013 -0800

    Update F18 Puppet to 3.1.0
    
    This is the update to 3.1.0 which is a working Puppet on Ruby 1.9.3.
    This update differs from rawhide slightly in that we are keeping systemV
    init scripts rather than using Systemd since this is an update within
    F18.
    
    Note that 2.7.x on F18 with F18's ruby did not work and was an
    unsupported combination from upstream. This resolves that issue and
    rebases Puppet. This is not backward compatible, but since 2.7.x of
    Puppet didn't work, I thought it was probably ok.
    
    Merge branch 'master' into f18
    
    Conflicts:
    	puppet.spec
    	puppetmaster-old-client-compat.patch
    
    Signed-off-by: Michael Stahnke <stahnma at puppetlabs.com>

 .gitignore                           |    3 ++-
 puppet-3.0.2.tar.gz.asc              |   18 ------------------
 puppet.spec                          |   29 +++++++++++++++++------------
 puppetmaster-old-client-compat.patch |    9 +++++++++
 sources                              |    4 ++--
 5 files changed, 30 insertions(+), 33 deletions(-)
---
diff --cc puppet.spec
index fed9e16,02c3f73..2bf80c0
--- a/puppet.spec
+++ b/puppet.spec
@@@ -2,6 -2,6 +2,9 @@@
  # --without augeas and/or --without selinux to rpmbuild or mock
  
  # F-17 and above have ruby-1.9.x, and place libs in a different location
++
++# Specifically not using systemd on F18 as it's technically a break between
++# using SystemV on 2.7.x and Systemd on 3.1.0.
  %if 0%{?fedora} >= 17
  %global puppet_libdir   %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["vendorlibdir"]')
  %else
@@@ -9,7 -9,7 +12,7 @@@
  %endif
  
  # F-17 also ships with systemd; package/use systemd files in this case
--%if 0%{?fedora} >= 17
++%if 0%{?fedora} > 18
  %global _with_systemd 1
  %else
  %global _with_systemd 0
@@@ -19,8 -19,8 +22,8 @@@
  %global ruby_version    %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["ruby_version"]')
  
  Name:           puppet
- Version:        3.0.2
- Release:        2%{?dist}
+ Version:        3.1.0
 -Release:        2%{?dist}
++Release:        3%{?dist}
  Summary:        A network tool for managing many disparate systems
  License:        ASL 2.0
  URL:            http://puppetlabs.com
@@@ -352,9 -348,12 +351,15 @@@ f
  rm -rf %{buildroot}
  
  %changelog
- * Thu Mar  7 2013 Daniel Drake <dsd at laptop.org> - 3.0.2-2
++* Thu Mar 07 2013 Michael Stahnke <stahnma at puppetlabs.com> - 3.1.0-3
++- Disable systemd in F18 as per bz#873853
++
+ * Thu Mar  7 2013 Daniel Drake <dsd at laptop.org> - 3.1.0-2
  - Improve server compatibility with old puppet clients (#831303)
  
+ * Mon Feb 11 2013 Sam Kottler <shk at redhat.com> - 3.1.0-1
+ - Update to 3.1.0
+ 
  * Tue Oct 30 2012 Moses Mendoza <moses at puppetlabs.com> - 3.0.2-1
  - Update to 3.0.2
  - Update new dependencies (ruby >= 1.8.7, facter >= 1.6.6, hiera >= 1.0.0)
diff --cc puppetmaster-old-client-compat.patch
index 95323a8,3787cde..4b88900
--- a/puppetmaster-old-client-compat.patch
+++ b/puppetmaster-old-client-compat.patch
@@@ -19,12 -19,12 +19,21 @@@ setups
   lib/puppet/util/monkey_patches.rb |    9 +++++++++
   1 file changed, 9 insertions(+)
  
++<<<<<<< HEAD
 +Index: puppet-3.0.2/lib/puppet/util/monkey_patches.rb
 +===================================================================
 +--- puppet-3.0.2.orig/lib/puppet/util/monkey_patches.rb
 ++++ puppet-3.0.2/lib/puppet/util/monkey_patches.rb
 +@@ -310,3 +310,13 @@ if RUBY_VERSION == '1.8.5'
 +     module_function :move
++=======
+ Index: puppet-3.1.0/lib/puppet/util/monkey_patches.rb
+ ===================================================================
+ --- puppet-3.1.0.orig/lib/puppet/util/monkey_patches.rb
+ +++ puppet-3.1.0/lib/puppet/util/monkey_patches.rb
+ @@ -356,3 +356,13 @@ unless Dir.respond_to?(:mktmpdir)
+      end
++>>>>>>> master
     end
   end
  +