rpms/openoffice.org/devel openoffice.org.spec,1.1338,1.1339

[Caolan McNamara (caolanm)]

Author: caolanm

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

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


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1338
retrieving revision 1.1339
diff -u -r1.1338 -r1.1339
--- openoffice.org.spec	14 Nov 2007 07:19:12 -0000	1.1338
+++ openoffice.org.spec	14 Nov 2007 08:00:34 -0000	1.1339
@@ -142,18 +142,14 @@
 Patch60: openoffice.org-2.3.0.ooo80967.ucb.neon27.patch
 Patch61: openoffice.org-2.3.0.ooo81112.reportdesign.parallel.patch
 Patch62: openoffice.org-2.3.0.ooo74751.bean.mawt.patch
-Patch63: openoffice.org-2.3.0.ooo77672.boost.use.end_p.patch
-Patch64: openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch
-Patch65: openoffice.org-2.3.0.ooo81323.svtools.sixtyfour.patch
-Patch66: openoffice.org-2.3.0.ooo81936.sc.maketypesagree.patch
-Patch67: openoffice.org-2.3.0.ooo53885.raiseannotationpriority.sw.patch
-Patch68: workspace.fpicker7.patch
-Patch69: openoffice.org.ooo82608.vcl.gtkbadfree.patch
-Patch70: openoffice.org-2.3.0.ooo76649.httpencoding.patch
-Patch71: openoffice.org-2.3.0.ooo82966.svx.missing3d.patch
-Patch72: openoffice.org-2.3.0.ooo83169.colordialog.crash.patch
-Patch73: openoffice.org-2.3.1.ooo81307.sw.word2.patch
-Patch74: openoffice.org-2.3.0.ooo83591.vcl.checkboxes.patch
+Patch63: openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch
+Patch64: openoffice.org-2.3.0.ooo81936.sc.maketypesagree.patch
+Patch65: openoffice.org-2.3.0.ooo53885.raiseannotationpriority.sw.patch
+Patch66: workspace.fpicker7.patch
+Patch67: openoffice.org-2.3.0.ooo76649.httpencoding.patch
+Patch68: openoffice.org-2.3.0.ooo82966.svx.missing3d.patch
+Patch69: openoffice.org-2.3.1.ooo81307.sw.word2.patch
+Patch70: openoffice.org-2.3.0.ooo83591.vcl.checkboxes.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1095,23 +1091,22 @@
 %patch60 -p1 -b .ooo80967.ucb.neon27.patch
 %patch61 -p1 -b .ooo81112.reportdesign.parallel.patch
 %patch62 -p1 -b .ooo74751.bean.mawt.patch
-%patch63 -p1 -b .ooo77672.boost.use.end_p.patch
-%patch64 -p1 -b .ooo81321.cppu.silencewarnings.patch
-%patch65 -p1 -b .ooo81323.svtools.sixtyfour.patch
-%patch66 -p1 -b .ooo81936.sc.maketypesagree.patch
-%patch67 -p1 -b .ooo53885.raiseannotationpriority.sw.patch
-%patch68 -p1 -b .workspace.fpicker7.patch
-%patch69 -p1 -b .ooo82608.vcl.gtkbadfree.patch
-%patch70 -p1 -b .ooo76649.httpencoding.patc
-%patch71 -p1 -b .ooo82966.svx.missing3d.patch
-%patch72 -p1 -b .ooo83169.colordialog.crash.patch
-%patch73 -p1 -b .ooo81307.sw.word2.patch
-%patch74 -p1 -b .ooo83591.vcl.checkboxes.patch
+%patch63 -p1 -b .ooo81321.cppu.silencewarnings.patch
+%patch64 -p1 -b .ooo81936.sc.maketypesagree.patch
+%patch65 -p1 -b .ooo53885.raiseannotationpriority.sw.patch
+%patch66 -p1 -b .workspace.fpicker7.patch
+%patch67 -p1 -b .ooo76649.httpencoding.patc
+%patch68 -p1 -b .ooo82966.svx.missing3d.patch
+%patch69 -p1 -b .ooo81307.sw.word2.patch
+%patch70 -p1 -b .ooo83591.vcl.checkboxes.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl
 %endif
 
+# temporary until hsqldb is updated in rawhide
+sed -i -e "s/exit 1/exit 0/g" config_office/configure.in
+
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
 #don't build localized helps which are poorly translated
@@ -2240,7 +2235,6 @@
 %{_bindir}/openoffice.org
 %{_bindir}/ooffice
 %{_bindir}/ooviewdoc
-%{_bindir}/unopkg
 #gnome integration
 %{instdir}/program/gnome-set-default-application
 #icons and mime
@@ -2251,8 +2245,8 @@
 %if %{stlport_abi_lockin}
 %{instdir}/program/libstlport*.so
 %endif
