rpms/amarok/devel amarok.spec,1.32,1.33

[Aurelien Bompard (abompard)]

Author: abompard

Update of /cvs/extras/rpms/amarok/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4419/devel

Modified Files:
	amarok.spec 
Log Message:
- really fix bug 175841


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- amarok.spec	15 Dec 2005 17:53:19 -0000	1.32
+++ amarok.spec	15 Dec 2005 18:48:24 -0000	1.33
@@ -147,23 +147,18 @@
 
 
 %post
-/sbin/ldconfig
 # update icon themes if necessary
-touch --no-create %{_datadir}/icons/crystalsvg || :
+touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
-    # needed because amarok 1.2 puts icon in hicolor
-    # and the RPM did not update the cache on uninstall
     %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 update-desktop-database &> /dev/null ||:
 
 %postun
-/sbin/ldconfig
 # update icon themes if necessary
-touch --no-create %{_datadir}/icons/crystalsvg || :
+touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
+    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 update-desktop-database &> /dev/null ||:
 
@@ -178,7 +173,7 @@
 %{_bindir}/amarok
 %{_bindir}/amarokapp
 %{_datadir}/apps/%{name}
-%{_datadir}/icons/*/*/*
+%{_datadir}/icons/hicolor/*/*
 %{_datadir}/applications/kde/*.desktop
 %{_datadir}/services/amarok_gstengine_plugin.desktop
 %{_datadir}/services/amarok_void-engine_plugin.desktop