A few spec file cleanups from prior changes

OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=557
This commit is contained in:
James Fehlig 2016-08-04 17:28:41 +00:00 committed by Git OBS Bridge
parent 2484184f10
commit 6ee7100e24

View File

@ -41,7 +41,7 @@
%define with_hyperv 0%{!?_without_hyperv:0} %define with_hyperv 0%{!?_without_hyperv:0}
# Then the secondary host drivers, which run inside libvirtd # Then the secondary host drivers, which run inside libvirtd
%define with_storage_rbd 0 %define with_storage_rbd 0%{!?_without_storage_rbd:0}
%define with_storage_sheepdog 0 %define with_storage_sheepdog 0
%define with_storage_gluster 0 %define with_storage_gluster 0
%define with_apparmor 0%{!?_without_apparmor:1} %define with_apparmor 0%{!?_without_apparmor:1}
@ -113,26 +113,26 @@
%ifarch x86_64 %ifarch x86_64
# enable on anything newer than 1320, or SLE12 family newer than 120100 # enable on anything newer than 1320, or SLE12 family newer than 120100
# use librbd-devel as build dependency # use librbd-devel as build dependency
%if 0%{?suse_version} > 1320 || ( 0%{?suse_version} == 1315 && ( 0%{?sle_version} > 120100 ) ) %if 0%{?suse_version} > 1320 || ( 0%{?suse_version} == 1315 && ( 0%{?sle_version} > 120100 ) )
%define with_storage_rbd 1 %define with_storage_rbd 0%{!?_without_storage_rbd:1}
%define with_rbd_lib librbd-devel %define with_rbd_lib librbd-devel
%endif %endif
# enable for SLE12 family <= 120100 (SLE12GA/SP1, Leap 42.1) # enable for SLE12 family <= 120100 (SLE12GA/SP1, Leap 42.1)
# use ceph-devel as build dependency # use ceph-devel as build dependency
%if 0%{?suse_version} == 1315 && 0%{?sle_version} <= 120100 %if 0%{?suse_version} == 1315 && 0%{?sle_version} <= 120100
%define with_storage_rbd 1 %define with_storage_rbd 0%{!?_without_storage_rbd:1}
%define with_rbd_lib ceph-devel %define with_rbd_lib ceph-devel
%endif %endif
%endif %endif
# For arm # For arm
%ifarch aarch64 %ifarch aarch64
# enable on anything newer than 1320, or SLE12 family newer than 120100 # enable on anything newer than 1320, or SLE12 family newer than 120100
# use librbd-devel as build dependency # use librbd-devel as build dependency
%if 0%{?suse_version} > 1320 || ( 0%{?is_opensuse} == 0 && 0%{?sle_version} > 120100 ) %if 0%{?suse_version} > 1320 || ( 0%{?is_opensuse} == 0 && 0%{?sle_version} > 120100 )
%define with_storage_rbd 1 %define with_storage_rbd 0%{!?_without_storage_rbd:1}
%define with_rbd_lib librbd-devel %define with_rbd_lib librbd-devel
%endif %endif
%endif %endif
# Support systemd on 12.1 and later # Support systemd on 12.1 and later
@ -148,14 +148,14 @@
# numad is used to manage the CPU and memory placement dynamically for # numad is used to manage the CPU and memory placement dynamically for
# qemu, lxc, and uml drivers # qemu, lxc, and uml drivers
%if %{with_qemu} || %{with_lxc} || %{with_uml} %if %{with_qemu} || %{with_lxc} || %{with_uml}
# Always enable numad on x86_64 # Enable numad for most architectures. Handle aarch64 separately
%ifarch x86_64 %ifnarch s390 s390x %arm %ix86 aarch64
%define with_numad 0%{!?_without_numad:1} %define with_numad 0%{!?_without_numad:1}
%endif %endif
# For aarch64, enable on anything newer than 1320, or SLE12 family newer # For aarch64, enable on anything newer than 1320, or SLE12 family newer
# than 120100 # than 120100
%ifarch aarch64 %ifarch aarch64
%if 0%{?suse_version} > 1320 || ( 0%{?is_opensuse} == 0 && 0%{?sle_version} > 120100 ) %if 0%{?suse_version} > 1320 || ( 0%{?suse_version} == 1315 && 0%{?sle_version} > 120100 )
%define with_numad 0%{!?_without_numad:1} %define with_numad 0%{!?_without_numad:1}
%endif %endif
%endif %endif