Changes in rpmbuild 4.20 break defining macros using --eval "%define
..." for noarch packages. While this is a bug, it is possible and
recommended to define macros using option --define instead, so let's
just do that.
Signed-off-by: Jean Delvare <jdelv...@suse.de>
---
quilt/setup.in | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
--- quilt.orig/quilt/setup.in 2025-02-14 13:28:08.851871986 +0100
+++ quilt/quilt/setup.in 2025-03-05 17:59:17.145287368 +0100
@@ -245,14 +245,14 @@ inspect()
echo -n "### rpmbuild: " >&4
PATH="$tmpdir/bin:$PATH" \
- rpmbuild --eval "%define _sourcedir $abs_sourcedir" \
- --eval "%define _specdir $specdir" \
- --eval "%define _builddir $tmpdir/build" \
- --eval "%define __patch $tmpdir/bin/patch" \
- --eval "%define __tar $tmpdir/bin/tar" \
- --eval "%define __unzip $tmpdir/bin/unzip" \
- --eval "%define __7zip $tmpdir/bin/7z" \
- --eval "$DEFINE_FUZZ" \
+ rpmbuild --define "_sourcedir $abs_sourcedir" \
+ --define "_specdir $specdir" \
+ --define "_builddir $tmpdir/build" \
+ --define "__patch $tmpdir/bin/patch" \
+ --define "__tar $tmpdir/bin/tar" \
+ --define "__unzip $tmpdir/bin/unzip" \
+ --define "__7zip $tmpdir/bin/7z" \
+ "${DEFINE_FUZZ[@]}" \
--nodeps \
-bp "$specdir/$specfile" < /dev/null >&5 2>&5
status=$?
@@ -318,6 +318,7 @@ eval set -- "$options"
export QUILT_SETUP_FAST=1
prefix=
sourcedir=
+declare -a DEFINE_FUZZ
while true
do
@@ -335,7 +336,7 @@ do
shift 2 ;;
--fuzz)
# Only works with rpm 4.6 and later
- DEFINE_FUZZ="%define _default_patch_fuzz $2"
+ DEFINE_FUZZ=( "--define" "_default_patch_fuzz $2" )
shift 2 ;;
--slow)
QUILT_SETUP_FAST=
--
Jean Delvare
SUSE L3 Support
_______________________________________________
Quilt-dev mailing list
Quilt-dev@nongnu.org
https://lists.nongnu.org/mailman/listinfo/quilt-dev
