[arch-commits] Commit in subversion/trunk (3 files)
Eric Bélanger
eric at archlinux.org
Tue Dec 6 07:11:47 UTC 2011
Date: Tuesday, December 6, 2011 @ 02:11:46
Author: eric
Revision: 144460
upgpkg: subversion 1.7.2-1
Upstream update, Update license, Add file depends, Add missing hook scripts, Add python2 and ruby optdepends, Disable ruby bindings (need ruby <= 1.8), Clean up PKGBUILD, Remove old patches
Modified:
subversion/trunk/PKGBUILD
Deleted:
subversion/trunk/subversion-perl-bindings.patch
subversion/trunk/subversion.suppress.deprecation.warnings.patch
------------------------------------------------+
PKGBUILD | 99 +++++++++--------------
subversion-perl-bindings.patch | 12 --
subversion.suppress.deprecation.warnings.patch | 22 -----
3 files changed, 39 insertions(+), 94 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-12-06 06:52:26 UTC (rev 144459)
+++ PKGBUILD 2011-12-06 07:11:46 UTC (rev 144460)
@@ -3,98 +3,77 @@
# Contributor: Jason Chu <jason at archlinux.org>
pkgname=subversion
-pkgver=1.6.17
-pkgrel=7
+pkgver=1.7.2
+pkgrel=1
pkgdesc="A Modern Concurrent Version Control System"
arch=('i686' 'x86_64')
-license=('apache' 'bsd')
-depends=('neon' 'apr-util' 'sqlite3')
-optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion')
-makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'ruby' 'java-runtime' 'java-environment'
+license=('APACHE')
+depends=('neon' 'apr-util' 'sqlite3' 'file')
+optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion' \
+ 'python2: for some hook scripts' 'ruby: for some hook scripts')
+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')
-source=(http://subversion.tigris.org/downloads/$pkgname-$pkgver.tar.bz2
+source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2{,.asc}
svnserve svn svnserve.conf svnmerge.py
- subversion.rpath.fix.patch
- subversion.suppress.deprecation.warnings.patch
- subversion-perl-bindings.patch)
-md5sums=('81e5dc5beee4b3fc025ac70c0b6caa14'
- 'a2b029e8385007ffb99b437b30521c90'
- 'a0db6dd43af33952739b6ec089852630'
- 'c459e299192552f61578f3438abf0664'
- 'a6371baeda7e224504629ecdda2749b4'
- '6b4340ba9d8845cd8497e013ae01be3f'
- '1166f3b7413d7e7450299b3525680bbe'
- '0591aa39837931161b4d61ff35c7b147')
+ subversion.rpath.fix.patch)
+sha1sums=('8c0824aeb7f42da1ff4f7cd296877af7f59812bb'
+ '66293923ddc1b12a43b0e86f6b6a3c23b70df6ae'
+ '64ba3e6ebafc08ac62f59d788f7a825fdce69573'
+ '73b36c046c09cec2093354911c89e3ba8056af6c'
+ 'ad117bf3b2a838a9a678a93fd8db1a066ad46c41'
+ 'd240228e5755495c26e89d7ef47a75fb097dd040'
+ '3d1e28408a9abb42af2e531adc0d01ce21acfad6')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
-
export PYTHON=/usr/bin/python2
- # apply patches
- patch -Np0 -i ../subversion.rpath.fix.patch
- patch -Np1 -i ../subversion.suppress.deprecation.warnings.patch
- patch -Np1 -i ../subversion-perl-bindings.patch
+ 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
- autoreconf
./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.2 \
--enable-javahl --with-gnome-keyring --with-kwallet
- # build
- (make external-all && make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all )
+ 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 CLEANUP=yes
+# make check check-swig-pl check-swig-py check-javahl CLEANUP=yes # check-swig-rb
#}
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
- # install
- export LD_LIBRARY_PATH=${pkgdir}/usr/lib:$LD_LIBRARY_PATH
- make DESTDIR=${pkgdir} install
+ 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
- make DESTDIR=${pkgdir} swig-py
- make install-swig-py DESTDIR=${pkgdir}
+ install -d "${pkgdir}"/usr/share/subversion
+ cp -a tools/hook-scripts "${pkgdir}"/usr/share/subversion/
+ rm -f "${pkgdir}"/usr/share/subversion/hook-scripts/*.in
- install -d ${pkgdir}/usr/lib/python2.7
- mv ${pkgdir}/usr/lib/svn-python/ ${pkgdir}/usr/lib/python2.7/site-packages
+ rm -f "${pkgdir}"/usr/lib/perl5/vendor_perl/auto/SVN/_Core/.packlist
+ rm -rf "${pkgdir}"/usr/lib/perl5/core_perl
- install -d ${pkgdir}/usr/share/subversion
- install -d -m 755 tools/hook-scripts ${pkgdir}/usr/share/subversion/
- rm -f ${pkgdir}/usr/share/subversion/hook-scripts/*.in
+ 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 -m 755 "${srcdir}"/svnmerge.py "${pkgdir}"/usr/bin/svnmerge
- make DESTDIR=${pkgdir} swig-pl
- make install-swig-pl DESTDIR=${pkgdir} INSTALLDIRS=vendor
- rm -f ${pkgdir}/usr/lib/perl5/vendor_perl/auto/SVN/_Core/.packlist
- rm -rf ${pkgdir}/usr/lib/perl5/core_perl
-
- make DESTDIR=${pkgdir} swig-rb
- make install-swig-rb DESTDIR=${pkgdir}
-
- make DESTDIR=${pkgdir} javahl
- make DESTDIR=${pkgdir} install-javahl
-
- install -d ${pkgdir}/etc/{rc.d,xinetd.d,conf.d}
-
- 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}/svnmerge.py ${pkgdir}/usr/bin/svnmerge
- install -D -m 644 ${srcdir}/subversion-$pkgver/COPYING \
- ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
-
# bash completion
- install -Dm 644 ${srcdir}/${pkgname}-${pkgver}/tools/client-side/bash_completion \
- ${pkgdir}/etc/bash_completion.d/subversion
+ install -Dm 644 tools/client-side/bash_completion \
+ "${pkgdir}"/etc/bash_completion.d/subversion
}
Deleted: subversion-perl-bindings.patch
===================================================================
--- subversion-perl-bindings.patch 2011-12-06 06:52:26 UTC (rev 144459)
+++ subversion-perl-bindings.patch 2011-12-06 07:11:46 UTC (rev 144460)
@@ -1,12 +0,0 @@
-diff -Naur subversion-1.6.17.ori/subversion/bindings/swig/perl/native/Makefile.PL.in subversion-1.6.17/subversion/bindings/swig/perl/native/Makefile.PL.in
---- subversion-1.6.17.ori/subversion/bindings/swig/perl/native/Makefile.PL.in 2010-11-24 20:42:16.000000000 +0000
-+++ subversion-1.6.17/subversion/bindings/swig/perl/native/Makefile.PL.in 2011-07-01 20:16:16.520892074 +0000
-@@ -43,7 +43,7 @@
- my %config = (
- ABSTRACT => 'Perl bindings for Subversion',
- DEFINE => $cppflags,
-- CCFLAGS => $cflags,
-+ CCFLAGS => $Config{ccflags},
- INC => join(' ',$apr_cflags, $apu_cflags,
- " -I$swig_srcdir/perl/libsvn_swig_perl",
- " -I$svnlib_srcdir/include",
Deleted: subversion.suppress.deprecation.warnings.patch
===================================================================
--- subversion.suppress.deprecation.warnings.patch 2011-12-06 06:52:26 UTC (rev 144459)
+++ subversion.suppress.deprecation.warnings.patch 2011-12-06 07:11:46 UTC (rev 144460)
@@ -1,22 +0,0 @@
-diff -urN subversion-1.6.9/subversion/bindings/swig/python/svn/core.py subversion-1.6.9-fixed/subversion/bindings/swig/python/svn/core.py
---- subversion-1.6.9/subversion/bindings/swig/python/svn/core.py 2009-02-13 11:22:26.000000000 -0500
-+++ subversion-1.6.9-fixed/subversion/bindings/swig/python/svn/core.py 2010-02-08 07:46:29.000000000 -0500
-@@ -19,6 +19,7 @@
- from libsvn.core import *
- import libsvn.core as _libsvncore
- import atexit as _atexit
-+import warnings
-
- class SubversionException(Exception):
- def __init__(self, message=None, apr_err=None, child=None,
-@@ -44,7 +45,9 @@
- Exception.__init__(self, *args)
-
- self.apr_err = apr_err
-- self.message = message
-+ with warnings.catch_warnings():
-+ warnings.simplefilter("ignore", DeprecationWarning)
-+ self.message = message
- self.child = child
- self.file = file
- self.line = line
More information about the arch-commits
mailing list