rpms/openoffice.org/devel openoffice.org.spec,1.1816,1.1817

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2433

Modified Files:
	openoffice.org.spec 
Log Message:
Resolves: rhbz#486460 unversion (well, use continue to use the old 1.9 names) .desktop files


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1816
retrieving revision 1.1817
diff -u -r1.1816 -r1.1817
--- openoffice.org.spec	19 Feb 2009 16:13:31 -0000	1.1816
+++ openoffice.org.spec	19 Feb 2009 23:49:31 -0000	1.1817
@@ -2190,13 +2190,22 @@
 echo "NoDisplay=true" >> math.desktop
 # relocate the .desktop and icon files
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
-cp -p base.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-base.desktop
-cp -p calc.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-calc.desktop
-cp -p impress.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-impress.desktop
-cp -p writer.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-writer.desktop
-cp -p math.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-math.desktop
-cp -p draw.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-draw.desktop
+cp -p base.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-base.desktop
+cp -p calc.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-calc.desktop
+cp -p impress.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-impress.desktop
+cp -p writer.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-writer.desktop
+cp -p math.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-math.desktop
+cp -p draw.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-draw.desktop
 popd
+## rhbz#486460, do we need to hold onto the legacy names just in case?, don't think so
+#pushd $RPM_BUILD_ROOT/%{_datadir}/applications
+#ln -s openoffice.org-base.desktop openoffice.org-1.9-base.desktop
+#ln -s openoffice.org-calc.desktop openoffice.org-1.9.calc.desktop
+#ln -s openoffice.org-impress.desktop openoffice.org-1.9-impress.desktop
+#ln -s openoffice.org-writer.desktop openoffice.org-1.9-writer.desktop
+#ln -s openoffice.org-math.desktop openoffice.org-1.9-math.desktop
+#ln -s openoffice.org-draw.desktop openoffice.org-1.9-draw.desktop
+#popd
 # rhbz#486062 create a .desktop file that registers OOo as a handler for the javafilter formats
 # iff it is installed
 cp -p %{SOURCE9} $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-javafilter.desktop
@@ -3160,7 +3169,8 @@
 %dir %{oooinstdir}
 %dir %{oooinstdir}/program
 %{oooinstdir}/program/sbase
-%{_datadir}/applications/openoffice.org-*-base.desktop
+%{_datadir}/applications/openoffice.org-base.desktop
+#%{_datadir}/applications/openoffice.org-*-base.desktop
 %{_datadir}/mimelnk/application/openoffice.org-*database*
 %{_bindir}/oobase
 
@@ -3451,7 +3461,8 @@
 %dir %{oooinstdir}/program
 %{oooinstdir}/program/scalc
 %{oooinstdir}/program/scalc.bin
-%{_datadir}/applications/openoffice.org-*-calc.desktop
+%{_datadir}/applications/openoffice.org-calc.desktop
+#%{_datadir}/applications/openoffice.org-*-calc.desktop
 %{_datadir}/mimelnk/application/openoffice.org-ms-excel*
 %{_datadir}/mimelnk/application/openoffice.org-*spreadsheet*
 %{_bindir}/oocalc
@@ -3520,7 +3531,8 @@
 %dir %{oooinstdir}/program
 %{oooinstdir}/program/sdraw
 %{oooinstdir}/program/sdraw.bin
-%{_datadir}/applications/openoffice.org-*-draw.desktop
+%{_datadir}/applications/openoffice.org-draw.desktop
+#%{_datadir}/applications/openoffice.org-*-draw.desktop
 %{_datadir}/mimelnk/application/openoffice.org-*drawing*
 %{_bindir}/oodraw
 
@@ -3633,7 +3645,8 @@
 %dir %{oooinstdir}/program
 %{oooinstdir}/program/swriter
 %{oooinstdir}/program/swriter.bin
-%{_datadir}/applications/openoffice.org-*-writer.desktop
+%{_datadir}/applications/openoffice.org-writer.desktop
+#%{_datadir}/applications/openoffice.org-*-writer.desktop
 %{_datadir}/mimelnk/application/openoffice.org-ms-word*
 %{_datadir}/mimelnk/application/openoffice.org-openxmlformats-officedocument-wordprocessingml*
 %{_datadir}/mimelnk/application/openoffice.org-*master*
@@ -3716,7 +3729,8 @@
 %dir %{oooinstdir}/program
 %{oooinstdir}/program/simpress
 %{oooinstdir}/program/simpress.bin
-%{_datadir}/applications/openoffice.org-*-impress.desktop
+%{_datadir}/applications/openoffice.org-impress.desktop
+#%{_datadir}/applications/openoffice.org-*-impress.desktop
 %{_datadir}/mimelnk/application/openoffice.org-*presentation*
 %{_datadir}/mimelnk/application/openoffice.org-ms-powerpoint-template*.desktop
 %{_bindir}/ooimpress
@@ -3793,7 +3807,8 @@
 %dir %{oooinstdir}
 %dir %{oooinstdir}/program
 %{oooinstdir}/program/smath
-%{_datadir}/applications/openoffice.org-*-math.desktop
+%{_datadir}/applications/openoffice.org-math.desktop
+#%{_datadir}/applications/openoffice.org-*-math.desktop
 %{_datadir}/mimelnk/application/openoffice.org-*formula*
 %{_bindir}/oomath
 
@@ -4094,6 +4109,7 @@
    + add a openoffice.org-javafilter.desktop to the javafilter subrpm
      to notify existance of handlers for optional importers
 - Resolves: rhbz#486362 add openoffice.org-3.1.0.ooo99427.sd.ensure-icons-state.patch
+- Resolves: rhbz#486460 unversion (well, use continue to use the old 1.9 names) .desktop files
 
 * Tue Feb 17 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-1.2
 - fix rotated glyphs