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

[Eric Belanger]

    Date: Friday, September 19, 2008 @ 22:57:14
  Author: eric
Revision: 12767

Merged revisions 6296,6301,12069,12734 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/subversion/trunk

........
  r6296 | douglas | 2008-07-23 21:59:32 -0400 (Wed, 23 Jul 2008) | 1 line
  
  archrelease: new repo testing-i686
........
  r6301 | douglas | 2008-07-23 22:06:41 -0400 (Wed, 23 Jul 2008) | 2 lines
  
  upgpkg: subversion 1.5.0-1
      Updated for i686: 1.5.0
........
  r12069 | douglas | 2008-09-08 19:34:10 -0400 (Mon, 08 Sep 2008) | 2 lines
  
  upgpkg: subversion 1.5.2-1
      Updated for i686: 1.5.2
........
  r12734 | douglas | 2008-09-19 06:32:43 -0400 (Fri, 19 Sep 2008) | 2 lines
  
  upgpkg: subversion 1.5.2-2
      Updated for i686
........

Added:
  subversion/repos/extra-x86_64/ChangeLog
    (from rev 12734, subversion/trunk/ChangeLog)
Modified:
  subversion/repos/extra-x86_64/	(properties)
  subversion/repos/extra-x86_64/PKGBUILD

-----------+
 ChangeLog |   14 ++++++++++++++
 PKGBUILD  |   30 +++++++++++++++++++-----------
 2 files changed, 33 insertions(+), 11 deletions(-)


Property changes on: subversion/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /subversion/trunk:1-4785
   + /subversion/trunk:1-12766

Copied: subversion/repos/extra-x86_64/ChangeLog (from rev 12734, subversion/trunk/ChangeLog)
===================================================================
--- extra-x86_64/ChangeLog	                        (rev 0)
+++ extra-x86_64/ChangeLog	2008-09-20 02:57:14 UTC (rev 12767)
@@ -0,0 +1,14 @@
+
+2008-09-04  Douglas Soares de Andrade  <douglas at archlinux.org>
+
+	* 1.5.2: Finally updated for i686 as it does not break the
+	  devtools.
+
+2008-08-13  Douglas Soares de Andrade  <dsa at aur.archlinux.org>
+
+	* Updated for i686: 1.5.1
+
+2008-07-23  Douglas Soares de Andrade  <douglas at archlinux.org>
+
+	* Updated for i686: 1.5.0
+

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-09-20 02:43:01 UTC (rev 12766)
+++ extra-x86_64/PKGBUILD	2008-09-20 02:57:14 UTC (rev 12767)
@@ -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=2
 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