rpms/puppet/devel .cvsignore, 1.11, 1.12 puppet.spec, 1.12, 1.13 sources, 1.11, 1.12

[David Lutterkort (lutter)]

Author: lutter

Update of /cvs/extras/rpms/puppet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2952

Modified Files:
	.cvsignore puppet.spec sources 
Log Message:
New version 0.22.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/puppet/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	3 Feb 2007 19:35:12 -0000	1.11
+++ .cvsignore	20 Mar 2007 00:14:34 -0000	1.12
@@ -1 +1 @@
-puppet-0.22.1.tgz
+puppet-0.22.2.tgz


Index: puppet.spec
===================================================================
RCS file: /cvs/extras/rpms/puppet/devel/puppet.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- puppet.spec	12 Feb 2007 14:53:12 -0000	1.12
+++ puppet.spec	20 Mar 2007 00:14:34 -0000	1.13
@@ -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.2
+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 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 for f in bin/* ; do 
@@ -106,8 +104,10 @@
 %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 +136,10 @@
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Mon Mar 19 2007 David Lutterkort <dlutter at 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 at redhat.com> - 0.22.1-2
 - Fix bogus config parameter in puppetd.conf
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/puppet/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	3 Feb 2007 19:35:12 -0000	1.11
+++ sources	20 Mar 2007 00:14:34 -0000	1.12
@@ -1 +1 @@
-ce1ce40b5dda8c2068aa8c804f0617bf  puppet-0.22.1.tgz
+470581376bb1b6f7aaed666dc144bd12  puppet-0.22.2.tgz