From cf021ea8bfd69a5b338a6ea8beecb5c5dd2b81b463ce842c5a53a8a7940f4f5e Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Mon, 16 Nov 2009 09:46:17 +0000
Subject: [PATCH] Accepting request 24438 from Base:System

Copy from Base:System/pciutils based on submit request 24438 from user msmeissn

OBS-URL: https://build.opensuse.org/request/show/24438
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pciutils?expand=0&rev=22
---
 pciutils.changes     |  5 +++++
 pciutils.spec        |  2 +-
 update-pciutils-dist | 25 ++++++++++++++-----------
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/pciutils.changes b/pciutils.changes
index b24c938..756546c 100644
--- a/pciutils.changes
+++ b/pciutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Nov  3 19:09:37 UTC 2009 - coolo@novell.com
+
+- updated patches to apply with fuzz=0
+
 -------------------------------------------------------------------
 Fri Aug 14 17:30:05 CEST 2009 - anicka@suse.cz
 
diff --git a/pciutils.spec b/pciutils.spec
index df717fb..246e066 100644
--- a/pciutils.spec
+++ b/pciutils.spec
@@ -20,7 +20,7 @@
 
 Name:           pciutils
 Version:        3.1.3
-Release:        3
+Release:        4
 BuildRequires:  zlib-devel
 BuildRequires:  licenses
 Requires:       licenses
diff --git a/update-pciutils-dist b/update-pciutils-dist
index 2687aec..86c6547 100644
--- a/update-pciutils-dist
+++ b/update-pciutils-dist
@@ -1,8 +1,8 @@
-Index: pciutils-2.2.4/update-pciids.sh
-================================================================================
---- pciutils-2.2.6/Makefile
-+++ pciutils-2.2.6/Makefile
-@@ -47,7 +47,7 @@
+Index: pciutils-3.1.3/Makefile
+===================================================================
+--- pciutils-3.1.3.orig/Makefile
++++ pciutils-3.1.3/Makefile
+@@ -78,7 +78,7 @@ setpci.o: setpci.c pciutils.h $(PCIINC)
  common.o: common.c pciutils.h $(PCIINC)
  
  update-pciids: update-pciids.sh
@@ -10,10 +10,12 @@ Index: pciutils-2.2.4/update-pciids.sh
 +	sed <$< >$@ "s@^DEST=.*@DEST=$(IDSDIR)/pci.ids.d/pci.ids.dist@;s@^PCI_COMPRESSED_IDS=.*@PCI_COMPRESSED_IDS=@"
  	chmod +x $@
  
- %.8: %.man
---- pciutils-2.2.6/update-pciids.sh
-+++ pciutils-2.2.6/update-pciids.sh
-@@ -2,7 +2,7 @@
+ # The example of use of libpci
+Index: pciutils-3.1.3/update-pciids.sh
+===================================================================
+--- pciutils-3.1.3.orig/update-pciids.sh
++++ pciutils-3.1.3/update-pciids.sh
+@@ -4,7 +4,7 @@
  
  set -e
  SRC="http://pciids.sourceforge.net/v2.2/pci.ids"
@@ -22,7 +24,7 @@ Index: pciutils-2.2.4/update-pciids.sh
  PCI_COMPRESSED_IDS=
  GREP=grep
  
-@@ -54,5 +54,11 @@
+@@ -65,6 +65,12 @@ if [ -f $DEST ] ; then
  fi
  mv $DEST.neww $DEST
  rm $DEST.new
@@ -33,4 +35,5 @@ Index: pciutils-2.2.4/update-pciids.sh
 +	cp -p $DEST /usr/share/pci.ids
 +fi
  
- echo "Done."
+ # Older versions did not compress the ids file, so let's make sure we
+ # clean that up.