janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-28 07:43:55 +01:00
Code Activity

rpmdist.mk: Suffixed LAST_RPM_VERSION with flavour

Browse source
This commit is contained in:
Jan Lindemann 2007-08-29 00:49:50 +00:00 • committed by Jan Lindemann
commit 61a36a5d8b
1 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
make/rpmdist.mk
View file

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