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

Wed Sep 2 20:51:28 UTC 2009

Date: Wednesday, September 2, 2009 @ 16:51:27
  Author: ronald
Revision: 50895

Merged revisions 50115,50311,50890 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/subversion/trunk

........
  r50115 | douglas | 2009-08-23 01:01:30 +0200 (Sun, 23 Aug 2009) | 2 lines
  
  upgpkg: subversion 1.6.5-1
      Updated to: 1.6.5
........
  r50311 | douglas | 2009-08-25 13:26:30 +0200 (Tue, 25 Aug 2009) | 2 lines
  
  upgpkg: subversion 1.6.5-2
      Fixed some bugs (svnserve) and hopefully resolved bdb issue
........
  r50890 | andrea | 2009-09-02 21:13:36 +0200 (Wed, 02 Sep 2009) | 2 lines
  
  upgpkg: subversion 1.6.5-3
      upstream release, add ruby>=1.9.1 to depends
........

Modified:
  subversion/repos/testing-x86_64/	(properties)
  subversion/repos/testing-x86_64/PKGBUILD
  subversion/repos/testing-x86_64/svnserve

----------+
 PKGBUILD |   66 ++++++++++++++++++++++++++++++-------------------------------
 svnserve |    2 -
 2 files changed, 34 insertions(+), 34 deletions(-)


Property changes on: subversion/repos/testing-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /subversion/trunk:1-49513
   + /subversion/trunk:1-50894

Modified: testing-x86_64/PKGBUILD
===================================================================

--- testing-x86_64/PKGBUILD	2009-09-02 20:29:09 UTC (rev 50894)
+++ testing-x86_64/PKGBUILD	2009-09-02 20:51:27 UTC (rev 50895)
@@ -3,14 +3,14 @@
 # Contributor: Jason Chu <jason at archlinux.org>
 
 pkgname=subversion
-pkgver=1.6.4
-pkgrel=2
+pkgver=1.6.5
+pkgrel=3
 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' 'apache>=2.2.11' 'python>=2.6.2'
