diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-12 11:21:01 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-12 11:21:01 -0300 |
| commit | b337b14a9cce5d126d55695c97698484ac52a8ea (patch) | |
| tree | 8aa6281e14d6bd9b0876ae0e641d76de9e51cce0 /extra/avahi | |
| parent | 66873986693bc3c8812d12f3919f1977b9a30674 (diff) | |
| parent | 079c689ef9b252fd82dbf9b182ec2517c48f8737 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/conkeror-git/PKGBUILD
community/spidermonkey/PKGBUILD
core/gcc/PKGBUILD
extra/file-roller/PKGBUILD
extra/pixman/PKGBUILD
extra/poppler/PKGBUILD
extra/qtiplot/PKGBUILD
extra/xulrunner/PKGBUILD
extra/xulrunner/xulrunner-omnijar.patch
kde-unstable/akonadi/PKGBUILD
multilib-testing/lib32-mesa/PKGBUILD
multilib/gcc-multilib/PKGBUILD
testing/mesa/PKGBUILD
Diffstat (limited to 'extra/avahi')
| -rw-r--r-- | extra/avahi/PKGBUILD | 16 | ||||
| -rw-r--r-- | extra/avahi/install (renamed from extra/avahi/avahi.install) | 0 | ||||
| -rw-r--r-- | extra/avahi/rc.d.patch (renamed from extra/avahi/avahi-daemon-dbus.patch) | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD index 385a72331..1a050d944 100644 --- a/extra/avahi/PKGBUILD +++ b/extra/avahi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 126809 2011-06-07 12:12:31Z bisson $ +# $Id: PKGBUILD 128481 2011-06-24 03:51:45Z bisson $ # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=avahi pkgver=0.6.30 -pkgrel=3 +pkgrel=4 pkgdesc='A multicast/unicast DNS-SD framework' arch=('i686' 'x86_64' 'mips64el') url='http://www.avahi.org/' @@ -35,23 +35,23 @@ makedepends=('pygtk' 'intltool' 'dbus-python' 'gobject-introspection' 'gtk3') } backup=(etc/avahi/avahi-daemon.conf etc/avahi/services/{sftp-,}ssh.service) -install=avahi.install +install=install 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') + 'gnome-nettool.png' + 'rc.d.patch') sha1sums=('5b77443537600a00770e4c77e3c443eeb5861d06' - '36735096a6eeb3a4012fe14f875259ee8558e220' - 'cf56387c88aed246b9f435efc182ef44de4d52f3') + 'cf56387c88aed246b9f435efc182ef44de4d52f3' + '625ad7c131c0c1c383caeddef18fc7a32d8f3ab9') build() { cd "${srcdir}/${pkgname}-${pkgver}" sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf - patch -p1 -i "../avahi-daemon-dbus.patch" + patch -p1 -i "../rc.d.patch" [ "$CARCH" = "mips64el" ] && \ extra="--disable-qt3 --disable-qt4 --disable-mono" diff --git a/extra/avahi/avahi.install b/extra/avahi/install index 7c75c3dd4..7c75c3dd4 100644 --- a/extra/avahi/avahi.install +++ b/extra/avahi/install diff --git a/extra/avahi/avahi-daemon-dbus.patch b/extra/avahi/rc.d.patch index ef7272082..fd735734b 100644 --- a/extra/avahi/avahi-daemon-dbus.patch +++ b/extra/avahi/rc.d.patch @@ -1,11 +1,11 @@ diff -aur old/initscript/archlinux/avahi-daemon.in new/initscript/archlinux/avahi-daemon.in ---- old/initscript/archlinux/avahi-daemon.in 2010-06-29 05:30:35.000000000 +0200 -+++ new/initscript/archlinux/avahi-daemon.in 2011-06-07 12:20:03.237701492 +0200 +--- 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 && /etc/rc.d/dbus 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 |