avahi: update to 0.6.31-14

2 files changed, 39 insertions, 48 deletions

diff --git a/abs/core/avahi/PKGBUILD b/abs/core/avahi/PKGBUILD
index 7b247cb..d98069b 100644
--- a/abs/core/avahi/PKGBUILD
+++ b/abs/core/avahi/PKGBUILD
@@ -1,59 +1,60 @@
-# $Id: PKGBUILD 156451 2012-04-18 12:14:05Z bisson $
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
+# $Id$
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=avahi
 pkgver=0.6.31
-pkgrel=4
+pkgrel=14
 pkgdesc='Multicast/unicast DNS-SD framework'
 url='http://www.avahi.org/'
 license=('LGPL')
 arch=('i686' 'x86_64')
-options=('!libtool' '!emptydirs')
-depends=('expat' 'libdaemon' 'glib2' 'dbus' 'libcap' 'gdbm')
+options=('!emptydirs')
+depends=('expat' 'libdaemon' 'glib2' 'libcap' 'gdbm' 'dbus')
 optdepends=('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'
+            'python2-twisted: avahi-bookmarks'
             'mono: mono bindings'
-            'dbus-python: avahi-discover'
+            'python2-dbus: avahi-discover'
             'nss-mdns: NSS support for mDNS')
-makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'dbus-python'
-             'gtk-sharp-2' 'gobject-introspection' 'gtk3')
+makedepends=('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')
-source=("http://www.avahi.org/download/avahi-${pkgver}.tar.gz"
-        'gnome-nettool.png'
-        'rc.d.patch')
-sha1sums=('7e05bd78572c9088b03b1207a0ad5aba38490684'
-          'cf56387c88aed246b9f435efc182ef44de4d52f3'
-          '625ad7c131c0c1c383caeddef18fc7a32d8f3ab9')
+        '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")
+sha1sums=('7e05bd78572c9088b03b1207a0ad5aba38490684')
 
 conflicts=('howl' 'mdnsresponder')
 provides=('howl' 'mdnsresponder')
 
 install=install
 
-build() {
+prepare() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
+	sed '/^Libs:/s:$: -ldbus-1:' -i avahi-client.pc.in
+	sed 's:netdev:network:g' -i avahi-daemon/avahi-dbus.conf
+	sed 's:/sbin/resolvconf:/usr/sbin/resolvconf:g' -i */*.action
+	sed 's:-DG[^ ]*_DISABLE_DEPRECATED=1::g' -i avahi-ui/Makefile.*
+}
 
-	sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf
-	patch -p1 -i ../rc.d.patch
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	export MOC_QT4=/usr/bin/moc-qt4
+	export PYTHON=/usr/bin/python2
 
-	# 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 \
 		--localstatedir=/var \
-		--disable-static \
-		--disable-monodoc \
 		--sbindir=/usr/bin \
+		--disable-monodoc \
+		--disable-qt3 \
 		--enable-compat-libdns_sd \
 		--enable-compat-howl \
 		--with-distro=archlinux \
@@ -68,12 +69,12 @@ build() {
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" install
-	install -Dm644 ../gnome-nettool.png "${pkgdir}"/usr/share/pixmaps/gnome-nettool.png
-
-	cd "${pkgdir}"
-	sed -i '1c #!/usr/bin/python2' usr/bin/avahi-{bookmarks,discover}
+	rm -fr "${pkgdir}"/etc/rc.d
 
 	# 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)
-	(cd usr/lib/pkgconfig; ln -s avahi-compat-howl.pc howl.pc)
+	cd "${pkgdir}"/usr/include; ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h; ln -s avahi-compat-howl howl
+	cd "${pkgdir}"/usr/lib/pkgconfig; ln -s avahi-compat-howl.pc howl.pc
+
+	# see FS#42638
+	ln avahi-daemon.service -s "${pkgdir}"/usr/lib/systemd/system/dbus-org.freedesktop.Avahi.service
 }
diff --git a/abs/core/avahi/install b/abs/core/avahi/install
index 7c75c3d..d4ae23e 100644
--- a/abs/core/avahi/install
+++ b/abs/core/avahi/install
@@ -1,21 +1,11 @@
 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
-
-  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.
-==> avahi-dnsconfd: daemon used for peer-to-peer automatic dns
-==>                 configuration on dhcp-less networks.
-
-==> To use some of the client applications you will have to install python.
-==> In addition, pygtk is required for the graphical ones and
-==> twisted for avahi-bookmarks.
-EOF
+	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
+	true
 }
 
 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
 }