diff --git a/srcpkgs/network-manager-applet/libnm-gtk.rshlibs b/srcpkgs/network-manager-applet/libnm-gtk.rshlibs index 4c882634427..54b1c5e5f53 100644 --- a/srcpkgs/network-manager-applet/libnm-gtk.rshlibs +++ b/srcpkgs/network-manager-applet/libnm-gtk.rshlibs @@ -3,14 +3,11 @@ libgtk-3.so.0 libgdk-3.so.0 libatk-1.0.so.0 libgio-2.0.so.0 -libpangoft2-1.0.so.0 libpangocairo-1.0.so.0 libgdk_pixbuf-2.0.so.0 libcairo-gobject.so.2 libcairo.so.2 libpango-1.0.so.0 -libfreetype.so.6 -libfontconfig.so.1 libnm-glib.so.4 libnm-util.so.2 libnm-glib-vpn.so.1 @@ -18,7 +15,6 @@ libdbus-glib-1.so.2 libdbus-1.so.3 libpthread.so.0 libgobject-2.0.so.0 -libgthread-2.0.so.0 libgmodule-2.0.so.0 librt.so.1 libgnome-keyring.so.0 diff --git a/srcpkgs/network-manager-applet/libnm-gtk.template b/srcpkgs/network-manager-applet/libnm-gtk.template index 7168686903c..3276cff26bc 100644 --- a/srcpkgs/network-manager-applet/libnm-gtk.template +++ b/srcpkgs/network-manager-applet/libnm-gtk.template @@ -1,6 +1,5 @@ # Template file for 'libnm-gtk'. # -revision=1 short_desc="${sourcepkg} - runtime library" long_desc="${long_desc} @@ -8,7 +7,6 @@ long_desc="${long_desc} replaces="${sourcepkg}<0.9.1.95" -do_install() -{ +do_install() { vmove "usr/lib/*.so*" usr/lib } diff --git a/srcpkgs/network-manager-applet/network-manager-applet-devel.template b/srcpkgs/network-manager-applet/network-manager-applet-devel.template index 2d493457b90..aa8a98e0689 100644 --- a/srcpkgs/network-manager-applet/network-manager-applet-devel.template +++ b/srcpkgs/network-manager-applet/network-manager-applet-devel.template @@ -6,11 +6,12 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." Add_dependency run gtk+3-devel -Add_dependency run NetworkManager-devel -Add_dependency run libnm-gtk +Add_dependency run NetworkManager-devel ">=0.9.3.997" +Add_dependency run libnm-gtk ">=${version}" -do_install() -{ +noarch=yes + +do_install() { vmove usr/include usr vmove usr/lib/pkgconfig usr/lib } diff --git a/srcpkgs/network-manager-applet/network-manager-applet.rshlibs b/srcpkgs/network-manager-applet/network-manager-applet.rshlibs index 436ea9861a5..d528974ddf8 100644 --- a/srcpkgs/network-manager-applet/network-manager-applet.rshlibs +++ b/srcpkgs/network-manager-applet/network-manager-applet.rshlibs @@ -2,19 +2,15 @@ libnm-gtk.so.0 libgconf-2.so.4 libnm-glib-vpn.so.1 libgnome-keyring.so.0 -libgnome-bluetooth.so.8 libgtk-3.so.0 libgdk-3.so.0 libatk-1.0.so.0 libgio-2.0.so.0 -libpangoft2-1.0.so.0 libpangocairo-1.0.so.0 libgdk_pixbuf-2.0.so.0 libcairo-gobject.so.2 libcairo.so.2 libpango-1.0.so.0 -libfreetype.so.6 -libfontconfig.so.1 libgmodule-2.0.so.0 libnm-util.so.2 libnm-glib.so.4 @@ -22,9 +18,9 @@ libdbus-glib-1.so.2 libdbus-1.so.3 libpthread.so.0 libgobject-2.0.so.0 -libgthread-2.0.so.0 librt.so.1 libglib-2.0.so.0 libc.so.6 libm.so.6 x86_64 libnotify.so.4 +libgnome-bluetooth.so.10 diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template index 12c208a699a..08543cf9c25 100644 --- a/srcpkgs/network-manager-applet/template +++ b/srcpkgs/network-manager-applet/template @@ -1,17 +1,16 @@ # Template file for 'network-manager-applet' pkgname=network-manager-applet -version=0.9.2.0 +version=0.9.3.997 distfiles="${GNOME_SITE}/$pkgname/0.9/$pkgname-$version.tar.xz" build_style=gnu-configure configure_args="--disable-schemas-install --with-gconf-schema-file-dir=/usr/share/gconf/schemas --with-bluetooth --disable-static" -revision=1 short_desc="NetworkManager panel applet for GNOME" maintainer="Juan RP " homepage="http://www.gnome.org/projects/NetworkManager/" license="GPL-2" -checksum=ebe725d0140f658c6a3f384674c72fba7a7c417df3be0e84ee8f45e6dfc219de +checksum=076c6bd3499a36de78d801f255126729267bc19d708a68766c1da7babf529a7b long_desc=" NetworkManager attempts to keep an active network connection available at all times. It is intended only for the desktop use-case, and is not intended for @@ -47,8 +46,7 @@ Add_dependency build polkit-devel Add_dependency full iso-codes -post_install() -{ +post_install() { mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc} gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${gconf_schemas} \ --domain nm-applet ${wrksrc}/*.schemas