diff --git a/make/rpmdist.mk b/make/rpmdist.mk index df948368..16db0621 100644 --- a/make/rpmdist.mk +++ b/make/rpmdist.mk @@ -71,15 +71,11 @@ cpmod.dist: done touch $@ -ifneq ($(RPM_REQUIRED),) -RPM_REQUIRED_FLAG = -R "$(RPM_REQUIRED)" -endif - cpfiles.dist: mkdir -p $(DIST_SRC_DIR) cp Makefile $(DIST_SRC_DIR) cp configure.ac.tmpl $(DIST_SRC_DIR) - sh $(MKSPEC_SH) -V $(RPM_VERSION) -S $(notdir $(PCKG_TAR)) -N $(RPM_PROJECT) $(RPM_REQUIRED_FLAG) \ + sh $(MKSPEC_SH) -V $(RPM_VERSION) -S $(notdir $(PCKG_TAR)) -N $(RPM_PROJECT) -R "$(RPM_REQUIRED)" \ -P $(PROJECT) \ > $(DIST_SRC_DIR)/$(RPM_PROJECT)-$(RPM_VERSION).spec echo $(RPM_VERSION) > $(DIST_SRC_DIR)/VERSION diff --git a/scripts/mkspec-wrapper.sh b/scripts/mkspec-wrapper.sh index 9e34b183..08eadffa 100644 --- a/scripts/mkspec-wrapper.sh +++ b/scripts/mkspec-wrapper.sh @@ -11,9 +11,9 @@ usage() [ "$1" ] && exit $1 } -set -- `getopt P:T:V:S:N:hR: $*` +set -- `getopt P:T:V:S:N:hR: "$@"` -while [ $1 != -- ]; do +while [ "$1" != -- ]; do case $1 in -h) usage 0;; @@ -30,7 +30,10 @@ case $1 in NAME="$2" shift;; -R) - REQUIRES="$2" + while [ "`echo $2 | cut -c1`" != "-" ]; do + REQUIRES="$REQUIRES $2" + shift + done shift;; -P) PROJECT="$2"