From 37f67bff199ec210a743af4d268119436d71d26818d7cee0263d51f37f67c5dc Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 25 Oct 2007 00:40:00 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pciutils?expand=0&rev=8 --- pciutils-2.2.7-class.diff | 11 ----------- pciutils-2.2.7-ext_caps.diff | 11 +++++++++++ pciutils.changes | 7 +++++++ pciutils.spec | 9 ++++++--- 4 files changed, 24 insertions(+), 14 deletions(-) delete mode 100644 pciutils-2.2.7-class.diff create mode 100644 pciutils-2.2.7-ext_caps.diff diff --git a/pciutils-2.2.7-class.diff b/pciutils-2.2.7-class.diff deleted file mode 100644 index c5aeee8..0000000 --- a/pciutils-2.2.7-class.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/names.c -+++ lib/names.c -@@ -478,7 +478,7 @@ - return format_name_pair(buf, size, flags, v, d, numbuf); - case PCI_LOOKUP_CLASS: - icls = va_arg(args, int); -- sprintf(numbuf, "%04x", icls); -+ sprintf(numbuf, "Class %04x", icls); - cls = id_lookup(a, ID_SUBCLASS, icls >> 8, icls & 0xff, 0, 0); - if (!cls && (cls = id_lookup(a, ID_CLASS, icls >> 8, 0, 0, 0))) - { diff --git a/pciutils-2.2.7-ext_caps.diff b/pciutils-2.2.7-ext_caps.diff new file mode 100644 index 0000000..c9705cb --- /dev/null +++ b/pciutils-2.2.7-ext_caps.diff @@ -0,0 +1,11 @@ +--- lspci.c ++++ lspci.c +@@ -1437,7 +1437,7 @@ + break; + id = header & 0xffff; + printf("\tCapabilities: [%03x] ", where); +- if (been_there[where++]) ++ if (been_there[where]++) + { + printf("\n"); + break; diff --git a/pciutils.changes b/pciutils.changes index 1863a8b..3f25799 100644 --- a/pciutils.changes +++ b/pciutils.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Oct 24 15:19:12 CEST 2007 - anicka@suse.cz + +- drop the patch backporting upstream bug in + a machine readable output [#330533] +- fix typo in show_ext_caps in lspci + ------------------------------------------------------------------- Fri Oct 5 14:42:24 CEST 2007 - anicka@suse.cz diff --git a/pciutils.spec b/pciutils.spec index debe83f..7e3ba15 100644 --- a/pciutils.spec +++ b/pciutils.spec @@ -13,7 +13,7 @@ Name: pciutils BuildRequires: zlib-devel Version: 2.2.7 -Release: 1 +Release: 4 Requires: pciutils-ids AutoReqProv: on Group: Hardware/Other @@ -21,7 +21,7 @@ License: GPL v2 or later Summary: PCI-utilities for Kernel version 2.2 and newer Url: http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml Source: %{name}-%{version}.tar.bz2 -Patch0: %{name}-%{version}-class.diff +Patch0: %{name}-%{version}-ext_caps.diff Patch1: %{name}-%{version}-strip.diff Patch2: update-pciutils-dist BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -61,7 +61,6 @@ Authors: %prep %setup -q -n %{name}-%{version} -%patch0 %patch1 %patch2 -p1 @@ -91,6 +90,10 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/pci/ %{_libdir}/libpci.a %changelog +* Wed Oct 24 2007 - anicka@suse.cz +- drop the patch backporting upstream bug in + a machine readable output [#330533] +- fix typo in show_ext_caps in lspci * Fri Oct 05 2007 - anicka@suse.cz - update to 2.2.7 * lspci.c (show_caps, show_ext_caps): Detect and report loops in