--- a/SUNWevolution.spec	Mon Aug 18 06:07:39 2008 +0000
+++ b/SUNWevolution.spec	Mon Aug 18 06:37:38 2008 +0000
@@ -150,22 +150,15 @@
 rm -rf $RPM_BUILD_ROOT
 rm -rf ${RPM_BUILD_ROOT}DISABLE
 
+# replace the old scripts with script files
 %post
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
-  echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS_wait
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
-  echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
+%include desktop-database-install.script
+%include scrollkeeper-update.script
+%include icon-cache.script
 
 %postun
-test -x $BASEDIR/lib/postrun || exit 0
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
-  echo '/usr/bin/update-desktop-database'
-) | $BASEDIR/lib/postrun -b -u -c JDS
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
-  echo '/usr/bin/scrollkeeper-update'
-) | $BASEDIR/lib/postrun -b -u -c JDS
+%include desktop-database-uninstall.script
+%include scrollkeeper-update.script
 
 %post root
 %include gconf-install.script
@@ -223,16 +216,16 @@
 %dir %attr (-, root, other) %{_datadir}/icons/hicolor
 %dir %attr (-, root, other) %{_datadir}/icons/hicolor/16x16
 %dir %attr (-, root, other) %{_datadir}/icons/hicolor/16x16/apps
-%{_datadir}/icons/hicolor/16x16/apps/evolution.png
+%{_datadir}/icons/hicolor/16x16/apps/evolution*.png
 %dir %attr (-, root, other) %{_datadir}/icons/hicolor/22x22
 %dir %attr (-, root, other) %{_datadir}/icons/hicolor/22x22/apps
-%{_datadir}/icons/hicolor/22x22/apps/evolution.png
+%{_datadir}/icons/hicolor/22x22/apps/evolution*.png
 %dir %attr (-, root, other) %{_datadir}/icons/hicolor/24x24
 %dir %attr (-, root, other) %{_datadir}/icons/hicolor/24x24/apps
-%{_datadir}/icons/hicolor/24x24/apps/evolution.png
+%{_datadir}/icons/hicolor/24x24/apps/evolution*.png
 %dir %attr (-, root, other) %{_datadir}/icons/hicolor/32x32
 %dir %attr (-, root, other) %{_datadir}/icons/hicolor/32x32/apps
-%{_datadir}/icons/hicolor/32x32/apps/evolution.png
+%{_datadir}/icons/hicolor/32x32/apps/evolution*.png
 %dir %attr (-, root, other) %{_datadir}/icons/hicolor/48x48
 %dir %attr (-, root, other) %{_datadir}/icons/hicolor/48x48/apps
 %{_datadir}/icons/hicolor/48x48/apps/*.png