From 390e920e8505c8333fadd404f02d51ae20066624 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Tue, 14 Aug 2007 12:48:42 +0000
Subject: [PATCH] rpmdist.mk: Follow rpmbuild replacing rpm

  - Fix
    - Rpmbuild instead of rpm
    - Tar option order

  - Prefixed most targets by rpm-, to provide for later extension to
    other targets
---
 make/rpmdist.mk | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/make/rpmdist.mk b/make/rpmdist.mk
index 27c8b7ed..ec96d331 100644
--- a/make/rpmdist.mk
+++ b/make/rpmdist.mk
@@ -18,6 +18,7 @@ FTP_HOST                 ?= ftp.jannet.de
 FTP_HOST_LOGIN           ?= root
 RPM_PROJECT              ?= $(PROJECT)
 RPM_VERSION              ?= $(VERSION)
+RPMBUILD                 ?= rpmbuild
 
 include $(MODDIR)/make/tag-defs.mk
 
@@ -44,15 +45,19 @@ include $(MODDIR)/make/tag-rules.mk
 include $(MODDIR)/make/upload-rules.mk
 
 all:
-upload_stable: upload_STABLE.dist
-upload_rc: upload_RC.dist
-tgz: $(PCKG_TAR)
-distclean: rpmclean
-clean: rpmclean
-ftag: ftag.dist
-rpmrelease: upload.dist
+install:
+clean: rpm-clean
+distclean: rpm-clean
 
-rpmclean:
+tgz: $(PCKG_TAR)
+ftag: ftag.dist
+
+rpm-upload-stable: rpm-upload-STABLE.dist
+rpm-upload-rc: rpm-upload-RC.dist
+rpm-release: upload.dist
+rpm-clean: clean.rpm
+
+clean.rpm:
 	rm -rf $(DIST_SRC_DIR) $(PCKG_TAR) *.dist
 
 cpmod.dist:
@@ -86,15 +91,15 @@ cpfiles.dist:
 
 %.tar.gz: cpfiles.dist cpmod.dist
 	mkdir -p $(DIST_PCKG_DIR)
-	tar -czvf $@ -C $(dir $(DIST_SRC_DIR)) $(notdir $(DIST_SRC_DIR)) \
-		$(addprefix --exclude=,$(patsubst %,"%",$(basename $(shell find . -name *.in | sed 's%\./%*/%; s%\(.*\)%\1%g'))))
+	tar $(addprefix --exclude=,$(patsubst %,"%",$(basename $(shell find . -name *.in | sed 's%\./%*/%; s%\(.*\)%\1%g')))) \
+		-czvf $@ -C $(dir $(DIST_SRC_DIR)) $(notdir $(DIST_SRC_DIR))
 
 %.src.rpm: %.tar.gz
 	rpm -ts $<
 	cp $(SRPMS_DIR)/$(notdir $@) $@
 
 $(DIST_PCKG_RPM): $(DIST_PCKG_DIR)/$(PCKG_TAR)
-	if [ $< -nt $(RPMS_DIR)/$(notdir $@) ]; then rpm -tb $<; fi
+	if [ $< -nt $(RPMS_DIR)/$(notdir $@) ]; then $(RPMBUILD) -tb $<; fi
 	cp $(RPMS_DIR)/$(notdir $@) $@
 
 $(DIST_PCKG_DIR)/CURRENT_%: $(TOPDIR)/VERSION
@@ -106,7 +111,7 @@ rpminstall.dist: $(DIST_PCKG_RPM)
 	sudo /bin/rpm -U $<
 	touch $@
 
-upload_%.dist: %_$(PROJECT_CAPNAME)_RPM_RUN_I386
+upload-%.dist: %_$(PROJECT_CAPNAME)_RPM_RUN_I386
 	cvs commit $<
 	$(UPLOAD_SH) $< $(REMOTE_TARGET_PREFIX)$(PCKG_ROOT)/$<:640:750:$(FTP_RUN_USER).$(FTP_RUN_GROUP)
 	touch $@