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

[Douglas Soares de Andrade]

    Date: Wednesday, December 24, 2008 @ 07:10:54
  Author: douglas
Revision: 22253

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

........
  r22233 | douglas | 2008-12-23 12:11:10 -0200 (Ter, 23 Dez 2008) | 1 line
  
  upgpkg: subversion 1.5.5-1
........

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

----------+
 PKGBUILD |   21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)


Property changes on: subversion/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /subversion/trunk:1-20521
   + /subversion/trunk:1-22252
Deleted: svn:mergeinfo
   - 

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-12-24 11:46:31 UTC (rev 22252)
+++ extra-i686/PKGBUILD	2008-12-24 12:10:54 UTC (rev 22253)
@@ -3,23 +3,17 @@
 # Maintainer: Jason Chu <jason at archlinux.org>
 
 pkgname=subversion
-pkgver=1.5.4
-pkgrel=2
+pkgver=1.5.5
+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' 'jdk' 'jre' 'ruby'
-             'autoconf')
+             'perl>=5.10.0-3' 'swig>=1.3.31' 'ruby' 'openjdk6' 'autoconf')
 source=(http://svn.collab.net/tarballs/${pkgname}-${pkgver}.tar.gz
         svnserve svn svnserve.conf)
 
-md5sums=('37533b0435caaa3e4e1be359389fcbb9'
-         'c5a2e490b3e58c6bd2ca3a2e72b71845'
-         'a0db6dd43af33952739b6ec089852630'
-         'c459e299192552f61578f3438abf0664')
-        
 backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve')
 url="http://subversion.tigris.org/"
 provides=('svn')
@@ -28,8 +22,8 @@
 build() {
    cd $startdir/src/${pkgname}-${pkgver}
 
-   [ -z "${J2REDIR}" ] && . /etc/profile.d/jre.sh
-   [ -z "${J2SDKDIR}" ] && . /etc/profile.d/jdk.sh
+   [ -z "${J2REDIR}" ] && . /etc/profile.d/openjdk6.sh
+   [ -z "${J2SDKDIR}" ] && . /etc/profile.d/openjdk6.sh
 
    #patch -Np1 -i $startdir/src/subversion-neon.patch
 
@@ -42,7 +36,7 @@
    autoreconf
    ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \
                --with-zlib=/usr --with-neon=/usr --with-apxs \
-               --enable-javahl --with-jdk=/opt/java
+               --enable-javahl --with-jdk=/usr/lib/jvm/java-1.6.0-openjdk
 
    (make external-all && make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all ) || return 1
 
@@ -55,7 +49,6 @@
    mkdir -p $startdir/pkg/usr/lib/python2.6
    mv $startdir/pkg/usr/lib/svn-python/ $startdir/pkg/usr/lib/python2.6/site-packages
 
-
    mkdir -p $startdir/pkg/usr/share/subversion
    install -d -m 755 tools/hook-scripts $startdir/pkg/usr/share/subversion/
    rm -f $startdir/pkg/usr/share/subversion/hook-scripts/*.in
@@ -86,7 +79,7 @@
    find ${startdir}/pkg/usr/lib/ruby -name '*.la' -exec rm {} \;
    find ${startdir}/pkg/usr/lib/python2.6 -name '*.la' -exec rm {} \;
 }
-md5sums=('8ec0a6e756c35dc3ce20abb580040924'
+md5sums=('532c7d49b3cd33d712289a5ef03b7749'
          'c5a2e490b3e58c6bd2ca3a2e72b71845'
          'a0db6dd43af33952739b6ec089852630'
          'c459e299192552f61578f3438abf0664')