summaryrefslogtreecommitdiff
path: root/extra/git
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2013-01-20 15:38:15 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2013-01-20 15:38:15 -0300
commitc28258d27bd9d58760eb647f912bb98a536aa753 (patch)
tree261e61872b291c02790e5483c769710942547731 /extra/git
parenteefed5e3db847eccce0207f89c7430b9ec4994b7 (diff)
parent949fa4e5ed405aaddcebff7e21008f03cdffa580 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/erlang/PKGBUILD community/fcitx-mozc/PKGBUILD community/geda-gaf/PKGBUILD community/mplayer2/PKGBUILD community/parcellite/PKGBUILD community/python2-pytables/PKGBUILD community/ruby-gtk2/PKGBUILD core/kbd/PKGBUILD core/systemd/PKGBUILD extra/calligra/PKGBUILD extra/dmapi/PKGBUILD extra/gstreamer0.10-ugly/PKGBUILD extra/gvfs/PKGBUILD extra/libcdio/PKGBUILD extra/libtorrent-rasterbar/PKGBUILD extra/llvm/PKGBUILD extra/nx/PKGBUILD extra/ocaml/PKGBUILD extra/php-xcache/PKGBUILD extra/qtwebkit/PKGBUILD extra/vcdimager/PKGBUILD extra/w3m/PKGBUILD extra/xorg-bdftopcf/PKGBUILD extra/xorg-xcalc/PKGBUILD extra/xorg-xconsole/PKGBUILD extra/xorg-xedit/PKGBUILD extra/xorg-xmag/PKGBUILD extra/xorg-xmessage/PKGBUILD extra/xorg-xvidtune/PKGBUILD libre/unzip-libre/PKGBUILD social/opentracker/PKGBUILD
Diffstat (limited to 'extra/git')
-rw-r--r--extra/git/PKGBUILD15
1 files changed, 6 insertions, 9 deletions
diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD
index bdb4ced38..375e1c1b6 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 174135 2013-01-02 14:21:11Z dan $
+# $Id: PKGBUILD 175132 2013-01-14 22:24:03Z dan $
# Maintainer: Dan McGee <dan@archlinux.org>
pkgname=git
-pkgver=1.8.1
+pkgver=1.8.1.1
pkgrel=1
pkgdesc="the fast distributed version control system"
arch=(i686 x86_64 'mips64el')
@@ -28,13 +28,11 @@ source=("http://git-core.googlecode.com/files/git-$pkgver.tar.gz"
git-daemon
git-daemon.conf
git-daemon@.service
- git-daemon.socket
- fix-git-build-python.patch)
+ git-daemon.socket)
build() {
export PYTHON_PATH='/usr/bin/python2'
cd "$srcdir/$pkgname-$pkgver"
- patch -Np1 < ../fix-git-build-python.patch
make prefix=/usr gitexecdir=/usr/lib/git-core \
CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
USE_LIBPCRE=1 \
@@ -111,10 +109,9 @@ package() {
install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket
}
-md5sums=('a2c6f4404c5e432b47474d246ca83c7e'
- '8da825142aed9f37f80ad67164990373'
+md5sums=('2bf7fd005ecf2e0a311b849e6add7994'
+ '4ac4ea5a72ec96ac24b7d6fba9ad1277'
'8e2648910fd5dd4f1c41d3c7fa9e9156'
'2e42bf97779a1c6411d89043334c9e78'
'042524f942785772d7bd52a1f02fe5ae'
- 'f67869315c2cc112e076f0c73f248002'
- '7fd505fdcd0cd0223e5b8ad641090de8')
+ 'f67869315c2cc112e076f0c73f248002')