- add patch to skip which dependency, updated pci.ids; rel 3

Changed files:
    pciutils.spec -> 1.100

diff --git a/pciutils.spec b/pciutils.spec
index 3b5f816e49331a2a2518c32ae9b662e4fbdcf04d..00490834c25bcc32f1bf2f780acd5a039f09e621 100644 (file)
--- a/pciutils.spec
+++ b/pciutils.spec
@@ -17,7 +17,7 @@ Summary(uk.UTF-8):    Утиліти роботи з PCI пристроями
 Summary(zh_CN.UTF-8):  PCI 总线相关的工具。
 Name:          pciutils
 Version:       2.2.9
-Release:       2
+Release:       3
 License:       GPL v2+
 Group:         Applications/System
 Source0:       ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz
@@ -25,9 +25,10 @@ Source0:     ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: 1ac48f433b1995044e14c24513992211
 Source2:       http://pciids.sourceforge.net/pci.ids
-# NoSource2-md5:       f6b2aef20568e6a86444ef0e06f9a785
+# NoSource2-md5:       835ec8d54ffd16348ec4a97c2920edd4
 Patch0:                %{name}-pci_h.patch
 Patch1:                %{name}-pcimodules.patch
+Patch2:                %{name}-nowhich.patch
 URL:           http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml
 BuildRequires: zlib-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -236,10 +237,11 @@ enheter kopplade till PCI-bussen.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 # paranoid check whether pci.ids in _sourcedir isn't too old
-if [ "`wc -l < %{SOURCE2}`" -lt "`wc -l < pci.ids`" ] ; then
-       echo "pci.ids needs to be updated"
+if [ $(wc -l < %{SOURCE2}) -lt $(wc -l < pci.ids) ] ; then
+       : pci.ids needs to be updated
        exit 1
 fi
 cp -f %{SOURCE2} .