common Makefile.common,1.123,1.124 branches,1.27,1.28

[Jesse Keating]

Author: jkeating

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

Modified Files:
	Makefile.common branches 
Log Message:
Support F-11 branches



Index: Makefile.common
===================================================================
RCS file: /cvs/pkgs/common/Makefile.common,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- Makefile.common	19 Mar 2009 19:16:20 -0000	1.123
+++ Makefile.common	30 Mar 2009 20:50:05 -0000	1.124
@@ -22,8 +22,8 @@
 BRANCH:=$(shell pwd | awk -F '/' '{ print $$NF }' )
 # 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-10/$(SPECFILE) >/dev/null 2>&1 && echo "F-11" || echo "devel")
+ifeq ($(BRANCH),devel)
+BRANCH:=$(shell cvs rlog rpms/$(NAME)/F-11/$(SPECFILE) >/dev/null 2>&1 && echo "F-12" || echo "devel")
 #endif
 BRANCHINFO = $(shell grep ^$(BRANCH): $(COMMON_DIR)/branches | cut -d: --output-delimiter=" " -f2-)
 TARGET := $(word 1, $(BRANCHINFO))
@@ -455,7 +455,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-11 F-10 F-9 F-8  OLPC-2 OLPC-3 OLPC-4, $(BRANCH)))
+ifneq (, $(filter devel F-12 F-11 F-10 F-9 F-8  OLPC-2 OLPC-3 OLPC-4, $(BRANCH)))
 build: koji
 else
 build: plague
@@ -517,7 +517,7 @@
 BODHI_USER=$(USER)
 endif
 
-ifneq (, $(filter F-10 F-9 F-8 F-7, $(BRANCH)))
+ifneq (, $(filter F-11 F-10 F-9 F-8 F-7, $(BRANCH)))
 update: bodhi
 endif
 


Index: branches
===================================================================
RCS file: /cvs/pkgs/common/branches,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- branches	11 Nov 2008 17:55:32 -0000	1.27
+++ branches	30 Mar 2009 20:50:05 -0000	1.28
@@ -17,4 +17,5 @@
 F-9:dist-f9-updates-candidate:.fc9:fedora:9
 F-10:dist-f10-updates-candidate:.fc10:fedora:10
 F-11:dist-f11:.fc11:fedora:11
+F-12:dist-f12:.fc12:fedora:12
 devel:dist-f11:.fc11:fedora:11