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

[Douglas Soares de Andrade]

    Date: Friday, August 7, 2009 @ 17:12:03
  Author: douglas
Revision: 49430

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

........
  r48509 | eric | 2009-08-02 19:32:36 -0300 (Dom, 02 Ago 2009) | 2 lines
  
  upgpkg: subversion 1.6.3-2
      Rebuilt against ruby 1.9
........
  r49429 | douglas | 2009-08-07 18:11:14 -0300 (Sex, 07 Ago 2009) | 2 lines
  
  upgpkg: subversion 1.6.4-1
      Updated to 1.6.4, also fixed some packages problems and add the option to store passwords in kwallet or gnome-keyring
........

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

-----------+
 ChangeLog |    8 ++++++++
 PKGBUILD  |   16 +++++++---------
 2 files changed, 15 insertions(+), 9 deletions(-)


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

Modified: extra-x86_64/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog	2009-08-07 21:11:14 UTC (rev 49429)
+++ extra-x86_64/ChangeLog	2009-08-07 21:12:03 UTC (rev 49430)
@@ -1,4 +1,12 @@
 
+2009-08-07  Douglas Soares de Andrade  <douglas at archlinux.org>
+
+	* Updated to: 1.6.4
+
+2009-08-02  Eric Belanger  <eric at archlinux.org>
+
+	* subversion 1.6.3-2: Rebuilt against ruby 1.9
+
 2009-06-07  Douglas Soares de Andrade  <douglas at archlinux.org>
 
 	* Now hopefully fixed git issues

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-08-07 21:11:14 UTC (rev 49429)
+++ extra-x86_64/PKGBUILD	2009-08-07 21:12:03 UTC (rev 49430)
@@ -3,15 +3,15 @@
 # Contributor: Jason Chu <jason at archlinux.org>
 
 pkgname=subversion
-pkgver=1.6.3
+pkgver=1.6.4
 pkgrel=1
 pkgdesc="Replacement for CVS, another versioning system (svn)"
 arch=(i686 x86_64)
 license=('apache' 'bsd')
 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.6-1'
-             'perl>=5.10.0-3' 'swig>=1.3.31' 'ruby' 'openjdk6' 'autoconf'
-             'sqlite3')
+makedepends=('heimdal>=1.2' 'apache>=2.2.11' 'python>=2.6.2'
+             'perl>=5.10.0-3' 'swig>=1.3.39' 'ruby' 'java-runtime' 'autoconf'
+             'sqlite3' 'db>=4.7.25' 'e2fsprogs')
 source=(http://subversion.tigris.org/downloads/$pkgname-$pkgver.tar.bz2
         svnserve svn svnserve.conf svnmerge.py
         subversion.rpath.fix.patch)
@@ -20,19 +20,17 @@
 url="http://subversion.tigris.org/"
 provides=('svn')
 options=('!makeflags' '!libtool')
+optdepends=('gnome-keyring' 'kdeutils-kwallet')
 
 build() {
    cd $startdir/src/${pkgname}-${pkgver}
 
-   [ -z "${J2REDIR}" ] && . /etc/profile.d/openjdk6.sh
-   [ -z "${J2SDKDIR}" ] && . /etc/profile.d/openjdk6.sh
-
    patch -p0 < $srcdir/subversion.rpath.fix.patch || return 1
    autoreconf
    ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \
                --with-zlib=/usr --with-neon=/usr --with-apxs \
                --with-sqlite=/usr \
-               --enable-javahl --with-jdk=/usr/lib/jvm/java-1.6.0-openjdk
+               --enable-javahl --with-gnome-keyring --with-kwallet
 
    (make external-all && make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all ) || return 1
 
@@ -71,7 +69,7 @@
    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=('8bf7637ac99368db0890e3f085fa690d'
+md5sums=('11e3fa838c9a558cadc378f2807572e2'
          'c5a2e490b3e58c6bd2ca3a2e72b71845'
          'a0db6dd43af33952739b6ec089852630'
          'c459e299192552f61578f3438abf0664'