packages: openoffice.org/openoffice.org.spec - simplier make -j flags extra...

[glen]

Author: glen                         Date: Sun Aug 22 19:51:16 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- simplier make -j flags extraction

---- Files affected:
packages/openoffice.org:
   openoffice.org.spec (1.866 -> 1.867) 

---- Diffs:

================================================================
Index: packages/openoffice.org/openoffice.org.spec
diff -u packages/openoffice.org/openoffice.org.spec:1.866 packages/openoffice.org/openoffice.org.spec:1.867
--- packages/openoffice.org/openoffice.org.spec:1.866	Thu Jul  8 20:42:36 2010
+++ packages/openoffice.org/openoffice.org.spec	Sun Aug 22 21:51:10 2010
@@ -2473,9 +2473,8 @@
 export DEFAULT_TO_ENGLISH_FOR_PACKING=1
 
 %if %{with parallelbuild}
-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)
+RPM_BUILD_NR_THREADS=$(echo %{_smp_mflags} | cut -dj -f2)
+[ -z "$RPM_BUILD_NR_THREADS" ] && RPM_BUILD_NR_THREADS=1
 %else
 RPM_BUILD_NR_THREADS="1"
 %endif
@@ -4627,6 +4626,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.867  2010/08/22 19:51:10  glen
+- simplier make -j flags extraction
+
 Revision 1.866  2010/07/08 18:42:36  arekm
 - release 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openoffice.org/openoffice.org.spec?r1=1.866&r2=1.867&f=u