[Frugalware-git] frugalware-current: openoffice.org-3.1.1-1-i686

[Miklos Vajna]

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

commit 40b6575e764340df20d85335ad0cb8af4e530b8c
Author: Miklos Vajna <vmik...@frugalware.org>
Date:   Mon Sep 7 23:15:48 2009 +0200

openoffice.org-3.1.1-1-i686

- version bump
- up2date fix
- cleanup

diff --git a/source/xapps/openoffice.org/FrugalBuild 
b/source/xapps/openoffice.org/FrugalBuild
index 7fc390b..28db14a 100644
--- a/source/xapps/openoffice.org/FrugalBuild
+++ b/source/xapps/openoffice.org/FrugalBuild
@@ -5,14 +5,14 @@
pkgname=openoffice.org
USE_DEVEL=${USE_DEVEL:-"n"}
if ! Fuse $USE_DEVEL; then
-       upstream=3.1.0
-       branch=-3-1
+       upstream=3.1.1
+       branch=-3-1-1
tree=ooo310
dir=`echo $tree|tr [a-z] [A-Z]`
-       milestone=11
+       milestone=19
pkgver=$upstream
-       pkgrel=2
-       snapshot=1850412
+       pkgrel=1
+       snapshot=1-20-gcbafe1f
else
upstream=3.1.1
branch=-3-1-1
@@ -41,13 +41,8 @@ makedepends=(${makedepen...@]} 'curl' 'intltool' 'tcsh' 
'pam-headers' 'apache-an
groups=('xapps')
archs=('i686' 'x86_64')
if ! Fuse $USE_DEVEL; then
-       up2date="lynx -dump http://download.openoffice.org/|grep /source|sed 
's|.*/\(.*\)/source.*|\1|;q'"
+       up2date="lynx -dump http://download.openoffice.org/source/|grep 
Source|sed 's/.* \(.*\) .*/\1/;q'"
else
-       if [ -z "$branch" ]; then
-               path="trunk"
-       else
-               path="branches/ooo-build$branch"
-       fi
up2date="lynx -source -dump 
http://cgit.freedesktop.org/ooo-build/ooo-build/plain/configure.in?h=ooo-build$branch
 |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
 \
@@ -147,11 +142,7 @@ build()
{
Fmonoexport
Fextract ooo-build$branch-$snapshot.tar.bz2
-       if ! Fuse $USE_DEVEL; then
-               Fcd ooo-build-3.1
-       else
-               Fcd ooo-build$branch-$snapshot
-       fi
+       Fcd ooo-build$branch-$snapshot
cp -fv $Fsrcdir/mono24-hack patches/hotfixes/mono24-hack.diff || Fdie

# Predownloaded tarballs
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git