diff options
| -rw-r--r-- | abs/core-testing/avahi/ChangeLog | 8 | ||||
| -rw-r--r-- | abs/core-testing/avahi/PKGBUILD | 51 | ||||
| -rw-r--r-- | abs/core-testing/avahi/avahi-daemon-dbus.patch | 16 |
3 files changed, 53 insertions, 22 deletions
diff --git a/abs/core-testing/avahi/ChangeLog b/abs/core-testing/avahi/ChangeLog index e298fb4..57984a3 100644 --- a/abs/core-testing/avahi/ChangeLog +++ b/abs/core-testing/avahi/ChangeLog @@ -1,4 +1,12 @@ +2009-04-23 Douglas Soares de Andrade <douglas@archlinux.org> + + * Updated for i686: 0.6.25 + +2009-03-21 Eric Belanger <eric@archlinux.org> + + * Added optdepends for avahi-discover (close FS#11250) + 2009-01-04 Douglas Soares de Andrade <douglas@archlinux.org> * Updated for i686: 0.6.24 diff --git a/abs/core-testing/avahi/PKGBUILD b/abs/core-testing/avahi/PKGBUILD index c448d16..f3d15bf 100644 --- a/abs/core-testing/avahi/PKGBUILD +++ b/abs/core-testing/avahi/PKGBUILD @@ -1,31 +1,37 @@ -# $Id: PKGBUILD 23159 2009-01-04 04:58:11Z douglas $ -# Maintainer: Douglas Soares de Andrade <douglas@archlinux.org> +# $Id: PKGBUILD 70504 2010-02-27 03:24:54Z dgriffiths $ +# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=avahi -pkgver=0.6.24 -pkgrel=2 +pkgver=0.6.25 +pkgrel=3 pkgdesc="A multicast/unicast DNS-SD framework" arch=('i686' 'x86_64') url="http://www.avahi.org/" license=('LGPL') -depends=('dbus>=1.1.20-1' 'libcap' 'libdaemon>=0.11' 'gdbm' 'glib2' 'expat') -optdepends=('qt3:Qt3 UI support' 'libglade:Avahi-discover-standalone' - 'nss-mdns:NSS support for mDNS') +depends=('dbus>=1.1.20-1' 'libcap>=2.16' 'libdaemon>=0.11' 'gdbm' 'glib2' 'expat') +optdepends=('qt3: Qt3 UI support' + 'libglade: avahi-discover-standalone' + 'nss-mdns: NSS support for mDNS' + 'pygtk: avahi-discover' + 'dbus-python: avahi-discover') makedepends=('mono' 'pygtk' 'gtk-sharp-2' 'dbus-python' 'qt3' 'libglade' 'intltool') -backup=(etc/avahi/avahi-daemon.conf) +backup=(etc/avahi/avahi-daemon.conf etc/avahi/services/{sftp-,}ssh.service) install=avahi.install conflicts=('howl' 'mdnsresponder') provides=('howl' 'mdnsresponder') replaces=('howl' 'mdnsresponder') options=('!libtool') -source=(http://www.avahi.org/download/avahi-${pkgver}.tar.gz gnome-nettool.png) +source=(http://www.avahi.org/download/avahi-${pkgver}.tar.gz gnome-nettool.png avahi-daemon-dbus.patch) build() { [ -z "${QTDIR}" ] && . /etc/profile.d/qt3.sh - export MONO_SHARED_DIR=${startdir}/src/.wabi + export MONO_SHARED_DIR=${srcdir}/.wabi mkdir -p ${MONO_SHARED_DIR} - cd ${startdir}/src/${pkgname}-${pkgver} + cd ${srcdir}/${pkgname}-${pkgver} + + sed -i 's|Requires.private|Requires|' avahi-qt3.pc.in + ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ @@ -42,23 +48,24 @@ build() { --with-autoipd-group=avahi make || return 1 - make DESTDIR=${startdir}/pkg install + make DESTDIR=${pkgdir} install rm -rf ${MONO_SHARED_DIR} - #fix capability - sed -i -e 's|$DAEMON -D |modprobe capability > /dev/null 2>\&1 ; $DAEMON -D |' ${startdir}/pkg/etc/rc.d/avahi-daemon - - sed -i -e 's/netdev/network/g' ${startdir}/pkg/etc/dbus-1/system.d/avahi-dbus.conf + sed -i -e 's/netdev/network/g' ${pkgdir}/etc/dbus-1/system.d/avahi-dbus.conf # howl and mdnsresponder compatability - cd ${startdir}/pkg/usr/include + cd ${pkgdir}/usr/include ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h ln -s avahi-compat-howl howl - cd ${startdir}/pkg/usr/lib/pkgconfig + cd ${pkgdir}/usr/lib/pkgconfig ln -s avahi-compat-howl.pc howl.pc - mkdir -p ${startdir}/pkg/usr/share/pixmaps - install -m 644 ${startdir}/src/gnome-nettool.png ${startdir}/pkg/usr/share/pixmaps/gnome-nettool.png + mkdir -p ${pkgdir}/usr/share/pixmaps + install -m 644 ${srcdir}/gnome-nettool.png ${pkgdir}/usr/share/pixmaps/gnome-nettool.png + + cd ${pkgdir} + patch -p0 < ${srcdir}/avahi-daemon-dbus.patch || return 1 } -md5sums=('068c1d220b07037e64caf87d4a7a0504' - '42c2905307c7a5dc6ac4b75f4c3d65a3') +md5sums=('a83155a6e29e3988f07e5eea3287b21e' + '42c2905307c7a5dc6ac4b75f4c3d65a3' + '0e1f5900b56fcfa1bffddb4f233f539f') diff --git a/abs/core-testing/avahi/avahi-daemon-dbus.patch b/abs/core-testing/avahi/avahi-daemon-dbus.patch new file mode 100644 index 0000000..fe82f41 --- /dev/null +++ b/abs/core-testing/avahi/avahi-daemon-dbus.patch @@ -0,0 +1,16 @@ +--- etc/rc.d/avahi-daemon 2010-02-26 21:10:30.000000000 -0600 ++++ etc/rc.d/avahi-daemon 2010-02-26 21:09:44.000000000 -0600 +@@ -35,8 +35,11 @@ + + case "$1" in + start) +- stat_busy "Starting $DESC" +- $DAEMON -D > /dev/null 2>&1 ++ if ck_daemon dbus; then ++ /etc/rc.d/dbus start ++ fi ++ stat_busy "Starting $DESC" ++ modprobe capability > /dev/null 2>&1 ; $DAEMON -D > /dev/null 2>&1 + if [ $? -gt 0 ]; then + stat_fail + else |