Merge pull request #40 from yast/jsc11873-conditional-build-removal

Conditional build removal - attempt 2
yast · Apr 29, 2020 · 76a92c7 · 76a92c7
2 parents 35a55c3 + 2a9dcb4
commit 76a92c7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/package/yast2-sound.changes b/package/yast2-sound.changes
@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
 Thu Apr 16 08:53:21 UTC 2020 - Michal Filka <mfilka@suse.com>
 
-- jsc#SLE-11873
+- jsc#SLE-11862
   - dropped conditional build to unify SLE and OS builds
 - 4.2.3 
 

diff --git a/package/yast2-sound.spec b/package/yast2-sound.spec
@@ -29,7 +29,6 @@ Source0:        %{name}-%{version}.tar.bz2
 BuildRequires:  alsa-devel
 BuildRequires:  doxygen
 BuildRequires:  gcc-c++
-BuildRequires:  kernel-default
 BuildRequires:  libtool
 BuildRequires:  perl-XML-Writer
 BuildRequires:  ruby
@@ -39,6 +38,11 @@ BuildRequires:  yast2-core-devel
 BuildRequires:  yast2-devtools >= 4.2.2
 BuildRequires:  yast2-testsuite
 
+# workaround for OS builds, see jsc#SLE-11862
+%ifnarch i586
+BuildRequires:  kernel-default
+%endif
+
 # Fixed handling of Kernel modules loaded on boot
 Requires:       alsa
 # For proc_modules.scr