[PATCH] Update to branches system to match recent DistTag change

[Mike Bonnet]

On Tue, 2007-05-22 at 14:18 -0400, Ignacio Vazquez-Abrams wrote:
> On Tue, 2007-05-22 at 14:03 -0400, Mike Bonnet wrote:
> > On Tue, 2007-05-22 at 13:23 -0400, Ignacio Vazquez-Abrams wrote:
> > >  ## use this to build an srpm locally
> > >  srpm: sources $(TARGETS)
> > > -       $(RPM_WITH_DIRS) $(DIST_DEFINES) --nodeps -bs $(SPECFILE)
> > > +       $(RPM_WITH_DIRS) --nodeps -bs $(SPECFILE)
> > 
> > $(DIST_DEFINES) should not be removed from the srpm target.  This is the
> > target that Koji calls to build the srpm, and if %{dist} is not defined
> > the N-V-R of the srpm will not contain the %{dist} macro, and you'll get
> > N-V-R mismatches when the binary rpms are built.
> 
> This is from Makefile.common, before the srpm target is defined:
> 
> ***
> ifndef RPM_WITH_DIRS
> RPM_WITH_DIRS = $(RPM) $(RPM_DEFINES)
> endif
> ***
> 
> This is from even earlier in the same file:
> 
> ***
> ifndef RPM_DEFINES
> RPM_DEFINES = --define "_sourcedir $(SOURCEDIR)" \
>                 --define "_builddir $(BUILDDIR)" \
>                 --define "_srcrpmdir $(SRCRPMDIR)" \
>                 --define "_rpmdir $(RPMDIR)" \
>                 $(DIST_DEFINES)
> endif
> ***
> 
> Does koji define either RPM_WITH_DIRS or RPM_DEFINES?

Ahh, no it doesn't.  All is well then.  Thanks.