packages: libreoffice/libreoffice.spec - added missing update-icon-cache ma...

Tue Nov 8 21:34:23 CET 2011

Author: kiesiu                       Date: Tue Nov  8 20:34:23 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added missing update-icon-cache macros
- rel. 0.3

---- Files affected:
packages/libreoffice:
   libreoffice.spec (1.914 -> 1.915) 

---- Diffs:

================================================================
Index: packages/libreoffice/libreoffice.spec
diff -u packages/libreoffice/libreoffice.spec:1.914 packages/libreoffice/libreoffice.spec:1.915

--- packages/libreoffice/libreoffice.spec:1.914	Tue Nov  8 20:23:12 2011
+++ packages/libreoffice/libreoffice.spec	Tue Nov  8 21:34:17 2011
@@ -12,7 +12,7 @@
 %bcond_without	kde4		# KDE4 L&F packages
 %bcond_with	mono		# enable compilation of mono bindings
 %bcond_without	mozilla		# without mozilla components
-%bcond_without i18n        # do not create i18n packages (extra build time)
+%bcond_without	i18n        # do not create i18n packages (extra build time)
 %bcond_with	ccache		# use ccache to speed up builds
 %bcond_with	icecream	# use icecream to speed up builds
 %bcond_with	msaccess	# with ms access import pieces
@@ -46,7 +46,7 @@
 Summary(pl.UTF-8):	LibreOffice - potężny pakiet biurowy
 Name:		libreoffice
 Version:	%{major_ver}.2
-Release:	0.2
+Release:	0.3
 License:	GPL/LGPL
 Group:		X11/Applications
 # we use git because released tarballs are buggy too often
@@ -338,11 +338,13 @@
 Summary(pl.UTF-8):	Podstawowe moduły dla LibreOffice
 Group:		X11/Applications
 Requires(post,postun):	desktop-file-utils
+Requires(post,postun):	gtk-update-icon-cache
 Requires(post,postun):	shared-mime-info
 Requires:	%{name}-ure = %{version}-%{release}
 # libcups.so.2 is dlopened (in cupsmgr.cxx); maybe Suggests instead?
 Requires:	cups-lib
 Requires:	fonts-TTF-OpenSymbol
+Requires:	hicolor-icon-theme
 %{?with_system_beanshell:Requires:	java-beanshell}
 %{?with_system_hsqldb:Requires:	java-hsqldb}
 Requires:	libstdc++ >= 5:3.2.1
@@ -501,7 +503,9 @@
 Summary(pl.UTF-8):	Frontend do baz danych dla LibreOffice
 Group:		X11/Applications
 Requires(post,postun):	desktop-file-utils
+Requires(post,postun):	gtk-update-icon-cache
 Requires:	%{name}-core = %{version}-%{release}
+Requires:	hicolor-icon-theme
 Obsoletes:	openoffice.org-base
 
 %description base
@@ -532,7 +536,9 @@
 Summary(pl.UTF-8):	Moduł Writer dla LibreOffice
 Group:		X11/Applications
 Requires(post,postun):	desktop-file-utils
+Requires(post,postun):	gtk-update-icon-cache
 Requires:	%{name}-core = %{version}-%{release}
+Requires:	hicolor-icon-theme
 Obsoletes:	openoffice.org-writer
 
 %description writer
@@ -561,7 +567,9 @@
 Summary(pl.UTF-8):	Moduł Calc dla LibreOffice
 Group:		X11/Applications
 Requires(post,postun):	desktop-file-utils
+Requires(post,postun):	gtk-update-icon-cache
 Requires:	%{name}-core = %{version}-%{release}
+Requires:	hicolor-icon-theme
 Obsoletes:	openoffice.org-calc
 
 %description calc
@@ -575,7 +583,9 @@
 Summary(pl.UTF-8):	Moduł Draw dla LibreOffice
 Group:		X11/Applications
 Requires(post,postun):	desktop-file-utils
+Requires(post,postun):	gtk-update-icon-cache
 Requires:	%{name}-core = %{version}-%{release}
+Requires:	hicolor-icon-theme
 Obsoletes:	openoffice.org-draw
 
 %description draw
