forked from pool/samba
Accepting request 703039 from network:samba:STABLE
- Fix cephwrap_flistxattr() debug message; (bso#13940); (bsc#1134697). - Add ceph_snapshots VFS module; (jsc#SES-183). - Fix vfs_ceph realpath; (bso#13918); (bsc#1134452). - Explicitly enable libcephfs POSIX ACL support; (bso#13896); (bsc#1130245). OBS-URL: https://build.opensuse.org/request/show/703039 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/samba?expand=0&rev=248
This commit is contained in:
commit
c323ec6743
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:2e389527a89ab02245ea40f32b18db7539a6a1a0e6b1f1cf167303f34fbae4f9
|
||||
size 24772325
|
3
samba-4.10.2+git.94.31fb5e37171.tar.bz2
Normal file
3
samba-4.10.2+git.94.31fb5e37171.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:2c1a39f2dc3c7ccb1030d2a246077b2569b607f9babf6de05c4e5eb8c22975f0
|
||||
size 24797292
|
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue May 14 14:22:11 UTC 2019 - David Disseldorp <ddiss@suse.com>
|
||||
|
||||
- Fix cephwrap_flistxattr() debug message; (bso#13940); (bsc#1134697).
|
||||
- Add ceph_snapshots VFS module; (jsc#SES-183).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed May 8 12:42:31 UTC 2019 - David Disseldorp <ddiss@suse.com>
|
||||
|
||||
- Fix vfs_ceph realpath; (bso#13918); (bsc#1134452).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 17 11:20:32 UTC 2019 - npower <nopower@suse.com>
|
||||
|
||||
@ -76,6 +87,11 @@ Wed Apr 17 11:20:32 UTC 2019 - npower <nopower@suse.com>
|
||||
+ lib/winbind_util: Add winbind_xid_to_sid for --without-winbind; (bso#13813);
|
||||
+ lib:util: Move debug message for mkdir failing to log level 1; (bso#13823);
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Apr 14 22:31:32 UTC 2019 - David Disseldorp <ddiss@suse.com>
|
||||
|
||||
- Explicitly enable libcephfs POSIX ACL support; (bso#13896); (bsc#1130245).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 27 18:47:07 UTC 2019 - David Mulder <dmulder@suse.com>
|
||||
|
||||
|
17
samba.spec
17
samba.spec
@ -170,7 +170,7 @@ BuildRequires: libtasn1-devel >= 3.8
|
||||
%else
|
||||
%define build_make_smp_mflags %{?jobs:-j%jobs}
|
||||
%endif
|
||||
Version: 4.10.2+git.78.0c89af72312
|
||||
Version: 4.10.2+git.94.31fb5e37171
|
||||
Release: 0
|
||||
Url: https://www.samba.org/
|
||||
Obsoletes: samba-32bit < %{version}
|
||||
@ -343,11 +343,11 @@ Summary: Samba Python3 libraries
|
||||
License: GPL-3.0-or-later
|
||||
Group: Development/Libraries/Python
|
||||
Requires: %{name} = %{version}
|
||||
Requires: libsamba-policy0-python3 = %{version}
|
||||
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
|
||||
@ -381,8 +381,8 @@ Requires: %{?insserv_prereq}
|
||||
%endif
|
||||
Requires(pre): /usr/sbin/groupadd
|
||||
Requires: coreutils
|
||||
Requires: libtevent-util0 >= %{version}
|
||||
Requires: samba-client >= %{version}
|
||||
Requires: libtevent-util0 >= %{version}
|
||||
Requires(post): /sbin/ldconfig
|
||||
Requires(postun): /sbin/ldconfig
|
||||
|
||||
@ -1287,9 +1287,10 @@ for file in $( find %{buildroot}%{DOCDIR} -maxdepth 1); do
|
||||
echo "%doc ${file#%{buildroot}}" >>"%{_builddir}/samba-%{version}/filelist-samba-doc"
|
||||
done
|
||||
for file in $( find %{buildroot}%{_libdir}/samba/vfs/ -mindepth 1 ); do
|
||||
# if built we don't want vfs_ceph in the base package
|
||||
# if built we don't want ceph VFS modules in the base package
|
||||
case "${file#%{buildroot}}" in
|
||||
%{_libdir}/samba/vfs/ceph.so) continue ;;
|
||||
%{_libdir}/samba/vfs/ceph_snapshots.so) continue ;;
|
||||
esac
|
||||
echo "${file#%{buildroot}}" >>%{_builddir}/samba-%{version}/filelist-samba
|
||||
done
|
||||
@ -1299,6 +1300,12 @@ for file in %{buildroot}%{_mandir}/man8/vfs_*; do
|
||||
%{_mandir}/man8/vfs_ceph.8)
|
||||
%if 0%{?build_ceph} == 0
|
||||
rm ${file}
|
||||
%endif
|
||||
continue
|
||||
;;
|
||||
%{_mandir}/man8/vfs_ceph_snapshots.8)
|
||||
%if 0%{?build_ceph} == 0
|
||||
rm ${file}
|
||||
%endif
|
||||
continue
|
||||
;;
|
||||
@ -2453,6 +2460,8 @@ exit 0
|
||||
%defattr(-,root,root)
|
||||
%{_mandir}/man8/vfs_ceph.8.*
|
||||
%{_libdir}/samba/vfs/ceph.so
|
||||
%{_mandir}/man8/vfs_ceph_snapshots.8.*
|
||||
%{_libdir}/samba/vfs/ceph_snapshots.so
|
||||
%{_mandir}/man7/ctdb_mutex_ceph_rados_helper.7.*
|
||||
%{_libdir}/ctdb/ctdb_mutex_ceph_rados_helper
|
||||
%endif
|
||||
|
Loading…
Reference in New Issue
Block a user