Fix for python2-imaging.

2 files changed, 9 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c371f7b76258..df6316f357c2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -12,12 +12,12 @@ pkgbase = ocropy-git
 	depends = python2-pytables
 	depends = imagemagick
 	depends = opencv
-	depends = python2-beautifulsoup4
+	depends = python2-lxml
 	provides = ocropy
+	conflicts = ocropy
 	source = git+https://github.com/ocropus/ocropy.git
 	source = https://github.com/zuphilip/ocropy-models/raw/master/en-default.pyrnn.gz
 	sha256sums = SKIP
 	sha256sums = b749ec701a53915183963c3814a288de7da5a38261bd9008e0ae0674c71cd1f7
 
 pkgname = ocropy-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 955f5b4a91f2..a84ed02c7bc2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,9 +10,10 @@ arch=('any')
 url="https://github.com/ocropus/${_pkgname}"
 license=('APACHE')
 depends=('python2-imaging' 'python2-scipy' 'python2-matplotlib' 'python2-pytables'
-         'imagemagick' 'opencv' 'python2-beautifulsoup4')
+         'imagemagick' 'opencv' 'python2-lxml')
 makedepends=('git')
 provides=("${_pkgname}")
+conflicts=("${_pkgname}")
 source=("git+https://github.com/ocropus/${_pkgname}.git"
         "https://github.com/zuphilip/ocropy-models/raw/master/en-default.pyrnn.gz")
 sha256sums=('SKIP'
@@ -27,8 +28,11 @@ prepare() {
   cd "$srcdir/${_pkgname}"
   cp "$srcdir/en-default.pyrnn.gz" models
   
-  sed -i 's|tostring|tobytes|' ocrolib/common.py
-  sed -i 's|PIL\.Image\.fromstring|PIL\.Image\.frombytes|' ocrolib/common.py
+  #sed -i 's|numpy.fromstring|numpy.frombytes|' ocrolib/common.py
+  #sed -i 's|tostring|tobytes|' ocrolib/common.py
+  #sed -i 's|im.tobytes()|im.tostring()|' 'ocrolib/common.py'
+  #sed -i 's|PIL\.Image\.fromstring|PIL\.Image\.frombytes|' 'ocrolib/common.py'
+  sed -i 's|tobytes|tostring|' ocrolib/common.py
 }
 
 build() {