avahi 0.6.31

1 files changed, 52 insertions, 52 deletions

diff --git a/abs/core/avahi/PKGBUILD b/abs/core/avahi/PKGBUILD
index 3ab5c8b..424bf2c 100644
--- a/abs/core/avahi/PKGBUILD
+++ b/abs/core/avahi/PKGBUILD
@@ -1,15 +1,18 @@
-# $Id: PKGBUILD 94183 2010-10-05 07:08:54Z bisson $
+# $Id: PKGBUILD 156451 2012-04-18 12:14:05Z bisson $
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=avahi
-pkgver=0.6.27
-pkgrel=8
-pkgdesc='A multicast/unicast DNS-SD framework'
-arch=('i686' 'x86_64')
+pkgver=0.6.31
+pkgrel=3
+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')
-optdepends=('gtk2: avahi-discover-standalone'
+optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
+            'gtk2: gtk2 bindings'
             'qt3: qt3 bindings'
             'qt: qt bindings'
             'pygtk: avahi-bookmarks, avahi-discover'
@@ -17,62 +20,59 @@ optdepends=('gtk2: avahi-discover-standalone'
             'mono: mono bindings'
             'dbus-python: avahi-discover'
             'nss-mdns: NSS support for mDNS')
-makedepends=('qt' 'pygtk' 'mono' 'intltool' 'dbus-python' 'gtk-sharp-2' 'gobject-introspection>=0.9.10')
-backup=(etc/avahi/avahi-daemon.conf etc/avahi/services/{sftp-,}ssh.service)
-install=avahi.install
+makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'dbus-python'
+             'gtk-sharp-2' 'gobject-introspection' 'gtk3')
+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')
+
 conflicts=('howl' 'mdnsresponder')
 provides=('howl' 'mdnsresponder')
-replaces=('howl' 'mdnsresponder')
-options=('!libtool')
-source=(http://www.avahi.org/download/avahi-${pkgver}.tar.gz
-        avahi-daemon-dbus.patch
-        gnome-nettool.png
-        introspection.patch)
-sha1sums=('e763bbeba92fd5b3ba3e2af5fc85aaf99b406c8b'
-          '41e9f23efa0b5a5f7b0f14a86cfb0677ece84c61'
-          'cf56387c88aed246b9f435efc182ef44de4d52f3'
-          '999d71add829ab9bb55262855dfe04126ac7975c')
+
+install=install
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+	cd "${srcdir}/${pkgname}-${pkgver}"
 
-  sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf
-  patch -Np0 -i "${srcdir}/avahi-daemon-dbus.patch"
-  patch -Np1 -i "${srcdir}/introspection.patch"
+	sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf
+	patch -p1 -i ../rc.d.patch
 
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --disable-gtk3 \
-    --disable-qt3 \
-    --disable-monodoc \
-    --disable-doxygen-doc \
-    --disable-xmltoman \
-    --enable-compat-libdns_sd \
-    --enable-compat-howl \
-    --with-distro=archlinux \
-    --with-avahi-priv-access-group=network \
-    --with-autoipd-user=avahi \
-    --with-autoipd-group=avahi \
-    --with-systemdsystemunitdir=/lib/systemd/system # See FS#20999
+	# 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 \
+		--enable-compat-libdns_sd \
+		--enable-compat-howl \
+		--with-distro=archlinux \
+		--with-avahi-priv-access-group=network \
+		--with-autoipd-user=avahi \
+		--with-autoipd-group=avahi \
+		--with-systemdsystemunitdir=/usr/lib/systemd/system \
 
-  make || return 1
+	make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install || return 1
-
-  # 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
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+	install -Dm644 ../gnome-nettool.png "${pkgdir}"/usr/share/pixmaps/gnome-nettool.png
 
-  sed -i '1c #!/usr/bin/python2' "$pkgdir"/usr/bin/avahi-{bookmarks,discover}
+	cd "${pkgdir}"
+	sed -i '1c #!/usr/bin/python2' usr/bin/avahi-{bookmarks,discover}
 
-  install -D -m 644 "${srcdir}"/gnome-nettool.png "${pkgdir}"/usr/share/pixmaps/gnome-nettool.png
+	# 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)
 }