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

[Douglas Soares de Andrade]

    Date: Monday, September 8, 2008 @ 21:06:52
  Author: douglas
Revision: 12070

Fixing the commit in testing

Modified:
  subversion/repos/testing-i686/PKGBUILD

----------+
 PKGBUILD |   30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-09-08 23:34:10 UTC (rev 12069)
+++ PKGBUILD	2008-09-09 01:06:52 UTC (rev 12070)
@@ -1,9 +1,10 @@
 # $Id$
 # Contributer: Jason Chu <jason at archlinux.org>
 # Maintainer: Jason Chu <jason at archlinux.org>
+
 pkgname=subversion
-pkgver=1.4.6
-pkgrel=4
+pkgver=1.5.2
+pkgrel=1
 pkgdesc="Replacement for CVS, another versioning system (svn)"
 arch=(i686 x86_64)
 license=('apache' 'bsd')
@@ -12,34 +13,41 @@
              '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)
-md5sums=('32786fe2f322982c0567346de18f6460'
+        svnserve svn svnserve.conf)
+
+md5sums=('37533b0435caaa3e4e1be359389fcbb9'
          'c5a2e490b3e58c6bd2ca3a2e72b71845'
          'a0db6dd43af33952739b6ec089852630'
-         'c459e299192552f61578f3438abf0664'
-         'f869289684b394840e10908c89460303')
+         'c459e299192552f61578f3438abf0664')
+        
 backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve')
 url="http://subversion.tigris.org/"
 provides=('svn')
 options=('!makeflags' 'libtool')
 
+md5sums=('ec3ae55d43ee87c1c1f57e2411009459'
+         'c5a2e490b3e58c6bd2ca3a2e72b71845'
+         'a0db6dd43af33952739b6ec089852630'
+         'c459e299192552f61578f3438abf0664')
+
 build() {
    cd $startdir/src/${pkgname}-${pkgver}
 
    [ -z "${J2REDIR}" ] && . /etc/profile.d/jre.sh
    [ -z "${J2SDKDIR}" ] && . /etc/profile.d/jdk.sh
 
-   # patch from gentoo
-   patch -Np1 -i $startdir/src/subversion-neon.patch
+   #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 0.28.2"/' -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
 
    autoreconf
-   ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr --with-zlib --with-neon=/usr --with-apxs --enable-javahl --with-jdk=/opt/java
+   ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \
+               --with-zlib=/usr --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
 
@@ -75,7 +83,7 @@
    install -m 755 $startdir/src/svnserve $startdir/pkg/etc/rc.d
    install -m 644 $startdir/src/svn $startdir/pkg/etc/xinetd.d
    install -m 644 $startdir/src/svnserve.conf $startdir/pkg/etc/conf.d/svnserve
-   install -m 755 $startdir/src/subversion-$pkgver/contrib/client-side/svnmerge.py $startdir/pkg/usr/bin/svnmerge
+   install -m 755 $startdir/src/subversion-$pkgver/contrib/client-side/svnmerge/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