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

[Evgeniy Alekseev]

    Date: Thursday, January 2, 2014 @ 01:33:14
  Author: arcanis
Revision: 103270

upgpkg: pymol 1.6.0.0-3

Modified:
  pymol/trunk/PKGBUILD

----------+
 PKGBUILD |   18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-01-02 00:18:57 UTC (rev 103269)
+++ PKGBUILD	2014-01-02 00:33:14 UTC (rev 103270)
@@ -1,3 +1,4 @@
+# $Id$
 # Maintainer: Evgeniy Alekseev <arcanis dot arch at gmail dot com>
 # Contributor: graysky
 # Contributor: Tomasz Żok <tomasz dot zok at gmail dot com>
@@ -4,7 +5,7 @@
 
 pkgname=pymol
 pkgver=1.6.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A USER-SPONSORED molecular visualization system on an OPEN-SOURCE foundation"
 arch=('i686' 'x86_64')
 url="http://pymol.org/"
@@ -15,7 +16,12 @@
 
 prepare() {
   # suppress non-zero exit code that breaks makepkg
-  sed -i '/sys.exit/ s,2,0,' "${srcdir}/${pkgname}/setup.py"
+  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"
 }
 
 build() {
@@ -26,16 +32,8 @@
 package() {
   cd "${srcdir}/${pkgname}"
   python2 setup.py install --prefix="usr/" --root="${pkgdir}"
-  
   sed -i "s|${pkgdir}||g" pymol
   install -D -m755 "pymol" "${pkgdir}/usr/bin/pymol"
-  
-  # change python to python2
-  sed -i "s|python|python2|g" "${pkgdir}/usr/lib/python2.7/site-packages/pymol/pymol_path/test/run"
-  sed -i "s|python|python2|g" "${pkgdir}/usr/lib/python2.7/site-packages/pymol/pymol_path/test/cyg"
-  sed -i "s|python|python2|g" "${pkgdir}/usr/lib/python2.7/site-packages/pmg_tk/startup/apbs_tools.py"
-  sed -i "s|python|python2|g" "${pkgdir}/usr/lib/python2.7/site-packages/pymol/pymol_path/test/show"
-  
   install -D -m644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }