Skip to content

Commit

Permalink
- do no use "--nosignature" on rpm v3
Browse files Browse the repository at this point in the history
  • Loading branch information
adrianschroeter committed Mar 29, 2012
1 parent 2c61068 commit 7d50cb6
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions build
Expand Up @@ -2002,8 +2002,15 @@ for SPECFILE in "${SPECFILES[@]}" ; do
if test "$BUILDTYPE" = spec ; then
test -z "$BUILD_RPM_BUILD_STAGE" && BUILD_RPM_BUILD_STAGE=-ba

rpmbuild=rpmbuild
test -x $BUILD_ROOT/usr/bin/rpmbuild || rpmbuild=rpm

# XXX: move _srcdefattr to macro file?
rpmbopts=("$BUILD_RPM_BUILD_STAGE" "--nosignature" "--define" "_srcdefattr (-,root,root)")
rpmbopts=("$BUILD_RPM_BUILD_STAGE" "--define" "_srcdefattr (-,root,root)")
if [ "$rpmbuild" == "rpmbuild" ]; then
# use only --nosignature for rpm v4
rpmbopts[${#rpmbopts[@]}]="--nosignature"
fi
if [ -n "$ABUILD_TARGET" ]; then
rpmbopts[${#rpmbopts[@]}]="--target=$ABUILD_TARGET"
fi
Expand All @@ -2024,9 +2031,6 @@ for SPECFILE in "${SPECFILES[@]}" ; do
rpmbopts[${#rpmbopts[@]}]="RSYNCDONE 1"
fi

rpmbuild=rpmbuild

test -x $BUILD_ROOT/usr/bin/rpmbuild || rpmbuild=rpm
# su involves a shell which would require even more
# complicated quoting to bypass than this
toshellscript $rpmbuild \
Expand Down

0 comments on commit 7d50cb6

Please sign in to comment.