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

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
2.3.1 pre-release candidate m9


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1339
retrieving revision 1.1340
diff -u -r1.1339 -r1.1340
--- openoffice.org.spec	14 Nov 2007 08:00:34 -0000	1.1339
+++ openoffice.org.spec	14 Nov 2007 11:29:06 -0000	1.1340
@@ -1,5 +1,5 @@
 %define oootag OOG680
-%define ooomilestone 8
+%define ooomilestone 9
 %define rh_rpm_release 1
 
 # undef to get english only and no-langpacks for a faster smoketest build
@@ -2235,6 +2235,7 @@
 %{_bindir}/openoffice.org
 %{_bindir}/ooffice
 %{_bindir}/ooviewdoc
+%{_bindir}/unopkg
 #gnome integration
 %{instdir}/program/gnome-set-default-application
 #icons and mime
@@ -2245,8 +2246,8 @@
 %if %{stlport_abi_lockin}
 %{instdir}/program/libstlport*.so
 %endif
-%dir %{_datadir}/mimelnk
-%dir %{_datadir}/mimelnk/application
+%{_datadir}/applications/openoffice.org-extension.desktop
+%{_datadir}/mime/packages/openoffice.org.xml
 %{_datadir}/mimelnk/application/*extension*
 #linkopt libs
 %if ! %{linkopt}
@@ -2377,10 +2378,7 @@
 %{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
@@ -2439,10 +2437,7 @@
 %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,10 +2485,7 @@
 %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
 
@@ -2573,10 +2565,7 @@
 %{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*
@@ -2630,10 +2619,7 @@
 %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
 
@@ -2683,10 +2669,7 @@
 %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
 
@@ -2812,8 +2795,8 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
-* Mon Nov 12 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.1-8.1
-- 2.3.1 pre-release candidate m8
+* Wed Nov 14 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.1-9.1
+- 2.3.1 pre-release candidate m9
 - 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