[arch-commits] Commit in openoffice-base/trunk (PKGBUILD)

[andyrtr at archlinux.org]

    Date: Friday, September 19, 2008 @ 14:50:57
  Author: andyrtr
Revision: 12756

fixed pkgver, vendor and shipped dicts

Modified:
  openoffice-base/trunk/PKGBUILD

----------+
 PKGBUILD |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-09-19 18:02:45 UTC (rev 12755)
+++ PKGBUILD	2008-09-19 18:50:57 UTC (rev 12756)
@@ -2,7 +2,7 @@
 # Contributor: Hussam Al-Tayeb <ht990332 at gmail.com>
 
 pkgname=openoffice-base
-pkgver=3.0
+pkgver=3.0.0
 pkgrel=0.1
 pkgdesc="OpenOffice.org - a free multiplatform and multilingual office suite"
 arch=(i686 x86_64)
@@ -102,8 +102,6 @@
 
 	cd ${srcdir}/config_office
 
-	# Set OOO_VENDOR in build environment
-	export OOO_VENDOR="ArchLinux"
 	# export C(XX)FLAGS
 	export ARCH_FLAGS="$CFLAGS"
 
@@ -111,6 +109,7 @@
 	autoreconf -v || return 1
 
 	./configure --with-build-version="${pkgver} ArchLinux build-${pkgrel} (${_OO_milestone})" \
+	--with-vendor="ArchLinux"\
 	--prefix=/usr --exec-prefix=/usr\
 	--disable-ldap\
 	--with-lang="en-US"\
@@ -220,9 +219,11 @@
 	ln -s ../../opt/openoffice/program/spadmin spadmin
 
 	# install all built dictionaries from source tree
-	for i in `ls -1 ${srcdir}/dictionaries/unxlngx6.pro/bin/dict-??.oxt`; do
-	  install -Dm644 $i ${pkgdir}/opt/openoffice/share/extension/install/$i || return 1
+	pushd ${srcdir}/dictionaries/unxlngx6.pro/bin
+	for i in `ls -1 dict-??.oxt`; do
+	  install -D -m644 $i ${pkgdir}/opt/openoffice/share/extension/install/$i || return 1
 	done
+	popd
 
 	# install shortcuts
 	mv ${pkgdir}/opt/openoffice/share/xdg/*.desktop  ${pkgdir}/usr/share/applications