diff options
| author | Chris Cromer | 2017-01-28 18:33:52 -0300 |
|---|---|---|
| committer | Chris Cromer | 2017-01-28 18:33:52 -0300 |
| commit | 71106a851e9eaafc193f7e85539f99461db07156 (patch) | |
| tree | 09222dae64d40c57b55df062ae0e14ae08b4338f | |
| parent | 21b9baebc6b4e99e71e515da59a84a2a78ac95fc (diff) | |
| download | aur-71106a851e9eaafc193f7e85539f99461db07156.tar.gz | |
networkmanager 1.6.0
| -rw-r--r-- | PKGBUILD | 15 |
1 files changed, 8 insertions, 7 deletions
@@ -13,7 +13,7 @@ _pppver=2.4.7 pkgname=networkmanager-consolekit-noscan -pkgver=1.4.4 +pkgver=1.6.0 pkgrel=1 pkgdesc="Network Management daemon with scan disabled after connection established" arch=('i686' 'x86_64') @@ -106,10 +106,13 @@ check() { package() { cd NetworkManager-$pkgver make DESTDIR="$pkgdir" install - make DESTDIR="$pkgdir" -C libnm uninstall - make DESTDIR="$pkgdir" -C libnm-glib uninstall - make DESTDIR="$pkgdir" -C libnm-util uninstall - make DESTDIR="$pkgdir" -C vapi uninstall + + # remove conflicting files from libnm, etc + rm ${pkgdir}/usr/lib/libnm* + rm ${pkgdir}/usr/share/vala/vapi/libnm* + rm -rf ${pkgdir}/usr/lib/girepository-1.0/* + rm -rf ${pkgdir}/usr/share/gir-1.0 + rm -rf ${pkgdir}/usr/share/gtk-doc # Some stuff to move is left over rm -r "$pkgdir/usr/include" @@ -119,8 +122,6 @@ package() { install -m755 -d "$pkgdir/etc/NetworkManager/dnsmasq.d" rm -r "$pkgdir/var/run" - rmdir -p --ignore-fail-on-non-empty \ - "$pkgdir"/usr/{share/{vala/vapi,gir-1.0},lib/girepository-1.0} install -dm 750 -o polkitd "${pkgdir}"/usr/share/polkit-1/rules.d |