[arch-commits] Commit in wv2/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Jan de Groot]

    Date: Friday, December 5, 2008 @ 15:38:46
  Author: jgc
Revision: 20565

Fix conflict

Modified:
  wv2/repos/extra-x86_64/	(properties)
  wv2/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)


Property changes on: wv2/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /wv2/trunk:1
   + /wv2/trunk:1-20564

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-12-05 20:37:59 UTC (rev 20564)
+++ extra-x86_64/PKGBUILD	2008-12-05 20:38:46 UTC (rev 20565)
@@ -6,11 +6,12 @@
 pkgver=0.2.3
 pkgrel=1
 pkgdesc="wvWare is the continuation of Caolan McNamara's wv - the MSWord library. It can parse MSWord 9,8,7,6 formats"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/wvware/"
 depends=('libgsf>=1.14.1')
-options=(NOLIBTOOL)
-source=(http://heanet.dl.sourceforge.net/sourceforge/wvware/${pkgname}-${pkgver}.tar.bz2)
+options=(!libtool)
+source=(http://downloads.sourceforge.net/sourceforge/wvware/${pkgname}-${pkgver}.tar.bz2)
+license=('GPL2')
 md5sums=('ea7e3331fbe597185070c0784411a3f7')
 
 build() {