wordforge-0.8rc1-1

3 files changed, 27 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e99177a00276..7df967860182 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,15 @@
 pkgbase = wordforge
-	pkgdesc = A user friendly translation program (CAT), that makes the translation process simpler.
-	pkgver = 0.5_rc1
-	pkgrel = 2
+	pkgdesc = A user friendly translation program (CAT), that makes the translation process simpler
+	pkgver = 0.8rc1
+	pkgrel = 1
 	url = http://translate.sourceforge.net/wiki/wordforge/index
-	arch = i686
-	arch = x86_64
+	arch = any
 	license = GPL
-	makedepends = patch
-	depends = python
-	depends = pyqt
+	depends = python2-pyqt4
+	depends = python2-pyenchant
 	depends = translate-toolkit
-	source = http://downloads.sourceforge.net/wordforge2/WordForge-0.5-rc1.tar
-	source = wordforge.diff
-	md5sums = fcf99c0221a3140aca57d58b677efc73
-	md5sums = 5c41bdb82236d625b9d3fc151fc1e09f
+	source = http://downloads.sourceforge.net/wordforge2/wordforge-0.8-rc1.tar.gz
+	md5sums = 91dffd250c3bf8351f4cf48f53eecb7c
 
 pkgname = wordforge
 
diff --git a/PKGBUILD b/PKGBUILD
index e9ba86375c8c..df91eeb305f0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,28 @@
-# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 
 pkgname=wordforge
-pkgver=0.5_rc1
-pkgrel=2
-pkgdesc="A user friendly translation program (CAT), that makes the translation process simpler."
-arch=('i686' 'x86_64')
+pkgver=0.8rc1
+pkgrel=1
+pkgdesc="A user friendly translation program (CAT), that makes the translation process simpler"
+arch=('any')
 url="http://translate.sourceforge.net/wiki/wordforge/index"
 license=('GPL')
-depends=('python' 'pyqt' 'translate-toolkit')
-makedepends=('patch')
-source=(http://downloads.sourceforge.net/wordforge2/WordForge-0.5-rc1.tar \
-        $pkgname.diff)
+depends=('python2-pyqt4' 'python2-pyenchant' 'translate-toolkit')
+source=(http://downloads.sourceforge.net/wordforge2/wordforge-0.8-rc1.tar.gz)
+md5sums=('91dffd250c3bf8351f4cf48f53eecb7c')
 
-md5sums=('fcf99c0221a3140aca57d58b677efc73'
-         '5c41bdb82236d625b9d3fc151fc1e09f')
+prepare() {
+  cd "${srcdir}"/wordforge-0.8-rc1
 
-build() {
-  cd "${srcdir}/WordForge-0.5-rc1"
-
-  patch -Np0 -i "${srcdir}/$pkgname.diff" || return 1
-
-  python setup.py install --root="${pkgdir}" || return 1
+#Python2 fix
+  for file in $(find . -name '*.py' -print); do
+    sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file
+    sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
+  done
+}
 
-#removing files provided by translate-toolkit
-  rm "${pkgdir}"/usr/bin/{csv2po,csv2tbx,html2po,lookupclient.py,lookupservice,moz2po,oo2po,oo2xliff,po2csv,po2html,po2moz,po2oo,po2prop,po2tmx,po2ts,po2txt,po2xliff,poclean,pocompile,poconflicts,pocount,podebug,pofilter,pogrep,pomerge,porestructure,poswap,pot2po,prop2po,ts2po,txt2po,xliff2oo,xliff2po} || return 1
+package() {
+  cd "${srcdir}"/wordforge-0.8-rc1
 
-#directory for dictionaries writable to all - if you wish
-#  chmod 777 "${pgkdir}/usr/lib/python2.6/site-packages/WordForge/Editor/dict"  || return 1
+  python2 setup.py install --root="${pkgdir}"
 }
diff --git a/wordforge.diff b/wordforge.diff
deleted file mode 100644
index d8206d7d66b3..000000000000
--- a/wordforge.diff
+++ /dev/null
@@ -1,7 +0,0 @@
---- setup.py~	2008-11-04 03:11:21.000000000 +0100
-+++ setup.py	2008-11-22 12:47:23.000000000 +0100
-@@ -355,3 +355,3 @@
-   dosetup(name, version, packages + custompackages, datafiles + customdatafiles, wordforgescripts, ext_modules)
--  os.chmod(join(join(packagesdir, editor), "dict"), 0777)
-+#  os.chmod(join(join(packagesdir, editor), "dict"), 0777)
- #  print "------------------------------------------------"