rpms/puppet/FC-5 no-lockdir.patch,NONE,1.1 puppet.spec,1.11,1.12

[David Lutterkort (lutter)]

Author: lutter

Update of /cvs/extras/rpms/puppet/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31181

Modified Files:
	puppet.spec 
Added Files:
	no-lockdir.patch 
Log Message:
Fix lockdir problem in puppetd.conf

no-lockdir.patch:

--- NEW FILE no-lockdir.patch ---
--- 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


Index: puppet.spec
===================================================================
RCS file: /cvs/extras/rpms/puppet/FC-5/puppet.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- puppet.spec	3 Feb 2007 19:44:14 -0000	1.11
+++ puppet.spec	12 Feb 2007 15:05:20 -0000	1.12
@@ -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 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 for f in bin/* ; do 
@@ -134,6 +136,9 @@
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Mon Feb 12 2007 David Lutterkort <dlutter at redhat.com> - 0.22.1-2
+- Fix bogus config parameter in puppetd.conf
+
 * Sat Feb  3 2007 David Lutterkort <dlutter at redhat.com> - 0.22.1-1
 - New version