New version 0.22.4puppet-0_22_4-1_el4

3 files changed, 19 insertions, 8 deletions

diff --git a/.cvsignore b/.cvsignore
index 08c052b..c4a03f5 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-puppet-0.22.1.tgz
+puppet-0.22.4.tgz
diff --git a/puppet.spec b/puppet.spec
index ca4c9b1..6be1b19 100644
--- a/puppet.spec
+++ b/puppet.spec
@@ -7,14 +7,13 @@
 
 Summary: A network tool for managing many disparate systems
 Name: puppet
-Version: 0.22.1
-Release: 2%{?dist}
+Version: 0.22.4
+Release: 1%{?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
@@ -44,7 +43,6 @@ The server can also function as a certificate authority and file server.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 for f in bin/* ; do 
@@ -83,6 +81,7 @@ find %{buildroot}%{ruby_sitelibdir} -type f -perm +ugo+x -print0 | xargs -0 -r %
 %{_sbindir}/puppetd
 %{ruby_sitelibdir}/*
 %{_initrddir}/puppet
+%dir %{_sysconfdir}/puppet
 %config(noreplace) %{_sysconfdir}/sysconfig/puppet
 %config(noreplace) %{_sysconfdir}/puppet/puppetd.conf
 %doc CHANGELOG COPYING LICENSE README TODO examples
@@ -106,8 +105,10 @@ find %{buildroot}%{ruby_sitelibdir} -type f -perm +ugo+x -print0 | xargs -0 -r %
 %pre
 /usr/sbin/groupadd -r puppet 2>/dev/null || :
 /usr/sbin/useradd -g puppet -c "Puppet" \
-    -s /sbin/nologin -r -d /var/puppet puppet 2> /dev/null || :
-
+    -s /sbin/nologin -r -d /var/lib/puppet puppet 2> /dev/null || :
+if [ $1 -gt 1 ] ; then
+  /usr/sbin/usermod -d /var/lib/puppet puppet || :
+fi
 %post
 /sbin/chkconfig --add puppet
 exit 0
@@ -136,6 +137,16 @@ fi
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Wed May  2 2007 David Lutterkort <dlutter@redhat.com> - 0.22.4-1
+- New version
+
+* Thu Mar 29 2007 David Lutterkort <dlutter@redhat.com> - 0.22.3-1
+- Claim ownership of _sysconfdir/puppet (bz 233908)
+
+* Mon Mar 19 2007 David Lutterkort <dlutter@redhat.com> - 0.22.2-1
+- Set puppet's homedir to /var/lib/puppet, not /var/puppet
+- Remove no-lockdir patch, not needed anymore
+
 * Mon Feb 12 2007 David Lutterkort <dlutter@redhat.com> - 0.22.1-2
 - Fix bogus config parameter in puppetd.conf
 
diff --git a/sources b/sources
index 8adb92a..9fd4c7b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ce1ce40b5dda8c2068aa8c804f0617bf  puppet-0.22.1.tgz
+9bb853104f2616c7f2c8fa4e2f39b537  puppet-0.22.4.tgz