rpms/openoffice.org/devel openoffice.org.spec,1.1197,1.1198

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22790

Modified Files:
	openoffice.org.spec 
Log Message:
slap in some comments


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1197
retrieving revision 1.1198
diff -u -r1.1197 -r1.1198
--- openoffice.org.spec	6 Jun 2007 07:54:40 -0000	1.1197
+++ openoffice.org.spec	6 Jun 2007 13:05:11 -0000	1.1198
@@ -1097,13 +1097,13 @@
 cd ..
 ./bootstrap
 source Linux*Env.Set.sh
-#force linker
-export LINK=$CXX
 #faster build
 export nodep=true
 export NO_HIDS=true
 #Set the "This product has been created by..." in Help->About
 export OOO_VENDOR="Red Hat, Inc."
+#force linker
+export LINK=$CXX
 #use the RPM_OPT_FLAGS but remove the OOo overridden ones
 for i in $RPM_OPT_FLAGS; do
         case "$i" in
@@ -1111,7 +1111,9 @@
         esac
         ARCH_FLAGS="$ARCH_FLAGS $i"
 done
-export ARCH_FLAGS="$ARCH_FLAGS -fno-omit-frame-pointer -D_FILE_OFFSET_BITS=64 -finline-limit=64 -fno-threadsafe-statics"
+export ARCH_FLAGS="$ARCH_FLAGS -D_FILE_OFFSET_BITS=64 -finline-limit=64"
+#add -fno-threadsafe-statics (our statics are already double-locked) to C++ only
+export CXX="$CXX -fno-threadsafe-statics"
 #convert _smp_mflags to dmake equivalent
 SMP_MFLAGS=%{?_smp_mflags}
 SMP_MFLAGS=-P$[${SMP_MFLAGS/-j/}]
@@ -1119,13 +1121,16 @@
 #just in case you have a >16 proc box
 export MAXPROCESSLIMIT=65535
 
-# remove when these translations are fixed upstreamed
+#build translation tools and apply extra translations, so
+#this can be removed when these translations are upstreamed
 cd transex3/prj
 build --dlv_switch -link --all $SMP_MFLAGS -- $SMP_MFLAGS -s
 deliver -link
 localize -m -x -l bn -f %{SOURCE5}
 cd ../..
 
+#build OOo, on failure make a stab at debugging the crash if any, and
+#rebuild un-parallel
 cd instsetoo_native/util
 ulimit -c unlimited
 if ! build --dlv_switch -link --all $SMP_MFLAGS -- $SMP_MFLAGS -s; then
@@ -1240,6 +1245,7 @@
 done
 popd
 
+#Set some aliases to canonical autocorrect language files for similar locales
 pushd $RPM_BUILD_ROOT/%{instdir}/share/autocorr
 en_GB_aliases="en-AU en-BS en-BZ en-CA en-IE en-IN en-JM en-NA en-NZ en-TT en-ZA en-ZW"
 for lang in $en_GB_aliases; do
@@ -1251,8 +1257,8 @@
 done
 popd
 
-#auto generate the langpack file lists
-#langpack id, has help or not, dictionary pattern, other linguistic pattern, script classification
+#auto generate the langpack file lists, format is...
+#langpack id, has help or not, extra linguistic data glob, script classification
 langpackdetails=\
 (\
 af	help		nolingu		western		ar	nohelp		nolingu		ctl	\
@@ -1317,7 +1323,7 @@
 #this src.rpm totally, we'll make links at this time as well
 grep -v DICT $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/dictionary.lst > $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/dictionary.lst.tmp
 mv -f $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/dictionary.lst.tmp $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/dictionary.lst
-#remove the dictionaries, they are in hunspell-??
+#remove the dictionaries, they are in hunspell-XX rpms
 rm -rf $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/??_??.??? $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/README_??_??.txt $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/INSTALL_de.txt
 
 #add in some templates
@@ -1328,7 +1334,7 @@
 #skip the swahelli for now
 rm -rf $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/*sw_TZ*
 
-#allow gtk file dialog to be default
+#enable gtk file dialog as the default
 rm -rf $RPM_BUILD_ROOT/%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-UseOOoFileDialogs.xcu
 
 #remove dictooo stuff which we disabled in configure