OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pciutils?expand=0&rev=8

pciutils-2.2.7-class.diff

@@ -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)))
- 	{

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("<chain looped>\n");
+ 	  break;

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
 

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