summaryrefslogtreecommitdiffstats
path: root/puppet.spec
diff options
context:
space:
mode:
authorTodd Zullinger <tmz@pobox.com>2011-03-16 10:20:24 -0400
committerTodd Zullinger <tmz@pobox.com>2011-03-16 10:20:24 -0400
commitc1c8031682ced3b6ee2e5cd113ca88f7ac2fd23c (patch)
treefbdcef0c397c53033de4c73895fb8e81f6f1f685 /puppet.spec
parent291d3b16072da23ed250a9a2b357b7cfd9c8b8a8 (diff)
downloadpuppet-package-c1c8031682ced3b6ee2e5cd113ca88f7ac2fd23c.tar.gz
puppet-package-c1c8031682ced3b6ee2e5cd113ca88f7ac2fd23c.tar.xz
puppet-package-c1c8031682ced3b6ee2e5cd113ca88f7ac2fd23c.zip
Update to 2.6.6
Diffstat (limited to 'puppet.spec')
-rw-r--r--puppet.spec13
1 files changed, 8 insertions, 5 deletions
diff --git a/puppet.spec b/puppet.spec
index 3366343..74743ac 100644
--- a/puppet.spec
+++ b/puppet.spec
@@ -5,8 +5,8 @@
%global confdir conf/redhat
Name: puppet
-Version: 0.25.5
-Release: 2%{?dist}
+Version: 2.6.6
+Release: 1%{?dist}
Summary: A network tool for managing many disparate systems
License: GPLv2+
URL: http://puppetlabs.com
@@ -66,7 +66,8 @@ The server can also function as a certificate authority and file server.
%prep
%setup -q
-patch -p1 < conf/redhat/rundir-perms.patch
+patch -s -p1 < conf/redhat/rundir-perms.patch
+
%build
# Fix some rpmlint complaints
@@ -100,7 +101,6 @@ install -Dp -m0644 %{confdir}/server.sysconfig %{buildroot}%{_sysconfdir}/syscon
install -Dp -m0755 %{confdir}/server.init %{buildroot}%{_initrddir}/puppetmaster
install -Dp -m0644 %{confdir}/fileserver.conf %{buildroot}%{_sysconfdir}/puppet/fileserver.conf
install -Dp -m0644 %{confdir}/puppet.conf %{buildroot}%{_sysconfdir}/puppet/puppet.conf
-install -Dp -m0644 conf/auth.conf %{buildroot}%{_sysconfdir}/puppet/auth.conf
install -Dp -m0644 %{confdir}/logrotate %{buildroot}%{_sysconfdir}/logrotate.d/puppet
# We need something for these ghosted files, otherwise rpmbuild
@@ -214,13 +214,16 @@ fi
%postun server
if [ "$1" -ge 1 ]; then
- /sbin/service puppetmaster condrestart > /dev/null 2>&1 || :
+ /sbin/service puppetmaster condrestart >/dev/null 2>&1 || :
fi
%clean
rm -rf %{buildroot}
%changelog
+* Wed Mar 16 2011 Todd Zullinger <tmz@pobox.com> - 2.6.6-1
+- Update to 2.6.6
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.25.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild