diff --git a/samba-4.7.5+git.37.6d30796c515.tar.bz2 b/samba-4.7.5+git.37.6d30796c515.tar.bz2 index 45f99c2..dc667b6 100644 --- a/samba-4.7.5+git.37.6d30796c515.tar.bz2 +++ b/samba-4.7.5+git.37.6d30796c515.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:84190476bb4955170627791a2e01aaa688d2f0c3c4f680cec135c08f4af1e3cc -size 21959968 +oid sha256:014d3d28192286f324027953403d6a9dc9443ad0d0a7c9b21444a6b261e8331f +size 22091389 diff --git a/samba.changes b/samba.changes index d14b341..b515277 100644 --- a/samba.changes +++ b/samba.changes @@ -2,12 +2,12 @@ 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 contents of package samba-python + + Remove contents of package libsamba-policy0 + + Remove contents of 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 + + Remove smbtorture binary and manpage from samba-test ------------------------------------------------------------------- Fri Feb 23 15:27:07 UTC 2018 - dmulder@suse.com diff --git a/samba.spec b/samba.spec index dac9e25..fdceafc 100644 --- a/samba.spec +++ b/samba.spec @@ -27,9 +27,9 @@ # 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 +# - contents of package samba-python +# - contents of package libsamba-policy0 +# - contents of 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 @@ -46,7 +46,7 @@ %define build_ceph 1 %endif %endif -%define vendor_files_git_vers git.4adce31 +%define vendor_files_git_vers git.9c6e2d0 %define talloc_version 2.1.10 %define tevent_version 0.9.34 @@ -345,17 +345,17 @@ and Wireshark to parse IDL and similar protocols Source Timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} -%if %{with_python} - %package python Summary: Samba Python libraries License: GPL-3.0+ Group: Applications/System +%if %{with_python} Requires: %{name} = %{version} Requires: python-ldb Requires: python-talloc Requires: python-tdb Requires: python-tevent +%endif %description python The samba-python package contains the Python libraries needed by programs @@ -364,8 +364,6 @@ 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 License: GPL-3.0+ @@ -744,8 +742,6 @@ applications that want to make use of libsamba-passdb. Source Timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} - -%if %{with_python} %package -n libsamba-policy0 Summary: Active Directory Group Policy library License: GPL-3.0+ @@ -770,8 +766,6 @@ 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 License: GPL-3.0+ @@ -1198,6 +1192,11 @@ rm \ %{buildroot}/%{_libdir}/samba/ldb/ildap.so \ %{buildroot}/%{_libdir}/samba/ldb/ldbsamba_extensions.so \ %endif +%if ! %{with_python} +# seems easiest to just delete these so the samba-python package is +# truely empty +find %{buildroot} -name ".py" -delete +%endif # CTDB install -m 0644 vendor-files-%{vendor_files_git_vers}/config/sysconfig.ctdb %{buildroot}/%{_fillupdir} @@ -2028,12 +2027,13 @@ fi %exclude %dir %{perl_vendorlib}/Parse/Yapp %exclude %{perl_vendorlib}/Parse/Yapp/Driver.pm -%if %{with_python} + %files python %defattr(-,root,root) +%if %{with_python} %{python_sitearch}/* %else -%exclude %{python_sitearch}/samba/third_party/* +%exclude %{python_sitearch}/* %endif %files test @@ -2371,19 +2371,21 @@ fi %_includedir/samba-4.0/passdb.h %_libdir/libsamba-passdb.so -%if %{with_python} + %files -n libsamba-policy0 %defattr(-,root,root) +%if %{with_python} %_libdir/libsamba-policy.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 %_libdir/libsamba-policy.so %_libdir/pkgconfig/samba-policy.pc - %endif %files -n libsamba-util0 diff --git a/vendor-files-git.4adce31.tar.bz2 b/vendor-files-git.4adce31.tar.bz2 deleted file mode 100644 index ca0afae..0000000 --- a/vendor-files-git.4adce31.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2a4317546db97cbf0989bba34010b48ae505d0ccd2edd20fde9c2cf55b3e6f0d -size 54138 diff --git a/vendor-files-git.9c6e2d0.tar.bz2 b/vendor-files-git.9c6e2d0.tar.bz2 new file mode 100644 index 0000000..4a00d19 --- /dev/null +++ b/vendor-files-git.9c6e2d0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ec33aa483190ae1494e25b8e1bb867580028166ccdefdabf04dc9b92f463b72e +size 54217