common Makefile.common, 1.45, 1.46 branches, 1.6, 1.7 koji_branches, 1.3, NONE

[Jesse Keating (jkeating)]

Author: jkeating

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30780

Modified Files:
	Makefile.common branches 
Removed Files:
	koji_branches 
Log Message:
shore up some of the differences between koji/plague stuff.



Index: Makefile.common
===================================================================
RCS file: /cvs/extras/common/Makefile.common,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- Makefile.common	2 Apr 2007 05:02:03 -0000	1.45
+++ Makefile.common	3 May 2007 03:58:18 -0000	1.46
@@ -27,12 +27,6 @@
 DISTVAL = $(word 4, $(BRANCHINFO))
 DIST_DEFINES = --define "dist $(DIST)" --define "$(DISTVAR) $(DISTVAL)"
 
-KOJI_BRANCHINFO  = $(shell grep ^$(BRANCH): $(COMMON_DIR)/koji_branches | cut -d: --output-delimiter=" " -f2-)
-KOJI_TARGET := $(word 1, $(KOJI_BRANCHINFO))
-KOJI_DIST = $(word 2, $(KOJI_BRANCHINFO))
-KOJI_DISTVAR = $(word 3, $(KOJI_BRANCHINFO))
-KOJI_DISTVAL = $(word 4, $(KOJI_BRANCHINFO))
-KOJI_DIST_DEFINES = --define "dist $(DIST)" --define "$(KOJI_DISTVAR) $(KOJI_DISTVAL)"
 BUILD_FLAGS ?=  $(shell echo $(KOJI_FLAGS))
 
 ## a base directory where we'll put as much temporary working stuff as we can
@@ -366,7 +360,7 @@
 	@cvs status -v $(SPECFILE) 2>/dev/null | grep -q $(TAG); ret=$$? ;\
 	if [ $$ret -ne 0 ]; then echo "$(SPECFILE) not tagged with tag $(TAG)"; exit 1;  fi
 	
-	@$(BUILD_CLIENT) build $(BUILD_FLAGS) $(KOJI_TARGET) 'cvs://cvs.fedoraproject.org/cvs/extras?$(CVS_REPOSITORY)#$(TAG)'
+	@$(BUILD_CLIENT) build $(BUILD_FLAGS) $(TARGET) 'cvs://cvs.fedoraproject.org/cvs/extras?$(CVS_REPOSITORY)#$(TAG)'
 
 # "make new | less" to see what has changed since the last tag was assigned
 new:


Index: branches
===================================================================
RCS file: /cvs/extras/common/branches,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- branches	4 Nov 2006 18:38:35 -0000	1.6
+++ branches	3 May 2007 03:58:18 -0000	1.7
@@ -9,4 +9,4 @@
 FC-4:fc4:.fc4:fedora:4
 FC-5:fc5:.fc5:fedora:5
 FC-6:fc6:.fc6:fedora:6
-devel:devel:.fc7:fedora:7
+devel:dist-fc7:.fc7:fedora:7


--- koji_branches DELETED ---