[libvirt] [PATCH] spec: RHEL-7 does not have sanlock on i686

--- libvirt.spec.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 6236c08..e74f774 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -245,11 +245,16 @@ %if 0%{?fedora} >= 16 %define with_sanlock 0%{!?_without_sanlock:%{server_drivers}} %endif -%if 0%{?rhel} >= 6 +%if 0%{?rhel} == 6 %ifarch %{ix86} x86_64 %define with_sanlock 0%{!?_without_sanlock:%{server_drivers}} %endif %endif +%if 0%{?rhel} >= 7 + %ifarch x86_64 + %define with_sanlock 0%{!?_without_sanlock:%{server_drivers}} + %endif +%endif # Enable libssh2 transport for new enough distros %if 0%{?fedora} >= 17 -- 1.8.3.2

On 07/30/2013 05:46 AM, Jiri Denemark wrote:
--- libvirt.spec.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
ACK.
%if 0%{?fedora} >= 16 %define with_sanlock 0%{!?_without_sanlock:%{server_drivers}} %endif -%if 0%{?rhel} >= 6 +%if 0%{?rhel} == 6 %ifarch %{ix86} x86_64 %define with_sanlock 0%{!?_without_sanlock:%{server_drivers}} %endif %endif +%if 0%{?rhel} >= 7 + %ifarch x86_64 + %define with_sanlock 0%{!?_without_sanlock:%{server_drivers}} + %endif +%endif
It feels a bit redundant, but I don't see any more compact way to combine conditionals. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
participants (2)
-
Eric Blake
-
Jiri Denemark