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

[Andreas Radke]

    Date: Friday, August 30, 2013 @ 19:03:08
  Author: andyrtr
Revision: 193771

upgpkg: libreoffice 4.1.1-2

fix file conflict with en-GB, en-ZA langpack pkg; FS#36732

Modified:
  libreoffice/trunk/PKGBUILD

----------+
 PKGBUILD |   19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-08-30 15:45:22 UTC (rev 193770)
+++ PKGBUILD	2013-08-30 17:03:08 UTC (rev 193771)
@@ -20,7 +20,7 @@
 	'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built)
 _LOver=4.1.1.2
 pkgver=4.1.1
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
@@ -342,9 +342,9 @@
  rm -rf ${pkgdir}/etc/bash_completion.d
  
  # some files would conflict
- rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/ScriptProviderForJavaScript.jar
- rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/js.jar
- rm -f ${pkgdir}/usr/lib/libreoffice/program/services/scriptproviderforjavascript.rdb
+ rm -vf ${pkgdir}/usr/lib/libreoffice/program/classes/ScriptProviderForJavaScript.jar
+ rm -vf ${pkgdir}/usr/lib/libreoffice/program/classes/js.jar
+ rm -vf ${pkgdir}/usr/lib/libreoffice/program/services/scriptproviderforjavascript.rdb
  
  # make pyuno find its modules
  install -dm755 ${pkgdir}/usr/lib/python3.3/site-packages
@@ -352,7 +352,11 @@
  ln -svf /usr/lib/libreoffice/program/unohelper.py ${pkgdir}/usr/lib/python3.3/site-packages/unohelper.py
   
  # workaround all packages now depend on that file
- cp  ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/writer.xcd ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd
+ cp ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/writer.xcd ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd
+ 
+ # move dicts to en-US langpack to avoid file conflicts with en-GBen-ZA packages
+ mv ${pkgdir}/usr/lib/libreoffice/share/wordbook/en-GB.dic ${srcdir}/
+ mv ${pkgdir}/usr/lib/libreoffice/share/wordbook/en-US.dic ${srcdir}/
 }
 
 package_libreoffice-base() {
@@ -615,6 +619,11 @@
    # mv file from fakeinstall to pkgdir
    mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
  done
+ 
+ # move dicts to en-US langpack to avoid file conflicts with en-GBen-ZA packages
+ install -dm755 ${pkgdir}/usr/lib/libreoffice/share/wordbook
+ mv ${srcdir}/en-GB.dic ${pkgdir}/usr/lib/libreoffice/share/wordbook/en-GB.dic
+ mv ${srcdir}/en-US.dic ${pkgdir}/usr/lib/libreoffice/share/wordbook/en-US.dic
 }
 
 package_libreoffice-extension-presentation-minimizer() {