[NEW PATCH] Don't override the rpm topdir macro settings (via gerrit-bot)

Federico Simoncelli fsimonce at redhat.com
Wed Sep 7 15:23:17 UTC 2011


New patch submitted by Federico Simoncelli (fsimonce at redhat.com)

You can review this change at: http://gerrit.usersys.redhat.com/826

commit 5199a6e34adde8bd8f8470f4f4be3721371fe663
Author: Federico Simoncelli <fsimonce at redhat.com>
Date:   Wed Aug 17 13:37:28 2011 +0000

    Don't override the rpm topdir macro settings
    
    Change-Id: Ia84386fb980745107c7d664900effcbc0bb2d18e

diff --git a/Makefile.am b/Makefile.am
index 49bd3cb..d903c49 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,11 +7,11 @@
 #
 
 SUBDIRS = vdsm vdsm_cli vds_bootstrap vdsm_reg vdsm_hooks
+
 EXTRA_DIST = vdsm.spec
 
-rpmversion = @PACKAGE_VERSION@
-rpmrelease = @PACKAGE_RELEASE@
-RPMTOP = $(PWD)/rpmtop
+CLEANFILES = \
+	$(DIST_ARCHIVES)
 
 check-local:
 	$(PYFLAKES) $(SUBDIRS)
@@ -19,15 +19,10 @@ check-local:
 .PHONY: srpm rpm
 
 srpm: dist
-	$(MKDIR_P) $(RPMTOP)/{RPMS,SRPMS,SOURCES,BUILD}
-	rpmbuild -ts \
-		--define="_topdir $(RPMTOP)" \
-		--define="_sourcedir $(PWD)" $(DIST_ARCHIVES)
+	rpmbuild -ts --define="extra_release $(BUILDID)" $(DIST_ARCHIVES)
 
 rpm: dist
-	rpmbuild -ta \
-		--define="extra_release $(BUILDID)" \
-		--define="_topdir $(RPMTOP)" $(DIST_ARCHIVES)
+	rpmbuild -ta --define="extra_release $(BUILDID)" $(DIST_ARCHIVES)
 
 dist-hook: gen-ChangeLog
 




More information about the vdsm-patches mailing list