diff options
| author | TBK <tbk@jjtc.dk> | 2018-04-14 03:34:45 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-04-23 19:38:54 +0000 |
| commit | 4dc7770d041a62dfa8ea91e397fa0167d0de0abe (patch) | |
| tree | f3f9212f7c01634be18de6637a655211ed82872d | |
| parent | 0c0fd7471cf1ff4a437ca60ecb6901e17b1065ea (diff) | |
| download | aports-4dc7770d041a62dfa8ea91e397fa0167d0de0abe.tar.bz2 aports-4dc7770d041a62dfa8ea91e397fa0167d0de0abe.tar.xz | |
main/avahi: upgrade to 0.7
| -rw-r--r-- | main/avahi/APKBUILD | 34 | ||||
| -rw-r--r-- | main/avahi/openrc-run.patch | 20 |
2 files changed, 17 insertions, 37 deletions
diff --git a/main/avahi/APKBUILD b/main/avahi/APKBUILD index 07d0c7a6a1..3febb7930a 100644 --- a/main/avahi/APKBUILD +++ b/main/avahi/APKBUILD @@ -1,28 +1,25 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=avahi -pkgver=0.6.32 -pkgrel=4 +pkgver=0.7 +pkgrel=0 pkgdesc="A multicast/unicast DNS-SD framework" -url="http://www.avahi.org/" +url="https://www.avahi.org/" arch="all" license="LGPL-2.0-or-later" +pkgusers="avahi" +pkggroups="avahi" depends="" depends_dev="gdbm-dev" -makedepends="py-dbus-dev intltool gobject-introspection-dev expat-dev +makedepends="py-dbus-dev intltool py-gobject3-dev gobject-introspection-dev expat-dev libdaemon-dev glib-dev dbus-dev libcap-dev gdbm-dev py-gdbm gettext-dev autoconf automake libtool" install="$pkgname.pre-install" -pkgusers="avahi" -pkggroups="avahi" subpackages="$pkgname-dev $pkgname-doc $pkgname-tools $pkgname-glib $pkgname-libs $pkgname-compat-howl:howl $pkgname-compat-libdns_sd:lidns_sd $pkgname-lang - py-avahi:py" -source="https://github.com/lathiat/avahi/releases/download/v$pkgver/avahi-$pkgver.tar.gz - openrc-run.patch - " + py-avahi:py:noarch" +source="https://github.com/lathiat/avahi/releases/download/v$pkgver/avahi-$pkgver.tar.gz" -builddir="$srcdir"/$pkgname-$pkgver prepare() { default_prepare autoreconf -vif @@ -51,20 +48,24 @@ build() { --enable-compat-howl \ --enable-python \ --with-distro="gentoo" \ - --with-systemdsystemunitdir=/lib/systemd/system \ - || return 1 + --with-systemdsystemunitdir=/lib/systemd/system make } +check() { + cd "$builddir" + make check +} + package() { cd "$builddir" - make DESTDIR="$pkgdir" install || return 1 + make DESTDIR="$pkgdir" install install -d -o avahi -g avahi "$pkgdir"/var/run/avahi-daemon ln -s avahi-compat-howl.pc "$pkgdir"/usr/lib/pkgconfig/howl.pc ln -s avahi-compat-libdns_sd.pc \ "$pkgdir"/usr/lib/pkgconfig/libdns_sd.pc ln -s avahi-compat-libdns_sd/dns_sd.h "$pkgdir"/usr/include/ - rm -r "$pkgdir"/usr/bin/avahi-bookmarks || return 1 + rm -r "$pkgdir"/usr/bin/avahi-bookmarks } dev() { @@ -117,5 +118,4 @@ py() { } -sha512sums="6f8d0a64292439cbb989c531a4ba2f25a53ee9cf7ad9df04dedf73149489a92612f3b5955e10aa4b1c76496c34b90ad75590e8aa49468249508267c1c8b899ee avahi-0.6.32.tar.gz -2754d11bf027676f30de6322eb9251ae83df5ef8f7b354793263224d432514a49e021d8f819f5525eeaeead04b544e15bfd2183ac8bc9f97e871d246e2b6a108 openrc-run.patch" +sha512sums="bae5a1e9204aca90b90e7fd223d19e809e3514d03ba5fa2da1e55bf1d72d3d3b98567f357900c36393613dc17dc98e15ff3ebf0f226f2f6b9766e592452a6ce7 avahi-0.7.tar.gz" diff --git a/main/avahi/openrc-run.patch b/main/avahi/openrc-run.patch deleted file mode 100644 index 08105aa268..0000000000 --- a/main/avahi/openrc-run.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/initscript/gentoo/avahi-daemon.in b/initscript/gentoo/avahi-daemon.in -index f12d0e4..c038c75 100644 ---- a/initscript/gentoo/avahi-daemon.in -+++ b/initscript/gentoo/avahi-daemon.in -@@ -1,4 +1,4 @@ --#!/sbin/runscript -+#!/sbin/openrc-run - # Copyright 1999-2007 Gentoo Foundation - # Distributed under the terms of the GNU General Public License v2 - -diff --git a/initscript/gentoo/avahi-dnsconfd.in b/initscript/gentoo/avahi-dnsconfd.in -index dff914c..48f3b35 100644 ---- a/initscript/gentoo/avahi-dnsconfd.in -+++ b/initscript/gentoo/avahi-dnsconfd.in -@@ -1,4 +1,4 @@ --#!/sbin/runscript -+#!/sbin/openrc-run - # Copyright 1999-2007 Gentoo Foundation - # Distributed under the terms of the GNU General Public License v2 - |