[packages/hwdata] use oui.txt from ieee-oui package

glen glen at pld-linux.org
Tue Jan 15 15:40:25 CET 2013


commit 0fdf1ddca9bfbcd1aa251e470e09d461faebce99
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Jan 15 16:40:03 2013 +0200

    use oui.txt from ieee-oui package

 hwdata.spec | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/hwdata.spec b/hwdata.spec
index 2d5d8d9..68a70a6 100644
--- a/hwdata.spec
+++ b/hwdata.spec
@@ -7,14 +7,15 @@ Summary(pl.UTF-8):	Dane do identyfikacji i konfiguracji sprzętu
 Name:		hwdata
 # see hwdata.spec inside of tarball
 Version:	0.241
-Release:	0.1
+Release:	1
 License:	GPL v2+
 Group:		Applications/System
 Source0:	https://fedorahosted.org/releases/h/w/hwdata/%{name}-%{version}.tar.bz2
 # Source0-md5:	32dd541d778cfe0dd6100f88433bbc90
+Requires:	ieee-oui
 Requires:	pciutils
-Requires:	usbutils
 Requires:	pnputils
+Requires:	usbutils
 Conflicts:	Xconfigurator < 4.9.42-1
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -38,9 +39,10 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-ln -sf /etc/pci.ids $RPM_BUILD_ROOT%{_datadir}/hwdata/pci.ids
-ln -sf /etc/usb.ids $RPM_BUILD_ROOT%{_datadir}/hwdata/usb.ids
-ln -sf /usr/share/misc/pnp.ids $RPM_BUILD_ROOT%{_datadir}/hwdata/pnp.ids
+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
 %{__rm} $RPM_BUILD_ROOT/etc/modprobe.d/blacklist.conf
 
 %clean
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list