git-svn-id: svn+slack://slack.fluxo.info/var/svn/mkbuilds@41 18ef50b8-d735-4ccd-97c1...

diff --git a/app/office/broffice/broffice.mkbuild b/app/office/broffice/broffice.mkbuild
index 89114a6c026277770645ede7a9a223ce086dd8f9..ff851aecd0dfe397dec795d04f30fe4d1e04f04c 100644 (file)
--- a/app/office/broffice/broffice.mkbuild
+++ b/app/office/broffice/broffice.mkbuild
@@ -12,7 +12,7 @@
 #------------------------
 #
 # Complete URL address or URL base address ( without $SRC_NAME-$VERSION... )
-[[DOWNLOAD FOLDER URL]]="http://linorg.usp.br/BrOffice.org/stable/2.3.0/"
+[[DOWNLOAD FOLDER URL]]="ftp://ftp.unicamp.br/pub/broffice/stable/2.3.1/"
 
 # Source base name. if different from package name. Null ("") to default value.
 # Auto-set, get SRC_NAME from URL: http://.../$SRC_NAME-$VERSION.tar.$EXTENSION'
@@ -25,12 +25,12 @@
 #
 # Source Name construction string
 # Default value is: $SRC_NAME-$VERSION.tar.$EXTENSION
-[[SOURCE NAME CONSTRUCTION STRING]]="${SRC_NAME}_${VERSION}_LinuxIntel_install_pt-BR_rpm.tar.$EXTENSION"
+[[SOURCE NAME CONSTRUCTION STRING]]="${SRC_NAME}_${VERSION}rc1_20071113_LinuxIntel_install_pt-BR.tar.$EXTENSION"
 
 #
 # Package version.  Null ("") to auto-set.
 # Auto-set, get VERSION from URL: http://.../$SRC_NAME-$VERSION.tar.$EXTENSION'
-[[VERSION]]="2.3.0"
+[[VERSION]]="2.3.1"
 
 #
 # Package extension. Null ("") to auto-set
@@ -142,15 +142,16 @@ broffice: http://www.openoffice.org.br
 # Change in untar_source ----------------------------------
 #>untar_source
 # Untar
-mkdir -p $PKG_SRC
-cd $PKG_SRC
+cd $PKG_WORK
 tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
 
-mv $PKG_SRC/OOG680_m5_native_packed-1_pt-BR.9221/* $PKG_SRC/
-rm -rf $PKG_SRC/OOG680_m5_native_packed-1_pt-BR.9221
-cd $PKG_SRC/RPMS
-#<untar_source
+BR_OFFICE=`ls`
+mv $PKG_WORK/$BR_OFFICE/* $PKG_WORK/
+rm -rf $PKG_WORK/$BR_OFFICE
+cd $PKG_WORK/RPMS
 
+ARCH=i686
+#<untar_source
 
 # Change in md5sum_check ----------------------------------
 #>make_package
@@ -170,7 +171,7 @@ rm *.rpm *.deb 2>/dev/null
 cd ..
 
 # Change opt directory
-#mkdir $PKG/usr
+mkdir -p $PKG/usr/share
 mv $PKG/opt/broffice.org2.3 $PKG/usr/share/
 
 mv $PKG/opt/kde/share/* $PKG/usr/share/
@@ -186,6 +187,6 @@ mv $PKG/install/doinst.sh.new $PKG/install/doinst.sh
 #>install_documentation
 # Install Documentation
 mkdir -p "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR
-mv $PKG_SRC/licenses/* $PKG/usr/doc/$PKG_NAME-$PKG_VERSION/
-mv $PKG_SRC/readmes/* $PKG/usr/doc/$PKG_NAME-$PKG_VERSION/
+mv $PKG_WORK/licenses/* $PKG/usr/doc/$PKG_NAME-$PKG_VERSION/
+mv $PKG_WORK/readmes/* $PKG/usr/doc/$PKG_NAME-$PKG_VERSION/
 #<install_documentation