From fab93eda52bcd271d866dade8e595f57f2afb624 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org>
Date: Sun, 17 Sep 2017 22:47:52 +0200
Subject: [PATCH] Update to Samba 4.7.0rc6

Guenther
---
 .gitignore                           |  2 ++
 samba-4.7.0-dcerpc-__init__.py.patch | 33 ----------------------------
 samba.spec                           |  6 +++--
 sources                              |  4 ++--
 4 files changed, 8 insertions(+), 37 deletions(-)
 delete mode 100644 samba-4.7.0-dcerpc-__init__.py.patch

diff --git a/.gitignore b/.gitignore
index f4da10c..fabfe78 100644
--- a/.gitignore
+++ b/.gitignore
@@ -99,3 +99,5 @@ samba-3.6.0pre1.tar.gz
 /samba-4.7.0rc3.tar.asc
 /samba-4.7.0rc5.tar.xz
 /samba-4.7.0rc5.tar.asc
+/samba-4.7.0rc6.tar.xz
+/samba-4.7.0rc6.tar.asc
diff --git a/samba-4.7.0-dcerpc-__init__.py.patch b/samba-4.7.0-dcerpc-__init__.py.patch
deleted file mode 100644
index adf8d24..0000000
--- a/samba-4.7.0-dcerpc-__init__.py.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 71f48e7fac4ea2914f8d2b5be6dc53114a9e71c3 Mon Sep 17 00:00:00 2001
-From: Alexander Bokovoy <ab@samba.org>
-Date: Wed, 13 Sep 2017 11:37:34 +0300
-Subject: [PATCH] Install dcerpc/__init__.py for all Python environments
-
-Also fix whitespace. We use tabs, not spaces in Python/waf code.
----
- source4/librpc/wscript_build | 11 ++++++-----
- 1 file changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
-index e341432fa14..a381a65e3fa 100644
---- a/source4/librpc/wscript_build
-+++ b/source4/librpc/wscript_build
-@@ -407,9 +407,10 @@ for env in bld.gen_python_environments():
- 		)
- 
- if bld.PYTHON_BUILD_IS_ENABLED():
--    bld.SAMBA_SCRIPT('python_dcerpc_init',
--                 pattern='rpc/dcerpc.py',
--                 installdir='python/samba/dcerpc',
--                 installname='__init__.py')
-+	for env in bld.gen_python_environments():
-+		bld.SAMBA_SCRIPT('python_dcerpc_init',
-+			pattern='rpc/dcerpc.py',
-+			installdir='python/samba/dcerpc',
-+			installname='__init__.py')
- 
--    bld.INSTALL_FILES('${PYTHONARCHDIR}/samba/dcerpc', 'rpc/dcerpc.py', destname='__init__.py')
-+		bld.INSTALL_FILES('${PYTHONARCHDIR}/samba/dcerpc', 'rpc/dcerpc.py', destname='__init__.py')
--- 
-2.13.5
-
diff --git a/samba.spec b/samba.spec
index 9693b4d..074a890 100644
--- a/samba.spec
+++ b/samba.spec
@@ -14,7 +14,7 @@
 %define tevent_version 0.9.33
 %define ldb_version 1.2.1
 # This should be rc1 or nil
-%define pre_release rc5
+%define pre_release rc6
 
 %if "x%{?pre_release}" != "x"
 %define samba_release 0.%{main_release}.%{pre_release}%{?dist}
@@ -115,7 +115,6 @@ Source200: README.dc
 Source201: README.downgrade
 
 Patch0: samba-4.7.0-bind_dlz.patch
-Patch1: samba-4.7.0-dcerpc-__init__.py.patch
 
 Requires(pre): /usr/sbin/groupadd
 Requires(post): systemd
@@ -3358,6 +3357,9 @@ rm -rf %{buildroot}
 %endif # with_clustering_support
 
 %changelog
+* Sun Sep 17 2017 Guenther Deschner <gdeschner@redhat.com> - 4.7.0-0.11.rc6
+- Update to Samba 4.7.0rc6
+
 * Wed Sep 13 2017 Alexander Bokovoy <abokovoy@redhat.com> - 4.7.0-0.11.rc5
 - resolves: #1491137 - dcerpc/__init__.py is not packaged for py3
 
diff --git a/sources b/sources
index f603a45..4260c94 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (samba-4.7.0rc5.tar.xz) = 9fadb55db928433bc40ec87dcc5710f02161804b7ceac5d86c7866ae454d5323426540e5c43bfd75c4cba2364c30605602eb2d846df514ff96623c30ec9564e3
-SHA512 (samba-4.7.0rc5.tar.asc) = 22b0875425f31d78153d54297fa7bc1ad0f79b05ef03818464737807f17f0ae8d217a903a59b198d1132a27ad1329bde6586739f26148a47e426b00f4445b781
+SHA512 (samba-4.7.0rc6.tar.xz) = e2dcef22702261344d1bb4db68813a06dc61d785678ec821ca5aa004c35456687a718b3a4564ba682429a52bf3c46305ea807a99bd734b87a7d63ef283a7360f
+SHA512 (samba-4.7.0rc6.tar.asc) = f86d8dea0697d06aecc57a2c8b71f2fbd51b2aa54192644051a30c41b9975bbbbad1d6f4d5995c61af44c68959900319f2df7b775ddf5a8da89fe6c2b15d652c