From 924e5f2fb34487892790f13fa7e920220b5798322bb5b48cd68424c66ab0a55f Mon Sep 17 00:00:00 2001
From: Steffen Winterfeldt <snwint@suse.com>
Date: Wed, 1 Apr 2015 12:41:37 +0000
Subject: [PATCH] - added ExcludeArch i586 (bnc #924024) - add grub2 to
 buildrequires for s390x (bnc #893971) - handle xen & xen-kmp separately in
 spec file (bnc #906248)

- added ExcludeArch i586 (bnc #924024)
- add grub2 to buildrequires for s390x (bnc #893971)
- handle xen & xen-kmp separately in spec file (bnc #906248)

OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=796
---
 installation-images-SLES.changes     |  7 +++++++
 installation-images-SLES.spec        | 16 +++++++++++-----
 installation-images-openSUSE.changes |  7 +++++++
 installation-images-openSUSE.spec    | 16 +++++++++++-----
 4 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/installation-images-SLES.changes b/installation-images-SLES.changes
index ed73ba9..e635596 100644
--- a/installation-images-SLES.changes
+++ b/installation-images-SLES.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Apr  1 13:22:05 CEST 2015 - snwint@suse.de
+
+- added ExcludeArch i586 (bnc #924024)
+- add grub2 to buildrequires for s390x (bnc #893971)
+- handle xen & xen-kmp separately in spec file (bnc #906248)
+
 -------------------------------------------------------------------
 Tue Mar 24 17:57:52 CET 2015 - snwint@suse.com
 
diff --git a/installation-images-SLES.spec b/installation-images-SLES.spec
index 7e589f0..e5364f6 100644
--- a/installation-images-SLES.spec
+++ b/installation-images-SLES.spec
@@ -31,14 +31,19 @@
 %define with_shim 1
 %bcond_without sbl
 %bcond_without vnc
-%ifarch %ix86
-# FIXME: xen not working on i586
+%ifarch x86_64 %ix86
 %bcond_without xen
 %else
-%bcond_without xen  
+%bcond_with xen  
+%endif
+%ifarch x86_64
+%bcond_without xenkmp
+%else
+%bcond_with xenkmp  
 %endif
 
 %if %theme == SLES
+ExcludeArch: %ix86
 BuildRequires:  plymouth-theme-tribar
 BuildRequires:  sle12-desktop-migration
 BuildRequires:  sles-release
@@ -62,6 +67,7 @@ BuildRequires:  alsa-utils
 BuildRequires:  arabic-kacst-fonts
 BuildRequires:  audit-libs
 BuildRequires:  bc
+BuildRequires:  bind-libs
 BuildRequires:  bind-utils
 BuildRequires:  blueprint-cursor-theme
 BuildRequires:  btrfsprogs
@@ -269,7 +275,7 @@ BuildRequires:  ipw-firmware
 BuildRequires:  tftp
 %if %{with xen}
 BuildRequires:  kernel-xen
-%ifnarch %ix86
+%if %{with xenkmp}
 BuildRequires:  xen-kmp-default
 %endif
 %else
@@ -299,6 +305,7 @@ BuildRequires:  xf86-video-r128
 BuildRequires:  xf86-video-sis
 BuildRequires:  xf86-video-vesa
 %endif
+BuildRequires:  grub2
 %ifarch ppc ppc64 ppc64le
 %ifnarch ppc64le
 BuildRequires:  pdisk
@@ -313,7 +320,6 @@ BuildRequires:  dhcp-client
 BuildRequires:  dmidecode
 BuildRequires:  elilo
 BuildRequires:  firmwarekit
-BuildRequires:  grub2
 BuildRequires:  lilo
 BuildRequires:  memtest86+
 BuildRequires:  syslinux
diff --git a/installation-images-openSUSE.changes b/installation-images-openSUSE.changes
index ed73ba9..e635596 100644
--- a/installation-images-openSUSE.changes
+++ b/installation-images-openSUSE.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Apr  1 13:22:05 CEST 2015 - snwint@suse.de
+
+- added ExcludeArch i586 (bnc #924024)
+- add grub2 to buildrequires for s390x (bnc #893971)
+- handle xen & xen-kmp separately in spec file (bnc #906248)
+
 -------------------------------------------------------------------
 Tue Mar 24 17:57:52 CET 2015 - snwint@suse.com
 
diff --git a/installation-images-openSUSE.spec b/installation-images-openSUSE.spec
index f52cad8..2296bba 100644
--- a/installation-images-openSUSE.spec
+++ b/installation-images-openSUSE.spec
@@ -31,14 +31,19 @@
 %define with_shim 1
 %bcond_without sbl
 %bcond_without vnc
-%ifarch %ix86
-# FIXME: xen not working on i586
+%ifarch x86_64 %ix86
 %bcond_without xen
 %else
-%bcond_without xen  
+%bcond_with xen  
+%endif
+%ifarch x86_64
+%bcond_without xenkmp
+%else
+%bcond_with xenkmp  
 %endif
 
 %if %theme == SLES
+ExcludeArch: %ix86
 BuildRequires:  plymouth-theme-tribar
 BuildRequires:  sle12-desktop-migration
 BuildRequires:  sles-release
@@ -62,6 +67,7 @@ BuildRequires:  alsa-utils
 BuildRequires:  arabic-kacst-fonts
 BuildRequires:  audit-libs
 BuildRequires:  bc
+BuildRequires:  bind-libs
 BuildRequires:  bind-utils
 BuildRequires:  blueprint-cursor-theme
 BuildRequires:  btrfsprogs
@@ -269,7 +275,7 @@ BuildRequires:  ipw-firmware
 BuildRequires:  tftp
 %if %{with xen}
 BuildRequires:  kernel-xen
-%ifnarch %ix86
+%if %{with xenkmp}
 BuildRequires:  xen-kmp-default
 %endif
 %else
@@ -299,6 +305,7 @@ BuildRequires:  xf86-video-r128
 BuildRequires:  xf86-video-sis
 BuildRequires:  xf86-video-vesa
 %endif
+BuildRequires:  grub2
 %ifarch ppc ppc64 ppc64le
 %ifnarch ppc64le
 BuildRequires:  pdisk
@@ -313,7 +320,6 @@ BuildRequires:  dhcp-client
 BuildRequires:  dmidecode
 BuildRequires:  elilo
 BuildRequires:  firmwarekit
-BuildRequires:  grub2
 BuildRequires:  lilo
 BuildRequires:  memtest86+
 BuildRequires:  syslinux