From da701042b5f6299842401295d8623d98d0a763ba Mon Sep 17 00:00:00 2001 From: John McIver Date: Tue, 7 Jul 2020 22:31:51 -0600 Subject: [PATCH] Fix buildrpm.sh "-r" option used for RPM options specification The "-r" option now concatenates using the rpmbuild_options variable. The "-r" option in prior versions of buildrpm.sh concatenated using the configure_options variable, which uses special delineation for Autoconf options (first word of argument string is "configure_options"). This resulted in an RPM build failure as the Autoconf options would contain nested RPM option statements. Signed-off-by: John K. McIver III --- contrib/dist/linux/buildrpm.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/dist/linux/buildrpm.sh b/contrib/dist/linux/buildrpm.sh index 3b609ee574..8e749ec621 100755 --- a/contrib/dist/linux/buildrpm.sh +++ b/contrib/dist/linux/buildrpm.sh @@ -185,7 +185,7 @@ while getopts bn:omif:t:dc:r:sR:h flag; do ;; c) configure_options="$configure_options $OPTARG" ;; - r) configure_options="$rpmbuild_options $OPTARG" + r) rpmbuild_options="$rpmbuild_options $OPTARG" ;; R) rpmtopdir="$OPTARG" ;;