diff --git a/fltk.spec b/fltk.spec
index 00d9dd2..27aa429 100644
--- a/fltk.spec
+++ b/fltk.spec
@@ -1,33 +1,51 @@
-Summary:	C++ user interface toolkit for X11, Win32, and MacOS X
+
+Summary:	C++ user interface toolkit
 Name:		fltk
 Version:	1.1.7
-Release:	2%{?dist}
+Release:	3%{?dist}
 
 License:	LGPL with exceptions
 Group:		System Environment/Libraries
 URL:		http://www.fltk.org/
 Source0:        http://ftp.easysw.com/pub/fltk/%{version}/%{name}-%{version}-source.tar.bz2
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires:	libjpeg-devel zlib-devel libpng-devel libXt-devel libX11-devel
-BuildRequires:  xorg-x11-proto-devel libXft-devel libSM-devel libICE-devel
-BuildRequires:  mesa-libGL-devel mesa-libGLU-devel libXext-devel
-BuildRequires:	pkgconfig
-BuildRequires:	ImageMagick desktop-file-utils man
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source1:        fluid.desktop
+
+%if 0%{?rhel} > 4 || 0%{?fedora} > 4
+BuildRequires:  libICE-devel libSM-devel
+BuildRequires:	libXext-devel libXft-devel libXt-devel libX11-devel
+BuildRequires:  xorg-x11-proto-devel 
+%else
+BuildRequires:  xorg-x11-devel
+%endif
+BuildRequires:  libjpeg-devel
+BuildRequires:  zlib-devel
+BuildRequires:  libpng-devel
+BuildRequires:  libGL-devel libGLU-devel 
+BuildRequires:  pkgconfig
+BuildRequires:  ImageMagick
+BuildRequires:  desktop-file-utils
+BuildRequires:  man
 
 %package devel
 Summary:	Development package for %{name}
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	libstdc++-devel
-Requires:       libXft-devel libXext-devel mesa-libGL-devel mesa-libGLU-devel
+Requires:       libGL-devel libGLU-devel
+%if 0%{?rhel} > 4 || 0%{?fedora} > 4
+Requires:       libXft-devel libXext-devel
 Requires:       libX11-devel libSM-devel libICE-devel
+%else
+Requires:       xorg-x11-devel
+%endif
 
 %package fluid
 Summary:	Fast Light User Interface Designer
 Group:		Development/Tools
 Requires:	%{name}-devel = %{version}-%{release}
 
-
 %description
 FLTK (pronounced "fulltick") is a cross-platform C++ GUI toolkit for
 UNIX/Linux (X11), Microsoft Windows, and Mac OS X. It provides modern
@@ -49,13 +67,6 @@ interactive GUI designer for FLTK.
 
 
 %prep
-cat<<EOT
-
-Build disabled. Package is without maintainer.
-
-EOT
-exit 1
-
 %setup -q -n %{name}-%{version}%{?extraversion}
 
 
@@ -63,7 +74,9 @@ exit 1
 perl -pi -e "s^\\\$prefix/share/doc/fltk^$RPM_DOC_DIR/%{name}-devel-%{version}^" configure
 export CPPFLAGS="$(pkg-config xft --cflags)"
 export LDFLAGS="$(pkg-config xft --libs)"
+
 %configure --enable-shared --enable-threads --enable-xdbe --enable-xft
+
 make %{?_smp_mflags}
 
 
@@ -72,27 +85,16 @@ rm -rf $RPM_BUILD_ROOT __documentation
 %makeinstall docdir=$(pwd)/__documentation
 rm -rf $RPM_BUILD_ROOT%{_mandir}/cat*
 
-cat > fluid.desktop <<EOF
-[Desktop Entry]
-Name=Fluid
-Comment=Fast Light User Interface Designer
-Exec=fluid
-Icon=fluid.png
-Terminal=false
-Type=Application
-Encoding=UTF-8
-Categories=Application;Development;GUIDesigner;
-EOF
-
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --vendor fedora            \
+desktop-file-install --vendor=fedora            \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-    --add-category X-Fedora                     \
-    fluid.desktop
+    %{SOURCE1} 
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-convert -resize 48x48 documentation/FL.gif \
-    $RPM_BUILD_ROOT%{_datadir}/pixmaps/fluid.png
+convert -resize 48x48 documentation/FL.gif fluid.png 
+install -p -m644 -D fluid.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/fluid.png
+
+## unpackaged files
+# static libs
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.a
 
 
 %clean
@@ -100,8 +102,16 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post -p /sbin/ldconfig
+
 %postun -p /sbin/ldconfig
 
+%post fluid
+touch --no-create %{_datadir}/icons/hicolor ||:
+
+%postun fluid
+touch --no-create %{_datadir}/icons/hicolor ||:
+
+
 %files
 %defattr(-,root,root,-)
 %doc ANNOUNCEMENT CHANGES COPYING CREDITS README
@@ -114,15 +124,11 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc __documentation/*
 %{_bindir}/fltk-config
-%{_includedir}/FL
-%{_includedir}/Fl
-%{_libdir}/libfltk.a
+%{_includedir}/FL/
+%{_includedir}/Fl/
 %{_libdir}/libfltk.so
-%{_libdir}/libfltk_forms.a
 %{_libdir}/libfltk_forms.so
-%{_libdir}/libfltk_gl.a
 %{_libdir}/libfltk_gl.so
-%{_libdir}/libfltk_images.a
 %{_libdir}/libfltk_images.so
 %{_mandir}/man1/fltk-config.1*
 %{_mandir}/man3/fltk.3*
@@ -132,10 +138,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/fluid
 %{_mandir}/man1/fluid.1*
 %{_datadir}/applications/*fluid.desktop
-%{_datadir}/pixmaps/fluid.png
+%{_datadir}/icons/hicolor/*/*/*
 
 
 %changelog
+* Mon Dec 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.1.7-3
+- follow icon spec
+- omit static libs
+
 * Wed Sep 06 2006 Michael J. Knox <michael[AT]knox.net.nz> - 1.1.7-2
 - rebuild for FC6