[xen] strip out an extra compile option for gcc-x86_64-linux-gnu on ix86

[myoung]

commit 4a92c571c010f50d700995173e3ab36dc6b2fef9
Author: Michael Young <m.a.young at durham.ac.uk>
Date:   Sat Jul 20 14:41:55 2013 +0100

    strip out an extra compile option for gcc-x86_64-linux-gnu on ix86

 xen.64.bit.hyp.on.ix86.patch |    2 +-
 xen.spec                     |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/xen.64.bit.hyp.on.ix86.patch b/xen.64.bit.hyp.on.ix86.patch
index 101130d..e94101c 100644
--- a/xen.64.bit.hyp.on.ix86.patch
+++ b/xen.64.bit.hyp.on.ix86.patch
@@ -5,7 +5,7 @@
  EFI_VENDOR=fedora
  LD_EFI ?= $(LD)
 +ifeq ($(XEN_TARGET_ARCH),x86_32)
-+CFLAGS := $(shell echo $(CFLAGS) | sed -e 's/-m[a-z0-9=]* //g')
++CFLAGS := $(shell echo $(CFLAGS) | sed -e 's/-m[a-z0-9=]* //g' -e 's/ -fstack-protector-strong//g')
 +endif
  
  .PHONY: default
diff --git a/xen.spec b/xen.spec
index 108dd0b..da6c9fa 100644
--- a/xen.spec
+++ b/xen.spec
@@ -46,7 +46,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 4.3.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group:   Development/Libraries
 License: GPLv2+ and LGPLv2+ and BSD
 URL:     http://xen.org/
@@ -789,7 +789,7 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
-* Sat Jul 20 2013 Michael Young <m.a.young at durham.ac.uk> - 4.3.0-2
+* Sat Jul 20 2013 Michael Young <m.a.young at durham.ac.uk> - 4.3.0-2 4.3.0-3
 - build a 64-bit hypervisor on ix86
 
 * Tue Jul 16 2013 Michael Young <m.a.young at durham.ac.uk> - 4.3.0-1