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

commit 5326e86296a1f38db809fbc9e4fe38c26b3523c0
Author: Miklos Vajna <vmik...@frugalware.org>
Date:   Thu Jan 28 10:06:30 2010 +0100

openoffice.org-3.1.1-1-i686

- devel version: update to newer ooo-build snapshot
- use Finclude kde
- drop 3 unnecessary configure switches

diff --git a/source/xapps/openoffice.org/FrugalBuild 
b/source/xapps/openoffice.org/FrugalBuild
index 01b5868..cfa6357 100644
--- a/source/xapps/openoffice.org/FrugalBuild
+++ b/source/xapps/openoffice.org/FrugalBuild
@@ -18,13 +18,13 @@ else
tree=ooo320
milestone=11
pkgver=$upstream${tree}_m$milestone
-       pkgrel=1
-       snapshot=101-g91f019f
+       pkgrel=2
+       snapshot=104-g94c60f5
fi
pkgdesc="OpenOffice.org, a full office productivity suite."
url="http://www.openoffice.org/";
_F_gnome_desktop="y"
-Finclude gnome-scriptlet mono java
+Finclude gnome-scriptlet mono java kde
install=openoffice.org.install
depends=('libxml2' 'libart_lgpl' 'libsndfile' 'libgcj-awt>=4.4.0-2' 'nas' 
'fontconfig' 'libpng' 'imagemagick' \
'flex' 'neon>=0.26.1' 'bison' 'zip' 'unzip' 'expat' 'cups' 'desktop-file-utils' 
'perl-archive-zip' \
@@ -51,8 +51,7 @@ subpkgs=("$pkgname-kde" "$pkgname-gnome" "$pkgname-sdk" 
"$pkgname-mono" "$pkgnam
subdescs=("$pkgname kde integration" "$pkgname gnome integration" \
"The OpenOffice.org Software Development Kit" "$pkgname mono integration" \
"$pkgname mozilla integration")
-# TODO: use Finclude kde to get kde version
-subdepends=("kdelibs>=4.3.5" \
+subdepends=("kdelibs>=$_F_kde_ver" \
"gnome-vfs libbonobo evolution-data-server-ldap" \
"java-gcj-compat ecj gcc-gcj" \
"mono" \
@@ -177,13 +176,10 @@ build()
--with-tag=$tree-m$milestone \
--with-gcc-speedup=ccache \
--with-openclipart=/usr/share/openclipart \
-               --enable-gtk \
--with-binsuffix=no \
-               --disable-dependency-tracking \
--with-installed-ooo-dirname=openoffice.org\
--disable-odk \
-               --without-git \
-               --with-system-mozilla=mozilla"
+               --without-git"

# Set our version.
Fsed "AC_PACKAGE_VERSION" "$pkgver-$pkgrel" configure.in
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to