Updated in preparation for samba-3.0.0alpha20

(This used to be commit 05f61b2dc4c120f5303e1a7c85ca8b1409d9a95e)

diff --git a/packaging/Caldera/OpenLinux/samba3.spec.tmpl b/packaging/Caldera/OpenLinux/samba3.spec.tmpl
index 7d7da0433600254ef447790f0af89d39d8ab9488..a59ef071b27af72f09c4007ca9683ff33871cc8e 100644 (file)
--- a/packaging/Caldera/OpenLinux/samba3.spec.tmpl
+++ b/packaging/Caldera/OpenLinux/samba3.spec.tmpl
@@ -244,25 +244,23 @@ CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" ./configure \
        --with-netatalk \
        --with-smbwrapper \
        --with-libsmbclient \
+       --with-acl-support \
        --with-sambabook=$(DESTDIR)/usr/share/swat/using_samba
 
 # Temp disabled - add later - JHT
 #      --with-pam_smbpass \
 #      --with-nisplus-home \
-#      --with-acl-support \
 
 make all nsswitch/libnss_wins.so nsswitch/libnss_winbind.so torture nsswitch/pam_winbind.so everything
 (cd tdb; make tdbdump tdbtest tdbtorture tdbtool)
 
-#cd ../examples/VFS
-#CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" ./configure \
-#        --prefix='$(DESTDIR)/usr' \
-#        --localstatedir='$(DESTDIR)/var' \
-#        --libdir='$(DESTDIR)%{EtcSamba}' \
-#        --sbindir='$(DESTDIR)/usr/sbin'
-#make
-#cd block
-#make
+cd ../examples/VFS
+CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" ./configure \
+        --prefix='$(DESTDIR)/usr' \
+        --localstatedir='$(DESTDIR)/var' \
+        --libdir='$(DESTDIR)%{EtcSamba}' \
+        --sbindir='$(DESTDIR)/usr/sbin'
+make
 
 %Install
 %{mkDESTDIR}
@@ -304,11 +302,12 @@ for i in tdbdump tdbtest tdbtorture tdbtool
 do
        install -m 755 source/tdb/$i $DESTDIR/usr/sbin
 done
+
 # Add VFS Modules
-#for i in audit.so recycle.so block/block.so
-#do
-#      install -m755 $i $DESTDIR/lib/samba
-#done
+for i in audit.so recycle.so netatalk.so skel.so
+do
+       install -m755 $i $DESTDIR/lib/samba
+done
 
 #mv $DESTDIR/usr/bin/{make,add,conv}* $DESTDIR/usr/sbin