[SCM] Samba Shared Repository - branch v3-6-test updated
Michael Adam
obnox at samba.org
Tue Jan 18 07:43:56 MST 2011
The branch, v3-6-test has been updated
via ee048da release-scripts: add build-htmlman-nogit
via 61f1064 release-scripts: add build-htmlman-git
via a9d7d79 release-scripts: add gpl header comment to build-manpages-nogit
via 9284833 release-scripts: add gpl header comment to build-manpages-git
via 3f10470 release-scripts: remove commented out line from git-version
via 796452a packaging/RHEL-CTDB: add the smbta-util manpage
via e405c40 packaging/RHEL-CTDB: add the pam_winbind.conf manpage
via d4a1ec6 packaging/RHEL-CTDB: do not use an external docs tarball but build the manpages
via 94d8c98 packaging/RHEL-CTDB: untangle the various %doc entries to single lines
via c510a5e docs: Remove template "itemizedlist/listitem" from man.xsl
from b561963 s3-auth: Fixed account lockout check. (cherry picked from commit ad6560564350616b2925d097460876bd56555acf)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit ee048dac3e7f073727b84cbc6772e158152f1a67
Author: Michael Adam <obnox at samba.org>
Date: Tue Jan 18 14:20:12 2011 +0100
release-scripts: add build-htmlman-nogit
non-git version of a script to ease building of html version of manpages
Autobuild-User: Michael Adam <obnox at samba.org>
Autobuild-Date: Tue Jan 18 15:07:09 CET 2011 on sn-devel-104
commit 61f1064ada52f21c61a8e7743cfb5c4461db0b47
Author: Michael Adam <obnox at samba.org>
Date: Tue Jan 18 14:20:12 2011 +0100
release-scripts: add build-htmlman-git
git version of a script to ease building of html version of manpages
commit a9d7d79c89ef97f425aba6490161fe7de6d59903
Author: Michael Adam <obnox at samba.org>
Date: Tue Jan 18 14:17:15 2011 +0100
release-scripts: add gpl header comment to build-manpages-nogit
commit 92848330bc574948394adf5113ed4df3fa01c6a6
Author: Michael Adam <obnox at samba.org>
Date: Tue Jan 18 14:18:08 2011 +0100
release-scripts: add gpl header comment to build-manpages-git
commit 3f10470f00fc81ab0dc7cb25866854fb4072abd9
Author: Michael Adam <obnox at samba.org>
Date: Tue Jan 18 14:17:15 2011 +0100
release-scripts: remove commented out line from git-version
commit 796452aa234fcc57b1fcf5cdeca09bbdd1316403
Author: Michael Adam <obnox at samba.org>
Date: Tue Jan 18 01:06:32 2011 +0100
packaging/RHEL-CTDB: add the smbta-util manpage
commit e405c4081a874726adf76fdf97030adb71ccfce6
Author: Michael Adam <obnox at samba.org>
Date: Tue Jan 18 01:06:18 2011 +0100
packaging/RHEL-CTDB: add the pam_winbind.conf manpage
commit d4a1ec61cbea3a2381db1a06c3a76d6188a472e3
Author: Michael Adam <obnox at samba.org>
Date: Thu Sep 9 17:56:03 2010 +0200
packaging/RHEL-CTDB: do not use an external docs tarball but build the manpages
commit 94d8c98b042eeb4a8983906f600d172378baaac2
Author: Michael Adam <obnox at samba.org>
Date: Thu Sep 9 17:14:20 2010 +0200
packaging/RHEL-CTDB: untangle the various %doc entries to single lines
commit c510a5e08e4aefdf01dca5123abab6a74060682e
Author: Michael Adam <obnox at samba.org>
Date: Tue Jan 18 13:00:51 2011 +0100
docs: Remove template "itemizedlist/listitem" from man.xsl
This seems to have been basically taken from the manpages/lists.xls
from the docbook-xsl stylesheets. But it references a variable list-indent
that older versions of docbook-xsl (e.g. 1.69) do not provide.
This makes the manpage build break on older systems. Removing
the definition lets the build succeed, using the system-definition
of the itemizedlist/listitem.
The diff between the docbook's (version 1.75.1) definition of
itemizedlist/listitem and the definition in our man.xls is this:
-- with this patch
-- without this patch
@@ -53,5 +53,7 @@
<!-- * seems to require the extra space. -->
<xsl:call-template name="roff-if-end"/>
<xsl:apply-templates/>
- <xsl:text>.RE </xsl:text>
+ <xsl:if test=" following-sibling::listitem">
+ <xsl:text> .RE </xsl:text>
+ </xsl:if>
</xsl:template>
I.e. the version of man.xsl made insertion if ".RE" conditional.
I hope this does not break anything severely.
The diff for e.g. the resulting winbindd.8 manpage is this:
--- with this patch
+++ witout this patch:
@@ -375,7 +375,6 @@
\m[blue]\fBwinbind: rpc only\fR\m[]
Setting this parameter forces winbindd to use RPC instead of LDAP to retrieve information from Domain Controllers\&.
-.RE
.SH "EXAMPLE SETUP"
.PP
To setup winbindd for user and group lookups plus authentication from a domain controller use something like the following setup\&. This was tested on an early Red Hat Linux box\&.
Cheers
-----------------------------------------------------------------------
Summary of changes:
docs-xml/xslt/man.xsl | 60 ----------------------------------
packaging/RHEL-CTDB/makerpms.sh | 7 ----
packaging/RHEL-CTDB/samba.spec.tmpl | 32 ++++++++++++------
release-scripts/build-htmlman-git | 52 +++++++++++++++++++++++++++++
release-scripts/build-htmlman-nogit | 55 +++++++++++++++++++++++++++++++
release-scripts/build-manpages-git | 14 ++++++++
release-scripts/build-manpages-nogit | 16 ++++++++-
7 files changed, 156 insertions(+), 80 deletions(-)
create mode 100755 release-scripts/build-htmlman-git
create mode 100755 release-scripts/build-htmlman-nogit
Changeset truncated at 500 lines:
diff --git a/docs-xml/xslt/man.xsl b/docs-xml/xslt/man.xsl
index e259004..d9cc1de 100644
--- a/docs-xml/xslt/man.xsl
+++ b/docs-xml/xslt/man.xsl
@@ -29,66 +29,6 @@
</xsl:if>
</xsl:template>
-<xsl:template match="itemizedlist/listitem">
- <!-- * We output a real bullet here (rather than, "\(bu", -->
- <!-- * the roff bullet) because, when we do character-map -->
- <!-- * processing before final output, the character-map will -->
- <!-- * handle conversion of the • to "\(bu" for us -->
- <xsl:text> </xsl:text>
- <xsl:text>.sp</xsl:text>
- <xsl:text> </xsl:text>
- <xsl:text>.RS</xsl:text>
- <xsl:if test="not($list-indent = '')">
- <xsl:text> </xsl:text>
- <xsl:value-of select="$list-indent"/>
- </xsl:if>
- <xsl:text> </xsl:text>
- <!-- * if "n" then we are using "nroff", which means the output is for -->
- <!-- * TTY; so we do some fixed-width-font hackery with \h to make a -->
- <!-- * hanging indent (instead of using .IP, which has some -->
- <!-- * undesirable side effects under certain circumstances) -->
- <xsl:call-template name="roff-if-else-start"/>
- <xsl:text>\h'-</xsl:text>
- <xsl:choose>
- <xsl:when test="not($list-indent = '')">
- <xsl:text>0</xsl:text>
- <xsl:value-of select="$list-indent"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:text>\n(INu</xsl:text>
- </xsl:otherwise>
- </xsl:choose>
- <xsl:text>'</xsl:text>
- <xsl:text>•</xsl:text>
- <xsl:text>\h'+</xsl:text>
- <xsl:choose>
- <xsl:when test="not($list-indent = '')">
- <xsl:text>0</xsl:text>
- <xsl:value-of select="$list-indent - 1"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:text>\n(INu-1</xsl:text>
- </xsl:otherwise>
- </xsl:choose>
- <xsl:text>'\c </xsl:text>
- <!-- * else, we are not using for "nroff", but instead "troff" - which -->
- <!-- * means not for TTY, but for PS or whatever; so we’re not using a -->
- <!-- * fixed-width font, so use a real .IP instead -->
- <xsl:call-template name="roff-else"/>
- <!-- * .IP generates a blank like of space, so let’s go backwards one -->
- <!-- * line up to compensate for that -->
- <xsl:text>.sp -1 </xsl:text>
- <xsl:text>.IP \(bu 2.3 </xsl:text>
- <!-- * The value 2.3 is the amount of indentation; we use 2.3 instead -->
- <!-- * of 2 because when the font family is New Century Schoolbook it -->
- <!-- * seems to require the extra space. -->
- <xsl:call-template name="roff-if-end"/>
- <xsl:apply-templates/>
- <xsl:if test=" following-sibling::listitem">
- <xsl:text> .RE </xsl:text>
- </xsl:if>
-</xsl:template>
-
<xsl:template match="itemizedlist|orderedlist|procedure">
<xsl:if test="title">
<xsl:text>.PP </xsl:text>
diff --git a/packaging/RHEL-CTDB/makerpms.sh b/packaging/RHEL-CTDB/makerpms.sh
index 8da9078..74d5f7b 100755
--- a/packaging/RHEL-CTDB/makerpms.sh
+++ b/packaging/RHEL-CTDB/makerpms.sh
@@ -13,8 +13,6 @@
# Note: Under this directory rpm expects to find the same directories
# that are under the /usr/src/redhat directory.
-# Set DOCS_TARBALL to the path to a docs release tarball in .tar.bz2 format.
-
# extra options passed to rpmbuild
EXTRA_OPTIONS="$1"
@@ -27,7 +25,6 @@ DIRNAME=$(dirname $0)
TOPDIR=${DIRNAME}/../..
SPECFILE="samba.spec"
-DOCS="docs.tar.bz2"
RPMVER=`rpm --version | awk '{print $3}'`
RPM="rpmbuild"
@@ -74,10 +71,6 @@ fi
##
## copy additional source files
##
-if [ "x${DOCS_TARBALL}" != "x" ] && [ -f ${DOCS_TARBALL} ]; then
- cp ${DOCS_TARBALL} ${RPMSRCDIR}/${DOCS}
-fi
-
pushd ${DIRNAME}
chmod 755 setup/filter-requires-samba.sh
diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl b/packaging/RHEL-CTDB/samba.spec.tmpl
index 8bb120e..475adcb 100644
--- a/packaging/RHEL-CTDB/samba.spec.tmpl
+++ b/packaging/RHEL-CTDB/samba.spec.tmpl
@@ -15,7 +15,6 @@ URL: http://www.samba.org/
Source: samba-%{version}.tar.bz2
# Don't depend on Net::LDAP
-Source997: docs-3.6.tar.bz2
Source998: filter-requires-samba.sh
Source999: setup.tar.bz2
@@ -29,6 +28,8 @@ Provides: samba = %{version}
Prefix: /usr
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: pam-devel, readline-devel, fileutils, libacl-devel, openldap-devel, krb5-devel, cups-devel, ctdb, e2fsprogs-devel
+# requirements for building the man pages:
+BuildRequires: libxslt, docbook-utils, docbook-style-xsl
# Working around perl dependency problem from docs
%define __perl_requires %{SOURCE998}
@@ -123,7 +124,6 @@ utilized by SWAT as well as the HTML and PDF version of "Using Samba",
# setup the vendor files (init scripts, etc...)
%setup -T -D -a 999 -n samba-%{version} -q
-%setup -T -D -a 997 -n samba-%{version} -q
%build
@@ -281,8 +281,11 @@ do
fi
done
-# Remove some permission bits to avoid to many dependencies
+# try and build the manpages
cd ..
+./release-scripts/build-manpages-nogit
+
+# Remove some permission bits to avoid to many dependencies
find examples docs -type f | xargs -r chmod -x
%install
@@ -368,10 +371,6 @@ ln -s ../..%{initdir}/winbind $RPM_BUILD_ROOT%{_sbindir}/winbind
# Remove "*.old" files
find $RPM_BUILD_ROOT -name "*.old" -exec rm -f {} \;
-## don't duplicate the docs. These are installed by/with SWAT
-rm -rf docs/htmldocs
-rm -rf docs/manpages
-( cd docs; ln -s %{_prefix}/share/swat/help htmldocs )
##
## Clean out man pages for tools not installed here
@@ -504,6 +503,7 @@ exit 0
%{_mandir}/man1/smbstatus.1*
%{_mandir}/man1/vfstest.1*
%{_mandir}/man5/smbpasswd.5*
+%{_mandir}/man5/pam_winbind.conf.5*
%{_mandir}/man7/samba.7*
%{_mandir}/man8/nmbd.8*
%{_mandir}/man8/pdbedit.8*
@@ -513,16 +513,26 @@ exit 0
%{_mandir}/man8/tdbtool.8*
%{_mandir}/man8/eventlogadm.8*
%{_mandir}/man8/vfs_*.8*
+%{_mandir}/man8/smbta-util.8*
##########
%files doc
%defattr(-,root,root)
-%doc README COPYING Manifest
-%doc WHATSNEW.txt Roadmap
-%doc docs
-%doc examples/autofs examples/LDAP examples/libsmbclient examples/misc examples/printer-accounting
+%doc README
+%doc COPYING
+%doc Manifest
+%doc WHATSNEW.txt
+%doc Roadmap
+%doc docs-xml/archives/THANKS
+%doc docs-xml/archives/history
+%doc docs-xml/registry
+%doc examples/autofs
+%doc examples/LDAP
+%doc examples/libsmbclient
+%doc examples/misc
+%doc examples/printer-accounting
%doc examples/printing
##########
diff --git a/release-scripts/build-htmlman-git b/release-scripts/build-htmlman-git
new file mode 100755
index 0000000..f108549
--- /dev/null
+++ b/release-scripts/build-htmlman-git
@@ -0,0 +1,52 @@
+#!/bin/sh
+#
+# Copyright (C) Michael Adam 2011
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the Free
+# Software Foundation; either version 3 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, see <http://www.gnu.org/licenses/>.
+#
+
+_exit() {
+ echo $@
+ popd
+ exit 1
+}
+
+DIRNAME=$(dirname $0)
+DOCS_XML_DIR=${DIRNAME}/../docs-xml
+DOCS_DIR=${DIRNAME}/../docs
+
+pushd ${DOCS_XML_DIR} || exit 1
+
+git clean -xdf || _exit "Error running git clean."
+
+autoconf || _exit "Error running autoconf."
+
+./configure || _exit "Error running configure."
+
+export XML_CATALOG_FILES="file:///etc/xml/catalog file://$(pwd)/build/catalog.xml"
+
+make htmlman3 || _exit "Error running make htmlman3"
+
+popd
+
+test -e ${DOCS_DIR}/htmldocs/manpages && rm -rf ${DOCS_DIR}/htmldocs/manpages
+mkdir -p ${DOCS_DIR}/htmldocs/manpages
+
+rsync -Ca ${DOCS_XML_DIR}/output/htmldocs/samba.css ${DOCS_DIR}/htmldocs/
+rsync -Ca ${DOCS_XML_DIR}/output/htmldocs/manpages-3/ ${DOCS_DIR}/htmldocs/manpages
+
+echo "Success"
+exit
+
+# END
diff --git a/release-scripts/build-htmlman-nogit b/release-scripts/build-htmlman-nogit
new file mode 100755
index 0000000..afd388b
--- /dev/null
+++ b/release-scripts/build-htmlman-nogit
@@ -0,0 +1,55 @@
+#!/bin/sh
+#
+# Copyright (C) Michael Adam 2011
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the Free
+# Software Foundation; either version 3 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, see <http://www.gnu.org/licenses/>.
+#
+
+_exit() {
+ echo $@
+ popd
+ exit 1
+}
+
+DIRNAME=$(dirname $0)
+DOCS_XML_DIR=${DIRNAME}/../docs-xml
+DOCS_DIR=${DIRNAME}/../docs
+
+pushd ${DOCS_XML_DIR} || exit 1
+
+autoconf || _exit "Error running autoconf."
+
+./configure || _exit "Error running configure."
+
+export XML_CATALOG_FILES="file:///etc/xml/catalog file://$(pwd)/build/catalog.xml"
+
+make clean || _exit "Error running make clean"
+
+# re-establish catalog (has been removed by make clean...)
+./config.status
+
+make htmlman3 || _exit "Error running make htmlman3"
+
+popd
+
+test -e ${DOCS_DIR}/htmldocs/manpages && rm -rf ${DOCS_DIR}/htmldocs/manpages
+mkdir -p ${DOCS_DIR}/htmldocs/manpages
+
+rsync -Ca ${DOCS_XML_DIR}/output/htmldocs/samba.css ${DOCS_DIR}/htmldocs/
+rsync -Ca ${DOCS_XML_DIR}/output/htmldocs/manpages-3/ ${DOCS_DIR}/htmldocs/manpages
+
+echo "Success"
+exit
+
+# END
diff --git a/release-scripts/build-manpages-git b/release-scripts/build-manpages-git
index a9c51b5..0de106c 100755
--- a/release-scripts/build-manpages-git
+++ b/release-scripts/build-manpages-git
@@ -1,6 +1,20 @@
#!/bin/sh
#
# Copyright (C) Michael Adam 2010
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the Free
+# Software Foundation; either version 3 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, see <http://www.gnu.org/licenses/>.
+#
_exit() {
echo $@
diff --git a/release-scripts/build-manpages-nogit b/release-scripts/build-manpages-nogit
index c39b685..0c020ec 100755
--- a/release-scripts/build-manpages-nogit
+++ b/release-scripts/build-manpages-nogit
@@ -1,6 +1,20 @@
#!/bin/sh
#
# Copyright (C) Michael Adam 2010
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the Free
+# Software Foundation; either version 3 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, see <http://www.gnu.org/licenses/>.
+#
_exit() {
echo $@
@@ -14,8 +28,6 @@ DOCS_DIR=${DIRNAME}/../docs
pushd ${DOCS_XML_DIR} || exit 1
-#git clean -xdf || _exit "Error running git clean."
-
autoconf || _exit "Error running autoconf."
./configure || _exit "Error running configure."
--
Samba Shared Repository
More information about the samba-cvs
mailing list