Version 0.23.1puppet-0_23_1-1_fc8

3 files changed, 11 insertions, 8 deletions

diff --git a/.cvsignore b/.cvsignore
index 8a18cb0..53b0c3b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-puppet-0.23.0.tgz
+puppet-0.23.1.tgz
diff --git a/puppet.spec b/puppet.spec
index ec473d2..a6c7a8a 100644
--- a/puppet.spec
+++ b/puppet.spec
@@ -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 @@ The server can also function as a certificate authority and file server.
 
 %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 -m0644 %{confdir}/server.sysconfig %{buildroot}%{_sysconfdir}/syscon
 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 @@ fi
 rm -rf %{buildroot}
 
 %changelog
+* Thu Jul 26 2007 David Lutterkort <dlutter@redhat.com> - 0.23.1-1
+- Remove old config files
+
 * Wed Jun 20 2007 David Lutterkort <dlutter@redhat.com> - 0.23.0-1
 - Install one puppet.conf instead of old config files, keep old configs 
   around to ease update
diff --git a/sources b/sources
index 9be7481..eb94ef5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c43342d7d24f1fe881ec97b59e7ea02d  puppet-0.23.0.tgz
+ecd13a353633d9dc215eb0582ef45194  puppet-0.23.1.tgz