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 c6192a1c809532f6b26bd6043912ad119f966e45..74d5f7b3d9508423de27a9e77f8eece20f014626 100755 (executable)
--- a/packaging/RHEL-CTDB/makerpms.sh
+++ b/packaging/RHEL-CTDB/makerpms.sh
@@ -1,30 +1,29 @@
 #!/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_DIR to the path to a release tarball docs dir in order to get docs
+# 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 RPMSPECDIR and RPMSRCDIR variables must have a value!
 
-# At this point the SPECDIR and SRCDIR variables must have a value!
+DIRNAME=$(dirname $0)
+TOPDIR=${DIRNAME}/../..
 
-USERID=`id -u`
-GRPID=`id -g`
-VERSION='3.2.0'
-REVISION='ctdb'
 SPECFILE="samba.spec"
 RPMVER=`rpm --version | awk '{print $3}'`
 RPM="rpmbuild"
@@ -42,73 +41,61 @@ case $RPMVER in
        ;;
 esac
 
-pushd .
-cd ../../source
-if [ -f Makefile ]; then 
-       make distclean
+##
+## determine the samba version and create the SPEC file
+##
+${DIRNAME}/makespec.sh
+RC=$?
+if [ $RC -ne 0 ]; then
+       exit ${RC}
 fi
-popd
 
-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
+RELEASE=$(grep ^Release ${DIRNAME}/${SPECFILE} | sed -e 's/^Release:\ \+//')
+VERSION=$(grep ^Version ${DIRNAME}/${SPECFILE} | sed -e 's/^Version:\ \+//')
+
+##
+## create the tarball
+##
+pushd ${TOPDIR}
 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 > ${RPMSRCDIR}/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
 ##
+pushd ${DIRNAME}
+
 chmod 755 setup/filter-requires-samba.sh
-tar --exclude=.svn -jcvf - setup > ${SRCDIR}/setup.tar.bz2
-cp -p ${SPECFILE} ${SPECDIR}
+tar --exclude=.svn -jcvf - setup > ${RPMSRCDIR}/setup.tar.bz2
+
+cp -p ${SPECFILE} ${RPMSPECDIR}
+
+popd
 
 ##
-## Build
+## some symlink fixes for building 32bit compat libs
 ##
-echo "$(basename $0): Getting Ready to build release package"
-cd ${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"
 
-# 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 ${RPMSPECDIR}
+${RPM} -ba $EXTRA_OPTIONS $SPECFILE
+popd
 
 echo "$(basename $0): Done."