Author: baggins Date: Fri Jun 29 09:17:31 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- update desktop database and icon caches in post scriptlets
---- Files affected:
packages/kde4-calligra:
kde4-calligra.spec (1.14 -> 1.15)
---- Diffs:
================================================================
Index: packages/kde4-calligra/kde4-calligra.spec
diff -u packages/kde4-calligra/kde4-calligra.spec:1.14
packages/kde4-calligra/kde4-calligra.spec:1.15
--- packages/kde4-calligra/kde4-calligra.spec:1.14 Fri Jun 29 10:54:39 2012
+++ packages/kde4-calligra/kde4-calligra.spec Fri Jun 29 11:17:26 2012
@@ -147,6 +147,8 @@
Summary(pl.UTF-8): Calligra - wspólne pliki i biblioteki
Group: X11/Applications
Requires: kde4-kdebase-workspace >= %{kdever}
+Requires: desktop-file-utils
+Requires: hicolor-icon-theme
Obsoletes: kde4-koffice-common
Obsoletes: kde4-koffice-kformula
@@ -349,35 +351,109 @@
%clean
rm -rf $RPM_BUILD_ROOT
-%post common -p /sbin/ldconfig
-%postun common -p /sbin/ldconfig
-
-%post karbon -p /sbin/ldconfig
-%postun karbon -p /sbin/ldconfig
-
-%post flow -p /sbin/ldconfig
-%postun flow -p /sbin/ldconfig
-
-%post kexi -p /sbin/ldconfig
-%postun kexi -p /sbin/ldconfig
-
-%post plan -p /sbin/ldconfig
-%postun plan -p /sbin/ldconfig
-
-%post stage -p /sbin/ldconfig
-%postun stage -p /sbin/ldconfig
-
-%post krita -p /sbin/ldconfig
-%postun krita -p /sbin/ldconfig
-
-%post sheets -p /sbin/ldconfig
-%postun sheets -p /sbin/ldconfig
-
-%post words -p /sbin/ldconfig
-%postun words -p /sbin/ldconfig
-
-%post braindump -p /sbin/ldconfig
-%postun braindump -p /sbin/ldconfig
+%post common
+/sbin/ldconfig
+%update_icon_cache hicolor
+%update_icon_cache oxygen
+%update_desktop_database
+
+%postun common
+/sbin/ldconfig
+if [ "$1" = 0 ]; then
+ %update_icon_cache hicolor
+ %update_icon_cache oxygen
+ %update_desktop_database
+fi
+
+%post karbon
+/sbin/ldconfig
+%update_desktop_database
+
+%postun karbon
+/sbin/ldconfig
+if [ "$1" = 0 ]; then
+ %update_desktop_database
+fi
+
+%post flow
+/sbin/ldconfig
+%update_desktop_database
+
+%postun flow
+/sbin/ldconfig
+if [ "$1" = 0 ]; then
+ %update_desktop_database
+fi
+
+%post kexi
+/sbin/ldconfig
+%update_desktop_database
+
+%postun kexi
+/sbin/ldconfig
+if [ "$1" = 0 ]; then
+ %update_desktop_database
+fi
+
+%post plan
+/sbin/ldconfig
+%update_desktop_database
+
+%postun plan
+/sbin/ldconfig
+if [ "$1" = 0 ]; then
+ %update_desktop_database
+fi
+
+%post stage
+/sbin/ldconfig
+%update_desktop_database
+
+%postun stage
+/sbin/ldconfig
+if [ "$1" = 0 ]; then
+ %update_desktop_database
+fi
+
+%post krita
+/sbin/ldconfig
+%update_desktop_database
+
+%postun krita
+/sbin/ldconfig
+if [ "$1" = 0 ]; then
+ %update_desktop_database
+fi
+
+%post sheets
+/sbin/ldconfig
+%update_desktop_database
+
+%postun sheets
+/sbin/ldconfig
+if [ "$1" = 0 ]; then
+ %update_desktop_database
+fi
+
+%post words
+/sbin/ldconfig
+%update_desktop_database
+
+%postun words
+/sbin/ldconfig
+if [ "$1" = 0 ]; then
+ %update_desktop_database
+fi
+
+%post braindump
+/sbin/ldconfig
+%update_desktop_database
+
+%postun braindump
+/sbin/ldconfig
+if [ "$1" = 0 ]; then
+ %update_desktop_database
+fi
%files common
%defattr(644,root,root,755)
@@ -845,6 +921,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.15 2012/06/29 09:17:26 baggins
+- update desktop database and icon caches in post scriptlets
+
Revision 1.14 2012/06/29 08:54:39 baggins
- rel 1
- looks working, (probably) needs testing
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/kde4-calligra/kde4-calligra.spec?r1=1.14&r2=1.15
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
