Re: [PATCH] spec: Use correct versions of libgfapi in RHEL builds

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 02/26/2014 05:35 AM, Martin Kletzander wrote:
> On Wed, Feb 26, 2014 at 01:09:48PM +0100, Peter Krempa wrote:
>> RHEL still uses the 3.4.0 package of libgfapi and the package is built
>> only for x86_64.
>> ---
>>  libvirt.spec.in | 14 +++++++++++++-
>>  1 file changed, 13 insertions(+), 1 deletion(-)
>>
>> diff --git a/libvirt.spec.in b/libvirt.spec.in
>> index 3d5a69e..67b5557 100644
>> --- a/libvirt.spec.in
>> +++ b/libvirt.spec.in
>> @@ -98,7 +98,7 @@
>>  %else
>>      %define with_storage_sheepdog 0
>>  %endif
>> -%if 0%{?fedora} >= 19
>> +%if 0%{?fedora} >= 19 || 0%{?rhel >= 6}
> 
> Be consistent, this ...

rpmbuild isn't dying, but I think this is trying to compute the value of
a variable literally named 'rhel >= 6', which doesn't exist, so the
overall %if ends up looking like '%if ... || 0' and the rhel arm never
fires.

> 
> ... and this doesn't look like ...
> 

>>  %endif
>>  %if %{with_storage_gluster}
>> +%if 0%{?rhel} >= 6
> 
> ... this, which is the only one that'll work, I guess.

Indeed, this is the form that works whether 'rhel' is defined ('%if 07
>= 6', remembering that %if does decimal math rather than octal), or
undefined ('%if 0 >= 6').

> 
> BTW: If 3.4.0 is enough, why are we requiring 3.4.1 somewhere?

3.4.1 happens to be what Fedora ships with, and where gluster was
originally tested.  But I'm okay with going with the simpler change of
just requiring 3.4.0 as a minimum, now that we've tested that, rather
than trying to make this quite so complex.  We definitely need a followup.

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

Attachment: signature.asc
Description: OpenPGP digital signature

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list

[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]