Date: Wednesday, October 24, 2018 @ 21:40:53 Author: arcanis Revision: 398887
upgpkg: pymol 2.2.0-1 Modified: pymol/trunk/ChangeLog pymol/trunk/PKGBUILD -----------+ ChangeLog | 4 ++++ PKGBUILD | 19 +++++++++---------- 2 files changed, 13 insertions(+), 10 deletions(-) Modified: ChangeLog =================================================================== --- ChangeLog 2018-10-24 21:21:53 UTC (rev 398886) +++ ChangeLog 2018-10-24 21:40:53 UTC (rev 398887) @@ -1,3 +1,7 @@ +2.2.0-1: +* upstream update +* use github sources + 2.1.0-1: * upstream update * use python3 instead of python2 Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-10-24 21:21:53 UTC (rev 398886) +++ PKGBUILD 2018-10-24 21:40:53 UTC (rev 398887) @@ -3,21 +3,20 @@ # Contributor: Tomasz Żok <tomasz dot zok at gmail dot com> pkgname=pymol -pkgver=2.1.0 -_majorver=2 -pkgrel=4 +pkgver=2.2.0 +pkgrel=1 pkgdesc="Molecular visualization system on an Open Source foundation" arch=('x86_64') url="http://pymol.org/" license=('custom') -depends=('freetype2' 'glew' 'glut' 'python-numpy' 'tcsh') +depends=('freetype2' 'glew' 'glm' 'glut' 'python-numpy' 'tcsh') makedepends=('desktop-file-utils' 'gendesk' 'msgpack-c') optdepends=('python-pmw: pmw based UI' 'python-pyqt5: Qt5 based UI') -source=("https://downloads.sourceforge.net/project/pymol/pymol/${_majorver}/pymol-v${pkgver}.tar.bz2" +source=("https://github.com/schrodinger/pymol-open-source/archive/v${pkgver}.tar.gz" ${pkgname}.png::"https://c.fsdn.com/allura/p/pymol/icon" "apbstools_tcltk8.6.patch") -sha512sums=('67175c0668a13826febcb73f7c62a43cfa03a7f86bb80113d52fb337e7d29008684c03163fc06338c4d68edd9246ffcf63aec1ee3110ae91c8a71ef24ab7b605' +sha512sums=('56776586276208d42cc4bd4c3cb7d6b9a08e7239186b8f398c75cb57f85e05ebf51aaa8cdec5672e56beeda26f1cd9d14c6de7fba1a741f9c8ec22c1292b9c63' '39917c1dc80cd6a59e8f6b3ea49a59491eaf23d14e32ac264f6d71f33007f686deb6a66e50e7f20ef9df5337038e3572b018633c361460d5ee0c1d8f0a8259d1' '90fce6d3c4364cd775b44bdd9013a08f26392339bec40ecd749220b3d11391381f5b159734bdb2e2ac675fbc016a6a1b9c4cec2fa8c9c0226609a5f09b610b9c') changelog=ChangeLog @@ -29,19 +28,19 @@ --categories="Science;Chemistry" # suppress non-zero exit code that breaks makepkg - sed -i '/sys.exit/ s,2,0,' "${srcdir}/pymol/setup.py" + sed -i '/sys.exit/ s,2,0,' "${srcdir}/${pkgname}-open-source-${pkgver}/setup.py" # fix FS#39526 - cd "${srcdir}/${pkgname}" + cd "${srcdir}/${pkgname}-open-source-${pkgver}" patch -p0 -i "${srcdir}/apbstools_tcltk8.6.patch" } build() { - cd "${srcdir}/${pkgname}" + cd "${srcdir}/${pkgname}-open-source-${pkgver}" python setup.py build } package() { - cd "${srcdir}/${pkgname}" + cd "${srcdir}/${pkgname}-open-source-${pkgver}" 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"