SPECS (AC-branch): openoffice.org.spec - more HEAD merge

[glen]

Author: glen                         Date: Wed Jan  3 10:03:50 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- more HEAD merge

---- Files affected:
SPECS:
   openoffice.org.spec (1.605.2.7 -> 1.605.2.8) 

---- Diffs:

================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.605.2.7 SPECS/openoffice.org.spec:1.605.2.8
--- SPECS/openoffice.org.spec:1.605.2.7	Wed Jan  3 10:59:04 2007
+++ SPECS/openoffice.org.spec	Wed Jan  3 11:03:44 2007
@@ -1878,16 +1878,16 @@
 export CC CXX ENVCFLAGS ENVCFLAGSCXX DESTDIR IGNORE_MANIFEST_CHANGES DISTRO QTINC QTLIB
 
 %if %{with java}
-JAVA_HOME=%{java_home}
-DB_JAR="%{_javadir}/db.jar"
-ANT_HOME=%{_prefix}
-export JAVA_HOME DB_JAR ANT_HOME
+export JAVA_HOME=%{java_home}
+export DB_JAR="%{_javadir}/db.jar"
+export ANT_HOME=%{_prefix}
 %endif
 
-DEFAULT_TO_ENGLISH_FOR_PACKING=1; export DEFAULT_TO_ENGLISH_FOR_PACKING
+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}" | 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} \
@@ -1979,7 +1979,7 @@
 "
 
 # build-ooo script will pickup these
-CONFIGURE_OPTIONS="$CONFOPTS"; export CONFIGURE_OPTIONS
+export CONFIGURE_OPTIONS="$CONFOPTS"
 
 :> distro-configs/Common.conf
 :> distro-configs/Common.conf.in
@@ -1998,7 +1998,7 @@
 %{__make} -j1
 
 # hack for parallel build
-if [ "$RPM_BUILD_NCPUS" -gt 1 ]; then
+if [ $RPM_BUILD_NR_THREADS -gt 1 ]; then
 	doit=1
 	while [ "$doit" -eq 1 ]; do
 		echo "Waiting one more time..."
@@ -2053,8 +2053,8 @@
 # We don't need spadmin (gtk) or the setup application
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/setup
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/program/crash_report.bin
-rm -f $RPM_BUILD_ROOT%{_datadir}/applications/openoffice-setup.desktop
-rm -f $RPM_BUILD_ROOT%{_datadir}/applications/openoffice-printeradmin.desktop
+rm -f $RPM_BUILD_ROOT%{_desktopdir}/openoffice-setup.desktop
+rm -f $RPM_BUILD_ROOT%{_desktopdir}/openoffice-printeradmin.desktop
 
 #rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/program/gnomeint
 
@@ -2093,7 +2093,7 @@
 		lprefix="`bin/openoffice-xlate-lang -p ${lang} 2>/dev/null || echo ""`"
 		longlang="`bin/openoffice-xlate-lang -l ${lang} 2>/dev/null || echo ""`"
 		# share/*/${longlang}
-		if [ "x${longlang}" != "x" ] ; then 
+		if [ "x${longlang}" != "x" ] ; then
 			grep "^%%dir.*/${longlang}/\$" ${lfile} > tmp.lang || :
 		fi
 		# share/registry/res/${lang} (but en-US for en)
@@ -2393,6 +2393,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.605.2.8  2007/01/03 10:03:44  glen
+- more HEAD merge
+
 Revision 1.605.2.7  2007/01/03 09:59:04  glen
 - merged group and language preamble changes from HEAD
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/openoffice.org.spec?r1=1.605.2.7&r2=1.605.2.8&f=u