subversion: rebuild against perl-5.16; fix version in libsvn shlibs.

This commit is contained in:
Juan RP 2012-05-27 12:28:21 +02:00
parent 8866e62c0b
commit 3a2e5bf971
11 changed files with 47 additions and 62 deletions

View file

@ -663,23 +663,23 @@ libSDL_net-1.2.so.0 SDL_net-1.2.7
libmodplug.so.1 libmodplug-0.8.8 libmodplug.so.1 libmodplug-0.8.8
libfetch.so libfetch-2.33 libfetch.so libfetch-2.33
libneon.so.27 neon-0.29.5 libneon.so.27 neon-0.29.5
libsvn_subr-1.so.0 libsvn-0.29.5 libsvn_subr-1.so.0 libsvn-1.7.5
libsvn_diff-1.so.0 libsvn-0.29.5 libsvn_diff-1.so.0 libsvn-1.7.5
libsvn_client-1.so.0 libsvn-0.29.5 libsvn_client-1.so.0 libsvn-1.7.5
libsvn_delta-1.so.0 libsvn-0.29.5 libsvn_delta-1.so.0 libsvn-1.7.5
libsvn_fs-1.so.0 libsvn-0.29.5 libsvn_fs-1.so.0 libsvn-1.7.5
libsvn_ra-1.so.0 libsvn-0.29.5 libsvn_ra-1.so.0 libsvn-1.7.5
libsvn_repos-1.so.0 libsvn-0.29.5 libsvn_repos-1.so.0 libsvn-1.7.5
libsvn_wc-1.so.0 libsvn-0.29.5 libsvn_wc-1.so.0 libsvn-1.7.5
libsvn_fs_util-1.so.0 libsvn-0.29.5 libsvn_fs_util-1.so.0 libsvn-1.7.5
libsvn_ra_svn-1.so.0 libsvn-0.29.5 libsvn_ra_svn-1.so.0 libsvn-1.7.5
libsvn_fs_fs-1.so.0 libsvn-0.29.5 libsvn_fs_fs-1.so.0 libsvn-1.7.5
libsvn_fs_base-1.so.0 libsvn-0.29.5 libsvn_fs_base-1.so.0 libsvn-1.7.5
libsvn_ra_local-1.so.0 libsvn-0.29.5 libsvn_ra_local-1.so.0 libsvn-1.7.5
libsvn_ra_neon-1.so.0 libsvn-0.29.5 libsvn_ra_neon-1.so.0 libsvn-1.7.5
libsvn_swig_py-1.so.0 subversion-python-0.29.5 libsvn_swig_py-1.so.0 subversion-python-1.7.5
libsvn_swig_perl-1.so.0 subversion-perl-0.29.5 libsvn_swig_perl-1.so.0 subversion-perl-1.7.5
libsvn_swig_ruby-1.so.0 subversion-ruby-0.29.5 libsvn_swig_ruby-1.so.0 subversion-ruby-1.7.5
libjson-glib-1.0.so.0 json-glib-0.12.2 libjson-glib-1.0.so.0 json-glib-0.12.2
liblxc.so.0 liblxc-0.7.3 liblxc.so.0 liblxc-0.7.3
libvirt.so.0 libvirt-0.8.7 libvirt.so.0 libvirt-0.8.7

View file

@ -3,7 +3,6 @@ libdb-4.8.so
libexpat.so.1 libexpat.so.1
libapr-1.so.0 libapr-1.so.0
libpthread.so.0 libpthread.so.0
libdl.so.2
libz.so.1 libz.so.1
libsqlite3.so.0 libsqlite3.so.0
libc.so.6 libc.so.6
@ -16,5 +15,4 @@ libgssapi_krb5.so.2
libkrb5.so.3 libkrb5.so.3
libk5crypto.so.3 libk5crypto.so.3
libcom_err.so.2 libcom_err.so.2
libresolv.so.2
libproxy.so.1 libproxy.so.1

