[packages/pciutils] up to 3.8.0

[atler]

commit 3250c5e9d2c6d6b4893873205f5c2f0a63664182
Author: Jan Palus <atler at pld-linux.org>
Date:   Sat Apr 30 00:41:29 2022 +0200

    up to 3.8.0

 hwdata.patch              |  8 ++++----
 pciutils-nowhich.patch    |  2 +-
 pciutils-pci_h.patch      |  4 ++--
 pciutils-pcimodules.patch | 12 ++++++------
 pciutils.spec             |  5 +++--
 5 files changed, 16 insertions(+), 15 deletions(-)
---
diff --git a/pciutils.spec b/pciutils.spec
index e3c4d03..1989ca3 100644
--- a/pciutils.spec
+++ b/pciutils.spec
@@ -20,12 +20,12 @@ Summary(sv.UTF-8):	PCI-bussrelaterade verktyg
 Summary(uk.UTF-8):	Утиліти роботи з PCI пристроями
 Summary(zh_CN.UTF-8):	PCI 总线相关的工具。
 Name:		pciutils
-Version:	3.7.0
+Version:	3.8.0
 Release:	1
 License:	GPL v2+
 Group:		Applications/System
 Source0:	https://mj.ucw.cz/download/linux/pci/%{name}-%{version}.tar.gz
-# Source0-md5:	51554c538b5a57b61123326e14ea28a1
+# Source0-md5:	5d51d046ab0dc10c9a28e0f5a9f85276
 Source1:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5:	1ac48f433b1995044e14c24513992211
 Patch0:		%{name}-pci_h.patch
@@ -314,6 +314,7 @@ rm -rf $RPM_BUILD_ROOT
 	PREFIX=%{_prefix} \
 	LIBDIR=%{_libdir} \
 	SBINDIR=%{_sbindir} \
+	LSPCIDIR=%{_sbindir}
 
 install -d $RPM_BUILD_ROOT/%{_lib}
 mv $RPM_BUILD_ROOT%{_libdir}/libpci.so.* $RPM_BUILD_ROOT/%{_lib}
diff --git a/hwdata.patch b/hwdata.patch
index 87aba91..014ea7f 100644
--- a/hwdata.patch
+++ b/hwdata.patch
@@ -1,7 +1,7 @@
 --- pciutils-3.0.0/Makefile.idpath	2008-04-10 21:19:43.000000000 +0200
 +++ pciutils-3.0.0/Makefile	2008-09-01 15:16:19.000000000 +0200
 @@ -27,7 +27,7 @@ ABI_VERSION=.3
- PREFIX=/usr/local
+ BINDIR=$(PREFIX)/bin
  SBINDIR=$(PREFIX)/sbin
  SHAREDIR=$(PREFIX)/share
 -IDSDIR=$(SHAREDIR)
@@ -12,12 +12,12 @@
 --- pciutils-3.1.10/Makefile~	2013-01-19 22:36:24.000000000 +0200
 +++ pciutils-3.1.10/Makefile	2013-01-19 22:44:19.146531267 +0200
 @@ -104,7 +104,9 @@
- 	$(DIRINSTALL) -m 755 $(DESTDIR)$(SBINDIR) $(DESTDIR)$(IDSDIR) $(DESTDIR)$(MANDIR)/man8 $(DESTDIR)$(MANDIR)/man7
- 	$(INSTALL) -c -m 755 $(STRIP) lspci setpci $(DESTDIR)$(SBINDIR)
+ 	$(INSTALL) -c -m 755 $(STRIP) lspci$(EXEEXT) $(DESTDIR)$(LSPCIDIR)
+ 	$(INSTALL) -c -m 755 $(STRIP) setpci$(EXEEXT) $(DESTDIR)$(SBINDIR)
  	$(INSTALL) -c -m 755 update-pciids $(DESTDIR)$(SBINDIR)
 +ifneq ($(PCI_IDS),)
  	$(INSTALL) -c -m 644 $(PCI_IDS) $(DESTDIR)$(IDSDIR)
 +endif
  	$(INSTALL) -c -m 644 lspci.8 setpci.8 update-pciids.8 $(DESTDIR)$(MANDIR)/man8
  	$(INSTALL) -c -m 644 pcilib.7 $(DESTDIR)$(MANDIR)/man7
