From 5e7a1b1fa9c4647d1c6d81512a665db1fc715d24 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich <kevin@archlinuxarm.org> Date: Sat, 16 Dec 2017 03:04:14 +0000 Subject: [PATCH] extra/avahi to 0.7-2 --- extra/avahi/PKGBUILD | 11 ++++++----- extra/avahi/avahi.install | 16 ---------------- 2 files changed, 6 insertions(+), 21 deletions(-) delete mode 100644 extra/avahi/avahi.install diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD index 55b598d9a..3968d4225 100644 --- a/extra/avahi/PKGBUILD +++ b/extra/avahi/PKGBUILD @@ -8,14 +8,14 @@ pkgname=avahi pkgver=0.7 -pkgrel=1 +pkgrel=2 pkgdesc='Service Discovery for Linux using mDNS/DNS-SD -- compatible with Bonjour' url='https://github.com/lathiat/avahi' license=(LGPL) -arch=(i686 x86_64) +arch=(x86_64) depends=(expat libdaemon glib2 libcap gdbm dbus) makedepends=(git qt4 pygtk intltool gtk-sharp-2 gobject-introspection gtk3 - xmltoman python-dbus python-gobject) + xmltoman python-dbus python-gobject doxygen graphviz) optdepends=('gtk3: avahi-discover, avahi-discover-standalone, bshell, bssh, bvnc' 'gtk2: gtk2 bindings' 'qt4: qt4 bindings' @@ -24,9 +24,9 @@ optdepends=('gtk3: avahi-discover, avahi-discover-standalone, bshell, bssh, bvnc 'nss-mdns: NSS support for mDNS' 'python-gobject: avahi-discover' 'python-dbus: avahi-discover') -install=avahi.install backup=(etc/avahi/{hosts,avahi-daemon.conf} usr/lib/avahi/service-types.db) +options=(!emptydirs) _commit=6242e5f0fe001b7de2ccaa9431db279b2ee76b83 # tags/v0.7 source=("git+https://github.com/lathiat/avahi#commit=$_commit" 0001-avahi-python-Use-the-agnostic-DBM-interface.patch) @@ -86,5 +86,6 @@ package() { mv "$pkgdir"/etc/avahi/services/{,sftp-}ssh.service \ "$pkgdir/usr/share/doc/$pkgname/" - rmdir "$pkgdir"/run + echo 'u avahi - "Avahi mDNS/DNS-SD daemon"' | + install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/$pkgname.conf" } diff --git a/extra/avahi/avahi.install b/extra/avahi/avahi.install deleted file mode 100644 index 395a21e0f..000000000 --- a/extra/avahi/avahi.install +++ /dev/null @@ -1,16 +0,0 @@ -post_install() { - if ! getent passwd avahi &>/dev/null; then - groupadd -r -g 84 avahi - useradd -r -u 84 -g avahi -d / -s /bin/nologin -c avahi avahi - fi -} - -post_upgrade() { - if (( $(vercmp $2 0.6.32rc-1) < 0 )); then - cat <<MSG ->>> Avahi now needs to be enabled in order to launch. - Run \`systemctl enable avahi-daemon\` if you wish - to make use of Avahi. -MSG - fi -}