pci.ids moved from pciutils to hwdata

diff --git a/hwdata.spec b/hwdata.spec
index 7fb74d7b150c11059ecde42b146cc605072306be..f9b6ca07ea72fef2a4267a49f3d1116bf47b5d24 100644 (file)
--- a/hwdata.spec
+++ b/hwdata.spec
@@ -1,5 +1,5 @@
 # TODO
-# - make this primary db of pci/usb/oui/pnp/blacklist db (merge usbutils, pciutils, ieee-oui, pnputils, kmod/module-init-tools) ?
+# - make this primary db of pci/usb/oui/pnp/blacklist db (merge usbutils, ieee-oui, pnputils, kmod/module-init-tools) ?
 # - merge (switch?) with http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-apps/hwids ?
 #   their db contains Hardware (PCI, USB, OUI, IAB) IDs databases: https://github.com/gentoo/hwids
 Summary:       Hardware identification and configuration data
@@ -13,10 +13,10 @@ Group:              Applications/System
 Source0:       https://fedorahosted.org/releases/h/w/hwdata/%{name}-%{version}.tar.bz2
 # Source0-md5: 98615d098bafb7bad1ae5912c073edc7
 Requires:      ieee-oui
-Requires:      pciutils
 Requires:      pnputils
 Requires:      usbutils
 Conflicts:     Xconfigurator < 4.9.42-1
+Conflicts:     pciutils < 3.1.10-3
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -39,7 +39,6 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-ln -sf %{_sysconfdir}/pci.ids $RPM_BUILD_ROOT%{_datadir}/hwdata/pci.ids
 ln -sf %{_sysconfdir}/usb.ids $RPM_BUILD_ROOT%{_datadir}/hwdata/usb.ids
 ln -sf %{_datadir}/misc/pnp.ids $RPM_BUILD_ROOT%{_datadir}/hwdata/pnp.ids
 ln -sf %{_datadir}/oui.txt $RPM_BUILD_ROOT%{_datadir}/hwdata/oui.txt