SPECS: openoffice.org.spec - rename .desktop files by adding oo at...

[lisu]

Author: lisu                         Date: Fri Sep 28 22:09:10 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rename .desktop files by adding oo at begining of each one

---- Files affected:
SPECS:
   openoffice.org.spec (1.774 -> 1.775) 

---- Diffs:

================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.774 SPECS/openoffice.org.spec:1.775
--- SPECS/openoffice.org.spec:1.774	Fri Sep 28 18:49:57 2007
+++ SPECS/openoffice.org.spec	Sat Sep 29 00:09:05 2007
@@ -24,7 +24,6 @@
 #	- --with-system-mythes + mythes package (http://lingucomponent.openoffice.org/thesaurus.html)
 #   - --with-system-mspack - use libmspack already installed on system
 #	- bcond system_xt doesn't work - xt in PLD is too old or broken
-#   - rename %_desktopdir/calc.desktop (conflicts with calc)
 #
 #	$ grep SYSTEM ooo-build-ooe680-m6/build/ooe680-m6/config_office/config.log |grep NO
 #
@@ -74,7 +73,7 @@
 %define		tag			%(echo %{mws} | tr A-Z a-z)-%{milestone}
 %define		milestone	m14
 %define		_tag		%(echo %{tag} | tr - _)
-%define		_rel		0.10
+%define		_rel		0.11
 
 Summary:	OpenOffice.org - powerful office suite
 Summary(pl.UTF-8):	OpenOffice.org - potężny pakiet biurowy
@@ -2487,6 +2486,13 @@
 	s,%{_libdir}/%{name}/share,%{_datadir}/%{name}/share,;
 ' *.lang
 
+# Rename .desktop files to avoid conflicts with other applications .desktops
+desktoplist=$(ls desktop/*.desktop | cut -d"/" -f2)
+
+for desktop in $desktoplist; do
+	install $desktop $RPM_BUILD_ROOT%{_desktopdir}/oo$desktop
+done
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -3069,7 +3075,7 @@
 
 %{_datadir}/mime/packages/openoffice.xml
 
-%{_desktopdir}/template.desktop
+%{_desktopdir}/ootemplate.desktop
 
 %{_iconsdir}/hicolor/*/apps/ooo-gulls.png
 %{_iconsdir}/hicolor/*/apps/ooo-printeradmin.png
@@ -3453,7 +3459,7 @@
 %attr(755,root,root) %{_bindir}/oobase
 %attr(755,root,root) %{_libdir}/%{name}/program/sbase
 %{_mandir}/man1/oobase.1
-%{_desktopdir}/base.desktop
+%{_desktopdir}/oobase.desktop
 %{_iconsdir}/hicolor/*/apps/ooo-base.png
 %{_pixmapsdir}/ooo-base.png
 %{_libdir}/%{name}/program/resource/cnr680en-US.res
@@ -3483,7 +3489,7 @@
 %attr(755,root,root) %{_libdir}/%{name}/program/libscui680*.so
 %attr(755,root,root) %{_libdir}/%{name}/program/scalc
 %{_mandir}/man1/oocalc.1
-%{_desktopdir}/calc.desktop
+%{_desktopdir}/oocalc.desktop
 %{_iconsdir}/hicolor/*/apps/ooo-calc.png
 %{_pixmapsdir}/ooo-calc.png
 %if %{with java}
@@ -3509,7 +3515,7 @@
 %attr(755,root,root) %{_bindir}/oodraw
 %attr(755,root,root) %{_libdir}/%{name}/program/sdraw
 %{_mandir}/man1/oodraw.1
-%{_desktopdir}/draw.desktop
+%{_desktopdir}/oodraw.desktop
 %{_iconsdir}/hicolor/*/apps/ooo-draw.png
 %{_pixmapsdir}/ooo-draw.png
 %if %{with java}
@@ -3537,7 +3543,7 @@
 %attr(755,root,root) %{_libdir}/%{name}/program/libwpft680*.so
 %attr(755,root,root) %{_libdir}/%{name}/program/swriter
 %{_mandir}/man1/oowriter.1
-%{_desktopdir}/writer.desktop
+%{_desktopdir}/oowriter.desktop
 %{_iconsdir}/hicolor/*/apps/ooo-writer.png
 %{_pixmapsdir}/ooo-writer.png
 %if %{with java}
@@ -3570,7 +3576,7 @@
 %attr(755,root,root) %{_libdir}/%{name}/program/libplaceware*.so
 %attr(755,root,root) %{_libdir}/%{name}/program/simpress
 %{_mandir}/man1/ooimpress.1
-%{_desktopdir}/impress.desktop
+%{_desktopdir}/ooimpress.desktop
 %{_iconsdir}/hicolor/*/apps/ooo-impress.png
 %{_pixmapsdir}/ooo-impress.png
 %if %{with java}
@@ -3594,7 +3600,7 @@
 %attr(755,root,root) %{_libdir}/%{name}/program/libsmd680*.so
 %attr(755,root,root) %{_libdir}/%{name}/program/smath
 %{_mandir}/man1/oomath.1
-%{_desktopdir}/math.desktop
+%{_desktopdir}/oomath.desktop
 %{_iconsdir}/hicolor/*/apps/ooo-math.png
 %{_pixmapsdir}/ooo-math.png
 %if %{with java}
@@ -3616,7 +3622,7 @@
 %attr(755,root,root) %{_bindir}/ooweb
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/sweb
 %{_mandir}/man1/ooweb.1
-%{_desktopdir}/web.desktop
+%{_desktopdir}/ooweb.desktop
 %{_iconsdir}/hicolor/*/apps/ooo-web.png
 %{_pixmapsdir}/ooo-web.png
 
@@ -3976,6 +3982,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.775  2007/09/28 22:09:05  lisu
+- rename .desktop files by adding oo at begining of each one
+
 Revision 1.774  2007/09/28 16:49:57  arekm
 - don't disable old curl compatibility
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/openoffice.org.spec?r1=1.774&r2=1.775&f=u