[xen] adjust gcc 4.8 fixes patch, remove BuildRequires for texlive-kpathsea-bin

[myoung]

commit 0b6946bab9baee557e3a3c2fdf2f50c53a559280
Author: Michael Young <m.a.young at durham.ac.uk>
Date:   Fri Feb 8 21:16:13 2013 +0000

    adjust gcc 4.8 fixes patch, remove BuildRequires for texlive-kpathsea-bin

 gcc48.build.patch |   28 +++++++++-------------------
 xen.spec          |    7 +++++--
 2 files changed, 14 insertions(+), 21 deletions(-)
---
diff --git a/gcc48.build.patch b/gcc48.build.patch
index d294283..a21f75f 100644
--- a/gcc48.build.patch
+++ b/gcc48.build.patch
@@ -1,14 +1,13 @@
---- xen-4.2.1/xen/common/compat/memory.c.orig	2012-12-17 15:01:54.000000000 +0000
-+++ xen-4.2.1/xen/common/compat/memory.c	2013-01-28 21:24:36.971241229 +0000
-@@ -258,7 +258,7 @@
+--- xen-4.2.1/Config.mk.orig	2013-02-08 20:07:25.006716975 +0000
++++ xen-4.2.1/Config.mk	2013-02-08 20:13:52.184876582 +0000
+@@ -166,6 +166,7 @@
+ $(call cc-option-add,HOSTCFLAGS,HOSTCC,-Wdeclaration-after-statement)
+ $(call cc-option-add,CFLAGS,CC,-Wdeclaration-after-statement)
+ $(call cc-option-add,CFLAGS,CC,-Wno-unused-but-set-variable)
++$(call cc-option-add,CFLAGS,CC,-Wno-unused-local-typedefs)
  
-         case XENMEM_exchange:
-         {
--            DEFINE_XEN_GUEST_HANDLE(compat_memory_exchange_t);
-+            DEFINE_XEN_GUEST_HANDLE(compat_memory_exchange_t) __attribute__((unused));
-             int order_delta;
- 
-             BUG_ON(split >= 0 && rc);
+ LDFLAGS += $(foreach i, $(EXTRA_LIB), -L$(i)) 
+ CFLAGS += $(foreach i, $(EXTRA_INCLUDES), -I$(i))
 --- xen-4.2.1/tools/libxc/xc_dom_boot.c.orig	2012-12-17 15:00:48.000000000 +0000
 +++ xen-4.2.1/tools/libxc/xc_dom_boot.c	2013-01-28 22:21:13.215782329 +0000
 @@ -266,7 +266,7 @@
@@ -75,12 +74,3 @@
  
         rth->fd = socket(AF_NETLINK, SOCK_RAW, protocol);
         if (rth->fd < 0) {
-@@ -264,7 +264,7 @@
-                return -1;
-        }
- 
--       memset(buf,0,sizeof(buf));
-+       memset(buf,0,sizeof(*buf));
- 
-        iov.iov_base = buf;
- 
diff --git a/xen.spec b/xen.spec
index 2a2771d..ed9d272 100644
--- a/xen.spec
+++ b/xen.spec
@@ -27,7 +27,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 4.2.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 Group:   Development/Libraries
 License: GPLv2+ and LGPLv2+ and BSD
 URL:     http://xen.org/
@@ -92,7 +92,6 @@ BuildRequires: transfig libidn-devel zlib-devel texi2html SDL-devel curl-devel
 BuildRequires: libX11-devel python-devel ghostscript texlive-latex
 %if "%dist" >= ".fc18"
 BuildRequires: texlive-times texlive-courier texlive-helvetic texlive-ntgclass
-BuildRequires: texlive-kpathsea-bin
 %endif
 BuildRequires: ncurses-devel gtk2-devel libaio-devel
 # for the docs
@@ -748,6 +747,10 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Fri Feb 08 2013 Michael Young <m.a.young at durham.ac.uk> - 4.2.1-7
+- BuildRequires for texlive-kpathsea-bin wasn't needed
+- correct gcc 4.8 fixes and follow suggestions upstream
+
 * Tue Feb 05 2013 Michael Young <m.a.young at durham.ac.uk> - 4.2.1-6
 - guest using oxenstored can crash host or exhaust memory [XSA-38,
   CVE-2013-0215] (#907888)