From 61a36a5d8bbd6f17fb887a133be4c05bae20900b Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Wed, 29 Aug 2007 00:49:50 +0000
Subject: [PATCH] rpmdist.mk: Suffixed LAST_RPM_VERSION with flavour

---
 make/rpmdist.mk | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/make/rpmdist.mk b/make/rpmdist.mk
index 29d1f6d6..f87a4315 100644
--- a/make/rpmdist.mk
+++ b/make/rpmdist.mk
@@ -1,5 +1,4 @@
-UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh
-
+UPLOAD_SH                 = $(MOD_SCRIPT_DIR)/upload.sh
 RPM_PROJECT              ?= $(FLAVOUR_PREFIX)$(PROJECT)
 MKSPEC_SH                ?= $(MOD_SCRIPT_DIR)/mkspec_wrapper.sh $(TOPDIR)/make/mkspec.sh
 FTP_SRC_GROUP            ?= $(shell id -g)
@@ -15,7 +14,8 @@ FTP_HOST                 ?= ftp.jannet.de
 FTP_HOST_LOGIN           ?= root
 RPM_PROJECT              ?= $(PROJECT)
 RPM_VERSION              ?= $(DIST_VERSION)
-LAST_RPM_VERSION         ?= $(shell sed 's/-dev$$//' $(TOPDIR)/LAST_RPM_VERSION 2>/dev/null)
+LAST_RPM_VERSION_FILE     = $(TOPDIR)/LAST_RPM_VERSION$(FLAVOUR_SUFFIX)
+LAST_RPM_VERSION         ?= $(shell sed 's/-dev$$//' $(LAST_RPM_VERSION_FILE) 2>/dev/null)
 RPM_ARCH                 ?= i586
 RPMBUILD                 ?= rpmbuild
 CHECK_CVS_SYNC_BEFORE_RPM_RELEASE ?= true
@@ -44,8 +44,6 @@ 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)
 RPM_REQUIRES_DEVEL       += $(RPM_PROJECT)-run = $(RPM_VERSION)
 
-
-
 unexport RPM_VERSION VERSION DIST_SRC_DIR
 
 include $(MODDIR)/make/tag-rules.mk
@@ -190,11 +188,11 @@ rpm-release: rpm-update-release
 		echo "+ version $(RPM_VERSION) doesn't match latest released rpm version "\
 			"$(LAST_RPM_VERSION), building a new release" ;\
 		make rpm-clean update-repo.dist || exit 1;\
-		cp VERSION LAST_RPM_VERSION ;\
-		if ! grep -q LAST_RPM_VERSION CVS/Entries; then \
-			cvs add LAST_RPM_VERSION ;\
+		cp VERSION $(LAST_RPM_VERSION_FILE) ;\
+		if ! grep -q $(LAST_RPM_VERSION_FILE) CVS/Entries; then \
+			cvs add $(LAST_RPM_VERSION_FILE) ;\
 		fi ;\
-		cvs commit -m "o $(RPM_VERSION)" LAST_RPM_VERSION ;\
+		cvs commit -m "o $(RPM_VERSION)" $(LAST_RPM_VERSION_FILE) ;\
 	else \
 		echo "+ version matches latest released rpm version" ;\
 	fi