@@ -589,7 +599,9 @@
 Summary(pl.UTF-8):	Moduł Impress dla LibreOffice
 Group:		X11/Applications
 Requires(post,postun):	desktop-file-utils
+Requires(post,postun):	gtk-update-icon-cache
 Requires:	%{name}-core = %{version}-%{release}
+Requires:	hicolor-icon-theme
 Obsoletes:	openoffice.org-impress
 
 %description impress
@@ -603,7 +615,9 @@
 Summary(pl.UTF-8):	Moduł Math dla LibreOffice
 Group:		X11/Applications
 Requires(post,postun):	desktop-file-utils
+Requires(post,postun):	gtk-update-icon-cache
 Requires:	%{name}-core = %{version}-%{release}
+Requires:	hicolor-icon-theme
 Obsoletes:	openoffice.org-math
 
 %description math
@@ -2718,7 +2732,7 @@
 	rm -r $RPM_BUILD_ROOT%{_desktopdir}/*.desktop \
 		$RPM_BUILD_ROOT%{_iconsdir}/gnome \
 		$RPM_BUILD_ROOT%{_datadir}/application-registry \
-		$RPM_BUILD_ROOT%{_datadir}/mimelnk
+		$RPM_BUILD_ROOT%{_datadir}/mime*
 	for a in $RPM_BUILD_ROOT%{_libdir}/%{name}/share/xdg/*.desktop; do
 		cp $a $RPM_BUILD_ROOT%{_desktopdir}/libreoffice-$(basename "$a")
 	done
@@ -2820,16 +2834,20 @@
 %post core
 %update_mime_database
 %update_desktop_database_post
+%update_icon_cache hicolor
 
 %postun core
 %update_desktop_database_postun
 %update_mime_database
+%update_icon_cache hicolor
 
 %post base
 %update_desktop_database_post
+%update_icon_cache hicolor
 
 %postun base
 %update_desktop_database_postun
+%update_icon_cache hicolor
 
 %post web
 %update_desktop_database_post
@@ -2839,33 +2857,43 @@
 
 %post writer
 %update_desktop_database_post
+%update_icon_cache hicolor
 
 %postun writer
 %update_desktop_database_postun
+%update_icon_cache hicolor
 
 %post calc
 %update_desktop_database_post
+%update_icon_cache hicolor
 
 %postun calc
 %update_desktop_database_postun
+%update_icon_cache hicolor
 
 %post draw
 %update_desktop_database_post
+%update_icon_cache hicolor
 
 %postun draw
 %update_desktop_database_postun
+%update_icon_cache hicolor
 
 %post impress
 %update_desktop_database_post
+%update_icon_cache hicolor
 
 %postun impress
 %update_desktop_database_postun
+%update_icon_cache hicolor
 
 %post math
 %update_desktop_database_post
+%update_icon_cache hicolor
 
 %postun math
 %update_desktop_database_postun
+%update_icon_cache hicolor
 
 %post -n browser-plugin-%{name}
 %update_browser_plugins
@@ -3373,7 +3401,6 @@
 %{_datadir}/mime/packages/libreoffice.xml
 
 %{_desktopdir}/libreoffice-startcenter.desktop
-
 %{_iconsdir}/hicolor/*/apps/libreoffice-startcenter.png
 
 %{_mandir}/man1/loffice.1
@@ -3408,7 +3435,6 @@
 %attr(755,root,root) %{basisdir}/program/gconfbe1.uno.so
 %attr(755,root,root) %{basisdir}/program/gnome-open-url
 %attr(755,root,root) %{basisdir}/program/gnome-open-url.bin
-#%attr(755,root,root) %{basisdir}/program/libevoabl[ipx].so
 %attr(755,root,root) %{basisdir}/program/libvclplug_gtk*.so
 %attr(755,root,root) %{basisdir}/program/ucpgio1.uno.so
 %{basisdir}/share/registry/gnome.xcd
@@ -4065,6 +4091,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.915  2011/11/08 20:34:17  kiesiu
+- added missing update-icon-cache macros
+- rel. 0.3
+
 Revision 1.914  2011/11/08 19:23:12  kiesiu
 - added missing dir
 - rel 0.2
================================================================

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

