--- common/Makefile.common 2009/10/12 21:02:01 1.14 +++ common/Makefile.common 2012/08/03 16:54:13 1.19 @@ -5,7 +5,7 @@ # Copyright (C) 2004-2005 Red Hat, Inc. # Copyright (C) 2005 Fedora Foundation # -# $Id: Makefile.common,v 1.13 2008/07/30 18:02:34 slords Exp $ +# $Id: Makefile.common,v 1.18 2012/06/30 05:57:51 slords Exp $ # Define the common dir. # This needs to happen first. @@ -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://smeserver.cvs.sourceforge.net:/cvsroot/smeserver?$(CVS_REPOSITORY)\#$(TAG) +CVS_URL := cvs://smeserver.cvs.sourceforge.net/cvsroot/smeserver?$(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 sme7 sme8, $(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