From e3f225daecfd5cfea4af1a4e8ac4b6c46c7ec363 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 21 May 2013 00:28:39 -0700 Subject: Tue May 21 00:28:39 PDT 2013 --- extra/avahi/PKGBUILD | 33 +++++++++++++++------------------ extra/avahi/rc.d.patch | 11 ----------- 2 files changed, 15 insertions(+), 29 deletions(-) delete mode 100644 extra/avahi/rc.d.patch (limited to 'extra/avahi') diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD index f9f628d40..13c7b4ff4 100644 --- a/extra/avahi/PKGBUILD +++ b/extra/avahi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184361 2013-05-06 19:36:36Z foutrelis $ +# $Id: PKGBUILD 186027 2013-05-20 14:49:50Z bisson $ # Contributor: Douglas Soares de Andrade # Maintainer: Gaetan Bisson pkgname=avahi pkgver=0.6.31 -pkgrel=7 +pkgrel=9 pkgdesc='Multicast/unicast DNS-SD framework' url='http://www.avahi.org/' license=('LGPL') @@ -29,31 +29,31 @@ backup=('etc/avahi/hosts' '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' - '625ad7c131c0c1c383caeddef18fc7a32d8f3ab9') +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 's:netdev:network:g' -i avahi-daemon/avahi-dbus.conf + sed 's:/sbin/resolvconf:/usr/sbin/resolvconf:g' -i */*.action +} - sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf - patch -p1 -i ../rc.d.patch - +build() { + cd "${srcdir}/${pkgname}-${pkgver}" export MOC_QT3=/usr/bin/moc-qt3 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 \ ./configure \ --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ + --sbindir=/usr/bin \ --disable-static \ --disable-monodoc \ --enable-compat-libdns_sd \ @@ -70,12 +70,9 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - - 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 + 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 } diff --git a/extra/avahi/rc.d.patch b/extra/avahi/rc.d.patch deleted file mode 100644 index fd735734b..000000000 --- a/extra/avahi/rc.d.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -aur old/initscript/archlinux/avahi-daemon.in new/initscript/archlinux/avahi-daemon.in ---- old/initscript/archlinux/avahi-daemon.in 2011-06-24 03:07:00.916170590 +0200 -+++ new/initscript/archlinux/avahi-daemon.in 2011-06-24 03:16:32.220596377 +0200 -@@ -33,6 +33,7 @@ - - case "$1" in - start) -+ ck_daemon dbus && { echo -n "Start dbus first." >&2; stat_die; } - stat_busy "Starting $DESC" - $DAEMON -D > /dev/null 2>&1 - if [ $? -gt 0 ]; then -- cgit v1.2.3-54-g00ecf