In commit 72f7658ba24491672e6b81118f892400916e9404 I've added a few macros with bad bracing. Although they work as expected fix them so that we use uniform syntax. --- libvirt.spec.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index fae4bb7..ef3b832 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -98,7 +98,7 @@ %else %define with_storage_sheepdog 0 %endif -%if 0%{?fedora} >= 19 || 0%{?rhel >= 6} +%if 0%{?fedora} >= 19 || 0%{?rhel} >= 6 %define with_storage_gluster 0%{!?_without_storage_gluster:%{server_drivers}} %else %define with_storage_gluster 0 @@ -155,7 +155,7 @@ # libgfapi is built only on x86_64 on rhel %ifnarch x86_64 - %if 0%{?rhel >= 6} + %if 0%{?rhel} >= 6 %define with_storage_gluster 0 %endif %endif -- 1.8.5.5

On 02/26/2014 06:21 AM, Peter Krempa wrote: > In commit 72f7658ba24491672e6b81118f892400916e9404 I've added a few > macros with bad bracing. Although they work as expected fix them so that > we use uniform syntax. > --- > libvirt.spec.in | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) I'd prefer we simplify things to just require 3.4.0 as a minimum gluster everywhere, instead of trying to distinguish between fedora and rhel. The only reason we started with 3.4.1 was because I started testing on Fedora; now that we've proved a lower minimum version works, it is just fine to use the lower minimum. > > diff --git a/libvirt.spec.in b/libvirt.spec.in > index fae4bb7..ef3b832 100644 > --- a/libvirt.spec.in > +++ b/libvirt.spec.in > @@ -98,7 +98,7 @@ > %else > %define with_storage_sheepdog 0 > %endif > -%if 0%{?fedora} >= 19 || 0%{?rhel >= 6} > +%if 0%{?fedora} >= 19 || 0%{?rhel} >= 6 > %define with_storage_gluster 0%{!?_without_storage_gluster:%{server_drivers}} > %else > %define with_storage_gluster 0 > @@ -155,7 +155,7 @@ > > # libgfapi is built only on x86_64 on rhel > %ifnarch x86_64 > - %if 0%{?rhel >= 6} > + %if 0%{?rhel} >= 6 These two hunks make sense, but we might as well get the version fix done at the same time to minimize the churn in gluster-related spec changes.