Date: Thursday, August 1, 2013 @ 23:52:44 Author: angvp Revision: 191953
upgpkg: subversion 1.8.1-1 Version bump and fixes several bugs FS#36157 FS#36073 Modified: subversion/trunk/PKGBUILD ----------+ PKGBUILD | 62 ++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 33 insertions(+), 29 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-08-01 20:54:09 UTC (rev 191952) +++ PKGBUILD 2013-08-01 21:52:44 UTC (rev 191953) @@ -5,76 +5,80 @@ # Contributor: Jason Chu <[email protected]> pkgname=subversion -pkgver=1.8.0 +pkgver=1.8.1 pkgrel=1 pkgdesc="A Modern Concurrent Version Control System" arch=('i686' 'x86_64') +url="http://subversion.apache.org/"; license=('APACHE') -depends=('apr-util' 'sqlite' 'file' 'serf' 'systemd') -optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion' \ - 'python2: for some hook scripts' 'java-environment') #'ruby: for some hook scripts') -makedepends=('krb5' 'apache' 'python2' 'perl>=5.18' 'swig' 'java-runtime' 'java-environment' - 'autoconf' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs') +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' + 'kdeutils-kwallet: 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') -url="http://subversion.apache.org/"; -provides=('svn') options=('!makeflags' '!libtool' '!emptydirs') install=${pkgname}.install -source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2 #{,.asc} +source=(http://www.apache.org/dist/subversion/subversion-1.8.1.tar.bz2{,.asc} svn svnserve.conf svnserve.tmpfiles svnserve.service subversion.rpath.fix.patch) -md5sums=('f053a9948dfe5c70eff5c00509723214' +md5sums=('f2ee0471b8a560f5efa0f2349d9c9ab9' + 'SKIP' 'a0db6dd43af33952739b6ec089852630' 'c459e299192552f61578f3438abf0664' 'bb2857eceafcfac35dde39dcffad2314' 'e8020c7a1d1a0c47091b5fdd034f81c5' '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 "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} export PYTHON=/usr/bin/python2 - - #patch -Np0 -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 --without-neon --with-serf=/usr --with-apxs \ + --with-zlib=/usr --with-serf=/usr --with-apxs \ --with-sqlite=/usr --with-berkeley-db=:/usr/include/:/usr/lib:db-5.3 \ --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 external-all - make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all + 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 + 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 -#} +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 "${srcdir}/${pkgname}-${pkgver}" + 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 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 - rm "${pkgdir}"/usr/lib/perl5/vendor_perl/auto/SVN/_Core/.packlist - rm -r "${pkgdir}"/usr/lib/perl5/core_perl - ## svnserve ... # xinetd
