janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-19 13:17:39 +01:00
Code Activity

VERSION, rpmdist.mk: Fix to rpm build machinery

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2014-04-28 17:35:11 +00:00
commit 2ff8a4b038
2 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
VERSION
View file

@ -1 +1 @@
1.2.4-15-dev 1.2.4-16-dev

15
make/rpmdist.mk
View file

@ -66,6 +66,13 @@ unexport RPM_VERSION VERSION DIST_SRC_DIR
include $(MODDIR)/make/tag-rules.mk include $(MODDIR)/make/tag-rules.mk
include $(MODDIR)/make/upload-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: all:
install: install:
clean: rpm-clean clean: rpm-clean
@ -79,7 +86,8 @@ rpm-upload-rc: rpm-upload-RC.dist
rpm-clean: clean.rpm clean.mkspec rpm-clean: clean.rpm clean.mkspec
rpm-uninstall: config rpmuninstall.dist rpm-uninstall: config rpmuninstall.dist
rpm-build: config rpmbuild.dist rpm-build:
$(BUILD_PACKAGE_SH) build
rpm-install: config rpminstall.dist rpm-install: config rpminstall.dist
rpm-reinstall: rpm-uninstall rpm-clean rpm-install rpm-reinstall: rpm-uninstall rpm-clean rpm-install
rpm-rebuild: rpm-clean rpm-build rpm-rebuild: rpm-clean rpm-build
@ -268,11 +276,6 @@ rpm-release: rpm-update-release
# doesn't work # doesn't work
# rpm-release-update: rpm-release rpm-update # 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: rpm-release-reinstall:
$(BUILD_PACKAGE_SH) release $(BUILD_PACKAGE_SH) release