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

[andyrtr at archlinux.org]

    Date: Tuesday, July 19, 2011 @ 05:54:01
  Author: andyrtr
Revision: 132034

upgpkg: libreoffice-i18n 3.4.2rc1-1
upstream prerelease 3.4.2rc1; needs testing for new pkg split

Modified:
  libreoffice-i18n/trunk/PKGBUILD

----------+
 PKGBUILD |   24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-07-19 09:51:46 UTC (rev 132033)
+++ PKGBUILD	2011-07-19 09:54:01 UTC (rev 132034)
@@ -5,7 +5,7 @@
 pkgname=('libreoffice-af'    'libreoffice-ar'    'libreoffice-as'    'libreoffice-ast'	 'libreoffice-be'    'libreoffice-bg'    'libreoffice-bn'
 	 'libreoffice-bo'    'libreoffice-br'    'libreoffice-brx'   'libreoffice-bs'    'libreoffice-ca'    'libreoffice-ca-XV' 'libreoffice-cs'
 	 'libreoffice-cy'    'libreoffice-da'    'libreoffice-de'    'libreoffice-dgo'	 'libreoffice-dz'    'libreoffice-el'
-	 'libreoffice-en-GB' 'libreoffice-en-US' 'libreoffice-en-ZA' 'libreoffice-eo'    'libreoffice-es'    'libreoffice-et'    'libreoffice-eu'
+	 'libreoffice-en-GB' 'libreoffice-en-ZA' 'libreoffice-eo'    'libreoffice-es'    'libreoffice-et'    'libreoffice-eu'
 	 'libreoffice-fa'    'libreoffice-fi'    'libreoffice-fr'    'libreoffice-ga'	 'libreoffice-gl' # 'libreoffice-gd'
 	 'libreoffice-gu'    'libreoffice-he'    'libreoffice-hi'    'libreoffice-hr'    'libreoffice-hu'    'libreoffice-id'    'libreoffice-is'
 	 'libreoffice-it'    'libreoffice-ja'    'libreoffice-ka'    'libreoffice-kk'    'libreoffice-km' #'libreoffice-kid'
@@ -27,7 +27,7 @@
 arch=('any')
 url="http://www.documentfoundation.org"
 license=('LGPL')
-depends=('libreoffice-common') #>=${pkgver}")
+#depends=('libreoffice-common') #>=${pkgver}")
 makedepends=('rpmextract')
 
 #http://download.documentfoundation.org/mirrors/all.html
@@ -75,7 +75,6 @@
 	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_dz.tar.gz
 	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_el.tar.gz
 	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_en-GB.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_helppack-rpm_en-US.tar.gz
 	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_en-ZA.tar.gz
 	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_eo.tar.gz
 	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_es.tar.gz
@@ -239,7 +238,6 @@
          '1c337743ec019fa15e143a701cd2b371'
          'e0f57e912fad4f4bb2d7e36d12761a87'
          '78ab44f4ee2995fb63e30e3f162a2d99'
-         '137f75e941f6544c8a0c2421ca794899'
          '7cd4d2096b3be288e65cf5762ce18e03'
          'a269f7778236052072c52a701df0f1df'
          '89b40e5d11e9d73c1c3554e8d73472cb'
@@ -367,18 +365,15 @@
          '36adc3c2ae3b79f7e03ed879a902c403')
 
 build() {
-  # workaround nonexisting en_US langpack
-  mkdir -p "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_en-US/RPMS
-
   for i in ${pkgname[@]}
    do _pkglang=${i#*-}
     echo ${_pkglang} " unpacking..."
     #cd ${srcdir}/LibO_${_oover/-/}_Linux_x86_langpack-rpm_${_pkglang}/RPMS
-    cd ${srcdir}/LibO_${_helpver}_Linux_x86_langpack-rpm_${_pkglang}/RPMS || /bin/true
+    cd ${srcdir}/LibO_${_helpver}_Linux_x86_langpack-rpm_${_pkglang}/RPMS
     # remove dictionaries if shipped - we ship them now in separate packages
     rm libreoffice3.4-dict-*.rpm || /bin/true
 	for j in *.rpm
-	 do rpmextract.sh $j || /bin/true
+	 do rpmextract.sh $j
 	done
     # the helppack rpm goes also into the langpack dir - so far we don't want to split the helppacks separate
 #     rpmextract.sh ${srcdir}/LibO_${_oover/-/}_Linux_x86_helppack-rpm_${_pkglang}/RPMS/libobasis3.3-${_pkglang}-help-${_helpver}.i586.rpm
@@ -618,17 +613,6 @@
   chown root:root -R "${pkgdir}"/usr/lib/libreoffice
 }
 
-package_libreoffice-en-US() {
-  pkgdesc="English (US) language pack for LibreOffice"
-  provides=('openoffice-en-US' 'libreoffice-langpack')
-  replaces=(openoffice-en-US)
-  conflicts=(openoffice-en-US)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_en-US/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.4/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
 package_libreoffice-en-ZA() {
   pkgdesc="English (ZA) language pack for LibreOffice"
   provides=('openoffice-en-ZA' 'libreoffice-langpack')