Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=64375d9bd910dbde562cff5456cae9bd49041461
commit 64375d9bd910dbde562cff5456cae9bd49041461
Author: Miklos Vajna <[EMAIL PROTECTED]>
Date: Mon Sep 22 21:33:28 2008 +0200
openoffice.org-3.0ooo300_m7-1-i686
- update to 3.0rc2
diff --git a/source/xapps/openoffice.org/FrugalBuild
b/source/xapps/openoffice.org/FrugalBuild
index 59ce5a2..7002139 100644
--- a/source/xapps/openoffice.org/FrugalBuild
+++ b/source/xapps/openoffice.org/FrugalBuild
@@ -15,13 +15,13 @@ if ! Fuse $USE_DEVEL; then
snapshot=r12728
else
upstream=3.0
- branch=
+ branch=-3-0
tree=ooo300
dir=`echo $tree|tr [a-z] [A-Z]`
- milestone=3
+ milestone=7
pkgver=$upstream${tree}_m$milestone
pkgrel=1
- snapshot=r13757
+ snapshot=r13987
fi
pkgdesc="OpenOffice.org, a full office productivity suite."
url="http://www.openoffice.org/";
@@ -43,10 +43,15 @@ archs=('i686' 'x86_64')
if ! Fuse $USE_DEVEL; then
up2date="lynx -dump $url |grep version:|sed 's/.*: //'"
else
- up2date="lynx -dump
http://svn.gnome.org/viewcvs/ooo-build/trunk/configure.in?view=markup |grep
^DEFAULT_TAG|sed 's/DEFAULT_TAG=\(.*\)-\(.*\)/$upstream\1_\2/'"
+ if [ -z "$branch" ]; then
+ path="trunk"
+ else
+ path="branches/ooo-build$branch"
+ fi
+ up2date="lynx -dump
http://svn.gnome.org/viewcvs/ooo-build/$path/configure.in?view=markup |grep
^DEFAULT_TAG|sed 's/DEFAULT_TAG=\(.*\)-\(.*\)/$upstream\1_\2/'"
fi
source=(http://ftp.frugalware.org/pub/other/sources/ooo-build/ooo-build$branch-$snapshot.tar.bz2
\
-http://download.go-oo.org/$dir/$tree-m$milestone-{ure,sdk,base,calc,l10n,writer,impress,artwork,filters,testing,bootstrap,libs_gui,libs_core,libs_extern,components,postprocess,libs_extern_sys,swext}.tar.bz2)
+http://download.go-oo.org/$dir/$tree-m$milestone-{ure,sdk,base,calc,l10n,writer,impress,artwork,filters,testing,bootstrap,libs_gui,libs_core,libs_extern,components,postprocess,libs_extern_sys,extensions}.tar.bz2)
signatures=($source.asc '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '')
NOEXTRACT=1
options=([EMAIL PROTECTED] 'scriptlet')
@@ -116,6 +121,7 @@ build() {
# Remove our patches so that incremental build will be possible.
#rm -f patches/src680/ecj-is-gcj.diff
+ sed -i '/reportdesign-useless-jfreereport-dep.diff/d'
patches/dev300/apply
Fpatchall
# SMP build
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
