[facter] Update to 1.6.6
Todd Zullinger
tmz at fedoraproject.org
Mon Mar 5 15:12:49 UTC 2012
commit 7f8ab51a595fee52130c48ed6054fd693a0ba9b0
Author: Todd Zullinger <tmz at pobox.com>
Date: Mon Mar 5 09:57:44 2012 -0500
Update to 1.6.6
...Preserve-timestamps-when-installing-files.patch | 29 +++++-----
0001-Make-ec2-facts-work-on-CentOS-again.patch | 57 --------------------
facter-1.6.5.tar.gz.asc | 18 ------
facter-1.6.6.tar.gz.asc | 17 ++++++
facter.spec | 14 +++---
sources | 2 +-
6 files changed, 39 insertions(+), 98 deletions(-)
---
diff --git a/0001-Preserve-timestamps-when-installing-files.patch b/0001-12669-Preserve-timestamps-when-installing-files.patch
similarity index 68%
rename from 0001-Preserve-timestamps-when-installing-files.patch
rename to 0001-12669-Preserve-timestamps-when-installing-files.patch
index c7f9ad6..3526051 100644
--- a/0001-Preserve-timestamps-when-installing-files.patch
+++ b/0001-12669-Preserve-timestamps-when-installing-files.patch
@@ -1,22 +1,21 @@
-From 850bfabe67ab2ab62f0d3f16acc941a6043ca92d Mon Sep 17 00:00:00 2001
+From 6ec28631f5d0a1d5f3a9f9c4879950089fce5ed2 Mon Sep 17 00:00:00 2001
From: Todd Zullinger <tmz at pobox.com>
Date: Wed, 15 Feb 2012 10:07:11 -0500
-Subject: [PATCH/facter] Preserve timestamps when installing files
+Subject: [PATCH/facter] (#12669) 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 | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/install.rb b/install.rb
-index ab233c3..e1785a2 100755
+index c5c3a11..909171f 100755
--- a/install.rb
+++ b/install.rb
-@@ -102,7 +102,7 @@ def do_libs(libs, strip = 'lib/')
+@@ -103,7 +103,7 @@ def do_libs(libs, strip = 'lib/')
op = File.dirname(olf)
FileUtils.makedirs(op, {:mode => 0755, :verbose => true})
FileUtils.chmod(0755, op)
@@ -25,7 +24,7 @@ index ab233c3..e1785a2 100755
end
end
-@@ -113,7 +113,7 @@ def do_man(man, strip = 'man/')
+@@ -114,7 +114,7 @@ def do_man(man, strip = 'man/')
om = File.dirname(omf)
FileUtils.makedirs(om, {:mode => 0755, :verbose => true})
FileUtils.chmod(0755, om)
@@ -34,7 +33,7 @@ index ab233c3..e1785a2 100755
gzip = %x{which gzip}
gzip.chomp!
%x{#{gzip} -f #{omf}}
-@@ -412,12 +412,12 @@ def install_binfile(from, op_file, target)
+@@ -400,12 +400,12 @@ def install_binfile(from, op_file, target)
installed_wrapper = false
if File.exists?("#{from}.bat")
@@ -49,20 +48,20 @@ index ab233c3..e1785a2 100755
installed_wrapper = true
end
-@@ -431,13 +431,13 @@ set RUBY_BIN=%RUBY_BIN:\\=/%
+@@ -419,13 +419,13 @@ set RUBY_BIN=%RUBY_BIN:\\=/%
"%RUBY_BIN%ruby.exe" -x "%RUBY_BIN%facter" %*
EOS
- File.open(tmp_file2, "w") { |cw| cw.puts cwv }
-- FileUtils.install(tmp_file2, File.join(target, "#{op_file}.bat"), :mode => 0755, :verbose => true)
-+ FileUtils.install(tmp_file2, File.join(target, "#{op_file}.bat"), :mode => 0755, :preserve => true, :verbose => true)
+ 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)
- File.unlink(tmp_file2)
+ tmp_file2.unlink
installed_wrapper = true
end
end
-- FileUtils.install(tmp_file, File.join(target, op_file), :mode => 0755, :verbose => true)
-+ FileUtils.install(tmp_file, File.join(target, op_file), :mode => 0755, :preserve => true, :verbose => true)
- File.unlink(tmp_file)
+- 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
--
diff --git a/facter-1.6.6.tar.gz.asc b/facter-1.6.6.tar.gz.asc
new file mode 100644
index 0000000..473584e
--- /dev/null
+++ b/facter-1.6.6.tar.gz.asc
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.11 (Darwin)
+
+iQIcBAABAgAGBQJPRrX/AAoJEBBUt6JL1uww5jMP/1EdteiAyZDJfKaJ5sguDpt8
+OEfxjBRDZblCFwOUIpt62enP3nwdepaToWAJF2ehL74K5jKMuDhlJAxN0WLq+m8q
+qm3hHWIKBac6CgeBFUX81DlLog+p9EU2HCBhzajBohfwCXjn74kczwskIhR9vrcx
+wH3/oG3BKKO51Gi/k6uXHkKJvIPpomAqGxvm5VpjE9e3vUkQMlxWL4jCeDIexByL
+ykviFtsdgzQRBOTSQRtz2okDJxZVVRux+Y4qQnsQe8C2YrDoXK8lzwhHjNVq1fr/
+XFM/4OXQawPmE7Jw+5DoAtJR4Ur3tRqHfkCK7dITv4tK4WuSCrrZa6r1bGWMhnwD
+WFPF5+aXIoX3IMtG0YFcarOPNj+X9Z+cs1oUBC2/eZQwStp9zRoLUSMV5w59Shgi
+6LnV7Rfk50C9QZhK8o/FxsRQthLLyMhYf9SPPJTBw2oCqTDgDLLcgnEYLUHYCDr+
+xscTEGa9p1maWfy2T2BnLEZOjDe8od3dXFH+7f7YjAMCXxbWM4PWb9EPQeCyXPX3
+9I620FNeiIFOLw3SLV77clgFufPHTYisyyp3/4ch83wzQRJMMdGSnX8BzBY57N/d
+PJblmp+hBOXXYBqJq4QPOzMVrf2dsMXfwRJf9S/XVcjx9ryVrC0eEUZJZRdMZl/6
+JFLvLFKS/8y++eI5Gem4
+=ztk/
+-----END PGP SIGNATURE-----
diff --git a/facter.spec b/facter.spec
index e69c8a5..d5aa138 100644
--- a/facter.spec
+++ b/facter.spec
@@ -15,8 +15,8 @@
%global debug_package %{nil}
Name: facter
-Version: 1.6.5
-Release: 5%{?dist}
+Version: 1.6.6
+Release: 1%{?dist}
Summary: Command and ruby library for gathering system information
Group: System Environment/Base
@@ -24,10 +24,8 @@ License: ASL 2.0
URL: http://www.puppetlabs.com/puppet/related-projects/%{name}/
Source0: http://downloads.puppetlabs.com/%{name}/%{name}-%{version}.tar.gz
Source1: http://downloads.puppetlabs.com/%{name}/%{name}-%{version}.tar.gz.asc
-# https://bugzilla.redhat.com/790849
-Patch0: 0001-Make-ec2-facts-work-on-CentOS-again.patch
-# https://github.com/puppetlabs/facter/pull/171
-Patch1: 0001-Preserve-timestamps-when-installing-files.patch
+# https://github.com/puppetlabs/facter/commit/6ec2863
+Patch0: 0001-12669-Preserve-timestamps-when-installing-files.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ruby >= 1.8.1
@@ -64,7 +62,6 @@ key off the values returned by facts.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
%build
@@ -94,6 +91,9 @@ rspec spec
%changelog
+* Mon Mar 05 2012 Todd Zullinger <tmz at pobox.com> - 1.6.6-1
+- Update to 1.6.6
+
* Sun Feb 19 2012 Todd Zullinger <tmz at pobox.com> - 1.6.5-5
- Disable useless debuginfo generation (#795106, thanks to Ville Skyttä)
- Update summary and description
diff --git a/sources b/sources
index 29d7416..fa7d556 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cc3c69d73e86a14832772d2add8b57f9 facter-1.6.5.tar.gz
+47670a59301d6c3e31a1c68747b139c8 facter-1.6.6.tar.gz
More information about the scm-commits
mailing list