rpms/openoffice.org/F-11 openoffice.org.spec,1.1907,1.1908

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27244/F-11

Modified Files:
	openoffice.org.spec 
Log Message:
Resolves: rhbz#499474 soffice and .recently-used.xbel


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1907
retrieving revision 1.1908
diff -u -p -r1.1907 -r1.1908
--- openoffice.org.spec	5 May 2009 13:36:12 -0000	1.1907
+++ openoffice.org.spec	7 May 2009 10:24:02 -0000	1.1908
@@ -102,7 +102,7 @@ Patch26: openoffice.org-3.0.0.ooo91924.s
 Patch27: workspace.mhu17.patch
 Patch28: openoffice.org-3.0.0.ooo95018.sal.fdwarnings.patch
 Patch29: workspace.gtkmenuimages.patch
-Patch30: openoffice.org-3.0.0.ooo95834.dontset-nonfunctional-forward.patch
+Patch30: workspace.calc50.patch
 Patch31: workspace.mav46.patch
 Patch32: openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch
 Patch33: workspace.transogl03redux.patch
@@ -1601,7 +1601,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch27 -p1 -b .workspace.mhu17.patch
 %patch28 -p1 -b .ooo95018.sal.fdwarnings.patch
 %patch29 -p0 -b .workspace.gtkmenuimages.patch
-%patch30 -p1 -b .ooo95834.dontset-nonfunctional-forward.patch
+%patch30 -p1 -b .workspace.calc50.patch
 %patch31 -p1 -b .workspace.mav46.patch
 %patch32 -p1
 %patch33 -p0 -b .workspace.transogl03redux.patch
@@ -2220,6 +2220,10 @@ chmod a+x $RPM_BUILD_ROOT/%{_bindir}/bro
 
 cp $RPM_BUILD_ROOT/%{_bindir}/openoffice.org $RPM_BUILD_ROOT/%{_bindir}/openoffice.org-2.0
 cp $RPM_BUILD_ROOT/%{_bindir}/openoffice.org $RPM_BUILD_ROOT/%{_bindir}/openoffice.org-1.9
+# rhbz#499474 provide a /usr/bin/soffice for .recently-used.xbel
+pushd $RPM_BUILD_ROOT/%{_bindir}
+ln -s %{oooinstdir}/program/soffice soffice
+popd
 
 pushd $RPM_BUILD_ROOT/%{oooinstdir}/share/xdg/
 chmod u+w *.desktop
@@ -3083,6 +3087,7 @@ fi
 %{_bindir}/openoffice.org-1.9
 %{_bindir}/openoffice.org-2.0
 %{_bindir}/openoffice.org
+%{_bindir}/soffice
 %{_bindir}/ooffice
 %{_bindir}/ooviewdoc
 
@@ -4135,11 +4140,12 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Tue May 05 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-11.3
+* Thu May 07 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-11.3
 - add in the ia64 and arm fixes for the secondary arch people
 - Resolves(partially): rhbz#495901 No default font-width for wmf export
 - ooo#101567 add Maithili locale data (some dodgy negative value and
   listseperator though)
+- Resolves: rhbz#499474 soffice and .recently-used.xbel
 
 * Tue Apr 27 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-11.2
 - Resolves: rhbz#484177 openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch