rpms/openoffice.org/F-7 openoffice.org.spec,1.1180,1.1181
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Fri Jun 8 17:48:05 UTC 2007
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6125
Modified Files:
openoffice.org.spec
Log Message:
Resolves: rhbz#243305 missing xdg file for quickstart restart
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-7/openoffice.org.spec,v
retrieving revision 1.1180
retrieving revision 1.1181
diff -u -r1.1180 -r1.1181
--- openoffice.org.spec 7 Jun 2007 16:44:54 -0000 1.1180
+++ openoffice.org.spec 8 Jun 2007 17:47:30 -0000 1.1181
@@ -1432,13 +1432,12 @@
#relocate the .desktop and icon files
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
-mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/base.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-base.desktop
-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 $RPM_BUILD_ROOT/%{instdir}/share/xdg/base.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-base.desktop
+cp $RPM_BUILD_ROOT/%{instdir}/share/xdg/calc.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-calc.desktop
+cp $RPM_BUILD_ROOT/%{instdir}/share/xdg/impress.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-impress.desktop
+cp $RPM_BUILD_ROOT/%{instdir}/share/xdg/writer.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-writer.desktop
+cp $RPM_BUILD_ROOT/%{instdir}/share/xdg/math.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-math.desktop
+cp $RPM_BUILD_ROOT/%{instdir}/share/xdg/draw.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-draw.desktop
#get rid of the gnome icons
rm -rf sysui/unxlng*/misc/redhat/usr/share/icons/gnome
#relocate the rest of them
@@ -2096,6 +2095,7 @@
%dir %{instdir}/share/uno_packages
%dir %{instdir}/share/uno_packages/cache
%{instdir}/share/wordbook
+%{instdir}/share/xdg/
%dir %{instdir}/share/xslt
%{instdir}/share/xslt/common
%dir %{instdir}/share/xslt/export
@@ -2642,7 +2642,8 @@
%{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
%changelog
-* Thu Jun 07 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.11
+* Fri Jun 07 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.11
+- Resolves: rhbz#243305 missing xdg file for quickstart restart
- add openoffice.org-2.2.1.ooo78198.sixtyfour.svx.patch
* Fri Jun 01 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.10
More information about the scm-commits
mailing list