rpms/puppet/EL-4 .cvsignore, 1.13, 1.14 puppet.spec, 1.14, 1.15 sources, 1.13, 1.14
David Lutterkort (lutter)
fedora-extras-commits at redhat.com
Wed Aug 22 17:36:31 UTC 2007
Author: lutter
Update of /cvs/extras/rpms/puppet/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27483
Modified Files:
.cvsignore puppet.spec sources
Log Message:
Version 0.23.2
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/puppet/EL-4/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore 21 Jun 2007 22:00:55 -0000 1.13
+++ .cvsignore 22 Aug 2007 17:35:59 -0000 1.14
@@ -1 +1 @@
-puppet-0.23.0.tgz
+puppet-0.23.2.tgz
Index: puppet.spec
===================================================================
RCS file: /cvs/extras/rpms/puppet/EL-4/puppet.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- puppet.spec 21 Jun 2007 22:00:55 -0000 1.14
+++ puppet.spec 22 Aug 2007 17:35:59 -0000 1.15
@@ -7,7 +7,7 @@
Summary: A network tool for managing many disparate systems
Name: puppet
-Version: 0.23.0
+Version: 0.23.2
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,12 @@
rm -rf %{buildroot}
%changelog
+* Wed Aug 22 2007 David Lutterkort <dlutter at redhat.com> - 0.23.2-1
+- New version
+
+* 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/EL-4/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources 21 Jun 2007 22:00:55 -0000 1.13
+++ sources 22 Aug 2007 17:35:59 -0000 1.14
@@ -1 +1 @@
-c43342d7d24f1fe881ec97b59e7ea02d puppet-0.23.0.tgz
+496373ce2a7affbb639f85bcff38da0b puppet-0.23.2.tgz
More information about the fedora-extras-commits
mailing list