diff --git a/hwdata.spec b/hwdata.spec index 8f6e9de..a886a16 100644 --- a/hwdata.spec +++ b/hwdata.spec @@ -1,10 +1,10 @@ Name: hwdata Summary: Hardware identification and configuration data Version: 0.234 -Release: 2%{?dist} +Release: 1%{?dist} License: GPLv2+ and LGPLv2+ Group: System Environment/Base -Source: hwdata-%{version}-%{release}.tar.bz2 +Source: hwdata-%{version}.tar.bz2 URL: http://git.fedorahosted.org/git/hwdata.git BuildArch: noarch Conflicts: Xconfigurator, system-config-display < 1.0.31, pcmcia-cs, kudzu < 1.2.0 @@ -37,17 +37,11 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/%{name}/* %changelog -* Mon Jul 11 2011 Karsten Hopp 0.234-1 -- update oui.txt, pci.ids, usb.ids +* Mon Aug 22 2011 David Nalley 0.234-1 +- packaging an update for mid-release -* Fri Jan 28 2011 Karsten Hopp 0.233-7 -- bump release -- update oui.txt URL -- fix tarball name in spec file -- update usb.ids, out.txt and pci.ids - -* Wed Aug 25 2010 Karsten Hopp 0.233-1 -- update usb.ids, out.txt and pci.ids +* Mon Aug 08 2011 Karsten Hopp 0.233-1 +- update pci.ids, usb. ids * Thu Aug 05 2010 Karsten Hopp 0.232-1 - update usb.ids, out.txt and pci.ids (#550020, #611860) @@ -68,8 +62,6 @@ rm -rf $RPM_BUILD_ROOT * Tue Feb 23 2010 Dave Airlie 0.227-1 - add viafb to blacklist - -* Mon Feb 22 2010 Karsten Hopp 0.227-1 - update usb.ids, pci.ids, oui.txt - update license diff --git a/pnp-dell.patch b/pnp-dell.patch deleted file mode 100644 index b14b78c..0000000 --- a/pnp-dell.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 diff --git a/sources b/sources index 7dded03..58558aa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b18197ba658008a4bf873e4e94d47705 hwdata-0.234.tar.bz2 +8108ff494a0a46358894c1b0e61592c6 hwdata-0.234.tar.bz2