From ab42f0a308ea1a541d70aa95f4ecb0ff5078091f5355b0de5217a630fd68d69e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Wed, 6 May 2015 17:39:11 +0000 Subject: [PATCH 1/3] Drop redundant doc attribute from man pages. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=462 --- patches.tar.bz2 | 4 +- samba.changes | 5 + samba.spec | 212 +++++++++++++++++++++---------------------- vendor-files.tar.bz2 | 4 +- 4 files changed, 115 insertions(+), 110 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 4ccf085..e30d1d0 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e546e49be077b61b88e2aa88c91c3eaad8dc859a0f1672afb87a838a7ddbfef1 -size 103790 +oid sha256:4d444a412711e22273207e7f709c6531fc06d425d85a5772f14563b3474e558c +size 103792 diff --git a/samba.changes b/samba.changes index 58ad6e4..3af0f33 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed May 6 17:09:36 UTC 2015 - lmuelle@suse.com + +- Drop redundant doc attribute from man pages. + ------------------------------------------------------------------- Thu Apr 16 11:32:55 UTC 2015 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index 93a3545..aac6676 100644 --- a/samba.spec +++ b/samba.spec @@ -143,7 +143,7 @@ BuildRequires: systemd-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3400 +%define SOURCE_TIMESTAMP 3403 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 @@ -1680,55 +1680,55 @@ fi %attr(0644,root,root) %{_datadir}/omc/svcinfo.d/smb.xml %dir %{_datadir}/samba %{_datadir}/samba/update-apparmor-samba-profile -%doc %{_mandir}/man1/smbstatus.1.* -%doc %{_mandir}/man5/smbpasswd.5.* -%doc %{_mandir}/man8/nmbd.8.* -%doc %{_mandir}/man8/smbd.8.* -%doc %{_mandir}/man8/smbta-util.8.* -%doc %{_mandir}/man8/vfs_acl_tdb.8.* -%doc %{_mandir}/man8/vfs_acl_xattr.8.* -%doc %{_mandir}/man8/vfs_aio_fork.8.* -%doc %{_mandir}/man8/vfs_aio_linux.8.* -%doc %{_mandir}/man8/vfs_aio_pthread.8.* -%doc %{_mandir}/man8/vfs_audit.8.* -%doc %{_mandir}/man8/vfs_btrfs.8.* -%doc %{_mandir}/man8/vfs_cacheprime.8.* -%doc %{_mandir}/man8/vfs_cap.8.* -%doc %{_mandir}/man8/vfs_catia.8.* -%doc %{_mandir}/man8/vfs_ceph.8.* -%doc %{_mandir}/man8/vfs_commit.8.* -%doc %{_mandir}/man8/vfs_crossrename.8.* -%doc %{_mandir}/man8/vfs_default_quota.8.* -%doc %{_mandir}/man8/vfs_dirsort.8.* -%doc %{_mandir}/man8/vfs_extd_audit.8.* -%doc %{_mandir}/man8/vfs_fake_perms.8.* -%doc %{_mandir}/man8/vfs_fileid.8.* -%doc %{_mandir}/man8/vfs_full_audit.8.* -%doc %{_mandir}/man8/vfs_fruit.8.* -%doc %{_mandir}/man8/vfs_glusterfs.8.* -%doc %{_mandir}/man8/vfs_gpfs.8.* -%doc %{_mandir}/man8/vfs_linux_xfs_sgid.8.* -%doc %{_mandir}/man8/vfs_media_harmony.8.* -%doc %{_mandir}/man8/vfs_netatalk.8.* -%doc %{_mandir}/man8/vfs_notify_fam.8.* -%doc %{_mandir}/man8/vfs_prealloc.8.* -%doc %{_mandir}/man8/vfs_preopen.8.* -%doc %{_mandir}/man8/vfs_readahead.8.* -%doc %{_mandir}/man8/vfs_readonly.8.* -%doc %{_mandir}/man8/vfs_recycle.8.* -%doc %{_mandir}/man8/vfs_scannedonly.8.* -%doc %{_mandir}/man8/vfs_shadow_copy.8.* -%doc %{_mandir}/man8/vfs_shadow_copy2.8.* -%doc %{_mandir}/man8/vfs_shell_snap.8.* -%doc %{_mandir}/man8/vfs_smb_traffic_analyzer.8.* -%doc %{_mandir}/man8/vfs_snapper.8.* -%doc %{_mandir}/man8/vfs_streams_depot.8.* -%doc %{_mandir}/man8/vfs_streams_xattr.8.* -%doc %{_mandir}/man8/vfs_syncops.8.* -%doc %{_mandir}/man8/vfs_time_audit.8.* -%doc %{_mandir}/man8/vfs_tsmsm.8.* -%doc %{_mandir}/man8/vfs_worm.8.* -%doc %{_mandir}/man8/vfs_xattr_tdb.8.* +%{_mandir}/man1/smbstatus.1.* +%{_mandir}/man5/smbpasswd.5.* +%{_mandir}/man8/nmbd.8.* +%{_mandir}/man8/smbd.8.* +%{_mandir}/man8/smbta-util.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_notify_fam.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_scannedonly.8.* +%{_mandir}/man8/vfs_shadow_copy.8.* +%{_mandir}/man8/vfs_shadow_copy2.8.* +%{_mandir}/man8/vfs_shell_snap.8.* +%{_mandir}/man8/vfs_smb_traffic_analyzer.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_worm.8.* +%{_mandir}/man8/vfs_xattr_tdb.8.* %if 0%{?suse_version} && 0%{?suse_version} < 1021 %{_includedir}/samba %endif @@ -1804,42 +1804,42 @@ fi %{_libdir}/libnss_wins.so.* %dir %{_libdir}/samba %{_libdir}/samba/charset -%doc %{_mandir}/man1/dbwrap_tool.1.* +%{_mandir}/man1/dbwrap_tool.1.* %exclude %doc %{_mandir}/man1/findsmb.1.* -%doc %{_mandir}/man1/log2pcap.1.* -%doc %{_mandir}/man1/nmblookup.1.* -%doc %{_mandir}/man1/nmbstatus.1.* -%doc %{_mandir}/man1/oLschema2ldif.1.* -%doc %{_mandir}/man1/profiles.1.* -%doc %{_mandir}/man1/regdiff.1.* -%doc %{_mandir}/man1/regpatch.1.* -%doc %{_mandir}/man1/regshell.1.* -%doc %{_mandir}/man1/regtree.1.* -%doc %{_mandir}/man1/rpcclient.1.* -%doc %{_mandir}/man1/sharesec.1.* -%doc %{_mandir}/man1/smbcacls.1.* -%doc %{_mandir}/man1/smbcontrol.1.* -%doc %{_mandir}/man1/smbclient.1.* -%doc %{_mandir}/man1/smbcquotas.1.* -%doc %{_mandir}/man1/smbget.1.* -%doc %{_mandir}/man1/smbtar.1.* -%doc %{_mandir}/man1/smbtree.1.* -%doc %{_mandir}/man1/testparm.1.* -%doc %{_mandir}/man3/ntdb.3.* -%doc %{_mandir}/man5/lmhosts.5.* -%doc %{_mandir}/man5/smb.conf.5.* -%doc %{_mandir}/man5/smbgetrc.5.* -%doc %{_mandir}/man7/samba.7.* -%doc %{_mandir}/man8/eventlogadm.8.* -%doc %{_mandir}/man8/net.8.* -%doc %{_mandir}/man8/ntdbbackup.8.* -%doc %{_mandir}/man8/ntdbdump.8.* -%doc %{_mandir}/man8/ntdbrestore.8.* -%doc %{_mandir}/man8/ntdbtool.8.* -%doc %{_mandir}/man8/pdbedit.8.* -%doc %{_mandir}/man8/samba-regedit.8.* -%doc %{_mandir}/man8/smbpasswd.8.* -%doc %{_mandir}/man8/smbspool.8.* +%{_mandir}/man1/log2pcap.1.* +%{_mandir}/man1/nmblookup.1.* +%{_mandir}/man1/nmbstatus.1.* +%{_mandir}/man1/oLschema2ldif.1.* +%{_mandir}/man1/profiles.1.* +%{_mandir}/man1/regdiff.1.* +%{_mandir}/man1/regpatch.1.* +%{_mandir}/man1/regshell.1.* +%{_mandir}/man1/regtree.1.* +%{_mandir}/man1/rpcclient.1.* +%{_mandir}/man1/sharesec.1.* +%{_mandir}/man1/smbcacls.1.* +%{_mandir}/man1/smbcontrol.1.* +%{_mandir}/man1/smbclient.1.* +%{_mandir}/man1/smbcquotas.1.* +%{_mandir}/man1/smbget.1.* +%{_mandir}/man1/smbtar.1.* +%{_mandir}/man1/smbtree.1.* +%{_mandir}/man1/testparm.1.* +%{_mandir}/man3/ntdb.3.* +%{_mandir}/man5/lmhosts.5.* +%{_mandir}/man5/smb.conf.5.* +%{_mandir}/man5/smbgetrc.5.* +%{_mandir}/man7/samba.7.* +%{_mandir}/man8/eventlogadm.8.* +%{_mandir}/man8/net.8.* +%{_mandir}/man8/ntdbbackup.8.* +%{_mandir}/man8/ntdbdump.8.* +%{_mandir}/man8/ntdbrestore.8.* +%{_mandir}/man8/ntdbtool.8.* +%{_mandir}/man8/pdbedit.8.* +%{_mandir}/man8/samba-regedit.8.* +%{_mandir}/man8/smbpasswd.8.* +%{_mandir}/man8/smbspool.8.* %{_datadir}/samba/codepages %dir %{_datadir}/samba %dir %{_datadir}/samba/LDAP @@ -2035,12 +2035,12 @@ fi %{_bindir}/ndrdump %{_bindir}/smbtorture %{_libdir}/libtorture.so.* -%doc %{_mandir}/man1/gentest.1.* -%doc %{_mandir}/man1/locktest.1.* -%doc %{_mandir}/man1/masktest.1.* -%doc %{_mandir}/man1/ndrdump.1.* -%doc %{_mandir}/man1/smbtorture.1.* -%doc %{_mandir}/man1/vfstest.1.* +%{_mandir}/man1/gentest.1.* +%{_mandir}/man1/locktest.1.* +%{_mandir}/man1/masktest.1.* +%{_mandir}/man1/ndrdump.1.* +%{_mandir}/man1/smbtorture.1.* +%{_mandir}/man1/vfstest.1.* %files test-devel %defattr(-,root,root) @@ -2069,21 +2069,21 @@ fi %{_libdir}/samba/idmap %{_libdir}/samba/nss_info %{_libdir}/winbind_krb5_locator.so -%doc %{_mandir}/man1/ntlm_auth.1.* -%doc %{_mandir}/man1/wbinfo.1.* -%doc %{_mandir}/man7/winbind_krb5_locator.7.* -%doc %{_mandir}/man5/pam_winbind.conf.5.* -%doc %{_mandir}/man8/idmap_ad.8.* -%doc %{_mandir}/man8/idmap_autorid.8.* -%doc %{_mandir}/man8/idmap_hash.8.* -%doc %{_mandir}/man8/idmap_ldap.8.* -%doc %{_mandir}/man8/idmap_nss.8.* -%doc %{_mandir}/man8/idmap_rfc2307.8.* -%doc %{_mandir}/man8/idmap_rid.8.* -%doc %{_mandir}/man8/idmap_tdb.8.* -%doc %{_mandir}/man8/idmap_tdb2.8.* -%doc %{_mandir}/man8/pam_winbind.8.* -%doc %{_mandir}/man8/winbindd.8.* +%{_mandir}/man1/ntlm_auth.1.* +%{_mandir}/man1/wbinfo.1.* +%{_mandir}/man7/winbind_krb5_locator.7.* +%{_mandir}/man5/pam_winbind.conf.5.* +%{_mandir}/man8/idmap_ad.8.* +%{_mandir}/man8/idmap_autorid.8.* +%{_mandir}/man8/idmap_hash.8.* +%{_mandir}/man8/idmap_ldap.8.* +%{_mandir}/man8/idmap_nss.8.* +%{_mandir}/man8/idmap_rfc2307.8.* +%{_mandir}/man8/idmap_rid.8.* +%{_mandir}/man8/idmap_tdb.8.* +%{_mandir}/man8/idmap_tdb2.8.* +%{_mandir}/man8/pam_winbind.8.* +%{_mandir}/man8/winbindd.8.* %if 0%{?suse_version} && 0%{?suse_version} < 1100 %dir %{_datadir}/omc %dir %{_datadir}/omc/svcinfo.d diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index aecb37f..e13cc1f 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:1e216db3228a520c8491727319c8ffb5c92a47813f0b97131308ecdd43346661 -size 52927 +oid sha256:a3de5793d34b35dbb88dfadcc9d76e735cf4e7451d623accfc9a126059184418 +size 53004 From b4a6dbbe25a807385c0f7bb8ecf56f424557856b12c2f2ae79ce430e878259c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Wed, 13 May 2015 17:09:44 +0000 Subject: [PATCH 2/3] Remove the independently built libraries ldb, talloc, tdn, and tevent from baselibs.conf. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=463 --- baselibs.conf | 4 ---- patches.tar.bz2 | 4 ++-- samba.changes | 6 ++++++ samba.spec | 2 +- vendor-files.tar.bz2 | 4 ++-- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index fad3d6e..f3bfb56 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -3,7 +3,6 @@ libdcerpc-atsvc0 libdcerpc-binding0 libdcerpc-samr0 libgensec0 -libldb1 libndr0 libndr-krb5pac0 libndr-nbt0 @@ -22,9 +21,6 @@ libsmbclient0 libsmbclient-raw0 libsmbconf0 libsmbldap0 -libtalloc2 -libtdb1 -libtevent0 libtevent-util0 libwbclient0 samba diff --git a/patches.tar.bz2 b/patches.tar.bz2 index e30d1d0..af724f9 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4d444a412711e22273207e7f709c6531fc06d425d85a5772f14563b3474e558c -size 103792 +oid sha256:b19128a7fd59ffa67d538ef358359a1ab713e93422b021c924fd7c96a6f70479 +size 103769 diff --git a/samba.changes b/samba.changes index 3af0f33..d20f353 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed May 13 16:10:00 UTC 2015 - lmuelle@suse.com + +- Remove the independently built libraries ldb, talloc, tdn, and tevent from + baselibs.conf. + ------------------------------------------------------------------- Wed May 6 17:09:36 UTC 2015 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index aac6676..c3ac943 100644 --- a/samba.spec +++ b/samba.spec @@ -143,7 +143,7 @@ BuildRequires: systemd-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3403 +%define SOURCE_TIMESTAMP 3405 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index e13cc1f..5b2e2cb 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:a3de5793d34b35dbb88dfadcc9d76e735cf4e7451d623accfc9a126059184418 -size 53004 +oid sha256:271260c3746350cae9d9b5c1e70f984a11ab7a13b870bebb94ce793972ea28fd +size 53167 From 45c7a62dde998c52b5c322f95792a7483653f37b3910fc67b7d9dbbd1836916a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Fri, 15 May 2015 18:15:39 +0000 Subject: [PATCH 3/3] Remove libsmbclient from baselibs.conf too The remaining reference was required in pre-11.0 times. This is an enhancement to r463 and the new package change log message is: Remove the independently built libraries ldb, talloc, tdn, and tevent and the post-10.3 renamed libsmbclient from baselibs.conf. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=464 --- baselibs.conf | 2 -- patches.tar.bz2 | 4 ++-- samba.changes | 4 ++-- samba.spec | 2 +- vendor-files.tar.bz2 | 4 ++-- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index f3bfb56..1a56bdf 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -15,8 +15,6 @@ libsamba-passdb0 libsamba-policy0 libsamba-util0 libsamdb0 -# The next line is required for pre-11.0 builds of libsmbclient -libsmbclient libsmbclient0 libsmbclient-raw0 libsmbconf0 diff --git a/patches.tar.bz2 b/patches.tar.bz2 index af724f9..46737cf 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b19128a7fd59ffa67d538ef358359a1ab713e93422b021c924fd7c96a6f70479 -size 103769 +oid sha256:cdfe04eabb15b741f2b0af3e7653ed21a79f87b8b929a76ecdf18436bb0ee4fb +size 103494 diff --git a/samba.changes b/samba.changes index d20f353..df388b9 100644 --- a/samba.changes +++ b/samba.changes @@ -1,8 +1,8 @@ ------------------------------------------------------------------- Wed May 13 16:10:00 UTC 2015 - lmuelle@suse.com -- Remove the independently built libraries ldb, talloc, tdn, and tevent from - baselibs.conf. +- Remove the independently built libraries ldb, talloc, tdn, and tevent and + the post-10.3 renamed libsmbclient from baselibs.conf. ------------------------------------------------------------------- Wed May 6 17:09:36 UTC 2015 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index c3ac943..ddc3d27 100644 --- a/samba.spec +++ b/samba.spec @@ -143,7 +143,7 @@ BuildRequires: systemd-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3405 +%define SOURCE_TIMESTAMP 3406 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 5b2e2cb..5b61243 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:271260c3746350cae9d9b5c1e70f984a11ab7a13b870bebb94ce793972ea28fd -size 53167 +oid sha256:d0b00f0b8fe3aa815fb35d1c6c4381a027cacb6d23e1a4e0b485b87f22e5b4ee +size 52937