Accepting request 654115 from home:dmulder:branches:network:samba:STABLE

- Remove python2 build dependency from samba-libs; (bsc#1116900);
- Update update-apparmor-samba-profile script to ignore the shares's
  paths containing substitution variables in any place, not only at the
  beginning of the path.

OBS-URL: https://build.opensuse.org/request/show/654115
OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=609

samba-4.9.3+git.113.3f6a4cdc269.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a313fad76b8ecb98b5169427c920aa0f79033525327c837bc3b11c3ac5e1110f
-size 24650354

samba-4.9.3+git.117.de34b389efa.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9a26cb82a109c071aa161dedbd6cdf6a9994ac0e74b39e87b2b2a971970da25d
+size 24646967

samba.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Thu Nov 29 15:54:27 UTC 2018 - David Mulder <dmulder@suse.com>
+
+- Remove python2 build dependency from samba-libs; (bsc#1116900);
+
+-------------------------------------------------------------------
+Wed Nov 28 09:35:06 UTC 2018 - Samuel Cabrero <scabrero@suse.de>
+
+- Update update-apparmor-samba-profile script to ignore the shares's
+  paths containing substitution variables in any place, not only at the
+  beginning of the path.
+
 -------------------------------------------------------------------
 Mon Nov 19 12:28:56 UTC 2018 - Samuel Cabrero <scabrero@suse.de>
 

samba.spec

@@ -168,7 +168,7 @@ BuildRequires:  krb5-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-Version:        4.9.3+git.113.3f6a4cdc269
+Version:        4.9.3+git.117.de34b389efa
 Release:        0
 Url:            https://www.samba.org/
 Obsoletes:      samba-32bit < %{version}
@@ -318,11 +318,31 @@ Requires:       krb5
 %if 0%{?suse_version} > 1210 && 0%{?suse_version} < 1315
 Requires:       libfam0-gamin
 %endif
+Requires:       samba-libs-python
 
 %description libs
 The samba-libs package contains the libraries needed by programs that
 link against the SMB, RPC and other protocols provided by the Samba suite.
 
+%package libs-python3
+Summary:        Python3 dependencies of samba-libs
+License:        GPL-3.0-or-later
+Group:          Development/Libraries/C and C++
+Requires:       python3
+Provides:       samba-libs-python
+
+%description libs-python3
+Dependencies of samba-libs that require python3.
+
+%package libs-python
+Summary:        Python2 dependencies of samba-libs
+License:        GPL-3.0-or-later
+Group:          Development/Libraries/C and C++
+Requires:       python
+
+%description libs-python
+Dependencies of samba-libs that require python2.
+
 %package pidl
 Summary:        Perl IDL compiler
 License:        GPL-3.0-or-later
@@ -697,26 +717,54 @@ This subpackage contains libraries and header files for developing
 applications that want to make use of libsamba-passdb.
 
 
-%package -n libsamba-policy0
+%package -n libsamba-policy0-python3
 Summary:        Active Directory Group Policy library
 License:        GPL-3.0-or-later
 Group:          System/Libraries
+Provides:       libsamba-policy0
 
-%description -n libsamba-policy0
+%description -n libsamba-policy0-python3
-This subpackage contains the library for policy management.
+This subpackage contains the python3 library for policy management.
 
+%package -n libsamba-policy0-python
+Summary:        Active Directory Group Policy library
+License:        GPL-3.0-or-later
+Group:          System/Libraries
+Provides:       libsamba-policy0
 
+%description -n libsamba-policy0-python
+This subpackage contains the python2 library for policy management.
 
 %package -n libsamba-policy-devel
 Summary:        Development files for the Samba AD Group Policy library
 License:        GPL-3.0-or-later
 Group:          Development/Libraries/C and C++
-Requires:       libsamba-policy0 = %{version}
+Requires:       libsamba-policy-python-devel = %{version}
 
 %description -n libsamba-policy-devel
 This subpackage contains libraries and header files for developing
 applications that want to make use of libsamba-policy.
 
+%package -n libsamba-policy-python3-devel
+Summary:        Development files for the Samba AD Group Policy library
+License:        GPL-3.0-or-later
+Group:          Development/Libraries/C and C++
+Requires:       libsamba-policy0-python3 = %{version}
+Provides:       libsamba-policy-python-devel
+
+%description -n libsamba-policy-python3-devel
+This subpackage contains libraries and header files for developing
+applications that want to make use of libsamba-policy.
+
+%package -n libsamba-policy-python-devel
+Summary:        Development files for the Samba AD Group Policy library
+License:        GPL-3.0-or-later
+Group:          Development/Libraries/C and C++
+Requires:       libsamba-policy0-python = %{version}
+
+%description -n libsamba-policy-python-devel
+This subpackage contains libraries and header files for developing
+applications that want to make use of libsamba-policy.
 
 %package -n libsamba-util0
 Summary:        Samba utility function library
@@ -1509,9 +1557,13 @@ fi
 %postun -n libsamba-hostconfig0 -p /sbin/ldconfig
 %post   -n libsamba-passdb0 -p /sbin/ldconfig
 %postun -n libsamba-passdb0 -p /sbin/ldconfig
+%if %{with_python3}
+%post   -n libsamba-policy0-python3 -p /sbin/ldconfig
+%postun -n libsamba-policy0-python3 -p /sbin/ldconfig
+%endif
 %if %{with_python}
-%post   -n libsamba-policy0 -p /sbin/ldconfig
+%post   -n libsamba-policy0-python -p /sbin/ldconfig
-%postun -n libsamba-policy0 -p /sbin/ldconfig
+%postun -n libsamba-policy0-python -p /sbin/ldconfig
 %endif
 %post   -n libsamba-util0 -p /sbin/ldconfig
 %postun -n libsamba-util0 -p /sbin/ldconfig
@@ -1950,14 +2002,6 @@ exit 0
 %{_libdir}/samba/libsamba-security-samba4.so
 %{_libdir}/samba/libsamba-sockets-samba4.so
 %{_libdir}/samba/libsamba3-util-samba4.so
-%if %{with_python}
-%{_libdir}/samba/libsamba-python-samba4.so
-%{_libdir}/samba/libsamba-net-samba4.so
-%endif
-%if %{with_python3}
-%{_libdir}/samba/libsamba-net.%{py3_soflags_dash}-samba4.so
-%{_libdir}/samba/libsamba-python.%{py3_soflags_dash}-samba4.so
-%endif
 %{_libdir}/samba/libsamdb-common-samba4.so
 %{_libdir}/samba/libsecrets3-samba4.so
 %{_libdir}/samba/libserver-id-db-samba4.so
@@ -1993,6 +2037,18 @@ exit 0
 %{_libdir}/samba/pdb/smbpasswd.so
 %{_libdir}/samba/pdb/tdbsam.so
 
+%files libs-python3
+%if %{with_python3}
+%{_libdir}/samba/libsamba-net.%{py3_soflags_dash}-samba4.so
+%{_libdir}/samba/libsamba-python.%{py3_soflags_dash}-samba4.so
+%endif
+
+%files libs-python
+%if %{with_python}
+%{_libdir}/samba/libsamba-python-samba4.so
+%{_libdir}/samba/libsamba-net-samba4.so
+%endif
+
 %if %{with_pidl}
 %files pidl
 %defattr(-,root,root)
@@ -2376,23 +2432,32 @@ exit 0
 %_includedir/samba-4.0/passdb.h
 %_libdir/libsamba-passdb.so
 
-%files -n libsamba-policy0
+%files -n libsamba-policy0-python
 %defattr(-,root,root)
 %if %{with_python}
 %_libdir/libsamba-policy.so.0*
 %endif
+
+%files -n libsamba-policy0-python3
+%defattr(-,root,root)
 %if %{with_python3}
 %_libdir/libsamba-policy.%{py3_soflags_dash}.so.0*
 %endif
 
 %files -n libsamba-policy-devel
 %defattr(-,root,root)
-%if %{with_python}
 %dir %_includedir/samba-4.0/
 %_includedir/samba-4.0/policy.h
+
+%files -n libsamba-policy-python-devel
+%defattr(-,root,root)
+%if %{with_python}
 %_libdir/libsamba-policy.so
 %_libdir/pkgconfig/samba-policy.pc
 %endif
+
+%files -n libsamba-policy-python3-devel
+%defattr(-,root,root)
 %if %{with_python3}
 %_libdir/libsamba-policy.%{py3_soflags_dash}.so
 %_libdir/pkgconfig/samba-policy.%{py3_soflags}.pc