summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorDan Horák <dan@danny.cz>2014-05-19 16:17:32 +0200
committerJosh Boyer <jwboyer@fedoraproject.org>2014-05-19 11:38:30 -0400
commita9cc543e43b3836febd8639e443dcd17cd0893c6 (patch)
tree58755de5698a37897f8b520f2cbf39fedc53ad07 /kernel.spec
parentf055781cf89f073e979c9198af6672ec12314972 (diff)
downloadkernel-a9cc543e43b3836febd8639e443dcd17cd0893c6.tar.gz
kernel-a9cc543e43b3836febd8639e443dcd17cd0893c6.tar.xz
kernel-a9cc543e43b3836febd8639e443dcd17cd0893c6.zip
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.
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec7
1 files changed, 6 insertions, 1 deletions
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 <dan@danny.cz>
+- kernel metapackage shouldn't depend on subpackages we don't build
+
* Thu May 15 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.15.0-0.rc5.git2.9
- Fix build fail on s390x