- reverted last change

- if no-init given set SPECS/SOURCES dirs to . in cache_rpm_dump

Changed files:
    builder.sh -> 1.423

diff --git a/builder.sh b/builder.sh
index a5733e40a1eac7706d282db2683765ed3bb65979..78a05cbe754fc4c9cd02b725a9303b8e390be6c9 100644 (file)
--- a/builder.sh
+++ b/builder.sh
@@ -406,7 +406,12 @@ EOF
                ARGS='--nodigest --nosignature --nobuild'
                ;;
        esac
-       $RPMBUILD --rcfile .builder-rpmrc $ARGS --nodeps --define "prep $dump" $RPMOPTS $BCOND $TARGET_SWITCH $SPECFILE 2>&1
+       if [ "$NOINIT" != "yes" ] ; then
+               ARGDIRS=''
+       else
+               ARGDIRS='--define "_specdir ." --define "_sourcedir ."'
+       fi
+       $RPMBUILD --rcfile .builder-rpmrc $ARGS $ARGDIRS --nodeps --define "prep $dump" $BCOND $TARGET_SWITCH $SPECFILE 2>&1
        `
        if [ $? -gt 0 ]; then
                error=$(echo "$rpm_dump" | sed -ne '/^error:/,$p')