diff --git a/baselibs.conf b/baselibs.conf index 1e57fa4..4914135 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -11,6 +11,7 @@ libsamba-errors0 libsamba-hostconfig0 libsamba-passdb0 obsoletes "libpdb0- < " +libsamba-policy0-python3 libsamba-policy0 libsamba-util0 libsamdb0 @@ -27,4 +28,6 @@ samba-client supplements "packageand(samba-client:glibc-)" -/usr/lib/samba samba-libs +samba-libs-python3 +samba-libs-python samba-ad-dc diff --git a/samba-4.9.3+git.113.3f6a4cdc269.tar.bz2 b/samba-4.9.3+git.113.3f6a4cdc269.tar.bz2 deleted file mode 100644 index f234a7d..0000000 --- a/samba-4.9.3+git.113.3f6a4cdc269.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a313fad76b8ecb98b5169427c920aa0f79033525327c837bc3b11c3ac5e1110f -size 24650354 diff --git a/samba-4.9.3+git.121.c328d5e9101.tar.bz2 b/samba-4.9.3+git.121.c328d5e9101.tar.bz2 new file mode 100644 index 0000000..ccd5f00 --- /dev/null +++ b/samba-4.9.3+git.121.c328d5e9101.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:10cf75bb97fe733f72c52fe73ea23f7470e13a14b413cfc40c9e53110b302e8f +size 24645183 diff --git a/samba.changes b/samba.changes index c3fbc0d..67add92 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Nov 29 15:54:27 UTC 2018 - David Mulder + +- Remove python2 build dependency from samba-libs; (bsc#1116900); + +------------------------------------------------------------------- +Wed Nov 28 09:35:06 UTC 2018 - Samuel Cabrero + +- 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 diff --git a/samba.spec b/samba.spec index ff00b8c..6a14f5d 100644 --- a/samba.spec +++ b/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.121.c328d5e9101 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 = %{version} %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 @@ -345,6 +365,7 @@ Requires: python-ldb Requires: python-talloc Requires: python-tdb Requires: python-tevent +Requires: libsamba-policy0 = %{version} %endif %description python @@ -360,6 +381,7 @@ Requires: python3-ldb Requires: python3-talloc Requires: python3-tdb Requires: python3-tevent +Requires: libsamba-policy0-python3 = %{version} %description python3 The samba-python3 package contains the Python libraries needed by programs @@ -703,20 +725,46 @@ License: GPL-3.0-or-later Group: System/Libraries %description -n libsamba-policy0 -This subpackage contains the library for policy management. +This subpackage contains the python2 library for policy management. +%package -n libsamba-policy0-python3 +Summary: Active Directory Group Policy library +License: GPL-3.0-or-later +Group: System/Libraries +%description -n libsamba-policy0-python3 +This subpackage contains the python3 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 = %{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,6 +1557,10 @@ 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 %postun -n libsamba-policy0 -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) @@ -2381,18 +2437,27 @@ exit 0 %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