packages: samba/samba.spec - fix spoolss.c mismerge

[baggins]

Author: baggins                      Date: Mon Jan 11 15:25:40 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix spoolss.c mismerge

---- Files affected:
packages/samba:
   samba.spec (1.473 -> 1.474) 

---- Diffs:

================================================================
Index: packages/samba/samba.spec
diff -u packages/samba/samba.spec:1.473 packages/samba/samba.spec:1.474
--- packages/samba/samba.spec:1.473	Mon Jan 11 15:38:22 2010
+++ packages/samba/samba.spec	Mon Jan 11 16:25:34 2010
@@ -76,6 +76,7 @@
 Patch3:		%{name}-nscd.patch
 Patch4:		%{name}-lprng-no-dot-printers.patch
 Patch5:		%{name}-python.patch
+Patch6:		%{name}-spoolss-mismerge.patch
 URL:		http://www.samba.org/
 BuildRequires:	acl-devel
 BuildRequires:	autoconf
@@ -981,6 +982,7 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %{__sed} -i 's#%SAMBAVERSION%#%{version}#' docs/htmldocs/index.html
 
@@ -1616,6 +1618,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.474  2010/01/11 15:25:34  baggins
+- fix spoolss.c mismerge
+
 Revision 1.473  2010/01/11 14:38:22  baggins
 - 3.4.4
 - patch samba-client-upcall-buildfix seems obsolete (fixed upstream)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/samba/samba.spec?r1=1.473&r2=1.474&f=u