[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

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



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 Vazquez-Abrams <ivazqueznet gmail com>
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 "$(DIST) 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


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]