Please review pull request #191: Ticket/1.6.x/update redhat spec file opened by (MosesMendoza)
Description:
This commit updates the rpm spec file to change
the ruby dependencies to version 1.8.5. It also
removes any conditionals for ruby abi, because
we can now assume ruby abi present. The
dependency on ruby is bumped to version 1.8.5,
as we can also assume this ruby version, given
that el4 is EOL. The facter version is bumped
to 1.6.8 to reflect the latest released version.
Finally, this commit removes the manual noarch
build setting, as facter is now arch-specific
because of its dependency on dmidecode.
Signed-off-by: Moses Mendoza [email protected]
- Opened: Mon Apr 23 20:50:49 UTC 2012
- Based on: puppetlabs:1.6.x (e1025c15ee3a01cbae537811679847571bacf619)
- Requested merge: MosesMendoza:ticket/1.6.x/update_redhat_spec_file (2842c96b602e1a3f7e4184554ff3aeaa3a9eeb70)
Diff follows:
diff --git a/conf/redhat/facter.spec b/conf/redhat/facter.spec
index fcf4e1e..e211eac 100644
--- a/conf/redhat/facter.spec
+++ b/conf/redhat/facter.spec
@@ -1,11 +1,8 @@
%{!?ruby_sitelibdir: %define ruby_sitelibdir %(ruby -rrbconfig -e 'puts Object.const_get(defined?(RbConfig) ? :RbConfig : :Config)::CONFIG["sitelibdir"]')}
-%define has_ruby_abi 0%{?fedora} || 0%{?rhel} >= 5
-%define has_ruby_noarch %has_ruby_abi
-
Summary: Ruby module for collecting simple facts about a host operating system
Name: facter
-Version: 1.6.6
+Version: 1.6.8
Release: 1%{?dist}
#Release: 0.1rc1%{?dist}
License: Apache 2.0
@@ -16,20 +13,15 @@ Source0: http://puppetlabs.com/downloads/%{name}/%{name}-%{version}.tar.gz
#Source1: http://puppetlabs.com/downloads/%{name}/%{name}-%{version}rc1.tar.gz.asc
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%if %has_ruby_noarch
-BuildArch: noarch
-%endif
-Requires: ruby >= 1.8.1
+Requires: ruby >= 1.8.5
Requires: which
# Note: dmidecode is only available on x86 and x86_64 so this package may need to move into being
# arch specific if people are using ppc, arm, s390 etc
Requires: dmidecode
Requires: pciutils
-%if %has_ruby_abi
Requires: ruby(abi) = 1.8
-%endif
-BuildRequires: ruby >= 1.8.1
+BuildRequires: ruby >= 1.8.5
%description
Ruby module for collecting simple facts about a host Operating
@@ -59,6 +51,9 @@ rm -rf %{buildroot}
%changelog
+* Mon Apr 23 2012 Moses Mendoza <[email protected]> - 1.6.8-1
+- Update for 1.6.8, spec for arch-specific build, req ruby 1.8.5
+
* Thu Feb 23 2012 Michael Stahnke <[email protected]> - 1.6.6-1
- Update for 1.6.6
-- You received this message because you are subscribed to the Google Groups "Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to [email protected].
For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.
