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

[Giovanni Scafora]

    Date: Thursday, March 4, 2010 @ 19:10:17
  Author: giovanni
Revision: 71172

upgpkg: abiword 2.8.2-2
Fixed FS16917

Modified:
  abiword/trunk/PKGBUILD

----------+
 PKGBUILD |   15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-03-04 23:25:44 UTC (rev 71171)
+++ PKGBUILD	2010-03-05 00:10:17 UTC (rev 71172)
@@ -5,7 +5,7 @@
 pkgbase=abiword
 pkgname=('abiword' 'abiword-plugins')
 pkgver=2.8.2
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.abisource.com"
@@ -16,18 +16,19 @@
 
 build() {
   cd ${srcdir}/${pkgbase}-${pkgver}
-  sed -e 's/png12/png14/g' -i configure plugins/rsvg/Makefile.in plugins/garble/Makefile.in || return 1
-  ./configure --prefix=/usr --enable-plugins || return 1
+
+  ./configure --prefix=/usr \
+              --enable-plugins || return 1
   make || return 1
-  sed -e 's/src plugins user/src user/' -i Makefile || return 1
 }
 
 package_abiword() {
   pkgdesc="A fully-featured word processor"
-  depends=('fribidi' 'enchant' 'librsvg>=2.26.0-2' 'wv>=1.2.4-4' 'libgsf-gnome>=1.14.16')
+  depends=('fribidi' 'enchant' 'librsvg' 'wv' 'libgsf-gnome')
   cd "${srcdir}/${pkgbase}-${pkgver}"
   make DESTDIR="${pkgdir}" install || return 1
-  mv ${pkgdir}/usr/share/icons ${pkgdir}/usr/share/pixmaps
+  # Remove plugin directory provided by abiword-plugins
+  rm -rf ${pkgdir}/usr/lib/abiword-2.8/plugins
 }
 
 package_abiword-plugins() {
@@ -35,4 +36,6 @@
   depends=("abiword>=${pkgver}" 'aiksaurus' 'gtkmathview' 'libsoup' 'link-grammar' 'libwpd' 'psiconv' 'libxslt' 'asio' 'loudmouth')
   cd "${srcdir}/${pkgbase}-${pkgver}/plugins"
   make DESTDIR="${pkgdir}" install || return 1
+  # Remove files conflicting with abiword package
+  rm -rf ${pkgdir}/usr/share
 }