From 851005e5e25203a707c8da3803d5474c09c29e2d25e6bc796f7a4da51a8c1946 Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Mon, 15 Aug 2016 19:38:49 +0000 Subject: [PATCH] Accepting request 419509 from home:dmdiss:samba_vfs_ceph - Don't package man pages for VFS modules that aren't built; (boo#993707). - Fix population of ctdb sysconfig after source merge; (bsc#981566). - Enable vfs_ceph builds for Factory (x86-64) + Package as samba-ceph to avoid Ceph dependency in base package. OBS-URL: https://build.opensuse.org/request/show/419509 OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=545 --- patches.tar.bz2 | 4 +- samba.changes | 17 +++++++ samba.keyring | 53 +++++++++++++++------- samba.spec | 103 ++++++++++++++++++++++++------------------- vendor-files.tar.bz2 | 4 +- 5 files changed, 115 insertions(+), 66 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 4eb2642..d1e7823 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8f0a35855853aad21e788bd416b9727fa3f0ef0bde188c277c094a50012d57b0 -size 41711 +oid sha256:733933187629808895e1d5b6d9c6e07c16991c9486af8e5378ebdf123715fd35 +size 41359 diff --git a/samba.changes b/samba.changes index 4cf5dc9..c5f8f47 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Mon Aug 15 14:54:14 UTC 2016 - ddiss@suse.com + +- Don't package man pages for VFS modules that aren't built; + (boo#993707). + +------------------------------------------------------------------- +Sat Aug 13 14:41:26 UTC 2016 - jmcdonough@suse.com + +- Fix population of ctdb sysconfig after source merge; (bsc#981566). + +------------------------------------------------------------------- +Fri Aug 12 16:22:33 UTC 2016 - ddiss@suse.com + +- Enable vfs_ceph builds for Factory (x86-64) + + Package as samba-ceph to avoid Ceph dependency in base package. + ------------------------------------------------------------------- Thu Jul 7 15:20:14 UTC 2016 - jmcdonough@suse.com diff --git a/samba.keyring b/samba.keyring index 572aa5f..ebc9e36 100644 --- a/samba.keyring +++ b/samba.keyring @@ -1,6 +1,6 @@ -pub 1024D/6568B7EA 2007-02-04 [expires: 2014-02-25] +pub 1024D/6568B7EA 2007-02-04 [expires: 2016-01-17] uid Samba Distribution Verification Key -sub 2048g/DA6DFB44 2007-02-04 [expires: 2014-02-25] +sub 2048g/DA6DFB44 2007-02-04 [expires: 2016-01-17] -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v1.4.11 (GNU/Linux) @@ -25,18 +25,39 @@ CgkQp6cLM3ld2XFzGwCffyD/eMhEKCN6j5FCSbb3rhkyR/kAn0PlFtYrTNkrc1dO ezhvaZZCPBHWiEYEEBECAAYFAkZQmboACgkQVVCoNUmKuAcl1wCdEzFgS3DIgIhY y6Id5a9EqUjArLkAnArdjXskM952gLuyJjgictCiHdIeiEYEEBECAAYFAkZdvkMA CgkQw1Ohknblb7ZN8gCgjD/SWG0qBCBD7w19I5kVTijU9j4AmwbPf4wU7hY942tn -1NxUyKwF+edxuQINBEXGOWEQCADIOV4TpVG6tDXU7YD1VjJ39xduomiWTg94dIOD -g1bZHLvwUa5I1X7zsjYmghZ5Qa6WxNknbRywWnaP0POMXSMspVWnqBQTZknxdApM -bMQEko0pPJSLwdTD3+0y5ht4edf08asWdSBT5yvu5Oak4O/Sa3P5lNIe8Q3SjfqR -YiSX12uWgqeh+2JsQC50Lr9rnz9AMjKqZEx2v7XKnCkxoaFy1XwOpPjJtIuPFaSI -5OunNsuhXYeGQv7MqqA2RNuulonoHgl9J6YzRBjdmDB28Lm+JKXyJpnHDrUkK6c5 -04EuxVXXQKOvLNPwod3U89OCZ3gFZU/zeESQdpWxXMiQvUqPAAQLCACnbn0cYaXh -l3UnnQgyPYVUJV12/sAjhlgAQq08SPgTJp4GE/Jx9C2KMS7dlWYH4tjDSbeO+RLL -d26npdhiy8Cn9UvsJvDs71/+5S2PTpV16eH5QzQZkvJ/PXkkRXQ1Ilovkvt5rKie -HCx4n6QZb5td9AuAeRZp75UXERO7pXKG/57o/SzswrD/tSEKRpBKQED4eHsPohLw -3dMKDWG6hLRf4GR8v+xKLFivqXr3ttELb9xS7ZyZqz6FSFucQAp6XY/xjnR3CFzf -Kq9pHO4PwvhU53uQeI9suAHSPecxfUIcQfrCaN6K6ktEMY+KxeTJUgqB7Fnskqyn -Cof0MN2OA40+iE8EGBECAA8CGwwFAk9Ki+YFCQ1GuYUACgkQbzORW2Vot+poJACe -Mx7cSix0y3zIgTvAIty06thlOMUAn1hZdeMtAkWjaKfu8LWk/umBetPI -=49fm +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 +9GHh4cjTsKMmRsY6FDkDm8mExQ== +=nU8K -----END PGP PUBLIC KEY BLOCK----- diff --git a/samba.spec b/samba.spec index f18e6d5..16bc802 100644 --- a/samba.spec +++ b/samba.spec @@ -21,6 +21,11 @@ %if 0%{?suse_version} > 1140 && 0%{?suse_version} != 1315 %define build_ctdb_pmda 1 %endif +%if 0%{?suse_version} > 1320 +%ifarch x86_64 +%define build_vfs_ceph 1 +%endif +%endif Name: samba BuildRequires: cups-devel @@ -120,6 +125,9 @@ BuildRequires: systemd-devel %if 0%{?build_ctdb_pmda} BuildRequires: libpcp-devel %endif +%if 0%{?build_vfs_ceph} +BuildRequires: libcephfs-devel +%endif %define samba_ver 4.4.5 %define samba_ver_suffix %nil %if "%{samba_ver_suffix}" == "" @@ -142,7 +150,7 @@ BuildRequires: libpcp-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3678 +%define SOURCE_TIMESTAMP 3686 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 @@ -1027,6 +1035,16 @@ develop programs which make use of the wbclient programming interface. Source Timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} +%if 0%{?build_vfs_ceph} +%package ceph +Summary: Ceph VFS Module for Samba +License: GPL-3.0+ +Group: Productivity/Networking/Samba + +%description ceph +The Ceph VFS module for Samba allows shares to be backed by the Ceph distributed file system. +%endif + %prep %setup -n samba-%{samba_ver_full} -q @@ -1359,8 +1377,37 @@ for file in $( find %{buildroot}%{DOCDIR} -maxdepth 1); do echo "%doc ${file#%{buildroot}}" >>"${RPM_BUILD_DIR}/samba-%{samba_ver_full}/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 + case "${file#%{buildroot}}" in + %{_libdir}/samba/vfs/ceph.so) continue ;; + esac echo "${file#%{buildroot}}" >>${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba done +# only package Man pages for VFS modules that we ship +for file in %{buildroot}%{_mandir}/man8/vfs_*; do + case "${file#%{buildroot}}" in + %{_mandir}/man8/vfs_ceph.8) + %if 0%{?build_vfs_ceph} == 0 + rm ${file} + %endif + continue + ;; + %{_mandir}/man8/vfs_glusterfs.8) + rm ${file} + continue + ;; + %{_mandir}/man8/vfs_gpfs.8) + rm ${file} + continue + ;; + %{_mandir}/man8/vfs_tsmsm.8) + rm ${file} + continue + ;; + esac + # wildcard suffix to account for subsequent gzip + echo "${file#%{buildroot}}*" >>${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba +done # copy the schema install -m 0644 examples/LDAP/samba.schema %{buildroot}/%{_sysconfdir}/openldap/schema/samba3.schema install -m 0644 examples/LDAP/samba-nds.schema %{buildroot}/%{_datadir}/samba/LDAP/samba-nds.schema @@ -1598,11 +1645,11 @@ exit 0 %post -n ctdb %if 0%{?suse_version} %if 0%{?suse_version} > 1220 -%{fillup_only} +%{fillup_only -n ctdb} %service_add_post ctdb.service %{_bindir}/systemd-tmpfiles --create %{_tmpfilesdir}/ctdb.conf || : %else -%{fillup_and_insserv} +%{fillup_and_insserv -n ctdb} %endif %endif @@ -1676,49 +1723,6 @@ fi %{_mandir}/man5/smbpasswd.5.* %{_mandir}/man8/nmbd.8.* %{_mandir}/man8/smbd.8.* -%{_mandir}/man8/vfs_acl_tdb.8.* -%{_mandir}/man8/vfs_acl_xattr.8.* -%{_mandir}/man8/vfs_aio_fork.8.* -%{_mandir}/man8/vfs_aio_linux.8.* -%{_mandir}/man8/vfs_aio_pthread.8.* -%{_mandir}/man8/vfs_audit.8.* -%{_mandir}/man8/vfs_btrfs.8.* -%{_mandir}/man8/vfs_cacheprime.8.* -%{_mandir}/man8/vfs_cap.8.* -%{_mandir}/man8/vfs_catia.8.* -%{_mandir}/man8/vfs_ceph.8.* -%{_mandir}/man8/vfs_commit.8.* -%{_mandir}/man8/vfs_crossrename.8.* -%{_mandir}/man8/vfs_default_quota.8.* -%{_mandir}/man8/vfs_dirsort.8.* -%{_mandir}/man8/vfs_extd_audit.8.* -%{_mandir}/man8/vfs_fake_perms.8.* -%{_mandir}/man8/vfs_fileid.8.* -%{_mandir}/man8/vfs_full_audit.8.* -%{_mandir}/man8/vfs_fruit.8.* -%{_mandir}/man8/vfs_glusterfs.8.* -%{_mandir}/man8/vfs_gpfs.8.* -%{_mandir}/man8/vfs_linux_xfs_sgid.8.* -%{_mandir}/man8/vfs_media_harmony.8.* -%{_mandir}/man8/vfs_netatalk.8.* -%{_mandir}/man8/vfs_offline.8.* -%{_mandir}/man8/vfs_prealloc.8.* -%{_mandir}/man8/vfs_preopen.8.* -%{_mandir}/man8/vfs_readahead.8.* -%{_mandir}/man8/vfs_readonly.8.* -%{_mandir}/man8/vfs_recycle.8.* -%{_mandir}/man8/vfs_shadow_copy.8.* -%{_mandir}/man8/vfs_shadow_copy2.8.* -%{_mandir}/man8/vfs_shell_snap.8.* -%{_mandir}/man8/vfs_snapper.8.* -%{_mandir}/man8/vfs_streams_depot.8.* -%{_mandir}/man8/vfs_streams_xattr.8.* -%{_mandir}/man8/vfs_syncops.8.* -%{_mandir}/man8/vfs_time_audit.8.* -%{_mandir}/man8/vfs_tsmsm.8.* -%{_mandir}/man8/vfs_unityed_media.8.* -%{_mandir}/man8/vfs_worm.8.* -%{_mandir}/man8/vfs_xattr_tdb.8.* %if 0%{?suse_version} && 0%{?suse_version} < 1021 %{_includedir}/samba %endif @@ -2476,4 +2480,11 @@ fi %{_libdir}/libwbclient.so %{_libdir}/pkgconfig/wbclient.pc +%if 0%{?build_vfs_ceph} +%files ceph +%defattr(-,root,root) +%{_mandir}/man8/vfs_ceph.8.* +%{_libdir}/samba/vfs/ceph.so +%endif + %changelog diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 987e135..a5e8401 100644 --- a/vendor-files.tar.bz2 +++ b/vendor-files.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d9033976a18387687ee089b25401c9cf6cc07ab69915f21f885780e2f7ee12aa -size 55878 +oid sha256:26050ae25f8e0f6158dc4ca4fbc85f3389725d7761461ff9397ed28bfdfe5696 +size 55575