diff --git a/pciutils-2.2.4-multilib.patch b/pciutils-2.2.4-multilib.patch index 74d53a7..2a1584c 100644 --- a/pciutils-2.2.4-multilib.patch +++ b/pciutils-2.2.4-multilib.patch @@ -1,6 +1,6 @@ --- pciutils-2.2.4/lib/configure.multilib 2006-09-09 13:06:10.000000000 +0200 -+++ pciutils-2.2.4/lib/configure 2007-01-26 13:09:31.000000000 +0100 -@@ -35,74 +35,60 @@ ++++ pciutils-2.2.4/lib/configure 2007-04-02 11:49:55.000000000 +0200 +@@ -35,74 +35,62 @@ zlib=$5 c=config.h @@ -25,6 +25,8 @@ +#define PCI_ARCH_S390X +#elif defined(__s390__) +#define PCI_ARCH_S390 ++#elif defined(__alpha__) ++#define PCI_ARCH_ALPHA +#else +#error Unknown Arch +#endif @@ -122,7 +124,7 @@ echo " dump" echo_n "Checking for zlib support... " -@@ -124,6 +110,8 @@ +@@ -124,6 +112,8 @@ echo >>$c '#define PCI_IDS "pci.ids"' fi echo >>$c "#define PCI_PATH_IDS_DIR \"$idsdir\"" diff --git a/pciutils.spec b/pciutils.spec index c99d9f2..6f9291d 100644 --- a/pciutils.spec +++ b/pciutils.spec @@ -1,6 +1,6 @@ Name: pciutils Version: 2.2.4 -Release: 1 +Release: 2%{?dist} Source: ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz Patch0: pciutils-strip.patch Patch1: pciutils-2.2.4-buf.patch @@ -11,10 +11,10 @@ Patch7: pciutils-2.1.99-gcc4.patch Patch8: pciutils-2.2.4-multilib.patch License: GPL URL: http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml -Buildroot: %{_tmppath}/%{name}-%{version}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveOS: Linux Requires: hwdata -Summary: PCI bus related utilities. +Summary: PCI bus related utilities Group: Applications/System %description @@ -24,7 +24,7 @@ require kernel version 2.1.82 or newer (which support the /proc/bus/pci interface). %package devel -Summary: Linux PCI development library. +Summary: Linux PCI development library Group: Development/Libraries %description devel @@ -42,7 +42,7 @@ devices connected to the PCI bus. %patch8 -p1 -b .multilib %build -make OPT="$RPM_OPT_FLAGS -D_GNU_SOURCE=1" PREFIX="/usr" IDSDIR="/usr/share/hwdata" +make OPT="$RPM_OPT_FLAGS -D_GNU_SOURCE=1" PREFIX="/usr" IDSDIR="/usr/share/hwdata" %{?_smp_mflags} %install @@ -72,6 +72,11 @@ install lib/types.h $RPM_BUILD_ROOT%{_includedir}/pci rm -rf $RPM_BUILD_ROOT %changelog +* Mon Apr 2 2007 Harald Hoyer - 2.2.4-2 +- added alpha to multilib patch (#231790) +- specfile cleanup +- Resolves: rhbz#231790 + * Fri Jan 26 2007 Harald Hoyer - 2.2.4-1 - version 2.2.4 - truncate long device names (#205948)