--- a/Solaris/SUNWgnome-wm.spec	Sun Feb 15 13:03:11 2004 +0000
+++ b/Solaris/SUNWgnome-wm.spec	Mon Feb 16 00:38:22 2004 +0000
@@ -24,8 +24,8 @@
 Requires: SUNWgnome-libs-share
 Requires: SUNWgnome-libs-root
 Requires: SUNWgnome-libs
-Requires:	SUNWgnome-base-libs
-Requires:	SUNWgnome-config
+Requires: SUNWgnome-base-libs
+Requires: SUNWgnome-config
 Requires: SUNWbzip
 Requires: SUNWzlib
 Requires: SUNWlxml
@@ -50,8 +50,6 @@
 mkdir %name-%version
 %metacity.prep -d %name-%version
 
-cd metacity-%{metacity.version}
-
 %build
 export CFLAGS="%optflags -I/usr/sfw/include -I/usr/sfw/include/freetype2 -DANSICPP"
 export RPM_OPT_FLAGS="$CFLAGS"
@@ -68,32 +66,35 @@
 # rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr (-, root, bin)
+%defattr (-, root, other)
+%dir %attr (0755, root, bin) %{_bindir}
 %{_bindir}/*
-%defattr (-, root, bin)
-%{_libdir}/lib*.so.*
-# FIXME libexec is defined as lib on Solaris so why does it end up here?
-%{_prefix}/libexec/metacity-dialog
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/lib*.so*
+%{_libexecdir}/metacity-dialog
 
 %files share
 %defattr (-, root, other)
+%dir %attr (0755, root, bin) %{_datadir}
 %{_datadir}/control-center-2.0
 %{_datadir}/gnome
 %{_datadir}/locale
-%{_datadir}/man
 %{_datadir}/metacity/glade
 %{_datadir}/metacity/icons
 %{_datadir}/pixmaps
 %{_datadir}/themes
-
+%dir %attr(0755, root, bin) %{_mandir}
+%dir %attr(0755, root, bin) %{_mandir}/*
+%{_mandir}/*/*
 
 %files devel
-%defattr (-, root, bin)
-%{_includedir}
-%defattr (-, root, root)
-%{_libdir}/*.so
-%{_libdir}/pkgconfig/*.pc
+%defattr (-, root, other)
+%dir %attr (0755, root, bin) %{_includedir}
+%{_includedir}/*
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/pkgconfig
 
 %files root
-%defattr (-, root, sys)
-%{_sysconfdir}
+%defattr (-, root, other)
+%attr (0755, root, sys) %{_sysconfdir}
+%{_sysconfdir}/*

--- a/metacity.spec	Sun Feb 15 13:03:11 2004 +0000
+++ b/metacity.spec	Mon Feb 16 00:38:22 2004 +0000
@@ -45,6 +45,7 @@
 CFLAGS="$RPM_OPT_FLAGS"			\
 ./configure --prefix=%{_prefix}		\
 	    --mandir=%{_mandir}		\
+            --libexecdir=%{_libexecdir} \
 	    --sysconfdir=%{_sysconfdir}
 make