diff options
| author | Leo <thinkabit.ukim@gmail.com> | 2019-08-11 23:40:18 -0300 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2019-08-12 10:04:36 +0000 |
| commit | bdc7c754c6a38f26236c3b977e155b7970343218 (patch) | |
| tree | 470bb5028bc90bc0c07365ca982baf93abf76d6d | |
| parent | a7cac6bb1a8c7ceb836c2bc3d3a901bf522c21aa (diff) | |
main/pciutils: fix conflict with hwids-pci by depending on it
Also fix license
| -rw-r--r-- | main/pciutils/APKBUILD | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/main/pciutils/APKBUILD b/main/pciutils/APKBUILD index d3c533910ad..5737dc72057 100644 --- a/main/pciutils/APKBUILD +++ b/main/pciutils/APKBUILD @@ -2,17 +2,16 @@ # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=pciutils pkgver=3.6.2 -pkgrel=0 +pkgrel=1 pkgdesc="PCI bus configuration space access library and tools" url="http://mj.ucw.cz/pciutils.html" arch="all" -license="GPL" -depends="hwdata-pci" +license="GPL-2.0-only" +depends="hwids-pci" makedepends="linux-headers" options="!check" -install= subpackages="$pkgname-doc $pkgname-dev $pkgname-libs" -source="https://www.kernel.org/pub/software/utils/$pkgname/$pkgname-$pkgver.tar.gz +source="https://www.kernel.org/pub/software/utils/pciutils/pciutils-$pkgver.tar.gz fix-linking-pci-malloc-Makefile.patch pread.patch " @@ -40,9 +39,13 @@ package() { ln -s libpci.so.${pkgver%%.*} "$pkgdir"/usr/lib/libpci.so install -D -m 644 lib/libpci.pc "$pkgdir"/usr/lib/pkgconfig/libpci.pc for i in config.h header.h pci.h types.h; do - install -D -m 644 lib/${i} "$pkgdir"/usr/include/pci/${i} + install -D -m 644 lib/$i "$pkgdir"/usr/include/pci/$i done + # this is now supplied by the hwids package + rm -rf "$pkgdir"/usr/sbin/update-pciids + rm -rf "$pkgdir"/usr/share/man/man8/update-pciids.8 + rm -rf "$pkgdir"/usr/share/hwdata } sha512sums="a9332f07755ab8af6ba99a5fa3cf739b0f3688276902673b9fe981955c4fa732c3d0ccaa150942ecaf4b263a10c2653f5454aa87492cac1dd805f33500fac489 pciutils-3.6.2.tar.gz |