Updated because I want this for now - NOTE: This will change before release

as this is NOT what we need to ship. This is experimental only at this time.
(This used to be commit 5c8ceaa4973bb7d82da886e03f24a972d978dcb7)

diff --git a/packaging/Caldera/OpenLinux/samba3.spec.tmpl b/packaging/Caldera/OpenLinux/samba3.spec.tmpl
index addca4a5598f131229b5b5bda6aacdf489779606..a9f43ac07e7899b4d99bd56f25c6fcdd4f4f349c 100644 (file)
--- a/packaging/Caldera/OpenLinux/samba3.spec.tmpl
+++ b/packaging/Caldera/OpenLinux/samba3.spec.tmpl
@@ -232,6 +232,8 @@ CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" ./configure \
        --with-smbmount \
        --with-pam \
        --with-tdbsam \
+       --with-ldapsam \
+       --with-krb5=/usr/athena \
        --with-winbind \
        --with-utmp \
        --with-quotas \
@@ -239,21 +241,18 @@ CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" ./configure \
        --with-msdfs \
        --with-profile \
        --with-syslog \
-       --with-utmp \
        --with-netatalk \
        --with-smbwrapper \
        --with-libsmbclient \
-       --with-ldapsam \
        --with-sambabook=$(DESTDIR)/usr/share/swat/using_samba
 
 # Temp disabled - add later - JHT
 #      --with-pam_smbpass \
-#      --with-ldapsam \
-#      --with-krb5=/usr/athena \
 #      --with-nisplus-home \
 #      --with-acl-support \
 
 make all nsswitch/libnss_wins.so torture nsswitch/pam_winbind.so everything
+make tbp/tdbdump tdb/tdbtest tdb/tdbtorture
 
 
 %Install
@@ -281,8 +280,14 @@ strip $DESTDIR/usr/bin/smb{mount,mnt,umount}
 ( cd $DESTDIR/sbin; ln -s /usr/bin/smbmount mount.smbfs; \
        ln -s /usr/bin/smbumount umount.smbfs )
 
-install -m 755 source/bin/smbfilter $DESTDIR/usr/bin
-for i in debug2html talloctort samsync make_printerdef
+# First install /usr/bin progs
+for i in smbfilter make_printerdef debug2html
+do
+       install -m 755 source/bin/$i $DESTDIR/usr/bin
+done
+# Next install /usr/sbin progs
+for i in talloctort samsync locktest locktest2 masktest msgtest smbtorture \
+       tdb/tdbdump tdb/tdbtest tdb/tdbtorture
 do
        install -m 755 source/bin/$i $DESTDIR/usr/sbin
 done