[xen] fix further man page issues to allow building on F19 and F20

[myoung]

commit 23f894b871a479bc6701050502860e8fac287f68
Author: Michael Young <m.a.young at durham.ac.uk>
Date:   Fri Apr 26 22:20:11 2013 +0100

    fix further man page issues to allow building on F19 and F20

 man.formatting.patch |   54 ++++++++++++++++++++++++++++++++++++++++++++++++++
 xen.spec             |    5 +++-
 2 files changed, 58 insertions(+), 1 deletions(-)
---
diff --git a/man.formatting.patch b/man.formatting.patch
index ba34fd0..fc49921 100644
--- a/man.formatting.patch
+++ b/man.formatting.patch
@@ -44,3 +44,57 @@
  =head3 Support for Paravirtualisation of HVM Guests
  
  The following options allow Paravirtualised features (such as devices)
+--- xen-4.2.2/tools/qemu-xen-traditional/qemu-doc.texi.orig	2013-01-17 16:00:26.000000000 +0000
++++ xen-4.2.2/tools/qemu-xen-traditional/qemu-doc.texi	2013-04-25 23:40:44.001454780 +0100
+@@ -1,6 +1,8 @@
+ \input texinfo @c -*- texinfo -*-
+ @c %**start of header
+ @setfilename qemu-doc.info
++ at documentlanguage en
++ at documentencoding utf-8
+ @settitle QEMU Emulator User Documentation
+ @exampleindent 0
+ @paragraphindent 0
+--- xen-4.2.2/tools/qemu-xen-traditional/texi2pod.pl.orig	2013-01-17 16:00:26.000000000 +0000
++++ xen-4.2.2/tools/qemu-xen-traditional/texi2pod.pl	2013-04-15 21:25:18.000000000 +0100
+@@ -37,6 +36,7 @@
+ $inf = "";
+ $ibase = "";
+ @ipath = ();
++$encoding = undef;
+ 
+ while ($_ = shift) {
+     if (/^-D(.*)$/) {
+@@ -98,6 +98,12 @@
+     /^\@setfilename\s+([^.]+)/ and $fn = $1, next;
+     /^\@settitle\s+([^.]+)/ and $tl = postprocess($1), next;
+ 
++    # Look for document encoding
++    /^\@documentencoding\s+([^.]+)/ and do {
++        $encoding = $1 unless defined $encoding;
++        next;
++    };
++
+     # Identify a man title but keep only the one we are interested in.
+     /^\@c\s+man\s+title\s+([A-Za-z0-9-]+)\s+(.+)/ and do {
+ 	if (exists $defs{$1}) {
+@@ -337,6 +343,8 @@
+ 
+ die "No filename or title\n" unless defined $fn && defined $tl;
+ 
++print "=encoding $encoding\n\n" if defined $encoding;
++
+ $sects{NAME} = "$fn \- $tl\n";
+ $sects{FOOTNOTES} .= "=back\n" if exists $sects{FOOTNOTES};
+ 
+--- xen-4.2.2/docs/man/xl.pod.1.orig	2013-04-23 17:42:55.000000000 +0100
++++ xen-4.2.2/docs/man/xl.pod.1	2013-04-26 20:51:16.639009661 +0100
+@@ -851,8 +851,6 @@
+ 
+ =item B<-p [pool] -d>...       : Illegal
+ 
+-=item
+-
+ =back
+ 
+ =item B<sched-credit2> [I<OPTIONS>]
diff --git a/xen.spec b/xen.spec
index 6f3e8f0..3f6d63d 100644
--- a/xen.spec
+++ b/xen.spec
@@ -27,7 +27,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 4.2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group:   Development/Libraries
 License: GPLv2+ and LGPLv2+ and BSD
 URL:     http://xen.org/
@@ -735,6 +735,9 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Fri Apr 26 2013 Michael Young <m.a.young at durham.ac.uk> - 4.2.2-2
+- fix further man page issues to allow building on F19 and F20
+
 * Thu Apr 25 2013 Michael Young <m.a.young at durham.ac.uk> - 4.2.2-1
 - update to xen-4.2.2
   includes fixes for