[packages/hwdata] package ieee oui database here

[glen]

commit e0c3ee0164b643c4477547b366b092340d7ecfa9
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Fri Mar 22 16:35:46 2013 +0200

    package ieee oui database here

 hwdata.spec | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/hwdata.spec b/hwdata.spec
index 89ecce7..1380f78 100644
--- a/hwdata.spec
+++ b/hwdata.spec
@@ -1,23 +1,28 @@
 # TODO
-# - make this primary db of oui/blacklist db (merge ieee-oui, kmod/module-init-tools) ?
+# - make this primary db of blacklist db (merge kmod/module-init-tools) ?
 # - merge (switch?) with http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-apps/hwids ?
 #   their db contains also OUI, IAB IDs databases: https://github.com/gentoo/hwids
 # - enable .gz if lshw has .gz support
 # NOTE: pnp.ids in pnputils package differ from that in hwdata
 # (hwdata pnp.ids contain only vendor IDs, pnputils pnp.ids contains only
 #  device IDs of (some) PNPACPI, PNPBIOS and ISAPNP devices)
+# - update to use oui.txt from this package:
+#   - hwdata-0.225-0.20090808.1.noarch
+#   - lshw-B.02.14-1.i686
+#   - python-netaddr-0.7.3-1.noarch
 Summary:	Hardware identification and configuration data
 Summary(pl.UTF-8):	Dane do identyfikacji i konfiguracji sprzętu
 Name:		hwdata
 # see hwdata.spec inside of tarball
 Version:	0.245
-Release:	1
+Release:	2
 License:	GPL v2+
 Group:		Applications/System
 Source0:	https://fedorahosted.org/releases/h/w/hwdata/%{name}-%{version}.tar.bz2
 # Source0-md5:	2b505f104a1d5bf4f1291599c671f866
-Requires:	ieee-oui
+Obsoletes:	ieee-oui
 Conflicts:	Xconfigurator < 4.9.42-1
+Conflicts:	ntop < 4.1.0-2
 Conflicts:	pciutils < 3.1.10-6
 Conflicts:	usbutils < 006-3
 BuildArch:	noarch
@@ -45,12 +50,12 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-ln -sf /usr/share/oui.txt $RPM_BUILD_ROOT%{_datadir}/%{name}/oui.txt
 %{__rm} $RPM_BUILD_ROOT/etc/modprobe.d/blacklist.conf
 
 %if 0
 gzip -n9 $RPM_BUILD_ROOT%{_datadir}/%{name}/pci.ids
 gzip -n9 $RPM_BUILD_ROOT%{_datadir}/%{name}/usb.ids
+gzip -n9 $RPM_BUILD_ROOT%{_datadir}/%{name}/oui.txt
 %endif
 
 %clean
@@ -60,7 +65,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc ChangeLog LICENSE
 %dir %{_datadir}/%{name}
-%{_datadir}/%{name}/oui.txt
+%{_datadir}/%{name}/oui.txt*
 %{_datadir}/%{name}/pci.ids*
 %{_datadir}/%{name}/pnp.ids
 %{_datadir}/%{name}/usb.ids*
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/hwdata.git/commitdiff/e0c3ee0164b643c4477547b366b092340d7ecfa9