scabrero/samba
SHA256
1
0
Fork 0
forked from pool/samba
Code Pull Requests Activity

- Enable librados CTDB lock helper for samba-ceph package; (fate#321622).

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=556
This commit is contained in:
David Disseldorp 2017-04-03 14:59:54 +00:00 committed by Git OBS Bridge
parent 6a14d0bdd9
commit 1382a46a1c
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
samba.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Apr 3 14:01:25 UTC 2017 - ddiss@suse.com
- Enable librados CTDB lock helper for samba-ceph package; (fate#321622).
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Mar 30 17:18:54 UTC 2017 - dmulder@suse.com Thu Mar 30 17:18:54 UTC 2017 - dmulder@suse.com

22
samba.spec
View File

@ -23,7 +23,7 @@
%endif %endif
%if 0%{?suse_version} > 1320 %if 0%{?suse_version} > 1320
%ifarch x86_64 %ifarch x86_64
%define build_vfs_ceph 1 %define build_ceph 1
%endif %endif
%endif %endif
@ -126,8 +126,9 @@ BuildRequires: systemd-devel
%if 0%{?build_ctdb_pmda} %if 0%{?build_ctdb_pmda}
BuildRequires: libpcp-devel BuildRequires: libpcp-devel
%endif %endif
%if 0%{?build_vfs_ceph} %if 0%{?build_ceph}
BuildRequires: libcephfs-devel BuildRequires: libcephfs-devel
BuildRequires: librados-devel
%endif %endif
%define samba_ver 4.6.1 %define samba_ver 4.6.1
%define samba_ver_suffix %nil %define samba_ver_suffix %nil
@ -1036,15 +1037,17 @@ develop programs which make use of the wbclient programming interface.
Source Timestamp: %{SOURCE_TIMESTAMP} Source Timestamp: %{SOURCE_TIMESTAMP}
Branch: %{BRANCH} Branch: %{BRANCH}
%if 0%{?build_vfs_ceph} %if 0%{?build_ceph}
%package ceph %package ceph
Summary: Ceph VFS Module for Samba Summary: Ceph specific add-ons for Samba
License: GPL-3.0+ License: GPL-3.0+
Group: Productivity/Networking/Samba Group: Productivity/Networking/Samba
Requires: samba = %{version} Requires: samba = %{version}
%description ceph %description ceph
The Ceph VFS module for Samba allows shares to be backed by the Ceph distributed file system. The Ceph VFS module for Samba allows shares to be backed by the Ceph
distributed file system. A Ceph CTDB lock helper binary is included so
that RADOS locks can be used for CTDB split-brain avoidance.
%endif %endif
@ -1131,6 +1134,9 @@ CONFIGURE_OPTIONS="\
%endif %endif
--enable-fhs \ --enable-fhs \
--with-cluster-support \ --with-cluster-support \
%if 0%{?build_ceph}
--enable-ceph-reclock \
%endif
--with-pam \ --with-pam \
--with-pammodulesdir=%{_lib}/security \ --with-pammodulesdir=%{_lib}/security \
--with-piddir=%{PIDDIR} \ --with-piddir=%{PIDDIR} \
@ -1399,7 +1405,7 @@ done
for file in %{buildroot}%{_mandir}/man8/vfs_*; do for file in %{buildroot}%{_mandir}/man8/vfs_*; do
case "${file#%{buildroot}}" in case "${file#%{buildroot}}" in
%{_mandir}/man8/vfs_ceph.8) %{_mandir}/man8/vfs_ceph.8)
%if 0%{?build_vfs_ceph} == 0 %if 0%{?build_ceph} == 0
rm ${file} rm ${file}
%endif %endif
continue continue
@ -2463,11 +2469,13 @@ fi
%{_libdir}/libwbclient.so %{_libdir}/libwbclient.so
%{_libdir}/pkgconfig/wbclient.pc %{_libdir}/pkgconfig/wbclient.pc
%if 0%{?build_vfs_ceph} %if 0%{?build_ceph}
%files ceph %files ceph
%defattr(-,root,root) %defattr(-,root,root)
%{_mandir}/man8/vfs_ceph.8.* %{_mandir}/man8/vfs_ceph.8.*
%{_libdir}/samba/vfs/ceph.so %{_libdir}/samba/vfs/ceph.so
%{_mandir}/man7/ctdb_mutex_ceph_rados_helper.7.*
%{_libdir}/ctdb/ctdb_mutex_ceph_rados_helper
%endif %endif
%changelog %changelog