man pages: update authors and copyright notice for libvirtd and virsh

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.

diff --git a/daemon/libvirtd.pod.in b/daemon/libvirtd.pod.in
index 9f578c48a196124095593b9885e8f0758e501004..04a4cb4a08da81f600e3d80a7f74f112affaab0f 100644 (file)
--- 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@us.ibm.com>
- Daniel Berrange      <berrange@redhat.com>
- Eric Blake           <eblake@redhat.com>
- Matthias Bolte       <matthias.bolte@googlemail.com>
- Jiri Denemark        <jdenemar@redhat.com>
- Amy Griffis          <amy.griffis@hp.com>
- Guido Günther        <agx@sigxcpu.org>
- Richard W.M. Jones   <rjones@redhat.com>
- Dan Kenigsberg       <danken@redhat.com>
- Chris Lalancette     <clalance@redhat.com>
- Dave Leskovec        <dlesko@linux.vnet.ibm.com>
- John Levon           <john.levon@sun.com>
- Wolfgang Mauerer     <wolfgang.mauerer@siemens.com>
- Mark McLoughlin      <markmc@redhat.com>
- Jim Meyering         <meyering@redhat.com>
- Cole Robinson        <crobinso@redhat.com>
- Atsushi SAKAI        <sakaia@jp.fujitsu.com>
- Laine Stump          <laine@redhat.com>
- Miloslav Trmač       <mitr@redhat.com>
- Daniel Veillard      <veillard@redhat.com> or <daniel@veillard.com>
+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 in the
+libvirt AUTHORS file.
 
 =head1 LICENSE
 

diff --git a/libvirt.spec.in b/libvirt.spec.in
index ce58f2a579b739f31f8ac52a08804116a08fe35b..6d3c3c2b4c1416834f8129f9dc9d4901e25b0092 100644 (file)
--- 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 e03dbe87f4ba4c10fc38131120f1c2409ee799a5..e0471b1b1e3ea4c05140338ca8fa415a984a9819 100644 (file)
--- 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 in the
+libvirt AUTHORS file.
 
 =head1 LICENSE