[arch-commits] CVS update of extra/office/openoffice-base (PKGBUILD)

[Alexander Baldeck]

    Date: Tuesday, December 25, 2007 @ 09:44:59
  Author: alexander
    Path: /home/cvs-extra/extra/office/openoffice-base

Modified: PKGBUILD (1.63 -> 1.64)

* moved mozilla plugin to /usr/lib/mozilla/plugins & rebuilt against new xulrunner in /usr


----------+
 PKGBUILD |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)


Index: extra/office/openoffice-base/PKGBUILD
diff -u extra/office/openoffice-base/PKGBUILD:1.63 extra/office/openoffice-base/PKGBUILD:1.64
--- extra/office/openoffice-base/PKGBUILD:1.63	Thu Dec  6 14:07:21 2007
+++ extra/office/openoffice-base/PKGBUILD	Tue Dec 25 09:44:59 2007
@@ -3,7 +3,7 @@
 
 pkgname=openoffice-base
 pkgver=2.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="OpenOffice.org - a free multiplatform and multilingual office suite"
 arch=(i686 x86_64)
 _OO_milestone=oog680-m9
@@ -20,7 +20,7 @@
 # for gnu java/ecj
 makedepends=('bison' 'cvs' 'curl' 'findutils' 'flex' 'gawk' 'gcc-libs' 'kdelibs' 
              'libart-lgpl' 'pam' 'sane' 'zip' 'perl-archive-zip' 'pkgconfig'  'unzip'
-              'xulrunner>=1.8.1.3' 'java-gcj-compat' 'apache-ant' 'cairo' 'ccache')
+              'xulrunner>=1.8.1.11' 'java-gcj-compat' 'apache-ant' 'cairo' 'ccache' 'autoconf')
 	# 'boost' - we use internal one. jfreereport is broken with system-boost/has no effect on size
 # for SUN Java
 #makedepends=('boost' 'bison' 'ccache' 'cvs' 'curl' 'findutils'
@@ -43,7 +43,7 @@
 	#$MIRROR/stable/${pkgver}/OOo_${pkgver}_src_{core,binfilter}.tar.bz2
 	#$MIRROR/devel/build/Sources/OOo_${pkgver}_src_{core,binfilter}.tar.bz2
 	#$MIRROR/SRC680_m223/OOo-Dev_SRC680_m224_src_{core,binfilter}.tar.bz2
-	$MIRROR/${_OO_milestone}-{core,binfilter,system}.tar.bz2
+	http://download.go-oo.org/OOG680/${_OO_milestone}-{core,binfilter,system}.tar.bz2
 	intro.bmp
 	template.desktop
 	default-no-startup-wizard_oog680_m1.diff
@@ -102,7 +102,7 @@
 	unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH
 	[ -z "${JAVA_HOME}" ] && . /etc/profile.d/java-gcj-compat.sh
 	JAVAHOME=${JAVA_HOME}
-	[ -z "${QTDIR}" ] && . /etc/profile.d/qt.sh
+	[ -z "${QTDIR}" ] && . /etc/profile.d/qt3.sh
 	[ -z "${KDEDIR}" ] && . /etc/profile.d/kde.sh
 	[ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh
 #	[ -z "${JAVA_HOME}" ] && . /etc/profile.d/jdk.sh
@@ -247,7 +247,7 @@
 
 	# to compile with SMP add -P2 or above, remove any -Px if your cou has only one core or if you want to fix it for non smp build
 	cd instsetoo_native
-	build.pl -P6 --all || return 1
+	build.pl -P4 --all || return 1
 
 	cd ..
 
@@ -324,7 +324,7 @@
 	install -D -m644 $startdir/src/${_OO_milestone}/dictionaries/diclst/DicOOo.sxw $startdir/pkg/opt/openoffice/share/dict/ooo/DicOOo.sxw
 
 	# link the mozilla-plugin
-	mkdir -p $startdir/pkg/opt/mozilla/lib/plugins/
-	cd $startdir/pkg/opt/mozilla/lib/plugins/
-	ln -v -s ../../../openoffice/program/libnpsoplugin.so .
+	mkdir -p $startdir/pkg/usr/lib/mozilla/plugins/
+	cd $startdir/pkg/usr/lib/mozilla/plugins/
+	ln -v -s /opt/openoffice/program/libnpsoplugin.so .
 }