rpms/puppet/F-7 .cvsignore, 1.15, 1.16 puppet.spec, 1.16, 1.17 sources, 1.15, 1.16

[David Lutterkort (lutter)]

Author: lutter

Update of /cvs/extras/rpms/puppet/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6826

Modified Files:
	.cvsignore puppet.spec sources 
Log Message:
Version 0.23.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/puppet/F-7/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	21 Jun 2007 21:41:14 -0000	1.15
+++ .cvsignore	27 Jul 2007 00:08:06 -0000	1.16
@@ -1 +1 @@
-puppet-0.23.0.tgz
+puppet-0.23.1.tgz


Index: puppet.spec
===================================================================
RCS file: /cvs/extras/rpms/puppet/F-7/puppet.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- puppet.spec	21 Jun 2007 21:41:14 -0000	1.16
+++ puppet.spec	27 Jul 2007 00:08:06 -0000	1.17
@@ -7,7 +7,7 @@
 
 Summary: A network tool for managing many disparate systems
 Name: puppet
-Version: 0.23.0
+Version: 0.23.1
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
@@ -43,8 +43,6 @@
 
 %prep
 %setup -q
-cp -p conf/redhat/puppetd.conf conf/redhat/puppet.conf
-sed -i -e 's/^\[puppet\]$/[main]/' conf/redhat/puppet.conf
 
 %build
 for f in bin/* ; do 
@@ -75,10 +73,12 @@
 install -Dp -m0755 %{confdir}/server.init %{buildroot}%{_initrddir}/puppetmaster
 install -Dp -m0644 %{confdir}/fileserver.conf %{buildroot}%{_sysconfdir}/puppet/fileserver.conf
 install -Dp -m0644 %{confdir}/puppet.conf %{buildroot}%{_sysconfdir}/puppet/puppet.conf
-ln -s puppetd.conf %{buildroot}%{_sysconfdir}/puppet/puppetmasterd.conf
-ln -s puppetd.conf %{buildroot}%{_sysconfdir}/puppet/puppetca.conf
-install -Dp -m0644 %{confdir}/puppetd.conf %{buildroot}%{_sysconfdir}/puppet/puppetd.conf
 install -Dp -m0644 %{confdir}/logrotate %{buildroot}%{_sysconfdir}/logrotate.d/puppet
+# We need something for these ghosted files, otherwise rpmbuild
+# will complain loudly. They won't be included in the binary packages
+touch %{buildroot}%{_sysconfdir}/puppet/puppetmasterd.conf
+touch %{buildroot}%{_sysconfdir}/puppet/puppetca.conf
+touch %{buildroot}%{_sysconfdir}/puppet/puppetd.conf
 
 %files
 %defattr(-, root, root, 0755)
@@ -148,6 +148,9 @@
 rm -rf %{buildroot}
 
 %changelog
+* Thu Jul 26 2007 David Lutterkort <dlutter at redhat.com> - 0.23.1-1
+- Remove old config files
+
 * Wed Jun 20 2007 David Lutterkort <dlutter at redhat.com> - 0.23.0-1
 - Install one puppet.conf instead of old config files, keep old configs 
   around to ease update


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/puppet/F-7/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	21 Jun 2007 21:41:14 -0000	1.15
+++ sources	27 Jul 2007 00:08:06 -0000	1.16
@@ -1 +1 @@
-c43342d7d24f1fe881ec97b59e7ea02d  puppet-0.23.0.tgz
+ecd13a353633d9dc215eb0582ef45194  puppet-0.23.1.tgz