More temp. changes. - Bear with me, this will soon be resolved.

(This used to be commit cb38843ac753992be0c6a109a8de175b73fe7db2)

2 files changed, 20 insertions, 26 deletions

diff --git a/packaging/Caldera/OpenLinux/makerpms.sh.tmpl b/packaging/Caldera/OpenLinux/makerpms.sh.tmpl
index 1b48cf6be6..3b8eda4d5c 100644
--- a/packaging/Caldera/OpenLinux/makerpms.sh.tmpl
+++ b/packaging/Caldera/OpenLinux/makerpms.sh.tmpl
@@ -24,27 +24,27 @@ fi
 
 # Start preparing the packages...
 if [ $devel -ne 0 ]; then
-        ( cd ../../../.. ; chown -R ${USERID}.${GRPID} samba; mv samba samba-PVERSION )
-        ( cd ../../../.. ; tar czvf ${SRCDIR}/samba-PVERSION.tar.gz samba-PVERSION; mv samba-PVERSION samba )
+        ( cd ../../../.. ; chown -R ${USERID}.${GRPID} samba3; mv samba3 samba-PVERSION )
+        ( cd ../../../.. ; tar czvf ${SRCDIR}/samba-PVERSION.tar.gz samba-PVERSION; mv samba-PVERSION samba3 )
 else
         ( cd ../../../.. ; chown -R ${USERID}.${GRPID} samba-PVERSION )
         ( cd ../../../.. ; tar czvf ${SRCDIR}/samba-PVERSION.tar.gz samba-PVERSION )
 fi
 
 cp -af *.spec *.spec-lsb $SPECDIR
-if [ $team -ne 0 ]; then
-	cp *.spec-team $SPECDIR
-fi
+#if [ $team -ne 0 ]; then
+#	cp *.spec-team $SPECDIR
+#fi
 for i in `ls *.patch`
 do
 	cp $i $SRCDIR/
 done
 # Start building the package
 cd $SPECDIR
-if [ $old -eq 0 ]; then
-mv -f samba2.spec samba2.spec-nonlsb
-ln -f samba2.spec-lsb samba3.spec
-fi
+#if [ $old -eq 0 ]; then
+#mv -f samba2.spec samba2.spec-nonlsb
+#ln -f samba2.spec-lsb samba3.spec
+#fi
 if [ $team -ne 0 ]; then
 #	mv -f samba3.spec samba3.spec-lsb
 #	ln -f samba3.spec-team samba3.spec
diff --git a/packaging/Caldera/OpenLinux/samba3.spec.tmpl b/packaging/Caldera/OpenLinux/samba3.spec.tmpl
index fb098d9e8d..81ee895f40 100644
--- a/packaging/Caldera/OpenLinux/samba3.spec.tmpl
+++ b/packaging/Caldera/OpenLinux/samba3.spec.tmpl
@@ -13,7 +13,7 @@ Summary      : Samba SMB client and server.
 
 Copyright      : Andrew Tridgell, John H Terpstra; GPL Version 2
 Packager      : Klaus Singvogel <klaus@caldera.de>
-Icon              : Caldera-daemon.gif
+#Icon              : Caldera-daemon.gif
 URL              : http://samba.org/samba
 
 Requires    	: libpam >= 0.66, SysVinit-scripts >= 1.04-6
@@ -23,7 +23,7 @@ BuildRoot   	: /tmp/%{Name}-%{Version}
 
 Source: ftp://ftp.samba.org/pub/samba/%{Name}-%{Version}.tar.gz
 #Patch0: %{Name}-%{Version}-smbmount.patch
-Patch1: %{Name}-%{Version}-install.patch
+#Patch1: %{Name}-%{Version}-install.patch
 #Patch2: %{Name}-%{Version}-smbconf.patch
 
 
@@ -43,7 +43,9 @@ Summary     	: Mount and unmount commands for SMB filesystems (smbfs).
 Group       	: Administration/Network
 Requires       : setup >= 2.0-2, tcp_wrappers
 
-Summary      : Samba Web Administration Tool.
+Summary		: Samba Web Adminsitration Tool.
+
+%Description
 Samba provides an SMB server which can be used to provide
 network services to SMB (sometimes called "Lan Manager")
 clients, including various versions of MS Windows, OS/2,
@@ -53,7 +55,7 @@ in Linux. Samba uses NetBIOS over TCP/IP (NetBT) protocols
 and does NOT need NetBEUI (Microsoft Raw NetBIOS frame)
 protocol.
 
-Samba-2.2 features working NT Domain Control capability and 
+Samba features working NT Domain Control capability and 
 includes the SWAT (Samba Web Administration Tool) that 
 allows samba's smb.conf file to be remotely managed using your 
 favourite web browser. For the time being this is being
@@ -67,10 +69,6 @@ Backup Domain control ability.
 Please refer to the WHATSNEW.txt document for fixup information.
 This binary release includes encrypted password support.
 
-Please read the smb.conf file and ENCRYPTION.txt in the
-docs directory for implementation details.
-
-%Description
 
 NOTE: Caldera OpenLinux uses PAM which has integrated support
 for Shadow passwordsand for quotas. Do NOT recompile with the 
@@ -102,9 +100,9 @@ allowing an administrator to easily look up the effects of any change.
 
 
 %Prep
-%setup -n samba
-#%%patch0 -p1
-%patch1 -p1
+%setup
+#%patch0 -p1
+#%patch1 -p1
 #%patch2 -p1
 
 # instead of patch (to help configuration) ...   ;^)
@@ -142,11 +140,6 @@ done
   s:/usr/local/etc/:/etc/: +
   s:/usr/local/:/usr/:;
 '
-%{fixUP} -vT docs/textdocs/ENCRYPTION.txt -e '
-  s:/usr/local/samba/private:%{EtcSamba}:g +
-  s:mksmbpasswd.sh:mksmbpasswd:g +
-  s:the Samba source directory:/usr/bin:;
-'
 # End of DirtyHack(TM)
 
 
@@ -325,5 +318,6 @@ lisa --inetd disable swat $1
 
 
 %ChangeLog
-* Mon Jan 01 1997 ...
+* Mon Mar 11 2002 John H Terpstra <jht@samba.org>
+- Make this work