summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Lutterkort <lutter@fedoraproject.org>2007-02-12 14:53:12 +0000
committerDavid Lutterkort <lutter@fedoraproject.org>2007-02-12 14:53:12 +0000
commite4f049dd078af9c3eb1e12ca1c3c6a5fecb621a9 (patch)
treecfc43b6830ece49b738ea5ad7c8363ebfa677604
parent7bce7b24ed13f346f33800507bc36761f4e983b0 (diff)
downloadpuppet-package-e4f049dd078af9c3eb1e12ca1c3c6a5fecb621a9.tar.gz
puppet-package-e4f049dd078af9c3eb1e12ca1c3c6a5fecb621a9.tar.xz
puppet-package-e4f049dd078af9c3eb1e12ca1c3c6a5fecb621a9.zip
Fix lockdir problem in puppetd.confpuppet-0_22_1-2_fc7EL-4-startEL-4-split
-rw-r--r--no-lockdir.patch13
-rw-r--r--puppet.spec7
2 files changed, 19 insertions, 1 deletions
diff --git a/no-lockdir.patch b/no-lockdir.patch
new file mode 100644
index 0000000..899a202
--- /dev/null
+++ b/no-lockdir.patch
@@ -0,0 +1,13 @@
+--- puppet-0.22.1/conf/redhat/puppetd.conf.orig 2006-09-27 10:30:35.000000000 -0700
++++ puppet-0.22.1/conf/redhat/puppetd.conf 2007-02-11 13:27:04.000000000 -0800
+@@ -11,10 +11,6 @@
+ # The default value is '$vardir/run'.
+ rundir = /var/run/puppet
+
+- # Where lock files are kept.
+- # The default value is '$vardir/locks'.
+- lockdir = /var/lock
+-
+ # Where SSL certificates are kept.
+ # The default value is '$confdir/ssl'.
+ ssldir = $vardir/ssl
diff --git a/puppet.spec b/puppet.spec
index 840fb71..ca4c9b1 100644
--- a/puppet.spec
+++ b/puppet.spec
@@ -8,12 +8,13 @@
Summary: A network tool for managing many disparate systems
Name: puppet
Version: 0.22.1
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPL
Group: System Environment/Base
URL: http://reductivelabs.com/projects/puppet/
Source: http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tgz
+Patch0: no-lockdir.patch
Requires: ruby >= 1.8.1
%if %has_ruby_abi
@@ -43,6 +44,7 @@ The server can also function as a certificate authority and file server.
%prep
%setup -q
+%patch0 -p1
%build
for f in bin/* ; do
@@ -134,6 +136,9 @@ fi
%{__rm} -rf %{buildroot}
%changelog
+* Mon Feb 12 2007 David Lutterkort <dlutter@redhat.com> - 0.22.1-2
+- Fix bogus config parameter in puppetd.conf
+
* Sat Feb 3 2007 David Lutterkort <dlutter@redhat.com> - 0.22.1-1
- New version