--- squid.spec	2002-11-28 14:45:39 +0300
+++ squid.spec.my	2003-05-06 09:34:44 +0400
@@ -1,6 +1,6 @@
 Name: squid
 Version: 2.5.STABLE1
-Release: alt5
+Release: alt5bga
 
 Summary: The Squid proxy caching server
 License: GPL
@@ -47,6 +47,9 @@
 Patch32: %name-2.5.STABLE1-uninstall.patch
 Patch33: %name-2.5.STABLE1-wccp.patch
 
+# common winbind files from samba-2.2.8-alt2
+Patch35: %name-2.5.STABLE1-alt-samba228_helpers.diff.gz
+
 PreReq: chkconfig shadow-utils fileutils findutils
 Obsoletes: %name-novm
 
@@ -112,6 +115,8 @@
 %patch32 -p1
 %patch33 -p1
 
+%patch35 -p1
+
 %build
 %set_autoconf_version 2.5
 
@@ -270,6 +275,10 @@
 %attr(4710,root,%name) %_libdir/%name/pinger
 
 %changelog
+* Tue May 06 2003 Grigory Batalov <bga@altlinux.ru> 2.5.STABLE1-alt5bga
+- added winbind commons from samba-2.2.8-alt2
+- rebuilt under pure Master 2.2 + updates
+
 * Thu Nov 28 2002 Konstantin Timoshenko <kt@altlinux.ru> 2.5.STABLE1-alt5
 - fix build support for the authentication schemes
 - Official bugfixes from www.%name-cache.org.