Build fix, still not finished/tested

diff --git a/odd-glib2-fix.patch b/odd-glib2-fix.patch
new file mode 100644 (file)
index 0000000..cdc1959
--- /dev/null
+++ b/odd-glib2-fix.patch
@@ -0,0 +1,19 @@
+--- xen-4.4.0/tools/qemu-xen/ui/vnc-enc-tight.c.orig   2014-03-14 11:53:18.512514455 +0000
++++ xen-4.4.0/tools/qemu-xen/ui/vnc-enc-tight.c        2014-03-14 15:03:52.245475390 +0000
+@@ -31,7 +31,6 @@
+ /* This needs to be before jpeglib.h line because of conflict with
+    INT32 definitions between jmorecfg.h (included by jpeglib.h) and
+    Win32 basetsd.h (included by windows.h). */
+-#include "qemu-common.h"
+ 
+ #ifdef CONFIG_VNC_PNG
+ /* The following define is needed by pngconf.h. Otherwise it won't compile,
+@@ -44,6 +43,8 @@
+ #include <jpeglib.h>
+ #endif
+ 
++#include "qemu-common.h"
++
+ #include "qemu/bswap.h"
+ #include "qapi/qmp/qint.h"
+ #include "vnc.h"

diff --git a/xen.spec b/xen.spec
index a1ff2af7feb44dc32b36b4ca76dee411b39ac6e2..983a398bcf4223cda979ff31e8b700cb25b515eb 100644 (file)
--- a/xen.spec
+++ b/xen.spec
@@ -113,6 +113,7 @@ Patch11:    %{name}-ulong.patch
 Patch12:       %{name}-doc.patch
 Patch13:       %{name}-paths.patch
 Patch14:       %{name}-no_fetcher.patch
+Patch15:    odd-glib2-fix.patch
 URL:           http://www.xen.org/products/xenhyp.html
 %{?with_opengl:BuildRequires:  OpenGL-devel}
 %{?with_sdl:BuildRequires:     SDL-devel >= 1.2.1}
@@ -208,7 +209,7 @@ ExclusiveArch:      %{ix86} %{x8664} arm
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # some PPC/SPARC boot images in ELF format
-%define         _noautostrip    .*%{_datadir}/\\(xen\\|qemu-xen\\)/qemu/\\(openbios-.*\\|palcode-clipper\\)
+%define         _noautostrip    .*%{_datadir}/\\(xen\\|qemu-xen\\)/qemu/\\(openbios-.*\\|palcode-clipper\\|s390-ccw.img\\)
 
 %description
 This package contains the Xen hypervisor and Xen tools, needed to run
@@ -409,6 +410,7 @@ Nadzorca Xen w postaci, która może być uruchomiona wprost z firmware
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 
 # stubdom sources
 ln -s %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} stubdom
@@ -518,7 +520,7 @@ sed -e's;@libdir@;%{_libdir};g' -e's;@target_cpu@;%{_target_cpu};g' \
                        %{SOURCE58} > $RPM_BUILD_ROOT/etc/efi-boot/update.d/xen.conf
 %endif
 
-mv $RPM_BUILD_ROOT/etc/xen/{x{m,l}example*,examples}
+mv $RPM_BUILD_ROOT/etc/xen/{xlexample*,examples}
 
 install %{SOURCE59} $RPM_BUILD_ROOT%{_sysconfdir}/xen/scripts/vif-openvswitch
 
@@ -539,7 +541,7 @@ cp -al tools/qemu-xen/docs _doc/qemu-xen
 
 # remove unneeded files
 %if %{with hypervisor}
-%{__rm} $RPM_BUILD_ROOT/boot/xen-4.3.gz
+%{__rm} $RPM_BUILD_ROOT/boot/xen-4.4.gz
 %{__rm} $RPM_BUILD_ROOT/boot/xen-4.gz
 %endif
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/xen