From 30a38e2eb72c141e5f914a79eee6987ee50a84ba Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20R=C4=99korajski?= <baggins@pld-linux.org>
Date: Mon, 11 Jan 2010 15:25:34 +0000
Subject: [PATCH] - fix spoolss.c mismerge

Changed files:
    samba.spec -> 1.474
---
 samba.spec | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/samba.spec b/samba.spec
index 287bbb2..7aa0989 100644
--- 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
 
-- 
2.44.0