common Makefile.common,1.7,1.8

[Elliot Lee (sopwith)]

Author: sopwith

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8172

Modified Files:
	Makefile.common 
Log Message:


Start using the new upload.cgi with client certificate authentication.



Index: Makefile.common
===================================================================
RCS file: /cvs/extras/common/Makefile.common,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile.common	31 Mar 2005 21:02:37 -0000	1.7
+++ Makefile.common	13 Apr 2005 07:16:53 -0000	1.8
@@ -18,9 +18,7 @@
 endif
 # this is used in make patch, maybe make clean eventually.
 # would be nicer to autodetermine from the spec file...
-ifndef RPM_BUILD_DIR
-RPM_BUILD_DIR = $(BUILDDIR)/$(NAME)-$(VERSION)
-endif
+RPM_BUILD_DIR ?= $(BUILDDIR)/$(NAME)-$(VERSION)
 
 # default target: just make sure we've got the sources
 all: sources
@@ -39,15 +37,9 @@
 ## but this way you can separate your normal RPM setup from your CVS
 ## setup. Override RPM_WITH_DIRS in .pkgcvsrc to avoid the usage of
 ## these variables.
-ifndef SRCRPMDIR
-SRCRPMDIR = $(WORKDIR)
-endif
-ifndef BUILDDIR
-BUILDDIR = $(WORKDIR)
-endif
-ifndef RPMDIR
-RPMDIR = $(WORKDIR)
-endif
+SRCRPMDIR ?= $(WORKDIR)
+BUILDDIR ?= $(WORKDIR)
+RPMDIR ?= $(WORKDIR)
 ## SOURCEDIR is special; it has to match the CVS checkout directory, 
 ## because the CVS checkout directory contains the patch files. So it basically 
 ## can't be overridden without breaking things. But we leave it a variable
@@ -57,9 +49,8 @@
 endif
 
 # The repository and the clients we use for the files
-ifndef REPOSITORY
-REPOSITORY = http://cvs.fedora.redhat.com/repo/extras
-endif
+REPOSITORY ?= http://cvs.fedora.redhat.com/repo/extras
+UPLOAD_REPOSITORY ?= https://cvs.fedora.redhat.com/repo/extras/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
@@ -87,9 +78,7 @@
 TAG_RELEASE := $(shell echo $(RELEASE) | sed s/\\\./_/g)
 
 # tag to export, defaulting to current tag in the spec file
-ifndef TAG
-TAG=$(TAG_NAME)-$(TAG_VERSION)-$(TAG_RELEASE)
-endif
+TAG?=$(TAG_NAME)-$(TAG_VERSION)-$(TAG_RELEASE)
 
 # where to cvs export temporarily
 TMPCVS := $(WORKDIR)/cvs-$(TAG)
@@ -139,11 +128,11 @@
 # that we're always using upload.cgi
 ifdef FILES
 
-UPLOAD_REPOSITORY ?= $(REPOSITORY)/upload.cgi
 # we hardwire curl in here because the upload rules are very dependent
 # on curl's behavior on missing pages, ISEs, etc.
-UPLOAD_CHECK	   = curl --silent --fail
-UPLOAD_CLIENT	   = curl --fail --show-error --progress-bar
+UPLOAD_CERT	   = $(shell if test -f $(HOME)/.fedora.cert ; then echo " --cert $(HOME)/.fedora.cert" ; fi)
+UPLOAD_CHECK	   = curl -k $(UPLOAD_CERT) --fail
+UPLOAD_CLIENT	   = curl -k $(UPLOAD_CERT) --fail --show-error --progress-bar
 
 upload-check = $(UPLOAD_CHECK) -F "name=$(NAME)" -F "md5sum=$${m%%[[:space:]]*}" -F "filename=$$f" $(UPLOAD_REPOSITORY)
 upload-file  = $(UPLOAD_CLIENT) -F "name=$(NAME)" -F "md5sum=$${m%%[[:space:]]*}" -F "file=@$$f" $(UPLOAD_REPOSITORY)