rpms/openoffice.org/F-9 openoffice.org.spec,1.1471,1.1472

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18993

Modified Files:
	openoffice.org.spec 
Log Message:
might as well try this


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-9/openoffice.org.spec,v
retrieving revision 1.1471
retrieving revision 1.1472
diff -u -r1.1471 -r1.1472
--- openoffice.org.spec	17 Apr 2008 14:04:57 -0000	1.1471
+++ openoffice.org.spec	18 Apr 2008 10:17:37 -0000	1.1472
@@ -1146,7 +1146,7 @@
 #use the RPM_OPT_FLAGS but remove the OOo overridden ones
 for i in $RPM_OPT_FLAGS; do
         case "$i" in
-                -O?|-pipe|-Wall|-g|-fexceptions|-fasynchronous-unwind-tables) continue;;
+                -O?|-pipe|-Wall|-g|-fexceptions) continue;;
         esac
         ARCH_FLAGS="$ARCH_FLAGS $i"
 done
@@ -1232,14 +1232,17 @@
 cd instsetoo_native/util
 #get an unpackaged raw install
 export PKGFORMATSWITCH="-format rpm -simple $RPM_BUILD_ROOT/%{instdir}"
-for attempt in 1 2 3; do
+for attempt in 1 2 3 4 5; do
     echo Attempt $attempt
     if ! dmake openoffice_en-US; then
         echo installation failure time is `date`, diskspace: `df -h . | tail -n 1`
         echo - ---dump log start---
         cat ../unx*.pro/OpenOffice/rpm/logging/en-US/log_*_en-US.log
         echo - ---dump log end---
-        dmake openoffice_en-US
+        if [ -e /usr/sbin/sestatus ]; then
+            /usr/sbin/sestatus
+        fi
+        export _MALLOC_CHECK=0
     else
         break
     fi
@@ -2901,7 +2904,7 @@
 
 
 %changelog
-* Thu Apr 17 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-12.6
+* Fri Apr 18 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-12.6
 - Resolves: rhbz#439727 find another crasher
 - Resolves: rhbz#441112 openoffice.org-3.0.0.ooo85691.vcl.tooltipcolor.patch
 - Resolves: rhbz#441108 openoffice.org-3.0.0.ooo87991.fpickersafe.patch