rpms/openoffice.org/devel openoffice.org.spec,1.586,1.587

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24417

Modified Files:
	openoffice.org.spec 
Log Message:
frustrating


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.586
retrieving revision 1.587
diff -u -r1.586 -r1.587
--- openoffice.org.spec	14 Dec 2005 08:55:51 -0000	1.586
+++ openoffice.org.spec	14 Dec 2005 12:57:00 -0000	1.587
@@ -842,7 +842,7 @@
 %patch20 -p1 -b .ooo52428.execshield.bridges.patch
 %if ! %{internaljavabits}
 %patch21 -p1 -b .ooo52974.systemhsqldbbeanshell.patch
-%patch22 -p1 -b .ooo54692.fasterhelpcontent2.patch
+# %patch22 -p1 -b .ooo54692.fasterhelpcontent2.patch
 %patch23 -p1 -b .oooXXXXX.newsystemdb.xmlhelp.patch
 %patch24 -p1 -b .oooXXXXX.systemxalan.patch
 %else
@@ -861,7 +861,7 @@
 %patch34 -p1 -b .workspace.atkbridge.patch
 %patch35 -p1 -b .workspace.cmcfixes20.patch
 %patch36 -p1 -b .ooo56651.sw.rtfcrash.patch
-%patch37 -p1 -b .workspace.jaxpapi.patch
+# %patch37 -p1 -b .workspace.jaxpapi.patch
 %patch38 -p1 -b .workspace.cmcfixes22.patch
 %patch39 -p1 -b .workspace.cmcfixes23.patch
 %patch40 -p1 -b .ooo58663.vcl.missingglyph.patch
@@ -3332,8 +3332,6 @@
 %changelog
 * Tue Dec 13 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.0.1-145.3
 - system agg
-- reenable workspace.jaxpapi.patch
-- reenable openoffice.org-1.9.130.ooo54692.fasterhelpcontent2.patch
 
 * Fri Dec 08 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.0.1-145.2
 - gcc 4.1 rebuild