From 09cb75ba2eda835413837b9ee872313a3326da78 Mon Sep 17 00:00:00 2001
From: Michael Young <m.a.young@durham.ac.uk>
Date: May 14 2013 21:39:48 +0000
Subject: xen-devel should require libuuid-devel (#962833),

pygrub menu items can include too much text (#958524)

---

diff --git a/xen.pygrubtitlefix.patch b/xen.pygrubtitlefix.patch
new file mode 100644
index 0000000..e1c3353
--- /dev/null
+++ b/xen.pygrubtitlefix.patch
@@ -0,0 +1,11 @@
+--- xen-4.2.2/tools/pygrub/src/GrubConf.py.orig	2013-04-23 17:42:55.000000000 +0100
++++ xen-4.2.2/tools/pygrub/src/GrubConf.py	2013-05-14 21:59:55.660558780 +0100
+@@ -390,7 +390,7 @@
+                 continue
+ 
+             # new image
+-            title_match = re.match('^menuentry ["\'](.*)["\'] (.*){', l)
++            title_match = re.match('^menuentry ["\']([^"\']*)["\'] (.*){', l)
+             if title_match:
+                 if img is not None:
+                     raise RuntimeError, "syntax error: cannot nest menuentry (%d %s)" % (len(img),img)
diff --git a/xen.spec b/xen.spec
index 6a03dd0..713bf85 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: 3%{?dist}
+Release: 4%{?dist}
 Group:   Development/Libraries
 License: GPLv2+ and LGPLv2+ and BSD
 URL:     http://xen.org/
@@ -86,6 +86,7 @@ Patch69: xsa45-4.2-05-set-info-guest-preemptible.patch
 Patch70: xsa45-4.2-06-unpin-preemptible.patch
 Patch71: xsa45-4.2-07-mm-error-paths-preemptible.patch
 Patch72: xsa49-4.2.patch
+Patch73: xen.pygrubtitlefix.patch
 
 Patch100: xen-configure-xend.patch
 
@@ -198,6 +199,7 @@ This package contains the Xen documentation.
 Summary: Development libraries for Xen tools
 Group: Development/Libraries
 Requires: xen-libs = %{version}-%{release}
+Requires: libuuid-devel
 
 %description devel
 This package contains what's needed to develop applications
@@ -262,6 +264,7 @@ manage Xen virtual machines.
 %patch70 -p1
 %patch71 -p1
 %patch72 -p1
+%patch73 -p1
 
 %patch100 -p1
 
@@ -751,6 +754,10 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Tue May 14 2013 Michael Young <m.a.young@durham.ac.uk> - 4.2.2-4
+- xen-devel should require libuuid-devel (#962833)
+- pygrub menu items can include too much text (#958524)
+
 * Thu May 02 2013 Michael Young <m.a.young@durham.ac.uk> - 4.2.2-3
 - PV guests can use non-preemptible long latency operations to
   mount a denial of service attack on the whole system