[icewm/f16] Clearlooks start button fixup.^M-EL6 support fixes.

[Gilboa Davara]

commit 2869471ace5f6413b060606f663bedd3b0c0f682
Author: Gilboa Davara <gilboa at gilboa-home-dev.localdomain>
Date:   Sun Mar 4 15:21:32 2012 +0200

    Clearlooks start button fixup.^M-EL6 support fixes.

 icewm.spec |   23 ++++++++++++++++-------
 1 files changed, 16 insertions(+), 7 deletions(-)
---
diff --git a/icewm.spec b/icewm.spec
index df5832f..37224fc 100644
--- a/icewm.spec
+++ b/icewm.spec
@@ -1,6 +1,6 @@
 Name:			icewm
 Version:		1.3.7
-Release:		1%{?dist}
+Release:		2%{?dist}
 Summary:		Light and configurable window manager
 
 %if 0%{?rhel} != 0
@@ -48,7 +48,11 @@ Requires:		alsa-utils
 Requires:		xterm
 
 %if %{new_version} == 1
+%if %{platform} == fedora
 Requires:		bluecurve-icon-theme
+%else
+Requires:		redhat-logos
+%endif
 Requires:		xdg-utils
 %else
 Requires:		xorg-x11-fonts-truetype
@@ -174,23 +178,25 @@ echo "Theme=\"clearlooks/default.theme\"" > $RPM_BUILD_ROOT%{_datadir}/icewm/the
 rm -rf $RPM_BUILD_ROOT
 
 
-%post clearlooks
 %if %{platform} == fedora
+%post clearlooks
 [ -d /usr/share/icewm/themes/clearlooks ] && [ -x /usr/bin/convert ] &&					\
 	[ -f /usr/share/icons/hicolor/24x24/apps/fedora-logo-icon.png ] &&					\
 		convert /usr/share/icons/hicolor/24x24/apps/fedora-logo-icon.png				\
-				/usr/share/icewm/themes/clearlooks/taskbar/icewm.xpm || echo -n
+				/usr/share/icewm/themes/clearlooks/taskbar/linux.xpm || echo -n
 %else
 %if %{new_version} == 1
+%post clearlooks
 [ -d /usr/share/icewm/themes/clearlooks ] && 											\
-	[ -f /usr/share/pixmaps/redhat/rpmlogo-mini.xpm ] &&								\
-		cp /usr/share/pixmaps/redhat/rpmlogo-mini.xpm									\
-			/usr/share/icewm/themes/clearlooks/taskbar/icewm.xpm || echo -n
+	[ -f /usr/share/pixmaps/redhat/rpmlogo-mini.png ] &&								\
+		convert /usr/share/pixmaps/redhat/rpmlogo-mini.png								\
+			/usr/share/icewm/themes/clearlooks/taskbar/linux.xpm || echo -n
 %else
+%post clearlooks
 [ -d /usr/share/icewm/themes/clearlooks ] && [ -x /usr/bin/convert ] &&					\
 	[ -f /usr/share/pixmaps/redhat/shadowman-transparent-22.png ] &&					\
 		convert /usr/share/pixmaps/redhat/shadowman-transparent-22.png					\
-				/usr/share/icewm/themes/clearlooks/taskbar/icewm.xpm || echo -n
+				/usr/share/icewm/themes/clearlooks/taskbar/linux.xpm || echo -n
 %endif
 %endif
 
@@ -231,6 +237,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Nov 11 2011 Gilboa Davara <gilboad[AT]gmail.com> - 1.3.7-2
+- Fix missing bluecurve-icon-theme in EL-6.
+
 * Wed Nov 11 2011 Gilboa Davara <gilboad[AT]gmail.com> - 1.3.7-1
 - Switch to 1.3.7 tree.
 - Fixes bugs: #694532, #689804, #696291, #694622, #716218, #754124.