diff options
| author | Jan Palus | 2022-12-16 09:25:55 (GMT) |
|---|---|---|
| committer | Jan Palus | 2022-12-16 09:25:55 (GMT) |
| commit | 4c3fdd69caefc1ae669d0f66f01979cab9a53fae (patch) | |
| tree | 7439ecd62bc0b74a5b3ac51ac562f7f2a98deaed | |
| parent | 3250c5e9d2c6d6b4893873205f5c2f0a63664182 (diff) | |
| download | pciutils-4c3fdd69caefc1ae669d0f66f01979cab9a53fae.zip pciutils-4c3fdd69caefc1ae669d0f66f01979cab9a53fae.tar.gz | |
up to 3.9.0auto/th/pciutils-3.9.0-1
| -rw-r--r-- | hwdata.patch | 10 | ||||
| -rw-r--r-- | pciutils-pcimodules.patch | 10 | ||||
| -rw-r--r-- | pciutils.spec | 4 |
3 files changed, 14 insertions, 10 deletions
diff --git a/hwdata.patch b/hwdata.patch index 014ea7f..a7fa8c7 100644 --- a/hwdata.patch +++ b/hwdata.patch @@ -9,14 +9,18 @@ MANDIR:=$(shell if [ -d $(PREFIX)/share/man ] ; then echo $(PREFIX)/share/man ; else echo $(PREFIX)/man ; fi) INCDIR=$(PREFIX)/include LIBDIR=$(PREFIX)/lib ---- 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 @@ +--- pciutils-3.9.0/Makefile.orig 2022-12-16 10:21:43.588532476 +0100 ++++ pciutils-3.9.0/Makefile 2022-12-16 10:23:46.251274298 +0100 +@@ -152,11 +152,13 @@ $(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),) + ifneq ($(IDSDIR),) $(INSTALL) -c -m 644 $(PCI_IDS) $(DESTDIR)$(IDSDIR) + else + $(INSTALL) -c -m 644 $(PCI_IDS) $(DESTDIR)$(SBINDIR) + endif +endif $(INSTALL) -c -m 644 lspci.8 setpci.8 update-pciids.8 $(DESTDIR)$(MANDIR)/man8 $(INSTALL) -c -m 644 pcilib.7 $(DESTDIR)$(MANDIR)/man7 diff --git a/pciutils-pcimodules.patch b/pciutils-pcimodules.patch index 1bf9aef..4bbd01b 100644 --- a/pciutils-pcimodules.patch +++ b/pciutils-pcimodules.patch @@ -4,18 +4,18 @@ export --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) +-all: lib/$(PCIIMPLIB) lspci$(EXEEXT) setpci$(EXEEXT) example$(EXEEXT) lspci.8 setpci.8 pcilib.7 pci.ids.5 update-pciids update-pciids.8 $(PCI_IDS) ++all: lib/$(PCIIMPLIB) 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 + lib/$(PCIIMPLIB): $(PCIINC) force $(MAKE) -C lib all @@ -60,6 +60,7 @@ COMMON+=compat/getopt.o endif +pcimodules: pcimodules.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) + 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/$(PCIIMPLIB) + setpci$(EXEEXT): setpci.o $(COMMON) lib/$(PCIIMPLIB) --- 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 diff --git a/pciutils.spec b/pciutils.spec index 1989ca3..5362435 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.8.0 +Version: 3.9.0 Release: 1 License: GPL v2+ Group: Applications/System Source0: https://mj.ucw.cz/download/linux/pci/%{name}-%{version}.tar.gz -# Source0-md5: 5d51d046ab0dc10c9a28e0f5a9f85276 +# Source0-md5: 357496ae1652aac66cad0d2de2d831d0 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 |