- ifeq ($(SHARED),yes)
+ 	$(INSTALL) -c -m 644 pci.ids.5 $(DESTDIR)$(MANDIR)/man5
diff --git a/pciutils-nowhich.patch b/pciutils-nowhich.patch
index 279e1b8..0118f6a 100644
--- a/pciutils-nowhich.patch
+++ b/pciutils-nowhich.patch
@@ -19,7 +19,7 @@
 -if which curl >/dev/null 2>&1 ; then
 +if [ -x /usr/bin/curl ]; then
  	DL="curl -o $DEST.new $SRC"
-     ${quiet} && DL="$DL -s -S"
+ 	${quiet} && DL="$DL -s -S"
 -elif which wget >/dev/null 2>&1 ; then
 +elif [ -x /usr/bin/curl ]; then
  	DL="wget --no-timestamping -O $DEST.new $SRC"
diff --git a/pciutils-pci_h.patch b/pciutils-pci_h.patch
index 04bc634..4741efd 100644
--- a/pciutils-pci_h.patch
+++ b/pciutils-pci_h.patch
@@ -9,5 +9,5 @@
 +#include "pci/pci.h"
 +#include "pci/sysdep.h"
  
- #ifdef PCI_OS_WINDOWS
- #include "compat/getopt.h"
+ /*
+  * gcc predefines macro __MINGW32__ for all MinGW targets.
diff --git a/pciutils-pcimodules.patch b/pciutils-pcimodules.patch
index 4c86593..1bf9aef 100644
--- a/pciutils-pcimodules.patch
+++ b/pciutils-pcimodules.patch
@@ -4,18 +4,18 @@
  
  export
  
--all: lib/$(PCILIB) lspci setpci example lspci.8 setpci.8 pcilib.7 pci.ids.5 update-pciids update-pciids.8 $(PCI_IDS)
-+all: lib/$(PCILIB) lspci setpci pcimodules example lspci.8 setpci.8 pcilib.7 pci.ids.5 update-pciids update-pciids.8 $(PCI_IDS)
+-all: lib/$(PCILIB) lspci$(EXEEXT) setpci$(EXEEXT) example$(EXEEXT) lspci.8 setpci.8 pcilib.7 pci.ids.5 update-pciids update-pciids.8 $(PCI_IDS)
++all: lib/$(PCILIB) lspci$(EXEEXT) setpci$(EXEEXT) pcimodules example$(EXEEXT) lspci.8 setpci.8 pcilib.7 pci.ids.5 update-pciids update-pciids.8 $(PCI_IDS)
  
  lib/$(PCILIB): $(PCIINC) force
  	$(MAKE) -C lib all
 @@ -60,6 +60,7 @@
- lib/config.h lib/config.mk:
- 	cd lib && ./configure
+ COMMON+=compat/getopt.o
+ endif
  
 +pcimodules: pcimodules.o common.o lib/$(PCILIB)
- lspci: lspci.o ls-vpd.o ls-caps.o ls-caps-vendor.o ls-ecaps.o ls-kernel.o ls-tree.o ls-map.o common.o lib/$(PCILIB)
- setpci: setpci.o common.o lib/$(PCILIB)
+ lspci$(EXEEXT): lspci.o ls-vpd.o ls-caps.o ls-caps-vendor.o ls-ecaps.o ls-kernel.o ls-tree.o ls-map.o $(COMMON) lib/$(PCILIB)
+ setpci$(EXEEXT): setpci.o $(COMMON) lib/$(PCILIB)
  
 --- pciutils-2.1.11/pcimodules.c.pix	2003-01-04 23:06:00.000000000 +0100
 +++ pciutils-2.1.11/pcimodules.c	2003-01-04 23:06:00.000000000 +0100
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/pciutils.git/commitdiff/3250c5e9d2c6d6b4893873205f5c2f0a63664182