Updating build info for 2.2.1 release - more to follow - NOT COMPLETE

PS: I had to commit this as I am switching machines - You have been warned!

2 files changed, 30 insertions, 17 deletions

diff --git a/packaging/Caldera/OpenLinux/makerpms.sh.tmpl b/packaging/Caldera/OpenLinux/makerpms.sh.tmpl
index fda8545df78..fa4c1e1090e 100644
--- a/packaging/Caldera/OpenLinux/makerpms.sh.tmpl
+++ b/packaging/Caldera/OpenLinux/makerpms.sh.tmpl
@@ -6,20 +6,20 @@ SRCDIR=${SRCDIR:-/usr/src/OpenLinux/SOURCES}
 USERID=`id -u`
 GRPID=`id -g`
 
-if ( z$1 == "zdevel" ) then
-        ( cd ../../../.. ; chown -R ${USERID}.${GRPID} ${SRCDIR}/samba; mv samba samba-PVERSION )
-        ( cd ../../../.. ; tar czvf ${SRCDIR}/samba-PVERSION.tar.gz samba-PVERIONS; mv samba-PVERSION samba )
+if [ z$1 = "zdevel" ]; then
+        ( cd ../../../.. ; chown -R ${USERID}.${GRPID} ${SRCDIR}/samba; mv samba samba-PVERSION; ls -al )
+        ( cd ../../../.. ; tar czvf ${SRCDIR}/samba-PVERSION.tar.gz samba-PVERSION; mv samba-PVERSION samba )
 else
         ( cd ../../../.. ; chown -R ${USERID}.${GRPID} ${SRCDIR}/samba-PVERSION )
         ( cd ../../../.. ; tar czvf ${SRCDIR}/samba-PVERSION.tar.gz samba-PVERSION )
-done
+fi
 
-cp -a *.spec *.spec-lsb $SPECDIR
+cp -af *.spec *.spec-lsb $SPECDIR
 for src in *.patch; do
   trg=`echo $src | sed 's;xxxxxx;PVERSION;'`
   cp -a $src $SRCDIR/$trg
 done
 cd $SPECDIR
-mv samba2.spec samba2.spec-nonlsb
-ln samba2.spec-lsb samba2.spec
+mv -f samba2.spec samba2.spec-nonlsb
+ln -f samba2.spec-lsb samba2.spec
 rpm -ba -v samba2.spec
diff --git a/packaging/Caldera/OpenLinux/samba2.spec-lsb.tmpl b/packaging/Caldera/OpenLinux/samba2.spec-lsb.tmpl
index d527b07ecee..d87984be6d0 100644
--- a/packaging/Caldera/OpenLinux/samba2.spec-lsb.tmpl
+++ b/packaging/Caldera/OpenLinux/samba2.spec-lsb.tmpl
@@ -27,7 +27,7 @@ Requires    	: libpam >= 0.66, SysVinit-scripts >= 1.04-6
 
 BuildRoot   	: /tmp/%{Name}-%{Version}
 
-Source: ftp://ftp.samba.org/pub/samba/%{Name}-%{Version}-%{date}.tar.gz
+Source: ftp://ftp.samba.org/pub/samba/%{Name}-%{Version}.tar.gz
 #Patch0: %{Name}-%{Version}-smbmount.patch
 #Patch1: %{Name}-%{Version}-install.patch
 #Patch2: %{Name}-%{Version}-smbconf.patch
@@ -182,7 +182,7 @@ verificar rapidamente o efeite de qualquer alteração.
 
 
 %Prep
-%setup -n samba
+%setup
 #%patch0 -p1
 #%patch1 -p1
 #%patch2 -p1
@@ -241,8 +241,7 @@ for i in htmldocs/DOMAIN_MEMBER.html htmldocs/Samba-HOWTO-Collection.html \
          docbook/projdoc/DOMAIN_MEMBER.sgml docbook/projdoc/DOMAIN_MEMBER.sgml \
          docbook/faq/samba-pdc-faq.sgml docbook/howto/samba-pdc-howto.sgml \
          docbook/manpages/smbclient.1.sgml docbook/manpages/smbd.8.sgml \
