fbc62d411f
update to version 3.1.9 OBS-URL: https://build.opensuse.org/request/show/101923 OBS-URL: https://build.opensuse.org/package/show/Base:System/pciutils?expand=0&rev=32
39 lines
1.3 KiB
Plaintext
39 lines
1.3 KiB
Plaintext
diff -aur pciutils-3.1.9.orig/Makefile pciutils-3.1.9/Makefile
|
|
--- pciutils-3.1.9.orig/Makefile 2012-01-14 09:07:55.000000000 -0500
|
|
+++ pciutils-3.1.9/Makefile 2012-01-28 21:03:25.072209962 -0500
|
|
@@ -78,7 +78,7 @@
|
|
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 $@
|
|
|
|
# The example of use of libpci
|
|
diff -aur pciutils-3.1.9.orig/update-pciids.sh pciutils-3.1.9/update-pciids.sh
|
|
--- pciutils-3.1.9.orig/update-pciids.sh 2012-01-14 09:29:38.000000000 -0500
|
|
+++ pciutils-3.1.9/update-pciids.sh 2012-01-28 21:05:57.719301612 -0500
|
|
@@ -4,7 +4,7 @@
|
|
|
|
set -e
|
|
SRC="http://pci-ids.ucw.cz/v2.2/pci.ids"
|
|
-DEST=pci.ids
|
|
+DEST=pci.ids.d/pci.ids.dist
|
|
PCI_COMPRESSED_IDS=
|
|
GREP=grep
|
|
|
|
@@ -66,6 +66,13 @@
|
|
mv $DEST.neww $DEST
|
|
rm $DEST.new
|
|
|
|
+if [ -x /usr/bin/merge-pciids -a -x /usr/bin/perl ]; then
|
|
+ merge-pciids
|
|
+else
|
|
+ echo "WARNING: merge-pciids or perl missing"
|
|
+ cp -p $DEST /usr/share/pci.ids
|
|
+fi
|
|
+
|
|
# Older versions did not compress the ids file, so let's make sure we
|
|
# clean that up.
|
|
if [ ${DEST%.gz} != ${DEST} ] ; then
|