--- samba.spec.orig	2005-04-20 16:21:52 +0400
+++ samba.spec	2005-06-30 17:28:20 +0400
@@ -7,7 +7,7 @@
 Release: alt2
 
 # for pam modules
-%add_findprov_lib_path /lib/security
+%add_findprov_lib_path /%_lib/security
 
 %def_disable aw
 
@@ -42,8 +42,11 @@
 %def_enable xml
 %def_enable mysql
 %def_enable pgsql
+# Broken build of documentation on x86_64
+%ifnarch x86_64
 # Generate documentation out of Docbook sources by default
 %def_enable gendoc
+%endif
 # Use CUPS by default
 %def_enable cups
 %endif
@@ -454,6 +457,8 @@
 	--with-lockdir=%_localstatedir/%origname \
 	--with-libsmbclient=yes 
 
+%__subst 's,^LIBDIR *=.*,LIBDIR = %_libdir/%origname,' Makefile
+
 # Make prototypes using uniprocessor (important, proto does not work for SMP)
 %__make  \
     proto
@@ -495,7 +500,7 @@
 %__mkdir -p %buildroot/%_logdir/%origname
 %__mkdir -p %buildroot/%_spooldir/%origname
 %__mkdir -p %buildroot/%_localstatedir/%origname/{netlogon,profiles}
-%__mkdir -p %buildroot/lib/security
+%__mkdir -p %buildroot/%_lib/security
 %__mkdir -p %buildroot/%_datadir/%origname/vfs-devel/source
 %__mkdir -p %buildroot/%_includedir
 
@@ -534,14 +539,14 @@
 
 # Install the nsswitch library extension file
 for i in wins winbind ; do
-  %__install -m755 source/nsswitch/libnss_$i.so %buildroot/lib
+  %__install -m755 source/nsswitch/libnss_$i.so %buildroot/%_lib
 # Make link for Name Switch modules
-  ( cd %buildroot/lib; %__ln_s libnss_$i.so libnss_$i.so.2; )
+  ( cd %buildroot/%_lib; %__ln_s libnss_$i.so libnss_$i.so.2; )
 done 
 
 # Install PAM modules
-%__mkdir -p %buildroot/lib/security
-%__install -m755 source/nsswitch/pam_winbind.so %buildroot/lib/security
+%__mkdir -p %buildroot/%_lib/security
+%__install -m755 source/nsswitch/pam_winbind.so %buildroot/%_lib/security
 
 %if_enabled aw
 	%__install -m644 %{SOURCE22} %buildroot%_sysconfdir/%origname/smb.conf
@@ -873,8 +878,8 @@
 %_bindir/wbinfo
 %_bindir/smbget
 %_sbindir/winbindd
-%attr(755,root,root) /lib/security/*
-%attr(755,root,root) /lib/libnss*
+%attr(755,root,root) /%_lib/security/*
+%attr(755,root,root) /%_lib/libnss*
 %attr(-,root,root) %config(noreplace) %_sysconfdir/%origname/smb.conf
 %attr(-,root,root) %config(noreplace) %_sysconfdir/%origname/lmhosts
 %attr(-,root,root) %config %_initdir/winbind