[SCM] Samba Shared Repository - branch master updated
Michael Adam
obnox at samba.org
Tue Apr 5 17:22:02 MDT 2011
The branch, master has been updated
via 82e0ba2 docs: fix the missing parameter description section in the smb.conf manpage
via f52b318 packaging(RHEL-CTDB): Fix debuginfo builds
via c2738b2 packaging(RHEL-CTDB): add BuildRequires to ctdb-devel >= 1.2.25
via 86a3c39 packaging(RHEL-CTDB): replace Prereq by Requires.
from 48646ee s3-auth: Make server_info const in create_local_token()
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 82e0ba22ce51659d9c455c477d217bc8bbaf71b3
Author: Michael Adam <obnox at samba.org>
Date: Tue Apr 5 23:07:01 2011 +0200
docs: fix the missing parameter description section in the smb.conf manpage
The smb.conf (5) manpage recently sometimes failed to contain the
contents of the description of each parameter section. The reason
was a unreliable chain of dependencies in the Makefile.
The error can be reproduced by touching manpages-3/smb.conf.5.xml
and then building the manpages.
Then smb.conf.5.xml is newer than any of the smbdotconf/*/*.xml
files and hence the intermediate inexistent parameters.*.xml
don't get generated.
This patch fixes this problem by introducing a phony "parameters"
target referencing the parameters.*.xml targets, so that they
get build unconditionally.
Autobuild-User: Michael Adam <obnox at samba.org>
Autobuild-Date: Wed Apr 6 01:22:00 CEST 2011 on sn-devel-104
commit f52b3180fe314dbfb6bfd0f27b36ceb7a49e8231
Author: Michael Adam <obnox at samba.org>
Date: Fri Dec 3 02:13:46 2010 -0700
packaging(RHEL-CTDB): Fix debuginfo builds
At least on RHEL 5.5, we observed broken debuginfo packages
when either old build directories were still present or old
debuginfo packages (of samba) were installed.
This patch removes the debuginfo samba RPMs and old RPM build
directories, giving the user a 10 second chance to quit.
commit c2738b2a2b544fd7d218f44239f2754576125836
Author: Michael Adam <obnox at samba.org>
Date: Tue Apr 5 15:49:39 2011 +0200
packaging(RHEL-CTDB): add BuildRequires to ctdb-devel >= 1.2.25
This should make sure we build against ctdb with SCHEDULE_FOR_DELETION control.
commit 86a3c39fa8b8304fc346083b8d7765a38af53120
Author: Michael Adam <obnox at samba.org>
Date: Thu Feb 10 07:33:56 2011 +0100
packaging(RHEL-CTDB): replace Prereq by Requires.
In RHEL6, Prereq is deprecated.
-----------------------------------------------------------------------
Summary of changes:
docs-xml/Makefile | 10 ++++++++-
packaging/RHEL-CTDB/makerpms.sh | 38 +++++++++++++++++++++++++++++++++++
packaging/RHEL-CTDB/samba.spec.tmpl | 9 ++++---
3 files changed, 52 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/Makefile b/docs-xml/Makefile
index 40a6c7b..40aa161 100644
--- a/docs-xml/Makefile
+++ b/docs-xml/Makefile
@@ -181,7 +181,15 @@ $(TEXINFODIR)/%.info: $(TEXINFODIR)/%.texi
$(MAKEINFO) --no-validate --force -o $@ "$<"
# Manpages
-$(MANPAGEDIR3)/smb.conf.5.xml: $(SMBDOTCONFDOC)/parameters.all.xml $(SMBDOTCONFDOC)/parameters.service.xml $(SMBDOTCONFDOC)/parameters.global.xml
+$(MANPAGEDIR3)/smb.conf.5.xml: parameters
+
+# The phony parameters target exists in order to always create the
+# the parameters xml files. Otherwise, when parameters.*.xml does not exist
+# yet, the parameters are not generated when smb.conf.5.xml is newer than
+# any smbdotconf/*/*.xml file ...
+.PHONY: parameters
+
+parameters: $(SMBDOTCONFDOC)/parameters.all.xml $(SMBDOTCONFDOC)/parameters.service.xml $(SMBDOTCONFDOC)/parameters.global.xml
$(SMBDOTCONFDOC)/parameters.all.xml: $(wildcard $(SMBDOTCONFDOC)/*/*.xml) $(SMBDOTCONFDOC)/generate-file-list.sh
$(SMBDOTCONFDOC)/generate-file-list.sh $(SMBDOTCONFDOC) > $@
diff --git a/packaging/RHEL-CTDB/makerpms.sh b/packaging/RHEL-CTDB/makerpms.sh
index 74d5f7b..c1a4b70 100755
--- a/packaging/RHEL-CTDB/makerpms.sh
+++ b/packaging/RHEL-CTDB/makerpms.sh
@@ -18,6 +18,7 @@ EXTRA_OPTIONS="$1"
RPMSPECDIR=`rpm --eval %_specdir`
RPMSRCDIR=`rpm --eval %_sourcedir`
+RPMBUILDDIR=`rpm --eval %_builddir`
# At this point the RPMSPECDIR and RPMSRCDIR variables must have a value!
@@ -42,6 +43,43 @@ case $RPMVER in
esac
##
+## Delete the old debuginfo remnants:
+##
+## At least on RHEL 5.5, we observed broken debuginfo packages
+## when either old build directories were still present or old
+## debuginfo packages (of samba) were installed.
+##
+## Remove the debuginfo samba RPMs and old RPM build
+## directories, giving the user a 10 second chance to quit.
+##
+
+if rpm -qa | grep -q samba-debuginfo || test -n "$(echo ${RPMBUILDDIR}/samba* | grep -v \*)" ; then
+ echo "Removing debuginfo remnants to fix debuginfo build:"
+ if rpm -qa | grep -q samba-debuginfo ; then
+ echo "Uninstalling the samba-debuginfo RPM"
+ echo -n "Press Control-C if you want to quit (you have 10 seconds)"
+ for count in $(seq 1 10) ; do
+ echo -n "."
+ sleep 1
+ done
+ echo
+ echo "That was your chance... :-)"
+ rpm -e samba-debuginfo
+ fi
+ if test -n "$(echo ${RPMBUILDDIR}/samba* | grep -v \*)" ; then
+ echo "Deleting ${RPMBUILDDIR}/samba*"
+ echo -n "Press Control-C if you want to quit (you have 10 seconds)"
+ for count in $(seq 1 10) ; do
+ echo -n "."
+ sleep 1
+ done
+ echo
+ echo "That was your chance... :-)"
+ rm -rf ${RPMBUILDDIR}/samba*
+ fi
+fi
+
+##
## determine the samba version and create the SPEC file
##
${DIRNAME}/makespec.sh
diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl b/packaging/RHEL-CTDB/samba.spec.tmpl
index f27635a..5e80840 100644
--- a/packaging/RHEL-CTDB/samba.spec.tmpl
+++ b/packaging/RHEL-CTDB/samba.spec.tmpl
@@ -18,8 +18,8 @@ Source: samba-%{version}.tar.bz2
Source998: filter-requires-samba.sh
Source999: setup.tar.bz2
-Prereq: /sbin/chkconfig /bin/mktemp /usr/bin/killall
-Prereq: fileutils sed /etc/init.d
+Requires: /sbin/chkconfig /bin/mktemp /usr/bin/killall
+Requires: fileutils sed /etc/init.d
Requires: pam >= 0.64 %{auth}
Requires: samba-common = %{version}-%{release}
@@ -27,9 +27,10 @@ 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
+BuildRequires: pam-devel, readline-devel, fileutils, libacl-devel, openldap-devel, krb5-devel, cups-devel, e2fsprogs-devel
# requirements for building the man pages:
BuildRequires: libxslt, docbook-utils, docbook-style-xsl
+BuildRequires: ctdb-devel >= 1.2.25
# Working around perl dependency problem from docs
%define __perl_requires %{SOURCE998}
@@ -109,7 +110,7 @@ Compatibility package for 32 bit apps on 64 bit architecures
Summary: Samba Documentation
Group: Documentation/Other
Provides: samba-doc = %{version}-%{release}
-Prereq: /usr/bin/find /bin/rm /usr/bin/xargs
+Requires: /usr/bin/find /bin/rm /usr/bin/xargs
%description doc
The samba-doc package includes the HTML versions of the Samba manpages
--
Samba Shared Repository
More information about the samba-cvs
mailing list