janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-23 06:30:38 +01:00
Code Activity

rpmdist.mk: Make pkg-build.dist depend on $(VERSION_FILE)

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2018-12-27 16:59:28 +00:00
commit eb97f44ddb
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
make/rpmdist.mk
View file

@ -69,9 +69,9 @@ ifeq ($(CREATE_DEVEL),true)
BINARY_RPM += $(DIST_PCKG_DIR)/$(PCKG_RPM_DEVEL_I386) BINARY_RPM += $(DIST_PCKG_DIR)/$(PCKG_RPM_DEVEL_I386)
endif endif
DIST_PCKG_SRPM = $(BINARY_RPM) $(DIST_PCKG_DIR)/$(PCKG_RPM_SRC) DIST_PCKG_SRPM = $(BINARY_RPM) $(DIST_PCKG_DIR)/$(PCKG_RPM_SRC)
# to be replaced by pkg.sh
RPM_REQUIRES_DEVEL += $(call proj_query, pkg-requires --dont-expand-version-macros $(PROJ_QUERY_PKG_REQUIRES_EXTRA_ARGS) devel $(PROJECT)) RPM_REQUIRES_DEVEL += $(call proj_query, pkg-requires --dont-expand-version-macros $(PROJ_QUERY_PKG_REQUIRES_EXTRA_ARGS) devel $(PROJECT))
RPM_REQUIRES_RUN += $(call proj_query, pkg-requires --dont-expand-version-macros $(PROJ_QUERY_PKG_REQUIRES_EXTRA_ARGS) run $(PROJECT)) RPM_REQUIRES_RUN += $(call proj_query, pkg-requires --dont-expand-version-macros $(PROJ_QUERY_PKG_REQUIRES_EXTRA_ARGS) run $(PROJECT))
RPM_CONFLICTS_DEVEL += $(call proj_query, pkg-conflicts --dont-expand-version-macros $(PROJ_QUERY_PKG_CONFLICTS_EXTRA_ARGS) devel $(PROJECT)) RPM_CONFLICTS_DEVEL += $(call proj_query, pkg-conflicts --dont-expand-version-macros $(PROJ_QUERY_PKG_CONFLICTS_EXTRA_ARGS) devel $(PROJECT))
RPM_CONFLICTS_RUN += $(call proj_query, pkg-conflicts --dont-expand-version-macros $(PROJ_QUERY_PKG_CONFLICTS_EXTRA_ARGS) run $(PROJECT)) RPM_CONFLICTS_RUN += $(call proj_query, pkg-conflicts --dont-expand-version-macros $(PROJ_QUERY_PKG_CONFLICTS_EXTRA_ARGS) run $(PROJECT))
@ -118,7 +118,7 @@ pkg-update: pkgupdate.dist
pkg-upload-local: pkg-upload-local.dist pkg-upload-local: pkg-upload-local.dist
clean.rpm: clean.rpm:
$(RM) -rf $(DIST_DIR) *.dist CURRENT_RPM_SRC $(RM) -rf $(DIST_DIR) *.dist
#ifeq ($(PROJECT_DESCR_FILE),) #ifeq ($(PROJECT_DESCR_FILE),)
# #
@ -135,7 +135,7 @@ clean.rpm:
# #
#endif #endif
pkg-build.dist: pkg-build.dist: $(VERSION_FILE)
$(PKG_SH) build $(PKG_SH) build
touch $@ touch $@