--- common/Makefile.common 2008/07/30 18:02:28 1.4 +++ common/Makefile.common 2017/11/24 18:39:04 1.13 @@ -5,7 +5,7 @@ # Copyright (C) 2004-2005 Red Hat, Inc. # Copyright (C) 2005 Fedora Foundation # -# $Id: Makefile.common,v 1.12 2008/03/28 14:38:42 slords Exp $ +# $Id: Makefile.common,v 1.12 2013/11/11 14:41:28 unnilennium Exp $ # Define the common dir. # This needs to happen first. @@ -46,7 +46,7 @@ SRCRPMDIR ?= $(WORKDIR) BUILDDIR ?= $(WORKDIR) RPMDIR ?= $(WORKDIR) MOCKDIR ?= $(WORKDIR) -MOCKCFG ?= smeserver-$(SMEVAL)-$(BUILDARCH)-contribs +MOCKCFG ?= smeserver-$(SMEVAL)-$(BUILDARCH)-base ## 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 @@ -94,8 +94,8 @@ include $(CVS_EXTRAS_RC) endif # The repository and the clients we use for the files -REPOSITORY ?= http://lordsfam.net/yum/builds/source -UPLOAD_REPOSITORY ?= /builds/source +REPOSITORY ?= http://buildsys.contribs.org/source +UPLOAD_REPOSITORY ?= /build/builds/source # 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 @@ -291,7 +291,7 @@ install-short: sources $(TARGETS) CVS_ROOT := $(shell if [ -f CVS/Root ] ; then cat CVS/Root ; fi) CVS_REPOSITORY := $(shell if [ -f CVS/Repository ] ; then cat CVS/Repository ; fi) -CVS_URL := cvs://smecontribs.cvs.sourceforge.net:/cvsroot/smecontribs?$(CVS_REPOSITORY)\#$(TAG) +CVS_URL := cvs://shell.koozali.org/cvs/smecontribs?$(CVS_REPOSITORY)\#$(TAG) ## create a clean exported copy in $(TMPCVS) export:: sources @@ -322,8 +322,13 @@ check: test-srpm done; ## use this to build an srpm locally +ifneq (, $(filter contribs7 contribs8 contribs9, $(BRANCH))) +srpm: sources $(TARGETS) + $(RPM_WITH_DIRS) $(DIST_DEFINES) --define _source_filedigest_algorithm=md5 --nodeps -bs $(SPECFILE) +else srpm: sources $(TARGETS) $(RPM_WITH_DIRS) $(DIST_DEFINES) --nodeps -bs $(SPECFILE) +endif test-srpm: srpm @@ -412,7 +417,7 @@ ifndef $(BODHI_USER) BODHI_USER=$(USER) endif -ifneq (, $(filter contribs7 contribs8, $(BRANCH))) +ifneq (, $(filter contribs7 contribs8 contribs9, $(BRANCH))) update: bodhi endif