From 230bea9b9b6c3613d903b1eb612f2f055e62fb23 Mon Sep 17 00:00:00 2001
From: fenlason <fenlason@fedoraproject.org>
Date: Tue, 22 Feb 2005 18:16:30 +0000
Subject: [PATCH] Upgrade to 3.0.11 Add the -smbspool patch to close bz#104136

---
 samba.spec | 61 +++++++++++++++++++++++++++++++++---------------------
 1 file changed, 37 insertions(+), 24 deletions(-)

diff --git a/samba.spec b/samba.spec
index 85b2a70..1c8d239 100644
--- a/samba.spec
+++ b/samba.spec
@@ -2,15 +2,15 @@
 
 Summary: The Samba SMB server.
 Name: samba
-Version: 3.0.10
-Release: 4
+Version: 3.0.11
+Release: 3
 Epoch: 0
 License: GNU GPL Version 2
 Group: System Environment/Daemons
 URL: http://www.samba.org/
 
 #TAG: change for non-pre
-#Source: ftp://us2.samba.org/pub/samba/%{name}-%{version}pre2.tar.gz
+#Source: ftp://us2.samba.org/pub/samba/%{name}-%{version}rc1.tar.gz
 Source: ftp://us2.samba.org/pub/samba/%{name}-%{version}.tar.gz
 
 # Red Hat specific replacement-files
@@ -29,22 +29,23 @@ Source999: filter-requires-samba.sh
 # generic patches
 Patch1: samba-2.2.0-smbw.patch
 Patch2: samba-3.0.0beta1-pipedir.patch
-Patch3: samba-3.0.10-logfiles.patch
-Patch4: samba-3.0.8-pie.patch
+Patch3: samba-3.0.11-logfiles.patch
+Patch4: samba-3.0.11rc1-pie.patch
 Patch5: samba-3.0.0rc3-nmbd-netbiosname.patch
 Patch6: samba-3.0.4-smb.conf.patch
 Patch7: samba-3.0.10-man.patch
 Patch8: samba-3.0.4-warning.patch
 Patch9: samba-3.0.5rc1-passwd.patch
-Patch10: samba-3.0.5pre1-smbclient-kerberos.patch
-Patch11: samba-3.0.5pre1-use_authtok.patch
-Patch12: samba-3.0.5rc1-64bit-timestamps.patch
-Patch13: samba-3.0.8pre1-smbmnt.patch
-#Patch14: samba-3.0.8-non-ascii-domain.patch
-Patch15: samba-3.0.4-install.mount.smbfs.patch
-Patch16: samba-3.0.9-changetrustpw.patch
-Patch17: samba-3.0.7-64bit.patch
-Patch18: samba-3.0.10-delim.patch
+Patch10: samba-3.0.5rc1-64bit-timestamps.patch
+#Patch11: samba-3.0.8-non-ascii-domain.patch
+Patch12: samba-3.0.4-install.mount.smbfs.patch
+Patch13: samba-3.0.10-delim.patch
+Patch14: samba-3.0.9-smbspool.patch
+Patch15: samba-3.0.11-gcc4.patch
+Patch16: samba-3.0.11-clitar.patch
+Patch17: samba-3.0.11-establish_trust.patch
+Patch18: samba-3.0.11-user_rights_v1.patch
+Patch19: samba-3.0.11-winbind_find_dc_v2.patch
 
 Requires: pam >= 0:0.64 %{auth} samba-common = %{epoch}:%{version} 
 Requires: logrotate >= 0:3.4 initscripts >= 0:5.54-1 
@@ -100,7 +101,7 @@ Web browser.
 
 %prep
 # TAG: change for non-pre
-# % setup -q -n samba-3.0.8pre2
+#% setup -q -n samba-3.0.11rc1
 %setup -q
 
 # copy Red Hat specific scripts
@@ -118,15 +119,16 @@ cp %{SOURCE8} packaging/RedHat/winbind.init
 %patch7 -p1 -b .man
 %patch8 -p1 -b .warning
 %patch9 -p1 -b .passwd
-%patch10 -p1 -b .smbclient-kerberos
-%patch11 -p1 -b .use_authtok
-%patch12 -p1 -b .64bit-timestamps
-%patch13 -p1 -b .smbmnt
-#%patch14 -p1 -b .non-ascii-domain
-%patch15 -p1 -b .install.mount.smbfs
-%patch16 -p1 -b .changetrustpw
-%patch17 -p1 -b .64bit
-%patch18 -p1 -b .delim
+%patch10 -p1 -b .64bit-timestamps
+#%patch11 -p1 -b .non-ascii-domain
+%patch12 -p1 -b .install.mount.smbfs
+%patch13 -p1 -b .delim
+%patch14 -p1 -b .smbspool
+%patch15 -p1 -b .gcc4
+%patch16 -p0 -b .clitar
+%patch17 -p0 -b .establish_trust
+%patch18 -p0 -b .user_rights_v1
+%patch19 -p1 -b .winbind_find_dc_v2
 
 # crap
 rm -f examples/VFS/.cvsignore
@@ -457,6 +459,17 @@ fi
 #%lang(ja) %{_mandir}/ja/man8/smbpasswd.8*
 
 %changelog
+* Fri Feb 18 2005 Jay Fenlason <fenlason@redhat.com> 3.0.11-3
+- add -gcc4 patch to compile with gcc 4.
+- remove the now obsolete -smbclient-kerberos.patch
+- Include four upstream patches from
+  http://samba.org/~jerry/patches/post-3.0.11/
+  (Slightly modified the winbind_find_dc_v2 patch to apply easily with
+  rpmbuild).
+
+* Fri Feb 4 2005 Jay Fenlason <fenlason@redhat.com> 3.0.11-2
+- include -smbspool patch to close bz#104136
+
 * Wed Jan 12 2005 Jay Fenlason <fenlason@redhat.com> 3.0.10-4
 - Update the -man patch to fix ntlm_auth.1 too.
 - Move pam_smbpass.so to the -common package, so both the 32