common Makefile.common,1.79,1.80

[Jesse Keating (jkeating)]

Author: jkeating

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

Modified Files:
	Makefile.common 
Log Message:
Fix syntax for mock (patch from Michael E. Brown)



Index: Makefile.common
===================================================================
RCS file: /cvs/pkgs/common/Makefile.common,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- Makefile.common	23 Oct 2007 13:37:10 -0000	1.79
+++ Makefile.common	30 Oct 2007 18:33:33 -0000	1.80
@@ -49,22 +49,22 @@
 MOCKDIR ?= $(WORKDIR)
 ifeq ($(DISTVAR),epel)
 DISTVAR := rhel
-MOCKCFG ?= fedora-$(DISTVAL)-$(BUILDARCH)-epel.cfg
+MOCKCFG ?= fedora-$(DISTVAL)-$(BUILDARCH)-epel
 else
-MOCKCFG ?= fedora-$(DISTVAL)-$(BUILDARCH).cfg
+MOCKCFG ?= fedora-$(DISTVAL)-$(BUILDARCH)
 ## 4, 5, 6 need -core
 ifeq ($(DISTVAL),4)
-MOCKCFG = fedora-$(DISTVAL)-$(BUILDARCH)-core.cfg
+MOCKCFG = fedora-$(DISTVAL)-$(BUILDARCH)-core
 endif
 ifeq ($(DISTVAL),5)
-MOCKCFG = fedora-$(DISTVAL)-$(BUILDARCH)-core.cfg
+MOCKCFG = fedora-$(DISTVAL)-$(BUILDARCH)-core
 endif
 ifeq ($(DISTVAL),6)
-MOCKCFG = fedora-$(DISTVAL)-$(BUILDARCH)-core.cfg
+MOCKCFG = fedora-$(DISTVAL)-$(BUILDARCH)-core
 endif
 ## Devel builds use -devel mock config
 ifeq ($(BRANCH),devel)
-MOCKCFG = fedora-devel-$(BUILDARCH).cfg
+MOCKCFG = fedora-devel-$(BUILDARCH)
 endif
 endif
 
@@ -301,7 +301,7 @@
 
 # test build in mock
 mockbuild : srpm
-	mock $(MOCKARGS) -r $(MOCKCFG) --resultdir=$(MOCKDIR)/$(TAG) $(SRCRPMDIR)/$(NAME)-$(VERSION)-$(RELEASE).src.rpm
+	mock $(MOCKARGS) -r $(MOCKCFG) --resultdir=$(MOCKDIR)/$(TAG) rebuild $(SRCRPMDIR)/$(NAME)-$(VERSION)-$(RELEASE).src.rpm
 
 # build for a particular arch
 $(ARCHES) : sources $(TARGETS)