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

[Evgeniy Alekseev]

    Date: Friday, April 14, 2017 @ 18:46:38
  Author: arcanis
Revision: 223030

upgpkg: pymol 1.8.6.0-2

rollback python3, because some functions became unavailable (see FS#53654)

Modified:
  pymol/trunk/ChangeLog
  pymol/trunk/PKGBUILD

-----------+
 ChangeLog |    3 +++
 PKGBUILD  |   13 +++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2017-04-14 18:27:43 UTC (rev 223029)
+++ ChangeLog	2017-04-14 18:46:38 UTC (rev 223030)
@@ -1,3 +1,6 @@
+1.8.6.0-2:
+rollback to python2 (see FS#53654)
+
 1.8.6.0-1:
 * upstream update
 * use python3 instead of python2

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-04-14 18:27:43 UTC (rev 223029)
+++ PKGBUILD	2017-04-14 18:46:38 UTC (rev 223030)
@@ -5,12 +5,12 @@
 
 pkgname=pymol
 pkgver=1.8.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Molecular visualization system on an Open Source foundation"
 arch=('i686' 'x86_64')
 url="http://pymol.org/"
 license=('custom')
-depends=('glew' 'glut' 'libgl' 'libxml2' 'python-numpy' 'python-pmw' 'tcsh')
+depends=('glew' 'glut' 'libgl' 'libxml2' 'python2-numpy' 'python2-pmw' 'tcsh')
 makedepends=('desktop-file-utils' 'gendesk' 'msgpack-c')
 source=("http://downloads.sourceforge.net/project/pymol/pymol/1.8/pymol-v${pkgver}.tar.bz2"
         ${pkgname}.png::"https://c.fsdn.com/allura/p/pymol/icon"
@@ -30,6 +30,11 @@
 
   # suppress non-zero exit code that breaks makepkg
   sed -i '/sys.exit/ s,2,0,' "${srcdir}/pymol/setup.py"
+  # change python to python2
+  find "${pkgname}" -name '*.py' -type f -exec \
+       sed -i 's|env python|env python2|g' {} \;
+  find "${pkgname}/test" -type f -exec \
+       sed -i 's|bin/python|bin/python2|g' {} \;
   # fix FS#38899
   patch -p0 -i "${pkgname}-38899.patch"
   mv "${srcdir}/${pkgname}/modules/web" "${srcdir}/${pkgname}/modules/pymolweb"
@@ -42,12 +47,12 @@
   cd "${srcdir}/${pkgname}"
   # required c++11
   export CPPFLAGS="$CPPFLAGS -std=c++11"
-  python setup.py build
+  python2 setup.py build
 }
 
 package() {
   cd "${srcdir}/${pkgname}"
-  python setup.py install --prefix=/usr --root="${pkgdir}"
+  python2 setup.py install --prefix=/usr --root="${pkgdir}"
   install -Dm644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
   install -Dm644 "${srcdir}/pymol.desktop" "${pkgdir}/usr/share/applications/pymol.desktop"
   install -Dm644 "${srcdir}/pymol.png" "${pkgdir}/usr/share/pixmaps/pymol.png"