From f8e2537f2b6050ea3069abe081633146ad9ecc86 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Wed, 13 Sep 2017 11:42:36 +0300
Subject: [PATCH] dcerpc/__init__.py is not packaged for py3

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1491137
---
 samba-4.7.0-dcerpc-__init__.py.patch | 34 ++++++++++++++++++++++++++++
 samba.spec                           |  9 +++++++-
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 samba-4.7.0-dcerpc-__init__.py.patch

diff --git a/samba-4.7.0-dcerpc-__init__.py.patch b/samba-4.7.0-dcerpc-__init__.py.patch
new file mode 100644
index 0000000..3140ef8
--- /dev/null
+++ b/samba-4.7.0-dcerpc-__init__.py.patch
@@ -0,0 +1,34 @@
+From f62ca366bd96cd2d73a8c65db5d361548dfa2f1a 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 | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
+index e341432fa14..a826fbed8ea 100644
+--- a/source4/librpc/wscript_build
++++ b/source4/librpc/wscript_build
+@@ -406,10 +406,10 @@ for env in bld.gen_python_environments():
+ 		realname='samba/dcerpc/messaging.so'
+ 		)
+ 
+-if bld.PYTHON_BUILD_IS_ENABLED():
+-    bld.SAMBA_SCRIPT('python_dcerpc_init',
+-                 pattern='rpc/dcerpc.py',
+-                 installdir='python/samba/dcerpc',
+-                 installname='__init__.py')
++	if bld.PYTHON_BUILD_IS_ENABLED():
++		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 f6261da..9693b4d 100644
--- a/samba.spec
+++ b/samba.spec
@@ -6,7 +6,7 @@
 # ctdb is enabled by default, you can disable it with: --without clustering
 %bcond_without clustering
 
-%define main_release 10
+%define main_release 11
 
 %define samba_version 4.7.0
 %define talloc_version 2.1.9
@@ -115,6 +115,7 @@ 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
@@ -2232,6 +2233,9 @@ rm -rf %{buildroot}
 %{python3_sitearch}/samba/credentials.*.so
 %{python3_sitearch}/samba/crypto.*.so
 %dir %{python3_sitearch}/samba/dcerpc
+%dir %{python3_sitearch}/samba/dcerpc/__pycache__
+%{python3_sitearch}/samba/dcerpc/__pycache__/__init__.*.pyc
+%{python3_sitearch}/samba/dcerpc/__init__.py
 %{python3_sitearch}/samba/dcerpc/atsvc.*.so
 %{python3_sitearch}/samba/dcerpc/auth.*.so
 %{python3_sitearch}/samba/dcerpc/base.*.so
@@ -3354,6 +3358,9 @@ rm -rf %{buildroot}
 %endif # with_clustering_support
 
 %changelog
+* 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
+
 * Tue Sep 12 2017 Andreas Schneider <asn@redhat.com> - 4.7.0-0.10.rc5
 - resolves: #1476175 - Create seperate package for bind_dlz module