git » avahi.git » commit 7605d32

diff --git a/PKGBUILD b/PKGBUILD
index 59c5042..43473db 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=avahi
 pkgver=0.6.30
-pkgrel=3
+pkgrel=4
 pkgdesc='A multicast/unicast DNS-SD framework'
 arch=('i686' 'x86_64')
 url='http://www.avahi.org/'
@@ -21,23 +21,23 @@ optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
 makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'dbus-python'
              'gtk-sharp-2' '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"
 
 	# pygtk requires python2; make it explicit in case other python are installed: FS#21865
 	PYTHON=python2 \
diff --git a/avahi.install b/install
similarity index 100%
rename from avahi.install
rename to install
diff --git a/avahi-daemon-dbus.patch b/rc.d.patch
similarity index 50%
rename from avahi-daemon-dbus.patch
rename to rc.d.patch
index ef72720..fd73573 100644
--- a/avahi-daemon-dbus.patch
+++ b/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