rpms/qemu
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactor global module requires to facilitate conditional builds

Browse Source 
The global list of module requires is not amenable to conditional
builds, requiring the entire set of requires to be duplicated.
Refactor it so that individual pieces can be disabled.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2019-03-01 11:58:14 +00:00
parent e24cbbb32e
commit f1fa58e582
1 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
qemu.spec
View File

@ -83,38 +83,42 @@
%define with_block_rbd 1 %define with_block_rbd 1
%endif %endif
%define evr %{epoch}:%{version}-%{release}
%define requires_block_curl Requires: %{name}-block-curl = %{evr}
%define requires_block_dmg Requires: %{name}-block-dmg = %{evr}
%define requires_block_gluster Requires: %{name}-block-gluster = %{evr}
%define requires_block_iscsi Requires: %{name}-block-iscsi = %{evr}
%define requires_block_nfs Requires: %{name}-block-nfs = %{evr}
%if %{with_block_rbd} %if %{with_block_rbd}
%global requires_all_modules \ %define requires_block_rbd Requires: %{name}-block-rbd = %{evr}
Requires: %{name}-block-curl = %{epoch}:%{version}-%{release} \
Requires: %{name}-block-dmg = %{epoch}:%{version}-%{release} \
Requires: %{name}-block-gluster = %{epoch}:%{version}-%{release} \
Requires: %{name}-block-iscsi = %{epoch}:%{version}-%{release} \
Requires: %{name}-block-nfs = %{epoch}:%{version}-%{release} \
Requires: %{name}-block-rbd = %{epoch}:%{version}-%{release} \
Requires: %{name}-block-ssh = %{epoch}:%{version}-%{release} \
Requires: %{name}-audio-alsa = %{epoch}:%{version}-%{release} \
Requires: %{name}-audio-oss = %{epoch}:%{version}-%{release} \
Requires: %{name}-audio-pa = %{epoch}:%{version}-%{release} \
Requires: %{name}-audio-sdl = %{epoch}:%{version}-%{release} \
Requires: %{name}-ui-curses = %{epoch}:%{version}-%{release} \
Requires: %{name}-ui-gtk = %{epoch}:%{version}-%{release} \
Requires: %{name}-ui-sdl = %{epoch}:%{version}-%{release}
%else %else
%global requires_all_modules \ %define requires_block_rbd %{nil}
Requires: %{name}-block-curl = %{epoch}:%{version}-%{release} \
Requires: %{name}-block-dmg = %{epoch}:%{version}-%{release} \
Requires: %{name}-block-gluster = %{epoch}:%{version}-%{release} \
Requires: %{name}-block-iscsi = %{epoch}:%{version}-%{release} \
Requires: %{name}-block-nfs = %{epoch}:%{version}-%{release} \
Requires: %{name}-block-ssh = %{epoch}:%{version}-%{release} \
Requires: %{name}-audio-alsa = %{epoch}:%{version}-%{release} \
Requires: %{name}-audio-oss = %{epoch}:%{version}-%{release} \
Requires: %{name}-audio-pa = %{epoch}:%{version}-%{release} \
Requires: %{name}-audio-sdl = %{epoch}:%{version}-%{release} \
Requires: %{name}-ui-curses = %{epoch}:%{version}-%{release} \
Requires: %{name}-ui-gtk = %{epoch}:%{version}-%{release} \
Requires: %{name}-ui-sdl = %{epoch}:%{version}-%{release}
%endif %endif
%define requires_block_ssh Requires: %{name}-block-ssh = %{evr}
%define requires_audio_alsa Requires: %{name}-audio-alsa = %{evr}
%define requires_audio_oss Requires: %{name}-audio-oss = %{evr}
%define requires_audio_pa Requires: %{name}-audio-pa = %{evr}
%define requires_audio_sdl Requires: %{name}-audio-sdl = %{evr}
%define requires_ui_curses Requires: %{name}-ui-curl = %{evr}
%define requires_ui_gtk Requires: %{name}-ui-gtk = %{evr}
%define requires_ui_sdl Requires: %{name}-ui-sdl = %{evr}
%global requires_all_modules \
%{requires_block_curl} \
%{requires_block_dmg} \
%{requires_block_gluster} \
%{requires_block_iscsi} \
%{requires_block_nfs} \
%{requires_block_rbd} \
%{requires_block_ssh} \
%{requires_audio_alsa} \
%{requires_audio_oss} \
%{requires_audio_pa} \
%{requires_audio_sdl} \
%{requires_ui_curses} \
%{requires_ui_gtk} \
%{requires_ui_sdl}
# Release candidate version tracking # Release candidate version tracking
# global rcver rc1 # global rcver rc1