From a9cc543e43b3836febd8639e443dcd17cd0893c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Mon, 19 May 2014 16:17:32 +0200 Subject: [PATCH] kernel metapackage shouldn't depend on subpackages we don't build On %{nobuildarches} we don't build the real kernel and modules, so don't set a Requires for them. The positive effect is that we can eliminate an explicit kernel Provides from the fake-build-provides package in secondary kojis. --- kernel.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/kernel.spec b/kernel.spec index 11352bc59..72d11a662 100644 --- a/kernel.spec +++ b/kernel.spec @@ -40,7 +40,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 9 +%global baserelease 10 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -402,8 +402,10 @@ Release: %{pkg_release} # SET %%nobuildarches (ABOVE) INSTEAD ExclusiveArch: %{all_x86} x86_64 ppc ppc64 ppc64p7 s390 s390x %{arm} aarch64 ppc64le ExclusiveOS: Linux +%ifnarch %{nobuildarches} Requires: kernel-%{?variant:%{variant}-}core-uname-r = %{KVERREL}%{?variant} Requires: kernel-%{?variant:%{variant}-}modules-uname-r = %{KVERREL}%{?variant} +%endif # @@ -2236,6 +2238,9 @@ fi # ||----w | # || || %changelog +* Mon May 19 2014 Dan Horák +- kernel metapackage shouldn't depend on subpackages we don't build + * Thu May 15 2014 Josh Boyer - 3.15.0-0.rc5.git2.9 - Fix build fail on s390x