Date: Sunday, October 13, 2013 @ 07:34:00
Author: andyrtr
Revision: 196409
upgpkg: libreoffice 4.1.2-2
rebuild for icu 52.1; revert wordbook changes
Modified:
libreoffice/trunk/PKGBUILD
----------+
PKGBUILD | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-10-12 20:32:18 UTC (rev 196408)
+++ PKGBUILD 2013-10-13 05:34:00 UTC (rev 196409)
@@ -33,7 +33,7 @@
'clucene' 'bluez-libs' 'harfbuzz-icu'
# the runtime dependencies
"curl>=7.20.0" "hunspell>=1.2.8" "python>=3.3" 'libwpd>=0.9.2'
'libwps' 'libxaw' "neon>=0.28.6"
- 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib'
'libxslt' 'librsvg' "icu>=51.1"
+ 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib'
'libxslt' 'librsvg' "icu>=52.1"
'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat'
'graphite' 'lcms2' 'poppler>=0.24.0'
'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info'
'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils'
'ttf-dejavu') # to satisfy regression tests
@@ -284,7 +284,7 @@
pkgdesc="common files for LibreOffice - a productivity suite that is
compatible with other major office suites"
install=libreoffice-common.install
depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3"
"neon>=0.28.6" 'dbus-glib' 'librsvg' 'libcups'
- 'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=51.1" 'clucene'
'lcms2' "poppler>=0.24.0"
+ 'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=52.1" 'clucene'
'lcms2' "poppler>=0.24.0"
'harfbuzz-icu' 'hicolor-icon-theme' 'desktop-file-utils'
'shared-mime-info' 'xdg-utils')
optdepends=('libreoffice-langpack: additional language support'
'java-runtime: adds java support'
@@ -354,10 +354,6 @@
# 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
-
- # 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() {
@@ -622,11 +618,6 @@
# 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() {
