Attachment 6975 Details for Bug 33118 – работающий --without doc

[patch] работающий --without doc

0001-4.5.5-alt1.1-ubt.patch (text/plain), 7.07 KB, created by Michael Shigorin on 2017-02-15 23:40:42 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Shigorin

Created: 2017-02-15 23:40:42 MSK

Size: 7.07 KB

patch

obsolete

>From 8a55a550ac39b18efe8a05d1e8451d57bca198bd Mon Sep 17 00:00:00 2001
>From: Michael Shigorin <mike@altlinux.org>
>Date: Wed, 15 Feb 2017 23:37:43 +0300
>Subject: [PATCH] 4.5.5-alt1.1%ubt
>
>- BOOTSTRAP: renamed docs knob to doc, made it work on BRs and %files
>---
> samba4.spec | 53 +++++++++++++++++++++++++++++++++++++++++++----------
> 1 file changed, 43 insertions(+), 10 deletions(-)
>
>diff --git a/samba4.spec b/samba4.spec
>index 19b0fec..ea95472 100644
>--- a/samba4.spec
>+++ b/samba4.spec
>@@ -20,7 +20,7 @@
> %def_without libsmbclient
> %def_with libwbclient
> %def_without libnetapi
>-%def_with docs
>+%def_with doc
> 
> %def_with dc
> %def_without ntvfs
>@@ -46,7 +46,7 @@
> 
> Name:    samba-DC
> Version: 4.5.5
>-Release: alt1%ubt
>+Release: alt1.1%ubt
> 
> Group:   System/Servers
> Summary: Samba Active Directory Domain Controller
>@@ -117,7 +117,7 @@ BuildConflicts: setproctitle-devel
> BuildRequires: libiniparser-devel
> BuildRequires: libcups-devel
> BuildRequires: gawk libgtk+2-devel libcap-devel libuuid-devel
>-BuildRequires: inkscape libxslt xsltproc netpbm dblatex html2text docbook-style-xsl
>+%{?_with_doc:BuildRequires: inkscape libxslt xsltproc netpbm dblatex html2text docbook-style-xsl}
> %{?_without_talloc:BuildRequires: libtalloc-devel >= 2.1.8 libpytalloc-devel}
> %{?_without_tevent:BuildRequires: libtevent-devel >= 0.9.29 python-module-tevent}
> %{?_without_tdb:BuildRequires: libtdb-devel >= 1.3.10  python-module-tdb}
>@@ -384,7 +384,7 @@ temporary data it is very easy to convert that application to be cluster aware
> and use CTDB instead.
> %endif
> 
>-%if_with docs
>+%if_with doc
> %package doc
> Summary: Documentation for the Samba suite
> Group: Documentation
>@@ -540,7 +540,7 @@ libsamba_util private headers.
> [ -n "$NPROCS" ] || NPROCS=%__nprocs; export JOBS=$NPROCS
> %make_build NPROCS=%__nprocs
> 
>-%if_with docs
>+%if_with doc
> pushd docs-xml
> export XML_CATALOG_FILES="file:///etc/xml/catalog file://$(pwd)/build/catalog.xml"
> %autoreconf
>@@ -661,7 +661,7 @@ rm -rf %buildroot%python_sitelibdir/samba/{tests,external/subunit,external/testt
> [ "%_libdir" != "%_samba_libdir" ] && mv %buildroot{%_samba_libdir/pkgconfig,%_libdir}
> 
> # Install documentation
>-%if_with docs
>+%if_with doc
> mkdir -p %buildroot%_defaultdocdir/%rname/
> cp -a docs-xml/output/htmldocs %buildroot%_defaultdocdir/%rname/
> %endif
>@@ -734,11 +734,13 @@ TDB_NO_FSYNC=1 %make_build test
> %attr(1777,root,root) %dir /var/spool/samba
> %_sysconfdir/openldap/schema/samba.schema
> %_sysconfdir/pam.d/samba
>+%if_with doc
> %_man1dir/smbstatus.1*
> %_man8dir/eventlogadm.8*
> %_man8dir/smbd.8*
> %_man8dir/nmbd.8*
> %_man8dir/vfs_*.8*
>+%endif
> 
> %if_with dc
> %attr(755,root,root) %_initdir/samba
>@@ -751,13 +753,18 @@ TDB_NO_FSYNC=1 %make_build test
> %_sbindir/samba_upgradedns
> %dir /var/lib/samba/sysvol
> %_datadir/samba/setup
>+%if_with doc
> %_man8dir/samba.8*
> %_man8dir/samba-tool.8*
>+%endif #doc
> %else
> %doc README.dc
>+%if_with doc
> %exclude %_man8dir/samba.8*
> %exclude %_man8dir/samba-tool.8*
>-%endif
>+%endif #doc
>+%endif #dc
>+%if_with doc
> %if_with libcephfs
> %exclude %_samba_mod_libdir/vfs/ceph.so
> %exclude %_man8dir/vfs_ceph.8*
>@@ -766,6 +773,7 @@ TDB_NO_FSYNC=1 %make_build test
> %exclude %_samba_mod_libdir/vfs/glusterfs.so
> %exclude %_man8dir/vfs_glusterfs.8*
> %endif
>+%endif #doc
> 
> %files client
> %_bindir/cifsdd
>@@ -792,6 +800,7 @@ TDB_NO_FSYNC=1 %make_build test
> %_bindir/smbtree
> %_libexecdir/samba/smbspool_krb5_wrapper
> %{cups_serverbin}/backend/smb
>+%if_with doc
> %_man1dir/dbwrap_tool.1*
> %_man1dir/nmblookup.1*
> %_man1dir/oLschema2ldif.1*
>@@ -816,28 +825,33 @@ TDB_NO_FSYNC=1 %make_build test
> %_man8dir/smbspool_krb5_wrapper.8*
> #_man8dir/smbta-util.8*
> %_man8dir/cifsdd.8*
>+%endif
> 
> %if_with ntdb
> %_bindir/ntdbbackup
> %_bindir/ntdbdump
> %_bindir/ntdbrestore
> %_bindir/ntdbtool
>+%if_with doc
> %_man3dir/ntdb.3*
> %_man8dir/ntdbbackup.8*
> %_man8dir/ntdbdump.8*
> %_man8dir/ntdbrestore.8*
> %_man8dir/ntdbtool.8*
>-%endif
>+%endif #doc
>+%endif #ntdb
> %if_with tdb
> %_bindir/tdbbackup
> %_bindir/tdbdump
> %_bindir/tdbrestore
> %_bindir/tdbtool
>+%if_with doc
> %_man8dir/tdbbackup.8*
> %_man8dir/tdbdump.8*
> %_man8dir/tdbrestore.8*
> %_man8dir/tdbtool.8*
>-%endif
>+%endif #doc
>+%endif #tdb
> 
> %if_with ldb
> %_bindir/ldbadd
>@@ -846,12 +860,14 @@ TDB_NO_FSYNC=1 %make_build test
> %_bindir/ldbmodify
> %_bindir/ldbrename
> %_bindir/ldbsearch
>+%if_with doc
> %_man1dir/ldbadd.1*
> %_man1dir/ldbdel.1*
> %_man1dir/ldbedit.1*
> %_man1dir/ldbmodify.1*
> %_man1dir/ldbrename.1*
> %_man1dir/ldbsearch.1*
>+%endif
> %_samba_mod_libdir/libldb-cmdline.so
> %endif
> 
>@@ -873,6 +889,7 @@ TDB_NO_FSYNC=1 %make_build test
> %config(noreplace) %_sysconfdir/samba/smb.conf
> %config(noreplace) %_sysconfdir/samba/lmhosts
> %config(noreplace) %_sysconfdir/sysconfig/samba
>+%if_with doc
> %_man1dir/profiles.1*
> %_man1dir/smbcontrol.1*
> %_man1dir/testparm.1*
>@@ -882,6 +899,7 @@ TDB_NO_FSYNC=1 %make_build test
> %_man7dir/samba.7*
> %_man8dir/net.8*
> %_man8dir/pdbedit.8*
>+%endif
> 
> # common libraries
> %_samba_mod_libdir/libpopt-samba3-samba4.so
>@@ -1149,14 +1167,16 @@ TDB_NO_FSYNC=1 %make_build test
> 
> %files pidl
> %attr(755,root,root) %_bindir/pidl
>+%if_with doc
> %_man1dir/pidl.1.*
> %_man3dir/Parse::Pidl::*
>+%endif
> %perl_vendor_privlib/*
> 
> %files -n python-module-%name
> %python_sitelibdir/*
> 
>-%if_with docs
>+%if_with doc
> %files doc
> %doc %_defaultdocdir/%rname/htmldocs
> %endif
>@@ -1173,12 +1193,14 @@ TDB_NO_FSYNC=1 %make_build test
> %else
> %_samba_mod_libdir/libdsdb-module-samba4.so
> %endif
>+%if_with doc
> %_man1dir/gentest.1*
> %_man1dir/locktest.1*
> %_man1dir/masktest.1*
> %_man1dir/ndrdump.1*
> %_man1dir/smbtorture.1*
> %_man1dir/vfstest.1*
>+%endif
> 
> %if_with testsuite
> # files to ignore in testsuite mode
>@@ -1198,8 +1220,10 @@ TDB_NO_FSYNC=1 %make_build test
> %_unitdir/winbind.service
> %attr(755,root,root) %_initrddir/winbind
> %_sysconfdir/NetworkManager/dispatcher.d/30-winbind
>+%if_with doc
> %_man8dir/winbindd.8*
> %_man8dir/idmap_*.8*
>+%endif
> 
> %files winbind-clients
> %_bindir/ntlm_auth
>@@ -1210,14 +1234,18 @@ TDB_NO_FSYNC=1 %make_build test
> /%_lib/libnss_wins.so.*
> /%_lib/security/pam_winbind.so
> %config(noreplace) %_sysconfdir/security/pam_winbind.conf
>+%if_with doc
> %_man1dir/ntlm_auth.1.*
> %_man1dir/wbinfo.1*
> %_man5dir/pam_winbind.conf.5*
> %_man8dir/pam_winbind.8*
>+%endif
> 
> %files winbind-krb5-locator
> %_libdir/krb5/plugins/libkrb5/winbind_krb5_locator.so
>+%if_with doc
> %_man7dir/winbind_krb5_locator.7*
>+%endif #doc
> %endif
> 
> %if_with clustering_support
>@@ -1260,6 +1288,7 @@ TDB_NO_FSYNC=1 %make_build test
> %_libexecdir/ctdb/ctdb_recovery_helper
> %_libexecdir/ctdb/smnotify
> 
>+%if_with doc
> %_man1dir/ctdb.1*
> %_man1dir/ctdbd.1*
> %_man1dir/onnode.1*
>@@ -1271,6 +1300,7 @@ TDB_NO_FSYNC=1 %make_build test
> %_man7dir/ctdb.7*
> %_man7dir/ctdb-tunables.7*
> %_man7dir/ctdb-statistics.7*
>+%endif
> 
> %files ctdb-tests
> %_libexecdir/ctdb/tests
>@@ -1285,6 +1315,9 @@ TDB_NO_FSYNC=1 %make_build test
> %_includedir/samba-4.0/private
> 
> %changelog
>+* Wed Feb 15 2017 Michael Shigorin <mike@altlinux.org> 4.5.5-alt1.1%ubt
>+- BOOTSTRAP: renamed docs knob to doc, made it work on BRs and %%files
>+
> * Wed Feb 01 2017 Evgeny Sinelnikov <sin@altlinux.ru> 4.5.5-alt1%ubt
> - Update to winter release
> - Fix PAM winbind problem with access user to keytab
>-- 
>2.7.4
>

Actions: View | Diff

Attachments on bug 33118: 6975