rpms/puppet/FC-5 .cvsignore, 1.14, 1.15 puppet.spec, 1.15, 1.16 sources, 1.14, 1.15

David Lutterkort (lutter) fedora-extras-commits at redhat.com
Thu Jun 21 21:59:32 UTC 2007


Author: lutter

Update of /cvs/extras/rpms/puppet/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27459

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


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/puppet/FC-5/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	3 May 2007 19:15:38 -0000	1.14
+++ .cvsignore	21 Jun 2007 21:58:57 -0000	1.15
@@ -1 +1 @@
-puppet-0.22.4.tgz
+puppet-0.23.0.tgz


Index: puppet.spec
===================================================================
RCS file: /cvs/extras/rpms/puppet/FC-5/puppet.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- puppet.spec	3 May 2007 19:15:38 -0000	1.15
+++ puppet.spec	21 Jun 2007 21:58:57 -0000	1.16
@@ -7,12 +7,12 @@
 
 Summary: A network tool for managing many disparate systems
 Name: puppet
-Version: 0.22.4
+Version: 0.23.0
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
 
-URL: http://reductivelabs.com/projects/puppet/
+URL: http://puppet.reductivelabs.com/
 Source: http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tgz
 
 Requires: ruby >= 1.8.1
@@ -43,6 +43,8 @@
 
 %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 
@@ -50,41 +52,47 @@
 done
 
 %install
