SPECS: pciutils.spec - add patch to skip which dependency, updated...

Tue Apr 15 02:47:37 CEST 2008

Author: glen                         Date: Tue Apr 15 00:47:37 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- add patch to skip which dependency, updated pci.ids; rel 3

---- Files affected:
SPECS:
   pciutils.spec (1.99 -> 1.100) 

---- Diffs:

================================================================
Index: SPECS/pciutils.spec
diff -u SPECS/pciutils.spec:1.99 SPECS/pciutils.spec:1.100

--- SPECS/pciutils.spec:1.99	Wed Jan 23 17:19:25 2008
+++ SPECS/pciutils.spec	Tue Apr 15 02:47:32 2008
@@ -18,7 +18,7 @@
 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
@@ -26,9 +26,10 @@
 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)
@@ -237,10 +238,11 @@
 %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} .
@@ -311,6 +313,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.100  2008-04-15 00:47:32  glen
+- add patch to skip which dependency, updated pci.ids; rel 3
+
 Revision 1.99  2008-01-23 16:19:25  tommat
 - updated pci.ids
 
@@ -494,7 +499,7 @@
 - release 3
 
 Revision 1.43  2002/07/02 23:11:06  ankry
-- added -fomit-frame-pointer tp OPT in %%build (lspci segfautls sometimes
+- added -fomit-frame-pointer tp OPT in %build (lspci segfautls sometimes
   otherwise)
 - s/-p/-P/ in lspci.man (pciutils-man.patch)
 - release 2, STBR
@@ -506,13 +511,13 @@
 - added paranoid check for pci.ids file
 
 Revision 1.40  2002/05/28 21:45:27  qboosh
-- new %%doc (without .lsm file - rpm header replaces it)
+- new %doc (without .lsm file - rpm header replaces it)
 
 Revision 1.39  2002/05/28 12:19:24  ankry
 - version 2.1.10, release 1
 - removed obsolete patch (pciutils-pcix.patch)
 - using pci.ids snapshot instead of enclosed into tarball
-STBR
+  STBR
 
 Revision 1.38  2002/02/23 04:17:26  kloczek
 - adapterized.
@@ -525,7 +530,7 @@
 - adding es/fr/pt_BR/ru/uk (and eventually de) Group translations
 
 Revision 1.35  2002/01/18 02:14:09  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.34  2001/12/27 08:45:01  qboosh
 - typo
@@ -553,13 +558,13 @@
 - release 19: merge lsi, moremega patches from rawhide.
 
 Revision 1.27  2001/04/30 16:05:26  kloczek
-- added using %%{rpmcflags} macro.
+- added using %{rpmcflags} macro.
 
 Revision 1.26  2001/03/15 06:22:59  kloczek
 - release 18.
 
 Revision 1.25  2001/03/09 17:08:53  qboosh
-- missing dir in pci-devel: %%{_includedir}/pci
+- missing dir in pci-devel: %{_includedir}/pci
 
 Revision 1.24  2001/02/28 05:00:40  kloczek
 - release 17,
@@ -576,22 +581,22 @@
 - use rpm automation.
 
 Revision 1.21  2000/06/09 07:23:27  kloczek
-- added using %%{__make} macro.
+- added using %{__make} macro.
 
 Revision 1.20  2000/05/21 15:41:28  kloczek
 - updated to 2.1.8,
-- %%{_libdir} changed to %%{_prefix}/lib.
+- %{_libdir} changed to %{_prefix}/lib.
 
 Revision 1.19  2000/05/20 21:58:00  kloczek
 - spec adapterized.
 
 Revision 1.18  2000/05/15 01:41:34  kloczek
-- fix: added missing %%defattr() in devel,
+- fix: added missing %defattr() in devel,
 - spec adapterized.
 
 Revision 1.17  2000/05/06 22:16:13  pawelk
-Added devel subpckage. In this subpacakge are files reqired for build
-PLD-installer
+- Added devel subpckage. In this subpacakge are files reqired for build
+  PLD-installer
 
 Revision 1.16  2000/04/21 05:16:19  kloczek
 - updated to 2.1.6,
@@ -631,21 +636,4 @@
 - release 2.
 
 Revision 1.6  1999/07/12 23:06:12  kloczek
-- added using CVS keywords in %%changelog (for automating them).
-
-* Sun May  2 1999 Tomasz Kłoczko <kloczek at rudy.mif.pg.gda.pl>
-  [1.99.5-1]
-- added gzippping %%doc and man pages,
-- added Group(pl),
-- pci.ids moved to %%{_datadir} and removed trom them %%config (this data file,
-  not %%config).
-
-* Mon Oct 26 1998 Wojtek Ślusarczyk <wojtek at shadow.eu.org>
-  [1.08-1d]
-- updated to 1.08,
-- minor changes.
-
-* Tue Sep 29 1998 Krzysztof G. Baranowski <kgb at knm.org.pl>
-  [1.07-1d]
-- build from non-root account against glibc-2.1,
-- written spec from scratch.
+- added using CVS keywords in %changelog (for automating them).
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/pciutils.spec?r1=1.99&r2=1.100&f=u

