avahi: fully switch to /run and move so symlinks to -devel pkgs.

The switch to /run is necessary to not depend on /var/run being a symlink.
This commit is contained in:
Juan RP 2013-10-09 22:54:45 +02:00
parent 3610095e26
commit 97a0ac749c
2 changed files with 30 additions and 17 deletions

View File

@ -6,7 +6,7 @@
pkgname=avahi-discover
version=0.6.31
wrksrc="avahi-${version}"
revision=11
revision=12
build_style=gnu-configure
configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
--disable-doxygen-doc --enable-compat-libdns_sd --enable-compat-howl
@ -54,19 +54,21 @@ avahi-python_package() {
avahi-glib-libs-devel_package() {
depends="avahi-libs-devel-${version}_${revision} avahi-glib-libs-${version}_${revision}"
short_desc="Avahi glib libraries -- development files"
short_desc="Avahi glib libraries - development files"
pkg_install() {
vmove "usr/include/avahi-g*"
vmove "usr/lib/pkgconfig/avahi-g*"
vmove "usr/share/gir-*"
vmove usr/lib/libavahi-glib.so
vmove usr/lib/libavahi-gobject.so
}
}
avahi-glib-libs_package() {
short_desc="Avahi glib shared libraries"
pkg_install() {
vmove "usr/lib/libavahi-glib.so*"
vmove "usr/lib/libavahi-gobject.so*"
vmove "usr/lib/libavahi-glib.so.*"
vmove "usr/lib/libavahi-gobject.so.*"
vmove "usr/lib/girepository*"
}
}
@ -74,25 +76,27 @@ avahi-glib-libs_package() {
avahi-ui-libs-devel_package() {
depends="gtk+-devel gtk+3-devel avahi-libs-devel-${version}_${revision}
avahi-ui-libs-${version}_${revision} avahi-ui-libs-gtk3-${version}_${revision}"
short_desc="Avahi UI libraries -- development files"
short_desc="Avahi UI libraries - development files"
pkg_install() {
vmove usr/include/avahi-ui/avahi-ui.h
vmove usr/lib/pkgconfig/avahi-ui.pc
vmove usr/lib/pkgconfig/avahi-ui-gtk3.pc
vmove usr/lib/libavahi-ui-gtk3.so
vmove usr/lib/libavahi-ui.so
}
}
avahi-ui-libs-gtk3_package() {
short_desc="Avahi UI GTK+3 shared libraries"
pkg_install() {
vmove "usr/lib/libavahi-ui-gtk3.so*"
vmove "usr/lib/libavahi-ui-gtk3.so.*"
}
}
avahi-ui-libs_package() {
short_desc="Avahi UI shared libraries"
pkg_install() {
vmove "usr/lib/libavahi-ui.so*"
vmove "usr/lib/libavahi-ui.so.*"
}
}

View File

@ -1,7 +1,7 @@
# Template file for 'avahi'
pkgname=avahi
version=0.6.31
revision=11
revision=12
build_style=gnu-configure
configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
--disable-doxygen-doc --enable-compat-libdns_sd --enable-compat-howl
@ -29,6 +29,11 @@ if [ "$CROSS_BUILD" ]; then
}
fi
post_extract() {
# Switch to /run to not depend on /var/run being a symlink.
sed -e 's,\(avahi_runtime_dir=\).*,\1\"/run\",' -i ${wrksrc}/configure
}
avahi-autoipd_package() {
depends="net-tools"
short_desc="Avahi IPv4LL network address configuration daemon"
@ -41,39 +46,44 @@ avahi-autoipd_package() {
avahi-compat-libs-devel_package() {
depends="avahi-libs-devel-${version}_${revision} avahi-compat-libs-${version}_${revision}"
short_desc="Avahi compat libraries -- development files"
short_desc="Avahi compat libraries - development files"
pkg_install() {
vmove "usr/include/avahi-compat*"
vmove "usr/lib/pkgconfig/avahi-compat*"
vmove usr/lib/libhowl.so
vmove usr/lib/libdns_sd.so
}
}
avahi-compat-libs_package() {
short_desc="Avahi compatiblity shared libraries"
pkg_install() {
vmove "usr/lib/libhowl.so*"
vmove "usr/lib/libdns_sd.so*"
vmove "usr/lib/libhowl.so.*"
vmove "usr/lib/libdns_sd.so.*"
}
}
avahi-libs-devel_package() {
depends="dbus-devel avahi-libs-${version}_${revision}"
short_desc="Avahi core libraries -- development files"
short_desc="Avahi core libraries - development files"
pkg_install() {
for f in common client core; do
vmove usr/include/avahi-${f}
done
vmove usr/lib/pkgconfig/avahi-core.pc
vmove usr/lib/pkgconfig/avahi-client.pc
vmove usr/lib/libavahi-client.so
vmove usr/lib/libavahi-core.so
vmove usr/lib/libavahi-common.so
}
}
avahi-libs_package() {
short_desc="Avahi shared libraries"
pkg_install() {
vmove "usr/lib/libavahi-client.so*"
vmove "usr/lib/libavahi-core.so*"
vmove "usr/lib/libavahi-common.so*"
vmove "usr/lib/libavahi-client.so.*"
vmove "usr/lib/libavahi-core.so.*"
vmove "usr/lib/libavahi-common.so.*"
}
}
@ -95,7 +105,6 @@ avahi_package() {
/etc/avahi/avahi-dnsconfd.action"
depends="dbus"
pkg_install() {
vmove etc
vmove usr
vmove all
}
}