summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTodd Zullinger <tmz@pobox.com>2010-07-20 09:55:06 -0400
committerMarkus Roberts <Markus@reality.com>2010-07-25 22:25:01 -0700
commitbdfcac5c9c44cdbb4a13e282720ff29fed79642c (patch)
treec424721b0cef0882f78c1dbfa46f7e4b0d1e2fdd
parent9f08e7c1e49282754c839e631bf52102707336c0 (diff)
downloadpuppet-bdfcac5c9c44cdbb4a13e282720ff29fed79642c.tar.gz
puppet-bdfcac5c9c44cdbb4a13e282720ff29fed79642c.tar.xz
puppet-bdfcac5c9c44cdbb4a13e282720ff29fed79642c.zip
Update Red Hat spec file for 2.6.0
-rw-r--r--conf/redhat/puppet.spec10
1 files changed, 8 insertions, 2 deletions
diff --git a/conf/redhat/puppet.spec b/conf/redhat/puppet.spec
index 6791cea77..e51af0a6b 100644
--- a/conf/redhat/puppet.spec
+++ b/conf/redhat/puppet.spec
@@ -5,14 +5,14 @@
%global confdir conf/redhat
Name: puppet
-Version: 0.25.5
+Version: 2.6.0
Release: 1%{?dist}
Summary: A network tool for managing many disparate systems
License: GPLv2+
URL: http://puppetlabs.com
Source0: http://puppetlabs.com/downloads/%{name}/%{name}-%{version}.tar.gz
Source1: http://puppetlabs.com/downloads/%{name}/%{name}-%{version}.tar.gz.sign
-Patch0: rundir-perms.patch
+
Group: System Environment/Base
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -68,6 +68,7 @@ The server can also function as a certificate authority and file server.
%setup -q
patch -p1 < conf/redhat/rundir-perms.patch
+
%build
# Fix some rpmlint complaints
for f in mac_dscl.pp mac_dscl_revert.pp \
@@ -91,6 +92,7 @@ rm -rf %{buildroot}
ruby install.rb --destdir=%{buildroot} --quick --no-rdoc
install -d -m0755 %{buildroot}%{_sysconfdir}/puppet/manifests
+install -d -m0755 %{buildroot}%{_datadir}/%{name}/modules
install -d -m0755 %{buildroot}%{_localstatedir}/lib/puppet
install -d -m0755 %{buildroot}%{_localstatedir}/run/puppet
install -d -m0750 %{buildroot}%{_localstatedir}/log/puppet
@@ -221,6 +223,10 @@ fi
rm -rf %{buildroot}
%changelog
+* Tue Jul 20 2010 Todd Zullinger <tmz@pobox.com> - 2.6.0-1
+- Update to 2.6.0
+- Create and own /usr/share/puppet/modules (#615432)
+
* Mon May 03 2010 Todd Zullinger <tmz@pobox.com> - 0.25.5-1
- Update to 0.25.5
- Adjust selinux conditional for EL-6