common Makefile.common,1.47,1.48

[Jesse Keating (jkeating)]

Author: jkeating

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

Modified Files:
	Makefile.common 
Log Message:
s/extras/pkgs/



Index: Makefile.common
===================================================================
RCS file: /cvs/pkgs/common/Makefile.common,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- Makefile.common	3 May 2007 15:40:19 -0000	1.47
+++ Makefile.common	3 May 2007 16:59:28 -0000	1.48
@@ -35,7 +35,7 @@
 endif
 ## of course all this can also be overridden in your RPM macros file,
 ## but this way you can separate your normal RPM setup from your CVS
-## setup. Override RPM_WITH_DIRS in ~/.cvsextrasrc to avoid the usage of
+## setup. Override RPM_WITH_DIRS in ~/.cvspkgsrc to avoid the usage of
 ## these variables.
 SRCRPMDIR ?= $(WORKDIR)
 BUILDDIR ?= $(WORKDIR)
@@ -83,14 +83,14 @@
 all: sources
 
 # user specific configuration
-CVS_EXTRAS_RC	:= $(shell if test -f $(HOME)/.cvsextrasrc ; then echo $(HOME)/.cvsextrasrc ; fi)
+CVS_EXTRAS_RC	:= $(shell if test -f $(HOME)/.cvspkgsrc ; then echo $(HOME)/.cvspkgsrc ; fi)
 ifdef CVS_EXTRAS_RC
 include $(CVS_EXTRAS_RC)
 endif
 
 # The repository and the clients we use for the files
-REPOSITORY ?= http://cvs.fedora.redhat.com/repo/extras
-UPLOAD_REPOSITORY ?= https://cvs.fedora.redhat.com/repo/extras/upload.cgi
+REPOSITORY ?= http://cvs.fedora.redhat.com/repo/pkgs
+UPLOAD_REPOSITORY ?= https://cvs.fedora.redhat.com/repo/pkgs/upload.cgi
 
 # We define CURL and WGET in a way that makes if possible to have them
 # overwritten from the module's Makefiles. Then CLIENT picks CURL, otherwise WGET
@@ -101,7 +101,7 @@
 BUILD_CLIENT ?= $(shell which koji) 
 
 # RPM with all the overrides in place; you can override this in your
-# .cvsextrasrc also, to use a default rpm setup
+# .cvspkgsrc also, to use a default rpm setup
 # the rpm build command line
 ifndef RPM
 RPM := $(shell if test -f /usr/bin/rpmbuild ; then echo rpmbuild ; else echo rpm ; fi)
@@ -360,7 +360,7 @@
 	@cvs 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
 
-	@$(BUILD_CLIENT) build $(BUILD_FLAGS) $(TARGET) 'cvs://cvs.fedoraproject.org/cvs/extras?$(CVS_REPOSITORY)#$(TAG)'
+	@$(BUILD_CLIENT) build $(BUILD_FLAGS) $(TARGET) 'cvs://cvs.fedoraproject.org/cvs/pkgs?$(CVS_REPOSITORY)#$(TAG)'
 
 # build selects koji for devel and plague for the rest
 build: $(COMMON_DIR)/branches
@@ -395,7 +395,7 @@
 	@echo "Fully clean!"
 
 # To prevent CVS noise due to changing file timestamps, upgrade
-# to patchutils-0.2.23-3 or later, and add to ~/.cvsextrasrc:
+# to patchutils-0.2.23-3 or later, and add to ~/.cvspkgsrc:
 #    FILTERDIFF := filterdiff --remove-timestamps
 ifndef FILTERDIFF
 FILTERDIFF := cat