- update from rpm-build-macros

Changed files:
    builder.sh -> 1.471

diff --git a/builder.sh b/builder.sh
index 300d4c3470894e9ce5309bd96662c53724774e82..3b76028ebf38872731d5d4ab38db3690cd68c960 100644 (file)
--- a/builder.sh
+++ b/builder.sh
@@ -403,7 +403,17 @@ cache_rpm_dump () {
 %perl_vendorlib ERROR
 # damn. need it here! - copied from /usr/lib/rpm/macros.build
 %tmpdir                %(echo "${TMPDIR:-/tmp}")
-%patchset_source(f:b:) %(base=%{-b*}%{!-b*:10000}; start=$((%1 + $base)); end=$((%{?2}%{!?2:%{1}} + $base)); seq -f 'Patch%g:' $start $end > %{tmpdir}/__ps1; seq -f '%{-f*}' %1 %{?2}%{!?2:%{1}} > %{tmpdir}/__ps2; paste %{tmpdir}/__ps{1,2}; rm -f %{tmpdir}/__ps{1,2})%{nil}
+%patchset_source(f:b:) %(
+       base=%{-b*}%{!-b*:10000};
+       start=$(expr $base + %1);
+       end=$(expr $base + %{?2}%{!?2:%{1}});
+       # we need to call seq twice as it doesn't allow two formats
+       seq -f 'Patch%g:' $start $end > %{tmpdir}/__ps1;
+       seq -f '%{-f*}' %1 %{?2}%{!?2:%{1}} > %{tmpdir}/__ps2;
+       paste %{tmpdir}/__ps{1,2};
+       rm -f %{tmpdir}/__ps{1,2};
+) \
+%{nil}
 EOF
        case "$RPMBUILD" in
        rpm)