--- common/Makefile.common	2008/07/30 18:02:34	1.13
+++ common/Makefile.common	2022/06/08 18:49:05	1.21
@@ -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.20 2017/11/24 18:53:43 jpp Exp $
 
 # Define the common dir.
 # This needs to happen first.
@@ -26,7 +26,7 @@ TARGET := $(word 1, $(BRANCHINFO))
 DIST = $(word 2, $(BRANCHINFO))
 DISTVAR = $(word 3, $(BRANCHINFO))
 DISTVAL = $(word 4, $(BRANCHINFO))
-DISTDEF = $(shell echo  $(DIST) | sed -e s/^\\\.// )
+DISTDEF = $(shell echo  $(DIST) | sed -e s/^\\\.//| sed -e s/\\\./_/ )
 SMEVAL = $(word 5, $(BRANCHINFO))
 DIST_DEFINES = --define "dist $(DIST)" --define "$(DISTVAR) $(DISTVAL)" --define "$(DISTDEF) 1" --define "sme $(SMEVAL)"
 
@@ -46,7 +46,7 @@ SRCRPMDIR ?= $(WORKDIR)
 BUILDDIR ?= $(WORKDIR)
 RPMDIR ?= $(WORKDIR)
 MOCKDIR ?= $(WORKDIR)
-MOCKCFG ?= smeserver-$(SMEVAL)-$(BUILDARCH)-core
+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://smeserver.cvs.sourceforge.net:/cvsroot/smeserver?$(CVS_REPOSITORY)\#$(TAG)
+CVS_URL		:= cvs://shell.koozali.org/cvs/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