rpms/openoffice.org/FC-4 openoffice.org.spec,1.219,1.220

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
minor spec tweaks required


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org.spec,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- openoffice.org.spec	21 Nov 2005 12:41:40 -0000	1.219
+++ openoffice.org.spec	21 Nov 2005 16:37:10 -0000	1.220
@@ -191,8 +191,8 @@
 Patch38: workspace.jaxpapi.patch
 Patch39: openoffice.org-2.0.1.oooXXXXX.extensions.openldapapi.patch
 Patch40: openoffice.org-2.0.1.oooXXXXX.m400.buildissues.patch
-Patch41: openoffice.org-2.0.1.gccXXXXX.bridges.brokengcj.patch
-Patch42: openoffice.org-2.0.1.ooo57545.xmerge.xalan.patch
+Patch41: openoffice.org-2.0.1.ooo57545.xmerge.xalan.patch
+Patch42: openoffice.org-2.0.1.gccXXXXX.bridges.brokengcj.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -846,8 +846,8 @@
 %patch38 -p1 -b .workspace.jaxpapi.patch
 %patch39 -p1 -b .oooXXXXX.extensions.openldapapi.patch
 %patch40 -p1 -b .oooXXXXX.m400.buildissues.patch
-%patch41 -p1 -b .gccXXXXX.bridges.brokengcj.patch
-%patch42 -p1 -b .ooo57545.xmerge.xalan.patch
+%patch41 -p1 -b .ooo57545.xmerge.xalan.patch
+%patch42 -p1 -b .bridges.brokengcj.patch
 
 %if %{includingexternals}
 #start ludicrous workaround
@@ -2819,6 +2819,7 @@
 %{instdir}/program/classes/xercesImpl.jar
 %{instdir}/program/classes/xml-apis.jar
 %{instdir}/program/libdb-*.so
+%{instdir}/program/libdb_*.so
 %endif
 # base files
 %if ! %{seperatebase}
@@ -2827,9 +2828,7 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-base.xcu
 %{instdir}/share/registry/modules/org/openoffice/Setup/Setup-base.xcu
 %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_database_filters.xcu
-%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Misc
 %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Misc/fcfg_database_others.xcu
-%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types
 %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_database_types.xcu
 %{_bindir}/oobase
 %dir %{_datadir}/applications
@@ -3298,6 +3297,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Thu Nov 17 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.0.1-0.141.2
+- rh#173775# crash on help under some circumstances
+
 * Thu Nov 17 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.0.1-0.141.1
 - next version
 - hi-IN translations upstreamed