[packages/hwdata] up to 0.241

glen glen at pld-linux.org
Sun Jan 13 18:41:39 CET 2013


commit 1417ab0c2fb56b91d48624225cd83648d66beb4c
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Jan 13 19:40:41 2013 +0200

    up to 0.241
    
    contains more than usb and pci dbs:
    PCI, USB, OUI, IAB, modprobe blacklist db

 hwdata.spec | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)
---
diff --git a/hwdata.spec b/hwdata.spec
index 93fed58..07aa4ba 100644
--- a/hwdata.spec
+++ b/hwdata.spec
@@ -1,15 +1,18 @@
-%define	snap	20090808
+# TODO
+# - sync -pl
+# - make this primary db of pci/usb/oui/pnp/blacklist db (merge usbutils, pciutils, 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
 Summary(pl.UTF-8):	Dane do identyfikacji i konfiguracji sprzętu
 Name:		hwdata
 # see hwdata.spec inside of tarball
-Version:	0.225
-Release:	0.%{snap}.1
-License:	GPL/XFree86
+Version:	0.241
+Release:	0.1
+License:	GPL v2+
 Group:		Applications/System
-# git clone git://git.fedorahosted.org/git/hwdata.git
-Source0:	%{name}-%{snap}.tar.bz2
-# Source0-md5:	e38fc6902b82be61b845da5516317f40
+Source0:	https://fedorahosted.org/releases/h/w/hwdata/%{name}-%{version}.tar.bz2
+# Source0-md5:	32dd541d778cfe0dd6100f88433bbc90
 Requires:	pciutils
 Requires:	usbutils
 Conflicts:	Xconfigurator < 4.9.42-1
@@ -18,8 +21,7 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 hwdata contains various hardware identification and configuration
-data, such as the pci.ids database, the XFree86 Cards and MonitorsDB
-databases.
+data, such as pci.ids, usb.ids, oui.txt and pnp.ids databases.
 
 %description -l pl.UTF-8
 Pakiet hwdata zawiera różne dane do identyfikacji i konfiguracji
@@ -27,17 +29,19 @@ sprzętu, takie jak baza danych pci.ids oraz bazy Cards i MonitorsDB
 dla XFree86.
 
 %prep
-%setup -q -n %{name}
+%setup -q
+
+%build
+%configure
 
 %install
 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
-rm -f $RPM_BUILD_ROOT/etc/modprobe.d/blacklist
+ln -sf %{_sysconfdir}/pci.ids $RPM_BUILD_ROOT%{_datadir}/hwdata/pci.ids
+ln -sf %{_sysconfdir}/usb.ids $RPM_BUILD_ROOT%{_datadir}/hwdata/usb.ids
+%{__rm} $RPM_BUILD_ROOT/etc/modprobe.d/blacklist.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list