- create 2.7-SERIES

- up to 2.7.21

diff --git a/install-p.patch b/install-p.patch
deleted file mode 100644 (file)
index 6fb536a..0000000
--- a/install-p.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From cfce8cf0baa7a96498f0ddc2c46170ed38c9aea7 Mon Sep 17 00:00:00 2001
-From: Todd Zullinger <tmz@pobox.com>
-Date: Thu, 12 Jul 2012 00:34:28 -0400
-Subject: [PATCH/puppet] Preserve timestamps when installing files
-
-Without the preserve option, ruby's FileUtils.install method uses the
-current time for all installed files.  For backup systems, package
-installs, and general pedantic sysadmins, preserving timestamps makes a
-small improvement in the world.
----
- install.rb |   16 ++++++++--------
- 1 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/install.rb b/install.rb
-index a55d929..c77edff 100755
---- a/install.rb
-+++ b/install.rb
-@@ -84,7 +84,7 @@ def do_configs(configs, target, strip = 'conf/')
-     if $haveftools
-       File.install(cf, ocf, 0644, true)
-     else
--      FileUtils.install(cf, ocf, {:mode => 0644, :verbose => true})
-+      FileUtils.install(cf, ocf, {:mode => 0644, :preserve => true, :verbose => true})
-     end
-   end
- 
-@@ -94,7 +94,7 @@ def do_configs(configs, target, strip = 'conf/')
-     if $haveftools
-       File.install(src_dll, dst_dll, 0644, true)
-     else
--      FileUtils.install(src_dll, dst_dll, {:mode => 0644, :verbose => true})
-+      FileUtils.install(src_dll, dst_dll, {:mode => 0644, :preserve => true, :verbose => true})
-     end
- 
-     require 'win32/registry'
-@@ -130,7 +130,7 @@ def do_libs(libs, strip = 'lib/')
-     else
-       FileUtils.makedirs(op, {:mode => 0755, :verbose => true})
-       FileUtils.chmod(0755, op)
--      FileUtils.install(lf, olf, {:mode => 0644, :verbose => true})
-+      FileUtils.install(lf, olf, {:mode => 0644, :preserve => true, :verbose => true})
-     end
-   end
- end
-@@ -146,7 +146,7 @@ def do_man(man, strip = 'man/')
-     else
-       FileUtils.makedirs(om, {:mode => 0755, :verbose => true})
-       FileUtils.chmod(0755, om)
--      FileUtils.install(mf, omf, {:mode => 0644, :verbose => true})
-+      FileUtils.install(mf, omf, {:mode => 0644, :preserve => true, :verbose => true})
-     end
-     gzip = %x{which gzip}
-     gzip.chomp!
-@@ -420,12 +420,12 @@ def install_binfile(from, op_file, target)
-     installed_wrapper = false
- 
-     if File.exists?("#{from}.bat")
--      FileUtils.install("#{from}.bat", File.join(target, "#{op_file}.bat"), :mode => 0755, :verbose => true)
-+      FileUtils.install("#{from}.bat", File.join(target, "#{op_file}.bat"), :mode => 0755, :preserve => true, :verbose => true)
-       installed_wrapper = true
-     end
- 
-     if File.exists?("#{from}.cmd")
--      FileUtils.install("#{from}.cmd", File.join(target, "#{op_file}.cmd"), :mode => 0755, :verbose => true)
-+      FileUtils.install("#{from}.cmd", File.join(target, "#{op_file}.cmd"), :mode => 0755, :preserve => true, :verbose => true)
-       installed_wrapper = true
-     end
- 
-@@ -439,13 +439,13 @@ set RUBY_BIN=%RUBY_BIN:\\=/%
- "%RUBY_BIN%ruby.exe" -x "%RUBY_BIN%puppet" %*
- EOS
-       File.open(tmp_file2.path, "w") { |cw| cw.puts cwv }
--      FileUtils.install(tmp_file2.path, File.join(target, "#{op_file}.bat"), :mode => 0755, :verbose => true)
-+      FileUtils.install(tmp_file2.path, File.join(target, "#{op_file}.bat"), :mode => 0755, :preserve => true, :verbose => true)
- 
-       tmp_file2.unlink
-       installed_wrapper = true
-     end
-   end
--  FileUtils.install(tmp_file.path, File.join(target, op_file), :mode => 0755, :verbose => true)
-+  FileUtils.install(tmp_file.path, File.join(target, op_file), :mode => 0755, :preserve => true, :verbose => true)
-   tmp_file.unlink
- end
- 
--- 
-1.7.6
-

diff --git a/puppet.spec b/puppet.spec
index 56bbe73b0ccfb2929c314cd398ef3287b8eceef1..7d4f4c548c662c5c472fb90ffd79fdf61053c33c 100644 (file)
--- a/puppet.spec
+++ b/puppet.spec
@@ -4,14 +4,12 @@
 # - initscripts
 Summary:       A network tool for managing many disparate systems
 Name:          puppet
-Version:       2.7.18
-Release:       0.5
+Version:       2.7.21
+Release:       0.1
 License:       GPL v2+
 Group:         Networking/Admin
 Source0:       http://puppetlabs.com/downloads/puppet/%{name}-%{version}.tar.gz
-# Source0-md5: 210725704692a0ca7b8ffc312471796e
-Patch0:                install-p.patch
-Patch1:                ruby19.patch
+# Source0-md5: cfea4e3f8cf268c1340aa5c295b3d7f0
 URL:           http://www.puppetlabs.com/
 BuildRequires: docutils
 BuildRequires: rpmbuild(macros) >= 1.484
@@ -53,8 +51,6 @@ Vim syntax for puppet .pp files
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 # puppet-queue.conf is more of an example, used for stompserver
 mv conf/puppet-queue.conf examples/etc/puppet/

diff --git a/ruby19.patch b/ruby19.patch
deleted file mode 100644 (file)
index f7fed29..0000000
--- a/ruby19.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From a71208ba651d96d2ac9792c5358f10231a140e10 Mon Sep 17 00:00:00 2001
-From: Daniel Pittman <daniel@puppetlabs.com>
-Date: Fri, 9 Mar 2012 14:43:02 -0800
-Subject: [PATCH/puppet] Ruby 1.9.3 has a different error when `require`
- fails.
-
-The text of the error message when load fails has changed, resulting in the
-test failing.  This adapts that to catch the different versions, allowing this
-to pass in all cases.
-
-Signed-off-by: Daniel Pittman <daniel@puppetlabs.com>
----
- lib/puppet/provider/confine.rb |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/lib/puppet/provider/confine.rb b/lib/puppet/provider/confine.rb
-index 6825def..b28d07d 100644
---- a/lib/puppet/provider/confine.rb
-+++ b/lib/puppet/provider/confine.rb
-@@ -25,7 +25,7 @@ class Puppet::Provider::Confine
-       begin
-         require "puppet/provider/confine/#{name}"
-       rescue LoadError => detail
--        unless detail.to_s =~ /No such file/i
-+        unless detail.to_s =~ /No such file|cannot load such file/i
-           warn "Could not load confine test '#{name}': #{detail}"
-         end
-         # Could not find file
--- 
-1.7.6
-