From 86333909e8899c40db8dd522c88bb8c120761657 Mon Sep 17 00:00:00 2001 From: Michael Hanson Date: Tue, 30 Nov 2010 23:35:00 +0000 Subject: git: upgrade --- abs/core/git/PKGBUILD | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/abs/core/git/PKGBUILD b/abs/core/git/PKGBUILD index 5b281a2..335d85d 100644 --- a/abs/core/git/PKGBUILD +++ b/abs/core/git/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90230 2010-09-09 13:16:45Z dan $ +# $Id: PKGBUILD 96573 2010-10-22 13:12:55Z dan $ # Maintainer: Dan McGee pkgname=git -pkgver=1.7.2.3 -pkgrel=2 +pkgver=1.7.3.2 +pkgrel=1 pkgdesc="the fast distributed version control system" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://git-scm.com/" license=('GPL2') depends=('curl' 'expat>=2.0' 'perl-error' 'perl>=5.10.0') @@ -14,6 +14,7 @@ optdepends=('tk: gitk and git gui' 'perl-libwww: git svn' 'perl-term-readkey: git svn' 'perl-net-smtp-ssl: git send-email TLS support' + 'python2: various helper scripts' 'subversion: git svn' 'cvsps: git cvsimport') replaces=('git-core') @@ -45,8 +46,9 @@ package() { 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 + sed -i 's|#![ ]*/usr/bin/env python|#!/usr/bin/env python2|' \ + $(find "$pkgdir" -name '*.py') \ + "$pkgdir"/usr/share/git/{fast-import/git-p4,gitview/gitview} # emacs interface mkdir -p $pkgdir/usr/share/emacs/site-lisp @@ -68,11 +70,11 @@ package() { install -D -m644 $srcdir/git-daemon.conf $pkgdir/etc/conf.d/git-daemon.conf } -md5sums=('d88c06f6442156686deb4b4fbab0954c' - '2ef8d3959c832347c29885627ebc0682' +md5sums=('902f7f07a789fedc0d2ac03656b85969' + '80bbef2adeaae852f04a9f143aaa5204' 'd777ff1a239b3d810dcf5d89f9d894af' '9d065134210aa0dd3f2b40d12d915040') -sha256sums=('6139ec31d0a79cae04f469e73cc1f912162bb8f84ef7621ecc8630989fc81ba1' - '87e00245e10472ee5acdd75bb5a6e2e89c12638b498e0df9edca6201439d47d7' +sha256sums=('bc4cf6bc7c116056050ef43b051691828d7101327b23311d424b02eaee553e71' + 'ce6ca1cb1c62b7dd8d258cf9a94cda7de90a9476b7bb315968f3ed1976dc621e' 'd2741714a477029ca1ed63f8584040bcba6a53b2332028f9005feef4ae500113' '6e1475974fae315c55da344c0527923061ad7d9478d39396d147aea497f501b7') -- cgit v0.12