[arch-commits] Commit in subversion/repos (3 files)

[Giovanni Scafora]

    Date: Tuesday, May 12, 2009 @ 06:40:13
  Author: giovanni
Revision: 39115

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

........
  r39042 | douglas | 2009-05-11 08:13:54 -0700 (lun, 11 mag 2009) | 2 lines
  
  upgpkg: subversion 1.6.2-1
      Updated for i686
........

Modified:
  subversion/repos/extra-x86_64/	(properties)
  subversion/repos/extra-x86_64/ChangeLog
  subversion/repos/extra-x86_64/PKGBUILD

-----------+
 ChangeLog |    4 ++++
 PKGBUILD  |   16 ++++++----------
 2 files changed, 10 insertions(+), 10 deletions(-)


Property changes on: subversion/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /subversion/trunk:1-37008
   + /subversion/trunk:1-39114

Modified: extra-x86_64/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog	2009-05-12 10:39:43 UTC (rev 39114)
+++ extra-x86_64/ChangeLog	2009-05-12 10:40:13 UTC (rev 39115)
@@ -1,4 +1,8 @@
 
+2009-05-11  Douglas Soares de Andrade  <douglas at archlinux.org>
+
+	* Updated for i686: 1.6.2
+
 2009-04-17  Douglas Soares de Andrade  <douglas at archlinux.org>
 
 	* Back to use svnmerge.py from trunk

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-05-12 10:39:43 UTC (rev 39114)
+++ extra-x86_64/PKGBUILD	2009-05-12 10:40:13 UTC (rev 39115)
@@ -3,8 +3,8 @@
 # Maintainer: Jason Chu <jason at archlinux.org>
 
 pkgname=subversion
-pkgver=1.6.1
-pkgrel=4
+pkgver=1.6.2
+pkgrel=1
 pkgdesc="Replacement for CVS, another versioning system (svn)"
 arch=(i686 x86_64)
 license=('apache' 'bsd')
@@ -12,8 +12,8 @@
 makedepends=('heimdal>=1.2' 'db>=4.7' 'apache>=2.2.9-3' 'python>=2.6-1'
              'perl>=5.10.0-3' 'swig>=1.3.31' 'ruby' 'openjdk6' 'autoconf'
              'sqlite3')
-source=(http://svn.collab.net/tarballs/${pkgname}-${pkgver}.tar.gz
-        svnserve svn svnserve.conf svnmerge.py sqlite-config.patch)
+source=(http://subversion.tigris.org/downloads/$pkgname-$pkgver.tar.bz2
+        svnserve svn svnserve.conf svnmerge.py)
 
 backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve')
 url="http://subversion.tigris.org/"
@@ -26,9 +26,6 @@
    [ -z "${J2REDIR}" ] && . /etc/profile.d/openjdk6.sh
    [ -z "${J2SDKDIR}" ] && . /etc/profile.d/openjdk6.sh
 
-   # Fix sqlite issue
-   patch -Np1 < ../sqlite-config.patch
-
    autoreconf
    ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \
                --with-zlib=/usr --with-neon=/usr --with-apxs \
@@ -78,9 +75,8 @@
    install -m 755 $startdir/src/svnmerge.py $startdir/pkg/usr/bin/svnmerge
    install -D -m 644 $startdir/src/subversion-$pkgver/COPYING $startdir/pkg/usr/share/licenses/$pkgname/LICENSE
 }
-md5sums=('32014fe70397357fa1e0ef8f937a0232'
+md5sums=('ebb1cecd313533ca0876f9bfc86bd5d9'
          'c5a2e490b3e58c6bd2ca3a2e72b71845'
          'a0db6dd43af33952739b6ec089852630'
          'c459e299192552f61578f3438abf0664'
-         '21bf3aa5b797ce98eba8307f30e9c070'
-         '94996eef653bca80de6042eb4ead04d2')
+         '21bf3aa5b797ce98eba8307f30e9c070')