Re: Want to help the merge?

[Christian Iseli <Christian Iseli licr org>]

On Wed, 2 May 2007 21:05:16 -0700, Jesse Keating wrote:
> Patches gleefully reviewed and potentially accepted.

Would this be enough ?

					C

? Makefile.common.diff
Index: Makefile.common
===================================================================
RCS file: /cvs/pkgs/common/Makefile.common,v
retrieving revision 1.46
diff -u -p -r1.46 Makefile.common
--- Makefile.common	3 May 2007 03:58:18 -0000	1.46
+++ Makefile.common	3 May 2007 06:39:02 -0000
@@ -345,7 +345,7 @@ oldbuild:   $(COMMON_DIR)/branches
 	cvs commit -m "request build of $(CVS_REPOSITORY) $(TAG) for $(TARGET)" tobuild ;\
 	popd >/dev/null)
 
-build plague: $(COMMON_DIR)/branches
+plague: $(COMMON_DIR)/branches
 	@if [ ! -x $(PLAGUE_CLIENT) ]; then echo "Must have plague-client installed - see http://fedoraproject.org/wiki/Extras/BuildSystemClientSetup";; exit 1; fi
 	@if [ -z "$(TARGET)" -a ! -d CVS ]; then echo "Must be in a branch subdirectory"; exit 1; fi
 
@@ -362,6 +362,14 @@ koji: $(COMMON_DIR)/branches
 	
 	@$(BUILD_CLIENT) build $(BUILD_FLAGS) $(TARGET) 'cvs://cvs.fedoraproject.org/cvs/extras?$(CVS_REPOSITORY)#$(TAG)'
 
+# build selects koji for devel and plague for the rest
+build: $(COMMON_DIR)/branches
+	@if [ "x$(BRANCH)" = "xdevel" ]; then \
+	  $(MAKE) koji \
+	else \
+	  $(MAKE) plague \
+	fi
+
 # "make new | less" to see what has changed since the last tag was assigned
 new:
 	- cvs diff -u -r$$(cvs log Makefile 2>/dev/null | awk '/^symbolic names:$$/ {getline; sub(/^[ \t]*/, "") ; sub (/:.*$$/, ""); print; exit 0}')