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

[Paul Howarth]

On Mon, 10 May 2010 11:37:16 -0500
Dennis Gilmore <dennis at ausil.us> wrote:

> On Monday 10 May 2010 11:18:26 am Itamar Reis Peixoto wrote:
> > Author: itamarjp
> > 
> > Update of /cvs/pkgs/rpms/redir/EL-6
> > In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv20463/EL-6
> > 
> > Modified Files:
> > 	import.log redir.spec
> > Log Message:
> > - fix building for EL-6
> > 
> > 
> > 
> > Index: import.log
> > ===================================================================
> > RCS file: /cvs/pkgs/rpms/redir/EL-6/import.log,v
> > retrieving revision 1.2
> > retrieving revision 1.3
> > diff -u -p -r1.2 -r1.3
> > --- import.log	25 Sep 2009 22:51:24 -0000	1.2
> > +++ import.log	10 May 2010 16:18:25 -0000	1.3
> > @@ -1,2 +1,3 @@
> >  redir-2_2_1-3_fc11:HEAD:redir-2.2.1-3.fc11.src.rpm:1239099294
> >  redir-2_2_1-5_fc12:HEAD:redir-2.2.1-5.fc12.src.rpm:1253918869
> > +redir-2_2_1-6_fc13:EL-6:redir-2.2.1-6.fc13.src.rpm:1273508246
> > 
> > 
> > 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.

Or you can just use:

BuildRequires: /usr/include/tcpd.h

which works everywhere and you don't need conditionals.

Paul.