From 01eddf6788ea7d2981d47909f4efd44bb4679877 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 3 Oct 2011 17:38:31 +0200 Subject: [PATCH] NetworkManager: split library related stuff into libnm subpkg. --- .../NetworkManager-devel.template | 25 ++++++------------- srcpkgs/NetworkManager/depends | 2 +- srcpkgs/NetworkManager/libnm.template | 24 ++++++++++++++++++ srcpkgs/NetworkManager/template | 17 +++++-------- srcpkgs/libnm | 1 + xbps-src/common/mapping_shlib_binpkg.txt | 6 ++--- 6 files changed, 43 insertions(+), 32 deletions(-) create mode 100644 srcpkgs/NetworkManager/libnm.template create mode 120000 srcpkgs/libnm diff --git a/srcpkgs/NetworkManager/NetworkManager-devel.template b/srcpkgs/NetworkManager/NetworkManager-devel.template index 6b13b83ea8..8bcc1f185b 100644 --- a/srcpkgs/NetworkManager/NetworkManager-devel.template +++ b/srcpkgs/NetworkManager/NetworkManager-devel.template @@ -5,27 +5,18 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." -Add_dependency run pkg-config +revision=1 + Add_dependency run libuuid-devel Add_dependency run nss-devel -Add_dependency run nspr-devel -Add_dependency run dbus-glib-devel -Add_dependency run dbus-devel -Add_dependency run glib-devel -Add_dependency run libgudev-devel -Add_dependency run pkg-config -Add_dependency run intltool -Add_dependency run wireless_tools-devel -Add_dependency run libnl-devel Add_dependency run polkit-devel -Add_dependency run ppp-devel -Add_dependency run iptables-devel -Add_dependency run NetworkManager +Add_dependency run dbus-glib-devel +Add_dependency run libgudev-devel +Add_dependency run libnm do_install() { - mkdir -p ${DESTDIR}/usr/{lib,share} - mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/share/gir* ${DESTDIR}/usr/share + vmove usr/include usr + vmove usr/lib/pkgconfig usr/lib + vmove usr/share/gir-1.0 usr/share } diff --git a/srcpkgs/NetworkManager/depends b/srcpkgs/NetworkManager/depends index e3955c234d..6eedd31fbf 100644 --- a/srcpkgs/NetworkManager/depends +++ b/srcpkgs/NetworkManager/depends @@ -1,2 +1,2 @@ -abi_depends=">=0.8.998" +abi_depends=">=0.9.1.90" api_depends="${abi_depends}" diff --git a/srcpkgs/NetworkManager/libnm.template b/srcpkgs/NetworkManager/libnm.template new file mode 100644 index 0000000000..cbe84b4f1f --- /dev/null +++ b/srcpkgs/NetworkManager/libnm.template @@ -0,0 +1,24 @@ +# Template file for 'libnm'. +# +short_desc="${sourcepkg} - shared libraries" +long_desc="${long_desc} + + This package contains a convenience library to ease the access to + NetworkManager." + +replaces="NetworkManager<0.9.1.90_1" + +Add_dependency run glibc +Add_dependency run libuuid +Add_dependency run nspr +Add_dependency run nss +Add_dependency run glib +Add_dependency run dbus-libs +Add_dependency run dbus-glib +Add_dependency run libgudev + +do_install() +{ + vmove "usr/lib/*.so*" usr/lib + vmove "usr/lib/girepository-*" usr/lib +} diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template index 3e3db20199..2735d35df4 100644 --- a/srcpkgs/NetworkManager/template +++ b/srcpkgs/NetworkManager/template @@ -1,6 +1,7 @@ # Template file for 'NetworkManager' pkgname=NetworkManager version=0.9.1.90 +revision=1 distfiles="${GNOME_SITE}/$pkgname/0.9/$pkgname-$version.tar.xz" build_style=gnu_configure configure_args="--localstatedir=/var --with-distro=gentoo @@ -23,14 +24,10 @@ long_desc=" keep_empty_dirs=yes openrc_services="NetworkManager default true" conf_files="/etc/NetworkManager/NetworkManager.conf" -subpackages="$pkgname-devel" +subpackages="$pkgname-devel libnm" Add_dependency run glibc -Add_dependency run wireless_tools -Add_dependency run libnl -Add_dependency run polkit -Add_dependency run ppp -Add_dependency run iptables +Add_dependency run libnm Add_dependency run libuuid Add_dependency run nss Add_dependency run nspr @@ -38,17 +35,15 @@ Add_dependency run dbus-glib Add_dependency run dbus-libs Add_dependency run glib Add_dependency run libgudev +Add_dependency run libnl +Add_dependency run polkit Add_dependency build pkg-config +Add_dependency build intltool Add_dependency build libuuid-devel Add_dependency build nss-devel -Add_dependency build nspr-devel Add_dependency build dbus-glib-devel -Add_dependency build dbus-devel -Add_dependency build glib-devel Add_dependency build libgudev-devel -Add_dependency build pkg-config -Add_dependency build intltool Add_dependency build wireless_tools-devel Add_dependency build libnl-devel Add_dependency build polkit-devel diff --git a/srcpkgs/libnm b/srcpkgs/libnm new file mode 120000 index 0000000000..494d576b33 --- /dev/null +++ b/srcpkgs/libnm @@ -0,0 +1 @@ +NetworkManager \ No newline at end of file diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt index d9aa875535..ed3e0f34d6 100644 --- a/xbps-src/common/mapping_shlib_binpkg.txt +++ b/xbps-src/common/mapping_shlib_binpkg.txt @@ -575,9 +575,9 @@ libip6tc.so iptables iptables-devel libxtables.so iptables iptables-devel libip4tc.so iptables iptables-devel libipq.so iptables iptables-devel -libnm-util.so NetworkManager NetworkManager-devel -libnm-glib.so NetworkManager NetworkManager-devel -libnm-glib-vpn.so NetworkManager NetworkManager-devel +libnm-util.so libnm NetworkManager-devel +libnm-glib.so libnm NetworkManager-devel +libnm-glib-vpn.so libnm NetworkManager-devel libpanel-applet-4.so gnome-panel gnome-panel-devel libgnome-control-center.so gnome-control-center gnome-control-center-devel libboost_date_time.so.1.44 boost boost-devel