common Makefile.common,1.135,1.136 branches,1.32,1.33

[Jesse Keating]

Author: jkeating

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

Modified Files:
	Makefile.common branches 
Log Message:
Prepare for early F-12 branching



Index: Makefile.common
===================================================================
RCS file: /cvs/pkgs/common/Makefile.common,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -p -r1.135 -r1.136
--- Makefile.common	12 Aug 2009 22:53:30 -0000	1.135
+++ Makefile.common	27 Aug 2009 23:09:57 -0000	1.136
@@ -22,9 +22,9 @@ endif
 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-11/$(SPECFILE) >/dev/null 2>&1 && echo "F-12" || echo "devel")
-#endif
+ifeq ($(BRANCH),devel)
+BRANCH:=$(shell cvs rlog rpms/$(NAME)/F-12/$(SPECFILE) >/dev/null 2>&1 && echo "F-13" || echo "devel")
+endif
 BRANCHINFO = $(shell grep ^$(BRANCH): $(COMMON_DIR)/branches | cut -d: --output-delimiter=" " -f2-)
 TARGET := $(word 1, $(BRANCHINFO))
 DIST = $(word 2, $(BRANCHINFO))


Index: branches
===================================================================
RCS file: /cvs/pkgs/common/branches,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- branches	20 Jun 2009 15:58:45 -0000	1.32
+++ branches	27 Aug 2009 23:09:57 -0000	1.33
@@ -18,4 +18,5 @@ F-9:dist-f9-updates-candidate:.fc9:fedor
 F-10:dist-f10-updates-candidate:.fc10:fedora:10
 F-11:dist-f11-updates-candidate:.fc11:fedora:11
 F-12:dist-f12:.fc12:fedora:12
+F-13:dist-f13:.fc13:fedora:13
 devel:dist-f12:.fc12:fedora:12