- fix spoolss.c mismerge

Changed files:
    samba.spec -> 1.474

diff --git a/samba.spec b/samba.spec
index 287bbb26ee7d069141338fc6f47149473c8b9d12..7aa09891c0478718028f01e9ba99521f1e2e50a3 100644 (file)
--- a/samba.spec
+++ b/samba.spec
@@ -75,6 +75,7 @@ Patch2:               %{name}-pthread.patch
 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
@@ -980,6 +981,7 @@ Samba Module for Python.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %{__sed} -i 's#%SAMBAVERSION%#%{version}#' docs/htmldocs/index.html