diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-10 11:35:18 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-10 11:35:18 +0200 |
commit | 51d25a8023c8dafdbcafd8bcc6adb19979f15ac6 (patch) | |
tree | 3419b254ec8c04b09a938d993fdb768eae03c005 /community/miredo | |
parent | 11fe0679d59f68c3fbe3d0a205e5087bf694262e (diff) | |
parent | 7b2739f21a7ed0d52497fa381c9a2383e71ab7a8 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/kdemultimedia/PKGBUILD
extra/kdenetwork/PKGBUILD
extra/samba/PKGBUILD
multilib/lib32-gnutls/PKGBUILD
multilib/wine/PKGBUILD
staging/kdemultimedia/PKGBUILD
Diffstat (limited to 'community/miredo')
-rw-r--r-- | community/miredo/PKGBUILD | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/community/miredo/PKGBUILD b/community/miredo/PKGBUILD index 9c3ca8400..05339135d 100644 --- a/community/miredo/PKGBUILD +++ b/community/miredo/PKGBUILD @@ -1,17 +1,16 @@ -# $Id: PKGBUILD 62679 2012-01-24 12:52:57Z spupykin $ +# $Id: PKGBUILD 72132 2012-06-08 23:58:54Z dreisner $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=miredo pkgver=1.2.4 -pkgrel=1 +pkgrel=2 pkgdesc="Teredo client and server." arch=('i686' 'x86_64' 'mips64el') url="http://www.remlab.net/miredo/" license=('GPL') depends=(judy iproute2) backup=('etc/miredo/miredo.conf' - 'etc/miredo/miredo-server.conf' - 'etc/miredo/isatapd.conf') + 'etc/miredo/client-hook') source=(http://www.remlab.net/files/${pkgname}/${pkgname}-${pkgver}.tar.bz2 isatapd.rc.d miredo.install @@ -34,4 +33,8 @@ build() { install -D -m755 $srcdir/miredo-server.rc.d $pkgdir/etc/rc.d/miredo-server install -D -m755 $srcdir/isatapd.rc.d $pkgdir/etc/rc.d/isatapd sed -i 's#/sbin/ip#/usr/sbin/ip#' $pkgdir/etc/miredo/client-hook + + # avoid conflict with filesystem>=2012.06 + rmdir "$pkgdir/var/run" } + |