[facter] Rebase facter to 1.6.14.

Michael Stahnke stahnma at fedoraproject.org
Mon Nov 5 06:18:12 UTC 2012


commit b0f6e351252e344d8b7a994b7cb56b839c45b9f2
Author: Michael Stahnke <stahnma at puppetlabs.com>
Date:   Mon Oct 29 15:51:19 2012 -0700

    Rebase facter to 1.6.14.
    
    This is a patch to rebase facter to 1.6.14 for rawhide (and should be a
    clean change in F17).  Note I had to add a requires on rpsec (not just
    rspec-core) to make this build cleanly in the %%check phase.
    
    This patch also removes the asc file, as it is never (and has never
    been) used in the process of making the facter package.
    
    rpmlint looks reasonable to me upon build.
    
    Bugzilla: 871211
    
    Signed-off-by: Michael Stahnke <stahnma at puppetlabs.com>

 ...Preserve-timestamps-when-installing-files.patch |   69 --------------------
 facter-1.6.6.tar.gz.asc                            |   17 -----
 facter.spec                                        |   17 +++--
 3 files changed, 9 insertions(+), 94 deletions(-)
---
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 <stahnma at fedoraproject.org> - 1.6.14-1
+- Rebase to 1.6.14 via bz 871211
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 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 <tmz at pobox.com> - 1.6.5-4
-- Only run rspec checks on Fedora >= 17 
+- Only run rspec checks on Fedora >= 17
 
 * Mon Feb 13 2012 Todd Zullinger <tmz at pobox.com> - 1.6.5-3
 - Make spec file work for EPEL and Fedora


More information about the scm-commits mailing list