diff --git a/hwdata.spec b/hwdata.spec index 4fee335..64c33b7 100644 --- a/hwdata.spec +++ b/hwdata.spec @@ -1,7 +1,7 @@ Name: hwdata Summary: Hardware identification and configuration data Version: 0.225 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and LGPLv2+ Group: System Environment/Base Source: hwdata-%{version}.tar.bz2 @@ -10,6 +10,7 @@ BuildArch: noarch Conflicts: Xconfigurator, system-config-display < 1.0.31, pcmcia-cs, kudzu < 1.2.0 Requires: module-init-tools >= 3.2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: pnp-dell.patch %description hwdata contains various hardware identification and configuration data, @@ -18,6 +19,7 @@ such as the pci.ids database and MonitorsDb databases. %prep %setup -q +%patch0 -p1 -b .dell %build # nothing to build @@ -37,6 +39,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/%{name}/* %changelog +* Tue Jul 07 2009 Adam Jackson 0.225-2 +- pnp-dell.patch: Fix Dell's entry in pnp.ids + * Thu Apr 09 2009 Adam Jackson 0.224-1 - Update pci.ids, usb.ids, and oui.txt - Add pnp.ids diff --git a/pnp-dell.patch b/pnp-dell.patch new file mode 100644 index 0000000..b14b78c --- /dev/null +++ b/pnp-dell.patch @@ -0,0 +1,12 @@ +diff -up hwdata-0.225/pnp.ids.jx hwdata-0.225/pnp.ids +--- hwdata-0.225/pnp.ids.jx 2009-04-09 14:33:30.000000000 -0400 ++++ hwdata-0.225/pnp.ids 2009-07-07 18:32:20.000000000 -0400 +@@ -440,7 +440,7 @@ DDS Barco, n.v. + DDT Datadesk Technologies Inc + DEC Digital Equipment Corporation + DEI Deico Electronics +-DEL Deltec Corporation ++DEL Dell + DEN Densitron Computers Ltd + DEX idex displays + DFI DFI