diff --git a/samba.changes b/samba.changes index 34e308f..d14b341 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Feb 26 22:09:49 UTC 2018 - aaptel@suse.com + +- Disable python until full python3 port is done; (bsc#1082139); + + Remove package samba-python + + Remove package libsamba-policy0 + + Remove package libsamba-policy-devel + + Remove library libsamba-python-samba4.so from samba-libs package + + Remove library libsamba-net-samba4.so from samba-libs package + + Remove smbtorture binary and manpage + ------------------------------------------------------------------- Fri Feb 23 15:27:07 UTC 2018 - dmulder@suse.com diff --git a/samba.spec b/samba.spec index bf764c6..dac9e25 100644 --- a/samba.spec +++ b/samba.spec @@ -23,6 +23,21 @@ %{!?_tmpfilesdir:%global _tmpfilesdir /usr/lib/tmpfiles.d} +%if 0%{?sle_version} >= 150000 && !0%{?is_opensuse} +# SLE15 dropped python2 (bsc#1082139) +# disabling all python things until full python3 port is done +# this removes: +# - package samba-python +# - package libsamba-policy0 +# - package libsamba-policy-devel +# - file libsamba-python-samba4.so from pkg samba-libs +# - file libsamba-net-samba4.so from pkg samba-libs +# - bin & manpage of smbtorture from pkg samba-test +%define with_python 0 +%else +%define with_python 1 +%endif + %if 0%{?suse_version} > 1140 && 0%{?suse_version} != 1315 %define build_ctdb_pmda 1 %endif @@ -330,6 +345,7 @@ and Wireshark to parse IDL and similar protocols Source Timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} +%if %{with_python} %package python Summary: Samba Python libraries @@ -348,6 +364,7 @@ that use SMB, RPC and other Samba provided protocols in Python programs. Source Timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} +%endif %package test Summary: Testing tools for Samba servers and clients @@ -728,6 +745,7 @@ Source Timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} +%if %{with_python} %package -n libsamba-policy0 Summary: Active Directory Group Policy library License: GPL-3.0+ @@ -752,6 +770,7 @@ applications that want to make use of libsamba-policy. Source Timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} +%endif %package -n libsamba-util0 Summary: Samba utility function library @@ -1112,6 +1131,9 @@ CONFIGURE_OPTIONS="\ %endif %if ! %{with_dc} --without-ad-dc \ +%endif +%if ! %{with_python} + --disable-python %endif --bundled-libraries=NONE,socket_wrapper,cmocka,${bundled_libraries_extra} \ " @@ -1542,8 +1564,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_python} %post -n libsamba-policy0 -p /sbin/ldconfig %postun -n libsamba-policy0 -p /sbin/ldconfig +%endif %post -n libsamba-util0 -p /sbin/ldconfig %postun -n libsamba-util0 -p /sbin/ldconfig %post -n libsamdb0 -p /sbin/ldconfig @@ -1952,11 +1976,13 @@ fi %{_libdir}/samba/libsamba-cluster-support-samba4.so %{_libdir}/samba/libsamba-debug-samba4.so %{_libdir}/samba/libsamba-modules-samba4.so -%{_libdir}/samba/libsamba-net-samba4.so %{_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 %{_libdir}/samba/libsamdb-common-samba4.so %{_libdir}/samba/libsecrets3-samba4.so %{_libdir}/samba/libserver-id-db-samba4.so @@ -2002,9 +2028,13 @@ fi %exclude %dir %{perl_vendorlib}/Parse/Yapp %exclude %{perl_vendorlib}/Parse/Yapp/Driver.pm +%if %{with_python} %files python %defattr(-,root,root) %{python_sitearch}/* +%else +%exclude %{python_sitearch}/samba/third_party/* +%endif %files test %defattr(-,root,root) @@ -2012,13 +2042,15 @@ fi %{_bindir}/locktest %{_bindir}/masktest %{_bindir}/ndrdump +%if %{with_python} %{_bindir}/smbtorture +%{_mandir}/man1/smbtorture.1.* +%endif %{_bindir}/vfstest %{_mandir}/man1/gentest.1.* %{_mandir}/man1/locktest.1.* %{_mandir}/man1/masktest.1.* %{_mandir}/man1/ndrdump.1.* -%{_mandir}/man1/smbtorture.1.* %{_mandir}/man1/vfstest.1.* %files winbind -f filelist-samba-winbind @@ -2339,6 +2371,8 @@ fi %_includedir/samba-4.0/passdb.h %_libdir/libsamba-passdb.so +%if %{with_python} + %files -n libsamba-policy0 %defattr(-,root,root) %_libdir/libsamba-policy.so.0* @@ -2350,6 +2384,8 @@ fi %_libdir/libsamba-policy.so %_libdir/pkgconfig/samba-policy.pc +%endif + %files -n libsamba-util0 %defattr(-,root,root) %_libdir/libsamba-util.so.0*