From ebf67adc2bc5872ec3cd7bc68734958623c6a39c2f4fca299ffe257105727f7f Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Tue, 31 May 2016 14:23:31 +0000 Subject: [PATCH] Accepting request 399159 from home:lnussel:branches:system:install:head - disable i586 on Leap OBS-URL: https://build.opensuse.org/request/show/399159 OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=898 --- installation-images-SLES.changes | 5 +++++ installation-images-SLES.spec | 5 ++++- installation-images-openSUSE.changes | 5 +++++ installation-images-openSUSE.spec | 5 ++++- 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/installation-images-SLES.changes b/installation-images-SLES.changes index 6235a3d..35c0913 100644 --- a/installation-images-SLES.changes +++ b/installation-images-SLES.changes @@ -10,6 +10,11 @@ Mon May 30 08:56:21 UTC 2016 - snwint@suse.com - module.config: add macsec - 14.246 +------------------------------------------------------------------- +Mon May 23 14:11:23 UTC 2016 - lnussel@suse.de + +- disable i586 on Leap + ------------------------------------------------------------------- Thu May 19 07:45:21 UTC 2016 - snwint@suse.com diff --git a/installation-images-SLES.spec b/installation-images-SLES.spec index 46634c6..ad75326 100644 --- a/installation-images-SLES.spec +++ b/installation-images-SLES.spec @@ -34,8 +34,11 @@ %bcond_with xen %bcond_with xenkmp -%if %theme == SLES +# no i586 in Leap +%if %suse_version == 1315 ExcludeArch: %ix86 +%endif +%if %theme == SLES BuildRequires: sle12-desktop-migration BuildRequires: sles-release BuildRequires: sles-release-MINI diff --git a/installation-images-openSUSE.changes b/installation-images-openSUSE.changes index 6235a3d..35c0913 100644 --- a/installation-images-openSUSE.changes +++ b/installation-images-openSUSE.changes @@ -10,6 +10,11 @@ Mon May 30 08:56:21 UTC 2016 - snwint@suse.com - module.config: add macsec - 14.246 +------------------------------------------------------------------- +Mon May 23 14:11:23 UTC 2016 - lnussel@suse.de + +- disable i586 on Leap + ------------------------------------------------------------------- Thu May 19 07:45:21 UTC 2016 - snwint@suse.com diff --git a/installation-images-openSUSE.spec b/installation-images-openSUSE.spec index 8704451..1b4e6bb 100644 --- a/installation-images-openSUSE.spec +++ b/installation-images-openSUSE.spec @@ -34,8 +34,11 @@ %bcond_with xen %bcond_with xenkmp -%if %theme == SLES +# no i586 in Leap +%if %suse_version == 1315 ExcludeArch: %ix86 +%endif +%if %theme == SLES BuildRequires: sle12-desktop-migration BuildRequires: sles-release BuildRequires: sles-release-MINI