From 5a00da68e8c33b4404bd2f77aca7293cff1bd4d5 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Wed, 22 Aug 2007 14:42:39 +0000 Subject: [PATCH] rpmdist.mk: Fix rpm versions leaking to next - Unexport RPM_VERSION VERSION DIST_SRC_DIR - Beautify logging --- make/rpmdist.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/make/rpmdist.mk b/make/rpmdist.mk index a07e1a1d..897fca3a 100644 --- a/make/rpmdist.mk +++ b/make/rpmdist.mk @@ -43,6 +43,8 @@ SRPMS_DIR = /usr/src/packages/SRPMS DIST_DIRS = $(DIST_SRC_DIR) $(DIST_PCKG_DIR) DIST_PCKG_RPM = $(DIST_PCKG_DIR)/$(PCKG_RPM_RUN_I386) $(DIST_PCKG_DIR)/$(PCKG_RPM_DEVEL_I386) +unexport RPM_VERSION VERSION DIST_SRC_DIR + include $(MODDIR)/make/tag-rules.mk include $(MODDIR)/make/upload-rules.mk @@ -198,7 +200,8 @@ rpm-next-build: rpm-release: rpm-update-release @if [ "$(VERSION)" != "$(LAST_RPM_VERSION)" ]; then \ $(check_cvs_sync) ;\ - echo "+ version doesn't match latest released rpm version, building a new release" ;\ + echo "+ version $(VERSION) doesn't match latest released rpm version "\ + "$(LAST_RPM_VERSION), building a new release" ;\ make update-repo.dist || exit 1;\ cp VERSION LAST_RPM_VERSION ;\ if ! grep -q LAST_RPM_VERSION CVS/Entries; then \