-	 docbook/projdoc/ENCRYPTION.sgml textdocs/samba-pdc-faq.txt \
-	 textdocs/samba-pdc-howto.txt manpages/smbclient.1 manpages/smbd.8 ; do
+	 docbook/projdoc/ENCRYPTION.sgml manpages/smbclient.1 manpages/smbd.8 ; do
 %{fixUP} -vT docs/$i -e '
     s:/usr/local/samba/private/FOREST.SLEEPY.SID:/var/lock/samba.d/FOREST.SLEEPY.SID: +
     s:/usr/local/samba/private:/usr/bin:g +
@@ -256,9 +255,6 @@ done
 %{fixUP} -vT docs/htmldocs/samba-pdc-faq.html -e '
   s:/usr/local/src:/usr/src:g ;
 '
-%{fixUP} -vT docs/textdocs/PRINTER_DRIVER.txt -e '
-  s:/usr/local/samba/printer:/var/spool/samba:g ;
-'
 # End of DirtyHack(TM)
 
 
@@ -279,6 +275,7 @@ CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" ./configure \
 	--without-smbwrapper \
 	--with-smbmount \
 	--with-pam \
+	--with-pam_smbpass \
 	--with-netatalk \
 	--with-quotas \
 	--with-utmp \
@@ -344,6 +341,9 @@ cp -p $VVS/README.home $DESTDIR/etc/skel/Samba/README.txt
 cp -p $VVS/README.Public $DESTDIR/%{LSBservedir}/Public/README.txt
 cp -p $VVS/README.profiles $DESTDIR/%{LSBservedir}/profiles/README.txt
 
+# Add PAM smbpass facility
+mv $DESTDIR/usr/bin/pam_smbpass.so $DESTDIR/lib/security
+
 install -m 755 $VVS/samba.init-lsb $DESTDIR/%{SVIdir}/%{Name}
 
 for f in testparm testprns; do
@@ -414,6 +414,9 @@ swat					swat
 %{_defaultdocdir}/samba- 		doc
 tmp					IGNORED
 man					IGNORED
+lib/security				IGNORED
+/src/$					IGNORED
+/usr/private/$				IGNORED
 @default@
 EOF
 cat << 'EOF' | %{mkLists} -f -a samba
@@ -421,7 +424,8 @@ cat << 'EOF' | %{mkLists} -f -a samba
 Samba/README.txt			base
 ^/etc					config-IGNORED
 %{_defaultdocdir}/samba-[^/]+/(COPYING|README$)	base
-libnss_wins.so				base
+libnss_wins.*				base
+pam_smbpass.so				base
 %{_defaultdocdir}/samba-[^/]+/(COPYING|README$)	base
 %{_defaultdocdir}/samba- 		doc
 smb(mount|mnt|umount)			smbfs
@@ -450,7 +454,16 @@ test "$1" = "0" || exit 0
 /usr/lib/LSB/init-remove %{Name}
 # We want to remove the browse.dat and wins.dat files so they can not
 # interfer with a new version of samba!
-rm -f /var/lock/samba/{browse,wins}.dat 
+rm -f /var/lock/samba/browse.dat 
+rm -f /var/lock/samba/{brlock,connections,locking,messages}.tdb
+if [ -e /var/lock/samba.d/namelist.debug ]; then
+	rm -f /var/lock/samba.d/namelist.debug
+fi
+rm -f /var/lock/samba/unexpected.tdb
+rm -f /var/lock/samba/{smbd,nmbd}.pid
+
+# Note: We MUST keep:
+#	winbindd_*, sshare_info*, printing*, ntdrivers*
 
 
 %PostUn -n swat
@@ -490,4 +503,4 @@ test "$1" = "0" || exit 0
 
 %ChangeLog
 * Mon Jan 01 1997 ...
-$Id: samba2.spec-lsb.tmpl,v 1.1.2.17 2001/04/15 00:33:29 jht Exp $
+$Id: samba2.spec-lsb.tmpl,v 1.1.2.18 2001/05/16 14:47:18 jht Exp $