common Makefile.common,1.116,1.117 branches,1.23,1.24

[Jesse Keating]

Author: jkeating

Update of /cvs/pkgs/common
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25715

Modified Files:
	Makefile.common branches 
Log Message:
Setup for F-10 early branching.



Index: Makefile.common
===================================================================
RCS file: /cvs/pkgs/common/Makefile.common,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- Makefile.common	28 Sep 2008 21:57:28 -0000	1.116
+++ Makefile.common	1 Oct 2008 21:22:49 -0000	1.117
@@ -23,7 +23,7 @@
 # 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-9/$(SPECFILE) >/dev/null 2>&1 && echo "F-10" || echo "devel")
+BRANCH:=$(shell cvs rlog rpms/$(NAME)/F-10/$(SPECFILE) >/dev/null 2>&1 && echo "F-11" || echo "devel")
 endif
 BRANCHINFO = $(shell grep ^$(BRANCH): $(COMMON_DIR)/branches | cut -d: --output-delimiter=" " -f2-)
 TARGET := $(word 1, $(BRANCHINFO))
@@ -438,7 +438,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-10 F-9 F-8 F-7 OLPC-2 OLPC-3, $(BRANCH)))
+ifneq (, $(filter devel F-11 F-10 F-9 F-8  OLPC-2 OLPC-3, $(BRANCH)))
 build: koji
 else
 build: plague
@@ -500,7 +500,7 @@
 BODHI_USER=$(USER)
 endif
 
-ifneq (, $(filter F-9 F-8 F-7, $(BRANCH)))
+ifneq (, $(filter F-10 F-9 F-8 F-7, $(BRANCH)))
 update: bodhi
 endif
 


Index: branches
===================================================================
RCS file: /cvs/pkgs/common/branches,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- branches	26 Jun 2008 22:23:57 -0000	1.23
+++ branches	1 Oct 2008 21:22:49 -0000	1.24
@@ -15,4 +15,5 @@
 F-8:dist-f8-updates-candidate:.fc8:fedora:8
 F-9:dist-f9-updates-candidate:.fc9:fedora:9
 F-10:dist-f10:.fc10:fedora:10
+F-11:dist-f11:.fc11:fedora:11
 devel:dist-f10:.fc10:fedora:10