[arch-commits] Commit in git/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Dan McGee]

    Date: Sunday, December 28, 2008 @ 11:02:18
  Author: dan
Revision: 22829

Merged revisions 22828 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/git/trunk

........
  r22828 | dan | 2008-12-28 10:01:55 -0600 (Sun, 28 Dec 2008) | 1 line
  
  upgpkg: git 1.6.1-1
........

Modified:
  git/repos/extra-x86_64/	(properties)
  git/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)


Property changes on: git/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /git/trunk:1-22208
   + /git/trunk:1-22828

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-12-28 16:01:55 UTC (rev 22828)
+++ extra-x86_64/PKGBUILD	2008-12-28 16:02:18 UTC (rev 22829)
@@ -2,7 +2,7 @@
 # Maintainer: Dan McGee <dan at archlinux.org>
 
 pkgname=git
-pkgver=1.6.0.6
+pkgver=1.6.1
 pkgrel=1
 pkgdesc="GIT - the stupid content tracker"
 arch=(i686 x86_64)
@@ -20,18 +20,16 @@
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  make THREADED_DELTA_SEARCH=1 \
-    prefix=/usr gitexecdir=/usr/lib/git-core || return 1
-  make THREADED_DELTA_SEARCH=1 \
-    prefix=/usr gitexecdir=/usr/lib/git-core \
-    INSTALLDIRS=vendor DESTDIR=${pkgdir} install
+  make prefix=/usr gitexecdir=/usr/lib/git-core || return 1
+  make prefix=/usr gitexecdir=/usr/lib/git-core \
+    INSTALLDIRS=vendor DESTDIR=${pkgdir} install || return 1
   
   # let's plop gitweb in /usr/share
-  mkdir -p $pkgdir/usr/share/ || return 1
+  mkdir -p $pkgdir/usr/share/
   cp -dR ./gitweb $pkgdir/usr/share/gitweb || return 1
 
   #bash completion
-  mkdir -p $pkgdir/etc/bash_completion.d/ || return 1
+  mkdir -p $pkgdir/etc/bash_completion.d/
   install -m644 ./contrib/completion/git-completion.bash $pkgdir/etc/bash_completion.d/git || return 1
 
   # how 'bout some manpages?
@@ -45,5 +43,5 @@
   rm -rf $pkgdir/usr/lib/perl5
 }
 
-md5sums=('b5be9b34b441cb57f92086bfaf59f255'
-         'e795e251df5c14a8c7212742880a6a9e')
+md5sums=('66265d85593473b23290232b9dccef77'
+         'f53f454c397f691ad50ca6657b56d35c')