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

Dan McGee dan at archlinux.org
Thu Sep 9 13:16:46 UTC 2010


    Date: Thursday, September 9, 2010 @ 09:16:45
  Author: dan
Revision: 90230

upgpkg: git 1.7.2.3-2
update for python2/3 transition

Modified:
  git/trunk/PKGBUILD

----------+
 PKGBUILD |   16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-09-09 13:06:21 UTC (rev 90229)
+++ PKGBUILD	2010-09-09 13:16:45 UTC (rev 90230)
@@ -3,13 +3,13 @@
 
 pkgname=git
 pkgver=1.7.2.3
-pkgrel=1
+pkgrel=2
 pkgdesc="the fast distributed version control system"
 arch=(i686 x86_64)
 url="http://git-scm.com/"
 license=('GPL2')
 depends=('curl' 'expat>=2.0' 'perl-error' 'perl>=5.10.0')
-makedepends=('python')
+makedepends=('python2')
 optdepends=('tk: gitk and git gui'
             'perl-libwww: git svn'
             'perl-term-readkey: git svn'
@@ -25,16 +25,18 @@
         git-daemon.conf)
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  export PYTHON_PATH='/usr/bin/python2'
+  cd "$srcdir/$pkgname-$pkgver"
   make prefix=/usr gitexecdir=/usr/lib/git-core || return 1
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
+  export PYTHON_PATH='/usr/bin/python2'
+  cd "$srcdir/$pkgname-$pkgver"
   make prefix=/usr gitexecdir=/usr/lib/git-core \
     NO_CROSS_DIRECTORY_HARDLINKS=1 \
     INSTALLDIRS=vendor DESTDIR=${pkgdir} install || return 1
-  
+
   # bash completion
   mkdir -p $pkgdir/etc/bash_completion.d/
   install -m644 ./contrib/completion/git-completion.bash $pkgdir/etc/bash_completion.d/git || return 1
@@ -42,6 +44,10 @@
   # more contrib stuff
   cp -a ./contrib $pkgdir/usr/share/git/ || return 1
 
+  # scripts are for python 2.x
+  find "$pkgdir" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
+  sed -i 's|#!/usr/bin/python|#!/usr/bin/env python2|' "$pkgdir"/usr/lib/git-core/git-remote-testgit
+
   # emacs interface
   mkdir -p $pkgdir/usr/share/emacs/site-lisp
   mv $pkgdir/usr/share/git/emacs $pkgdir/usr/share/emacs/site-lisp/git




More information about the arch-commits mailing list