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

rpmdist.mk: Fix rpm versions leaking to next

Browse source 
- Unexport RPM_VERSION VERSION DIST_SRC_DIR
  - Beautify logging
This commit is contained in:
Jan Lindemann 2007-08-22 14:42:39 +00:00 • committed by Jan Lindemann
commit 5a00da68e8
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
make/rpmdist.mk
View file

@ -43,6 +43,8 @@ SRPMS_DIR = /usr/src/packages/SRPMS
DIST_DIRS = $(DIST_SRC_DIR) $(DIST_PCKG_DIR) 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)
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
@ -198,7 +200,8 @@ rpm-next-build:
rpm-release: rpm-update-release rpm-release: rpm-update-release
@if [ "$(VERSION)" != "$(LAST_RPM_VERSION)" ]; then \ @if [ "$(VERSION)" != "$(LAST_RPM_VERSION)" ]; then \
$(check_cvs_sync) ;\ $(check_cvs_sync) ;\
echo "+ version doesn't match latest released rpm version, building a new release" ;\ echo "+ version $(VERSION) doesn't match latest released rpm version "\
"$(LAST_RPM_VERSION), building a new release" ;\
make update-repo.dist || exit 1;\ make update-repo.dist || exit 1;\
cp VERSION LAST_RPM_VERSION ;\ cp VERSION LAST_RPM_VERSION ;\
if ! grep -q LAST_RPM_VERSION CVS/Entries; then \ if ! grep -q LAST_RPM_VERSION CVS/Entries; then \