Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=00cba69a1599e5aea8dfe4527eb123ba86d3435b

commit 00cba69a1599e5aea8dfe4527eb123ba86d3435b
Author: Miklos Vajna <vmik...@frugalware.org>
Date:   Wed Sep 29 12:35:04 2010 +0200

openoffice.org-3.2.1-6-i686

- USE_DEVEL:
* update to 3.2.99.1
* ooo-build now got renamed to libreoffice
* drop download_external_sources.sh, it's now part of the release
tarball

diff --git a/source/xapps/openoffice.org/FrugalBuild 
b/source/xapps/openoffice.org/FrugalBuild
index d7a7506..07a6f50 100644
--- a/source/xapps/openoffice.org/FrugalBuild
+++ b/source/xapps/openoffice.org/FrugalBuild
@@ -25,7 +25,7 @@ else
milestone=7
pkgver=$upstream${tree}_m$milestone.15035.g955ee5e
else
-               pkgver=3.2.98.1
+               pkgver=3.2.99.1
fi
pkgrel=1
fi
@@ -33,10 +33,10 @@ pkgdesc="OpenOffice.org, a full office productivity suite."
url="http://www.openoffice.org/";
_F_gnome_desktop="y"
Finclude gnome-scriptlet mono kde
-install=openoffice.org.install
+unset install
depends=('libxml2' 'libart_lgpl' 'libsndfile' 'libgcj-awt>=4.4.0-2' 'nas' 
'fontconfig' 'libpng>=1.4.1' 'imagemagick' \
'flex' 'neon>=0.26.1' 'bison' 'zip' 'unzip' 'expat' 'cups' 'desktop-file-utils' 
'perl-archive-zip' \
-        'unixodbc' 'libxaw>=1.0.5' 'libxslt' 'startup-notification>=0.9-3' 
'libwpd>=0.8.13' 'poppler')
+        'unixodbc' 'libxaw>=1.0.5' 'libxslt' 'startup-notification>=0.9-3' 
'libwpd>=0.8.13' 'poppler' 'libboost-mt')
# this is here as gstreamer is only a makedepend
rodepends=('flac' 'dejavu-ttf')
# lucene can be any 2.x version actually
@@ -55,56 +55,54 @@ else
if Fuse $USE_GIT; then
unset source signatures
_F_scm_type="git"
-               
_F_scm_url="git://anongit.freedesktop.org/git/ooo-build/ooo-build"
+               _F_scm_url="git://anongit.freedesktop.org/git/libreoffice/build"
_F_scm_tag=$pkgver
Finclude scm
else
-               _F_archive_name="ooo-build"
+               _F_archive_name="libreoffice-build"
up2date="Flasttar http://download.go-oo.org/3.3/";
-               
source=(http://download.go-oo.org/3.3/ooo-build-$pkgver-artwork.tar.bz2
-                       
http://download.go-oo.org/3.3/ooo-build-$pkgver-base.tar.bz2
-                       
http://download.go-oo.org/3.3/ooo-build-$pkgver-bootstrap.tar.bz2
-                       
http://download.go-oo.org/3.3/ooo-build-$pkgver-calc.tar.bz2
-                       
http://download.go-oo.org/3.3/ooo-build-$pkgver-components.tar.bz2
-                       
http://download.go-oo.org/3.3/ooo-build-$pkgver-extensions.tar.bz2
-                       
http://download.go-oo.org/3.3/ooo-build-$pkgver-extras.tar.bz2
-                       
http://download.go-oo.org/3.3/ooo-build-$pkgver-filters.tar.bz2
-                       
http://download.go-oo.org/3.3/ooo-build-$pkgver-help.tar.bz2
-                       
http://download.go-oo.org/3.3/ooo-build-$pkgver-impress.tar.bz2
-                       
http://download.go-oo.org/3.3/ooo-build-$pkgver-l10n.tar.bz2
-                       
http://download.go-oo.org/3.3/ooo-build-$pkgver-libs-core.tar.bz2
-                       
http://download.go-oo.org/3.3/ooo-build-$pkgver-libs-extern-sys.tar.bz2
-                       
http://download.go-oo.org/3.3/ooo-build-$pkgver-libs-extern.tar.bz2
-                       
http://download.go-oo.org/3.3/ooo-build-$pkgver-libs-gui.tar.bz2
-                       
http://download.go-oo.org/3.3/ooo-build-$pkgver-postprocess.tar.bz2
-                       
http://download.go-oo.org/3.3/ooo-build-$pkgver-sdk.tar.bz2
-                       
http://download.go-oo.org/3.3/ooo-build-$pkgver-testing.tar.bz2
-                       
http://download.go-oo.org/3.3/ooo-build-$pkgver-ure.tar.bz2
-                       
http://download.go-oo.org/3.3/ooo-build-$pkgver-writer.tar.bz2
-                       http://download.go-oo.org/3.3/ooo-build-$pkgver.tar.gz \
-                       download_external_sources.sh)
-                       sha1sums=('a466bce7131a42ae7bf47c3b309507812951bb41' \
-                                 '50c2deda9f71d20c404036851fc1df784b936e51' \
-                                 '3b595ca30f3a190c5644501805b60d88f65a3a95' \
-                                 'cb663c372dffd488a63c3b8c545bd698725abfd8' \
-                                 '8b1a5ff8f20b7219469d70a2da6cc50889d6aa3f' \
-                                 'aa0dc2bc6122c019afdfdca5fac4d9e0c06f4aa1' \
-                                 '3b0d2c2487d2aa36535edee64ce899763133329d' \
-                                 '21358f5259c6089d12d4466077738396423e733d' \
-                                 'f3ca8e1833e5d734f697964c36224163f5332743' \
-                                 '3efb72bf01caa29add4d06e228bb04cf81a40621' \
-                                 'e04c6af5aa8a1a79bdbfc242158d6bdf973ff37c' \
-                                 '779a649dfb4cbc05feafc78263742c58ad47791a' \
-                                 '8395ecd50698179164188eceee02d77cf273de06' \
-                                 '310314311f04336bcabb3b43064fe7f01bc74bc7' \
-                                 '79a453bcda05e28cd44a2f08e8776fb6c268aa98' \
-                                 '5bdef062654a0c124ba42ca801ba5eab0a4ddf34' \
-                                 '7bc4a7d47a6311aa1b9bb1039aadcce5db0f376b' \
-                                 '690f1ac72347249ab3ca201b5505713011c038e5' \
-                                 'f9db36606cd40aa3bd32bc6b6d35e69a6725d21e' \
-                                 'b0a5fb527c102c5caf534cd1684f0fed131b6f93' \
-                                 'a052d9ed807b3ae6ec9606ac50ebeba688a2cd5e' \
-                                 'dc94a99221d48275e9ab3e5800b4695b7f242655')
+               
source=(http://download.go-oo.org/3.3/libreoffice-artwork-$pkgver.tar.bz2
+                       
http://download.go-oo.org/3.3/libreoffice-base-$pkgver.tar.bz2
+                       
http://download.go-oo.org/3.3/libreoffice-bootstrap-$pkgver.tar.bz2
+                       
http://download.go-oo.org/3.3/libreoffice-calc-$pkgver.tar.bz2
+                       
http://download.go-oo.org/3.3/libreoffice-components-$pkgver.tar.bz2
+                       
http://download.go-oo.org/3.3/libreoffice-extensions-$pkgver.tar.bz2
+                       
http://download.go-oo.org/3.3/libreoffice-extras-$pkgver.tar.bz2
+                       
http://download.go-oo.org/3.3/libreoffice-filters-$pkgver.tar.bz2
+                       
http://download.go-oo.org/3.3/libreoffice-help-$pkgver.tar.bz2
+                       
http://download.go-oo.org/3.3/libreoffice-impress-$pkgver.tar.bz2
+                       
http://download.go-oo.org/3.3/libreoffice-l10n-$pkgver.tar.bz2
+                       
http://download.go-oo.org/3.3/libreoffice-libs-core-$pkgver.tar.bz2
+                       
http://download.go-oo.org/3.3/libreoffice-libs-extern-sys-$pkgver.tar.bz2
+                       
http://download.go-oo.org/3.3/libreoffice-libs-extern-$pkgver.tar.bz2
+                       
http://download.go-oo.org/3.3/libreoffice-libs-gui-$pkgver.tar.bz2
+                       
http://download.go-oo.org/3.3/libreoffice-postprocess-$pkgver.tar.bz2
+                       
http://download.go-oo.org/3.3/libreoffice-sdk-$pkgver.tar.bz2
+                       
http://download.go-oo.org/3.3/libreoffice-testing-$pkgver.tar.bz2
+                       
http://download.go-oo.org/3.3/libreoffice-ure-$pkgver.tar.bz2
+                       
http://download.go-oo.org/3.3/libreoffice-writer-$pkgver.tar.bz2
+                       
http://download.go-oo.org/3.3/libreoffice-build-$pkgver.tar.gz)
+                       sha1sums=('42066401ccea56752bc2701fa5166ee33334775e' \
+          'aa78a8bf0d44681327ec56eb95f47d09bf10d5cd' \
+          '0bb33f173f26834a56fc4609be04b561008657cc' \
+          '18d1146e0a78e1d8276303b4def00714e3f93e47' \
+          'e9337b40965ca4b835ee4199f0e1f8fe7681c198' \
+          '3b84214eafc53ae6b03103e5d9f80251c8c9a401' \
+          'f481166ef05612a95dc2aa588f0f8cb4c9b169d0' \
+          'e52bbed3ba3e0f1466ab4b359d7e9ad65ce23dec' \
+          '5a6d891ab3de4af49651c95f527895fb37324cb3' \
+          '2b7c4db0bf713d0c7759099678ff48cd8f578a4b' \
+          'da32e11367a2b30f2eb3f25770a75b6b412fa26c' \
+          '88c28fdeaa3c989098815bc36d8f5f90d398fd5d' \
+          '643237f89370ce59d5378ceff492c69bf0ce1e90' \
+          'd167125c1c40bff757375bb46def61a07d6eea03' \
+          '07807d2bda6a056387b171ddf025a7cb7a22d7f3' \
+          'b1a89e95774dd9a2993c218f6f2b893194ff2453' \
+          '665040404a7c81a6c7b7c74cc8aa2a1378b29d37' \
+          'd8e25524224aeb78b21fbf098197d7af835d1422' \
+          'ecc3a16c73a62900475a6b2afe306033d2354f9f' \
+          '1ca543652935dbec9acc44a0dfe32cadd1ee0343' \
+          'fc295ddc35d27fed5b62870493c32a91ab12cac0')
fi
fi
NOEXTRACT=1
@@ -228,14 +226,12 @@ build()
Funpack_scm
NOCONFIGURE=1 ./autogen.sh || return 1
else
-                       Fextract ooo-build-$pkgver.tar.gz
-                       Fcd ooo-build-$pkgver
-                       for i in $Fsrcdir/ooo-build-*
+                       Fextract libreoffice-build-$pkgver.tar.gz
+                       Fcd libreoffice-build-$pkgver
+                       for i in $Fsrcdir/libreoffice-*
do
ln -sf $i src/
done
-                       cp $Fsrcdir/download_external_sources.sh .
-                       chmod +x download_external_sources.sh
fi
fi

@@ -281,9 +277,13 @@ build()
--with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar
else
if Fuse $USE_GIT; then
-                       Fconf 
--with-git=http://frugalware.org/git/pub/other/sources/ooo-build
+                       Fconf 
--with-git=http://frugalware.org/git/pub/other/sources/libreoffice
else
Fconf --without-git
+                       # workaround for a stupid autotools bug
+                       Fsed "'build_alias=$Fbuildchost' " '' bin/setup
+                       # this one wasn't updated
+                       Fsed 'ooo-build' 'libreoffice' 
download_external_sources.sh
fi
fi

diff --git a/source/xapps/openoffice.org/download_external_sources.sh 
b/source/xapps/openoffice.org/download_external_sources.sh
deleted file mode 100644
index ec2654b..0000000
--- a/source/xapps/openoffice.org/download_external_sources.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-. ./bin/setup
-
-export TARFILE_LOCATION
-GIT_TAG=`echo $OOO_SOURCEDIRNAME | tr "a-z.-" "A-Z__"`
-tmp=`mktemp -q -d`
-
-cd $tmp
-wget 
http://cgit.freedesktop.org/ooo-build/bootstrap/plain/fetch_tarballs.sh?id=$GIT_TAG
 -O fetch_tarballs.sh && chmod 755 fetch_tarballs.sh
-wget http://cgit.freedesktop.org/ooo-build/bootstrap/plain/ooo.lst?id=$GIT_TAG 
-O ooo.lst
-./fetch_tarballs.sh ooo.lst &&  rm -f fetch_tarballs.sh ooo.lst
-cd ..
-rmdir $tmp
-
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to