From 3b01ef5db4e329c999f760796da81f73196320b13923def2d1165283570d03e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Thu, 6 Jun 2013 12:32:42 +0000 Subject: [PATCH] Don't install the tdb utilities man pages on post-12.1 systems; (bnc#823549). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=311 --- patches.tar.bz2 | 4 ++-- samba-doc.spec | 2 +- samba.changes | 5 +++++ samba.spec | 10 ++++++---- vendor-files.tar.bz2 | 4 ++-- 5 files changed, 16 insertions(+), 9 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 0bbad73..1abb22d 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cff60225d63afdd05b3ea82f00da48d1ab3fbbb8c896476c53daebef7d14d9c2 -size 39994 +oid sha256:f02c1c7dfa83cc4978134c0718fea83a4f02f61fec5597f838b4df5c2d4c5a12 +size 39985 diff --git a/samba-doc.spec b/samba-doc.spec index 5bfff48..3089f3e 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -126,7 +126,7 @@ BuildRequires: libtevent-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3015 +%define SOURCE_TIMESTAMP 3016 %define BRANCH %{version} Version: 3.6.15 Release: 0 diff --git a/samba.changes b/samba.changes index 430ece6..b9f2197 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jun 6 11:43:31 UTC 2013 - lmuelle@suse.com + +- Don't install the tdb utilities man pages on post-12.1 systems; (bnc#823549). + ------------------------------------------------------------------- Wed Jun 5 11:45:41 UTC 2013 - ddiss@suse.com diff --git a/samba.spec b/samba.spec index 9d6c1a0..494e7e8 100644 --- a/samba.spec +++ b/samba.spec @@ -126,7 +126,7 @@ BuildRequires: libtevent-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3015 +%define SOURCE_TIMESTAMP 3016 %define BRANCH %{version} Version: 3.6.15 Release: 0 @@ -928,6 +928,8 @@ make -C source4/lib/ldb/ install \ # we prefer the s3 binaries of the tdbtools rm %{buildroot}/%{_bindir}/tdb{backup,dump,restore,tool} +%else +rm docs/manpages/tdb*.8 %endif make -C source3/ install \ @@ -1488,6 +1490,9 @@ fi %{_bindir}/tdbdump %{_bindir}/tdbrestore %{_bindir}/tdbtool +%doc %{_mandir}/man8/tdbbackup.8.* +%doc %{_mandir}/man8/tdbdump.8.* +%doc %{_mandir}/man8/tdbtool.8.* %endif /%{_lib}/libnss_wins.so.2 %dir %{cups_lib_dir} @@ -1522,9 +1527,6 @@ fi %doc %{_mandir}/man8/pdbedit.8.* %doc %{_mandir}/man8/smbpasswd.8.* %doc %{_mandir}/man8/smbspool.8.* -%doc %{_mandir}/man8/tdbbackup.8.* -%doc %{_mandir}/man8/tdbdump.8.* -%doc %{_mandir}/man8/tdbtool.8.* %dir %{_datadir}/samba %dir %{_datadir}/samba/LDAP %config %{_datadir}/samba/LDAP/samba-nds.schema diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index ad4c951..9459a1f 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:2e237a231a46fb716f0bb125968a44c608600dcef634c92b447c524f1f84e19e -size 53632 +oid sha256:7866289a264ecad13ad3f60923a2693b25c41887f2459b87b9b9da88c6c95eb9 +size 53681