- simplify

Changed files:
    repackage.sh -> 1.8

diff --git a/repackage.sh b/repackage.sh
index 3fde98d98ab3de9a8cd8024e44321c2b40ab872c..d5e5bfba02527c71382720c246773d13e4b92b6a 100644 (file)
--- a/repackage.sh
+++ b/repackage.sh
@@ -11,13 +11,13 @@ set -e
 
 rpmbuild() {
        set -x
-       /usr/bin/rpmbuild ${TARGET:+--target $TARGET} --short-circuit --define '_source_payload w9.gzdio' "$@" || exit
+       /usr/bin/rpmbuild ${TARGET:+--target $TARGET} $BCONDS --short-circuit --define '_source_payload w9.gzdio' "$@" || exit
 }
 
-bconds=$(./builder --show-bconds "$@")
+BCONDS=$(./builder --show-bconds "$@")
 # ignore output from older builders whose output is not compatible.
 if [ "$(echo "$bconds" | wc -l)" -gt 1 ]; then
-       bconds=""
+       BCONDS=""
 fi
 
 SPECFILE="$1"
@@ -28,6 +28,6 @@ fi
 
 # just create the rpm's if -bb is somewhere in the args
 if [[ *$@* != *-bb* ]]; then
-       rpmbuild -bi $bconds "$@"
+       rpmbuild -bi "$@"
 fi
-rpmbuild -bb --define 'clean %{nil}' $bconds "$@"
+rpmbuild -bb --define 'clean %{nil}' "$@"