From 2ff8a4b0382a24122e3ee6ccf454f61314e37bf2 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@janware.com>
Date: Mon, 28 Apr 2014 17:35:11 +0000
Subject: [PATCH] VERSION, rpmdist.mk: Fix to rpm build machinery

Signed-off-by: Jan Lindemann <jan@janware.com>
---
 VERSION         |  2 +-
 make/rpmdist.mk | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/VERSION b/VERSION
index 4d882baf..006ab5f6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.2.4-15-dev
+1.2.4-16-dev
diff --git a/make/rpmdist.mk b/make/rpmdist.mk
index f3ff4c66..4fef74f5 100644
--- a/make/rpmdist.mk
+++ b/make/rpmdist.mk
@@ -66,6 +66,13 @@ unexport RPM_VERSION VERSION DIST_SRC_DIR
 include $(MODDIR)/make/tag-rules.mk
 include $(MODDIR)/make/upload-rules.mk
 
+BUILD_PACKAGE_SH          = /bin/bash -x $(MOD_SCRIPT_DIR)/build-package.sh \
+	-N $(RPM_PROJECT) \
+	-R "$(RPM_REQUIRES_RUN)" -D "$(RPM_REQUIRES_DEVEL)" -P $(PROJECT) \
+	-m $(MOD_SCRIPT_DIR) -a $(RPM_ARCH) -p $(DIST_PCKG_DIR)
+
+# -t $(DIST_SRC_DIR) # wrong: contains $(RPM_PROJECT)-$(RPM_VERSION) but is expected differently
+
 all:
 install:
 clean: rpm-clean
@@ -79,7 +86,8 @@ rpm-upload-rc: rpm-upload-RC.dist
 
 rpm-clean: clean.rpm clean.mkspec
 rpm-uninstall: config rpmuninstall.dist
-rpm-build: config rpmbuild.dist
+rpm-build:
+	$(BUILD_PACKAGE_SH) build
 rpm-install: config rpminstall.dist
 rpm-reinstall: rpm-uninstall rpm-clean rpm-install
 rpm-rebuild: rpm-clean rpm-build
@@ -268,11 +276,6 @@ rpm-release: rpm-update-release
 # doesn't work
 # rpm-release-update: rpm-release rpm-update
 
-BUILD_PACKAGE_SH = /bin/bash -x $(MOD_SCRIPT_DIR)/build-package.sh \
-	-N $(RPM_PROJECT) \
-	-R "$(RPM_REQUIRES_RUN)" -D "$(RPM_REQUIRES_DEVEL)" -P $(PROJECT) \
-	-m $(MOD_SCRIPT_DIR) -a $(RPM_ARCH) -p $(DIST_PCKG_DIR) -t $(DIST_SRC_DIR)
-
 rpm-release-reinstall:
 	$(BUILD_PACKAGE_SH) release