rpms/redir/EL-6 import.log,1.2,1.3 redir.spec,1.3,1.4

[Toshio Kuratomi]

On Mon, May 10, 2010 at 11:37:16AM -0500, Dennis Gilmore wrote:
> On Monday 10 May 2010 11:18:26 am Itamar Reis Peixoto wrote:
> > Index: redir.spec
> > ===================================================================
> > RCS file: /cvs/pkgs/rpms/redir/EL-6/redir.spec,v
> > retrieving revision 1.3
> > retrieving revision 1.4
> > diff -u -p -r1.3 -r1.4
> > --- redir.spec	25 Sep 2009 22:51:24 -0000	1.3
> > +++ redir.spec	10 May 2010 16:18:26 -0000	1.4
> > @@ -1,6 +1,6 @@
> >  Name:           redir
> >  Version:        2.2.1
> > -Release:        5%{?dist}
> > +Release:        6%{?dist}
> >  Summary:        Redirect TCP connections
> > 
> >  Group:          Applications/Internet
> > @@ -13,8 +13,10 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
> >  BuildRequires:  tcp_wrappers-devel
> >  %endif
> > 
> > -%if 0%{?rhel}
> > +%if 0%{?rhel} < 5
> >  BuildRequires:  tcp_wrappers
> > +%else
> > +BuildRequires:  tcp_wrappers-devel
> >  %endif
> 
> this fix is incorrect.  because "%if 0%{?rhel} < 5"  becomes if 0<5  on fedora 
> since rhel is undefined. you need to add a check for fedora also.
> 
This is also wrong because we want 0%{?rhel} <= 5.

To avoid having to specify negation I'd also reverse the condition:

%if 0%{?rhel} >= 5 || 0%{?fedora}
BuildRequires: tcp_wrappers-devel
%else
BuildRequires: tcp_wrappers
%endif

-Toshio
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
Url : http://lists.fedoraproject.org/pipermail/devel/attachments/20100510/a6a3a5c4/attachment.bin