View file

@ -5,9 +5,6 @@ long_desc="${long_desc}
This package contains the shared libraries used by subversion." This package contains the shared libraries used by subversion."
do_install() {
do_install() vmove usr/lib usr
{
mkdir -p ${DESTDIR}/usr
mv ${SRCPKGDESTDIR}/usr/lib ${DESTDIR}/usr
} }

View file

@ -6,9 +6,6 @@ long_desc="${long_desc}
This package contains two modules for the HTTP apache daemon for use This package contains two modules for the HTTP apache daemon for use
with subversion." with subversion."
do_install() {
do_install() vmove usr/libexec usr
{
mkdir -p ${DESTDIR}/usr
mv ${SRCPKGDESTDIR}/usr/libexec ${DESTDIR}/usr
} }

View file

@ -1,15 +1,12 @@
# Template file for 'subversion-devel'. # Template file for 'subversion-devel'.
# #
depends="pkg-config perl ruby-devel python-devel swig apr-util-devel libldap-devel db-devel gdbm-devel expat-devel apr-devel libuuid-devel zlib-devel sqlite-devel libsasl-devel dbus-devel libgnome-keyring-devel glib-devel neon-devel libsvn" depends="libsvn>=$version"
short_desc="${short_desc} - development files" short_desc="${short_desc} - development files"
long_desc="${long_desc} long_desc="${long_desc}
This package contains files for development, headers, static libs, etc." This package contains files for development, headers, static libs, etc."
do_install() {
do_install() vmove usr/include usr
{ vmove "usr/lib/*.a" usr/lib
mkdir -p ${DESTDIR}/usr/lib
mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
} }

View file

@ -6,10 +6,6 @@ long_desc="${long_desc}
This package contains files for subversion to authenticate with This package contains files for subversion to authenticate with
the libgnome-keyring package." the libgnome-keyring package."
do_install() {
do_install() vmove "usr/lib/lib*gnome_keyring*.so*" usr/lib
{
mkdir -p ${DESTDIR}/usr/lib
mv ${SRCPKGDESTDIR}/usr/lib/lib*gnome_keyring*.so* \
${DESTDIR}/usr/lib
} }

View file

@ -1,16 +1,13 @@
# Template file for 'subversion-perl'. # Template file for 'subversion-perl'.
# #
depends="perl" depends="perl>=5.16"
short_desc="${short_desc} - perl bindings" short_desc="${short_desc} - perl bindings"
long_desc="${long_desc} long_desc="${long_desc}
This package contains the perl language bindings for subversion." This package contains the perl language bindings for subversion."
do_install() {
do_install() vmove "usr/lib/libsvn_swig_perl-1.so*" usr/lib
{ vmove usr/lib/perl5 usr/lib
mkdir -p ${DESTDIR}/usr/lib ${DESTDIR}/usr/share/man vmove usr/share/man/man3 usr/share/man
mv ${SRCPKGDESTDIR}/usr/lib/libsvn_swig_perl-1.so* ${DESTDIR}/usr/lib
mv ${SRCPKGDESTDIR}/usr/lib/perl5 ${DESTDIR}/usr/lib
mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man
} }

View file

@ -2,7 +2,6 @@ libsvn_diff-1.so.0
libsvn_subr-1.so.0 libsvn_subr-1.so.0
libapr-1.so.0 libapr-1.so.0
libpthread.so.0 libpthread.so.0
libdl.so.2
libc.so.6 libc.so.6
libsvn_client-1.so.0 libsvn_client-1.so.0
libsvn_delta-1.so.0 libsvn_delta-1.so.0
@ -27,7 +26,6 @@ libgssapi_krb5.so.2
libkrb5.so.3 libkrb5.so.3
libk5crypto.so.3 libk5crypto.so.3
libcom_err.so.2 libcom_err.so.2
libresolv.so.2
libproxy.so.1 libproxy.so.1
libz.so.1 libz.so.1
libsqlite3.so.0 libsqlite3.so.0

