From 920e3f09159836386b4ca82365fb6241cbe334e2 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20R=C4=99korajski?= <baggins@pld-linux.org>
Date: Mon, 11 Jan 2010 16:45:36 +0000
Subject: [PATCH] - rel 0.1 - doesn't build, source looks badly git-mismerged

Changed files:
    samba.spec -> 1.475
---
 samba.spec | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/samba.spec b/samba.spec
index 7aa0989..70fa687 100644
--- a/samba.spec
+++ b/samba.spec
@@ -52,7 +52,7 @@ Summary(uk.UTF-8):	SMB клієнт та сервер
 Summary(zh_CN.UTF-8):	Samba 客户端和服务器
 Name:		samba
 Version:	3.4.4
-Release:	1
+Release:	0.1
 Epoch:		1
 License:	GPL v3
 Group:		Networking/Daemons
@@ -75,7 +75,6 @@ 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
@@ -981,7 +980,6 @@ Samba Module for Python.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 
 %{__sed} -i 's#%SAMBAVERSION%#%{version}#' docs/htmldocs/index.html
 
-- 
2.44.0