Skip to content

Commit

Permalink
Updated CHANGELOG for 2.7.10
Browse files Browse the repository at this point in the history
  • Loading branch information
stahnma committed Jan 25, 2012
1 parent e31369a commit 9312a31
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 12 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
2.7.10rc1
2.7.10
===
e31369a (#6541) Use the same filebucket for backup and restore
0d8a22a (#11767) No longer necessary to delete ssl directory in each test
e1828ba Updated CHANGELOG for 2.7.10rc1
8da947f (#11996) Fix file content test after hash changes.
884fe75 (#11996) Fix file server recursion test after hash changes.
3fb0938 (#11996) Fix graph cycle reporting order after hash changes.
Expand Down
17 changes: 10 additions & 7 deletions conf/redhat/puppet.spec
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@

Name: puppet
Version: 2.7.10
Release: 0.1rc1%{?dist}
#Release: 1%{?dist}
#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}rc1.tar.gz
#Source1: http://puppetlabs.com/downloads/%{name}/%{name}-%{version}.tar.gz.asc
Source1: http://puppetlabs.com/downloads/%{name}/%{name}-%{version}rc1.tar.gz.asc
Source0: http://puppetlabs.com/downloads/%{name}/%{name}-%{version}.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}rc1.tar.gz.asc

Group: System Environment/Base

Expand Down Expand Up @@ -68,7 +68,7 @@ Provides the central puppet server daemon which provides manifests to clients.
The server can also function as a certificate authority and file server.

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


Expand Down Expand Up @@ -285,6 +285,9 @@ fi
rm -rf %{buildroot}

%changelog
* Wed Jan 25 2012 Michael Stahnke <[email protected]> - 2.7.10-1
- Update for 2.7.10

* Fri Dec 9 2011 Matthaus Litteken <[email protected]> - 2.7.9-1
- Update for 2.7.9

Expand Down
2 changes: 1 addition & 1 deletion conf/solaris/pkginfo
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PKG=CSWpuppet
NAME=puppet - System Automation Framework
VERSION=2.7.8
VERSION=2.7.10
CATEGORY=application
VENDOR=http://projects.puppetlabs.com/projects/puppet
[email protected]
9 changes: 6 additions & 3 deletions conf/suse/puppet.spec
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
Summary: A network tool for managing many disparate systems
Name: puppet
Version: 2.7.10
Release: 0.1rc1%{?dist}
Release: 1%{?dist}
License: Apache 2.0
Group: Productivity/Networking/System

URL: http://puppetlabs.com/projects/puppet/
Source0: http://puppetlabs.com/downloads/puppet/%{name}-%{version}rc1.tar.gz
Source0: http://puppetlabs.com/downloads/puppet/%{name}-%{version}.tar.gz

PreReq: %{insserv_prereq} %{fillup_prereq}
Requires: ruby >= 1.8.2
Expand All @@ -35,7 +35,7 @@ Provides the central puppet server daemon which provides manifests to clients.
The server can also function as a certificate authority and file server.

%prep
%setup -q -n %{name}-%{version}rc1
%setup -q -n %{name}-%{version}

%build
for f in bin/* sbin/*; do
Expand Down Expand Up @@ -136,6 +136,9 @@ find %{buildroot}%{ruby_sitelibdir} -type f -perm +ugo+x -exec chmod a-x '{}' \;
%{__rm} -rf %{buildroot}

%changelog
* Wed Jan 25 2012 Michael Stahnke <[email protected]> - 2.7.10-1
- Update for 2.7.10

* Wed Nov 30 2011 Michael Stahnke <[email protected]> - 2.7.8-0.1rc1
- Update for 2.7.8rc1

Expand Down

0 comments on commit 9312a31

Please sign in to comment.