From b5f690637837ff269bf5d248ee2dc37ea5236ca8 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Thu, 12 Jan 2012 23:14:51 +0000
Subject: Thu Jan 12 23:14:51 UTC 2012

---
 extra/subversion/PKGBUILD | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'extra/subversion')

diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD
index 31964707c..11a474e99 100644
--- a/extra/subversion/PKGBUILD
+++ b/extra/subversion/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 144954 2011-12-12 00:43:44Z eric $
+# $Id: PKGBUILD 146485 2012-01-11 15:22:42Z stephane $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=subversion
 pkgver=1.7.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A Modern Concurrent Version Control System"
 arch=('i686' 'x86_64')
 license=('APACHE')
@@ -18,14 +18,12 @@ url="http://subversion.apache.org/"
 provides=('svn')
 options=('!makeflags' '!libtool')
 source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2{,.asc}
-        svnserve svn svnserve.conf svnmerge.py
-        subversion.rpath.fix.patch)
+        svnserve svn svnserve.conf subversion.rpath.fix.patch)
 sha1sums=('8c0824aeb7f42da1ff4f7cd296877af7f59812bb'
           '66293923ddc1b12a43b0e86f6b6a3c23b70df6ae'
           '64ba3e6ebafc08ac62f59d788f7a825fdce69573'
           '73b36c046c09cec2093354911c89e3ba8056af6c'
           'ad117bf3b2a838a9a678a93fd8db1a066ad46c41'
-          'd240228e5755495c26e89d7ef47a75fb097dd040'
           '3d1e28408a9abb42af2e531adc0d01ce21acfad6')
 
 build() {
@@ -37,7 +35,7 @@ build() {
 
    ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \
                --with-zlib=/usr --with-neon=/usr --with-apxs \
-               --with-sqlite=/usr --with-berkeley-db=:/usr/include/:/usr/lib:db-5.2 \
+               --with-sqlite=/usr --with-berkeley-db=:/usr/include/:/usr/lib:db-5.3 \
                --enable-javahl --with-gnome-keyring --with-kwallet
 
    make external-all
@@ -71,7 +69,6 @@ package() {
    install -D -m 755 "${srcdir}"/svnserve "${pkgdir}"/etc/rc.d/svnserve
    install -D -m 644 "${srcdir}"/svn "${pkgdir}"/etc/xinetd.d/svn
    install -D -m 644 "${srcdir}"/svnserve.conf "${pkgdir}"/etc/conf.d/svnserve
-   install -m 755 "${srcdir}"/svnmerge.py "${pkgdir}"/usr/bin/svnmerge
 
    # bash completion
    install -Dm 644 tools/client-side/bash_completion \
-- 
cgit v1.2.3-54-g00ecf