git: Update to 2.4.4

This commit is contained in:
Alexpux
2015-06-17 10:01:24 +03:00
parent cb8564b677
commit 022f77076f

View File

@@ -1,7 +1,7 @@
# Maintainer: Alexey Pavlov <alexpux@gmail.com>
pkgname=git
pkgver=2.4.3
pkgver=2.4.4
pkgrel=1
pkgdesc="The fast distributed version control system"
arch=('i686' 'x86_64')
@@ -46,14 +46,14 @@ source=("${pkgname}-${pkgver}.tar.gz"::https://github.com/git/git/archive/v${pkg
git-1.9.0-manifest-msys2.patch
git-1.8.4-msys2.patch
git-2.3.5-mingw-pwd.patch)
md5sums=('b666e79a7accf0e3efbcc7093c27e4c1'
md5sums=('c2865d50718a77bf1f195cd3f9aefd87'
'c33c9dfa2944a0de9151a7af7a63a27b'
'f5975b367aa0979006bb07b297ef081b'
'9f9170a30dfb7643df4948cdae5bb864'
'18381075d8c134d8c4b03c9a566f40f0')
prepare() {
cd "$srcdir/$pkgname-$pkgver"
cd "${srcdir}/${pkgname}-${pkgver}"
rm -f compat/win32/git.manifest compat/win32/resource.rc
patch -p2 -i ${srcdir}/1.7.9-cygwin.patch
@@ -74,7 +74,7 @@ prepare() {
build() {
export PYTHON_PATH='/usr/bin/python2'
cd "$srcdir/$pkgname-$pkgver"
cd "${srcdir}/${pkgname}-${pkgver}"
./configure --build=${CHOST} \
--prefix=/usr \
@@ -93,7 +93,7 @@ build() {
check() {
export PYTHON_PATH='/usr/bin/python2'
cd "$srcdir/$pkgname-$pkgver"
cd "${srcdir}/${pkgname}-${pkgver}"
local jobs
jobs=$(expr "$MAKEFLAGS" : '.*\(-j[0-9]*\).*')
mkdir -p /tmp/git-test
@@ -110,35 +110,35 @@ check() {
package() {
export PYTHON_PATH='/usr/bin/python2'
cd "$srcdir/$pkgname-$pkgver"
cd "${srcdir}/${pkgname}-${pkgver}"
make INSTALLDIRS=vendor DESTDIR="$pkgdir" install
make INSTALLDIRS=vendor DESTDIR="$pkgdir" install-man
#make INSTALLDIRS=vendor DESTDIR="$pkgdir" install-info
make INSTALLDIRS=vendor DESTDIR="${pkgdir}" install-man
#make INSTALLDIRS=vendor DESTDIR="${pkgdir}" install-info
# bash completion
mkdir -p "$pkgdir"/usr/share/bash-completion/completions/
install -m644 ./contrib/completion/git-completion.bash "$pkgdir"/usr/share/bash-completion/completions/git
mkdir -p "${pkgdir}"/usr/share/bash-completion/completions/
install -m644 ./contrib/completion/git-completion.bash "${pkgdir}"/usr/share/bash-completion/completions/git
# fancy git prompt
mkdir -p "$pkgdir"/usr/share/git/
install -m644 ./contrib/completion/git-prompt.sh "$pkgdir"/usr/share/git/git-prompt.sh
mkdir -p "${pkgdir}"/usr/share/git/
install -m644 ./contrib/completion/git-prompt.sh "${pkgdir}"/usr/share/git/git-prompt.sh
# subtree installation
sed "s|libexec/git-core|lib/git-core|" -i contrib/subtree/Makefile
make -C contrib/subtree prefix=/usr DESTDIR="$pkgdir" install
make -C contrib/subtree prefix=/usr DESTDIR="${pkgdir}" install
# the rest of the contrib stuff
cp -a ./contrib/* $pkgdir/usr/share/git/
cp -a ./contrib/* ${pkgdir}/usr/share/git/
# scripts are for python 2.x
sed -i 's|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|' \
$(find "$pkgdir" -name '*.py') \
"$pkgdir"/usr/lib/git-core/git-p4 \
"$pkgdir"/usr/share/git/gitview/gitview \
"$pkgdir"/usr/share/git/remote-helpers/git-remote-bzr \
"$pkgdir"/usr/share/git/remote-helpers/git-remote-hg
"${pkgdir}"/usr/lib/git-core/git-p4 \
"${pkgdir}"/usr/share/git/gitview/gitview \
"${pkgdir}"/usr/share/git/remote-helpers/git-remote-bzr \
"${pkgdir}"/usr/share/git/remote-helpers/git-remote-hg
sed -i 's|#![ ]*/usr/bin/python$|#!/usr/bin/python2|' \
"$pkgdir"/usr/share/git/svn-fe/svnrdump_sim.py
"${pkgdir}"/usr/share/git/svn-fe/svnrdump_sim.py
# remove perllocal.pod, .packlist, and empty directories.
find $pkgdir/usr/lib/perl5 -name *.pod -delete
find $pkgdir/usr/lib/perl5 -name .packlist -delete
find ${pkgdir}/usr/lib/perl5 -name *.pod -delete
find ${pkgdir}/usr/lib/perl5 -name .packlist -delete
}