From bfa61b16731001eb33735f64c18b147a6a9e03893079efb3d96dce52a3cfbb69 Mon Sep 17 00:00:00 2001
From: Anna Maresova <anicka@suse.com>
Date: Thu, 10 Dec 2009 13:47:48 +0000
Subject: [PATCH] - update to 3.1.4  * Updated pci.ids to the today's snapshot
 of the database.  * Fixed memory and file descriptor leak in the dump
 back-end.  * The SR-IOV capability decoder now prints the VF BAR's.  * On
 request of certain company's lawyers, we now include a copy    of the GPL
 with our package. It seems that the pciutils are getting    mature if the
 most important bug of the month was this one ;-)

OBS-URL: https://build.opensuse.org/package/show/Base:System/pciutils?expand=0&rev=10
---
 pciutils-3.1.3.tar.bz2                        |  3 ---
 ...close.patch => pciutils-3.1.4-fclose.patch |  0
 pciutils-3.1.4.tar.bz2                        |  3 +++
 ...ig.patch => pciutils-3.1.4_pkgconfig.patch |  0
 pciutils.changes                              | 16 ++++++++++++
 pciutils.spec                                 |  6 ++---
 update-pciutils-dist                          | 25 +++++++++++--------
 7 files changed, 35 insertions(+), 18 deletions(-)
 delete mode 100644 pciutils-3.1.3.tar.bz2
 rename pciutils-3.1.3-fclose.patch => pciutils-3.1.4-fclose.patch (100%)
 create mode 100644 pciutils-3.1.4.tar.bz2
 rename pciutils-3.1.3_pkgconfig.patch => pciutils-3.1.4_pkgconfig.patch (100%)

diff --git a/pciutils-3.1.3.tar.bz2 b/pciutils-3.1.3.tar.bz2
deleted file mode 100644
index 06a0d17..0000000
--- a/pciutils-3.1.3.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6a3de80921e493c52e5c69f6d399a511b0ebc0464d10dcdda3924cd42ae69c78
-size 271733
diff --git a/pciutils-3.1.3-fclose.patch b/pciutils-3.1.4-fclose.patch
similarity index 100%
rename from pciutils-3.1.3-fclose.patch
rename to pciutils-3.1.4-fclose.patch
diff --git a/pciutils-3.1.4.tar.bz2 b/pciutils-3.1.4.tar.bz2
new file mode 100644
index 0000000..f8ea1e6
--- /dev/null
+++ b/pciutils-3.1.4.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:38acb0e479d4096d5cbb805e64aa1362d70215d73271fbba227b32efb45ba13a
+size 276864
diff --git a/pciutils-3.1.3_pkgconfig.patch b/pciutils-3.1.4_pkgconfig.patch
similarity index 100%
rename from pciutils-3.1.3_pkgconfig.patch
rename to pciutils-3.1.4_pkgconfig.patch
diff --git a/pciutils.changes b/pciutils.changes
index b24c938..54d79b8 100644
--- a/pciutils.changes
+++ b/pciutils.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Thu Dec 10 14:45:15 CET 2009 - anicka@suse.cz
+
+- update to 3.1.4
+ * Updated pci.ids to the today's snapshot of the database.
+ * Fixed memory and file descriptor leak in the dump back-end.
+ * The SR-IOV capability decoder now prints the VF BAR's.
+ * On request of certain company's lawyers, we now include a copy
+   of the GPL with our package. It seems that the pciutils are getting
+   mature if the most important bug of the month was this one ;-)
+
+-------------------------------------------------------------------
+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..7fb407e 100644
--- a/pciutils.spec
+++ b/pciutils.spec
@@ -19,8 +19,8 @@
 
 
 Name:           pciutils
-Version:        3.1.3
-Release:        3
+Version:        3.1.4
+Release:        4
 BuildRequires:  zlib-devel
 BuildRequires:  licenses
 Requires:       licenses
@@ -39,7 +39,6 @@ Source:         %{name}-%{version}.tar.bz2
 Source1:        COPYING
 Patch:          update-pciutils-dist
 Patch1:         %{name}-%{version}_pkgconfig.patch
-Patch2:         %{name}-%{version}-fclose.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -85,7 +84,6 @@ Authors:
 %setup -q
 %patch -p1
 %patch1
-%patch2
 
 %build
 make OPT="$RPM_OPT_FLAGS -Wall" PREFIX=%{_prefix} LIBDIR=/%{_lib} SBINDIR=/sbin STRIP="" SHARED="yes"
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.