Date: Tuesday, August 21, 2012 @ 10:04:52 Author: dan Revision: 165500
upgpkg: git 1.7.12-1 Modified: git/trunk/PKGBUILD git/trunk/git-daemon.socket git/trunk/[email protected] git/trunk/git.install Deleted: git/trunk/ChangeLog ---------------------+ ChangeLog | 57 -------------------------------------------------- PKGBUILD | 32 ++++++++++++++-------------- git-daemon.socket | 1 [email protected] | 1 git.install | 1 5 files changed, 17 insertions(+), 75 deletions(-) Deleted: ChangeLog =================================================================== --- ChangeLog 2012-08-21 14:04:40 UTC (rev 165499) +++ ChangeLog 2012-08-21 14:04:52 UTC (rev 165500) @@ -1,57 +0,0 @@ -Simple version bumps are omitted from the following ChangeLog. - -2011-08-16 Dan McGee <[email protected]> - Version 1.7.6.1-1 - * Enable USE_LIBPCRE for `git grep -P` usage - -2011-05-05 Dan McGee <[email protected]> - Version 1.7.5.1-1 - * Byte compile emacs files (FS#20874) - * Respect CFLAGS/LDFLAGS (FS#23963) - -2011-04-27 Dan McGee <[email protected]> - Version 1.7.5-1 - * Add missing optdepends for git send-email (FS#20923) - -2011-01-05 Dan McGee <[email protected]> - Version 1.7.3.5-1 - * More flexible git-daemon RC scripts (FS#20575) - -2010-10-01 Allan McRae <[email protected]> - Version 1.7.3.1-2 - * Python 2/3 rebuild - -2010-06-29 Dan McGee <[email protected]> - Version 1.7.1.1-1 - * Add emacs completion files (FS#17968) - * Add git-daemon RC scripts (FS#19291) - -2009-06-05 Dan McGee <[email protected]> - Version 1.6.3.2-1 - * Remove gitweb from /usr/share; it needs customization to be helpful - * Add NO_CROSS_DIRECTORY_HARDLINKS option to build (FS#13683) - -2008-09-14 Dan McGee <[email protected]> - Version 1.6.0.2-1 - * Moved optional depends from install file to optdepends array - -2008-06-15 Dan McGee <[email protected]> - Version 1.5.6-1 - * Removed 'cpio' dependency, clone is now a builtin and no longer needs it - -2008-02-02 Dan McGee <[email protected]> - Version 1.5.4-1 - * Upstream version 1.5.4 - * Enable pthreads support in pack-objects. To use, set the pack.threads - git config option. Read manpages of pack-objects and config for more - details. - * Changelog added (with entries going back a bit). - -2008-01-28 Kevin Piche <[email protected]> - Version 1.5.3.7-2 - * Updated for new perl policy (vendor dirs) - * Change license to GPL2 - -2007-11-01 Eric Belanger <[email protected]> - Version 1.5.3.5-2 - * Fix Perl module location Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-08-21 14:04:40 UTC (rev 165499) +++ PKGBUILD 2012-08-21 14:04:52 UTC (rev 165500) @@ -2,8 +2,8 @@ # Maintainer: Dan McGee <[email protected]> pkgname=git -pkgver=1.7.11.5 -pkgrel=2 +pkgver=1.7.12 +pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64) url="http://git-scm.com/"; @@ -29,7 +29,6 @@ git-daemon.conf [email protected] git-daemon.socket) -changelog=ChangeLog build() { export PYTHON_PATH='/usr/bin/python2' @@ -49,6 +48,10 @@ cd "$srcdir/$pkgname-$pkgver" local jobs jobs=$(expr "$MAKEFLAGS" : '.*\(-j[0-9]*\).*') + mkdir -p /dev/shm/git-test + # We used to use this, but silly git regressions: + #GIT_TEST_OPTS="--root=/dev/shm/" \ + # http://comments.gmane.org/gmane.comp.version-control.git/202020 make prefix=/usr gitexecdir=/usr/lib/git-core \ CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ USE_LIBPCRE=1 \ @@ -56,7 +59,7 @@ NO_SVN_TESTS=y \ DEFAULT_TEST_TARGET=prove \ GIT_PROVE_OPTS="$jobs -Q" \ - GIT_TEST_OPTS="--root=/dev/shm/" \ + GIT_TEST_OPTS="--root=/dev/shm/git-test" \ test } @@ -70,14 +73,13 @@ INSTALLDIRS=vendor DESTDIR="$pkgdir" install # bash completion - # until this is fixed, no point in loading it dynamically: - # http://git.661346.n2.nabble.com/bash-completion-now-loads-completions-dynamically-so-git-ps1-is-not-defined-when-you-open-a-shell-td7415323.html - #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"/etc/bash_completion.d/ - install -m644 ./contrib/completion/git-completion.bash "$pkgdir"/etc/bash_completion.d/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 # more 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') \ @@ -107,9 +109,9 @@ install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket } -md5sums=('9985d35c11531d546426ebefb327c847' - 'f08a5a60e57f00399bbd384cfd7791f3' +md5sums=('ceb1a6b17a3e33bbc70eadf8fce5876c' + '0070ad185cfc29da545abe35ba8862e7' '8e2648910fd5dd4f1c41d3c7fa9e9156' '2e42bf97779a1c6411d89043334c9e78' - '198ef9d9e79bd8d5868f95ed9f79cc34' - '779c00deb490291c6b477b8cc0161123') + '042524f942785772d7bd52a1f02fe5ae' + 'f67869315c2cc112e076f0c73f248002') Modified: git-daemon.socket =================================================================== --- git-daemon.socket 2012-08-21 14:04:40 UTC (rev 165499) +++ git-daemon.socket 2012-08-21 14:04:52 UTC (rev 165500) @@ -1,6 +1,5 @@ [Unit] Description=Git Daemon Socket -After=network.target [Socket] ListenStream=9418 Modified: [email protected] =================================================================== --- [email protected] 2012-08-21 14:04:40 UTC (rev 165499) +++ [email protected] 2012-08-21 14:04:52 UTC (rev 165500) @@ -1,6 +1,5 @@ [Unit] Description=Git Daemon Instance -After=network.target [Service] User=git Modified: git.install =================================================================== --- git.install 2012-08-21 14:04:40 UTC (rev 165499) +++ git.install 2012-08-21 14:04:52 UTC (rev 165500) @@ -4,7 +4,6 @@ fi if ! getent passwd git >/dev/null; then useradd --system -c 'git daemon user' -g git -d / -s /bin/bash git - passwd -l git >/dev/null fi }
