SPECS: openoffice.org.spec - more accurate check for RPM_BUILD_NR_...
glen
glen at pld-linux.org
Wed Nov 1 23:32:11 CET 2006
Author: glen Date: Wed Nov 1 22:32:11 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- more accurate check for RPM_BUILD_NR_THREADS
---- Files affected:
SPECS:
openoffice.org.spec (1.616 -> 1.617)
---- Diffs:
================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.616 SPECS/openoffice.org.spec:1.617
--- SPECS/openoffice.org.spec:1.616 Wed Nov 1 23:30:22 2006
+++ SPECS/openoffice.org.spec Wed Nov 1 23:32:06 2006
@@ -1965,8 +1965,9 @@
export DEFAULT_TO_ENGLISH_FOR_PACKING=1
-RPM_BUILD_NR_THREADS="%(echo "%{__make}" | sed -e 's#.*-j\([[:space:]]*[0-9]\+\)#\1#g' | xargs)"
-[ "$RPM_BUILD_NR_THREADS" = "$(echo %{__make})" ] && RPM_BUILD_NR_THREADS=1
+RPM_BUILD_NR_THREADS="%(echo "%{__make}" | sed -e 's#.*-j\([[:space:]]*[0-9]\+\)#\1#g')"
+[ "$RPM_BUILD_NR_THREADS" = "%{__make}" ] && RPM_BUILD_NR_THREADS=1
+RPM_BUILD_NR_THREADS=$(echo $RPM_BUILD_NR_THREADS)
CONFOPTS=" \
%ifarch %{ix86} \
@@ -2492,6 +2493,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.617 2006/11/01 22:32:06 glen
+- more accurate check for RPM_BUILD_NR_THREADS
+
Revision 1.616 2006/11/01 22:30:22 glen
- avoid errors when %{__make} ends with space
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/openoffice.org.spec?r1=1.616&r2=1.617&f=u
More information about the pld-cvs-commit
mailing list