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

[Ignacio Vazquez-Abrams]

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?

-- 
Ignacio Vazquez-Abrams <ivazqueznet at gmail.com>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/fedora-maintainers/attachments/20070522/981e571f/attachment.sig>