-%{__rm} -rf %{buildroot}
-%{__install} -d -m0755 %{buildroot}%{_sbindir}
-%{__install} -d -m0755 %{buildroot}%{_bindir}
-%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}
-%{__install} -d -m0755 %{buildroot}%{_sysconfdir}/puppet/manifests
-%{__install} -d -m0755 %{buildroot}%{_docdir}/%{name}-%{version}
-%{__install} -d -m0755 %{buildroot}%{_localstatedir}/lib/puppet
-%{__install} -d -m0755 %{buildroot}%{_localstatedir}/run/puppet
-%{__install} -d -m0755 %{buildroot}%{_localstatedir}/log/puppet
-%{__install} -Dp -m0755 %{pbuild}/bin/* %{buildroot}%{_sbindir}
-%{__mv} %{buildroot}%{_sbindir}/puppet %{buildroot}%{_bindir}/puppet
-%{__mv} %{buildroot}%{_sbindir}/puppetrun %{buildroot}%{_bindir}/puppetrun
-%{__install} -Dp -m0644 %{pbuild}/lib/puppet.rb %{buildroot}%{ruby_sitelibdir}/puppet.rb
-%{__cp} -a %{pbuild}/lib/puppet %{buildroot}%{ruby_sitelibdir}
-find %{buildroot}%{ruby_sitelibdir} -type f -perm +ugo+x -print0 | xargs -0 -r %{__chmod} a-x
-%{__install} -Dp -m0644 %{confdir}/client.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/puppet
-%{__install} -Dp -m0755 %{confdir}/client.init %{buildroot}%{_initrddir}/puppet
-%{__install} -Dp -m0644 %{confdir}/server.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/puppetmaster
-%{__install} -Dp -m0755 %{confdir}/server.init %{buildroot}%{_initrddir}/puppetmaster
-%{__install} -Dp -m0644 %{confdir}/fileserver.conf %{buildroot}%{_sysconfdir}/puppet/fileserver.conf
-%{__install} -Dp -m0644 %{confdir}/puppetd.conf %{buildroot}%{_sysconfdir}/puppet/puppetd.conf
-%{__ln_s} puppetd.conf %{buildroot}%{_sysconfdir}/puppet/puppetmasterd.conf
-%{__ln_s} puppetd.conf %{buildroot}%{_sysconfdir}/puppet/puppetca.conf
-%{__install} -Dp -m0644 %{confdir}/logrotate %{buildroot}%{_sysconfdir}/logrotate.d/puppet
+rm -rf %{buildroot}
+install -d -m0755 %{buildroot}%{_sbindir}
+install -d -m0755 %{buildroot}%{_bindir}
+install -d -m0755 %{buildroot}%{ruby_sitelibdir}
+install -d -m0755 %{buildroot}%{_sysconfdir}/puppet/manifests
+install -d -m0755 %{buildroot}%{_docdir}/%{name}-%{version}
+install -d -m0755 %{buildroot}%{_localstatedir}/lib/puppet
+install -d -m0755 %{buildroot}%{_localstatedir}/run/puppet
+install -d -m0755 %{buildroot}%{_localstatedir}/log/puppet
+install -Dp -m0755 %{pbuild}/bin/* %{buildroot}%{_sbindir}
+mv %{buildroot}%{_sbindir}/puppet %{buildroot}%{_bindir}/puppet
+mv %{buildroot}%{_sbindir}/ralsh %{buildroot}%{_bindir}/ralsh
+mv %{buildroot}%{_sbindir}/filebucket %{buildroot}%{_bindir}/filebucket
+mv %{buildroot}%{_sbindir}/puppetrun %{buildroot}%{_bindir}/puppetrun
+install -Dp -m0644 %{pbuild}/lib/puppet.rb %{buildroot}%{ruby_sitelibdir}/puppet.rb
+cp -a %{pbuild}/lib/puppet %{buildroot}%{ruby_sitelibdir}
+find %{buildroot}%{ruby_sitelibdir} -type f -perm +ugo+x -print0 | xargs -0 -r chmod a-x
+install -Dp -m0644 %{confdir}/client.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/puppet
+install -Dp -m0755 %{confdir}/client.init %{buildroot}%{_initrddir}/puppet
+install -Dp -m0644 %{confdir}/server.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/puppetmaster
+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
 
 %files
 %defattr(-, root, root, 0755)
 %{_bindir}/puppet
+%{_bindir}/ralsh
+%{_bindir}/filebucket
 %{_sbindir}/puppetd
 %{ruby_sitelibdir}/*
 %{_initrddir}/puppet
 %dir %{_sysconfdir}/puppet
 %config(noreplace) %{_sysconfdir}/sysconfig/puppet
-%config(noreplace) %{_sysconfdir}/puppet/puppetd.conf
-%doc CHANGELOG COPYING LICENSE README TODO examples
+%config(noreplace) %{_sysconfdir}/puppet/puppet.conf
+%ghost %config(noreplace,missingok) %{_sysconfdir}/puppet/puppetd.conf
+%doc CHANGELOG COPYING LICENSE README examples
 %exclude %{_sbindir}/puppetdoc
 %config(noreplace) %{_sysconfdir}/logrotate.d/puppet
 # These need to be owned by puppet so the server can
@@ -98,8 +106,11 @@
 %{_sbindir}/puppetmasterd
 %{_bindir}/puppetrun
 %{_initrddir}/puppetmaster
-%config(noreplace) %{_sysconfdir}/puppet/*
+%config(noreplace) %{_sysconfdir}/puppet/fileserver.conf
+%dir %{_sysconfdir}/puppet/manifests
 %config(noreplace) %{_sysconfdir}/sysconfig/puppetmaster
+%ghost %config(noreplace,missingok) %{_sysconfdir}/puppet/puppetca.conf
+%ghost %config(noreplace,missingok) %{_sysconfdir}/puppet/puppetmasterd.conf
 %{_sbindir}/puppetca
 
 %pre
@@ -134,9 +145,14 @@
 fi
 
 %clean
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
 
 %changelog
+* 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
+- Use plain shell commands in install instead of macros
+
 * Wed May  2 2007 David Lutterkort <dlutter at redhat.com> - 0.22.4-1
 - New version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/puppet/FC-5/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	3 May 2007 19:15:38 -0000	1.14
+++ sources	21 Jun 2007 21:58:57 -0000	1.15
@@ -1 +1 @@
-9bb853104f2616c7f2c8fa4e2f39b537  puppet-0.22.4.tgz
+c43342d7d24f1fe881ec97b59e7ea02d  puppet-0.23.0.tgz




More information about the fedora-extras-commits mailing list