common Makefile.common,1.89,1.90 branches,1.17,1.18

[Jesse Keating (jkeating)]

Author: jkeating

Update of /cvs/pkgs/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5571

Modified Files:
	Makefile.common branches 
Log Message:
Prepare for F-9 early branching, turn back on logic to detect early branches.



Index: Makefile.common
===================================================================
RCS file: /cvs/pkgs/common/Makefile.common,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- Makefile.common	17 Mar 2008 15:56:50 -0000	1.89
+++ Makefile.common	24 Mar 2008 18:40:14 -0000	1.90
@@ -22,9 +22,9 @@
 BRANCH:=$(shell [ -f branch ] && cat branch || echo $(HEAD_BRANCH))
 # check to see if this is an early branched package; we should make this more
 # generic in the future
-#ifeq ($(BRANCH),devel)
-#BRANCH:=$(shell cvs rlog rpms/$(NAME)/F-8/$(SPECFILE) >/dev/null 2>&1 && echo "F-9" || echo "devel")
-#endif
+ifeq ($(BRANCH),devel)
+BRANCH:=$(shell cvs rlog rpms/$(NAME)/F-9/$(SPECFILE) >/dev/null 2>&1 && echo "F-10" || echo "devel")
+endif
 BRANCHINFO = $(shell grep ^$(BRANCH): $(COMMON_DIR)/branches | cut -d: --output-delimiter=" " -f2-)
 TARGET := $(word 1, $(BRANCHINFO))
 DIST = $(word 2, $(BRANCHINFO))
@@ -425,7 +425,7 @@
 	@if [ ! -x "$(BUILD_CLIENT)" ]; then echo "Must have koji installed - see http://fedoraproject.org/wiki/BuildSystemClientSetup"; exit 1; fi
 	$(BUILD_CLIENT) $(SECONDARY_CONFIG) build $(BUILD_FLAGS) $(TARGET) '$(CVS_URL)'
 
-ifneq (, $(filter devel F-9 F-8 F-7 OLPC-2, $(BRANCH)))
+ifneq (, $(filter devel F-10 F-9 F-8 F-7 OLPC-2, $(BRANCH)))
 build: koji
 else
 build: plague


Index: branches
===================================================================
RCS file: /cvs/pkgs/common/branches,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- branches	21 Oct 2007 02:01:47 -0000	1.17
+++ branches	24 Mar 2008 18:40:14 -0000	1.18
@@ -13,4 +13,5 @@
 F-7:dist-fc7-updates-candidate:.fc7:fedora:7
 F-8:dist-f8-updates-candidate:.fc8:fedora:8
 F-9:dist-f9:.fc9:fedora:9
+F-10:dist-f10:.fc10:fedora:10
 devel:dist-f9:.fc9:fedora:9