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/bind-geodns | |
| 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/bind-geodns')
| -rw-r--r-- | community/bind-geodns/PKGBUILD | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/community/bind-geodns/PKGBUILD b/community/bind-geodns/PKGBUILD index 7c79aa2ec..af38472d5 100644 --- a/community/bind-geodns/PKGBUILD +++ b/community/bind-geodns/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 65058 2012-02-20 02:37:28Z spupykin $ +# $Id: PKGBUILD 72130 2012-06-08 23:51:33Z dreisner $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=bind-geodns pkgver=9.4.1 _pkgver=9.4.1-P1 -pkgrel=5 +pkgrel=6 pkgdesc="bind named server with geoip patch can return ip depending on requester location" arch=(i686 x86_64 'mips64el') url="http://www.caraytech.com/geodns/" license=('custom:ISC') -backup=(etc/named.conf etc/logrotate.d/named etc/conf.d/named etc/rndc.key) +backup=(etc/named.conf etc/logrotate.d/named etc/conf.d/named) depends=('openssl' 'geoip') provides=('dns-server' 'bind' 'dnsutils') conflicts=('bind' 'dnsutils') @@ -63,4 +63,7 @@ build() { chown -R 40:40 $pkgdir/var/named mv $pkgdir/usr/man $pkgdir/usr/share/ + + # avoid conflict with filesystem>=2012.06 + rmdir "$pkgdir/var/run" } |