+1 I believe this captures the consensus that Jacob and Ben reached, and it looks correct to me.
On Wed, Sep 29, 2010 at 3:15 PM, Jacob Helwig <[email protected]> wrote: > > Signed-off-by: Ben Kevan <[email protected]> > Signed-off-by: Jacob Helwig <[email protected]> > --- > > Given the discussion in this thread, here's a revised patch, that I > think meets (what I think are) our conclusions. > > Also available at: > git://github.com/jhelwig/puppet.git ticket/2.6.x/4772 > > conf/suse/puppet.spec | 23 +++++++++++++---------- > conf/suse/ruby-env.patch | 17 ----------------- > 2 files changed, 13 insertions(+), 27 deletions(-) > delete mode 100644 conf/suse/ruby-env.patch > > diff --git a/conf/suse/puppet.spec b/conf/suse/puppet.spec > index bd4b358..777f6a4 100644 > --- a/conf/suse/puppet.spec > +++ b/conf/suse/puppet.spec > @@ -4,23 +4,20 @@ > > Summary: A network tool for managing many disparate systems > Name: puppet > -Version: 2.6.0 > +Version: 2.6.1 > Release: 1%{?dist} > License: GPL > Group: Productivity/Networking/System > > URL: http://puppetlabs.com/projects/puppet/ > Source0: http://puppetlabs.com/downloads/puppet/%{name}-%{version}.tar.gz > -Source1: client.init > -Source2: server.init > -Patch0: ruby-env.patch > > PreReq: %{insserv_prereq} %{fillup_prereq} > Requires: ruby >= 1.8.2 > Requires: facter >= 1.5 > Requires: cron > BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) > -BuildRequires: ruby >= 1.8.7 > +BuildRequires: ruby >= 1.8.2 > > %description > Puppet lets you centrally manage every important aspect of your system > using a > @@ -39,11 +36,10 @@ The server can also function as a certificate authority > and file server. > > %prep > %setup -q > -%patch0 -p0 > > %build > -for f in bin/* ; do > - sed -i -e '1c#!/usr/bin/ruby' $f > +for f in bin/* sbin/*; do > + sed -i -e '1s,^#!.*ruby$,#!/usr/bin/ruby,' $f > done > > %install > @@ -63,16 +59,16 @@ done > find %{buildroot}%{ruby_sitelibdir} -type f -perm +ugo+x -exec chmod a-x > '{}' \; > %{__cp} -a %{pbuild}/conf/redhat/client.sysconfig > %{buildroot}%{_confdir}/client.sysconfig > %{__install} -Dp -m0644 %{buildroot}%{_confdir}/client.sysconfig > %{buildroot}/var/adm/fillup-templates/sysconfig.puppet > -%{__install} -Dp -m0755 %SOURCE1 %{buildroot}%{_initrddir}/puppet > %{__cp} -a %{pbuild}/conf/redhat/server.sysconfig > %{buildroot}%{_confdir}/server.sysconfig > %{__install} -Dp -m0644 %{buildroot}%{_confdir}/server.sysconfig > %{buildroot}/var/adm/fillup-templates/sysconfig.puppetmaster > -%{__install} -Dp -m0755 %SOURCE2 %{buildroot}%{_initrddir}/puppetmaster > %{__cp} -a %{pbuild}/conf/redhat/fileserver.conf > %{buildroot}%{_confdir}/fileserver.conf > %{__install} -Dp -m0644 %{buildroot}%{_confdir}/fileserver.conf > %{buildroot}%{_sysconfdir}/puppet/fileserver.conf > %{__cp} -a %{pbuild}/conf/redhat/puppet.conf > %{buildroot}%{_confdir}/puppet.conf > %{__install} -Dp -m0644 %{buildroot}%{_confdir}/puppet.conf > %{buildroot}%{_sysconfdir}/puppet/puppet.conf > %{__cp} -a %{pbuild}/conf/redhat/logrotate > %{buildroot}%{_confdir}/logrotate > %{__install} -Dp -m0644 %{buildroot}%{_confdir}/logrotate > %{buildroot}%{_sysconfdir}/logrotate.d/puppet > +%{__install} -Dp -m0755 %{confdir}/client.init > %{buildroot}%{_initrddir}/puppet > +%{__install} -Dp -m0755 %{confdir}/server.init > %{buildroot}%{_initrddir}/puppetmaster > %{__ln_s} %{_initrddir}/puppet %{buildroot}%{_sbindir}/rcpuppet > %{__ln_s} %{_initrddir}/puppetmaster > %{buildroot}%{_sbindir}/rcpuppetmaster > > @@ -140,6 +136,13 @@ find %{buildroot}%{ruby_sitelibdir} -type f -perm > +ugo+x -exec chmod a-x '{}' \; > %{__rm} -rf %{buildroot} > > %changelog > +* Tue Sep 14 2010 Ben Kevan <[email protected]> - 2.6.1 > +- New version to 2.6.1 > +- Add client.init and server.init from source since it's now included in > the packages > +- Change BuildRequires Ruby version to match Requires Ruby version > +- Removed ruby-env patch, replaced with sed in prep > +- Update urls to puppetlabs.com > + > * Wed Jul 21 2010 Ben Kevan <[email protected]> - 2.6.0 > - New version and ruby version bump > - Add puppetdoc to %_bindir (unknown why original suse package, excluded > or forgot to add) > diff --git a/conf/suse/ruby-env.patch b/conf/suse/ruby-env.patch > deleted file mode 100644 > index 0a7a8a7..0000000 > --- a/conf/suse/ruby-env.patch > +++ /dev/null > @@ -1,17 +0,0 @@ > ---- sbin/puppetd 2010-07-18 14:17:38.000000000 -0700 > -+++ sbin/puppetd 2010-07-21 17:31:57.057138615 -0700 > -@@ -1,4 +1,4 @@ > --#!/usr/bin/env ruby > -+#!/usr/bin/ruby > - > - require 'puppet/application/agent' > - Puppet::Application[:agent].run > - > ---- sbin/puppetmasterd 2010-07-18 14:17:38.000000000 -0700 > -+++ sbin/puppetmasterd 2010-07-21 17:32:10.178513969 -0700 > -@@ -1,4 +1,4 @@ > --#!/usr/bin/env ruby > -+#!/usr/bin/ruby > - > - require 'puppet/application/master' > - Puppet::Application[:master].run > -- > 1.7.3 > > -- > You received this message because you are subscribed to the Google Groups > "Puppet Developers" group. > To post to this group, send email to [email protected]. > To unsubscribe from this group, send email to > [email protected]<puppet-dev%[email protected]> > . > For more options, visit this group at > http://groups.google.com/group/puppet-dev?hl=en. > > -- You received this message because you are subscribed to the Google Groups "Puppet Developers" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.