-%{_datadir}/applications/openoffice.org-extension.desktop
-%{_datadir}/mime/packages/openoffice.org.xml
+%dir %{_datadir}/mimelnk
+%dir %{_datadir}/mimelnk/application
 %{_datadir}/mimelnk/application/*extension*
 #linkopt libs
 %if ! %{linkopt}
@@ -2383,7 +2377,10 @@
 %{instdir}/share/registry/schema/org/openoffice/Office/UI/DbReportWindowState.xcs
 %{instdir}/share/registry/schema/org/openoffice/Office/UI/ReportCommands.xcs
 %{_bindir}/oobase
+%dir %{_datadir}/applications
 %{_datadir}/applications/openoffice.org-*-base.desktop
+%dir %{_datadir}/mimelnk
+%dir %{_datadir}/mimelnk/application
 %{_datadir}/mimelnk/application/*database*
 
 %post base
@@ -2442,7 +2439,10 @@
 %dir %{instdir}/share/registry/schema/org/openoffice/Office/UI
 %{instdir}/share/registry/schema/org/openoffice/Office/UI/CalcCommands.xcs
 %{instdir}/share/registry/schema/org/openoffice/Office/UI/CalcWindowState.xcs
+%dir %{_datadir}/applications
 %{_datadir}/applications/openoffice.org-*-calc.desktop
+%dir %{_datadir}/mimelnk
+%dir %{_datadir}/mimelnk/application
 %{_datadir}/mimelnk/application/*spreadsheet*
 %{_bindir}/oocalc
 #vba
@@ -2490,7 +2490,10 @@
 %dir %{instdir}/share/registry/schema/org/openoffice/Office
 %dir %{instdir}/share/registry/schema/org/openoffice/Office/UI
 %{instdir}/share/registry/schema/org/openoffice/Office/UI/DrawWindowState.xcs
+%dir %{_datadir}/applications
 %{_datadir}/applications/openoffice.org-*-draw.desktop
+%dir %{_datadir}/mimelnk
+%dir %{_datadir}/mimelnk/application
 %{_datadir}/mimelnk/application/*drawing*
 %{_bindir}/oodraw
 
@@ -2570,7 +2573,10 @@
 %{instdir}/share/registry/schema/org/openoffice/Office/UI/WriterReportWindowState.xcs
 %{instdir}/share/registry/schema/org/openoffice/Office/UI/WriterWebWindowState.xcs
 %{instdir}/share/registry/schema/org/openoffice/Office/UI/WriterWindowState.xcs
+%dir %{_datadir}/applications
 %{_datadir}/applications/openoffice.org-*-writer.desktop
+%dir %{_datadir}/mimelnk
+%dir %{_datadir}/mimelnk/application
 %{_datadir}/mimelnk/application/*master*
 %{_datadir}/mimelnk/application/*text*
 %{_datadir}/mimelnk/application/*web*
@@ -2624,7 +2630,10 @@
 %dir %{instdir}/share/registry/schema/org/openoffice/Office/UI
 %{instdir}/share/registry/schema/org/openoffice/Office/UI/Effects.xcs
 %{instdir}/share/registry/schema/org/openoffice/Office/UI/ImpressWindowState.xcs
+%dir %{_datadir}/applications
 %{_datadir}/applications/openoffice.org-*-impress.desktop
+%dir %{_datadir}/mimelnk
+%dir %{_datadir}/mimelnk/application
 %{_datadir}/mimelnk/application/*presentation*
 %{_bindir}/ooimpress
 
@@ -2674,7 +2683,10 @@
 %dir %{instdir}/share/registry/schema/org/openoffice/Office
 %dir %{instdir}/share/registry/schema/org/openoffice/Office/UI
 %{instdir}/share/registry/schema/org/openoffice/Office/UI/MathCommands.xcs
+%dir %{_datadir}/applications
 %{_datadir}/applications/openoffice.org-*-math.desktop
+%dir %{_datadir}/mimelnk
+%dir %{_datadir}/mimelnk/application
 %{_datadir}/mimelnk/application/*formula*
 %{_bindir}/oomath
 
@@ -2805,6 +2817,10 @@
 - tweak mime information and desktop files to support .oxt extensions
 - add openoffice.org-2.3.1.ooo81307.sw.word2.patch
 - add openoffice.org-2.3.0.ooo83591.vcl.checkboxes.patch
+- drop integrated openoffice.org-2.3.0.ooo77672.boost.use.end_p.patch
+- drop integrated openoffice.org-2.3.0.ooo81323.svtools.sixtyfour.patch
+- drop integrated openoffice.org.ooo82608.vcl.gtkbadfree.patch
+- drop integrated openoffice.org-2.3.0.ooo83169.colordialog.crash.patch
 
 * Fri Nov 09 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.7
 - rebuild for hunspell