diff --git a/scripts/mkspec-wrapper.sh b/scripts/mkspec-wrapper.sh index b082ac1f..a809f486 100644 --- a/scripts/mkspec-wrapper.sh +++ b/scripts/mkspec-wrapper.sh @@ -14,7 +14,7 @@ usage() [ "$1" ] && exit $1 } -set -- `getopt P:T:V:S:N:hR: "$@"` +set -- `getopt P:T:V:S:N:hR:D: "$@"` while [ "$1" != -- ]; do case $1 in @@ -34,7 +34,13 @@ case $1 in shift;; -R) while [ "`echo $2 | cut -c1`" != "-" ]; do - REQUIRES="$REQUIRES $2" + REQUIRES_RUN="$REQUIRES_RUN $2" + shift + done + ;; + -D) + while [ "`echo $2 | cut -c1`" != "-" ]; do + REQUIRES_DEVEL="$REQUIRES_DEVEL $2" shift done ;; @@ -67,10 +73,16 @@ if [ -z "$NAME" ]; then NAME=`pwd | xargs basename` fi -if [ -n "$REQUIRES" ]; then - REQUIRES_RUN=`echo $REQUIRES | sed -e 's/\([a-zA-Z-]\+\) *\([<>=]*\) *\([a-zA-Z0-9\.-]*\)/\1-run \2 \3,/g; s/,$//'` - REQUIRES_DEVEL="$REQUIRES_RUN, $NAME-run = $VERSION-$RELEASE, `echo $REQUIRES_RUN | sed -e 's/-run/-devel/g'`" -fi +REQUIRES="$REQUIRES_RUN $REQUIRES_DEVEL" +#if [ -n "$REQUIRES" ]; then +# REQUIRES_RUN=`echo $REQUIRES | +# sed -e ' +# s/\([a-zA-Z-]\+\) *\([<>=]*\) *\([a-zA-Z0-9\.-]*\)/\1-run \2 \3,/g +# s/,$// +# s/-run-run/-run/ +# '` +# REQUIRES_DEVEL="$REQUIRES_RUN, $NAME-run = $VERSION-$RELEASE, `echo $REQUIRES_RUN | sed -e 's/-run/-devel/g'`" +#fi #echo "REQUIRES_RUN=\"$REQUIRES_RUN\"" #exit