Date: Thursday, January 26, 2017 @ 12:00:56 Author: heftig Revision: 287505
1.6.0-2: Fix splitting Modified: networkmanager/trunk/PKGBUILD ----------+ PKGBUILD | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-01-26 11:58:27 UTC (rev 287504) +++ PKGBUILD 2017-01-26 12:00:56 UTC (rev 287505) @@ -9,7 +9,7 @@ pkgbase=networkmanager pkgname=(networkmanager libnm libnm-glib) pkgver=1.6.0 -pkgrel=1 +pkgrel=2 pkgdesc="Network connection manager and user applications" arch=(i686 x86_64) license=(GPL2 LGPL2.1) @@ -131,29 +131,32 @@ install -Dm644 ../20-connectivity.conf \ "$pkgdir/usr/lib/NetworkManager/conf.d/20-connectivity.conf" -### Split libnm-glib - - cd ../libnm-glib - mv "$pkgdir"/usr/include/libnm-glib usr/include - mv "$pkgdir"/usr/lib/girepository-1.0/NMClient* usr/lib/girepository-1.0 - mv "$pkgdir"/usr/lib/libnm-{glib,util}* usr/lib - mv "$pkgdir"/usr/lib/pkgconfig/libnm-{glib,util}* usr/lib/pkgconfig - mv "$pkgdir"/usr/share/gir-1.0/NMClient* usr/share/gir-1.0 - mv "$pkgdir"/usr/share/gtk-doc/html/libnm-{glib,util} usr/share/gtk-doc/html - mv "$pkgdir"/usr/share/vala/vapi/libnm-{glib,util}* usr/share/vala/vapi - ### Split libnm cd ../libnm mv "$pkgdir"/usr/include/libnm usr/include - mv "$pkgdir"/usr/lib/girepository-1.0/NM* usr/lib/girepository-1.0 - mv "$pkgdir"/usr/lib/libnm* usr/lib - mv "$pkgdir"/usr/lib/pkgconfig/libnm* usr/lib/pkgconfig - mv "$pkgdir"/usr/share/gir-1.0/NM* usr/share/gir-1.0 + mv "$pkgdir"/usr/lib/girepository-1.0/NM-* usr/lib/girepository-1.0 + mv "$pkgdir"/usr/lib/libnm.* usr/lib + mv "$pkgdir"/usr/lib/pkgconfig/libnm.pc usr/lib/pkgconfig + mv "$pkgdir"/usr/share/gir-1.0/NM-* usr/share/gir-1.0 mv "$pkgdir"/usr/share/gtk-doc/html/libnm usr/share/gtk-doc/html - mv "$pkgdir"/usr/share/vala/vapi/libnm* usr/share/vala/vapi + mv "$pkgdir"/usr/share/vala/vapi/libnm.* usr/share/vala/vapi - rmdir -p --ignore-fail-on-non-empty "$pkgdir"/{run/NetworkManager,usr/share/vala/vapi} +### Split libnm-glib + + cd ../libnm-glib + mv "$pkgdir"/usr/include/* usr/include + mv "$pkgdir"/usr/lib/girepository-1.0/* usr/lib/girepository-1.0 + mv "$pkgdir"/usr/lib/libnm-* usr/lib + mv "$pkgdir"/usr/lib/pkgconfig/* usr/lib/pkgconfig + mv "$pkgdir"/usr/share/gir-1.0/* usr/share/gir-1.0 + mv "$pkgdir"/usr/share/gtk-doc/html/libnm-* usr/share/gtk-doc/html + mv "$pkgdir"/usr/share/vala/vapi/* usr/share/vala/vapi + + rmdir -p --ignore-fail-on-non-empty \ + "$pkgdir"/{run/NetworkManager,usr/include} \ + "$pkgdir"/usr/lib/{girepository-1.0,pkgconfig} \ + "$pkgdir"/usr/share/{gir-1.0,vala/vapi} } package_libnm() {