[SCM] CTDB repository - branch master updated - 3e6160e5d90a0661eb833b163c11be2267117d0b

[Andrew Tridgell]

The branch, master has been updated
       via  3e6160e5d90a0661eb833b163c11be2267117d0b (commit)
       via  7b624add53c270f803177237c08e867f70bc85cc (commit)
      from  d36f6a5ceb57364449b246a4e6664a7da6cb0040 (commit)

http://gitweb.samba.org/?p=tridge/ctdb.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 3e6160e5d90a0661eb833b163c11be2267117d0b
Author: Andrew Tridgell <tridge at samba.org>
Date:   Sat May 10 09:35:13 2008 +1000

    need to specicy tree to git archive

commit 7b624add53c270f803177237c08e867f70bc85cc
Author: Andrew Tridgell <tridge at samba.org>
Date:   Sat May 10 09:24:51 2008 +1000

    use git archive to create tarball

-----------------------------------------------------------------------

Summary of changes:
 packaging/RPM/makerpms.sh |   34 +---------------------------------
 1 files changed, 1 insertions(+), 33 deletions(-)


Changeset truncated at 500 lines:

diff --git a/packaging/RPM/makerpms.sh b/packaging/RPM/makerpms.sh
index 71c8db5..7b5012a 100755
--- a/packaging/RPM/makerpms.sh
+++ b/packaging/RPM/makerpms.sh
@@ -26,50 +26,19 @@ SRCDIR=`rpm --eval %_sourcedir`
 
 # At this point the SPECDIR and SRCDIR vaiables must have a value!
 
-USERID=`id -u`
-GRPID=`id -g`
 VERSION='1.0'
 REVISION=''
 SPECFILE="ctdb.spec"
-RPMVER=`rpm --version | awk '{print $3}'`
 RPMBUILD="rpmbuild"
 
-##
-## Check the RPM version (paranoid)
-##
-case $RPMVER in
-    4*)
-       echo "Supported RPM version [$RPMVER]"
-       ;;
-    *)
-       echo "Unknown RPM version: `rpm --version`"
-       exit 1
-       ;;
-esac
-
-if [ -f Makefile ]; then 
-	make distclean
-fi
-
-pushd .
-BASEDIR=`basename $PWD`
-cd ..
-chown -R ${USERID}.${GRPID} $BASEDIR
-rm -f ctdb-${VERSION}
-ln -s $BASEDIR ctdb-${VERSION} || exit 1
-REMOVE_LN=$PWD/ctdb-$VERSION
-
 echo -n "Creating ctdb-${VERSION}.tar.gz ... "
-tar --exclude=.bzr --exclude=.git --exclude .bzrignore --exclude="*~" --exclude=configure --exclude="test.db*" --exclude="#*" --exclude="push*.sh" --exclude="publish*.sh" -cf - ctdb-${VERSION}/. | gzip -9 --rsyncable > ${SRCDIR}/ctdb-${VERSION}.tar.gz
+git archive --prefix=ctdb-${VERSION}/ HEAD | gzip -9 --rsyncable > ${SRCDIR}/ctdb-${VERSION}.tar.gz
 echo "Done."
 if [ $? -ne 0 ]; then
         echo "Build failed!"
-	[ ${REMOVE_LN} ] && rm $REMOVE_LN
         exit 1
 fi
 
-popd
-
 
 ##
 ## copy additional source files
@@ -84,6 +53,5 @@ cd ${SPECDIR}
 ${RPMBUILD} -ba --clean --rmsource $EXTRA_OPTIONS $SPECFILE || exit 1
 
 echo "$(basename $0): Done."
-[ ${REMOVE_LN} ] && /bin/rm -f $REMOVE_LN
 
 exit 0


-- 
CTDB repository