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

[andyrtr at archlinux.org]

    Date: Sunday, October 4, 2009 @ 17:38:10
  Author: andyrtr
Revision: 53991

remove file conflicting en_US pkg that is included in the main OOo base pkg; closes #16154

Modified:
  openoffice-i18n/trunk/PKGBUILD

----------+
 PKGBUILD |   14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-10-04 21:31:52 UTC (rev 53990)
+++ PKGBUILD	2009-10-04 21:38:10 UTC (rev 53991)
@@ -3,7 +3,7 @@
 pkgbase="openoffice-i18n"
 pkgname=('openoffice-af' 'openoffice-ar' 'openoffice-as-IN' 'openoffice-be-BY' 'openoffice-bg' 'openoffice-bn' 'openoffice-br' 'openoffice-brx' 'openoffice-bs'
 	'openoffice-ca' 'openoffice-cs' 'openoffice-cy' 'openoffice-da' 'openoffice-de' 'openoffice-dgo' 'openoffice-dz' 'openoffice-el'
-	'openoffice-en-GB' 'openoffice-en-US' 'openoffice-en-ZA' 'openoffice-eo' 'openoffice-es' 'openoffice-et' 'openoffice-eu' 'openoffice-fa'
+	'openoffice-en-GB' 'openoffice-en-ZA' 'openoffice-eo' 'openoffice-es' 'openoffice-et' 'openoffice-eu' 'openoffice-fa'
 	'openoffice-fi' 'openoffice-fr' 'openoffice-ga' 'openoffice-gl' 'openoffice-gu-IN' 'openoffice-gu' 'openoffice-he' 'openoffice-hi-IN'
 	'openoffice-hr' 'openoffice-hu' 'openoffice-id' 'openoffice-it' 'openoffice-ja' 'openoffice-ka' 'openoffice-kk' 'openoffice-km'
 	'openoffice-kn-IN' 'openoffice-ko' 'openoffice-kok' 'openoffice-ks' 'openoffice-ku' 'openoffice-lt' 'openoffice-mai' 'openoffice-mk'
@@ -48,7 +48,6 @@
 	${_url}/${_oover}/OOo_${_oover}_${_rcdate}_LinuxIntel_langpack_dz.tar.gz
 	${_url}/${_oover}/OOo_${_oover}_${_rcdate}_LinuxIntel_langpack_el.tar.gz
 	${_url}/${_oover}/OOo_${_oover}_${_rcdate}_LinuxIntel_langpack_en-GB.tar.gz
-	${_url}/${_oover}/OOo_${_oover}_${_rcdate}_LinuxIntel_langpack_en-US.tar.gz
 	${_url}/${_oover}/OOo_${_oover}_${_rcdate}_LinuxIntel_langpack_en-ZA.tar.gz
 	${_url}/${_oover}/OOo_${_oover}_${_rcdate}_LinuxIntel_langpack_eo.tar.gz
 	${_url}/${_oover}/OOo_${_oover}_${_rcdate}_LinuxIntel_langpack_es.tar.gz
@@ -432,17 +431,6 @@
   chown root:root -R ${pkgdir}/usr/lib/openoffice
 }
 
-package_openoffice-en-US() {
-  pkgdesc="English (US) language pack for OpenOffice.org"
-  cd ${srcdir}/${_ootag}_native_packed-1_en-US.${_rpmnum}/RPMS
-
-  # install openoffice language files
-  mkdir -p ${pkgdir}/usr/lib/openoffice/basis-link
-  cp -R opt/openoffice.org/basis3.1/* ${pkgdir}/usr/lib/openoffice/basis-link
-  cp -R opt/openoffice.org3/* ${pkgdir}/usr/lib/openoffice/basis-link
-  chown root:root -R ${pkgdir}/usr/lib/openoffice
-}
-
 package_openoffice-en-ZA() {
   pkgdesc="English (South Africa) language pack for OpenOffice.org"
   cd ${srcdir}/${_ootag}_native_packed-1_en-ZA.${_rpmnum}/RPMS