From 737284e448f374bb2ff6e6f6f9730eb7fefb70af Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Feb 12 2019 14:53:35 +0000
Subject: Move samba.xattr modules out of python3 test package


resolves: #1674547

Guenther

---

diff --git a/samba.spec b/samba.spec
index 79ecdd6..a8d6985 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 0
+%define main_release 1
 
 %define samba_version 4.10.0
 %define talloc_version 2.1.15
@@ -2039,8 +2039,20 @@ fi
 %{python3_sitearch}/samba/subunit/__pycache__/run.*.pyc
 %{python3_sitearch}/samba/subunit/run.py
 %{python3_sitearch}/samba/tdb_util.py
+%dir %{python3_sitearch}/samba/third_party
+%{python3_sitearch}/samba/third_party/__init__.py
+%dir %{python3_sitearch}/samba/third_party/__pycache__
+%{python3_sitearch}/samba/third_party/__pycache__/__init__.*.pyc
 %{python3_sitearch}/samba/upgrade.py
 %{python3_sitearch}/samba/upgradehelpers.py
+%dir %{python3_sitearch}/samba/web_server
+%{python3_sitearch}/samba/web_server/__init__.py
+%dir %{python3_sitearch}/samba/web_server/__pycache__
+%{python3_sitearch}/samba/web_server/__pycache__/__init__.*.pyc
+%{python3_sitearch}/samba/werror.*.so
+%{python3_sitearch}/samba/xattr.py
+%{python3_sitearch}/samba/xattr_native.*.so
+%{python3_sitearch}/samba/xattr_tdb.*.so
 # FIXME:
 # /usr/lib64/libsamba-policy.cpython-36m-x86-64-linux-gnu.so
 # /usr/lib64/libsamba-policy.cpython-36m-x86-64-linux-gnu.so.0
@@ -2112,6 +2124,7 @@ fi
 %{python3_sitearch}/samba/provision/__pycache__/sambadns.*.pyc
 
 %{python3_sitearch}/samba/remove_dc.py
+%{python3_sitearch}/samba/uptodateness.py
 %endif
 
 %files -n python3-%{name}-test
@@ -2438,19 +2451,6 @@ fi
 %{python3_sitearch}/samba/tests/upgradeprovision.py
 %{python3_sitearch}/samba/tests/upgradeprovisionneeddc.py
 %{python3_sitearch}/samba/tests/xattr.py
-%dir %{python3_sitearch}/samba/third_party
-%{python3_sitearch}/samba/third_party/__init__.py
-%dir %{python3_sitearch}/samba/third_party/__pycache__
-%{python3_sitearch}/samba/third_party/__pycache__/__init__.*.pyc
-%{python3_sitearch}/samba/uptodateness.py
-%dir %{python3_sitearch}/samba/web_server
-%{python3_sitearch}/samba/web_server/__init__.py
-%dir %{python3_sitearch}/samba/web_server/__pycache__
-%{python3_sitearch}/samba/web_server/__pycache__/__init__.*.pyc
-%{python3_sitearch}/samba/werror.*.so
-%{python3_sitearch}/samba/xattr.py
-%{python3_sitearch}/samba/xattr_native.*.so
-%{python3_sitearch}/samba/xattr_tdb.*.so
 
 ### TEST
 %files test
@@ -3394,6 +3394,9 @@ fi
 %endif # with_clustering_support
 
 %changelog
+* Tue Feb 12 2019 Guenther Deschner <gdeschner@redhat.com> - 4.10.0rc2-1
+- resolves: #1674547 - Move samba.xattr modules out of python3 test package
+
 * Wed Feb 06 2019 Guenther Deschner <gdeschner@redhat.com> - 4.10.0rc2-0
 - Update to Samba 4.10.0rc2