From 79245abc0c95ce44786f9ca6f954858d9f6501c8 Mon Sep 17 00:00:00 2001 From: rudson Date: Fri, 14 Dec 2007 14:28:45 +0000 Subject: git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@1533 370017ae-e619-0410-ac65-c121f96126d4 --- app/office/broffice/broffice.SlackBuild | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'app/office') diff --git a/app/office/broffice/broffice.SlackBuild b/app/office/broffice/broffice.SlackBuild index 7f7f9a09..65fb5db6 100755 --- a/app/office/broffice/broffice.SlackBuild +++ b/app/office/broffice/broffice.SlackBuild @@ -15,7 +15,7 @@ # Place - Suite 330, Boston, MA 02111-1307, USA # # slackbuild for broffice, by Rudson R. Alves -# requires: Null +# requires: # tested: broffice-2.3.0 # @@ -39,7 +39,7 @@ TMP=${TMP:=/tmp} PKG=${PKG:=$TMP/package-$PKG_NAME} REPOS=${REPOS:=$TMP} PREFIX=${PREFIX:=/usr/share/broffice.org2.3} -PKG_SRC="$TMP/$SRC_NAME-$SRC_VERSION" +PKG_WORK="$TMP/$SRC_NAME" CONF_OPTIONS=${CONF_OPTIONS:=""} NUMJOBS=${NUMJOBS:=""} @@ -50,13 +50,14 @@ ERROR_TAR=37; ERROR_MKPKG=38; ERROR_GPG=39 ERROR_PATCH=40; ERROR_VCS=41; ERROR_MKDIR=42 # Clean up any leftovers of previous builds -rm -rf "$PKG_SRC" 2> /dev/null +rm -rf "$PKG_WORK" 2> /dev/null rm -rf "$PKG" 2> /dev/null # Create directories if necessary mkdir -p "$SRC_DIR" || exit $ERROR_MKDIR mkdir -p "$PKG" || exit $ERROR_MKDIR mkdir -p "$REPOS" || exit $ERROR_MKDIR +mkdir -p "$PKG_WORK" || exit $ERROR_MKDIR # Dowload source if necessary SRC="${SRC_NAME}_${VERSION}_LinuxIntel_install_pt-BR_rpm.tar.gz" @@ -66,7 +67,6 @@ if [ ! -s "$SRC_DIR/$SRC" ] || ! gunzip -t "$SRC_DIR/$SRC" 2> /dev/null; then wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET fi - # Untar mkdir -p $PKG_SRC cd $PKG_SRC @@ -110,7 +110,6 @@ mv $PKG/install/doinst.sh.new $PKG/install/doinst.sh xargs strip --strip-unneeded 2> /dev/null ) - # Add package description (slack-desc) mkdir -p "$PKG/install" || exit $ERROR_MKDIR cat << EODESC > "$PKG/install/slack-desc" @@ -141,5 +140,5 @@ makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERRO # Delete source and build directories if requested if [ "$CLEANUP" == "yes" ]; then - rm -rf "$PKG_SRC" "$PKG" + rm -rf "$PKG_WORK" "$PKG" fi -- cgit v1.2.3