From b013af48c93d3e4846a169287024341fba76640d Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 23 Apr 2010 17:51:25 +0200 Subject: [PATCH] avahi: move so symlinks into main pkg. --HG-- extra : convert_revision : 33a512ff933824f4e98e972f42a9f7b18162e2f4 --- srcpkgs/avahi/avahi-compat-libs-devel.template | 4 ++-- srcpkgs/avahi/avahi-compat-libs.template | 6 ++++-- srcpkgs/avahi/avahi-glib-libs-devel.template | 3 ++- srcpkgs/avahi/avahi-glib-libs.template | 6 +++--- srcpkgs/avahi/avahi-libs-devel.template | 4 +--- srcpkgs/avahi/avahi-libs.template | 8 +++++--- srcpkgs/avahi/avahi-ui-libs-devel.template | 3 ++- srcpkgs/avahi/avahi-ui-libs.template | 4 ++-- 8 files changed, 21 insertions(+), 17 deletions(-) diff --git a/srcpkgs/avahi/avahi-compat-libs-devel.template b/srcpkgs/avahi/avahi-compat-libs-devel.template index 87343f76ffd..07c3364bb00 100644 --- a/srcpkgs/avahi/avahi-compat-libs-devel.template +++ b/srcpkgs/avahi/avahi-compat-libs-devel.template @@ -6,6 +6,8 @@ long_desc="${long_desc} This package contains development files for the HOWL compatibility libraries provided by Avahi." +revision=1 + Add_dependency run avahi-libs-devel Add_dependency run avahi-compat-libs @@ -14,9 +16,7 @@ do_install() mkdir -p ${DESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/include mv ${SRCPKGDESTDIR}/usr/include/avahi-compat* ${DESTDIR}/usr/include - mv ${SRCPKGDESTDIR}/usr/lib/libhowl.so ${DESTDIR}/usr/lib mv ${SRCPKGDESTDIR}/usr/lib/libhowl.a ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/libdns_sd.so ${DESTDIR}/usr/lib mv ${SRCPKGDESTDIR}/usr/lib/libdns_sd.a ${DESTDIR}/usr/lib mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig/avahi-compat* \ ${DESTDIR}/usr/lib/pkgconfig diff --git a/srcpkgs/avahi/avahi-compat-libs.template b/srcpkgs/avahi/avahi-compat-libs.template index f70eb73a531..8a3f99531f5 100644 --- a/srcpkgs/avahi/avahi-compat-libs.template +++ b/srcpkgs/avahi/avahi-compat-libs.template @@ -6,6 +6,8 @@ long_desc="${long_desc} This package contains howl/mDNSResponder compatibility shared libraries provided by Avahi." +revision=1 + Add_dependency run glibc Add_dependency run libssp Add_dependency run dbus-libs @@ -14,6 +16,6 @@ Add_dependency run avahi-libs do_install() { mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/libhowl.so.* ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/libdns_sd.so.* ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/libhowl.so* ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/libdns_sd.so* ${DESTDIR}/usr/lib } diff --git a/srcpkgs/avahi/avahi-glib-libs-devel.template b/srcpkgs/avahi/avahi-glib-libs-devel.template index 734f6fa9718..01f3da12ab9 100644 --- a/srcpkgs/avahi/avahi-glib-libs-devel.template +++ b/srcpkgs/avahi/avahi-glib-libs-devel.template @@ -6,6 +6,8 @@ long_desc="${long_desc} This package contains development files for the glib libraries provided by Avahi." +revision=1 + Add_dependency run glibc-devel Add_dependency run avahi-libs-devel Add_dependency run glib-devel @@ -15,7 +17,6 @@ do_install() mkdir -p ${DESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/include mv ${SRCPKGDESTDIR}/usr/include/avahi-g* ${DESTDIR}/usr/include - mv ${SRCPKGDESTDIR}/usr/lib/libavahi-g*.so ${DESTDIR}/usr/lib mv ${SRCPKGDESTDIR}/usr/lib/libavahi-g*.a ${DESTDIR}/usr/lib mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig/avahi-g* \ ${DESTDIR}/usr/lib/pkgconfig diff --git a/srcpkgs/avahi/avahi-glib-libs.template b/srcpkgs/avahi/avahi-glib-libs.template index 0d3bed94a41..891201b6d34 100644 --- a/srcpkgs/avahi/avahi-glib-libs.template +++ b/srcpkgs/avahi/avahi-glib-libs.template @@ -5,7 +5,7 @@ long_desc="${long_desc} This package contains the glib shared libraries provided by Avahi." -revision=1 +revision=2 Add_dependency run glibc Add_dependency run libssp @@ -17,6 +17,6 @@ do_install() { mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/libavahi-glib.so.* ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/libavahi-gobject.so.* ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/libavahi-glib.so* ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/libavahi-gobject.so* ${DESTDIR}/usr/lib } diff --git a/srcpkgs/avahi/avahi-libs-devel.template b/srcpkgs/avahi/avahi-libs-devel.template index 9aa57f95413..39b3e660251 100644 --- a/srcpkgs/avahi/avahi-libs-devel.template +++ b/srcpkgs/avahi/avahi-libs-devel.template @@ -6,7 +6,7 @@ long_desc="${long_desc} This package contains development files for the core libraries provided by Avahi." -revision=1 +revision=2 Add_dependency run glibc-devel Add_dependency run libssp-devel @@ -20,8 +20,6 @@ do_install() for f in common client core; do mv ${SRCPKGDESTDIR}/usr/include/avahi-${f} \ ${DESTDIR}/usr/include - mv ${SRCPKGDESTDIR}/usr/lib/libavahi-${f}.so \ - ${DESTDIR}/usr/lib mv ${SRCPKGDESTDIR}/usr/lib/libavahi-${f}.a \ ${DESTDIR}/usr/lib done diff --git a/srcpkgs/avahi/avahi-libs.template b/srcpkgs/avahi/avahi-libs.template index 9df9f624bb7..ad59ee25ef4 100644 --- a/srcpkgs/avahi/avahi-libs.template +++ b/srcpkgs/avahi/avahi-libs.template @@ -5,6 +5,8 @@ long_desc="${long_desc} This package contains core shared libraries provided by Avahi." +revision=1 + Add_dependency run glibc Add_dependency run libssp Add_dependency run dbus-libs @@ -13,7 +15,7 @@ do_install() { mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/libavahi-client.so.* ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/libavahi-core.so.* ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/libavahi-common.so.* ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/libavahi-client.so* ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/libavahi-core.so* ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/libavahi-common.so* ${DESTDIR}/usr/lib } diff --git a/srcpkgs/avahi/avahi-ui-libs-devel.template b/srcpkgs/avahi/avahi-ui-libs-devel.template index 64d6e4fbeec..38f7b9a2eb8 100644 --- a/srcpkgs/avahi/avahi-ui-libs-devel.template +++ b/srcpkgs/avahi/avahi-ui-libs-devel.template @@ -6,6 +6,8 @@ long_desc="${long_desc} This package contains development files for the UI libraries provided by Avahi." +revision=1 + Add_dependency run glibc-devel Add_dependency run avahi-libs-devel Add_dependency run gtk+-devel @@ -16,7 +18,6 @@ do_install() mkdir -p ${DESTDIR}/usr/lib ${DESTDIR}/usr/include mv ${SRCPKGDESTDIR}/usr/include/avahi-ui ${DESTDIR}/usr/include - mv ${SRCPKGDESTDIR}/usr/lib/libavahi-ui.so ${DESTDIR}/usr/lib mv ${SRCPKGDESTDIR}/usr/lib/libavahi-ui.a ${DESTDIR}/usr/lib mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib } diff --git a/srcpkgs/avahi/avahi-ui-libs.template b/srcpkgs/avahi/avahi-ui-libs.template index 4f128464e2a..6bb8219f7e8 100644 --- a/srcpkgs/avahi/avahi-ui-libs.template +++ b/srcpkgs/avahi/avahi-ui-libs.template @@ -5,7 +5,7 @@ long_desc="${long_desc} This package contains the UI shared libraries provided by Avahi." -revision=1 +revision=2 Add_dependency run glibc Add_dependency run avahi-libs @@ -24,5 +24,5 @@ Add_dependency run gdbm do_install() { mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/libavahi-ui.so.* ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/libavahi-ui.so* ${DESTDIR}/usr/lib }