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

[Evgeniy Alekseev]

    Date: Tuesday, August 26, 2014 @ 21:45:43
  Author: arcanis
Revision: 117929

upgpkg: pymol 1.7.2.1-1

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

-----------+
 ChangeLog |    8 ++++++++
 PKGBUILD  |   21 +++++++++++++--------
 2 files changed, 21 insertions(+), 8 deletions(-)

Added: ChangeLog
===================================================================
--- ChangeLog	                        (rev 0)
+++ ChangeLog	2014-08-26 19:45:43 UTC (rev 117929)
@@ -0,0 +1,8 @@
+1.7.2.1-1:
+upstream update
+
+1.7.2.0-2:
+glew rebuild
+
+1.7.2.0-1:
+upstream update

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-08-26 18:49:44 UTC (rev 117928)
+++ PKGBUILD	2014-08-26 19:45:43 UTC (rev 117929)
@@ -4,8 +4,8 @@
 # Contributor: Tomasz Żok <tomasz dot zok at gmail dot com>
 
 pkgname=pymol
-pkgver=1.7.2.0
-pkgrel=2
+pkgver=1.7.2.1
+pkgrel=1
 pkgdesc="Molecular visualization system on an Open Source foundation"
 arch=('i686' 'x86_64')
 url="http://pymol.org/"
@@ -13,24 +13,29 @@
 depends=('glew' 'glut' 'mesa' 'python2-numpy' 'python2-pmw' 'tcsh')
 makedepends=('desktop-file-utils' 'gendesk')
 source=("http://downloads.sourceforge.net/project/pymol/pymol/1.7/pymol-v${pkgver}.tar.bz2"
+        ${pkgname}.png::"https://c.fsdn.com/allura/p/pymol/icon"
         "${pkgname}-38899.patch"
         "apbstools_tcltk8.6.patch")
 install="${pkgname}.install"
-md5sums=('921b26d20f82d383ba5622baea946527'
+md5sums=('a3349139f8c70739be524cb08e438b82'
+         '0e9df23150d39cbcb8f79c38ce2a52e5'
          '1f8152c4604ba2939b24e25a022937ca'
          'c48bf253e59ff97c14114cd285a4f1e1')
+changelog=ChangeLog
 
 prepare() {
   # create desktop file
-  gendesk -f --pkgname "${pkgname}" --pkgdesc "${pkgdesc}" --name="PyMOL" --categories="Science;Chemistry"
+  gendesk -f -n --pkgname "${pkgname}" --pkgdesc "${pkgdesc}" \
+          --name="PyMOL Molecular Graphics System" \
+          --categories="Science;Chemistry"
 
   # suppress non-zero exit code that breaks makepkg
   sed -i '/sys.exit/ s,2,0,' "${srcdir}/pymol/setup.py"
   # change python to python2
-  sed -i "s|python|python2|g" "${srcdir}/pymol/test/cyg"
-  sed -i "s|python|python2|g" "${srcdir}/pymol/test/run"
-  sed -i "s|python|python2|g" "${srcdir}/pymol/test/show"
-  sed -i "s|python|python2|g" "${srcdir}/pymol/modules/pmg_tk/startup/apbs_tools.py"
+  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"