Author: glen Date: Fri Dec 22 20:39:26 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- use expr instead of shell internal to avoid base conversion
---- Files affected:
SOURCES:
rpm.macros (1.352 -> 1.353)
---- Diffs:
================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.352 SOURCES/rpm.macros:1.353
--- SOURCES/rpm.macros:1.352 Fri Dec 22 21:38:37 2006
+++ SOURCES/rpm.macros Fri Dec 22 21:39:21 2006
@@ -1291,24 +1291,26 @@
# The sources start from 10000
%patchset_source(f:b:) %(
base=%{-b*}%{!-b*:10000};
- start=$((%1 + $base));
- end=$((%{?2}%{!?2:%{1}} + $base));
+ 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}
+) \
+%{nil}
# apply sources from %patchset_source
# -p specify -pX for %patch line
# -b base offset: defaults to 10000
%patchset_patch(f:p:b:) %(
base=%{-b*}%{!-b*:10000};
- start=$((%1 + $base));
- end=$((%{?2}%{!?2:%{1}} + $base));
+ start=$(expr $base + %1);
+ end=$(expr $base + %{?2}%{!?2:%{1}});
echo ": patchset_patch %1%{?2: to %2}";
seq -f 'patch%g %{-p*:-p%{-p*}}' $start $end | sed -e s,^,%%,;
-) %{nil}
+) \
+%{nil}
# vim:ts=4 sw=4 noet syn=spec
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.352&r2=1.353&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
