rpms/puppet/F-7 .cvsignore, 1.21, 1.22 puppet.spec, 1.23, 1.24 sources, 1.22, 1.23
David Lutterkort (lutter)
fedora-extras-commits at redhat.com
Tue Mar 25 22:06:30 UTC 2008
- Previous message (by thread): rpms/puppet/F-8 .cvsignore, 1.21, 1.22 puppet.spec, 1.23, 1.24 sources, 1.22, 1.23
- Next message (by thread): rpms/puppet/devel .cvsignore, 1.21, 1.22 puppet.spec, 1.23, 1.24 sources, 1.22, 1.23
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: lutter
Update of /cvs/pkgs/rpms/puppet/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6416/F-7
Modified Files:
.cvsignore puppet.spec sources
Log Message:
New version; add man pages
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/puppet/F-7/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore 24 Mar 2008 18:26:50 -0000 1.21
+++ .cvsignore 25 Mar 2008 22:05:17 -0000 1.22
@@ -1 +1,2 @@
-puppet-0.24.3.tgz
+puppet-0.24.4.tgz
+manpages.tar.gz
Index: puppet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/puppet/F-7/puppet.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- puppet.spec 24 Mar 2008 18:26:50 -0000 1.23
+++ puppet.spec 25 Mar 2008 22:05:17 -0000 1.24
@@ -7,13 +7,15 @@
Summary: A network tool for managing many disparate systems
Name: puppet
-Version: 0.24.3
+Version: 0.24.4
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
@@ -43,6 +45,8 @@
%prep
%setup -q
+%setup -a 1
+(cd man/man8 && rm pi.8 puppetdoc.8)
%build
for f in bin/* ; do
@@ -65,6 +69,7 @@
install -d -m0755 %{buildroot}%{ruby_sitelibdir}
install -d -m0755 %{buildroot}%{_sysconfdir}/puppet/manifests
install -d -m0755 %{buildroot}%{_docdir}/%{name}-%{version}
+install -d -m0755 %{buildroot}%{_mandir}/man8
install -d -m0755 %{buildroot}%{_localstatedir}/lib/puppet
install -d -m0755 %{buildroot}%{_localstatedir}/run/puppet
install -d -m0755 %{buildroot}%{_localstatedir}/log/puppet
@@ -83,6 +88,7 @@
install -Dp -m0644 %{confdir}/fileserver.conf %{buildroot}%{_sysconfdir}/puppet/fileserver.conf
install -Dp -m0644 %{confdir}/puppet.conf %{buildroot}%{_sysconfdir}/puppet/puppet.conf
install -Dp -m0644 %{confdir}/logrotate %{buildroot}%{_sysconfdir}/logrotate.d/puppet
+install -Dp -m0644 man/man8/* %{buildroot}%{_mandir}/man8
# 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
@@ -109,6 +115,10 @@
%attr(-, puppet, puppet) %{_localstatedir}/run/puppet
%attr(-, puppet, puppet) %{_localstatedir}/log/puppet
%attr(-, puppet, puppet) %{_localstatedir}/lib/puppet
+%doc %{_mandir}/man8/puppet.8.gz
+%doc %{_mandir}/man8/puppet.conf.8.gz
+%doc %{_mandir}/man8/puppetd.8.gz
+%doc %{_mandir}/man8/ralsh.8.gz
%files server
%defattr(-, root, root, 0755)
@@ -121,6 +131,10 @@
%ghost %config(noreplace,missingok) %{_sysconfdir}/puppet/puppetca.conf
%ghost %config(noreplace,missingok) %{_sysconfdir}/puppet/puppetmasterd.conf
%{_sbindir}/puppetca
+%doc %{_mandir}/man8/filebucket.8.gz
+%doc %{_mandir}/man8/puppetca.8.gz
+%doc %{_mandir}/man8/puppetmasterd.8.gz
+%doc %{_mandir}/man8/puppetrun.8.gz
%pre
/usr/sbin/groupadd -r puppet 2>/dev/null || :
@@ -157,6 +171,10 @@
rm -rf %{buildroot}
%changelog
+* 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)
+
* Mon Mar 24 2008 David Lutterkort <dlutter at redhat.com> - 0.24.3-1
- New version
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/puppet/F-7/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources 24 Mar 2008 18:26:50 -0000 1.22
+++ sources 25 Mar 2008 22:05:17 -0000 1.23
@@ -1 +1,2 @@
-908eb07a4c2d79e4adcc619ce2a7ec24 puppet-0.24.3.tgz
+9658624ed3745e8954772b3fbfdcc438 puppet-0.24.4.tgz
+f798fd9454f33860b4545513b4b199a6 manpages.tar.gz
- Previous message (by thread): rpms/puppet/F-8 .cvsignore, 1.21, 1.22 puppet.spec, 1.23, 1.24 sources, 1.22, 1.23
- Next message (by thread): rpms/puppet/devel .cvsignore, 1.21, 1.22 puppet.spec, 1.23, 1.24 sources, 1.22, 1.23
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list