--- ctwm.spec.orig	2005-05-03 15:21:52.000000000 -0400
+++ ctwm.spec	2005-05-04 13:18:51.000000000 -0400
@@ -2,12 +2,16 @@
 Name: ctwm
 Version: 3.7
 %define versuffix -beta3
-Release: 1
+Release: 2
 Source: http://ctwm.free.lp.se/preview/%{name}-%{version}%{versuffix}.tar.gz
 Copyright: MIT
 Group: User Interface/X
 Packager: Richard Levitte <richard@levitte.org>
 BuildRoot: /var/tmp/%{name}-%{version}%{versuffix}-buildroot
+URL: http://ctwm.free.lp.se/
+
+BuildRequires: xorg-x11-devel
+Requires: m4
 
 %description
 Ctwm is a window manager for the X Window System.  It provides
@@ -25,7 +29,7 @@
 
 %prep
 
-%setup -n %{name}-%{version}%{versuffix}
+%setup -q  -n %{name}-%{version}%{versuffix}
 
 %build
 cp Imakefile.local-template Imakefile.local
@@ -34,6 +38,13 @@
 
 %install
 rm -fr $RPM_BUILD_ROOT
+
+# xorg-x11-twm packages have been making /usr/X11R6/lib/X11/twm a
+# symlink to ../../../../etc/X11/twm for a long time now...
+%{__mkdir_p} $RPM_BUILD_ROOT/usr/X11R6/lib/X11
+%{__mkdir_p} $RPM_BUILD_ROOT/etc/X11/twm
+%{__ln_s} ../../../../etc/X11/twm $RPM_BUILD_ROOT/usr/X11R6/lib/X11/twm
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # Call the man page something a little more Unixly.
@@ -46,12 +57,14 @@
 %files
 %defattr(0644,root,root,0755)
 %doc README CHANGES PROBLEMS README.gnome TODO.gnome
+%doc *.ctwmrc
+%doc sound.doc vms.txt vms2.txt
 
 %attr(0755,root,root) /usr/X11R6/bin/ctwm
 %attr(0644,root,root) /usr/X11R6/man/man1/ctwm.1x.gz
 
-%config %attr(0644,root,root) /usr/X11R6/lib/X11/twm/system.ctwmrc
-%attr(0644,root,root) /usr/X11R6/lib/X11/twm/images/*
+%config %attr(0644,root,root) /etc/X11/twm/system.ctwmrc
+%attr(0644,root,root) /etc/X11/twm/images/*
 
 %changelog
 * Tue May  3 2005 Richard Levitte <richard@levitte.org>