X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=pciutils%2Fpciutils.nm;h=edcf016aea33624ca0346b938717f8bfc023e5df;hb=00c7738998cb850983426e6e8229313ad06d8b5d;hp=e67831e6b4a11dcb802b6e240745ab62ca5e43d2;hpb=203539d956d7d38568a3fd130941d1ef3aeef3f1;p=people%2Fms%2Fipfire-3.x.git

diff --git a/pciutils/pciutils.nm b/pciutils/pciutils.nm
index e67831e6b..edcf016ae 100644
--- a/pciutils/pciutils.nm
+++ b/pciutils/pciutils.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = pciutils
-version    = 3.1.9
+version    = 3.2.0
 release    = 1
 
 groups     = System/Base
@@ -21,36 +21,34 @@ source_dl  = ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/
 sources    = %{thisapp}.tar.gz
 
 build
+	requires
+		kmod-devel
+	end
+
 	build
 		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
 		# Install binaries.
-		mkdir -pv %{BUILDROOT}/sbin %{BUILDROOT}%{sbindir}
-		install -p lspci setpci %{BUILDROOT}/sbin
-		install -p update-pciids %{BUILDROOT}/%{sbindir}
+		mkdir -pv %{BUILDROOT}%{sbindir}
+		install -p lspci setpci 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
 
 		# 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}%{libdir}
+		install -p lib/libpci.so.%{version} %{BUILDROOT}%{libdir}
+		ln -svf libpci.so.%{version} %{BUILDROOT}%{libdir}/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/config.h %{BUILDROOT}%{includedir}/pci
 		install -p lib/types.h %{BUILDROOT}%{includedir}/pci
 
 		# Install pkg-config files.