aboutsummaryrefslogtreecommitdiffstats
path: root/community/modemmanager
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2017-03-24 06:15:21 +0000
committerWilliam Pitcock <nenolod@dereferenced.org>2017-03-24 06:34:48 +0000
commit4ccd40d505d0dd0bf67e956a6b805b18e3668f7c (patch)
treebb76c37d9d25976956dcd359cd5b918698c51124 /community/modemmanager
parent3ef1bf1d5a48a63944f8b32ac03c0a20a8d66fde (diff)
downloadaports-4ccd40d505d0dd0bf67e956a6b805b18e3668f7c.tar.bz2
aports-4ccd40d505d0dd0bf67e956a6b805b18e3668f7c.tar.xz
community/modemmanager: fix pc:mm-glib capability being declared by two different packages at once
Diffstat (limited to 'community/modemmanager')
-rw-r--r--community/modemmanager/APKBUILD7
1 files changed, 3 insertions, 4 deletions
diff --git a/community/modemmanager/APKBUILD b/community/modemmanager/APKBUILD
index a326ef2b0f..8ae3bd9070 100644
--- a/community/modemmanager/APKBUILD
+++ b/community/modemmanager/APKBUILD
@@ -2,14 +2,14 @@
# Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
pkgname=modemmanager
pkgver=1.6.4
-pkgrel=0
+pkgrel=1
pkgdesc="ModemManager library"
url="http://www.freedesktop.org/wiki/Software/ModemManager"
arch="all"
license="GPL2, LGPL2.1"
makedepends="$depends_dev gobject-introspection-dev gtk-doc intltool vala
libgudev-dev polkit-dev libmbim-dev libqmi-dev linux-headers"
-subpackages="$pkgname-dev $pkgname-lang $pkgname-doc libmm-glib:libmm libmm-glib-dev:libmmdev"
+subpackages="$pkgname-lang $pkgname-doc libmm-glib:libmm libmm-glib-dev:libmmdev $pkgname-dev"
source="http://www.freedesktop.org/software/ModemManager/ModemManager-$pkgver.tar.xz
$pkgname.rules
"
@@ -47,8 +47,7 @@ libmmdev() {
mkdir -p "$subpkgdir/usr/lib/pkgconfig"
mv "${subpkgdir%*-dev}/usr/include" "$subpkgdir/usr/"
mv "${subpkgdir%*-dev}/usr/share" "$subpkgdir/usr/"
- mv "$pkgdir-dev"/usr/lib/pkgconfig/mm-glib.pc "$subpkgdir"/usr/lib/pkgconfig/
- rmdir "$pkgdir-dev"/usr/include/libmm-glib # in libmm-glib-dev
+ mv "$pkgdir"/usr/lib/pkgconfig/mm-glib.pc "$subpkgdir"/usr/lib/pkgconfig/
}
package() {