packaging/RHEL-CTDB: do not use an external docs tarball

[metze/samba/wip.git] / packaging / RHEL-CTDB / makerpms.sh

diff --git a/packaging/RHEL-CTDB/makerpms.sh b/packaging/RHEL-CTDB/makerpms.sh
index 6b407e0ebd8607141be090954cf73fc78a881916..74d5f7b3d9508423de27a9e77f8eece20f014626 100755 (executable)
--- a/packaging/RHEL-CTDB/makerpms.sh
+++ b/packaging/RHEL-CTDB/makerpms.sh
@@ -1,30 +1,30 @@
 #!/bin/sh
 # Copyright (C) John H Terpstra 1998-2002
-#               Gerald (Jerry) Carter 2003
+# Copyright (C) Gerald (Jerry) Carter 2003
+# Copyright (C) Michael Adam 2008
+
+# Script to build RPMs for RHEL from inside a git checkout.
 
 # The following allows environment variables to override the target directories
 #   the alternative is to have a file in your home directory calles .rpmmacros
 #   containing the following:
 #   %_topdir  /home/mylogin/redhat
 #
-# 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
+# Note: Under this directory rpm expects to find the same directories
+# that are under the /usr/src/redhat directory.
 
 # extra options passed to rpmbuild
 EXTRA_OPTIONS="$1"
 
-SPECDIR=`rpm --eval %_specdir`
-SRCDIR=`rpm --eval %_sourcedir`
+RPMSPECDIR=`rpm --eval %_specdir`
+RPMSRCDIR=`rpm --eval %_sourcedir`
 
-# At this point the SPECDIR and SRCDIR variables must have a value!
+# At this point the RPMSPECDIR and RPMSRCDIR variables must have a value!
+
+DIRNAME=$(dirname $0)
+TOPDIR=${DIRNAME}/../..
 
-VERSION='3.3.0'
-REVISION='ctdb'
 SPECFILE="samba.spec"
-DOCS="docs.tar.bz2"
 RPMVER=`rpm --version | awk '{print $3}'`
 RPM="rpmbuild"
 
@@ -41,11 +41,24 @@ case $RPMVER in
        ;;
 esac
 
-DIRNAME=$(dirname $0)
+##
+## determine the samba version and create the SPEC file
+##
+${DIRNAME}/makespec.sh
+RC=$?
+if [ $RC -ne 0 ]; then
+       exit ${RC}
+fi
+
+RELEASE=$(grep ^Release ${DIRNAME}/${SPECFILE} | sed -e 's/^Release:\ \+//')
+VERSION=$(grep ^Version ${DIRNAME}/${SPECFILE} | sed -e 's/^Version:\ \+//')
 
-pushd ${DIRNAME}/../..
+##
+## create the tarball
+##
+pushd ${TOPDIR}
 echo -n "Creating samba-${VERSION}.tar.bz2 ... "
-git archive --prefix=samba-${VERSION}/ HEAD | bzip2 > ${SRCDIR}/samba-${VERSION}.tar.bz2
+git archive --prefix=samba-${VERSION}/ HEAD | bzip2 > ${RPMSRCDIR}/samba-${VERSION}.tar.bz2
 RC=$?
 popd
 echo "Done."
@@ -58,33 +71,30 @@ fi
 ##
 ## 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
+tar --exclude=.svn -jcvf - setup > ${RPMSRCDIR}/setup.tar.bz2
 
-cp -p ${SPECFILE} ${SPECDIR}
+cp -p ${SPECFILE} ${RPMSPECDIR}
 
 popd
 
 ##
-## Build
+## some symlink fixes for building 32bit compat libs
 ##
-echo "$(basename $0): Getting Ready to build release package"
-pushd ${SPECDIR}
-${RPM} -ba $EXTRA_OPTIONS $SPECFILE
-[ `arch` = "x86_64" ] && {
-    echo "Building 32 bit winbind libs"
-    # hi ho, a hacking we will go ...
+if [ `arch` = "x86_64" ]; then
     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
-}
+fi
 
+##
+## Build
+##
+echo "$(basename $0): Getting Ready to build release package"
+
+pushd ${RPMSPECDIR}
+${RPM} -ba $EXTRA_OPTIONS $SPECFILE
 popd
 
 echo "$(basename $0): Done."