mirror of
https://gitdl.cn/https://github.com/chakralinux/core.git
synced 2025-02-03 09:37:13 +08:00
subversion update to add corrected deps, pkrel up for shadow
This commit is contained in:
abveritas
parent
9102f532ae
commit
65e3ce9b02
@ -6,7 +6,7 @@
|
||||
|
||||
pkgname=shadow
|
||||
pkgver=4.1.4.2
|
||||
pkgrel=3
|
||||
pkgrel=4
|
||||
pkgdesc="Shadow password file utilities"
|
||||
arch=('i686' 'x86_64')
|
||||
url='http://pkg-shadow.alioth.debian.org/'
|
||||
|
||||
@ -5,92 +5,98 @@
|
||||
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
|
||||
|
||||
pkgname=subversion
|
||||
pkgver=1.6.16
|
||||
pkgrel=3
|
||||
pkgdesc="Replacement for CVS, another versioning system (svn)"
|
||||
pkgver=1.6.17
|
||||
pkgrel=1
|
||||
pkgdesc="A Modern Concurrent Version Control System"
|
||||
arch=('i686' 'x86_64')
|
||||
license=('apache' 'bsd')
|
||||
depends=('neon' 'apr-util')
|
||||
makedepends=('krb5' 'python2' 'perl' 'swig' 'ruby'
|
||||
'autoconf' 'sqlite3' 'db' 'e2fsprogs') # 'java-runtime' 'kdelibs' 'libgnome-keyring' 'apache'
|
||||
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'
|
||||
'autoconf' 'db' 'e2fsprogs' '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
|
||||
svnserve svn svnserve.conf svnmerge.py
|
||||
subversion.rpath.fix.patch
|
||||
subversion.suppress.deprecation.warnings.patch)
|
||||
|
||||
backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve')
|
||||
url="http://subversion.tigris.org/"
|
||||
provides=('svn')
|
||||
options=('!makeflags' '!libtool')
|
||||
optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion')
|
||||
|
||||
build() {
|
||||
cd ${srcdir}/${pkgname}-${pkgver} || return 1
|
||||
|
||||
# apply patches
|
||||
patch -p0 < $srcdir/subversion.rpath.fix.patch || return 1
|
||||
patch -p1 -i $srcdir/subversion.suppress.deprecation.warnings.patch \
|
||||
|| return 1
|
||||
|
||||
# configure
|
||||
autoreconf || return 1
|
||||
./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \
|
||||
--with-zlib=/usr --with-neon=/usr --without-apxs \
|
||||
--with-sqlite=/usr --without-jdk --without-junit --disable-mod-activation \
|
||||
--disable-javahl --without-gnome-keyring --without-kwallet || return 1
|
||||
|
||||
# build
|
||||
(make external-all && make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all ) \
|
||||
|| return 1
|
||||
|
||||
# install
|
||||
export LD_LIBRARY_PATH=${pkgdir}/usr/lib:$LD_LIBRARY_PATH
|
||||
make DESTDIR=${pkgdir} install || return 1
|
||||
|
||||
make DESTDIR=${pkgdir} swig-py || return 1
|
||||
make install-swig-py DESTDIR=${pkgdir} || return 1
|
||||
|
||||
mkdir -p ${pkgdir}/usr/lib/python2.7 || return 1
|
||||
mv ${pkgdir}/usr/lib/svn-python/ ${pkgdir}/usr/lib/python2.7/site-packages \
|
||||
|| return 1
|
||||
|
||||
mkdir -p ${pkgdir}/usr/share/subversion || return 1
|
||||
install -d -m 755 tools/hook-scripts ${pkgdir}/usr/share/subversion/ \
|
||||
|| return 1
|
||||
rm -f ${pkgdir}/usr/share/subversion/hook-scripts/*.in || return 1
|
||||
|
||||
make DESTDIR=${pkgdir} swig-pl || return 1
|
||||
make install-swig-pl DESTDIR=${pkgdir} INSTALLDIRS=vendor || return 1
|
||||
rm -f ${pkgdir}/usr/lib/perl5/vendor_perl/auto/SVN/_Core/.packlist \
|
||||
|| return 1
|
||||
rm -rf ${pkgdir}/usr/lib/perl5/core_perl || return 1
|
||||
|
||||
make DESTDIR=${pkgdir} swig-rb || return 1
|
||||
make install-swig-rb DESTDIR=${pkgdir} || return 1
|
||||
|
||||
# make DESTDIR=${pkgdir} javahl || return 1
|
||||
# make DESTDIR=${pkgdir} install-javahl || return 1
|
||||
|
||||
mkdir -p ${pkgdir}/etc/rc.d || return 1
|
||||
mkdir -p ${pkgdir}/etc/xinetd.d || return 1
|
||||
mkdir -p ${pkgdir}/etc/conf.d || return 1
|
||||
|
||||
install -m 755 ${srcdir}/svnserve ${pkgdir}/etc/rc.d || return 1
|
||||
install -m 644 ${srcdir}/svn ${pkgdir}/etc/xinetd.d || return 1
|
||||
install -m 644 ${srcdir}/svnserve.conf ${pkgdir}/etc/conf.d/svnserve \
|
||||
|| return 1
|
||||
install -m 755 ${srcdir}/svnmerge.py ${pkgdir}/usr/bin/svnmerge || return 1
|
||||
install -D -m 644 ${srcdir}/subversion-$pkgver/COPYING \
|
||||
${pkgdir}/usr/share/licenses/$pkgname/LICENSE || return 1
|
||||
|
||||
# bash completion
|
||||
install -Dm 644 ${srcdir}/${pkgname}-${pkgver}/tools/client-side/bash_completion \
|
||||
${pkgdir}/etc/bash_completion.d/subversion || return 1
|
||||
}
|
||||
md5sums=('32f25a6724559fe8691d1f57a63f636e'
|
||||
subversion.suppress.deprecation.warnings.patch
|
||||
subversion-perl-bindings.patch)
|
||||
md5sums=('81e5dc5beee4b3fc025ac70c0b6caa14'
|
||||
'a2b029e8385007ffb99b437b30521c90'
|
||||
'a0db6dd43af33952739b6ec089852630'
|
||||
'c459e299192552f61578f3438abf0664'
|
||||
'21bf3aa5b797ce98eba8307f30e9c070'
|
||||
'6b4340ba9d8845cd8497e013ae01be3f'
|
||||
'1166f3b7413d7e7450299b3525680bbe')
|
||||
'1166f3b7413d7e7450299b3525680bbe'
|
||||
'0591aa39837931161b4d61ff35c7b147')
|
||||
|
||||
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
|
||||
|
||||
# configure
|
||||
autoreconf
|
||||
./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \
|
||||
--with-zlib=/usr --with-neon=/usr --with-apxs \
|
||||
--with-sqlite=/usr \
|
||||
--enable-javahl --without-gnome-keyring --with-kwallet
|
||||
|
||||
# build
|
||||
(make external-all && make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all )
|
||||
}
|
||||
|
||||
#check() {
|
||||
# cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
# export LANG=C LC_ALL=C
|
||||
# make check check-swig-pl check-swig-py CLEANUP=yes
|
||||
#}
|
||||
|
||||
package() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
|
||||
# install
|
||||
export LD_LIBRARY_PATH=${pkgdir}/usr/lib:$LD_LIBRARY_PATH
|
||||
make DESTDIR=${pkgdir} install
|
||||
|
||||
make DESTDIR=${pkgdir} swig-py
|
||||
make install-swig-py DESTDIR=${pkgdir}
|
||||
|
||||
install -d ${pkgdir}/usr/lib/python2.7
|
||||
mv ${pkgdir}/usr/lib/svn-python/ ${pkgdir}/usr/lib/python2.7/site-packages
|
||||
|
||||
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
|
||||
|
||||
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
|
||||
}
|
||||
|
||||
12
subversion/subversion-perl-bindings.patch
Normal file
12
subversion/subversion-perl-bindings.patch
Normal file
@ -0,0 +1,12 @@
|
||||
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",
|
||||
Loading…
Reference in New Issue
Block a user