Trying to fix module handling. Not final yet.

(This used to be commit 3610e631125461ffeffcecf38ed20c6cc65d4bc8)

diff --git a/packaging/Caldera/OpenLinux/samba3.spec.tmpl b/packaging/Caldera/OpenLinux/samba3.spec.tmpl
index 0a5e2709188dc8b8859ff722c4277591319e72c0..9497c3d60036b2f3bad903e565db577ab9435ee7 100644 (file)
--- a/packaging/Caldera/OpenLinux/samba3.spec.tmpl
+++ b/packaging/Caldera/OpenLinux/samba3.spec.tmpl
@@ -235,12 +235,9 @@ CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" ./configure \
 #      --with-pam_smbpass \
 #      --with-nisplus-home \
 
-make all nsswitch/libnss_wins.so nsswitch/libnss_winbind.so torture nsswitch/pam_winbind.so everything
+make all nsswitch/libnss_wins.so nsswitch/libnss_winbind.so torture nsswitch/pam_winbind.so modules everything
 (cd tdb; make tdbdump tdbtest tdbtorture tdbtool)
 
-cd ../examples/VFS
-make srcdir=../../source
-
 %Install
 %{mkDESTDIR}
 VVS=packaging/%{Vendor}/%{Dist}
@@ -260,7 +257,7 @@ mkdir -p $DESTDIR/usr/share/samba/codepages/src
 mkdir -p $DESTDIR/usr/share/swat/using_samba/{gifs,figs}
 mkdir -p $DESTDIR/var/{lo{ck,g}/samba.d,spool/samba}
 
-make -C source DESTDIR=$RPM_BUILD_ROOT install installclientlib 
+make -C source DESTDIR=$RPM_BUILD_ROOT install-everything installclientlib 
 
 strip $DESTDIR/usr/bin/smb{mount,mnt,umount}
 # Add links for mount.smbfs
@@ -282,12 +279,6 @@ do
        install -m 755 source/tdb/$i $DESTDIR/usr/sbin
 done
 
-# Add VFS Modules
-for i in audit.so recycle.so netatalk.so skel.so
-do
-       install -m755 examples/VFS/$i $DESTDIR/lib/samba
-done
-
 # Install the nsswitch library extension file
 cp -p source/nsswitch/libnss_wins.so $DESTDIR/lib
 cp -p source/nsswitch/libnss_winbind.so $DESTDIR/lib