rpms/openoffice.org/devel openoffice.org.spec,1.650,1.651

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
rh#186515# missing mime-types


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.650
retrieving revision 1.651
diff -u -r1.650 -r1.651
--- openoffice.org.spec	22 Mar 2006 11:53:38 -0000	1.650
+++ openoffice.org.spec	24 Mar 2006 09:27:54 -0000	1.651
@@ -1,6 +1,6 @@
 %define oootag OOB680
 %define ooomilestone 5
-%define rh_rpm_release 4
+%define rh_rpm_release 4.cmc
 
 %define build_fc6 1
 %define build_rhel4 0
@@ -1123,6 +1123,9 @@
 echo "StartupNotify=true" >> $RPM_BUILD_ROOT/%{instdir}/share/xdg/writer.desktop
 echo "StartupNotify=true" >> $RPM_BUILD_ROOT/%{instdir}/share/xdg/math.desktop
 echo "StartupNotify=true" >> $RPM_BUILD_ROOT/%{instdir}/share/xdg/draw.desktop
+# rh#156677# / rh#186515#
+echo "NoDisplay=true" >> $RPM_BUILD_ROOT/%{instdir}/share/xdg/math.desktop
+echo "NoDisplay=true" >> $RPM_BUILD_ROOT/%{instdir}/share/xdg/draw.desktop
 chmod u-w $RPM_BUILD_ROOT/%{instdir}/share/xdg/*.desktop
 
 #relocate the .desktop and icon files
@@ -1131,6 +1134,8 @@
 mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/calc.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-calc.desktop
 mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/impress.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-impress.desktop
 mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/writer.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-writer.desktop
+mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/math.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-math.desktop
+mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/draw.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-draw.desktop
 rm -rf $RPM_BUILD_ROOT/%{instdir}/share/xdg
 cp -r sysui/unxlng*/misc/redhat/usr/share/icons $RPM_BUILD_ROOT/%{_datadir}
 cp -r sysui/unxlng*/misc/redhat/usr/share/mime-info $RPM_BUILD_ROOT/%{_datadir}
@@ -2968,6 +2973,7 @@
 %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*
@@ -3154,6 +3160,7 @@
 %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*
@@ -3259,6 +3266,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Fru Mar 24 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.4.cmc
+- rh#186515# Keep draw and math launchers for mimetypes
+
 * Mon Mar 13 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.4
 - ooo#59997# replacement opens___.ttf updated
 - drop integrated openoffice.org-2.0.0.ooo56651.sw.rtfcrash.patch