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

[Evgeniy Alekseev]

    Date: Monday, March 20, 2017 @ 15:19:16
  Author: arcanis
Revision: 217643

upgpkg: pymol 1.8.6.0-1

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

-----------+
 ChangeLog |    4 ++++
 PKGBUILD  |   17 ++++++-----------
 2 files changed, 10 insertions(+), 11 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2017-03-20 15:19:07 UTC (rev 217642)
+++ ChangeLog	2017-03-20 15:19:16 UTC (rev 217643)
@@ -1,3 +1,7 @@
+1.8.6.0-1:
+* upstream update
+* use python3 instead of python2
+
 1.8.4.0-1:
 upstream update
 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-03-20 15:19:07 UTC (rev 217642)
+++ PKGBUILD	2017-03-20 15:19:16 UTC (rev 217643)
@@ -4,19 +4,19 @@
 # Contributor: Tomasz Żok <tomasz dot zok at gmail dot com>
 
 pkgname=pymol
-pkgver=1.8.4.0
+pkgver=1.8.6.0
 pkgrel=1
 pkgdesc="Molecular visualization system on an Open Source foundation"
 arch=('i686' 'x86_64')
 url="http://pymol.org/"
 license=('custom')
-depends=('glew' 'glut' 'libgl' 'libxml2' 'python2-numpy' 'python2-pmw' 'tcsh')
-makedepends=('desktop-file-utils' 'gendesk')
+depends=('glew' 'glut' 'libgl' 'libxml2' 'python-numpy' 'python-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"
         "${pkgname}-38899.patch"
         "apbstools_tcltk8.6.patch")
-md5sums=('85451c40abc0a359a5ed91abd363b2c2'
+md5sums=('dc317a4046d653417ac6d4a984176e26'
          '0e9df23150d39cbcb8f79c38ce2a52e5'
          '1f8152c4604ba2939b24e25a022937ca'
          '138550367b74fd62a7c7bc48d339eb2d')
@@ -30,11 +30,6 @@
 
   # 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"
@@ -47,12 +42,12 @@
   cd "${srcdir}/${pkgname}"
   # required c++11
   export CPPFLAGS="$CPPFLAGS -std=c++11"
-  python2 setup.py build
+  python setup.py build
 }
 
 package() {
   cd "${srcdir}/${pkgname}"
-  python2 setup.py install --prefix=/usr --root="${pkgdir}"
+  python 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"