[NEW PATCH] Don't override the rpm topdir macro settings (via gerrit-bot)
Federico Simoncelli
fsimonce at redhat.com
Wed Aug 17 17:17:24 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 f2a872f0b235dad574674067a1a515adff8430e9
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 f51e595..fff5d8c 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)
dist-hook:
pyflakes $(SUBDIRS)
@@ -19,10 +19,7 @@ dist-hook:
.PHONY: srpm rpm
srpm: dist
- $(MKDIR_P) $(RPMTOP)/{RPMS,SRPMS,SOURCES,BUILD}
- rpmbuild -ts \
- --define="_topdir $(RPMTOP)" \
- --define="_sourcedir $(PWD)" $(DIST_ARCHIVES)
+ rpmbuild -ts $(DIST_ARCHIVES)
rpm: dist
- rpmbuild --define="_topdir $(RPMTOP)" -ta $(DIST_ARCHIVES)
+ rpmbuild -ta $(DIST_ARCHIVES)
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 60de31b..0d47086 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -7,8 +7,6 @@ Summary: Virtual Desktop Server Manager
Name: vdsm
Source: %{vdsm_name}-%{version}.tar.gz
# Url: no upstream project exists
-# tarball built from internal git repo with
-# make tarball rpmversion=<version> rpmrelease=<release>
Version: @PACKAGE_VERSION@
Release: @PACKAGE_RELEASE@%{?dist}
License: GPLv2+
More information about the vdsm-patches
mailing list