Date: Saturday, April 7, 2012 @ 11:45:07 Author: stephane Revision: 155844
db-move: moved subversion from [staging] to [testing] (i686) Added: subversion/repos/testing-i686/ subversion/repos/testing-i686/PKGBUILD (from rev 155843, subversion/repos/staging-i686/PKGBUILD) subversion/repos/testing-i686/subversion.rpath.fix.patch (from rev 155843, subversion/repos/staging-i686/subversion.rpath.fix.patch) subversion/repos/testing-i686/svn (from rev 155843, subversion/repos/staging-i686/svn) subversion/repos/testing-i686/svnserve (from rev 155843, subversion/repos/staging-i686/svnserve) subversion/repos/testing-i686/svnserve.conf (from rev 155843, subversion/repos/staging-i686/svnserve.conf) Deleted: subversion/repos/staging-i686/ ----------------------------+ PKGBUILD | 76 +++++++++++++++++++++++++++++++++++++++++++ subversion.rpath.fix.patch | 10 +++++ svn | 11 ++++++ svnserve | 42 +++++++++++++++++++++++ svnserve.conf | 7 +++ 5 files changed, 146 insertions(+) Copied: subversion/repos/testing-i686/PKGBUILD (from rev 155843, subversion/repos/staging-i686/PKGBUILD) =================================================================== --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2012-04-07 15:45:07 UTC (rev 155844) @@ -0,0 +1,76 @@ +# $Id$ +# Maintainer: Stéphane Gaudreault <steph...@archlinux.org> +# Contributor: Paul Mattal <p...@archlinux.org> +# Contributor: Jason Chu <ja...@archlinux.org> + +pkgname=subversion +pkgver=1.7.4 +pkgrel=2 +pkgdesc="A Modern Concurrent Version Control System" +arch=('i686' 'x86_64') +license=('APACHE') +depends=('neon' 'apr-util' 'sqlite' 'file') +optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion' \ + 'python2: for some hook scripts' 'ruby: for some hook scripts' 'java-environment') +makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'java-runtime' 'java-environment' + 'autoconf' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs') +backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve') +url="http://subversion.apache.org/" +provides=('svn') +options=('!makeflags' '!libtool' '!emptydirs') +source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2{,.asc} + svnserve svn svnserve.conf subversion.rpath.fix.patch) +sha1sums=('57a3cd351c1dbedddd020e7a1952df6cd2674527' + 'eebe0be6d539bf7dc37cf01b3c738072f1d9197b' + '64ba3e6ebafc08ac62f59d788f7a825fdce69573' + '73b36c046c09cec2093354911c89e3ba8056af6c' + 'ad117bf3b2a838a9a678a93fd8db1a066ad46c41' + '3d1e28408a9abb42af2e531adc0d01ce21acfad6') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + export PYTHON=/usr/bin/python2 + + patch -p0 -i ../subversion.rpath.fix.patch + sed -i 's|/usr/bin/env python|/usr/bin/env python2|' tools/hook-scripts/{,mailer/{,tests/}}*.py + + ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \ + --with-zlib=/usr --with-neon=/usr --with-apxs \ + --with-sqlite=/usr --with-berkeley-db=:/usr/include/:/usr/lib:db-5.3 \ + --enable-javahl --with-gnome-keyring --with-kwallet + + make external-all + make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all + make swig_pydir=/usr/lib/python2.7/site-packages/libsvn \ + swig_pydir_extra=/usr/lib/python2.7/site-packages/svn swig-py swig-pl javahl # swig-rb +} + +#check() { +# cd "${srcdir}/${pkgname}-${pkgver}" +# export LANG=C LC_ALL=C +# make check check-swig-pl check-swig-py check-javahl CLEANUP=yes # check-swig-rb +#} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + export LD_LIBRARY_PATH="${pkgdir}"/usr/lib:$LD_LIBRARY_PATH + make DESTDIR="${pkgdir}" INSTALLDIRS=vendor \ + swig_pydir=/usr/lib/python2.7/site-packages/libsvn \ + swig_pydir_extra=/usr/lib/python2.7/site-packages/svn \ + install install-swig-py install-swig-pl install-javahl # install-swig-rb + + install -d "${pkgdir}"/usr/share/subversion + cp -a tools/hook-scripts "${pkgdir}"/usr/share/subversion/ + rm -f "${pkgdir}"/usr/share/subversion/hook-scripts/*.in + + rm -f "${pkgdir}"/usr/lib/perl5/vendor_perl/auto/SVN/_Core/.packlist + rm -rf "${pkgdir}"/usr/lib/perl5/core_perl + + install -D -m 755 "${srcdir}"/svnserve "${pkgdir}"/etc/rc.d/svnserve + install -D -m 644 "${srcdir}"/svn "${pkgdir}"/etc/xinetd.d/svn + install -D -m 644 "${srcdir}"/svnserve.conf "${pkgdir}"/etc/conf.d/svnserve + + install -Dm 644 tools/client-side/bash_completion \ + "${pkgdir}"/usr/share/bash-completion/completions/subversion +} Copied: subversion/repos/testing-i686/subversion.rpath.fix.patch (from rev 155843, subversion/repos/staging-i686/subversion.rpath.fix.patch) =================================================================== --- testing-i686/subversion.rpath.fix.patch (rev 0) +++ testing-i686/subversion.rpath.fix.patch 2012-04-07 15:45:07 UTC (rev 155844) @@ -0,0 +1,10 @@ +--- Makefile.in.orig 2009-02-16 14:10:48.000000000 -0200 ++++ Makefile.in 2009-06-04 00:56:29.000000000 -0300 +@@ -678,6 +678,7 @@ + + $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL + cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL ++ cd $(SWIG_PL_DIR)/native; sed -i 's|LD_RUN_PATH|DIE_RPATH_DIE|g' Makefile{,.{client,delta,fs,ra,repos,wc}} + + swig-pl_DEPS = autogen-swig-pl libsvn_swig_perl \ + $(SWIG_PL_DIR)/native/Makefile Copied: subversion/repos/testing-i686/svn (from rev 155843, subversion/repos/staging-i686/svn) =================================================================== --- testing-i686/svn (rev 0) +++ testing-i686/svn 2012-04-07 15:45:07 UTC (rev 155844) @@ -0,0 +1,11 @@ +service svn +{ + flags = REUSE + socket_type = stream + wait = no + user = root + server = /usr/bin/svnserve + server_args = -i + log_on_failure += USERID + disable = yes +} Copied: subversion/repos/testing-i686/svnserve (from rev 155843, subversion/repos/staging-i686/svnserve) =================================================================== --- testing-i686/svnserve (rev 0) +++ testing-i686/svnserve 2012-04-07 15:45:07 UTC (rev 155844) @@ -0,0 +1,42 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/svnserve + +PID=`pidof -o %PPID /usr/bin/svnserve` +case "$1" in + start) + stat_busy "Starting svnserve" + if [ -z "$PID" ]; then + if [ -n "$SVNSERVE_USER" ]; then + su -s '/bin/sh' $SVNSERVE_USER -c "/usr/bin/svnserve -d $SVNSERVE_ARGS" & + else + /usr/bin/svnserve -d $SVNSERVE_ARGS & + fi + fi + if [ ! -z "$PID" -o $? -gt 0 ]; then + stat_fail + else + add_daemon svnserve + stat_done + fi + ;; + stop) + stat_busy "Stopping svnserve" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon svnserve + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac Copied: subversion/repos/testing-i686/svnserve.conf (from rev 155843, subversion/repos/staging-i686/svnserve.conf) =================================================================== --- testing-i686/svnserve.conf (rev 0) +++ testing-i686/svnserve.conf 2012-04-07 15:45:07 UTC (rev 155844) @@ -0,0 +1,7 @@ +# +# Parameters to be passed to svnserve +# +#SVNSERVE_ARGS="-r /path/to/some/repos" +SVNSERVE_ARGS="" + +#SVNSERVE_USER="svn"