git » avahi.git » commit 873af1c

diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index 57984a3..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,17 +0,0 @@
-
-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
-
-2008-07-22  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for i686: 0.6.23
-
diff --git a/PKGBUILD b/PKGBUILD
index 3d7d262..59c5042 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=avahi
 pkgver=0.6.30
-pkgrel=2
+pkgrel=3
 pkgdesc='A multicast/unicast DNS-SD framework'
 arch=('i686' 'x86_64')
 url='http://www.avahi.org/'
@@ -26,54 +26,49 @@ 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)
+source=("http://www.avahi.org/download/avahi-${pkgver}.tar.gz"
+        'avahi-daemon-dbus.patch'
+        'gnome-nettool.png')
 sha1sums=('5b77443537600a00770e4c77e3c443eeb5861d06'
-          '41e9f23efa0b5a5f7b0f14a86cfb0677ece84c61'
+          '36735096a6eeb3a4012fe14f875259ee8558e220'
           'cf56387c88aed246b9f435efc182ef44de4d52f3')
 
 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"
+	sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf
+	patch -p1 -i "../avahi-daemon-dbus.patch"
 
-  # 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 \
-    --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 \
+		--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
 
-  make
+	make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+	install -D -m 644 ../gnome-nettool.png "${pkgdir}"/usr/share/pixmaps/gnome-nettool.png
 
-  make DESTDIR="${pkgdir}" install
-
-  # 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
-
-  sed -i '1c #!/usr/bin/python2' "$pkgdir"/usr/bin/avahi-{bookmarks,discover}
-
-  install -D -m 644 "${srcdir}"/gnome-nettool.png "${pkgdir}"/usr/share/pixmaps/gnome-nettool.png
+	cd "${pkgdir}"
+	sed -i '1c #!/usr/bin/python2' usr/bin/avahi-{bookmarks,discover}
+	# 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)
 }
diff --git a/avahi-daemon-dbus.patch b/avahi-daemon-dbus.patch
index a168f03..ef72720 100644
--- a/avahi-daemon-dbus.patch
+++ b/avahi-daemon-dbus.patch
@@ -1,11 +1,11 @@
---- initscript/archlinux/avahi-daemon.in	2010-08-17 22:23:46.510293144 +0200
-+++ initscript/archlinux/avahi-daemon.in	2010-08-17 22:46:58.110163026 +0200
-@@ -33,6 +35,8 @@
+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
+@@ -33,6 +33,7 @@
  
  case "$1" in
      start)
 +        ck_daemon dbus && /etc/rc.d/dbus start
-+        modprobe capability &> /dev/null
          stat_busy "Starting $DESC"
          $DAEMON -D > /dev/null 2>&1
          if [ $? -gt 0 ]; then