--- samba.spec.ORIG	2005-09-29 18:35:13.000000000 -0400
+++ samba.spec	2005-10-07 22:28:28.685775478 -0400
@@ -196,6 +196,9 @@
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 install -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/samba
 
+# make install puts these files in the wrong place on x86_64
+rm -f $RPM_BUILD_ROOT/usr/lib/samba/libsmbclient*
+
 ##
 ## Clean out man pages for tools not installed here
 ##
@@ -294,7 +297,7 @@
 %{_mandir}/man8/tdbbackup.8*
 %{_mandir}/man8/libsmbclient.8*
 
-%{_libdir}/samba/vfs
+/usr/lib/samba/vfs
 
 %attr(0700,root,root) %dir /var/log/samba
 %attr(1777,root,root) %dir /var/spool/samba
@@ -305,15 +308,15 @@
 %{_datadir}/swat
 %{_sbindir}/swat
 %{_mandir}/man8/swat.8*
-%attr(755,root,root) %{_libdir}/samba/*.msg
+%attr(755,root,root) /usr/lib/samba/*.msg
 
 %files client
 %defattr(-,root,root)
 /sbin/mount.smb
 /sbin/mount.smbfs
-%{_libdir}/samba/lowcase.dat
-%{_libdir}/samba/upcase.dat
-%{_libdir}/samba/valid.dat
+/usr/lib/samba/lowcase.dat
+/usr/lib/samba/upcase.dat
+/usr/lib/samba/valid.dat
 %{_bindir}/rpcclient
 %{_bindir}/smbcacls
 %{_bindir}/smbmount
@@ -352,8 +355,8 @@
 /%{_lib}/security/pam_winbind.so
 %{_libdir}/libsmbclient.a
 %{_libdir}/libsmbclient.so
-%{_libdir}/samba/charset/CP*.so
-%{_libdir}/samba/idmap/idmap*.so
+/usr/lib/samba/charset/CP*.so
+/usr/lib/samba/idmap/idmap*.so
 %{_includedir}/libsmbclient.h
 %{_bindir}/testparm
 %{_bindir}/smbpasswd