rpms/openoffice.org/F-10 openoffice.org.spec,1.1731,1.1732

Caolan McNamara caolanm at fedoraproject.org
Thu May 7 10:24:33 UTC 2009


Author: caolanm

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

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-10/openoffice.org.spec,v
retrieving revision 1.1731
retrieving revision 1.1732
diff -u -p -r1.1731 -r1.1732
--- openoffice.org.spec	1 May 2009 11:59:28 -0000	1.1731
+++ openoffice.org.spec	7 May 2009 10:24:01 -0000	1.1732
@@ -1,6 +1,6 @@
 %define oootag OOO300
 %define ooomilestone 15
-%define rh_rpm_release 4
+%define rh_rpm_release 5
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -2002,6 +2002,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
@@ -2848,9 +2852,10 @@ fi
 #launchers
 %{_bindir}/openoffice.org-1.9
 %{_bindir}/openoffice.org-2.0
-%{_bindir}/openoffice.org
 %{_bindir}/ooffice
 %{_bindir}/ooviewdoc
+%{_bindir}/openoffice.org
+%{_bindir}/soffice
 
 %post brand
 update-desktop-database %{_datadir}/applications &> /dev/null || :
@@ -3791,6 +3796,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Thu May 07 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-15.5
+- Resolves: rhbz#499474 soffice and .recently-used.xbel
+
 * Fri May 01 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-15.4
 - Resolves: rhbz#494643 EMF polypolygons issue
 - Resolves: rhbz#495840 openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch




More information about the scm-commits mailing list