diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-19 12:40:04 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-19 12:40:04 +0200 |
| commit | d186e96728bff4cc4873c59d48d01fe6eefe6131 (patch) | |
| tree | 1eefcef8058414b07b2750f52d9746f5323472ff /extra/fakechroot | |
| parent | 84c217e2d9acc64713978324761816e2468b5292 (diff) | |
| parent | 1fedf1f5d5351aefd88268cba7353c79adac9b8a (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/collectd/PKGBUILD
community/drivel/PKGBUILD
community/fcitx-mozc/PKGBUILD
community/gnomesu/PKGBUILD
community/gnuchess/PKGBUILD
community/gphpedit/PKGBUILD
community/gsql/PKGBUILD
community/libmatchbox/PKGBUILD
community/lockfile-progs/PKGBUILD
community/opencc/PKGBUILD
community/roxterm/PKGBUILD
community/uriparser/PKGBUILD
community/xcircuit/PKGBUILD
core/bison/PKGBUILD
core/curl/PKGBUILD
core/expat/PKGBUILD
core/gcc/PKGBUILD
core/gpm/PKGBUILD
core/m4/PKGBUILD
core/systemd/PKGBUILD
core/tar/PKGBUILD
extra/alsa-lib/PKGBUILD
extra/alsa-utils/PKGBUILD
extra/bitlbee/PKGBUILD
extra/chkrootkit/PKGBUILD
extra/fakechroot/PKGBUILD
extra/farstream/PKGBUILD
extra/freeglut/PKGBUILD
extra/gob2/PKGBUILD
extra/libcdio-paranoia/PKGBUILD
extra/liblqr/PKGBUILD
extra/libnl1/PKGBUILD
extra/libpst/PKGBUILD
extra/libwpd/PKGBUILD
extra/xorg-server/PKGBUILD
Diffstat (limited to 'extra/fakechroot')
| -rw-r--r-- | extra/fakechroot/PKGBUILD | 12 | ||||
| -rw-r--r-- | extra/fakechroot/fakechroot.install | 3 |
2 files changed, 10 insertions, 5 deletions
diff --git a/extra/fakechroot/PKGBUILD b/extra/fakechroot/PKGBUILD index 203525ccb..f6bb0d394 100644 --- a/extra/fakechroot/PKGBUILD +++ b/extra/fakechroot/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 144961 2011-12-12 08:42:45Z allan $ +# $Id: PKGBUILD 182910 2013-04-16 04:51:02Z allan $ # Maintainer : Allan McRae <allan@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=fakechroot pkgver=2.16 -pkgrel=1.1 +pkgrel=2 pkgdesc="Gives a fake chroot environment" arch=('i686' 'x86_64' 'mips64el') url="https://github.com/fakechroot/fakechroot/wiki" @@ -14,6 +14,14 @@ install=fakechroot.install source=(https://github.com/downloads/fakechroot/fakechroot/fakechroot-${pkgver}.tar.gz) md5sums=('3ea5efb76664e787450e0cfcefc1b807') + +prepare() { + cd ${srcdir}/${pkgname}-${pkgver} + + # https://github.com/fakechroot/fakechroot/issues/10 + sed -i "s#usr/sbin/chroot#usr/bin/chroot#" test/testtree.sh test/t/chroot.t +} + build() { cd ${srcdir}/${pkgname}-${pkgver} # Somehow not all files use the chroot found by configure. diff --git a/extra/fakechroot/fakechroot.install b/extra/fakechroot/fakechroot.install index 2b5eb2100..61c5b73e5 100644 --- a/extra/fakechroot/fakechroot.install +++ b/extra/fakechroot/fakechroot.install @@ -3,9 +3,6 @@ post_install() { } post_upgrade() { - if [ "$(vercmp $2 2.9-2)" -lt 0 ]; then - sed -i -e '/\/usr\/lib\/libfakechroot/d' etc/ld.so.conf - fi sbin/ldconfig -r . } |