[arch-commits] Commit in pciutils/trunk (PKGBUILD)

[Tom Gundersen]

    Date: Sunday, May 20, 2012 @ 19:15:36
  Author: tomegun
Revision: 159290

upgpkg: pciutils 3.1.9-2

rebuild for hwids

Modified:
  pciutils/trunk/PKGBUILD

----------+
 PKGBUILD |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-05-20 22:32:14 UTC (rev 159289)
+++ PKGBUILD	2012-05-20 23:15:36 UTC (rev 159290)
@@ -2,22 +2,19 @@
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 pkgname=pciutils
 pkgver=3.1.9
-pkgrel=1
+pkgrel=2
 pkgdesc="PCI bus configuration space access library and tools"
 arch=(i686 x86_64)
 license=('GPL2')
 groups=('base')
 url="http://mj.ucw.cz/sw/pciutils/"
-optdepends=('sh: required by update-pciids')
-makedepends=('wget')
-depends=('glibc')
+depends=('glibc' 'hwids')
 source=(#ftp://ftp.kernel.org/pub/software/utils/${pkgname}/${pkgname}-${pkgver}.tar.bz2
        ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${pkgname}-${pkgver}.tar.gz)
 md5sums=('e958f5ffb93b12972964381c38f27eb3')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./update-pciids.sh
   make OPT="${CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all
   cp lib/libpci.a "${srcdir}/"
   make clean
@@ -28,4 +25,6 @@
   cd "${srcdir}/${pkgname}-${pkgver}"
   make SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man DESTDIR="${pkgdir}" install install-lib
   install -m644 "${srcdir}/libpci.a" "${pkgdir}/usr/lib/"
+  # this is now supplied by the hwids package
+  rm -rf $pkgdir/usr/{sbin/update-pciids,share/{man/man8/update-pciids.8.gz,hwdata}}
 }