View file

@ -1,14 +1,12 @@
# Template file for 'subversion-python'. # Template file for 'subversion-python'.
# #
depends="python" depends="python"
pycompile_module="libsvn svn"
short_desc="${short_desc} - python bindings" short_desc="${short_desc} - python bindings"
long_desc="${long_desc} long_desc="${long_desc}
This package contains the Python language bindings for subversion." This package contains the Python language bindings for subversion."
pycompile_module="libsvn svn"
do_install() { do_install() {
vmove "usr/lib/libsvn_swig_py-1.so*" usr/lib vmove "usr/lib/libsvn_swig_py-1.so*" usr/lib
vmove "usr/lib/python*" usr/lib vmove "usr/lib/python*" usr/lib

View file

@ -11,3 +11,12 @@ libsvn_repos-1.so.0
libsvn_fs-1.so.0 libsvn_fs-1.so.0
libsvn_ra_svn-1.so.0 libsvn_ra_svn-1.so.0
libsasl2.so.2 libsasl2.so.2
libsvn_fs_fs-1.so.0
libsvn_fs_base-1.so.0
libdb-4.8.so
libsvn_fs_util-1.so.0
libaprutil-1.so.0
libexpat.so.1
libz.so.1
libsqlite3.so.0
libmagic.so.1

View file

@ -1,12 +1,15 @@
# Template file for 'subversion' # Template file for 'subversion'
pkgname=subversion pkgname=subversion
version=1.7.5 version=1.7.5
revision=1
homepage="http://subversion.apache.org/" homepage="http://subversion.apache.org/"
distfiles="http://apache.mirror.rafal.ca/subversion/${pkgname}-${version}.tar.bz2" subpackages="$pkgname-python $pkgname-perl $pkgname-gnome-keyring-auth $pkgname-devel libsvn"
makedepends="pkg-config perl python-devel swig apr-util-devel libldap-devel db-devel gdbm-devel expat-devel apr-devel libuuid-devel zlib-devel sqlite-devel libsasl-devel dbus-devel libgnome-keyring-devel glib-devel neon-devel apache-devel" # XXX enable kwallet when kdelibs is available.
makedepends="pkg-config perl>=5.16 python-devel swig apr-util-devel libldap-devel db-devel gdbm-devel expat-devel apr-devel libuuid-devel sqlite-devel libsasl-devel dbus-devel libgnome-keyring-devel glib-devel neon-devel apache-devel"
short_desc="Enterprise-class centralized version control for the masses" short_desc="Enterprise-class centralized version control for the masses"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
license="Apache-2.0, BSD" license="Apache-2.0, BSD"
distfiles="http://apache.mirror.rafal.ca/subversion/${pkgname}-${version}.tar.bz2"
checksum=cb23ccd08b0c1f0c66fdcda773265e404d95f378493ba64b49dbaaf54ae44aec checksum=cb23ccd08b0c1f0c66fdcda773265e404d95f378493ba64b49dbaaf54ae44aec
long_desc=" long_desc="
Apache Subversion is a full-featured version control system originally Apache Subversion is a full-featured version control system originally
@ -15,11 +18,6 @@ long_desc="
remain heavily influenced by that goal. Even today, Subversion should still remain heavily influenced by that goal. Even today, Subversion should still
feel very familiar to CVS users." feel very familiar to CVS users."
# XXX enable kwallet when kdelibs is available.
subpackages="$pkgname-python $pkgname-perl"
subpackages="${subpackages} $pkgname-gnome-keyring-auth $pkgname-devel"
subpackages="${subpackages} $pkgname-apache libsvn"
do_configure() { do_configure() {
./configure --prefix=/usr --with-apxs --disable-javahl \ ./configure --prefix=/usr --with-apxs --disable-javahl \
--without-kwallet --with-gnome-keyring --with-editor=vim \ --without-kwallet --with-gnome-keyring --with-editor=vim \