rpm snapshot build script: fixed removing fpc dir and typo in lazarus export dir

git-svn-id: trunk@16489 -
This commit is contained in:
vincents 2008-09-08 19:52:10 +00:00
parent 859ec0bba3
commit 3cc36950ac

View File

@ -45,6 +45,7 @@ if [ ! -f $FPCRPM ]; then
exit exit
fi fi
# extract the fpc snapshot, so we don't need to install it
TmpFPCDir=~/tmp/fpc TmpFPCDir=~/tmp/fpc
if [ -e $TmpFPCDir ]; then if [ -e $TmpFPCDir ]; then
rm -rf $TmpFPCDir rm -rf $TmpFPCDir
@ -62,12 +63,11 @@ export FPC
FPCDIR=$TmpFPCDir/usr/$LIB/fpc/$FPCVersion FPCDIR=$TmpFPCDir/usr/$LIB/fpc/$FPCVersion
export FPCDIR export FPCDIR
cd - cd -
rm -rf $TmpFPCDir
# create a temporary copy of the lazarus sources for packaging # create a temporary copy of the lazarus sources for packaging
LazVersion=$(./get_lazarus_version.sh) LazVersion=$(./get_lazarus_version.sh)
LazRelease=`echo $FPCRPM | sed -e 's/-/_/g'` LazRelease=`echo $FPCRPM | sed -e 's/-/_/g'`
TmpDir=~/tmp/lazarus TmpLazDir=~/tmp/lazarus
rm -rf $TmpLazDir rm -rf $TmpLazDir
echo "extracting Lazarus source from local svn ..." echo "extracting Lazarus source from local svn ..."
@ -97,5 +97,9 @@ cat rpm/lazarus.spec.template | \
# build rpm # build rpm
rpmbuild --target $ARCH -ba $SpecFile --nodeps rpmbuild --target $ARCH -ba $SpecFile --nodeps
# remove the temp fpc dir
rm -rf $TmpFPCDir
# end. # end.