From 1a38392699313905e08375a2181b9445ecaa8e54 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Fri, 31 Aug 2007 11:12:59 +0000 Subject: [PATCH] rpmdist.mk: Mkspec.sh is passed $(add_flavour_prefix)ified dependencies now --- make/rpmdist.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/make/rpmdist.mk b/make/rpmdist.mk index 26911210..e202a030 100644 --- a/make/rpmdist.mk +++ b/make/rpmdist.mk @@ -42,7 +42,7 @@ RPMS_DIR = /usr/src/packages/RPMS/$(RPM_ARCH) SRPMS_DIR = /usr/src/packages/SRPMS 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) -RPM_REQUIRES_DEVEL += $(RPM_PROJECT)-run = $(RPM_VERSION) +RPM_REQUIRES_DEVEL += $(patsubst $(FLAVOUR_PREFIX)%,%,$(RPM_PROJECT)-run = $(RPM_VERSION)) unexport RPM_VERSION VERSION DIST_SRC_DIR @@ -76,7 +76,8 @@ src-dir.dist: cpfiles.dist: src-dir.dist $(cvs_files) | grep -v VERSION | cpio -o -H newc | ( cd $(DIST_SRC_DIR); cpio --make-directories -i) sh $(MKSPEC_SH) -V $(RPM_VERSION) -S $(notdir $(PCKG_TAR)) -N $(RPM_PROJECT) \ - -R "$(RPM_REQUIRES_RUN)" -D "$(RPM_REQUIRES_DEVEL)" -P $(PROJECT) \ + -R "$(shell echo '$(RPM_REQUIRES_RUN)' | $(add_flavour_prefix))" \ + -D "$(shell echo '$(RPM_REQUIRES_DEVEL)' | $(add_flavour_prefix))" -P $(PROJECT) \ > $(DIST_SRC_DIR)/$(RPM_PROJECT)-$(RPM_VERSION).spec echo $(RPM_VERSION) > $(DIST_SRC_DIR)/VERSION touch $@