From 033a5b6ec79fcfc5c5fadd2afde94e065bb0cc1b7c275e2ad745bd806cd0b900 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Sat, 20 Jan 2007 10:46:13 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/pciutils?expand=0&rev=2

---
 pci.ids.bz2          |  3 ---
 pciutils.changes     |  6 ++++++
 pciutils.spec        | 15 ++++++++++-----
 update-pciutils-dist | 43 +++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 59 insertions(+), 8 deletions(-)
 delete mode 100644 pci.ids.bz2
 create mode 100644 update-pciutils-dist

diff --git a/pci.ids.bz2 b/pci.ids.bz2
deleted file mode 100644
index 2f8adf8..0000000
--- a/pci.ids.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1e15c41ae071075cfe2cb9f38bee6768a98350a9bef6d17caa3ad7c38314b983
-size 112474
diff --git a/pciutils.changes b/pciutils.changes
index 43dec1f..713c086 100644
--- a/pciutils.changes
+++ b/pciutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Jan 20 01:36:12 CET 2007 - garloff@suse.de
+
+- Change update-pciids to download to pci.ids.d/pci.ids.dist
+  and call merge-pciids if possible. [FATE 301145, bug 221276] 
+
 -------------------------------------------------------------------
 Fri Oct 13 21:57:37 CEST 2006 - aj@suse.de
 
diff --git a/pciutils.spec b/pciutils.spec
index 257908a..192c93f 100644
--- a/pciutils.spec
+++ b/pciutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package pciutils (Version 2.2.4)
 #
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -12,18 +12,19 @@
 
 Name:           pciutils
 Version:        2.2.4
-Release:        2
+Release:        17
 %define ver   2.2.4
 Requires:       pciutils-ids
 Autoreqprov:    on
 Group:          Hardware/Other
-License:        GPL
+License:        GNU General Public License (GPL)
 Summary:        PCI-utilities for Kernel version 2.2 and newer
 URL:            http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml
 Source:         ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{ver}.tar.gz
 Patch0:         %{name}-%{ver}-class.diff
 Patch1:         %{name}-%{ver}-noabort.diff
 Patch2:         %{name}-%{ver}-strip.diff
+Patch3:         update-pciutils-dist
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -41,7 +42,7 @@ pci.ids file.
 
 Authors:
 --------
-    Martin Mares <mj@suse.cz>
+    Martin Mares <mj@ucw.cz>
 
 %package devel
 Group:          Development/Libraries/C and C++
@@ -55,13 +56,14 @@ development using the PCI-utilities.
 
 Authors:
 --------
-    Martin Mares <mj@suse.cz>
+    Martin Mares <mj@ucw.cz>
 
 %prep
 %setup -q -n %{name}-%{ver}
 %patch0
 %patch1
 %patch2
+%patch3 -p1
 
 %build
 make OPT="$RPM_OPT_FLAGS -Wall" PREFIX=%{_prefix} SBINDIR=/sbin
@@ -90,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libpci.a
 
 %changelog -n pciutils
+* Sat Jan 20 2007 - garloff@suse.de
+- Change update-pciids to download to pci.ids.d/pci.ids.dist
+  and call merge-pciids if possible. [FATE 301145, bug 221276]
 * Fri Oct 13 2006 - aj@suse.de
 - Fix to build (remove pci.ids.gz as well).
 * Fri Oct 13 2006 - mjancar@suse.cz
diff --git a/update-pciutils-dist b/update-pciutils-dist
new file mode 100644
index 0000000..2f75af7
--- /dev/null
+++ b/update-pciutils-dist
@@ -0,0 +1,43 @@
+Index: pciutils-2.2.4/update-pciids.sh
+===================================================================
+--- pciutils-2.2.4.orig/update-pciids.sh
++++ pciutils-2.2.4/update-pciids.sh
+@@ -1,9 +1,9 @@
+ #!/bin/sh
+ 
+ set -e
+ SRC="http://pciids.sourceforge.net/v2.2/pci.ids"
+-DEST=pci.ids
++DEST=pci.ids.d/pci.ids.dist
+ PCI_COMPRESSED_IDS=
+ GREP=grep
+ 
+ if [ -n "$PCI_COMPRESSED_IDS" ] ; then
+@@ -53,6 +53,12 @@ if [ -f $DEST ] ; then
+ 	chmod -f --reference=$DEST.old $DEST.neww 2>/dev/null || true
+ fi
+ mv $DEST.neww $DEST
+ rm $DEST.new
++if [ -x /usr/bin/merge-pciids -a -x /usr/bin/python ]; then
++	merge-pciids
++else
++	echo "WARNING: merge-pciids or python missing"
++	cp -p $DEST /usr/share/pci.ids
++fi
+ 
+ echo "Done."
+Index: pciutils-2.2.4/Makefile
+===================================================================
+--- pciutils-2.2.4.orig/Makefile
++++ pciutils-2.2.4/Makefile
+@@ -41,9 +41,9 @@ lspci.o: lspci.c pciutils.h $(PCIINC)
+ setpci.o: setpci.c pciutils.h $(PCIINC)
+ common.o: common.c pciutils.h $(PCIINC)
+ 
+ update-pciids: update-pciids.sh
+-	sed <$< >$@ "s@^DEST=.*@DEST=$(IDSDIR)/$(PCI_IDS)@;s@^PCI_COMPRESSED_IDS=.*@PCI_COMPRESSED_IDS=$(PCI_COMPRESSED_IDS)@"
++	sed <$< >$@ "s@^DEST=.*@DEST=$(IDSDIR)/pci.ids.d/pci.ids.dist@;s@^PCI_COMPRESSED_IDS=.*@PCI_COMPRESSED_IDS=@"
+ 	chmod +x $@
+ 
+ %.8: %.man
+ 	M=`echo $(DATE) | sed 's/-01-/-January-/;s/-02-/-February-/;s/-03-/-March-/;s/-04-/-April-/;s/-05-/-May-/;s/-06-/-June-/;s/-07-/-July-/;s/-08-/-August-/;s/-09-/-September-/;s/-10-/-October-/;s/-11-/-November-/;s/-12-/-December-/;s/\(.*\)-\(.*\)-\(.*\)/\3 \2 \1/'` ; sed <$< >$@ "s/@TODAY@/$$M/;s/@VERSION@/pciutils-$(VERSION)/;s#@IDSDIR@#$(IDSDIR)#"