devel/common branches,1.14,1.15 Makefile.common,1.76,1.77

[Jeremy Katz (katzj)]

Author: katzj

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

Modified Files:
	branches Makefile.common 
Log Message:
add F-9 branch info.  allow for early branching and determining if we're 
building an F8 vs an F9 package



Index: branches
===================================================================
RCS file: /cvs/pkgs/devel/common/branches,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- branches	3 Oct 2007 14:18:36 -0000	1.14
+++ branches	3 Oct 2007 14:49:49 -0000	1.15
@@ -12,4 +12,5 @@
 FC-6:fc6:.fc6:fedora:6
 F-7:dist-fc7-updates-candidate:.fc7:fedora:7
 F-8:dist-f8:.fc8:fedora:8
+F-9:dist-f9:.fc9:fedora:9
 devel:dist-f8:.fc8:fedora:8


Index: Makefile.common
===================================================================
RCS file: /cvs/pkgs/devel/common/Makefile.common,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- Makefile.common	23 Aug 2007 07:31:14 -0000	1.76
+++ Makefile.common	3 Oct 2007 14:49:49 -0000	1.77
@@ -20,6 +20,11 @@
 HEAD_BRANCH := devel
 endif
 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
 BRANCHINFO = $(shell grep ^$(BRANCH): $(COMMON_DIR)/branches | cut -d: --output-delimiter=" " -f2-)
 TARGET := $(word 1, $(BRANCHINFO))
 DIST = $(word 2, $(BRANCHINFO))