Date: Tuesday, December 16, 2014 @ 06:09:05 Author: fyan Revision: 227636
archrelease: copy trunk to extra-i686, extra-x86_64 Added: subversion/repos/extra-i686/PKGBUILD (from rev 227635, subversion/trunk/PKGBUILD) subversion/repos/extra-i686/subversion.install (from rev 227635, subversion/trunk/subversion.install) subversion/repos/extra-i686/subversion.rpath.fix.patch (from rev 227635, subversion/trunk/subversion.rpath.fix.patch) subversion/repos/extra-i686/svn (from rev 227635, subversion/trunk/svn) subversion/repos/extra-i686/svnserve.conf (from rev 227635, subversion/trunk/svnserve.conf) subversion/repos/extra-i686/svnserve.service (from rev 227635, subversion/trunk/svnserve.service) subversion/repos/extra-i686/svnserve.tmpfiles (from rev 227635, subversion/trunk/svnserve.tmpfiles) subversion/repos/extra-x86_64/PKGBUILD (from rev 227635, subversion/trunk/PKGBUILD) subversion/repos/extra-x86_64/subversion.install (from rev 227635, subversion/trunk/subversion.install) subversion/repos/extra-x86_64/subversion.rpath.fix.patch (from rev 227635, subversion/trunk/subversion.rpath.fix.patch) subversion/repos/extra-x86_64/svn (from rev 227635, subversion/trunk/svn) subversion/repos/extra-x86_64/svnserve.conf (from rev 227635, subversion/trunk/svnserve.conf) subversion/repos/extra-x86_64/svnserve.service (from rev 227635, subversion/trunk/svnserve.service) subversion/repos/extra-x86_64/svnserve.tmpfiles (from rev 227635, subversion/trunk/svnserve.tmpfiles) Deleted: subversion/repos/extra-i686/PKGBUILD subversion/repos/extra-i686/subversion.install subversion/repos/extra-i686/subversion.rpath.fix.patch subversion/repos/extra-i686/svn subversion/repos/extra-i686/svnserve.conf subversion/repos/extra-i686/svnserve.service subversion/repos/extra-i686/svnserve.tmpfiles subversion/repos/extra-x86_64/PKGBUILD subversion/repos/extra-x86_64/subversion.install subversion/repos/extra-x86_64/subversion.rpath.fix.patch subversion/repos/extra-x86_64/svn subversion/repos/extra-x86_64/svnserve.conf subversion/repos/extra-x86_64/svnserve.service subversion/repos/extra-x86_64/svnserve.tmpfiles -----------------------------------------+ /PKGBUILD | 206 ++++++++++++++++++++++++++++++ /subversion.install | 14 ++ /subversion.rpath.fix.patch | 20 ++ /svn | 22 +++ /svnserve.conf | 10 + /svnserve.service | 22 +++ /svnserve.tmpfiles | 2 extra-i686/PKGBUILD | 101 -------------- extra-i686/subversion.install | 7 - extra-i686/subversion.rpath.fix.patch | 10 - extra-i686/svn | 11 - extra-i686/svnserve.conf | 5 extra-i686/svnserve.service | 11 - extra-i686/svnserve.tmpfiles | 1 extra-x86_64/PKGBUILD | 101 -------------- extra-x86_64/subversion.install | 7 - extra-x86_64/subversion.rpath.fix.patch | 10 - extra-x86_64/svn | 11 - extra-x86_64/svnserve.conf | 5 extra-x86_64/svnserve.service | 11 - extra-x86_64/svnserve.tmpfiles | 1 21 files changed, 296 insertions(+), 292 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2014-12-16 05:07:55 UTC (rev 227635) +++ extra-i686/PKGBUILD 2014-12-16 05:09:05 UTC (rev 227636) @@ -1,101 +0,0 @@ -# $Id$ -# Maintainer: Angel Velasquez <an...@archlinux.org> -# Maintainer: Felix Yan <felixonm...@gmail.com> -# Contributor: Stéphane Gaudreault <steph...@archlinux.org> -# Contributor: Paul Mattal <p...@archlinux.org> -# Contributor: Jason Chu <ja...@archlinux.org> - -pkgname=subversion -pkgver=1.8.10 -pkgrel=1 -pkgdesc="A Modern Concurrent Version Control System" -arch=('i686' 'x86_64') -url="http://subversion.apache.org/" -license=('APACHE') -depends=('sqlite' 'file' 'serf' 'systemd') -makedepends=('apache' 'python2' 'perl' 'swig' 'java-runtime' 'java-environment' - 'libgnome-keyring' 'kdelibs' 'ruby') -optdepends=('libgnome-keyring: for GNOME Keyring for auth credentials' - 'kdebase-runtime: for KWallet for auth credentials' - 'bash-completion: for svn bash completion' - 'python2: for some hook scripts' - 'java-environment: for Java support' - 'ruby: for some hook scripts') -provides=('svn') -backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve') -options=('!makeflags' '!emptydirs') -install=${pkgname}.install -source=(http://www.apache.org/dist/subversion/subversion-${pkgver}.tar.bz2{,.asc} - svn - svnserve.conf - svnserve.tmpfiles - svnserve.service - subversion.rpath.fix.patch) -md5sums=('3068256761b40863df96128834d6b71b' - 'SKIP' - 'a0db6dd43af33952739b6ec089852630' - 'af1dd703cc28e61d2e2a132ce3eec37a' - 'bb2857eceafcfac35dde39dcffad2314' - '733011145b8a8e74baf4c9fc9197b3e8' - '6b4340ba9d8845cd8497e013ae01be3f') - -prepare() { - cd ${pkgname}-${pkgver} - patch -Np0 -i ../subversion.rpath.fix.patch - sed -i 's|/usr/bin/env python|/usr/bin/env python2|' tools/hook-scripts/{,mailer/{,tests/}}*.py -} - -build() { - cd ${pkgname}-${pkgver} - export PYTHON=/usr/bin/python2 - ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \ - --with-zlib=/usr --with-serf=/usr --with-apxs \ - --with-sqlite=/usr \ - --enable-javahl --with-gnome-keyring --with-kwallet \ - --with-apache-libexecdir=/usr/lib/httpd/modules \ - --with-ruby-sitedir=/usr/lib/ruby/vendor_ruby \ - --disable-static - - make LT_LDFLAGS="-L$Fdestdir/usr/lib" - 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 ${pkgname}-${pkgver} - export LANG=C LC_ALL=C - make check check-swig-pl check-swig-py check-swig-rb CLEANUP=yes # check-javahl -} - -package() { - cd ${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 -dm755 "${pkgdir}"/usr/share/subversion - cp -a tools/hook-scripts "${pkgdir}"/usr/share/subversion/ - rm "${pkgdir}"/usr/share/subversion/hook-scripts/*.in - - ## svnserve ... - - # xinetd - install -D -m 644 "${srcdir}"/svn "${pkgdir}"/etc/xinetd.d/svn - - # ... systemd - install -D -m 644 "${srcdir}"/svnserve.service "${pkgdir}"/usr/lib/systemd/system/svnserve.service - install -D -m 644 "${srcdir}"/svnserve.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/svnserve.conf - - # ... common config - 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 - for i in svn svnadmin svndumpfilter svnlook svnsync svnversion; do - ln -sf subversion "${pkgdir}"/usr/share/bash-completion/completions/${i} - done -} - Copied: subversion/repos/extra-i686/PKGBUILD (from rev 227635, subversion/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2014-12-16 05:09:05 UTC (rev 227636) @@ -0,0 +1,103 @@ +# $Id$ +# Maintainer: Angel Velasquez <an...@archlinux.org> +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Stéphane Gaudreault <steph...@archlinux.org> +# Contributor: Paul Mattal <p...@archlinux.org> +# Contributor: Jason Chu <ja...@archlinux.org> + +pkgname=subversion +pkgver=1.8.11 +pkgrel=1 +pkgdesc="A Modern Concurrent Version Control System" +arch=('i686' 'x86_64') +url="http://subversion.apache.org/" +license=('APACHE') +depends=('sqlite' 'file' 'serf' 'systemd') +makedepends=('apache' 'python2' 'perl' 'swig' 'java-environment' + 'libgnome-keyring' 'kdelibs' 'ruby') +optdepends=('libgnome-keyring: for GNOME Keyring for auth credentials' + 'kdebase-runtime: for KWallet for auth credentials' + 'bash-completion: for svn bash completion' + 'python2: for some hook scripts' + 'java-environment: for Java support' + 'ruby: for some hook scripts') +provides=('svn') +backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve') +options=('!makeflags' '!emptydirs') +install=${pkgname}.install +source=(http://www.apache.org/dist/subversion/subversion-${pkgver}.tar.bz2{,.asc} + svn + svnserve.conf + svnserve.tmpfiles + svnserve.service + subversion.rpath.fix.patch) +md5sums=('766a89bbbb388f8eb76166672d3b9e49' + 'SKIP' + 'a0db6dd43af33952739b6ec089852630' + 'af1dd703cc28e61d2e2a132ce3eec37a' + 'bb2857eceafcfac35dde39dcffad2314' + '733011145b8a8e74baf4c9fc9197b3e8' + '6b4340ba9d8845cd8497e013ae01be3f') +validpgpkeys=('19BBCAEF7B19B280A0E2175E62D48FAD16A0DE01') # Ben Reser + +prepare() { + cd ${pkgname}-${pkgver} + patch -Np0 -i ../subversion.rpath.fix.patch + sed -i 's|/usr/bin/env python|/usr/bin/env python2|' tools/hook-scripts/{,mailer/{,tests/}}*.py +} + +build() { + cd ${pkgname}-${pkgver} + export PYTHON=/usr/bin/python2 + ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \ + --with-zlib=/usr --with-serf=/usr --with-apxs \ + --with-sqlite=/usr \ + --enable-javahl --with-jdk=/usr/lib/jvm/default \ + --with-gnome-keyring --with-kwallet \ + --with-apache-libexecdir=/usr/lib/httpd/modules \ + --with-ruby-sitedir=/usr/lib/ruby/vendor_ruby \ + --disable-static + + make LT_LDFLAGS="-L$Fdestdir/usr/lib" + 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 ${pkgname}-${pkgver} + export LANG=C LC_ALL=C + make check check-swig-pl check-swig-py check-swig-rb CLEANUP=yes # check-javahl +} + +package() { + cd ${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 -dm755 "${pkgdir}"/usr/share/subversion + cp -a tools/hook-scripts "${pkgdir}"/usr/share/subversion/ + rm "${pkgdir}"/usr/share/subversion/hook-scripts/*.in + + ## svnserve ... + + # xinetd + install -D -m 644 "${srcdir}"/svn "${pkgdir}"/etc/xinetd.d/svn + + # ... systemd + install -D -m 644 "${srcdir}"/svnserve.service "${pkgdir}"/usr/lib/systemd/system/svnserve.service + install -D -m 644 "${srcdir}"/svnserve.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/svnserve.conf + + # ... common config + 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 + for i in svn svnadmin svndumpfilter svnlook svnsync svnversion; do + ln -sf subversion "${pkgdir}"/usr/share/bash-completion/completions/${i} + done +} + Deleted: extra-i686/subversion.install =================================================================== --- extra-i686/subversion.install 2014-12-16 05:07:55 UTC (rev 227635) +++ extra-i686/subversion.install 2014-12-16 05:09:05 UTC (rev 227636) @@ -1,7 +0,0 @@ -post_install() { - usr/bin/systemd-tmpfiles --create svnserve.conf || true -} - -post_upgrade() { - post_install -} Copied: subversion/repos/extra-i686/subversion.install (from rev 227635, subversion/trunk/subversion.install) =================================================================== --- extra-i686/subversion.install (rev 0) +++ extra-i686/subversion.install 2014-12-16 05:09:05 UTC (rev 227636) @@ -0,0 +1,7 @@ +post_install() { + usr/bin/systemd-tmpfiles --create svnserve.conf || true +} + +post_upgrade() { + post_install +} Deleted: extra-i686/subversion.rpath.fix.patch =================================================================== --- extra-i686/subversion.rpath.fix.patch 2014-12-16 05:07:55 UTC (rev 227635) +++ extra-i686/subversion.rpath.fix.patch 2014-12-16 05:09:05 UTC (rev 227636) @@ -1,10 +0,0 @@ ---- 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/extra-i686/subversion.rpath.fix.patch (from rev 227635, subversion/trunk/subversion.rpath.fix.patch) =================================================================== --- extra-i686/subversion.rpath.fix.patch (rev 0) +++ extra-i686/subversion.rpath.fix.patch 2014-12-16 05:09:05 UTC (rev 227636) @@ -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 Deleted: extra-i686/svn =================================================================== --- extra-i686/svn 2014-12-16 05:07:55 UTC (rev 227635) +++ extra-i686/svn 2014-12-16 05:09:05 UTC (rev 227636) @@ -1,11 +0,0 @@ -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/extra-i686/svn (from rev 227635, subversion/trunk/svn) =================================================================== --- extra-i686/svn (rev 0) +++ extra-i686/svn 2014-12-16 05:09:05 UTC (rev 227636) @@ -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 +} Deleted: extra-i686/svnserve.conf =================================================================== --- extra-i686/svnserve.conf 2014-12-16 05:07:55 UTC (rev 227635) +++ extra-i686/svnserve.conf 2014-12-16 05:09:05 UTC (rev 227636) @@ -1,5 +0,0 @@ -# -# Parameters to be passed to svnserve -# -#SVNSERVE_ARGS="-r /path/to/some/repos" -SVNSERVE_ARGS="" Copied: subversion/repos/extra-i686/svnserve.conf (from rev 227635, subversion/trunk/svnserve.conf) =================================================================== --- extra-i686/svnserve.conf (rev 0) +++ extra-i686/svnserve.conf 2014-12-16 05:09:05 UTC (rev 227636) @@ -0,0 +1,5 @@ +# +# Parameters to be passed to svnserve +# +#SVNSERVE_ARGS="-r /path/to/some/repos" +SVNSERVE_ARGS="" Deleted: extra-i686/svnserve.service =================================================================== --- extra-i686/svnserve.service 2014-12-16 05:07:55 UTC (rev 227635) +++ extra-i686/svnserve.service 2014-12-16 05:09:05 UTC (rev 227636) @@ -1,11 +0,0 @@ -[Unit] -Description=Subversion protocol daemon -After=syslog.target network.target - -[Service] -Type=forking -EnvironmentFile=/etc/conf.d/svnserve -ExecStart=/usr/bin/svnserve --daemon $SVNSERVE_ARGS - -[Install] -WantedBy=multi-user.target Copied: subversion/repos/extra-i686/svnserve.service (from rev 227635, subversion/trunk/svnserve.service) =================================================================== --- extra-i686/svnserve.service (rev 0) +++ extra-i686/svnserve.service 2014-12-16 05:09:05 UTC (rev 227636) @@ -0,0 +1,11 @@ +[Unit] +Description=Subversion protocol daemon +After=syslog.target network.target + +[Service] +Type=forking +EnvironmentFile=/etc/conf.d/svnserve +ExecStart=/usr/bin/svnserve --daemon $SVNSERVE_ARGS + +[Install] +WantedBy=multi-user.target Deleted: extra-i686/svnserve.tmpfiles =================================================================== --- extra-i686/svnserve.tmpfiles 2014-12-16 05:07:55 UTC (rev 227635) +++ extra-i686/svnserve.tmpfiles 2014-12-16 05:09:05 UTC (rev 227636) @@ -1 +0,0 @@ -D /run/svnserve 0700 root root - Copied: subversion/repos/extra-i686/svnserve.tmpfiles (from rev 227635, subversion/trunk/svnserve.tmpfiles) =================================================================== --- extra-i686/svnserve.tmpfiles (rev 0) +++ extra-i686/svnserve.tmpfiles 2014-12-16 05:09:05 UTC (rev 227636) @@ -0,0 +1 @@ +D /run/svnserve 0700 root root - Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2014-12-16 05:07:55 UTC (rev 227635) +++ extra-x86_64/PKGBUILD 2014-12-16 05:09:05 UTC (rev 227636) @@ -1,101 +0,0 @@ -# $Id$ -# Maintainer: Angel Velasquez <an...@archlinux.org> -# Maintainer: Felix Yan <felixonm...@gmail.com> -# Contributor: Stéphane Gaudreault <steph...@archlinux.org> -# Contributor: Paul Mattal <p...@archlinux.org> -# Contributor: Jason Chu <ja...@archlinux.org> - -pkgname=subversion -pkgver=1.8.10 -pkgrel=1 -pkgdesc="A Modern Concurrent Version Control System" -arch=('i686' 'x86_64') -url="http://subversion.apache.org/" -license=('APACHE') -depends=('sqlite' 'file' 'serf' 'systemd') -makedepends=('apache' 'python2' 'perl' 'swig' 'java-runtime' 'java-environment' - 'libgnome-keyring' 'kdelibs' 'ruby') -optdepends=('libgnome-keyring: for GNOME Keyring for auth credentials' - 'kdebase-runtime: for KWallet for auth credentials' - 'bash-completion: for svn bash completion' - 'python2: for some hook scripts' - 'java-environment: for Java support' - 'ruby: for some hook scripts') -provides=('svn') -backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve') -options=('!makeflags' '!emptydirs') -install=${pkgname}.install -source=(http://www.apache.org/dist/subversion/subversion-${pkgver}.tar.bz2{,.asc} - svn - svnserve.conf - svnserve.tmpfiles - svnserve.service - subversion.rpath.fix.patch) -md5sums=('3068256761b40863df96128834d6b71b' - 'SKIP' - 'a0db6dd43af33952739b6ec089852630' - 'af1dd703cc28e61d2e2a132ce3eec37a' - 'bb2857eceafcfac35dde39dcffad2314' - '733011145b8a8e74baf4c9fc9197b3e8' - '6b4340ba9d8845cd8497e013ae01be3f') - -prepare() { - cd ${pkgname}-${pkgver} - patch -Np0 -i ../subversion.rpath.fix.patch - sed -i 's|/usr/bin/env python|/usr/bin/env python2|' tools/hook-scripts/{,mailer/{,tests/}}*.py -} - -build() { - cd ${pkgname}-${pkgver} - export PYTHON=/usr/bin/python2 - ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \ - --with-zlib=/usr --with-serf=/usr --with-apxs \ - --with-sqlite=/usr \ - --enable-javahl --with-gnome-keyring --with-kwallet \ - --with-apache-libexecdir=/usr/lib/httpd/modules \ - --with-ruby-sitedir=/usr/lib/ruby/vendor_ruby \ - --disable-static - - make LT_LDFLAGS="-L$Fdestdir/usr/lib" - 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 ${pkgname}-${pkgver} - export LANG=C LC_ALL=C - make check check-swig-pl check-swig-py check-swig-rb CLEANUP=yes # check-javahl -} - -package() { - cd ${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 -dm755 "${pkgdir}"/usr/share/subversion - cp -a tools/hook-scripts "${pkgdir}"/usr/share/subversion/ - rm "${pkgdir}"/usr/share/subversion/hook-scripts/*.in - - ## svnserve ... - - # xinetd - install -D -m 644 "${srcdir}"/svn "${pkgdir}"/etc/xinetd.d/svn - - # ... systemd - install -D -m 644 "${srcdir}"/svnserve.service "${pkgdir}"/usr/lib/systemd/system/svnserve.service - install -D -m 644 "${srcdir}"/svnserve.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/svnserve.conf - - # ... common config - 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 - for i in svn svnadmin svndumpfilter svnlook svnsync svnversion; do - ln -sf subversion "${pkgdir}"/usr/share/bash-completion/completions/${i} - done -} - Copied: subversion/repos/extra-x86_64/PKGBUILD (from rev 227635, subversion/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2014-12-16 05:09:05 UTC (rev 227636) @@ -0,0 +1,103 @@ +# $Id$ +# Maintainer: Angel Velasquez <an...@archlinux.org> +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Stéphane Gaudreault <steph...@archlinux.org> +# Contributor: Paul Mattal <p...@archlinux.org> +# Contributor: Jason Chu <ja...@archlinux.org> + +pkgname=subversion +pkgver=1.8.11 +pkgrel=1 +pkgdesc="A Modern Concurrent Version Control System" +arch=('i686' 'x86_64') +url="http://subversion.apache.org/" +license=('APACHE') +depends=('sqlite' 'file' 'serf' 'systemd') +makedepends=('apache' 'python2' 'perl' 'swig' 'java-environment' + 'libgnome-keyring' 'kdelibs' 'ruby') +optdepends=('libgnome-keyring: for GNOME Keyring for auth credentials' + 'kdebase-runtime: for KWallet for auth credentials' + 'bash-completion: for svn bash completion' + 'python2: for some hook scripts' + 'java-environment: for Java support' + 'ruby: for some hook scripts') +provides=('svn') +backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve') +options=('!makeflags' '!emptydirs') +install=${pkgname}.install +source=(http://www.apache.org/dist/subversion/subversion-${pkgver}.tar.bz2{,.asc} + svn + svnserve.conf + svnserve.tmpfiles + svnserve.service + subversion.rpath.fix.patch) +md5sums=('766a89bbbb388f8eb76166672d3b9e49' + 'SKIP' + 'a0db6dd43af33952739b6ec089852630' + 'af1dd703cc28e61d2e2a132ce3eec37a' + 'bb2857eceafcfac35dde39dcffad2314' + '733011145b8a8e74baf4c9fc9197b3e8' + '6b4340ba9d8845cd8497e013ae01be3f') +validpgpkeys=('19BBCAEF7B19B280A0E2175E62D48FAD16A0DE01') # Ben Reser + +prepare() { + cd ${pkgname}-${pkgver} + patch -Np0 -i ../subversion.rpath.fix.patch + sed -i 's|/usr/bin/env python|/usr/bin/env python2|' tools/hook-scripts/{,mailer/{,tests/}}*.py +} + +build() { + cd ${pkgname}-${pkgver} + export PYTHON=/usr/bin/python2 + ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \ + --with-zlib=/usr --with-serf=/usr --with-apxs \ + --with-sqlite=/usr \ + --enable-javahl --with-jdk=/usr/lib/jvm/default \ + --with-gnome-keyring --with-kwallet \ + --with-apache-libexecdir=/usr/lib/httpd/modules \ + --with-ruby-sitedir=/usr/lib/ruby/vendor_ruby \ + --disable-static + + make LT_LDFLAGS="-L$Fdestdir/usr/lib" + 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 ${pkgname}-${pkgver} + export LANG=C LC_ALL=C + make check check-swig-pl check-swig-py check-swig-rb CLEANUP=yes # check-javahl +} + +package() { + cd ${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 -dm755 "${pkgdir}"/usr/share/subversion + cp -a tools/hook-scripts "${pkgdir}"/usr/share/subversion/ + rm "${pkgdir}"/usr/share/subversion/hook-scripts/*.in + + ## svnserve ... + + # xinetd + install -D -m 644 "${srcdir}"/svn "${pkgdir}"/etc/xinetd.d/svn + + # ... systemd + install -D -m 644 "${srcdir}"/svnserve.service "${pkgdir}"/usr/lib/systemd/system/svnserve.service + install -D -m 644 "${srcdir}"/svnserve.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/svnserve.conf + + # ... common config + 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 + for i in svn svnadmin svndumpfilter svnlook svnsync svnversion; do + ln -sf subversion "${pkgdir}"/usr/share/bash-completion/completions/${i} + done +} + Deleted: extra-x86_64/subversion.install =================================================================== --- extra-x86_64/subversion.install 2014-12-16 05:07:55 UTC (rev 227635) +++ extra-x86_64/subversion.install 2014-12-16 05:09:05 UTC (rev 227636) @@ -1,7 +0,0 @@ -post_install() { - usr/bin/systemd-tmpfiles --create svnserve.conf || true -} - -post_upgrade() { - post_install -} Copied: subversion/repos/extra-x86_64/subversion.install (from rev 227635, subversion/trunk/subversion.install) =================================================================== --- extra-x86_64/subversion.install (rev 0) +++ extra-x86_64/subversion.install 2014-12-16 05:09:05 UTC (rev 227636) @@ -0,0 +1,7 @@ +post_install() { + usr/bin/systemd-tmpfiles --create svnserve.conf || true +} + +post_upgrade() { + post_install +} Deleted: extra-x86_64/subversion.rpath.fix.patch =================================================================== --- extra-x86_64/subversion.rpath.fix.patch 2014-12-16 05:07:55 UTC (rev 227635) +++ extra-x86_64/subversion.rpath.fix.patch 2014-12-16 05:09:05 UTC (rev 227636) @@ -1,10 +0,0 @@ ---- 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/extra-x86_64/subversion.rpath.fix.patch (from rev 227635, subversion/trunk/subversion.rpath.fix.patch) =================================================================== --- extra-x86_64/subversion.rpath.fix.patch (rev 0) +++ extra-x86_64/subversion.rpath.fix.patch 2014-12-16 05:09:05 UTC (rev 227636) @@ -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 Deleted: extra-x86_64/svn =================================================================== --- extra-x86_64/svn 2014-12-16 05:07:55 UTC (rev 227635) +++ extra-x86_64/svn 2014-12-16 05:09:05 UTC (rev 227636) @@ -1,11 +0,0 @@ -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/extra-x86_64/svn (from rev 227635, subversion/trunk/svn) =================================================================== --- extra-x86_64/svn (rev 0) +++ extra-x86_64/svn 2014-12-16 05:09:05 UTC (rev 227636) @@ -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 +} Deleted: extra-x86_64/svnserve.conf =================================================================== --- extra-x86_64/svnserve.conf 2014-12-16 05:07:55 UTC (rev 227635) +++ extra-x86_64/svnserve.conf 2014-12-16 05:09:05 UTC (rev 227636) @@ -1,5 +0,0 @@ -# -# Parameters to be passed to svnserve -# -#SVNSERVE_ARGS="-r /path/to/some/repos" -SVNSERVE_ARGS="" Copied: subversion/repos/extra-x86_64/svnserve.conf (from rev 227635, subversion/trunk/svnserve.conf) =================================================================== --- extra-x86_64/svnserve.conf (rev 0) +++ extra-x86_64/svnserve.conf 2014-12-16 05:09:05 UTC (rev 227636) @@ -0,0 +1,5 @@ +# +# Parameters to be passed to svnserve +# +#SVNSERVE_ARGS="-r /path/to/some/repos" +SVNSERVE_ARGS="" Deleted: extra-x86_64/svnserve.service =================================================================== --- extra-x86_64/svnserve.service 2014-12-16 05:07:55 UTC (rev 227635) +++ extra-x86_64/svnserve.service 2014-12-16 05:09:05 UTC (rev 227636) @@ -1,11 +0,0 @@ -[Unit] -Description=Subversion protocol daemon -After=syslog.target network.target - -[Service] -Type=forking -EnvironmentFile=/etc/conf.d/svnserve -ExecStart=/usr/bin/svnserve --daemon $SVNSERVE_ARGS - -[Install] -WantedBy=multi-user.target Copied: subversion/repos/extra-x86_64/svnserve.service (from rev 227635, subversion/trunk/svnserve.service) =================================================================== --- extra-x86_64/svnserve.service (rev 0) +++ extra-x86_64/svnserve.service 2014-12-16 05:09:05 UTC (rev 227636) @@ -0,0 +1,11 @@ +[Unit] +Description=Subversion protocol daemon +After=syslog.target network.target + +[Service] +Type=forking +EnvironmentFile=/etc/conf.d/svnserve +ExecStart=/usr/bin/svnserve --daemon $SVNSERVE_ARGS + +[Install] +WantedBy=multi-user.target Deleted: extra-x86_64/svnserve.tmpfiles =================================================================== --- extra-x86_64/svnserve.tmpfiles 2014-12-16 05:07:55 UTC (rev 227635) +++ extra-x86_64/svnserve.tmpfiles 2014-12-16 05:09:05 UTC (rev 227636) @@ -1 +0,0 @@ -D /run/svnserve 0700 root root - Copied: subversion/repos/extra-x86_64/svnserve.tmpfiles (from rev 227635, subversion/trunk/svnserve.tmpfiles) =================================================================== --- extra-x86_64/svnserve.tmpfiles (rev 0) +++ extra-x86_64/svnserve.tmpfiles 2014-12-16 05:09:05 UTC (rev 227636) @@ -0,0 +1 @@ +D /run/svnserve 0700 root root -