mirror of
ssh://git.janware.com/srv/git/janware/proj/jw-pkg
synced 2026-01-24 22:50:39 +01:00
rpmdist.mk: Remove duplicate flavour prefix from requirements
This commit is contained in:
parent
4e124d48aa
commit
4e3baa5472
1 changed files with 2 additions and 2 deletions
|
|
@ -76,8 +76,8 @@ src-dir.dist:
|
||||||
cpfiles.dist: 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)
|
$(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) \
|
sh $(MKSPEC_SH) -V $(RPM_VERSION) -S $(notdir $(PCKG_TAR)) -N $(RPM_PROJECT) \
|
||||||
-R "$(shell echo '$(RPM_REQUIRES_RUN)' | $(add_flavour_prefix))" \
|
-R "$(RPM_REQUIRES_RUN)" \
|
||||||
-D "$(shell echo '$(RPM_REQUIRES_DEVEL)' | $(add_flavour_prefix))" -P $(PROJECT) \
|
-D "$(RPM_REQUIRES_DEVEL)" -P $(PROJECT) \
|
||||||
> $(DIST_SRC_DIR)/$(RPM_PROJECT)-$(RPM_VERSION).spec
|
> $(DIST_SRC_DIR)/$(RPM_PROJECT)-$(RPM_VERSION).spec
|
||||||
echo $(RPM_VERSION) > $(DIST_SRC_DIR)/VERSION
|
echo $(RPM_VERSION) > $(DIST_SRC_DIR)/VERSION
|
||||||
touch $@
|
touch $@
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue