diff --git a/.cvsignore b/.cvsignore index 0cfb2f0..5b89f24 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -hwdata-0.180.tar.gz +hwdata-0.101.25.tar.gz diff --git a/hwdata.spec b/hwdata.spec index b09aa53..67be56c 100644 --- a/hwdata.spec +++ b/hwdata.spec @@ -1,18 +1,17 @@ Name: hwdata Summary: Hardware identification and configuration data -Version: 0.180 +Version: 0.101.25 Release: 1 License: GPL/MIT Group: System Environment/Base Source: hwdata-%{version}.tar.gz BuildArch: noarch -Conflicts: Xconfigurator, system-config-display < 1.0.31, pcmcia-cs, kudzu < 1.2.0 -Requires: module-init-tools >= 3.2 +Conflicts: Xconfigurator < 4.9.42-1, kernel-pcmcia-cs < 3.1.31-11 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root %description hwdata contains various hardware identification and configuration data, -such as the pci.ids database and MonitorsDb databases. +such as the pci.ids database, the XFree86 Cards and MonitorsDb databases. %prep @@ -29,277 +28,97 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %doc LICENSE COPYING %dir /usr/share/hwdata -%config(noreplace) /etc/modprobe.d/blacklist +%dir /etc/pcmcia +%config /etc/pcmcia/config %config /usr/share/hwdata/* +# This file is screaming to be moved into /usr/share/hwdata sometime +/usr/X11R6/lib/X11/Cards %changelog -* Thu May 11 2006 Phil Knirsch - 0.180-1 -- Updated and added some MonitorsDB entries +* Thu Jun 22 2006 Adam Jackson 0.101.25-1 +- Added Matrox G200e to Cards and pcitable -* Tue May 02 2006 Phil Knirsch - 0.179-1 +* Fri May 26 2006 Karsten Hopp 0.101.24-1 +- added some monitors to MonitorsDB (#191694) + +* Tue May 02 2006 Phil Knirsch - 0.101.23-1 - Updated PCI ids from upstream (#180402) - Fixed missing monitor entry in MonitorsDB (#189446) -* Wed Mar 01 2006 Phil Knirsch - 0.178-1 -- Commented out the VT lines at the end of usb.ids as our tools don't handle - them properly. +* Fri Jan 27 2006 Phil Knirsch - 0.101.22-1 +- 2nd update for pci.ids from upstream (#171207) -* Fri Feb 24 2006 Bill Nottingham - 0.177-1 -- remove stock videoaliases in favor of driver-specific ones in - the X driver packages +* Mon Nov 28 2005 Bill Nottingham - 0.101.21-1 +- update pci.ids, usb.ids from upstream (#171207) +- add tg3 mappings (#165696) +- add Emluex mappings (#174005) +- add megaraid_sas mappings (#168226) -* Wed Feb 22 2006 Phil Knirsch - 0.176-1 -- More entries from Dell to MonitorsDB (#181008) +* Thu Aug 25 2005 Bill Nottingham - 0.101.20-1 +- update pci.ids (#156839) -* Fri Feb 10 2006 Phil Knirsch - 0.175-1 -- Added a few more entries to MonitorsDB +* Thu Jul 21 2005 Bill Nottingham - 0.101.19-1 +- update usb.ids, MonitorsDB -* Wed Feb 01 2006 Phil Knirsch - 0.174-1 -- Some cleanup and adds to the MonitorDB which closes several db related bugs. +* Tue Jul 12 2005 Kristian - 0.101.18-1 +- Add PCI IDs for ATI Raden RN50 cards. -* Tue Dec 13 2005 Bill Nottingham - 0.173-1 -- add some IDs to the generic display entries for matching laptops +* Thu Jun 30 2005 Bill Nottingham +- add more mptfusion ids (#107088) -* Fri Nov 18 2005 Bill Nottingham - 0.172-1 -- ditto for radeon +* Tue May 31 2005 Bill Nottingham +- fix 3w-9xxx mapping (#159204) -* Fri Nov 18 2005 Jeremy Katz - 0.171-1 -- r128 -> ati. should fix the unresolved symbol and kem says its more - generally the "right" thing to do - -* Wed Nov 16 2005 Bill Nottingham - 0.170-1 -- handle mptsas for migration as well -- move videoaliases file to a subdir - -* Fri Sep 16 2005 Bill Nottingham -- add Iiyama monitor (#168143) - -* Tue Sep 13 2005 Bill Nottingham -- add IBM monitor (#168080) - -* Thu Sep 8 2005 Bill Nottingham - 0.169-1 -- remove Cards, pcitable. Add videodrivers - -* Fri Sep 2 2005 Dan Williams - 0.168-1 -- Add more Gateway monitors - -* Fri Sep 2 2005 Dan Williams - 0.167-1 -- Add some ADI monitors, one BenQ, and and DPMS codes for two Apples - -* Fri Sep 2 2005 Bill Nottingham - 0.166-1 -- add videoaliases file -- remove CardMonitorCombos, as nothing uses it - -* Thu Aug 25 2005 Dan Williams - 0.165-1 -- Add a bunch of Acer monitors - -* Tue Aug 9 2005 Jeremy Katz - 0.164-1 -- migrate sk98lin -> skge - -* Sat Jul 30 2005 Bill Nottingham -- migrate mpt module names (#161420) -- remove pcitable entries for drivers in modules.pcimap -- switch lone remaining 'Server' entry - that can't work right - -* Tue Jul 26 2005 Bill Nottingham -- add Daytek monitor (#164339) - -* Wed Jul 13 2005 Bill Nottingham - 0.162-1 -- remove /etc/pcmcia/config, conflict with pcmcia-cs - -* Fri Jul 7 2005 Bill Nottingham - 0.160-1 -- move blacklist to /etc/modprobe.d, require new module-init-tools -- add LG monitors (#162466, #161734) -- add orinoco card (#161696) -- more mptfusion stuff (#107088) - -* Thu Jun 23 2005 Bill Nottingham -- add Samsung monitor (#161013) - -* Wed Jun 22 2005 Bill Nottingham - 0.159-1 -- pcitable: make branding happy (#160047) -- Cards: add required blank line (#157972) -- add some monitors -- add JVC CD-ROM (#160907, ) -- add hisax stuff to blacklist (#154799, #159068) - -* Mon May 16 2005 Bill Nottingham - 0.158-1 -- add a orinoco card (#157482) - -* Thu May 5 2005 Jeremy Katz - 0.157-1 -- add 20" Apple Cinema Display - -* Sun Apr 10 2005 Mike A. Harris 0.156-1 -- Update SiS entries in Cards/pcitable to match what Xorg X11 6.8.2 supports - -* Wed Mar 30 2005 Dan Williams 0.155-1 -- Add a boatload of BenQ, Acer, Sony, NEC, Mitsubishi, and Dell monitors - -* Wed Mar 30 2005 Dan Williams 0.154-1 -- Add Typhoon Speednet Wireless PCMCIA Card mapping to atmel_cs driver - -* Mon Mar 28 2005 Bill Nottingham 0.153-1 -- update the framebuffer blacklist - -* Wed Mar 9 2005 Bill Nottingham 0.152-1 -- fix qlogic driver mappings, add upgradelist mappings for the modules - that changed names (#150621) - -* Wed Mar 2 2005 Mike A. Harris 0.151-1 -- Added one hundred billion new nvidia PCI IDs to pcitable and Cards to - synchronize it with X.Org X11 6.8.2. (#140601) - -* Tue Jan 11 2005 Dan Williams - 0.150-1 -- Add Dell UltraSharp 1704FPV (Analog & Digital) - -* Sun Nov 21 2004 Bill Nottingham - 0.148-1 -- add Amptron monitors (#139142) - -* Wed Nov 10 2004 Bill Nottingham - 0.147-1 -- update usb.ids (#138533) -- migrate dpt_i2o to i2o_block (#138603) - -* Tue Nov 9 2004 Bill Nottingham - 0.146-1 -- update pci.ids (#138233) -- add Apple monitors (#138481) - -* Wed Oct 20 2004 Bill Nottingham - 0.145-1 -- remove ahci mappings, don't prefer it over ata_piix - -* Tue Oct 19 2004 Kristian Høgsberg - 0.144-1 -- update IDs for Cirrus, Trident, C&T, and S3 - -* Tue Oct 12 2004 Bill Nottingham - 0.143-1 -- add ahci mappings to prefer it over ata_piix -- map davej's ancient matrox card to vesa (#122750) - -* Thu Oct 7 2004 Dan Williams - 0.141-1 -- Add Belkin F5D6020 ver.2 (802.11b card based on Atmel chipset) - -* Fri Oct 1 2004 Bill Nottingham - 0.140-1 -- include /etc/hotplug/blacklist here - -* Thu Sep 30 2004 Bill Nottingham - 0.136-1 -- add S3 UniChrome (#131403) +* Tue Apr 19 2005 Bill Nottingham - 0.101.17-1 - update pci.ids -* Thu Sep 23 2004 Bill Nottingham - 0.135-1 -- megaraid -> megaraid_mbox +* Mon Mar 14 2005 Bill Nottingham - 0.101.16-1 +- update pci.ids -* Wed Sep 22 2004 Bill Nottingham - 0.134-1 -- map ncr53c8xx to sym53c8xx (#133181) +* Tue Mar 1 2005 Bill Nottingham - 0.101.15-1 +- update pci.ids, usb.ids, MonitorsDB +- fix some e100 mismappings (#144929) +- fix some aic79xx mappings (#142486) -* Fri Sep 17 2004 Bill Nottingham - 0.132-1 -- fix 3Ware 9000 mapping (#132851) +* Tue Nov 9 2004 Bill Nottingham - 0.101.14-1 +- update pci.ids, MonitorsDB -* Tue Sep 14 2004 Kristian Høgsberg - 0.131-1 -- Add python script to check sorting of pci.ids +* Thu Sep 30 2004 Bill Nottingham - 0.101.13-1 +- update pci.ids -* Thu Sep 9 2004 Kristian Høgsberg 0.131-1 -- Add pci ids and cards for new ATI, NVIDIA and Intel cards +* Fri Jul 2 2004 Bill Nottingham - 0.101.12-1 +- megaraid2 for certain cards -* Sat Sep 4 2004 Bill Nottingham 0.130-1 -- trim pcitable - now just ids/drivers +* Fri Jun 25 2004 Bill Nottingham - 0.101.11-1 +- update MonitorsDB +- update pcitable with emulex, aacraid, qlogic ids -* Wed Sep 1 2004 Bill Nottingham 0.125-1 -- pci.ids updates -- remove updsftab.conf.* +* Tue Jun 15 2004 Adrian Havill - 0.101.9-1 +- pci.ids updated to 2004-Jun-15 daily snapshot -* Sun Aug 29 2004 Mike A. Harris 0.124-1 -- Updates to pcitable/Cards for 'S3 Trio64 3D' cards. (#125866,59956) +* Thu Apr 15 2004 Bill Nottingham - 0.101.8-1 +- more pci.ids -* Fri Jul 9 2004 Mike A. Harris 0.123-1 -- Quick pcitable/Cards update for ATI Radeon and FireGL boards +* Tue Mar 9 2004 Jeremy Katz - 0.101.7-1 +- some more radeons -* Mon Jun 28 2004 Bill Nottingham -- add Proview monitor (#125853) -- add ViewSonic monitor (#126324) -- add a Concord camera (#126673) +* Fri Mar 5 2004 Jeremy Katz - 0.101.6-1 +- don't map the secondaries -* Wed Jun 23 2004 Brent Fox - 0.122-1 -- Add Vobis monitor to MonitorsDB (bug #124151) +* Fri Mar 5 2004 Jeremy Katz - 0.101.5-1 +- associate cards with some of the pci.ids -* Wed Jun 09 2004 Dan Williams - 0.121-1 -- add Belkin F5D5020 10/100 PCMCIA card (#125581) +* Mon Mar 1 2004 Bill Nottingham 0.101.4-1 +- update pci.ids again -* Fri May 28 2004 Bill Nottingham -- add modem (#124663) +* Mon Feb 23 2004 Bill Nottingham 0.101.3-1 +- update pci.ids, MonitorsDB (#92322, #109341, #104069) -* Mon May 24 2004 Bill Nottingham - 0.120-1 -- mainly: - fix upgradelist module for CMPci cards (#123647) -- also: - add another wireless card (#122676) - add wireless card (#122625) - add 1280x800 (#121548) - add 1680x1050 (#121148) - add IntelligentStick (#124313) +* Fri Feb 13 2004 John Dennis 0.101.2-1 +- fix typo in Hewlet-Packard, GP should have been HP -* Mon May 10 2004 Jeremy Katz - 0.119-1 -- veth driver is iseries_veth in 2.6 - -* Wed May 5 2004 Jeremy Katz - 0.118-1 -- add a wireless card (#122064) -- and a monitor (#121696) - -* Fri Apr 16 2004 Bill Nottingham 0.117-1 -- fix makefile - -* Thu Apr 15 2004 Bill Nottingham 0.116-1 -- move updfstab.conf here -- add wireless card (#116865) -- add laptop display panel (#117385) -- add clipdrive (#119928) -- add travelling disk (#119143) -- add NEXDISK (#106782) - -* Thu Apr 15 2004 Brent Fox 0.115-1 -- replace snd-es1960 driver with snd-es1968 in pcitable (bug #120729) - -* Mon Mar 29 2004 Bill Nottingham 0.114-1 -- fix entries pointing to Banshee (#119388) - -* Tue Mar 16 2004 Bill Nottingham 0.113-1 -- add a Marvell sk98lin card (#118467, <64bit_fedora@comcast.net>) - -* Fri Mar 12 2004 Brent Fox 0.112-1 -- add a Sun flat panel to MonitorsDB (bug #118138) - -* Fri Mar 5 2004 Brent Fox 0.111-1 -- add Samsung monitor to MonitorsDB (bug #112112) - -* Mon Mar 1 2004 Mike A. Harris 0.110-1 -- Added 3Dfx Voodoo Graphics and Voodoo II entries to the Cards database, both - pointing to Alan Cox's new "voodoo" driver which is now included in XFree86 - 4.3.0-62 and later builds in Fedora development. Mapped their PCI IDs to - the new Cards entry in pcitable. -- Updated the entries for 3Dfx Banshee - -* Mon Feb 23 2004 Bill Nottingham 0.109-1 -- pci.ids and other updates - -* Thu Feb 19 2004 Mike A. Harris 0.108-1 -- Added Shamrock C407L to MonitorsDB for bug (#104920) - -* Thu Feb 19 2004 Mike A. Harris 0.107-1 -- Massive Viewsonic monitor update for MonitorsDB (#84882) - -* Fri Feb 13 2004 John Dennis 0.106-1 -- fix typo, GP should have been HP - -* Thu Jan 29 2004 Bill Nottingham 0.105-1 -- many monitor updates (#114260, #114216, #113993, #113932, #113782, - #113685, #113523, #111203, #107788, #106526, #63005) -- add some PCMCIA cards (#113006, #112505) - -* Tue Jan 20 2004 Bill Nottingham 0.104-1 -- switch sound module mappings to alsa drivers - -* Mon Jan 19 2004 Brent Fox 0.103-1 -- fix tab spacing - -* Fri Jan 16 2004 Brent Fox 0.102-1 -- added an entry for ATI Radeon 9200SE (bug #111306) +* Mon Dec 8 2003 Bill Nottingham 0.101.1-1 +- add some pci ids (#106891) * Sun Oct 26 2003 Jeremy Katz 0.101-1 - add 1920x1200 Generic LCD as used on some Dell laptops (#108006) diff --git a/sources b/sources index 32a0d62..8fecba1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0e02b7d5d80f14f4994e8209c561535e hwdata-0.180.tar.gz +cbdf904f0cf7bc2681407d530a7cb08c hwdata-0.101.25.tar.gz