diff --git a/0001-12669-Preserve-timestamps-when-installing-files.patch b/0001-12669-Preserve-timestamps-when-installing-files.patch deleted file mode 100644 index 3526051..0000000 --- a/0001-12669-Preserve-timestamps-when-installing-files.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 6ec28631f5d0a1d5f3a9f9c4879950089fce5ed2 Mon Sep 17 00:00:00 2001 -From: Todd Zullinger -Date: Wed, 15 Feb 2012 10:07:11 -0500 -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 c5c3a11..909171f 100755 ---- a/install.rb -+++ b/install.rb -@@ -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) -- FileUtils.install(lf, olf, {:mode => 0644, :verbose => true}) -+ FileUtils.install(lf, olf, {:mode => 0644, :preserve => true, :verbose => true}) - end - end - -@@ -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) -- FileUtils.install(mf, omf, {:mode => 0644, :verbose => true}) -+ FileUtils.install(mf, omf, {:mode => 0644, :preserve => true, :verbose => true}) - gzip = %x{which gzip} - gzip.chomp! - %x{#{gzip} -f #{omf}} -@@ -400,12 +400,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 - -@@ -419,13 +419,13 @@ set RUBY_BIN=%RUBY_BIN:\\=/% - "%RUBY_BIN%ruby.exe" -x "%RUBY_BIN%facter" %* - 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/facter-1.6.6.tar.gz.asc b/facter-1.6.6.tar.gz.asc deleted file mode 100644 index 473584e..0000000 --- a/facter-1.6.6.tar.gz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------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 7b896d2..7a7f108 100644 --- a/facter.spec +++ b/facter.spec @@ -15,17 +15,14 @@ %global debug_package %{nil} Name: facter -Version: 1.6.6 -Release: 2%{?dist} +Version: 1.6.14 +Release: 1%{?dist} Summary: Command and ruby library for gathering system information Group: System Environment/Base 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://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 @@ -34,6 +31,7 @@ BuildRequires: ruby-devel BuildRequires: net-tools BuildRequires: rubygem(mocha) BuildRequires: rubygem(rspec-core) +BuildRequires: rubygem(rspec) %endif # dmidecode and pciutils are not available on all arches @@ -61,7 +59,6 @@ key off the values returned by facts. %prep %setup -q -%patch0 -p1 %build @@ -85,12 +82,16 @@ rspec spec %files %defattr(-,root,root,-) -%doc CHANGELOG LICENSE README.md +%doc LICENSE README.md %{_bindir}/%{name} %{facter_libdir}/%{name}* +%{_mandir}/man8/%{name}* %changelog +* Sun Nov 04 2012 - 1.6.14-1 +- Rebase to 1.6.14 via bz 871211 + * Thu Jul 19 2012 Fedora Release Engineering - 1.6.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild @@ -103,7 +104,7 @@ rspec spec - Remove INSTALL from %%doc * Wed Feb 15 2012 Todd Zullinger - 1.6.5-4 -- Only run rspec checks on Fedora >= 17 +- Only run rspec checks on Fedora >= 17 * Mon Feb 13 2012 Todd Zullinger - 1.6.5-3 - Make spec file work for EPEL and Fedora