SPECS: builder - update from rpm-build-macros

[glen]

Author: glen                         Date: Fri Dec 22 20:37:51 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- update from rpm-build-macros

---- Files affected:
SPECS:
   builder (1.470 -> 1.471) 

---- Diffs:

================================================================
Index: SPECS/builder
diff -u SPECS/builder:1.470 SPECS/builder:1.471
--- SPECS/builder:1.470	Fri Dec 22 20:52:11 2006
+++ SPECS/builder	Fri Dec 22 21:37:43 2006
@@ -403,7 +403,17 @@
 %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)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/builder?r1=1.470&r2=1.471&f=u