[arch-commits] Commit in subversion/repos (testing-i686 testing-i686/PKGBUILD)

[Allan McRae]

    Date: Monday, July 7, 2008 @ 23:33:12
  Author: allan
Revision: 4561

Merged revisions 3380-4560 via svnmerge from 
svn+ssh://archlinux.org/home/svn-packages/subversion/trunk

........
  r3752 | andyrtr | 2008-07-01 06:12:15 +1000 (Tue, 01 Jul 2008) | 1 line
  
  upgpkg: subversion 1.4.6-3
........

Modified:
  subversion/repos/testing-i686/	(properties)
  subversion/repos/testing-i686/PKGBUILD

----------+
 PKGBUILD |   20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)


Property changes on: subversion/repos/testing-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /subversion/trunk:1-3379
   + /subversion/trunk:1-4560

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2008-07-08 03:29:32 UTC (rev 4560)
+++ testing-i686/PKGBUILD	2008-07-08 03:33:12 UTC (rev 4561)
@@ -3,13 +3,13 @@
 # Maintainer: Jason Chu <jason at archlinux.org>
 pkgname=subversion
 pkgver=1.4.6
-pkgrel=2
+pkgrel=3
 pkgdesc="Replacement for CVS, another versioning system (svn)"
 arch=(i686 x86_64)
 license=('apache' 'bsd')
-depends=('neon>=0.27.2-1' 'apr-util>=1.2.12-1')
-makedepends=('heimdal>=1.0.1' 'db>=4.6' 'apache' 'python>=2.5'
-             'perl>=5.10.0' 'swig>=1.3.27' 'jdk' 'jre' 'ruby'
+depends=('neon>=0.28.2-2' 'apr-util>=1.3.2-2')
+makedepends=('heimdal>=1.2' 'db>=4.7' 'apache>=2.2.9-3' 'python>=2.5.2-4'
+             'perl>=5.10.0-3' 'swig>=1.3.31' 'jdk' 'jre' 'ruby'
              'autoconf')
 source=(http://svn.collab.net/tarballs/${pkgname}-${pkgver}.tar.gz
         svnserve svn svnserve.conf subversion-neon.patch)
@@ -32,11 +32,13 @@
    # patch from gentoo
    patch -Np1 -i $startdir/src/subversion-neon.patch
 
-   sed -e 's/\(NEON_ALLOWED_LIST=.* 0.26.4\)"/\1 0.27.2 0.28.0 0.28.1"/' -i configure.in
+   sed -e 's/\(NEON_ALLOWED_LIST=.* 0.26.4\)"/\1 0.27.2 0.28.0 0.28.1 0.28.2"/' -i configure.in
 
-   libtoolize --force --copy
-   aclocal -I build/ac-macros
-   autoconf
+#   libtoolize --force --copy
+#   aclocal -I build/ac-macros
+#   autoconf
+
+   autoreconf
    ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr --with-zlib --with-neon=/usr --with-apxs --enable-javahl --with-jdk=/opt/java
 
    (make external-all && make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all ) || return 1
@@ -76,7 +78,7 @@
    install -m 755 $startdir/src/subversion-$pkgver/contrib/client-side/svnmerge.py $startdir/pkg/usr/bin/svnmerge
    install -D -m 644 $startdir/src/subversion-$pkgver/COPYING $startdir/pkg/usr/share/licenses/$pkgname/LICENSE
 
-#libtoolslay not all because of kdesdk
+   #libtoolslay not all because of kdesdk
    find ${startdir}/pkg/usr/lib/httpd/modules -name '*.la' -exec rm {} \;
    find ${startdir}/pkg/usr/lib/ruby -name '*.la' -exec rm {} \;
    find ${startdir}/pkg/usr/lib/python2.5 -name '*.la' -exec rm {} \;