summaryrefslogtreecommitdiffstats
path: root/puppet.spec
diff options
context:
space:
mode:
authorDavid Lutterkort <lutter@fedoraproject.org>2007-07-27 00:08:06 +0000
committerDavid Lutterkort <lutter@fedoraproject.org>2007-07-27 00:08:06 +0000
commitadd66a20cdb07a9458a40d2b137bbc6b60decf17 (patch)
tree1ff6220fe828f39cb0744ab6b2907ff647f87310 /puppet.spec
parenta0c45233247a5768e41bda8d150c2a75f1dbb5f5 (diff)
Version 0.23.1puppet-0_23_1-1_fc7
Diffstat (limited to 'puppet.spec')
-rw-r--r--puppet.spec15
1 files changed, 9 insertions, 6 deletions
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