diff --git a/rust-package.sh b/rust-package.sh index d58b1764f1e5c8b4780c66adae68feb908262f1c..a3c62d9a63209298ecee6ca7fe60eaa8a837b637 100755 --- a/rust-package.sh +++ b/rust-package.sh @@ -1,8 +1,9 @@ #!/bin/bash -set -x set -e +TARGET="-t plain" + POSITIONAL=() while [ $# -gt 0 ] ; do case $1 in @@ -25,13 +26,15 @@ set -- "${POSITIONAL[@]}" # restore positional parameters NAME=${POSITIONAL[0]} rust2rpm ${PATCH} ${TARGET} ${POSITIONAL[@]} +sed -i -re 's/(BuildRequires:\s*)\((crate[\(][^\)]+\)).*/&\n\1\2/' \ + rust-${NAME}.spec DOWNLOAD=$(rpmspec -P rust-${NAME}.spec \ | grep Source0 \ | sed -re 's/^Source0:\s+(.*)$/\1/') -curl -L ${DOWNLOAD} > /usr/src/andersb/rpmbuild/SOURCES/$(basename ${DOWNLOAD}) +curl -L ${DOWNLOAD} > ${HOME}/rpmbuild/SOURCES/$(basename ${DOWNLOAD}) if [ -n "${PATCH}" ] ; then DIFF=$(basename ${DOWNLOAD} | sed -e 's/.crate//')-fix-metadata.diff - cp ${DIFF} /usr/src/andersb/rpmbuild/SOURCES/ + cp ${DIFF} ${HOME}/rpmbuild/SOURCES/ fi -rpmbuild -bs rust-${NAME}.spec rpmbuild -bb rust-${NAME}.spec +rpmbuild -bs rust-${NAME}.spec