From 147587dce8b9ca3759b92f04912b006d9a5ce308 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Tue, 28 Aug 2007 23:55:34 +0000
Subject: [PATCH] rpmdist.mk: Support FLAVOUR_PATH_PREFIX

  - Beautification of the copy process
  - Honour FLAVOUR_PREFIX to RPM_PROJECT
---
 make/rpmdist.mk | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/make/rpmdist.mk b/make/rpmdist.mk
index 3cd7eb48..3bf5deab 100644
--- a/make/rpmdist.mk
+++ b/make/rpmdist.mk
@@ -1,9 +1,6 @@
 UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh
 
-ifeq ($(RPM_PROJECT),)
-RPM_PROJECT              ?= $(PROJECT)
-endif
-
+RPM_PROJECT              ?= $(FLAVOUR_PREFIX)$(PROJECT)
 MKSPEC_SH                ?= $(MOD_SCRIPT_DIR)/mkspec_wrapper.sh $(TOPDIR)/make/mkspec.sh
 FTP_SRC_GROUP            ?= $(shell id -g)
 FTP_SRC_USER             ?= $(shell whoami)
@@ -74,21 +71,16 @@ rpm-reinstall: rpm-uninstall rpm-clean rpm-install
 clean.rpm:
 	rm -rf $(DIST_DIR) *.dist
 
-cpmod.dist:
-	mkdir -p $(DIST_SRC_DIR)
-	$(cvs_files) | cpio -o -H newc | ( cd $(DIST_SRC_DIR); cpio --make-directories -i)
-	touch $@
-
 cpfiles.dist:
 	mkdir -p $(DIST_SRC_DIR)
-	cp $(wildcard Makefile configure.ac.tmpl) $(DIST_SRC_DIR)
+	$(cvs_files) | grep -v VERSION | cpio -o -H newc | ( cd $(DIST_SRC_DIR); cpio --make-directories -i)
 	sh $(MKSPEC_SH) -V $(RPM_VERSION) -S $(notdir $(PCKG_TAR)) -N $(RPM_PROJECT) \
 		-R "$(RPM_REQUIRES_RUN)" -D "$(RPM_REQUIRES_DEVEL)" -P $(PROJECT) \
 		> $(DIST_SRC_DIR)/$(RPM_PROJECT)-$(RPM_VERSION).spec
 	echo $(RPM_VERSION) > $(DIST_SRC_DIR)/VERSION
 	touch $@
 
-%.tar.gz: cpfiles.dist cpmod.dist
+%.tar.gz: cpfiles.dist
 	mkdir -p $(DIST_PCKG_DIR)
 	tar --anchored $(addprefix --exclude=,$(GENERATED)) \
 		-czvf $@ -C $(dir $(DIST_SRC_DIR)) $(notdir $(DIST_SRC_DIR))