From b8b563e976ec0c0fcf8f2f9120c7d0f803d40eed Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@fedoraproject.org>
Date: Thu, 12 Jul 2007 08:48:40 +0000
Subject: [PATCH] - fixed update-pciids.sh

---
 pciutils-update-pciids.patch | 11 -----------
 pciutils.spec                |  7 +++++--
 2 files changed, 5 insertions(+), 13 deletions(-)
 delete mode 100644 pciutils-update-pciids.patch

diff --git a/pciutils-update-pciids.patch b/pciutils-update-pciids.patch
deleted file mode 100644
index f434f7e..0000000
--- a/pciutils-update-pciids.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pciutils-2.1.99-test8/Makefile.update-pciids	2006-02-23 12:07:05.000000000 +0100
-+++ pciutils-2.1.99-test8/Makefile	2006-02-23 12:07:34.000000000 +0100
-@@ -50,7 +50,7 @@
- common.o: common.c pciutils.h $(PCIINC)
- 
- update-pciids: update-pciids.sh
--	sed <$< >$@ "s@^DEST=.*@DEST=$(SHAREDIR)/pci.ids@"
-+	sed <$< >$@ "s@^DEST=.*@DEST=$(SHAREDIR)/hwdata/pci.ids@"
- 
- %.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#@SHAREDIR@#$(SHAREDIR)#"
diff --git a/pciutils.spec b/pciutils.spec
index 4421046..b21e23a 100644
--- a/pciutils.spec
+++ b/pciutils.spec
@@ -1,6 +1,6 @@
 Name:		pciutils
 Version:	2.2.6
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Source:		ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz
 Patch0:		pciutils-strip.patch
 Patch1: 	pciutils-2.2.4-buf.patch
@@ -45,7 +45,7 @@ devices connected to the PCI bus.
 sed -i -e 's/^SRC=.*/SRC="http:\/\/pciids.sourceforge.net\/pci.ids"/' update-pciids.sh
 
 %build
-make OPT="$RPM_OPT_FLAGS -D_GNU_SOURCE=1" PREFIX="/usr" IDSDIR="/usr/share/hwdata"  %{?_smp_mflags}
+make OPT="$RPM_OPT_FLAGS -D_GNU_SOURCE=1" PREFIX="/usr" IDSDIR="/usr/share/hwdata" PCI_IDS="pci.ids" %{?_smp_mflags}
 
 
 %install
@@ -75,6 +75,9 @@ install lib/types.h $RPM_BUILD_ROOT%{_includedir}/pci
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Jul 12 2007 Harald Hoyer <harald@redhat.com> - 2.2.6-2
+- fixed update-pciids.sh
+
 * Wed Jun 27 2007 Harald Hoyer <harald@redhat.com> - 2.2.6-1
 - version 2.2.6
 - fixed URL in update-pciids.sh