diff options
| author | root <root@rshg054.dnsready.net> | 2013-03-02 00:04:05 -0800 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-03-02 00:04:05 -0800 |
| commit | 98aa0004e23472ee63753fded33cd55d8b942f36 (patch) | |
| tree | 1299d9cfb8bcd6bd295a1a279b4ad322b4e9133a /extra/avahi | |
| parent | 5ae40a63ab4c6838234db5a9da1e99d8bc27875d (diff) | |
Sat Mar 2 00:04:03 PST 2013
Diffstat (limited to 'extra/avahi')
| -rw-r--r-- | extra/avahi/PKGBUILD | 19 | ||||
| -rw-r--r-- | extra/avahi/install | 11 |
2 files changed, 19 insertions, 11 deletions
diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD index 4e500bf48..a4ddb8e9e 100644 --- a/extra/avahi/PKGBUILD +++ b/extra/avahi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 172143 2012-11-30 03:01:06Z bisson $ +# $Id: PKGBUILD 178950 2013-03-01 10:19:30Z andrea $ # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=avahi pkgver=0.6.31 -pkgrel=5 +pkgrel=6 pkgdesc='Multicast/unicast DNS-SD framework' url='http://www.avahi.org/' license=('LGPL') @@ -15,18 +15,20 @@ optdepends=('dbus: communicating with client applications' 'gtk3: avahi-discover-standalone, bshell, bssh, bvnc' 'gtk2: gtk2 bindings' 'qt3: qt3 bindings' - 'qt: qt bindings' + 'qt4: qt4 bindings' 'pygtk: avahi-bookmarks, avahi-discover' 'twisted: avahi-bookmarks' 'mono: mono bindings' 'python2-dbus: avahi-discover' 'nss-mdns: NSS support for mDNS') -makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'python2-dbus' +makedepends=('qt3' 'qt4' 'pygtk' 'mono' 'intltool' 'python2-dbus' 'gtk-sharp-2' 'gobject-introspection' 'gtk3' 'xmltoman') backup=('etc/avahi/hosts' 'etc/avahi/avahi-daemon.conf' 'etc/avahi/services/ssh.service' - 'etc/avahi/services/sftp-ssh.service') + 'etc/avahi/services/sftp-ssh.service' + 'usr/lib/avahi/service-types.db' + 'usr/share/avahi/service-types') source=("http://www.avahi.org/download/avahi-${pkgver}.tar.gz" 'rc.d.patch') sha1sums=('7e05bd78572c9088b03b1207a0ad5aba38490684' @@ -43,9 +45,13 @@ build() { sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf patch -p1 -i ../rc.d.patch + export MOC_QT3=/opt/qt/bin/moc + export MOC_QT4=/usr/lib/qt4/bin/moc + source /etc/profile.d/qt3.sh + source /etc/profile.d/qt4.sh + # pygtk requires python2; make it explicit in case other python are installed: FS#21865 PYTHON=python2 \ - PKG_CONFIG_PATH=/opt/qt/lib/pkgconfig \ ./configure \ --prefix=/usr \ --sysconfdir=/etc \ @@ -69,6 +75,7 @@ package() { cd "${pkgdir}" sed -i '1c #!/usr/bin/python2' usr/bin/avahi-{bookmarks,discover} + sed -i 's:/sbin/resolvconf:/usr/sbin/resolvconf:g' etc/avahi/avahi-dnsconfd.action # howl and mdnsresponder compatability (cd usr/include; ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h; ln -s avahi-compat-howl howl) diff --git a/extra/avahi/install b/extra/avahi/install index 7c75c3dd4..d333389ee 100644 --- a/extra/avahi/install +++ b/extra/avahi/install @@ -1,8 +1,8 @@ post_install() { - getent group avahi &>/dev/null || groupadd -r -g 84 avahi >/dev/null - getent passwd avahi &>/dev/null || useradd -r -u 84 -g avahi -d / -s /bin/false -c avahi avahi >/dev/null + getent group avahi &>/dev/null || groupadd -r -g 84 avahi >/dev/null + getent passwd avahi &>/dev/null || useradd -r -u 84 -g avahi -d / -s /bin/false -c avahi avahi >/dev/null - cat <<EOF + cat <<EOF ==> The following daemons may be added to DAEMONS in /etc/rc.conf: ==> avahi-daemon: the mdns responder, you probably want this. ==> dbus needs to be running when you start it. @@ -16,6 +16,7 @@ EOF } post_remove() { - getent passwd avahi &>/dev/null && userdel avahi >/dev/null - getent group avahi &>/dev/null && groupdel avahi >/dev/null + getent passwd avahi &>/dev/null && userdel avahi >/dev/null + getent group avahi &>/dev/null && groupdel avahi >/dev/null + true } |