From: "Justin M. Forbes" <jforbes(a)fedoraproject.org>
While we only add broken out patches if we aren't doing a single tarball
we still need to remove the template markers if we are.
Signed-off-by: Justin M. Forbes <jforbes(a)fedoraproject.org>
---
redhat/genspec.sh | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/redhat/genspec.sh b/redhat/genspec.sh
index fce17298d071..3a80426e348b 100755
--- a/redhat/genspec.sh
+++ b/redhat/genspec.sh
@@ -280,10 +280,11 @@ Used to set the RHEL version.
sed -i "s/%%APPLYPATCH%%/ApplyOptionalPatch $patch\n%%APPLYPATCH%%/"
$SPECFILE
((pnum++))
done
- sed -i "s/%%PATCHLIST%%//" $SPECFILE
- sed -i "s/%%APPLYPATCH%%//" $SPECFILE
fi
+sed -i "s/%%PATCHLIST%%//" $SPECFILE
+sed -i "s/%%APPLYPATCH%%//" $SPECFILE
+
for opt in $BUILDOPTS; do
add_opt=
[ -z "${opt##+*}" ] && add_opt="_with_${opt#?}"
--
2.26.2