version 0.6.31-11

1 files changed, 16 insertions, 21 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 0ba68d05542f..5c8c30eb903c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,31 @@
-# $Id: PKGBUILD 212820 2014-05-15 14:29:12Z eric $
 # Maintainer: Brian Bidulock <bidulock@openss7.org>
-# Contributor: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 _pkgname=avahi
 pkgname=avahi-gtk2
 pkgver=0.6.31
-pkgrel=15
+pkgrel=11
 pkgdesc='Multicast/unicast DNS-SD framework (with Gtk2 client apps)'
 url='http://www.avahi.org/'
 license=('LGPL')
 arch=('i686' 'x86_64')
 options=('!emptydirs')
-depends=('expat' 'libdaemon' 'glib2' 'libcap' 'gdbm' 'dbus')
+depends=('expat' 'libdaemon' 'glib2' 'libcap' 'gdbm')
 replaces=(${_pkgname})
-optdepends=('gtk2: avahi-discover-standalone, bshell, bssh, bvnc, gtk2 bindings'
+optdepends=('dbus: communicating with client applications'
+            'gtk2: avahi-discover-standalone, bshell, bssh, bvnc, gtk2 bindings'
+            'qt3: qt3 bindings'
+            'qt4: qt4 bindings'
+            'pygtk: avahi-bookmarks, avahi-discover'
+            'twisted: avahi-bookmarks'
+            'python2-dbus: avahi-discover'
             'nss-mdns: NSS support for mDNS')
-makedepends=('intltool' 'gobject-introspection' 'gtk2' 'xmltoman' 'python2')
+makedepends=('qt3' 'qt4' 'pygtk' 'intltool' 'python2-dbus'
+             'gobject-introspection' 'gtk2' 'xmltoman')
 backup=('etc/avahi/hosts'
         'etc/avahi/avahi-daemon.conf'
         'etc/avahi/services/ssh.service'
         'etc/avahi/services/sftp-ssh.service'
-        'usr/lib/avahi/service-types.db'
+	'usr/lib/avahi/service-types.db'
 	'usr/share/avahi/service-types')
 source=("http://www.avahi.org/download/avahi-${pkgver}.tar.gz")
 sha1sums=('7e05bd78572c9088b03b1207a0ad5aba38490684')
@@ -41,6 +45,7 @@ prepare() {
 
 build() {
 	cd "${srcdir}/${_pkgname}-${pkgver}"
+	export MOC_QT3=/usr/bin/moc-qt3
 	export MOC_QT4=/usr/bin/moc-qt4
 	export PYTHON=/usr/bin/python2
 
@@ -49,17 +54,10 @@ build() {
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--sbindir=/usr/bin \
-		--disable-monodoc \
-		--disable-qt3 \
-		--disable-qt4 \
-		--disable-gtk3 \
-		--disable-pygtk \
-		--disable-python-dbus \
 		--disable-mono \
-		--disable-doxygen-doc \
-		--disable-doxygen-dot \
-		--disable-doxygen-xml \
-		--disable-doxygen-html \
+		--disable-gtk3 \
+		--disable-static \
+		--disable-monodoc \
 		--enable-compat-libdns_sd \
 		--enable-compat-howl \
 		--with-distro=archlinux \
@@ -79,7 +77,4 @@ package() {
 	# howl and mdnsresponder compatability
 	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
 }