1.2-2, added patch fixing a deep copy issue

3 files changed, 28 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0e98f955687c..76605561971f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,17 @@
 pkgbase = python-amoeba
 	pkgdesc = Amoeba fit routine based on the method of Nelder and Meads
 	pkgver = 1.2
-	pkgrel = 1
+	pkgrel = 2
 	url = http://stitchpanorama.sourceforge.net/Python/amoeba.py
 	arch = any
 	license = GPL2
 	makedepends = python
 	makedepends = python2
 	source = http://stitchpanorama.sourceforge.net/Python/amoeba.py
+	source = deepcopy.patch
 	source = setup.py
 	md5sums = 7e6a9ad95d8639ec3d1da7c6db0928fb
+	md5sums = d741ffab04b35e88f6ca60c3987886ae
 	md5sums = c68322a7608767cc03012e62b3baa546
 
 pkgname = python-amoeba
diff --git a/PKGBUILD b/PKGBUILD
index 753fd8647a6b..65085d658a4e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,38 +2,32 @@
 pkgbase=python-amoeba
 pkgname=("python-amoeba" "python2-amoeba")
 pkgver=1.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Amoeba fit routine based on the method of Nelder and Meads"
 url="http://stitchpanorama.sourceforge.net/Python/amoeba.py"
 arch=('any')
 license=('GPL2')
 makedepends=("python" "python2")
 source=("http://stitchpanorama.sourceforge.net/Python/amoeba.py"
+        "deepcopy.patch"
         "setup.py")
 md5sums=('7e6a9ad95d8639ec3d1da7c6db0928fb'
+         'd741ffab04b35e88f6ca60c3987886ae'
          'c68322a7608767cc03012e62b3baa546')
 
+prepare() {
+    cd "$srcdir/.."
+    # fix an error with initial simplex
+    patch amoeba.py deepcopy.patch
+}
+
 package_python2-amoeba() {
     depends=('python2')
-
-    ## determine python minor version
-    #ver=$(python2 --version 2>&1 | cut -d" " -f2 | cut -d"." -f2)
-    #mkdir -p "${pkgdir}/usr/lib/python2.${ver}/site-packages/amoeba"
-    #touch "${pkgdir}/usr/lib/python2.${ver}/site-packages/amoeba/__init__.py"
-    #install -m644 amoeba.py "${pkgdir}/usr/lib/python2.${ver}/site-packages/amoeba"
-
-    ls
     python2 setup.py install --root="${pkgdir}/" --optimize=1
 
 }
 
 package_python-amoeba() {
     depends=('python')
-    ls   
     python setup.py install --root="${pkgdir}/" --optimize=1
-    ## determine python minor version
-    #ver=$(python --version 2>&1 | cut -d" " -f2 | cut -d"." -f2)
-    #mkdir -p "${pkgdir}/usr/lib/python3.${ver}/site-packages/amoeba"
-    #touch "${pkgdir}/usr/lib/python3.${ver}/site-packages/amoeba/__init__.py"
-    #install -m644 amoeba.py "${pkgdir}/usr/lib/python3.${ver}/site-packages/amoeba"
 }
diff --git a/deepcopy.patch b/deepcopy.patch
new file mode 100644
index 000000000000..b4ca228568f1
--- /dev/null
+++ b/deepcopy.patch
@@ -0,0 +1,16 @@
+diff --git a/projekte/amoeba.py b/projekte/amoeba.py
+index da504b4..3068470 100644
+--- a/projekte/amoeba.py
++++ b/projekte/amoeba.py
+@@ -71,9 +71,9 @@ def amoeba(var,scale,func,ftolerance=1.e-4,xtolerance=1.e-4,itmax=500,data=None)
+     # first set up the simplex
+ 
+     simplex = [0]*(nvar+1)  # set the initial simplex
+-    simplex[0] = var[:]
++    simplex[0] = var[:]*1
+     for i in range(nvar):
+-        simplex[i+1] = var[:]
++        simplex[i+1] = var[:]*1
+         simplex[i+1][i] += scale[i]
+ 
+     fvalue = []