common Makefile.common,1.129,1.130 branches,1.31,1.32

[Dennis Gilmore]

Author: ausil

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

Modified Files:
	Makefile.common branches 
Log Message:
point epel at koji



Index: Makefile.common
===================================================================
RCS file: /cvs/pkgs/common/Makefile.common,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -p -r1.129 -r1.130
--- Makefile.common	16 Jun 2009 19:10:57 -0000	1.129
+++ Makefile.common	20 Jun 2009 15:58:45 -0000	1.130
@@ -154,7 +154,6 @@ UPLOAD_REPOSITORY ?= https://cvs.fedorap
 CURL	?= $(shell if test -f /usr/bin/curl ; then echo "curl -H Pragma: -O -R -S --fail --show-error" ; fi)
 WGET	?= $(shell if test -f /usr/bin/wget ; then echo "wget -nd -m" ; fi)
 CLIENT	?= $(if $(CURL),$(CURL),$(if $(WGET),$(WGET)))
-PLAGUE_CLIENT ?= $(shell which plague-client 2>/dev/null)
 BUILD_CLIENT ?= $(shell which koji 2>/dev/null)
 BODHI_CLIENT ?= $(shell which bodhi 2>/dev/null)
 
@@ -197,7 +196,7 @@ ARCHES = noarch i386 i586 i686 x86_64 ia
 PREP_ARCHES	= $(addprefix prep-,$(ARCHES))
 
 ## list all our bogus targets
-.PHONY :: $(ARCHES) sources uploadsource upload export check build-check plague koji build cvsurl chain-build test-srpm srpm tag verrel new clean patch prep compile install install-short compile-short FORCE local scratch-build scratch-build-% srpm-scratch-build srpm-scratch-build-%
+.PHONY :: $(ARCHES) sources uploadsource upload export check build-check build cvsurl chain-build test-srpm srpm tag verrel new clean patch prep compile install install-short compile-short FORCE local scratch-build scratch-build-% srpm-scratch-build srpm-scratch-build-%
 
 # The TARGETS define is meant for local module targets that should be
 # made in addition to the SOURCEFILES whenever needed
@@ -447,19 +446,11 @@ build-check: $(SPECFILE)
 	@cvs -f status -v $(SPECFILE) 2>/dev/null | grep -q $(TAG); ret=$$? ;\
 	if [ $$ret -ne 0 ]; then echo "$(SPECFILE) not tagged with tag $(TAG)"; exit 1;  fi
 
-plague: build-check $(COMMON_DIR)/branches
-	@if [ ! -x "$(PLAGUE_CLIENT)" ]; then echo "Must have plague-client installed - see http://fedoraproject.org/wiki/Extras/BuildSystemClientSetup"; exit 1; fi
-	$(PLAGUE_CLIENT) build $(NAME) $(TAG) $(TARGET)
 
-koji: build-check $(COMMON_DIR)/branches
+build: build-check $(COMMON_DIR)/branches
 	@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-12 F-11 F-10 F-9 F-8  OLPC-2 OLPC-3 OLPC-4, $(BRANCH)))
-build: koji
-else
-build: plague
-endif
 
 scratch-build: build-check
 	@if [ ! -x "$(BUILD_CLIENT)" ]; then echo "Must have koji installed - see http://fedoraproject.org/wiki/BuildSystemClientSetup"; exit 1; fi


Index: branches
===================================================================
RCS file: /cvs/pkgs/common/branches,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- branches	12 Jun 2009 20:25:12 -0000	1.31
+++ branches	20 Jun 2009 15:58:45 -0000	1.32
@@ -4,8 +4,8 @@ RHL-9:rhl9:.rhl9:rhl:9
 OLPC-2:dist-olpc2:.olpc2:olpc:2
 OLPC-3:dist-olpc3:.olpc3:olpc:3
 OLPC-4:dist-olpc4:.olpc4:olpc:4
-EL-4:el4:.el4:epel:4
-EL-5:el5:.el5:epel:5
+EL-4:dist-4E-epel-testing-candidate:.el4:epel:4
+EL-5:dist-5E-epel-testing-candidate:.el5:epel:5
 FC-1:fc1:.fc1:fedora:1
 FC-2:fc2:.fc2:fedora:2
 FC-3:fc3:.fc3:fedora:3