diff --git a/make/rpmdist.mk b/make/rpmdist.mk index 99bb7dcd..e760cb60 100644 --- a/make/rpmdist.mk +++ b/make/rpmdist.mk @@ -82,12 +82,13 @@ BINARY_RPM += $(DIST_PCKG_DIR)/$(PCKG_RPM_DEVEL_I386) endif DIST_PCKG_SRPM = $(BINARY_RPM) $(DIST_PCKG_DIR)/$(PCKG_RPM_SRC) -RPM_REQUIRES_DEVEL += $(call proj_query, pkg-requires --dont-expand-version-macros $(PROJ_QUERY_PKG_REQUIRES_EXTRA_ARGS) devel $(PROJECT)) +RPM_REQUIRES_BUILD += $(call proj_query, pkg-requires --dont-expand-version-macros $(PROJ_QUERY_PKG_REQUIRES_EXTRA_ARGS) build $(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_REQUIRES_DEVEL += $(call proj_query, pkg-requires --dont-expand-version-macros $(PROJ_QUERY_PKG_REQUIRES_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_PROVIDES_DEVEL += $(call proj_query, pkg-provides --dont-expand-version-macros $(PROJ_QUERY_PKG_PROVIDES_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_PROVIDES_RUN += $(call proj_query, pkg-provides --dont-expand-version-macros $(PROJ_QUERY_PKG_PROVIDES_EXTRA_ARGS) run $(PROJECT)) +RPM_PROVIDES_DEVEL += $(call proj_query, pkg-provides --dont-expand-version-macros $(PROJ_QUERY_PKG_PROVIDES_EXTRA_ARGS) devel $(PROJECT)) RPM_UPLOAD_OS_NAME = $(shell echo $(OS_NAME_VERSION) | sed 's/-.*//') RPM_UPLOAD_OS_VERSION = $(shell echo $(OS_NAME_VERSION) | sed 's/[^-]\+-//') @@ -348,9 +349,14 @@ ssh-remote: ssh -l root $(TARGET_HOST) endif -echo-requires: - @echo RPM_REQUIRES_RUN = $(RPM_REQUIRES_RUN) - @echo RPM_REQUIRES_DEVEL = $(RPM_REQUIRES_DEVEL) +pkg-requires: + @echo "RPM_REQUIRES_BUILD = $(RPM_REQUIRES_BUILD)" + @echo "RPM_REQUIRES_RUN = $(RPM_REQUIRES_RUN)" + @echo "RPM_REQUIRES_DEVEL = $(RPM_REQUIRES_DEVEL)" + @echo "RPM_CONFLICTS_RUN = $(RPM_CONFLICTS_RUN)" + @echo "RPM_CONFLICTS_DEVEL = $(RPM_CONFLICTS_DEVEL)" + @echo "RPM_PROVIDES_RUN = $(RPM_PROVIDES_RUN)" + @echo "RPM_PROVIDES_DEVEL = $(RPM_PROVIDES_DEVEL)" else # ifneq ($(BUILD_PROJECT_PACKAGE),false)