devel/common Makefile.common,1.21,1.22

[Jeremy Katz (katzj)]

Author: katzj

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

Modified Files:
	Makefile.common 
Log Message:
* new makefile target to do a test build using mock
* fix make srpm to use dist_defines



Index: Makefile.common
===================================================================
RCS file: /cvs/extras/devel/common/Makefile.common,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Makefile.common	7 Jun 2005 20:31:46 -0000	1.21
+++ Makefile.common	12 Jun 2005 23:11:25 -0000	1.22
@@ -221,6 +221,15 @@
 	@cvs update sources .cvsignore
 endif
 
+# allow overriding buildarch so you can do, say, an i386 build on x86_64
+ifndef BUILDARCH
+BUILDARCH := $(shell rpm --eval "%{_arch}")
+endif
+
+# test build in mock
+mockbuild : srpm
+	mock $(MOCKARGS) -r fedora-$(DISTVAL)-$(BUILDARCH)-core.cfg $(NAME)-$(VERSION)-$(RELEASE).src.rpm
+
 # build for a particular arch
 $(ARCHES) : sources $(TARGETS)
 	$(RPM_WITH_DIRS) --target $@ -ba $(SPECFILE)
@@ -283,7 +292,7 @@
 
 ## use this to build an srpm locally
 srpm: sources $(TARGETS)
-	$(RPM_WITH_DIRS) --nodeps -bs $(SPECFILE)
+	$(RPM_WITH_DIRS) $(DIST_DEFINES) --nodeps -bs $(SPECFILE)
 
 verrel:
 	@echo $(NAME)-$(VERSION)-$(RELEASE)
@@ -379,6 +388,7 @@
 	@echo "	srpm			Create a srpm"
 	@echo "	tag			Tag sources as \"$(TAG)\""
 	@echo "	build			Request build of \"$(TAG)\" for $(TARGET)"
+	@echo " mockbuild		Local test build using mock"
 	@echo "	verrel			Echo \"$(NAME)-$(VERSION)-$(RELEASE)\""
 	@echo "	new			Diff against last tag"
 	@echo "	clog			Make a clog file containing top changelog entry"