From eb97f44ddbafa72ca23fd154a01d30e7c967ddaf Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Thu, 27 Dec 2018 16:59:28 +0000 Subject: [PATCH] rpmdist.mk: Make pkg-build.dist depend on $(VERSION_FILE) Signed-off-by: Jan Lindemann --- make/rpmdist.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/make/rpmdist.mk b/make/rpmdist.mk index 76e38846..d3aeb9c5 100644 --- a/make/rpmdist.mk +++ b/make/rpmdist.mk @@ -69,9 +69,9 @@ ifeq ($(CREATE_DEVEL),true) BINARY_RPM += $(DIST_PCKG_DIR)/$(PCKG_RPM_DEVEL_I386) endif 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_RUN += $(call proj_query, pkg-requires --dont-expand-version-macros $(PROJ_QUERY_PKG_REQUIRES_EXTRA_ARGS) run $(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_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)) @@ -118,7 +118,7 @@ pkg-update: pkgupdate.dist pkg-upload-local: pkg-upload-local.dist clean.rpm: - $(RM) -rf $(DIST_DIR) *.dist CURRENT_RPM_SRC + $(RM) -rf $(DIST_DIR) *.dist #ifeq ($(PROJECT_DESCR_FILE),) # @@ -135,7 +135,7 @@ clean.rpm: # #endif -pkg-build.dist: +pkg-build.dist: $(VERSION_FILE) $(PKG_SH) build touch $@