Merge remote-tracking branch 'stevee/pixman'

[people/amarx/ipfire-3.x.git] / pciutils / pciutils.nm

diff --git a/pciutils/pciutils.nm b/pciutils/pciutils.nm
index d04677ab131d166dff6d8f5dfbf3aa4b40e8973c..e67831e6b4a11dcb802b6e240745ab62ca5e43d2 100644 (file)
--- a/pciutils/pciutils.nm
+++ b/pciutils/pciutils.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = pciutils
-version    = 3.1.7
-release    = 2
+version    = 3.1.9
+release    = 1
 
 groups     = System/Base
 url        = http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml
@@ -17,24 +17,45 @@ description
        and setting devices connected to the PCI bus.
 end
 
-source_dl  =
-sources    = %{thisapp}.tar.bz2
+source_dl  = ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/
+sources    = %{thisapp}.tar.gz
 
 build
        build
-               make SHARED=yes OPT="%{CFLAGS}" PREFIX=/usr \
+               make SHARED=yes OPT="%{CFLAGS}" PREFIX=/usr STRIP="" \
                        IDSDIR=/usr/share/hwdata ZLIB=no %{PARALLELISMFLAGS}
+
+               #fix lib vs. lib64 in libpci.pc (static Makefile is used)
+               sed -i "s|^libdir=.*$|libdir=/%{lib}|" lib/libpci.pc
        end
 
        install
-               make SHARED=yes PREFIX=/usr install DESTDIR=%{BUILDROOT} \
-                       IDSDIR=/usr/share/hwdata MANDIR=/usr/share/man
+               # Install binaries.
+               mkdir -pv %{BUILDROOT}/sbin %{BUILDROOT}%{sbindir}
+               install -p lspci setpci %{BUILDROOT}/sbin
+               install -p update-pciids %{BUILDROOT}/%{sbindir}
+
+               # Install man pages.
+               mkdir -pv %{BUILDROOT}%{mandir}/man8
+               install -p -m 644 lspci.8 setpci.8 update-pciids.8 %{BUILDROOT}%{mandir}/man8
 
-               mkdir -pv %{BUILDROOT}/usr/include/pci
-               install -v -m 644 %{DIR_APP}/lib/*.h %{BUILDROOT}/usr/include/pci
+               # Install libs.
+               mkdir -pv %{BUILDROOT}/%{lib} %{BUILDROOT}%{libdir}
+               install -p lib/libpci.so.* %{BUILDROOT}/%{lib}/
+               ln -s ../../%{lib}/$(basename %{BUILDROOT}/%{lib}/*.so.*.*.*) \
+                       %{BUILDROOT}%{libdir}/libpci.so
 
-               mkdir -pv %{BUILDROOT}/usr/lib
-               ln -svf libpci.so.3 %{BUILDROOT}/usr/lib/libpci.so
+               # Install headers.
+               mkdir -pv %{BUILDROOT}%{includedir}/pci
+               install -p lib/pci.h %{BUILDROOT}%{includedir}/pci
+               install -p lib/header.h %{BUILDROOT}%{includedir}/pci
+               install -p %{DIR_SOURCE}/multilibconfig.h %{BUILDROOT}%{includedir}/pci/config.h
+               install -p lib/config.h %{BUILDROOT}%{includedir}/pci/config.%{lib}.h
+               install -p lib/types.h %{BUILDROOT}%{includedir}/pci
+
+               # Install pkg-config files.
+               mkdir -pv %{BUILDROOT}%{libdir}/pkgconfig
+               install -p lib/libpci.pc %{BUILDROOT}%{libdir}/pkgconfig
        end
 end
 
@@ -45,6 +66,10 @@ packages
 
        package %{name}-libs
                template LIBS
+
+               requires
+                       /usr/share/hwdata/pci.ids
+               end
        end
 
        package %{name}-devel