diff --git a/Xaw3d.spec b/Xaw3d.spec
index f302e46..07a2e4e 100644
--- a/Xaw3d.spec
+++ b/Xaw3d.spec
@@ -1,25 +1,27 @@
+%define compatlib 0
+
 Summary: A version of the MIT Athena widget set for X.
 Name: Xaw3d
 Version: 1.5
-Release: 23
+Release: 25
 Group: System Environment/Libraries
 Source: ftp://ftp.x.org/contrib/widgets/Xaw3d/R6.3/Xaw3d-%{version}.tar.gz
 Source1: ftp://ftp.x.org/contrib/widgets/Xaw3d/R6/Xaw3d-1.3.tar.gz
 Source2: Imakefile
 Url: ftp://ftp.x.org/contrib/widgets/Xaw3d/
-Patch: Xaw3d-1.1-shlib.patch
+Patch: Xaw3d-1.5-xorg-imake.patch
 Patch1: Xaw3d-1.3-glibc.patch
 Patch2: Xaw3d-1.3-X11R6.3.patch
 Patch3: xaw3d.patch
-Patch4: Xaw3d-1.3-static.patch
 Patch5: Xaw3d-ia64.patch
 Patch6: Xaw3d-1.5-i18n.patch
 Patch7: Xaw3d-1.5-scrollbar2.patch
 Patch8: Xaw3d-1.5-scrollbar1.patch
 License: MIT
 Prefix: /usr
-Prereq: fileutils /sbin/ldconfig
-BuildRoot: %{_tmppath}/%{name}-root
+Prereq: fileutils
+Prereq: /sbin/ldconfig
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildPrereq: xorg-x11-devel
 
 %description
@@ -50,50 +52,48 @@ package.
 
 %prep
 %setup -q -c
-%ifnarch ia64
+
+# Xaw3d7
+pushd xc/lib/Xaw3d
+%patch -p0
+ln -s .. X11
+%patch1 -p4
+%patch3 -p4
+%patch5 -p4
+%patch6 -p4
+popd
+
+%if %{compatlib}
+# Xaw3d6, compat libs
 mkdir old
 pushd old
 tar xzf %{SOURCE1}
 popd
 mv old/xc/lib/Xaw3d xc/lib/Xaw3d6
 rm -rf old
-%endif
-
-pushd xc/lib/Xaw3d
-%patch -p0
-ln -s .. X11
-%patch1 -p4
-%patch3 -p4
-%patch4 -p0
-%patch5 -p4
-%patch6 -p4
-popd
-%ifnarch ia64
 pushd xc/lib/Xaw3d6
-%patch -p0
 ln -s .. X11
 %patch1 -p4
 %patch2 -p3
 %patch3 -p4
-%patch4 -p0
 %patch6 -p4
 %patch7 -p4
 popd
 %endif
+
 %patch8 -p1
 
-
 %build
-cp %{SOURCE2} xc/lib/Xaw3d6
-
+# Xaw3d7
 pushd xc/lib/Xaw3d
 export PATH=/usr/X11R6/bin:$PATH
 xmkmf
 make CDEBUGFLAGS="${RPM_OPT_FLAGS} -DARROW_SCROLLBAR"
 popd
 
-%ifnarch ia64
-# compat libs
+%if %{compatlib}
+# Xaw3d6, compat libs
+cp %{SOURCE2} xc/lib/Xaw3d6
 pushd xc/lib/Xaw3d6
 xmkmf
 make
@@ -105,8 +105,8 @@ rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT -C xc/lib/Xaw3d
 
-%ifnarch ia64
-cp -aR xc/lib/Xaw3d/libXaw*so.* $RPM_BUILD_ROOT/usr/X11R6/%{_lib}/
+%if %{compatlib}
+cp -aR xc/lib/Xaw3d6/libXaw*so.* $RPM_BUILD_ROOT/usr/X11R6/%{_lib}/
 %endif
 
 ln -s X11/Xaw3d $RPM_BUILD_ROOT/usr/X11R6/include
@@ -141,12 +141,17 @@ fi
 
 %files devel
 %defattr(-,root,root)
-/usr/X11R6/%{_lib}/*.a
 /usr/X11R6/%{_lib}/*.so
 /usr/X11R6/include/X11/Xaw3d
 %ghost /usr/X11R6/include/Xaw3d
 
 %changelog
+* Tue Nov 23 2004 Than Ngo <than@redhat.com> 1.5-25
+- rebuilt
+
+* Tue Nov 23 2004 Than Ngo <than@redhat.com> 1.5-24
+- add patch to fix build problem with xorg-x11, #140475
+
 * Mon Jul 26 2004 Than Ngo <than@redhat.com> 1.5-23
 - added requires on XFree86-devel