| author | Jan Alexander Steffens
<heftig@archlinux.org> 2015-07-01 04:33:01 UTC |
| committer | Jan Alexander Steffens
<heftig@archlinux.org> 2015-07-01 04:33:01 UTC |
| parent | b8ddc3d1ca2b80f779701243adb0b47812379dbc |
| PKGBUILD | +52 | -54 |
| avahi.install | +6 | -0 |
| install | +0 | -11 |
diff --git a/PKGBUILD b/PKGBUILD index fadf02a..2071450 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,16 +1,19 @@ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Gaetan Bisson <bisson@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=avahi pkgver=0.6.31 -pkgrel=15 -pkgdesc='Multicast/unicast DNS-SD framework' +pkgrel=16 +_commit=573e3b5 +pkgdesc='Multicast DNS-SD / Zeroconf Suite' #url='http://www.avahi.org/' url='http://git.0pointer.net/avahi.git' -license=('LGPL') -arch=('i686' 'x86_64') -options=('!emptydirs') -depends=('expat' 'libdaemon' 'glib2' 'libcap' 'gdbm' 'dbus') +license=(LGPL) +arch=(i686 x86_64) +depends=(expat libdaemon glib2 libcap gdbm dbus) +makedepends=(git qt4 pygtk mono intltool python2-dbus gtk-sharp-2 gobject-introspection gtk3 + xmltoman python-dbus) optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc' 'gtk2: gtk2 bindings' 'qt4: qt4 bindings' @@ -19,64 +22,59 @@ optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc' 'mono: mono bindings' 'python2-dbus: avahi-discover' 'nss-mdns: NSS support for mDNS') -makedepends=('git' 'qt4' 'pygtk' 'mono' 'intltool' 'python2-dbus' - 'gtk-sharp-2' 'gobject-introspection' 'gtk3' 'xmltoman') -backup=('etc/avahi/hosts' - 'etc/avahi/avahi-daemon.conf' - 'etc/avahi/services/ssh.service' - '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") -#sha1sums=('7e05bd78572c9088b03b1207a0ad5aba38490684') -source=('git://git.0pointer.net/avahi.git#commit=147cdce70b22ae7cee9fb4fe123db40952f31c9e') -sha1sums=('SKIP') +conflicts=(howl mdnsresponder) +provides=(howl mdnsresponder) +install=avahi.install +options=(!emptydirs) +backup=(etc/avahi/{hosts,avahi-daemon.conf,services/{ssh,sftp-ssh}.service} + usr/lib/avahi/service-types.db usr/share/avahi/service-types) +source=("git+https://github.com/heftig/avahi#commit=$_commit") +sha256sums=('SKIP') -conflicts=('howl' 'mdnsresponder') -provides=('howl' 'mdnsresponder') - -install=install prepare() { - cd "${srcdir}/${pkgname}" #-${pkgver}" - sed '/^Libs:/s:$: -ldbus-1:' -i avahi-client.pc.in - sed 's:/sbin/resolvconf:/usr/sbin/resolvconf:g' -i */*.action - sed 's:-DG[^ ]*_DISABLE_DEPRECATED=1::g' -i avahi-ui/Makefile.* + cd $pkgname + NOCONFIGURE=1 ./autogen.sh } build() { - cd "${srcdir}/${pkgname}" #-${pkgver}" - export MOC_QT4=/usr/bin/moc-qt4 - export PYTHON=/usr/bin/python2 + cd $pkgname + export MOC_QT4=/usr/bin/moc-qt4 PYTHON=/usr/bin/python2 + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --sbindir=/usr/bin \ + --disable-monodoc \ + --disable-qt3 \ + --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=/usr/lib/systemd/system - ./autogen.sh || true - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --sbindir=/usr/bin \ - --disable-monodoc \ - --disable-qt3 \ - --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=/usr/lib/systemd/system \ + cp -a avahi-python/avahi avahi-python/avahi3 - make + make + make -C avahi-python/avahi3 PYTHON=/usr/bin/python3 } package() { - cd "${srcdir}/${pkgname}" #-${pkgver}" - make DESTDIR="${pkgdir}" install - rm -fr "${pkgdir}"/etc/rc.d + cd $pkgname + make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C avahi-python/avahi3 install \ + PYTHON=/usr/bin/python3 pythondir=/usr/lib/python3.4/site-packages + + # howl compat + ln -s avahi-compat-howl "$pkgdir/usr/include/howl" + ln -s avahi-compat-howl.pc "$pkgdir/usr/lib/pkgconfig/howl.pc" - # 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 + # mdnsresponder compat + ln -s avahi-compat-libdns_sd/dns_sd.h "$pkgdir/usr/include/dns_sd.h" - # see FS#42638 - ln avahi-daemon.service -s "${pkgdir}"/usr/lib/systemd/system/dbus-org.freedesktop.Avahi.service + # see FS#42638 + ln -s avahi-daemon.service "$pkgdir/usr/lib/systemd/system/dbus-org.freedesktop.Avahi.service" } diff --git a/avahi.install b/avahi.install new file mode 100644 index 0000000..7eccf2a --- /dev/null +++ b/avahi.install @@ -0,0 +1,6 @@ +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 +} diff --git a/install b/install deleted file mode 100644 index 87ed25c..0000000 --- a/install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - getent group avahi &>/dev/null || groupadd -r -g 84 avahi >/dev/null - getent passwd avahi &>/dev/null || useradd -r -u 84 -g avahi -d / -s /bin/nologin -c avahi avahi >/dev/null - true -} - -post_remove() { - getent passwd avahi &>/dev/null && userdel avahi >/dev/null - getent group avahi &>/dev/null && groupdel avahi >/dev/null - true -}