Date: Tuesday, April 3, 2018 @ 07:18:56 Author: eworm Revision: 320885
upgpkg: git 2.17.0-1 * new upstream release * keep make options in centralized array * clean perl module installation (and fix dependencies) * drop old provides Modified: git/trunk/PKGBUILD ----------+ PKGBUILD | 56 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-04-03 07:17:21 UTC (rev 320884) +++ PKGBUILD 2018-04-03 07:18:56 UTC (rev 320885) @@ -3,14 +3,14 @@ # Maintainer: Dan McGee <[email protected]> pkgname=git -pkgver=2.16.3 +pkgver=2.17.0 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(x86_64) url="http://git-scm.com/"; license=('GPL2') -depends=('curl' 'expat>=2.0' 'perl-error' 'perl>=5.14.0' 'openssl' 'pcre2' - 'grep' 'shadow') +depends=('curl' 'expat>=2.0' 'perl>=5.14.0' 'perl-error' 'perl-mailtools' + 'openssl' 'pcre2' 'grep' 'shadow') makedepends=('python2' 'emacs' 'libgnome-keyring' 'xmlto' 'asciidoc') optdepends=('tk: gitk and git gui' 'perl-libwww: git svn' @@ -25,8 +25,6 @@ 'python2: various helper scripts' 'subversion: git svn' 'gnome-keyring: GNOME keyring credential helper') -replaces=('git-core') -provides=('git-core') install=git.install validpgpkeys=('96E07AF25771955980DAD10020D04E5A713660A7') # Junio C Hamano source=("https://www.kernel.org/pub/software/scm/git/git-$pkgver.tar."{xz,sign} @@ -33,20 +31,30 @@ '[email protected]' 'git-daemon.socket' 'git-sysusers.conf') -sha256sums=('d65d99e9e5b081c1f14ea018973806e942a2eb7d0da2ebc01bd2525adee62d48' +sha256sums=('e916e5e95e81dbeafa7aac5d719c01108b5c814eb90b746695afa1afedf955c7' 'SKIP' '14c0b67cfe116b430645c19d8c4759419657e6809dfa28f438c33a005245ad91' 'ac4c90d62c44926e6d30d18d97767efc901076d4e0283ed812a349aece72f203' '7630e8245526ad80f703fac9900a1328588c503ce32b37b9f8811674fcda4a45') +make_options=( + prefix=/usr + gitexecdir=/usr/lib/git-core + perllibdir=$(/usr/bin/perl -MConfig -wle 'print $Config{installvendorlib}') + CFLAGS="$CFLAGS" + LDFLAGS="$LDFLAGS" + USE_LIBPCRE2=1 + NO_CROSS_DIRECTORY_HARDLINKS=1 + NO_PERL_CPAN_FALLBACKS=1 + MAN_BOLD_LITERAL=1 +) + build() { export PYTHON_PATH='/usr/bin/python2' cd "$srcdir/$pkgname-$pkgver" - make prefix=/usr gitexecdir=/usr/lib/git-core \ - CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ - USE_LIBPCRE2=1 \ - NO_CROSS_DIRECTORY_HARDLINKS=1 \ - MAN_BOLD_LITERAL=1 \ + + make \ + "${make_options[@]}" \ all doc make -C contrib/emacs prefix=/usr @@ -60,6 +68,7 @@ check() { export PYTHON_PATH='/usr/bin/python2' cd "$srcdir/$pkgname-$pkgver" + local jobs jobs=$(expr "$MAKEFLAGS" : '.*\(-j[0-9]*\).*') || true mkdir -p /dev/shm/git-test @@ -67,11 +76,8 @@ # which is caused by 'git rebase' trying to use builduser's SHELL inside the # build chroot (i.e.: /usr/bin/nologin) SHELL=/bin/sh \ - make prefix=/usr gitexecdir=/usr/lib/git-core \ - CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ - USE_LIBPCRE2=1 \ - NO_CROSS_DIRECTORY_HARDLINKS=1 \ - MAN_BOLD_LITERAL=1 \ + make \ + "${make_options[@]}" \ NO_SVN_TESTS=y \ DEFAULT_TEST_TARGET=prove \ GIT_PROVE_OPTS="$jobs -Q" \ @@ -82,12 +88,11 @@ package() { export PYTHON_PATH='/usr/bin/python2' cd "$srcdir/$pkgname-$pkgver" - make prefix=/usr gitexecdir=/usr/lib/git-core \ - CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ - USE_LIBPCRE2=1 \ - NO_CROSS_DIRECTORY_HARDLINKS=1 \ - MAN_BOLD_LITERAL=1 \ - INSTALLDIRS=vendor DESTDIR="$pkgdir" install install-doc + + make \ + "${make_options[@]}" \ + DESTDIR="$pkgdir" \ + install install-doc # bash completion mkdir -p "$pkgdir"/usr/share/bash-completion/completions/ @@ -109,6 +114,7 @@ make -C contrib/subtree prefix=/usr gitexecdir=/usr/lib/git-core DESTDIR="$pkgdir" install install-doc # mediawiki installation make -C contrib/mw-to-git prefix=/usr gitexecdir=/usr/lib/git-core DESTDIR="$pkgdir" install + mv "$pkgdir"/Git/Mediawiki.pm "$pkgdir"/usr/share/perl5/vendor_perl/Git/ && rmdir "$pkgdir"/Git # TODO: fix install path! # the rest of the contrib stuff find contrib/ -name '.gitignore' -delete cp -a ./contrib/* $pkgdir/usr/share/git/ @@ -121,12 +127,6 @@ sed -i 's|#![ ]*/usr/bin/python$|#!/usr/bin/python2|' \ "$pkgdir"/usr/share/git/svn-fe/svnrdump_sim.py - # perl modules from contrib/ install to site dir... move to vendor - mv "$pkgdir"/usr/share/perl5/site_perl/Git/* "$pkgdir"/usr/share/perl5/vendor_perl/Git/ - rm -rf "$pkgdir"/usr/share/perl5/site_perl - # remove perllocal.pod, .packlist, and empty directories. - rm -rf "$pkgdir"/usr/lib/perl5 - # git-daemon via systemd socket activation install -D -m 0644 "$srcdir"/[email protected] "$pkgdir"/usr/lib/systemd/system/[email protected] install -D -m 0644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket
