packages: libreoffice/libreoffice.spec - added remaining .desktop files and...

kiesiu kiesiu at pld-linux.org
Wed Nov 9 14:13:06 CET 2011


Author: kiesiu                       Date: Wed Nov  9 13:13:06 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added remaining .desktop files and icons

---- Files affected:
packages/libreoffice:
   libreoffice.spec (1.917 -> 1.918) 

---- Diffs:

================================================================
Index: packages/libreoffice/libreoffice.spec
diff -u packages/libreoffice/libreoffice.spec:1.917 packages/libreoffice/libreoffice.spec:1.918
--- packages/libreoffice/libreoffice.spec:1.917	Wed Nov  9 12:55:32 2011
+++ packages/libreoffice/libreoffice.spec	Wed Nov  9 14:13:00 2011
@@ -661,6 +661,7 @@
 Summary:	Extra javafilter module for LibreOffice
 Summary(pl.UTF-8):	Dodatkowy moduł javafilter dla LibreOffice
 Group:		X11/Applications
+Requires(post,postun):	desktop-file-utils
 Requires:	%{name}-core = %{version}-%{release}
 Obsoletes:	openoffice.org-javafilter
 
@@ -2665,7 +2666,7 @@
 # install just once (based on makeinstall.stamp)
 # this will make packaging newer versions simplier
 if [ ! -f makeinstall.stamp -o ! -d $RPM_BUILD_ROOT ]; then
-	rm -rf makeinstall.stamp installed.stamp $RPM_BUILD_ROOT
+	%{__rm} -rf makeinstall.stamp installed.stamp $RPM_BUILD_ROOT
 
 	export QTINC="%{_includedir}/qt"
 	export QTLIB="%{_libdir}"
@@ -2709,7 +2710,7 @@
 	chmod -Rf a+rX,u+w,g-w,o-w $RPM_BUILD_ROOT
 
 	%if %{with mono}
-	rm $RPM_BUILD_ROOT%{_pkgconfigdir}/mono-ooo-2.1.pc
+	%{__rm} $RPM_BUILD_ROOT%{_pkgconfigdir}/mono-ooo-2.1.pc
 	%endif
 
 	%if %{with mozilla}
@@ -2729,14 +2730,14 @@
 	mv $RPM_BUILD_ROOT%{_libdir}/%{name}/readmes $RPM_BUILD_ROOT%{_datadir}/%{name}
 	ln -s ../../share/%{name}/readmes $RPM_BUILD_ROOT%{_libdir}/%{name}/readmes
 
-	rm -r $RPM_BUILD_ROOT%{_desktopdir}/*.desktop \
+	%{__rm} -r $RPM_BUILD_ROOT%{_desktopdir}/*.desktop \
 		$RPM_BUILD_ROOT%{_iconsdir}/{gnome,locolor} \
 		$RPM_BUILD_ROOT%{_datadir}/application-registry \
 		$RPM_BUILD_ROOT%{_datadir}/mime{lnk,-info}
 	for a in $RPM_BUILD_ROOT%{_libdir}/%{name}/share/xdg/*.desktop; do
 		cp $a $RPM_BUILD_ROOT%{_desktopdir}/libreoffice-$(basename "$a")
 	done
-	rm -r $RPM_BUILD_ROOT%{_libdir}/%{name}/share/xdg
+	%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/%{name}/share/xdg
 
 	# Make oo* -> lo* symlinks for compatibility with misc software,
 	# for example mailcap
@@ -2745,6 +2746,10 @@
 		ln -s lo$a $RPM_BUILD_ROOT%{_bindir}/oo$a
 	done
 
+	# remove printeradmin .desktop file and icons
+	%{__rm} $RPM_BUILD_ROOT%{_iconsdir}/hicolor/*/apps/libreoffice-printeradmin.png \
+		$RPM_BUILD_ROOT%{_desktopdir}/libreoffice-printeradmin.desktop
+
 	touch installed.stamp
 fi
 
@@ -2815,7 +2820,7 @@
 }
 
 %if %{with i18n}
-rm -f *.lang*
+%{__rm} -f *.lang*
 langlist=$(ls file-lists/lang_*_list.txt | sed -e 's=file-lists/lang_\(.*\)_list.txt=\1=g')
 
 for lang in $langlist; do
@@ -2895,6 +2900,12 @@
 %update_desktop_database_postun
 %update_icon_cache hicolor
 
+%post javafilter
+%update_desktop_database_post
+
+%postun javafilter
+%update_desktop_database_postun
+
 %post -n browser-plugin-%{name}
 %update_browser_plugins
 
@@ -3400,7 +3411,10 @@
 
 %{_datadir}/mime/packages/libreoffice.xml
 %{_iconsdir}/hicolor/*/mimetypes/libreoffice-*.png
+%{_iconsdir}/hicolor/*/apps/libreoffice-main.png
 
+%{_desktopdir}/libreoffice-qstart.desktop
+%{_iconsdir}/hicolor/*/apps/libreoffice-qstart.png
 %{_desktopdir}/libreoffice-startcenter.desktop
 %{_iconsdir}/hicolor/*/apps/libreoffice-startcenter.png
 
@@ -3618,6 +3632,7 @@
 %{basisdir}/share/registry/palm.xcd
 %{basisdir}/share/registry/pocketexcel.xcd
 %{basisdir}/share/registry/pocketword.xcd
+%{_desktopdir}/libreoffice-javafilter.desktop
 %endif
 
 %files testtools
@@ -4092,6 +4107,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.918  2011/11/09 13:13:00  kiesiu
+- added remaining .desktop files and icons
+
 Revision 1.917  2011/11/09 11:55:32  kiesiu
 - added mimetypes icons, removed locolor icons
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libreoffice/libreoffice.spec?r1=1.917&r2=1.918&f=u



More information about the pld-cvs-commit mailing list