Please review pull request #670: Update puppet spec for rpm 2.7.x opened by (haus)
Description:
As el4 is now EOL, Ruby 1.8.1 doesn't need to be the minimum Ruby. 1.8.5 is
available in el5, so that is a sane new minimum. This commit also removes a
macro that was needed for building rpms on platforms earlier than el5. It also
updates the changelog and version for the latest release of puppet, 2.7.13.
- Opened: Fri Apr 13 19:02:48 UTC 2012
- Based on: puppetlabs:2.7.x (849a882d0914e305547d566471f1027102bbfba5)
- Requested merge: haus:update_puppet_spec_for_rpm_2.7.x (5178adcbb8f76a466f954fef29ebc6261ea054ed)
Diff follows:
diff --git a/conf/redhat/puppet.spec b/conf/redhat/puppet.spec
index 57117a1..9635c56 100644
--- a/conf/redhat/puppet.spec
+++ b/conf/redhat/puppet.spec
@@ -5,7 +5,7 @@
%global confdir conf/redhat
Name: puppet
-Version: 2.7.12
+Version: 2.7.13
#Release: 0.1rc1%{?dist}
Release: 1%{?dist}
Summary: A network tool for managing many disparate systems
@@ -21,13 +21,11 @@ Group: System Environment/Base
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: facter >= 1.5
-BuildRequires: ruby >= 1.8.1
+BuildRequires: ruby >= 1.8.5
-%if 0%{?fedora} || 0%{?rhel} >= 5
BuildArch: noarch
Requires: ruby(abi) >= 1.8
Requires: ruby-shadow
-%endif
# Pull in ruby selinux bindings where available
%if 0%{?fedora} || 0%{?rhel} >= 6
@@ -39,7 +37,7 @@ Requires: ruby-shadow
%endif
Requires: facter >= 1.5
-Requires: ruby >= 1.8.1
+Requires: ruby >= 1.8.5
%{!?_without_augeas:Requires: ruby-augeas}
Requires(pre): shadow-utils
@@ -285,6 +283,9 @@ fi
rm -rf %{buildroot}
%changelog
+* Tue Apr 10 2012 Matthaus Litteken <[email protected]> - 2.7.13-1
+- Update for 2.7.13
+
* Mon Mar 12 2012 Michael Stahnke <[email protected]> - 2.7.12-1
- Update for 2.7.12
-- 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.
