From 741569f9f906dc49d23440c350da35e21cb10087 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@redhat.com>
Date: Wed, 24 Jul 2013 09:27:14 +0200
Subject: [PATCH] Fix file conflict between samba and wine.

resolves: #985985
---
 samba-4.1.0rc1-fix_regedit_name.patch | 36 +++++++++++++++++++++++++++
 samba.spec                            | 11 +++++---
 2 files changed, 44 insertions(+), 3 deletions(-)
 create mode 100644 samba-4.1.0rc1-fix_regedit_name.patch

diff --git a/samba-4.1.0rc1-fix_regedit_name.patch b/samba-4.1.0rc1-fix_regedit_name.patch
new file mode 100644
index 0000000..851e491
--- /dev/null
+++ b/samba-4.1.0rc1-fix_regedit_name.patch
@@ -0,0 +1,36 @@
+From f0ff2d8ee925921c70f2b9149316f123402ab81b Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <asn@samba.org>
+Date: Fri, 19 Jul 2013 16:08:39 +0200
+Subject: [PATCH] s3-waf: Rename regedit to samba-regedit.
+
+This is needed cause wine already provides a binary with the name
+regedit.
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=10040
+
+Signed-off-by: Andreas Schneider <asn@samba.org>
+Reviewed-by: Kai Blin <kai@samba.org>
+
+Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
+Autobuild-Date(master): Mon Jul 22 14:12:38 CEST 2013 on sn-devel-104
+
+(cherry picked from commit b5051111d2fd3a9ae3b3aa028ccf013a98c20b38)
+---
+ source3/wscript_build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/source3/wscript_build b/source3/wscript_build
+index 19c6d08..a8bdaf0 100755
+--- a/source3/wscript_build
++++ b/source3/wscript_build
+@@ -1615,7 +1615,7 @@ bld.SAMBA3_PYTHON('pylibsmb',
+                   realname='samba/samba3/libsmb_samba_internal.so'
+                   )
+
+-bld.SAMBA3_BINARY('regedit',
++bld.SAMBA3_BINARY('samba-regedit',
+                   source="""utils/regedit.c utils/regedit_samba3.c
+                             utils/regedit_wrap.c utils/regedit_treeview.c
+                             utils/regedit_valuelist.c utils/regedit_dialog.c
+--
+1.8.3.1
diff --git a/samba.spec b/samba.spec
index 6065ef3..57c72bb 100644
--- a/samba.spec
+++ b/samba.spec
@@ -1,7 +1,7 @@
 # Set --with testsuite or %bcond_without to run the Samba torture testsuite.
 %bcond_with testsuite
 
-%define main_release 1
+%define main_release 2
 
 %define samba_version 4.1.0
 %define talloc_version 2.0.7
@@ -46,7 +46,7 @@
 
 Name:           samba
 Version:        %{samba_version}
-Release:        %{samba_release}.1
+Release:        %{samba_release}
 
 %if 0%{?rhel}
 Epoch:          0
@@ -79,6 +79,7 @@ Source200: README.dc
 Source201: README.downgrade
 
 Patch0: samba-4.0.8-fix_winbind_ccache_cleanup.patch
+Patch1: samba-4.1.0rc1-fix_regedit_name.patch
 
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -458,6 +459,7 @@ the local kerberos library to use the same KDC as samba and winbind use
 %prep
 %setup -q -n samba-%{version}%{pre_release}
 %patch0 -p1
+%patch1 -p1
 
 %build
 %global _talloc_lib ,talloc,pytalloc,pytalloc-util
@@ -834,11 +836,11 @@ rm -rf %{buildroot}
 %{_bindir}/nmblookup4
 %{_bindir}/oLschema2ldif
 %{_bindir}/regdiff
-%{_bindir}/regedit
 %{_bindir}/regpatch
 %{_bindir}/regshell
 %{_bindir}/regtree
 %{_bindir}/rpcclient
+%{_bindir}/samba-regedit
 %{_bindir}/sharesec
 %{_bindir}/smbcacls
 %{_bindir}/smbclient
@@ -1510,6 +1512,9 @@ rm -rf %{buildroot}
 %{_mandir}/man7/winbind_krb5_locator.7*
 
 %changelog
+* Wed Jul 24 2013 - Andreas Schneider <asn@redhat.com> - 2:4.1.0-0.2
+- resolves: #985985 - Fix file conflict between samba and wine.
+
 * Sat Jul 20 2013 Petr Pisar <ppisar@redhat.com> - 2:4.1.0-0.1.rc1.1
 - Perl 5.18 rebuild