rpms/puppet/devel .cvsignore, 1.22, 1.23 puppet.spec, 1.24, 1.25 sources, 1.23, 1.24
David Lutterkort (lutter)
fedora-extras-commits at redhat.com
Mon Jul 28 17:30:30 UTC 2008
Author: lutter
Update of /cvs/pkgs/rpms/puppet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3639/devel
Modified Files:
.cvsignore puppet.spec sources
Log Message:
New version
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/puppet/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore 25 Mar 2008 22:05:48 -0000 1.22
+++ .cvsignore 28 Jul 2008 17:29:59 -0000 1.23
@@ -1,2 +1 @@
-puppet-0.24.4.tgz
-manpages.tar.gz
+puppet-0.24.5.tgz
Index: puppet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/puppet/devel/puppet.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- puppet.spec 25 Mar 2008 22:05:48 -0000 1.24
+++ puppet.spec 28 Jul 2008 17:30:00 -0000 1.25
@@ -7,15 +7,13 @@
Summary: A network tool for managing many disparate systems
Name: puppet
-Version: 0.24.4
+Version: 0.24.5
Release: 1%{?dist}
License: GPLv2+
Group: System Environment/Base
URL: http://puppet.reductivelabs.com/
Source: http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tgz
-# Man pages that were omitted from the release tarball
-Source1: manpages.tar.gz
Requires: ruby >= 1.8.1
%if %has_ruby_abi
@@ -29,9 +27,9 @@
BuildRequires: ruby >= 1.8.1
%description
-Puppet lets you centrally manage every important aspect of your system using a
-cross-platform specification language that manages all the separate elements
-normally aggregated in different files, like users, cron jobs, and hosts,
+Puppet lets you centrally manage every important aspect of your system using a
+cross-platform specification language that manages all the separate elements
+normally aggregated in different files, like users, cron jobs, and hosts,
along with obviously discrete elements like packages, services, and files.
%package server
@@ -45,18 +43,16 @@
%prep
%setup -q
-%setup -a 1
-(cd man/man8 && rm pi.8 puppetdoc.8)
%build
-for f in bin/* ; do
+for f in bin/* ; do
sed -i -e '1c#!/usr/bin/ruby' $f
done
# Fix some rpmlint complaints
for f in mac_dscl.pp mac_dscl_revert.pp \
mac_netinfo.pp mac_pkgdmg.pp ; do
- sed -i -e'1d' examples/code/$f
- chmod a-x examples/code/$f
+ sed -i -e'1d' examples/$f
+ chmod a-x examples/$f
done
find examples/ -type f -empty | xargs rm
@@ -78,6 +74,7 @@
mv %{buildroot}%{_sbindir}/ralsh %{buildroot}%{_bindir}/ralsh
mv %{buildroot}%{_sbindir}/filebucket %{buildroot}%{_bindir}/filebucket
mv %{buildroot}%{_sbindir}/puppetrun %{buildroot}%{_bindir}/puppetrun
+mv %{buildroot}%{_sbindir}/puppetdoc %{buildroot}%{_bindir}/puppetdoc
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
@@ -100,6 +97,8 @@
%{_bindir}/puppet
%{_bindir}/ralsh
%{_bindir}/filebucket
+%{_bindir}/puppetdoc
+%exclude %{_mandir}/man8/pi.8.gz
%{_sbindir}/puppetd
%{ruby_sitelibdir}/*
%{_initrddir}/puppet
@@ -108,7 +107,6 @@
%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
# write to them
@@ -119,6 +117,7 @@
%doc %{_mandir}/man8/puppet.conf.8.gz
%doc %{_mandir}/man8/puppetd.8.gz
%doc %{_mandir}/man8/ralsh.8.gz
+%doc %{_mandir}/man8/puppetdoc.8.gz
%files server
%defattr(-, root, root, 0755)
@@ -171,6 +170,14 @@
rm -rf %{buildroot}
%changelog
+* Mon Jul 28 2008 David Lutterkort <dlutter at redhat.com> - 0.24.5-1
+- Add /usr/bin/puppetdoc
+
+* Thu Jul 24 2008 Brenton Leanhardt <bleanhar at redhat.com>
+- New version
+- man pages now ship with tarball
+- examples/code moved to root examples dir in upstream tarball
+
* Tue Mar 25 2008 David Lutterkort <dlutter at redhat.com> - 0.24.4-1
- Add man pages (from separate tarball, upstream will fix to
include in main tarball)
@@ -198,7 +205,7 @@
- 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
+- 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
@@ -259,7 +266,7 @@
* Mon Jun 19 2006 David Lutterkort <dlutter at redhat.com> - 0.18.0-1
- Patch config for LSB compliance (lsb-config.patch)
-- Changed config moves /var/puppet to /var/lib/puppet, /etc/puppet/ssl
+- Changed config moves /var/puppet to /var/lib/puppet, /etc/puppet/ssl
to /var/lib/puppet, /etc/puppet/clases.txt to /var/lib/puppet/classes.txt,
/etc/puppet/localconfig.yaml to /var/lib/puppet/localconfig.yaml
@@ -282,7 +289,7 @@
- Rebuilt for new version
* Wed Mar 22 2006 David Lutterkort <dlutter at redhat.com> - 0.15.1-1
-- Patch0: Run puppetmaster as root; running as puppet is not ready
+- Patch0: Run puppetmaster as root; running as puppet is not ready
for primetime
* Mon Mar 13 2006 David Lutterkort <dlutter at redhat.com> - 0.15.0-1
@@ -297,7 +304,7 @@
allocate the puppet uid/gid dynamically
* Sun Feb 19 2006 David Lutterkort <dlutter at redhat.com> - 0.13.0-4
-- Use fedora-usermgmt to create puppet user/group. Use uid/gid 24. Fixed
+- Use fedora-usermgmt to create puppet user/group. Use uid/gid 24. Fixed
problem with listing fileserver.conf and puppetmaster.conf twice
* Wed Feb 8 2006 David Lutterkort <dlutter at redhat.com> - 0.13.0-3
@@ -322,7 +329,7 @@
- Added basic fileserver.conf
* Wed Jan 11 2006 David Lutterkort <dlutter at redhat.com> - 0.10.1-1
-- Updated. Moved installation of library files to sitelibdir. Pulled
+- Updated. Moved installation of library files to sitelibdir. Pulled
initscripts into separate files. Folded tools rpm into server
* Thu Nov 24 2005 Duane Griffin <d.griffin at psenterprise.com>
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/puppet/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources 25 Mar 2008 22:05:48 -0000 1.23
+++ sources 28 Jul 2008 17:30:00 -0000 1.24
@@ -1,2 +1 @@
-9658624ed3745e8954772b3fbfdcc438 puppet-0.24.4.tgz
-f798fd9454f33860b4545513b4b199a6 manpages.tar.gz
+1160bb69966b9145d9f845f1f355dd44 puppet-0.24.5.tgz
More information about the scm-commits
mailing list