SHA256
1
0
forked from pool/pciutils
OBS User unknown 2007-01-29 16:09:19 +00:00 committed by Git OBS Bridge
parent 033a5b6ec7
commit f6cfb001b4
3 changed files with 10 additions and 3 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Jan 29 13:39:09 CET 2007 - anicka@suse.cz
- change dependency from python to perl in update-pciids [#221276]
-------------------------------------------------------------------
Sat Jan 20 01:36:12 CET 2007 - garloff@suse.de

View File

@ -12,7 +12,7 @@
Name: pciutils
Version: 2.2.4
Release: 17
Release: 18
%define ver 2.2.4
Requires: pciutils-ids
Autoreqprov: on
@ -92,6 +92,8 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libpci.a
%changelog -n pciutils
* Mon Jan 29 2007 - anicka@suse.cz
- change dependency from python to perl in update-pciids [#221276]
* 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]

View File

@ -18,10 +18,10 @@ Index: pciutils-2.2.4/update-pciids.sh
fi
mv $DEST.neww $DEST
rm $DEST.new
+if [ -x /usr/bin/merge-pciids -a -x /usr/bin/python ]; then
+if [ -x /usr/bin/merge-pciids -a -x /usr/bin/perl ]; then
+ merge-pciids
+else
+ echo "WARNING: merge-pciids or python missing"
+ echo "WARNING: merge-pciids or perl missing"
+ cp -p $DEST /usr/share/pci.ids
+fi