[puppet] Remove superfluous logic and update to 3.6.0
Sam Kottler
skottler at fedoraproject.org
Sun May 18 17:18:11 UTC 2014
commit 773d1a3b37f11ec42e58fd6695beb2d338013f8b
Author: Sam Kottler <shk at linux.com>
Date: Sun May 18 13:17:55 2014 -0400
Remove superfluous logic and update to 3.6.0
puppet.spec | 12 ++++++++----
sources | 6 +++---
2 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/puppet.spec b/puppet.spec
index 58ad2f7..f28e661 100644
--- a/puppet.spec
+++ b/puppet.spec
@@ -1,11 +1,9 @@
# Augeas and SELinux requirements may be disabled at build time by passing
# --without augeas and/or --without selinux to rpmbuild or mock
-# F-17 and above have ruby-1.9.x, and place libs in a different location
-
# Specifically not using systemd on F18 as it's technically a break between
# using SystemV on 2.7.x and Systemd on 3.1.0.
-%if 0%{?fedora} >= 17 || 0%{?rhel} >= 7
+%if 0%{?fedora} || 0%{?rhel} >= 7
%global puppet_libdir %{ruby_vendorlibdir}
%else
%global puppet_libdir %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["sitelibdir"]')
@@ -17,7 +15,7 @@
%global pending_upgrade_file %{pending_upgrade_path}/upgrade_pending
Name: puppet
-Version: 3.5.1
+Version: 3.6.0
Release: 1%{?dist}
Summary: A network tool for managing many disparate systems
License: ASL 2.0
@@ -55,6 +53,8 @@ Requires: ruby
%endif
%endif
+BuildRequires: hiera >= 1.0.0
+
Requires: facter >= 1.6.6
Requires: hiera >= 1.0.0
Requires: rubygem(rgen)
@@ -386,6 +386,10 @@ exit 0
rm -rf %{buildroot}
%changelog
+* Sun May 18 2014 Sam Kottler <skottler at fedoraproject.org> 3.6.0-1
+- Remove logic specific to unsupported versions of Fedora
+- Update to 3.6.0
+
* Mon Apr 28 2014 Sam Kottler <skottler at fedoraproject.org> 3.5.1-1
- Update to 3.5.1
diff --git a/sources b/sources
index 9d9757c..5f453f0 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-79cc21bdedc61fe377647628479b2c9f puppet-3.5.1.tar.gz
-0eeef3b1cc3ed5c92aeaaeec59014724 puppet-3.5.1.tar.gz.asc
-6e5d1e2f9dcb5cba5efa92cb018c25ac 23115-convert-nil-to-undef.patch
+e9b79574aaa49bd25e10eaa356ff8b56 puppet-3.6.0.tar.gz
+afb7b1e19d36ce02949e5da2bd23e0a2 puppet-3.6.0.tar.gz.asc
5d19d719514246973649301f096c7970 start-puppet-wrapper
+6e5d1e2f9dcb5cba5efa92cb018c25ac 23115-convert-nil-to-undef.patch
More information about the scm-commits
mailing list