diff --git a/.cvsignore b/.cvsignore index abbea83..5be455f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -hwdata-0.178.tar.gz +hwdata-0.146.18.EL.tar.gz diff --git a/hwdata.spec b/hwdata.spec index 019751b..b354b00 100644 --- a/hwdata.spec +++ b/hwdata.spec @@ -1,18 +1,17 @@ Name: hwdata Summary: Hardware identification and configuration data -Version: 0.178 +Version: 0.146.18.EL 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, kudzu < 1.1.86 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,127 +28,86 @@ 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(noreplace) /etc/hotplug/blacklist +%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 -* 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 Mar 3 2006 Bill Nottingham 0.146.18.EL-1 +- blacklist EDAC modules (#183232) -* Fri Feb 24 2006 Bill Nottingham - 0.177-1 -- remove stock videoaliases in favor of driver-specific ones in - the X driver packages +* Thu Feb 09 2006 Phil Knirsch 0.146.17.EL-1 +- Added fix to detect the new ATI ES1000 chip properly (#180523) -* Wed Feb 22 2006 Phil Knirsch - 0.176-1 -- More entries from Dell to MonitorsDB (#181008) +* Fri Feb 03 2006 Phil Knirsch 0.146.16.EL-1 +- Fixed typo in upgradelist (#169783) -* Fri Feb 10 2006 Phil Knirsch - 0.175-1 -- Added a few more entries to MonitorsDB +* Fri Jan 27 2006 Phil Knirsch 0.146.15.EL-1 +- Updated pci.ids according to our schedule (#179097) -* Wed Feb 01 2006 Phil Knirsch - 0.174-1 -- Some cleanup and adds to the MonitorDB which closes several db related bugs. +* Thu Jan 19 2006 Phil Knirsch 0.146.14.EL-1 +- Fixed regression of missing line in pci.ids (#177169) -* Tue Dec 13 2005 Bill Nottingham - 0.173-1 -- add some IDs to the generic display entries for matching laptops +* Mon Nov 28 2005 Bill Nottingham 0.146.13.EL-1 +- update pci.ids, usb.ids from upstream (#168602) +- add support for Intel 915/945 (#170517) -* Fri Nov 18 2005 Bill Nottingham - 0.172-1 -- ditto for radeon +* Wed Aug 31 2005 Bill Nottingham 0.146.12.EL-1 +- update pci.ids (#156948) -* 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 +* Thu Aug 25 2005 Bill Nottingham +- /etc/pcmcia/config: fix typo (#166635) -* Wed Nov 16 2005 Bill Nottingham - 0.170-1 -- handle mptsas for migration as well -- move videoaliases file to a subdir +* Thu Jul 21 2005 Bill Nottingham 0.146.11.EL-1 +- update usb.ids, MonitorsDB (#158961) -* Fri Sep 16 2005 Bill Nottingham -- add Iiyama monitor (#168143) +* Tue Jul 19 2005 Bill Nottingham +- fix qlogic mapping -* Tue Sep 13 2005 Bill Nottingham -- add IBM monitor (#168080) +* Thu Jun 30 2005 Bill Nottingham +- add more mptfusion cards (#107088) -* Thu Sep 8 2005 Bill Nottingham - 0.169-1 -- remove Cards, pcitable. Add videodrivers +* Wed Jun 22 2005 Bill Nottingham +- add hisax modules to blacklist (#154799, #159068) -* Fri Sep 2 2005 Dan Williams - 0.168-1 -- Add more Gateway monitors +* Fri Jun 10 2005 Bill Nottingham +- fix ATI branding (#160047) -* 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 +* Wed May 4 2005 Bill Nottingham 0.146.10.EL-1 +- update pci.ids -* 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 +* Fri Apr 8 2005 Mike A. Harris 0.146.9.EL-1 +- Updated Cards to change the default driver for Nvidia FX1400 or FX540 to + "vesa" (#140601) -* Wed Mar 30 2005 Dan Williams 0.155-1 -- Add a boatload of BenQ, Acer, Sony, NEC, Mitsubishi, and Dell monitors +* Wed Mar 23 2005 Bill Nottingham 0.146.8.EL-1 +- fix qla6322 mapping (correction of fix for #150621) -* Wed Mar 30 2005 Dan Williams 0.154-1 -- Add Typhoon Speednet Wireless PCMCIA Card mapping to atmel_cs driver +* Mon Mar 14 2005 Bill Nottingham 0.146.7.EL-1 +- update pci.ids -* Mon Mar 28 2005 Bill Nottingham 0.153-1 -- update the framebuffer blacklist +* Wed Mar 9 2005 Bill Nottingham 0.146.6.EL-1 +- fix qlaXXXX mappings, add migration entries (#150621) -* Wed Mar 9 2005 Bill Nottingham 0.152-1 -- fix qlogic driver mappings, add upgradelist mappings for the modules - that changed names (#150621) +* Mon Mar 7 2005 Bill Nottingham 0.146.5.EL-1 +- more aic79xx entries (IT%67884) -* 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) +* Wed Mar 2 2005 Mike A. Harris 0.146.4.EL-1 +- Bump and rebuild to fix build problem -* Tue Jan 11 2005 Dan Williams - 0.150-1 -- Add Dell UltraSharp 1704FPV (Analog & Digital) +* Wed Mar 2 2005 Mike A. Harris 0.146.3.EL-1 +- Added many new nvidia PCI IDs to pcitable and Cards to synchronize it + with X.Org X11 6.8.2. (#140601) -* Sun Nov 21 2004 Bill Nottingham - 0.148-1 -- add Amptron monitors (#139142) +* Tue Mar 1 2005 Bill Nottingham - 0.146.2.EL-1 +- add sk98lin mapping (#145538) +- fix emu10k1x mapping (#147787) +- update usb.ids, pci.ids, MonitorsDB -* Wed Nov 10 2004 Bill Nottingham - 0.147-1 -- update usb.ids (#138533) +* Wed Nov 10 2004 Bill Nottingham - 0.146.1.EL-1 - migrate dpt_i2o to i2o_block (#138603) * Tue Nov 9 2004 Bill Nottingham - 0.146-1 diff --git a/sources b/sources index af59672..58eebba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d9eeb885781552312b34113ab947a3b7 hwdata-0.178.tar.gz +7c898a0b61a8f90c52b62d5c2d9f9e0e hwdata-0.146.18.EL.tar.gz