diff options
author | Doug Newgard | 2015-10-26 21:54:04 -0500 |
---|---|---|
committer | Doug Newgard | 2015-10-26 21:54:04 -0500 |
commit | 5dca0611e8ef9755f7fa7bf97becdd30b979101c (patch) | |
tree | a9d2ef3fccf251a6eab943609a3739b952c2a557 | |
parent | 4d9787e13eb819d2d7b1e0bfad76e96690540366 (diff) | |
download | aur-5dca0611e8ef9755f7fa7bf97becdd30b979101c.tar.gz |
Get rid of python symlink hack
-rw-r--r-- | .SRCINFO | 2 | ||||
-rw-r--r-- | PKGBUILD | 9 |
2 files changed, 4 insertions, 7 deletions
@@ -1,7 +1,7 @@ pkgbase = grass pkgdesc = Geospatial data management and analysis, image processing, graphics/maps production, spatial modeling and visualization pkgver = 7.0.1 - pkgrel = 6 + pkgrel = 7 url = http://grass.osgeo.org/ arch = i686 arch = x86_64 @@ -3,9 +3,8 @@ pkgname=grass pkgver=7.0.1 -pkgrel=6 -_shortver=${pkgver%.*} -_shortver=${_shortver/./} +pkgrel=7 +_shortver=${pkgver%.*}; _shortver=${_shortver/./} pkgdesc='Geospatial data management and analysis, image processing, graphics/maps production, spatial modeling and visualization' arch=('i686' 'x86_64') url='http://grass.osgeo.org/' @@ -19,10 +18,9 @@ md5sums=('bda8f612443a935b9da78dba85733db4') prepare() { cd $pkgname-$pkgver - ln -sf "$(which python2)" python - sed -i 's/\(env \|\/usr\/bin\/\)python$/&2/' $(find . -iname "*.py") sed -i '/os\.environ.*GRASS_PYTHON/ s/"python"/"python2"/' lib/init/grass.py + sed -i '/^PYTHON/ s/python$/&2/' include/Make/Platform.make.in sed -i '/^\s*INSTDIR/ s/".*"//' configure sed -i "/^Exec/ s/=.*/=grass$_shortver/" gui/icons/grass.desktop } @@ -30,7 +28,6 @@ prepare() { build() { cd $pkgname-$pkgver - export PATH="$srcdir/$pkgname-$pkgver:$PATH" export CFLAGS="$CPPFLAGS $CFLAGS" export CXXFLAGS="$CPPFLAGS $CXXFLAGS" unset CPPFLAGS |