-             'perl>=5.10.0-3' 'swig>=1.3.39' 'ruby' 'java-runtime' 'autoconf'
+makedepends=('heimdal>=1.2' 'apache>=2.2.13' 'python>=2.6.2'
+             'perl>=5.10.0-3' 'swig>=1.3.39' 'ruby>=1.9.1' 'java-runtime' 'autoconf'
              'sqlite3' 'db>=4.7.25' 'e2fsprogs' 'gnome-keyring' 'kdelibs')
 source=(http://subversion.tigris.org/downloads/$pkgname-$pkgver.tar.bz2
         svnserve svn svnserve.conf svnmerge.py
@@ -23,7 +23,7 @@
 optdepends=('gnome-keyring' 'kdeutils-kwallet')
 
 build() {
-   cd $startdir/src/${pkgname}-${pkgver}
+   cd ${srcdir}/${pkgname}-${pkgver}
 
    patch -p0 < $srcdir/subversion.rpath.fix.patch || return 1
    autoreconf
@@ -34,43 +34,43 @@
 
    (make external-all && make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all ) || return 1
 
-   export LD_LIBRARY_PATH=$startdir/pkg/usr/lib:$LD_LIBRARY_PATH
-   make DESTDIR=$startdir/pkg install || return 1
+   export LD_LIBRARY_PATH=${pkgdir}/usr/lib:$LD_LIBRARY_PATH
+   make DESTDIR=${pkgdir} install || return 1
 
-   make DESTDIR=$startdir/pkg swig-py || return 1
-   make install-swig-py DESTDIR=$startdir/pkg || return 1
+   make DESTDIR=${pkgdir} swig-py || return 1
+   make install-swig-py DESTDIR=${pkgdir} || return 1
 
-   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 ${pkgdir}/usr/lib/python2.6
+   mv ${pkgdir}/usr/lib/svn-python/ ${pkgdir}/usr/lib/python2.6/site-packages || return 1
 
-   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
+   mkdir -p ${pkgdir}/usr/share/subversion
+   install -d -m 755 tools/hook-scripts ${pkgdir}/usr/share/subversion/
+   rm -f ${pkgdir}/usr/share/subversion/hook-scripts/*.in
 
-   make DESTDIR=$startdir/pkg swig-pl || return 1
-   make install-swig-pl DESTDIR=$startdir/pkg INSTALLDIRS=vendor || return 1
-   rm -f $startdir/pkg/usr/lib/perl5/vendor_perl/auto/SVN/_Core/.packlist
-   rm -rf $startdir/pkg/usr/lib/perl5/core_perl
+   make DESTDIR=${pkgdir} swig-pl || return 1
+   make install-swig-pl DESTDIR=${pkgdir} INSTALLDIRS=vendor || return 1
+   rm -f ${pkgdir}/usr/lib/perl5/vendor_perl/auto/SVN/_Core/.packlist
+   rm -rf ${pkgdir}/usr/lib/perl5/core_perl
 
-   make DESTDIR=$startdir/pkg swig-rb || return 1
-   make install-swig-rb DESTDIR=$startdir/pkg  || return 1
+   make DESTDIR=${pkgdir} swig-rb || return 1
+   make install-swig-rb DESTDIR=${pkgdir}  || return 1
 
-   make DESTDIR=$startdir/pkg javahl || return 1
-   make DESTDIR=$startdir/pkg install-javahl || return 1
+   make DESTDIR=${pkgdir} javahl || return 1
+   make DESTDIR=${pkgdir} install-javahl || return 1
 
-   mkdir -p $startdir/pkg/etc/rc.d
-   mkdir -p $startdir/pkg/etc/xinetd.d
-   mkdir -p $startdir/pkg/etc/conf.d
+   mkdir -p ${pkgdir}/etc/rc.d
+   mkdir -p ${pkgdir}/etc/xinetd.d
+   mkdir -p ${pkgdir}/etc/conf.d
 
-   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/svnmerge.py $startdir/pkg/usr/bin/svnmerge
-   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
+   install -m 755 ${srcdir}/svnserve ${pkgdir}/etc/rc.d
+   install -m 644 ${srcdir}/svn ${pkgdir}/etc/xinetd.d
+   install -m 644 ${srcdir}/svnserve.conf ${pkgdir}/etc/conf.d/svnserve
+   #install -m 755 ${srcdir}/subversion-$pkgver/contrib/client-side/svnmerge/svnmerge.py ${pkgdir}/usr/bin/svnmerge
+   install -m 755 ${srcdir}/svnmerge.py ${pkgdir}/usr/bin/svnmerge
+   install -D -m 644 ${srcdir}/subversion-$pkgver/COPYING ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
 }
-md5sums=('11e3fa838c9a558cadc378f2807572e2'
-         'c5a2e490b3e58c6bd2ca3a2e72b71845'
+md5sums=('1a53a0e72bee0bf814f4da83a9b6a636'
+         'a2b029e8385007ffb99b437b30521c90'
          'a0db6dd43af33952739b6ec089852630'
          'c459e299192552f61578f3438abf0664'
          '21bf3aa5b797ce98eba8307f30e9c070'

Modified: testing-x86_64/svnserve
===================================================================
--- testing-x86_64/svnserve	2009-09-02 20:29:09 UTC (rev 50894)
+++ testing-x86_64/svnserve	2009-09-02 20:51:27 UTC (rev 50895)
@@ -10,7 +10,7 @@
     stat_busy "Starting svnserve"
     if [ -z "$PID" ]; then 
       if [ -n "$SVNSERVE_USER" ]; then
-        su $SVNSERVE_USER -c "/usr/bin/svnserve -d $SVNSERVE_ARGS" &
+        su -s '/bin/sh' $SVNSERVE_USER -c "/usr/bin/svnserve -d $SVNSERVE_ARGS" &
       else
         /usr/bin/svnserve -d $SVNSERVE_ARGS &
       fi


