[SCM] Samba Shared Repository - branch v3-3-test updated -
release-3-2-0pre2-2461-gf888310
Michael Adam
obnox at samba.org
Fri May 16 01:16:37 GMT 2008
The branch, v3-3-test has been updated
via f8883107499ca48db9b0e63718d1d8e384535833 (commit)
via 7de8666c722be5dce8520f34a0823eb8767ab5d5 (commit)
via 9e7466466d216f99582b03431d5c39875c574470 (commit)
via 161e7c32caf5d4fee23e1f9c5e8ea871ad2aa57e (commit)
via 5148e99d0951245632650784d18306db74ed87bd (commit)
via bccf4da9895afc560ac59ac7ee923b4c5d940d09 (commit)
via 95681f066dc070d6552455aabbb27e5487450c5c (commit)
via fec017125ce7b4a3ec87c0fc2ba77c570cf57074 (commit)
from db933ae1a9877b3485506fc8f0ecae2f2bd8a41f (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -----------------------------------------------------------------
commit f8883107499ca48db9b0e63718d1d8e384535833
Author: Michael Adam <obnox at samba.org>
Date: Fri May 16 01:39:12 2008 +0200
packaging: re-introduce Release numbering ".ctdb.<number>"
This got accidentially (?) replaced by .ctdb.test.<date>".
Michael
(cherry picked from commit be62d594bc2b680dfefb4a5050d033b77c08154b)
commit 7de8666c722be5dce8520f34a0823eb8767ab5d5
Author: Michael Adam <obnox at samba.org>
Date: Fri May 16 01:26:47 2008 +0200
packaging: enable calling RHEL-CTDB/makerpms.sh from other directories
Michael
(cherry picked from commit 05168aaa8dba85ecc1b74afacdd4d5ddc5825cfa)
commit 9e7466466d216f99582b03431d5c39875c574470
Author: Michael Adam <obnox at samba.org>
Date: Fri May 16 01:02:56 2008 +0200
packaging: fix RHEL-CTDB build by removing duplicate winbind-32bit paragraphs
Michael
(cherry picked from commit 29d5a68d95f656d5ca61edc4a10ec8b028597bb5)
commit 161e7c32caf5d4fee23e1f9c5e8ea871ad2aa57e
Author: Michael Adam <obnox at samba.org>
Date: Fri May 16 00:52:46 2008 +0200
packaging: use git-archive in RHEL-CTDB/makerpms.sh
(instead of using tar and make distclean and ...)
Michael
(cherry picked from commit 3ad0f2212720eb5fb33794c033a60f5ea4428c2c)
commit 5148e99d0951245632650784d18306db74ed87bd
Author: Michael Adam <obnox at samba.org>
Date: Fri May 16 00:37:12 2008 +0200
packaging: use docs tarball instead of docs dir in makerpms / samba.spec
Michael
(cherry picked from commit f28a24d5eac2dcf99e1d00c2daf913dd9912eb4a)
commit bccf4da9895afc560ac59ac7ee923b4c5d940d09
Author: Michael Adam <obnox at samba.org>
Date: Fri May 16 00:19:59 2008 +0200
packaging: add a comment explaining EXTRA_OPTIONS to the makerpms script
Michael
(cherry picked from commit 0defc2c60f2ca469d7538c60b7638150c67feb33)
commit 95681f066dc070d6552455aabbb27e5487450c5c
Author: Michael Adam <obnox at samba.org>
Date: Fri May 16 00:15:31 2008 +0200
packaging: fix a comment typo in makerpms script.
Michael
(cherry picked from commit 6044373d69ae8cb0353e7a03e923462a093da5f0)
commit fec017125ce7b4a3ec87c0fc2ba77c570cf57074
Author: Andrew Tridgell <tridge at samba.org>
Date: Fri May 9 21:35:08 2008 +1000
merge build changes from Mathias
(cherry picked from commit 2c08939f3db19eaaf31cb117e3d541d17a36da5e)
-----------------------------------------------------------------------
Summary of changes:
packaging/RHEL-CTDB/makerpms.sh | 73 ++++++++++++++++----------------------
packaging/RHEL-CTDB/samba.spec | 12 ++++++-
2 files changed, 42 insertions(+), 43 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/RHEL-CTDB/makerpms.sh b/packaging/RHEL-CTDB/makerpms.sh
index 6715194..a9d49bc 100755
--- a/packaging/RHEL-CTDB/makerpms.sh
+++ b/packaging/RHEL-CTDB/makerpms.sh
@@ -11,19 +11,20 @@
# /usr/src/redhat directory
#
-# set DOCS_DIR to the path to a release tarball docs dir in order to get docs
+# set DOCS_TARBALL to the path to a docs release tarball in .tar.bz2 format
+
+# extra options passed to rpmbuild
EXTRA_OPTIONS="$1"
SPECDIR=`rpm --eval %_specdir`
SRCDIR=`rpm --eval %_sourcedir`
-# At this point the SPECDIR and SRCDIR vaiables must have a value!
+# At this point the SPECDIR and SRCDIR variables must have a value!
-USERID=`id -u`
-GRPID=`id -g`
VERSION='3.2.0'
REVISION='ctdb'
SPECFILE="samba.spec"
+DOCS="docs.tar.bz2"
RPMVER=`rpm --version | awk '{print $3}'`
RPM="rpmbuild"
@@ -40,63 +41,51 @@ case $RPMVER in
;;
esac
-pushd .
-cd ../../source
-if [ -f Makefile ]; then
- make distclean
-fi
-popd
+DIRNAME=$(dirname $0)
-pushd .
-cd ../../
-SRCTREE=`basename $PWD`
-if [ $DOCS_DIR ] && [ -d $DOCS_DIR ]; then
- mv docs docs-orig
- ln -s $DOCS_DIR docs
-fi
-cd ../
-chown -R ${USERID}.${GRPID} $SRCTREE
-if [ ! -d samba-${VERSION} ]; then
- ln -s $SRCTREE samba-${VERSION} || exit 1
-fi
+pushd ${DIRNAME}/../..
echo -n "Creating samba-${VERSION}.tar.bz2 ... "
-tar --exclude=.svn --exclude=.bzr --exclude=.bzrignore --exclude=docs-orig -chf - samba-${VERSION}/. | bzip2 > ${SRCDIR}/samba-${VERSION}.tar.bz2
+git archive --prefix=samba-${VERSION}/ HEAD | bzip2 > ${SRCDIR}/samba-${VERSION}.tar.bz2
+RC=$?
+popd
echo "Done."
-if [ $? -ne 0 ]; then
- popd
- cd ../../
- # restore original structure if docs were specified
- if [ ${DOCS_DIR} ] && [ -d docs-orig ] && [ -L docs ]; then
- rm docs
- mv docs-orig docs
- fi
+if [ $RC -ne 0 ]; then
echo "Build failed!"
exit 1
fi
-popd
-
##
## copy additional source files
##
+if [ "x${DOCS_TARBALL}" != "x" ] && [ -f ${DOCS_TARBALL} ]; then
+ cp ${DOCS_TARBALL} ${SRCDIR}/${DOCS}
+fi
+
+pushd ${DIRNAME}
+
chmod 755 setup/filter-requires-samba.sh
tar --exclude=.svn -jcvf - setup > ${SRCDIR}/setup.tar.bz2
+
cp -p ${SPECFILE} ${SPECDIR}
+popd
+
##
## Build
##
echo "$(basename $0): Getting Ready to build release package"
-cd ${SPECDIR}
-${RPM} -ba --clean --rmsource $EXTRA_OPTIONS $SPECFILE
-
-# restore original structure if docs were specified
-cd ../../
-if [ ${DOCS_DIR} ] && [ -d docs-orig ] && [ -L docs ]; then
- rm docs
- mv -f docs-orig docs
-fi
+pushd ${SPECDIR}
+${RPM} -ba $EXTRA_OPTIONS $SPECFILE
+[ `arch` = "x86_64" ] && {
+ echo "Building 32 bit winbind libs"
+ # hi ho, a hacking we will go ...
+ ln -sf /lib/libcom_err.so.2 /lib/libcom_err.so
+ ln -sf /lib/libuuid.so.1 /lib/libuuid.so
+ ${RPM} -ba --rebuild --target=i386 $SPECFILE
+}
+
+popd
echo "$(basename $0): Done."
diff --git a/packaging/RHEL-CTDB/samba.spec b/packaging/RHEL-CTDB/samba.spec
index 35e11cb..8600e05 100644
--- a/packaging/RHEL-CTDB/samba.spec
+++ b/packaging/RHEL-CTDB/samba.spec
@@ -6,7 +6,7 @@ Vendor: Samba Team
Packager: Samba Team <samba at samba.org>
Name: samba
Version: 3.2.0
-Release: ctdb.test.090508
+Release: ctdb.1
Epoch: 0
License: GNU GPL version 3
Group: System Environment/Daemons
@@ -15,6 +15,7 @@ URL: http://www.samba.org/
Source: samba-%{version}.tar.bz2
# Don't depend on Net::LDAP
+Source997: docs.tar.bz2
Source998: filter-requires-samba.sh
Source999: setup.tar.bz2
@@ -40,6 +41,13 @@ BuildRequires: pam-devel, readline-devel, fileutils, libacl-devel, openldap-deve
%define _libarch %_lib
%endif
+# rpm screws up the arch lib dir when using --target on RHEL5
+%ifarch i386 i486 i586 i686 ppc s390
+%define _libarch lib
+%else
+%define _libarch %_lib
+%endif
+
%description
Samba is the protocol by which a lot of PC-related machines share
@@ -120,6 +128,7 @@ 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
@@ -535,6 +544,7 @@ fi
%endif
+
%changelog
* Fri Jan 16 2004 Gerald (Jerry) Carter <jerry at samba,org>
- Removed ChangeLog entries since they are kept in CVS
--
Samba Shared Repository
More information about the samba-cvs
mailing list