Skip to content

Commit

Permalink
Updated manpages, CHANGELOG, puppet.spec, puppet.rb for 2.7.16rc1.
Browse files Browse the repository at this point in the history
  • Loading branch information
haus committed Jun 6, 2012
1 parent fb4c64b commit da36281
Show file tree
Hide file tree
Showing 49 changed files with 1,687 additions and 242 deletions.
18 changes: 8 additions & 10 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
2.7.15rc4
2.7.16rc1
===
3a06246 (#8858) Explicitly set SSL peer verification mode.
cd4bee8 Test SSL setup code, not our stubbing of it.
ff052b8 (maint) Add mailmap to identify contributors
8dda6c2 (#14723) Fix http report description
ebf5386 Remove EL-related test changes from this commit.
2aea708 Revert changes to symbolic_modes.rb -- this test should indeed be pending (it should eventually work on Windows).
b601bb4 Update acceptance tests to use confine instead of skip_test loops
e619304 (#14761) Add boot, reboot to excludes list for redhat provider
7c1d8c2 (maint) Disable upstart spec test on windows
37df5c4 (#14615) Final stub fixes for the tests.
Expand All @@ -8,9 +15,6 @@ f11dfd6 (#14615) Fix provider spec tests to work on non gentoo systems
c0cb0fa (Maint) Close filehandles after read in upstart
0788ea2 (#14615) Exclude helperscripts in gentoo service provider
be6062c Apply commit from master that varies ports during tests

2.7.15rc3
===
a45942b (#14297) Don't remove tty1 or rsyslog during upstart acceptance
466ab49 (#14297) Define agent in upstart acceptance test
f5d1f74 (#14297) Update upstart provider acceptance tests
Expand All @@ -21,15 +25,9 @@ b9ed026 (#14297) Update spec tests for upstart provider
91827e8 (#14297) Handle upstart services better
3541db6 (#14343) Lookup in correct inherited scope
2d83e22 (Maint) Added test for fully qualified variable

2.7.15rc2
===
c6e006e (#8174) Allow defines to reference topscope
e27adf4 Evaluate node classes either in top or node scope
a3d51b2 Removed topscope being overridden by node

2.7.15rc1
===
53e0057 Use internal domain name for module tool tests
f4ba59e Use absolute_path in module install spec
ead9d25 (Maint) Color console output when the win32console gem is installed
Expand Down
24 changes: 16 additions & 8 deletions conf/redhat/puppet.spec
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,22 @@
%global confdir conf/redhat

Name: puppet
Version: 2.7.15
Release: 0.1rc4%{?dist}
Version: 2.7.16
Release: 0.1rc1%{?dist}
#Release: 1%{?dist}
Summary: A network tool for managing many disparate systems
License: ASL 2.0
URL: http://puppetlabs.com
#Source0: http://puppetlabs.com/downloads/%{name}/%{name}-%{version}.tar.gz
Source0: http://puppetlabs.com/downloads/%{name}/%{name}-%{version}rc4.tar.gz
Source0: http://puppetlabs.com/downloads/%{name}/%{name}-%{version}rc1.tar.gz
#Source1: http://puppetlabs.com/downloads/%{name}/%{name}-%{version}.tar.gz.asc
Source1: http://puppetlabs.com/downloads/%{name}/%{name}-%{version}rc4.tar.gz.asc
Source1: http://puppetlabs.com/downloads/%{name}/%{name}-%{version}rc1.tar.gz.asc

Group: System Environment/Base

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: facter >= 1.5
BuildRequires: facter >= 1.5, facter < 2.0
BuildRequires: ruby >= 1.8.5

BuildArch: noarch
Expand All @@ -36,7 +36,7 @@ Requires: ruby-shadow
%endif
%endif

Requires: facter >= 1.5, facter <= 2.0
Requires: facter >= 1.5, facter < 2.0
Requires: ruby >= 1.8.5
%{!?_without_augeas:Requires: ruby-augeas}

Expand Down Expand Up @@ -67,7 +67,7 @@ The server can also function as a certificate authority and file server.

%prep
#%setup -q -n %{name}-%{version}
%setup -q -n %{name}-%{version}rc4
%setup -q -n %{name}-%{version}rc1
patch -s -p1 < conf/redhat/rundir-perms.patch


Expand Down Expand Up @@ -178,6 +178,7 @@ echo "D /var/run/%{name} 0755 %{name} %{name} -" > \
%{_mandir}/man8/puppet-apply.8.gz
%{_mandir}/man8/puppet-catalog.8.gz
%{_mandir}/man8/puppet-describe.8.gz
%{_mandir}/man8/puppet-ca.8.gz
%{_mandir}/man8/puppet-cert.8.gz
%{_mandir}/man8/puppet-certificate.8.gz
%{_mandir}/man8/puppet-certificate_request.8.gz
Expand All @@ -190,9 +191,13 @@ echo "D /var/run/%{name} 0755 %{name} %{name} -" > \
%{_mandir}/man8/puppet-filebucket.8.gz
%{_mandir}/man8/puppet-help.8.gz
%{_mandir}/man8/puppet-inspect.8.gz
%{_mandir}/man8/puppet-instrumentation_data.8.gz
%{_mandir}/man8/puppet-instrumentation_listener.8.gz
%{_mandir}/man8/puppet-instrumentation_probe.8.gz
%{_mandir}/man8/puppet-key.8.gz
%{_mandir}/man8/puppet-kick.8.gz
%{_mandir}/man8/puppet-man.8.gz
%{_mandir}/man8/puppet-module.8.gz
%{_mandir}/man8/puppet-node.8.gz
%{_mandir}/man8/puppet-parser.8.gz
%{_mandir}/man8/puppet-plugin.8.gz
Expand Down Expand Up @@ -284,7 +289,10 @@ fi
rm -rf %{buildroot}

%changelog
* Fri Jun 1 2012 Matthaus Litteken <[email protected]> - 2.7.15-0.1rc4
* Wed Jun 06 2012 Matthaus Litteken <[email protected]> - 2.7.16-0.1rc1
- Update for 2.7.16rc1, added generated manpages

* Fri Jun 01 2012 Matthaus Litteken <[email protected]> - 2.7.15-0.1rc4
- Update for 2.7.15rc4

* Tue May 29 2012 Moses Mendoza <[email protected]> - 2.7.15-0.1rc3
Expand Down
2 changes: 1 addition & 1 deletion lib/puppet.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
# it's also a place to find top-level commands like 'debug'

module Puppet
PUPPETVERSION = '2.7.15'
PUPPETVERSION = '2.7.16'

def Puppet.version
PUPPETVERSION
Expand Down
Loading

0 comments on commit da36281

Please sign in to comment.