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

[Bartłomiej Piotrowski]

    Date: Wednesday, May 28, 2014 @ 20:41:14
  Author: bpiotrowski
Revision: 213725

upgpkg: libreoffice-fresh 4.3.0-0.5

merge back libreoffice-fresh-en-US into libreoffice-fresh

Modified:
  libreoffice-fresh/trunk/PKGBUILD

----------+
 PKGBUILD |   27 +++++----------------------
 1 file changed, 5 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-05-28 18:18:33 UTC (rev 213724)
+++ PKGBUILD	2014-05-28 18:41:14 UTC (rev 213725)
@@ -3,10 +3,10 @@
 # Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
 
 pkgbase=libreoffice-fresh
-pkgname=('libreoffice-fresh-en-US' 'libreoffice-fresh-sdk' 'libreoffice-fresh')
+pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh')
 _LOver=4.3.0.0.beta1
 pkgver=4.3.0
-pkgrel=0.4
+pkgrel=0.5
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
@@ -266,24 +266,6 @@
 	find ${pkgdir}/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x {} +
 }
 
-package_libreoffice-fresh-en-US() {
-	pkgdesc="English (US) language pack for LibreOffice Fresh"
-	depends=('libreoffice-fresh')
-	provides=('openoffice-en-US' 'libreoffice-langpack' 'libreoffice-en-US')
-	replaces=('openoffice-en-US')
-	conflicts=('openoffice-en-US' 'libreoffice-en-US')
-
-	for dir in $(grep ^%dir libreoffice-$_LOver/file-lists/lang_en_US_list.txt); do
-		install -dm755 ${pkgdir}/${dir/\%dir/}
-	done
-
-	for file in $(grep -v ^%dir libreoffice-$_LOver/file-lists/lang_en_US_list.txt); do
-		dirname=$(dirname $file)
-		[[ -d ${pkgdir}/$dirname ]] || install -dm755 ${pkgdir}/$dirname
-		mv ${srcdir}/fakeinstall/${file} ${pkgdir}/$file
-	done
-}
-
 package_libreoffice-fresh() {
 	pkgdesc="LibreOffice branch which contains new features and program enhancements"
 	depends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.4' 'libwpd>=0.9.2' 'libwps'
@@ -319,12 +301,13 @@
 		'libreoffice-draw' 'libreoffice-gnome' 'libreoffice-impress'
 		'libreoffice-kde4' 'libreoffice-math' 'libreoffice-writer'
 		'libreoffice-postgresql-connector' 'libreoffice-extension-wiki-publisher'
-		'libreoffice-extension-nlpsolver')
+		'libreoffice-extension-nlpsolver' 'libreoffice-en-US')
 	conflicts=('libreoffice-common' 'libreoffice-base' 'libreoffice-calc'
 		'libreoffice-draw' 'libreoffice-gnome' 'libreoffice-impress'
 		'libreoffice-kde4' 'libreoffice-math' 'libreoffice-writer'
 		'libreoffice-extension-wiki-publisher' 'libreoffice-postgresql-connector'
-		'libreoffice-extension-nlpsolver')
+		'libreoffice-extension-nlpsolver' 'libreoffice-en-US')
+	replaces=('libreoffice-fresh-en-US')
 
 	mv fakeinstall/* ${pkgdir}/