On 07/16/2010 10:40 AM, Justin Clift wrote:
This patch removes the individual author names from the libvirtd and virsh
man pages, instead referring to the main AUTHORS file distributed with
libvirt. This approach is needed, as we can't guarantee unicode support
across all versions of pod2man used with libvirt.
Additionally, this patch includes the libvirtd man page in the spec file
used with "make rpm". Without this patch "make rpm" is broken.
---
This 2nd release fixes a trailing whitespace problem with the 1st version. :/
daemon/libvirtd.pod.in | 26 +++-----------------------
libvirt.spec.in | 2 ++
tools/virsh.pod | 6 +++---
3 files changed, 8 insertions(+), 26 deletions(-)
diff --git a/daemon/libvirtd.pod.in b/daemon/libvirtd.pod.in
index 9f578c4..eb24dc0 100644
--- a/daemon/libvirtd.pod.in
+++ b/daemon/libvirtd.pod.in
@@ -1,5 +1,3 @@
-=encoding utf-8
-
=head1 NAME
libvirtd - libvirtd management daemon
@@ -148,30 +146,12 @@ L<http://libvirt.org/bugs.html>
=head1 AUTHORS
- Stefan Berger<stefanb@xxxxxxxxxx>
- Daniel Berrange<berrange@xxxxxxxxxx>
- Eric Blake<eblake@xxxxxxxxxx>
- Matthias Bolte<matthias.bolte@xxxxxxxxxxxxxx>
- Jiri Denemark<jdenemar@xxxxxxxxxx>
- Amy Griffis<amy.griffis@xxxxxx>
- Guido Günther<agx@xxxxxxxxxxx>
- Richard W.M. Jones<rjones@xxxxxxxxxx>
- Dan Kenigsberg<danken@xxxxxxxxxx>
- Chris Lalancette<clalance@xxxxxxxxxx>
- Dave Leskovec<dlesko@xxxxxxxxxxxxxxxxxx>
- John Levon<john.levon@xxxxxxx>
- Wolfgang Mauerer<wolfgang.mauerer@xxxxxxxxxxx>
- Mark McLoughlin<markmc@xxxxxxxxxx>
- Jim Meyering<meyering@xxxxxxxxxx>
- Cole Robinson<crobinso@xxxxxxxxxx>
- Atsushi SAKAI<sakaia@xxxxxxxxxxxxxx>
- Laine Stump<laine@xxxxxxxxxx>
- Miloslav Trmač<mitr@xxxxxxxxxx>
- Daniel Veillard<veillard@xxxxxxxxxx> or<daniel@xxxxxxxxxxxx>
+Please refer to the AUTHORS file distributed with libvirt.
=head1 COPYRIGHT
-Copyright (C) 2006-2010 Red Hat, Inc. and the above mentioned AUTHORS.
+Copyright (C) 2006-2010 Red Hat, Inc., and the authors listed the libvirt
+AUTHORS file.
listed *in* the libvirt AUTHORS file.
=head1 LICENSE
diff --git a/libvirt.spec.in b/libvirt.spec.in
index ce58f2a..6d3c3c2 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -828,6 +828,8 @@ fi
%attr(0755, root, root) %{_libexecdir}/libvirt_parthelper
%attr(0755, root, root) %{_sbindir}/libvirtd
+%{_mandir}/man8/libvirtd.8*
+
%doc docs/*.xml
%endif
diff --git a/tools/virsh.pod b/tools/virsh.pod
index e03dbe8..5740068 100644
--- a/tools/virsh.pod
+++ b/tools/virsh.pod
@@ -1093,8 +1093,7 @@ Alternatively report bugs to your software distributor / vendor.
=head1 AUTHORS
- Andrew Puch<apuch @ redhat.com>
- Daniel Veillard<veillard @ redhat.com>
+ Please refer to the AUTHORS file distributed with libvirt.
Based on the xm man page by:
Sean Dague<sean at dague dot net>
@@ -1102,7 +1101,8 @@ Alternatively report bugs to your software distributor / vendor.
=head1 COPYRIGHT
-Copyright (C) 2005, 2007-2010 Red Hat, Inc.
+Copyright (C) 2005, 2007-2010 Red Hat, Inc., and the authors listed the libvirt
+AUTHORS file.
=head1 LICENSE
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list