common Makefile.common,1.120,1.121

[Jesse Keating]

Author: jkeating

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

Modified Files:
	Makefile.common 
Log Message:
Disable pre-branch logic for now, screws with make mockbuild



Index: Makefile.common
===================================================================
RCS file: /cvs/pkgs/common/Makefile.common,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- Makefile.common	11 Nov 2008 17:55:32 -0000	1.120
+++ Makefile.common	22 Dec 2008 03:55:42 -0000	1.121
@@ -2,7 +2,7 @@
 #
 # Common Makefile for building RPMs
 # Licensed under the new-BSD license (http://www.opensource.org/licenses/bsd-license.php)
-# Copyright (C) 2004-2005 Red Hat, Inc.
+# Copyright (C) 2004-2008 Red Hat, Inc.
 # Copyright (C) 2005 Fedora Foundation
 #
 # $Id$
@@ -22,9 +22,9 @@
 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")
-endif
+#ifeq ($(BRANCH),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))
 DIST = $(word 2, $(BRANCHINFO))