From 0acd4b81cc0b6de5cdaa17bbedab36ff5b1e448f Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 27 Apr 2013 16:03:03 +0200
Subject: [PATCH] pciutils: Update to 3.2.0.

---
 pciutils/multilibconfig.h |  9 ---------
 pciutils/pciutils.nm      | 24 +++++++++++-------------
 2 files changed, 11 insertions(+), 22 deletions(-)
 delete mode 100644 pciutils/multilibconfig.h

diff --git a/pciutils/multilibconfig.h b/pciutils/multilibconfig.h
deleted file mode 100644
index 8bce82305..000000000
--- a/pciutils/multilibconfig.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#if defined(__x86_64__) || defined(__ia64__) || defined(__ppc64__) || defined(__powerpc64__) || defined(__s390x__)
-#include "config.lib64.h"
-#elif defined(__sparc__) && defined (__arch64__)
-#include "config.lib64.h"
-#elif defined(__i386__) || defined(__ppc__)  || defined(__powerpc__) || defined(__s390__) || defined(__alpha__) || defined(__sparc__) || defined(__sh__) || defined(__arm__)
-#include "config.lib.h"
-#else
-#error Unknown Arch
-#endif
diff --git a/pciutils/pciutils.nm b/pciutils/pciutils.nm
index edf0fc439..edcf016ae 100644
--- a/pciutils/pciutils.nm
+++ b/pciutils/pciutils.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = pciutils
-version    = 3.1.10
+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.
-- 
2.47.3