On Tue, 2007-05-22 at 07:52 -0500, Tom "spot" Callaway wrote: > On Tue, 2007-05-22 at 00:39 -0400, Ignacio Vazquez-Abrams wrote: > > This patch makes the branches system in cvs define the same tag as the > > buildsys-macros package now does. It also cleans out a bit of cruft that > > could cause a rpm command line to be too long. > > Ignacio, I don't think thats quite correct. > > $(DIST) would be .fc7 > We want to define fc7 as 1, not .fc7. You're right, I missed the field shift in the cut earlier. Updated patch attached. -- Ignacio Vazquez-Abrams <ivazqueznet@xxxxxxxxx>
Index: Makefile.common
===================================================================
RCS file: /cvs/pkgs/common/Makefile.common,v
retrieving revision 1.58
diff -u -r1.58 Makefile.common
--- Makefile.common 18 May 2007 18:25:32 -0000 1.58
+++ Makefile.common 22 May 2007 04:18:08 -0000
@@ -25,7 +25,7 @@
DIST = $(word 2, $(BRANCHINFO))
DISTVAR = $(word 3, $(BRANCHINFO))
DISTVAL = $(word 4, $(BRANCHINFO))
-DIST_DEFINES = --define "dist $(DIST)" --define "$(DISTVAR) $(DISTVAL)"
+DIST_DEFINES = --define "dist $(DIST)" --define "$(DISTVAR) $(DISTVAL)" --define "$(TARGET) 1"
BUILD_FLAGS ?= $(shell echo $(KOJI_FLAGS))
@@ -69,11 +69,11 @@
$(error "You can not run this Makefile without having NAME defined")
endif
ifndef VERSION
-VERSION := $(shell rpm $(RPM_DEFINES) $(DIST_DEFINES) -q --qf "%{VERSION}\n" --specfile $(SPECFILE)| head -1)
+VERSION := $(shell rpm $(RPM_DEFINES) -q --qf "%{VERSION}\n" --specfile $(SPECFILE)| head -1)
endif
# the release of the package
ifndef RELEASE
-RELEASE := $(shell rpm $(RPM_DEFINES) $(DIST_DEFINES) -q --qf "%{RELEASE}\n" --specfile $(SPECFILE)| head -1)
+RELEASE := $(shell rpm $(RPM_DEFINES) -q --qf "%{RELEASE}\n" --specfile $(SPECFILE)| head -1)
endif
# this is used in make patch, maybe make clean eventually.
# would be nicer to autodetermine from the spec file...
@@ -339,7 +339,7 @@
## use this to build an srpm locally
srpm: sources $(TARGETS)
- $(RPM_WITH_DIRS) $(DIST_DEFINES) --nodeps -bs $(SPECFILE)
+ $(RPM_WITH_DIRS) --nodeps -bs $(SPECFILE)
test-srpm: srpm
Attachment:
signature.asc
Description: This is a digitally signed message part
-- Fedora-maintainers mailing list Fedora-maintainers@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/fedora-maintainers
-- Fedora-maintainers-readonly mailing list Fedora-maintainers-readonly@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/fedora-maintainers-readonly
