Merged update from upstream sources
This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/samba.git#0d567d3ab93b26381d11f2e1885cfbd3a832365e
This commit is contained in:
DistroBaker
parent
d46a51b99d
commit
66c3b2fb40
69
samba.spec
69
samba.spec
|
|
@ -78,7 +78,7 @@
|
|||
|
||||
%define samba_requires_eq() %(LC_ALL="C" echo '%*' | xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not")
|
||||
|
||||
%global main_release 0
|
||||
%global main_release 1
|
||||
|
||||
%global samba_version 4.13.2
|
||||
%global talloc_version 2.3.1
|
||||
|
|
@ -266,7 +266,7 @@ BuildRequires: perl(ExtUtils::MakeMaker)
|
|||
BuildRequires: perl(FindBin)
|
||||
BuildRequires: perl(Parse::Yapp)
|
||||
|
||||
%if %{without testsuite}
|
||||
%if %{without includelibs}
|
||||
BuildRequires: libtalloc-devel >= %{talloc_version}
|
||||
BuildRequires: python3-talloc-devel >= %{talloc_version}
|
||||
|
||||
|
|
@ -604,6 +604,13 @@ Requires: libwbclient = %{samba_depver}
|
|||
The python3-%{name} package contains the Python 3 libraries needed by programs
|
||||
that use SMB, RPC and other Samba provided protocols in Python 3 programs.
|
||||
|
||||
%package -n python3-%{name}-devel
|
||||
Summary: Samba python devel files
|
||||
Requires: python3-%{name} = %{samba_depver}
|
||||
|
||||
%description -n python3-%{name}-devel
|
||||
The python3-%{name}-devel package contains the Python 3 defel files.
|
||||
|
||||
%package -n python3-samba-test
|
||||
Summary: Samba Python libraries
|
||||
Requires: python3-%{name} = %{samba_depver}
|
||||
|
|
@ -1123,7 +1130,7 @@ rm -f %{buildroot}%{_mandir}/man8/vfs_nfs4acl_xattr.8*
|
|||
%endif
|
||||
|
||||
pushd pidl
|
||||
make DESTDIR=%{buildroot} install_vendor
|
||||
%{__make} DESTDIR=%{buildroot} install_vendor
|
||||
|
||||
rm -f %{buildroot}%{perl_archlib}/perllocal.pod
|
||||
rm -f %{buildroot}%{perl_archlib}/vendor_perl/auto/Parse/Pidl/.packlist
|
||||
|
|
@ -1153,7 +1160,7 @@ export TDB_NO_FSYNC=1
|
|||
export NMBD_DONT_LOG_STDOUT=1
|
||||
export SMBD_DONT_LOG_STDOUT=1
|
||||
export WINBINDD_DONT_LOG_STDOUT=1
|
||||
make %{?_smp_mflags} test FAIL_IMMEDIATELY=1
|
||||
%{__make} %{?_smp_mflags} test FAIL_IMMEDIATELY=1
|
||||
#endif with testsuite
|
||||
%endif
|
||||
|
||||
|
|
@ -1649,6 +1656,16 @@ fi
|
|||
%{_libdir}/samba/libtdb.so.*
|
||||
%{_libdir}/samba/libtevent.so.*
|
||||
|
||||
%{_libdir}/samba/ldb/asq.so
|
||||
%{_libdir}/samba/ldb/ldb.so
|
||||
#%%{_libdir}/samba/ldb/mdb.so
|
||||
%{_libdir}/samba/ldb/paged_searches.so
|
||||
%{_libdir}/samba/ldb/rdn_name.so
|
||||
%{_libdir}/samba/ldb/sample.so
|
||||
%{_libdir}/samba/ldb/server_sort.so
|
||||
%{_libdir}/samba/ldb/skel.so
|
||||
%{_libdir}/samba/ldb/tdb.so
|
||||
|
||||
%{_mandir}/man3/ldb.3.gz
|
||||
%{_mandir}/man3/talloc.3.gz
|
||||
#endif with includelibs
|
||||
|
|
@ -1770,19 +1787,6 @@ fi
|
|||
%{_libdir}/samba/ldb/vlv.so
|
||||
%{_libdir}/samba/ldb/wins_ldb.so
|
||||
|
||||
%if %{with includelibs}
|
||||
%{_libdir}/samba/ldb/asq.so
|
||||
%{_libdir}/samba/ldb/ldb.so
|
||||
%{_libdir}/samba/ldb/mdb.so
|
||||
%{_libdir}/samba/ldb/paged_searches.so
|
||||
%{_libdir}/samba/ldb/rdn_name.so
|
||||
%{_libdir}/samba/ldb/sample.so
|
||||
%{_libdir}/samba/ldb/server_sort.so
|
||||
%{_libdir}/samba/ldb/skel.so
|
||||
%{_libdir}/samba/ldb/tdb.so
|
||||
#endif with includelibs
|
||||
%endif
|
||||
|
||||
%{_libdir}/samba/vfs/posix_eadb.so
|
||||
%dir /var/lib/samba/sysvol
|
||||
%{_mandir}/man8/samba.8*
|
||||
|
|
@ -2317,22 +2321,13 @@ fi
|
|||
%{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
|
||||
# /usr/lib64/libsamba-policy.cpython-36m-x86-64-linux-gnu.so.0.0.1
|
||||
%{_libdir}/libsamba-policy.*.so*
|
||||
# FIXME:
|
||||
# /usr/lib64/pkgconfig/samba-policy.cpython-36m-x86_64-linux-gnu.pc
|
||||
%{_libdir}/pkgconfig/samba-policy.*.pc
|
||||
# FIXME:
|
||||
# /usr/lib64/samba/libsamba-net.cpython-36m-x86-64-linux-gnu-samba4.so
|
||||
# /usr/lib64/samba/libsamba-python.cpython-36m-x86-64-linux-gnu-samba4.so
|
||||
%{_libdir}/samba/libsamba-net.*-samba4.so
|
||||
%{_libdir}/samba/libsamba-python.*-samba4.so
|
||||
%{_libdir}/libsamba-policy.cpython*.so.*
|
||||
%{_libdir}/samba/libsamba-net.cpython*.so
|
||||
%{_libdir}/samba/libsamba-python.cpython*.so
|
||||
|
||||
%if %{with testsuite}
|
||||
%{_libdir}/samba/libpyldb-util.*.so.*
|
||||
%if %{with includelibs}
|
||||
%{_libdir}/samba/libpyldb-util.cpython*.so.*
|
||||
%{_libdir}/samba/libpytalloc-util.cpython*.so.*
|
||||
|
||||
%{python3_sitearch}/__pycache__/_ldb_text*.pyc
|
||||
%{python3_sitearch}/__pycache__/_tdb_text*.pyc
|
||||
|
|
@ -2341,11 +2336,16 @@ fi
|
|||
%{python3_sitearch}/_tdb_text.py
|
||||
%{python3_sitearch}/_tevent.cpython*.so
|
||||
%{python3_sitearch}/ldb.cpython*.so
|
||||
%{python3_sitearch}/talloc.cpython*.so
|
||||
%{python3_sitearch}/tdb.cpython*.so
|
||||
%{python3_sitearch}/tevent.py
|
||||
#endif with testsuite
|
||||
#endif with includelibs
|
||||
%endif
|
||||
|
||||
%files -n python3-%{name}-devel
|
||||
%{_libdir}/libsamba-policy.*.so
|
||||
%{_libdir}/pkgconfig/samba-policy.*.pc
|
||||
|
||||
%if %{with dc} || %{with testsuite}
|
||||
%files -n python3-%{name}-dc
|
||||
%{python3_sitearch}/samba/samdb.py
|
||||
|
|
@ -3754,6 +3754,9 @@ fi
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Nov 03 2020 Andreas Schneider <asn@redhat.com> - 4.13.2-1
|
||||
- Create a python3-samba-devel package to avoid unnessary dependencies
|
||||
|
||||
* Tue Nov 03 2020 Guenther Deschner <gdeschner@redhat.com> - 4.13.2-0
|
||||
- Update to Samba 4.13.2
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue