rpms/openoffice.org/F-9 openoffice.org.spec, 1.1458, 1.1459 workspace.notes2.patch, 1.7, 1.8

Caolan McNamara (caolanm) fedora-extras-commits at redhat.com
Wed Apr 2 18:44:23 UTC 2008


Author: caolanm

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

Modified Files:
	openoffice.org.spec workspace.notes2.patch 
Log Message:
rhbz#439727 find crasher


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-9/openoffice.org.spec,v
retrieving revision 1.1458
retrieving revision 1.1459
diff -u -r1.1458 -r1.1459
--- openoffice.org.spec	1 Apr 2008 08:21:37 -0000	1.1458
+++ openoffice.org.spec	2 Apr 2008 18:43:35 -0000	1.1459
@@ -1,6 +1,6 @@
 %define oootag OOH680
 %define ooomilestone 12
-%define rh_rpm_release 4
+%define rh_rpm_release 5
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -1138,7 +1138,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) continue;;
+                -O?|-pipe|-Wall|-g|-fexceptions|-fasynchronous-unwind-tables) continue;;
         esac
         ARCH_FLAGS="$ARCH_FLAGS $i"
 done
@@ -2890,6 +2890,10 @@
 
 
 %changelog
+* Wed Apr 02 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-12.5
+- Resolves: rhbz#439727 find crasher
+- Resolves: rhbz#436518 try and workaround bizarro bug
+
 * Tue Apr 01 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-12.4
 - Resolves: rhbz#439727 add workspace.notes3.patch4
 

workspace.notes2.patch:

Index: workspace.notes2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-9/workspace.notes2.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- workspace.notes2.patch	1 Apr 2008 08:23:21 -0000	1.7
+++ workspace.notes2.patch	2 Apr 2008 18:43:35 -0000	1.8
@@ -5133,7 +5133,7 @@
 +{
 +	for(std::list<SwPostItItem*>::iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
 +	{
-+		if ((*i)->bShow && (*i)->pPostIt->Scrollbar())
++		if ((*i)->bShow && (*i)->pPostIt && (*i)->pPostIt->Scrollbar())
 +			return true;
 +	}
 +	return false;




More information about the scm-commits mailing list