[puppet/f18] Update patch to 3.1.0

[Michael Stahnke]

commit 398854873ea95589bbf563d37122ae9eb55a655f
Author: Michael Stahnke <stahnma at puppetlabs.com>
Date:   Thu Mar 7 17:36:58 2013 -0800

    Update patch to 3.1.0

 puppet.spec                          |    5 +++--
 puppetmaster-old-client-compat.patch |    9 ---------
 2 files changed, 3 insertions(+), 11 deletions(-)
---
diff --git a/puppet.spec b/puppet.spec
index 2bf80c0..b53af53 100644
--- a/puppet.spec
+++ b/puppet.spec
@@ -23,7 +23,7 @@
 
 Name:           puppet
 Version:        3.1.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A network tool for managing many disparate systems
 License:        ASL 2.0
 URL:            http://puppetlabs.com
@@ -351,8 +351,9 @@ fi
 rm -rf %{buildroot}
 
 %changelog
-* Thu Mar 07 2013 Michael Stahnke <stahnma at puppetlabs.com> - 3.1.0-3
+* Thu Mar 07 2013 Michael Stahnke <stahnma at puppetlabs.com> - 3.1.0-4
 - Disable systemd in F18 as per bz#873853
+- Update Patch0 to work with 3.1
 
 * Thu Mar  7 2013 Daniel Drake <dsd at laptop.org> - 3.1.0-2
 - Improve server compatibility with old puppet clients (#831303)
diff --git a/puppetmaster-old-client-compat.patch b/puppetmaster-old-client-compat.patch
index 4b88900..3787cde 100644
--- a/puppetmaster-old-client-compat.patch
+++ b/puppetmaster-old-client-compat.patch
@@ -19,21 +19,12 @@ 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
 +