diff options
| author | lutter <lutter@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-03-02 01:48:23 +0000 |
|---|---|---|
| committer | lutter <lutter@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-03-02 01:48:23 +0000 |
| commit | 68233706a9ff05be8fa8ab3ab7198cd0918517d6 (patch) | |
| tree | 52d2f61a36ae665211b283e7b2fc2b7e2cf1f666 | |
| parent | 4a73da3370f9223c5fd43dc9ee008fb87b6ca24b (diff) | |
Sync with latest Fedora specfile
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2253 980ebf18-57e1-0310-9a29-db15c13687c0
| -rw-r--r-- | conf/redhat/no-lockdir.patch | 13 | ||||
| -rw-r--r-- | conf/redhat/puppet.spec | 10 |
2 files changed, 22 insertions, 1 deletions
diff --git a/conf/redhat/no-lockdir.patch b/conf/redhat/no-lockdir.patch new file mode 100644 index 000000000..899a2025c --- /dev/null +++ b/conf/redhat/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/conf/redhat/puppet.spec b/conf/redhat/puppet.spec index 6502eee40..ca4c9b132 100644 --- a/conf/redhat/puppet.spec +++ b/conf/redhat/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,12 @@ 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 + * Fri Jan 5 2007 David Lutterkort <dlutter@redhat.com> - 0.22.0-1 - New version |