Removed bad entry from usb ids

[oweals/hwdata.git] / hwdata.spec

diff --git a/hwdata.spec b/hwdata.spec
index 869ea69d1352e0957d70e6383837a5d7c25aafe0..08c758733dff409d3047efb2545c50e01a8bba7c 100644 (file)
--- a/hwdata.spec
+++ b/hwdata.spec
@@ -1,106 +1,356 @@
 Name: hwdata
 Summary: Hardware identification and configuration data
 Name: hwdata
 Summary: Hardware identification and configuration data

-Version: 0.207
+Version: 0.274

 Release: 2%{?dist}
 Release: 2%{?dist}

-License: GPL+ and MIT and LGPLv2+
+License: GPLv2+

 Group: System Environment/Base
 Group: System Environment/Base

-Source: hwdata-%{version}.tar.gz
-Patch1: dell-monitors.patch
+Source: https://fedorahosted.org/releases/h/w/%{name}/%{name}-%{version}.tar.bz2
+URL:    http://git.fedorahosted.org/git/hwdata.git

 BuildArch: noarch
 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)

 
 %description
 hwdata contains various hardware identification and configuration data,
 
 %description
 hwdata contains various hardware identification and configuration data,

-such as the pci.ids database and MonitorsDb databases.
+such as the pci.ids and usb.ids databases.

 
 %prep
 
 %prep

-

 %setup -q
 %setup -q

-%patch1 -p1 -b .dellmonitors
+%configure
+
+%build
+# nothing to build

 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %install
 rm -rf $RPM_BUILD_ROOT

-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT libdir=%{_prefix}/lib

 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files

-%defattr(-,root,root)

 %doc LICENSE COPYING
 %dir %{_datadir}/%{name}
 %doc LICENSE COPYING
 %dir %{_datadir}/%{name}

-%config(noreplace) %{_sysconfdir}/modprobe.d/blacklist
+%{_prefix}/lib/modprobe.d/dist-blacklist.conf

 %{_datadir}/%{name}/*
 
 %changelog
 %{_datadir}/%{name}/*
 
 %changelog

-* Thu Oct 25 2007 Matt Domsch <Matt_Domsch@dell.com> 0.207-2
-- MonitorsDB: add 20 new Dell monitors
+* Mon Jan 26 2015 Michal Minar <miminar@redhat.com> 0.274-2
+- Removed bad entry from usb ids file.

 
 

-* Wed Aug 29 2007 Karsten Hopp <karsten@redhat.com> 0.207-1
-- update license tag
+* Mon Jan 19 2015 Michal Minar <miminar@redhat.com> 0.274-1
+- Updated pci, usb and vendor ids.

 
 

-* Mon Aug 06 2007 Adam Jackson <ajax@redhat.com> 0.207-1
-- MonitorsDB: Fix the sync ranges for the generic monitors to not be quite
-  so dumb.  90kHz hsync is way out of range for any common single-link DVI
-  panel, for example. (#247271)
+* Thu Dec 18 2014 Michal Minar <miminar@redhat.com> 0.273-1
+- Updated pci, usb and vendor ids.

 
 

-* Thu Jul 12 2007 Karsten Hopp <karsten@redhat.com> 0.206-1
-- build
+* Tue Nov 25 2014 Michal Minar <miminar@redhat.com> 0.272-1
+- Updated pci and vendor ids.

 
 

--* Wed Jul 11 2007 Matt Domsch <Matt_Domsch@dell.com>
-- add dell-monitors.patch so Dell can update these themselves.
+* Sun Oct 26 2014 Michal Minar <miminar@redhat.com> 0.271-1
+- Updateed pci and vendor ids.

 
 

-* Mon Jul 02 2007 Karsten Hopp <karsten@redhat.com> 0.206-1
-- add Acer AL1916W monitor (#200572)
-- add Eizo L568D, L568 (#200572)
-- add Samsung 795DF/795MB/Magic CD175GP (#200572)
+* Wed Sep 17 2014 Michal Minar <miminar@redhat.com> 0.270-2
+- Recreated pnp.ids.

 
 

-* Mon Jun 25 2007 Karsten Hopp <karsten@redhat.com> 0.204-1
-- add some Samsung monitors to MonitorsDB, bz#245434, bz#245439
+* Wed Sep 17 2014 Michal Minar <miminar@redhat.com> 0.270-1
+- Updated pci, usb and vendor ids.

 
 

-* Mon Jun 25 2007 Karsten Hopp <karsten@redhat.com> 0.203-1
-- add Samsung Syncmaster 591v, bz#240660
-- add LG L1740B, Mtek MT-0910, bz#240662
-- move blacklist matrxfb_base from module-init-tools blacklist-compat 
-  into hwdata's blacklist, bz#241595
-- update pci.ids, usb.ids
+* Mon Aug 18 2014 Michal Minar <miminar@redhat.com> 0.269-1
+- Updated pci, usb and vendor ids.

 
 

-* Tue Apr 10 2007 Karsten Hopp <karsten@redhat.com> 0.200-1
-- use macros
-- update pci.ids
+* Mon Jul 21 2014 Michal Minar <miminar@redhat.com> 0.268-1
+- Updated pci, usb and vendor ids.
+
+* Mon Jun 16 2014 Michal Minar <miminar@redhat.com> 0.267-1
+- Updated pci, and vendor ids.
+
+* Tue May 27 2014 Michal Minar <miminar@redhat.com> 0.266-1
+- Updated pci, usb and vendor ids
+
+* Tue Apr 22 2014 Michal Minar <miminar@redhat.com> 0.265-1
+- Updated pci, usb and vendor ids.
+
+* Thu Mar 27 2014 Michal Minar <miminar@redhat.com> 0.264-1
+- Updated pci and vendor ids.
+
+* Thu Mar 20 2014 Michal Minar <miminar@redhat.com> 0.263-1
+- Added Individual Address Blocks file (iab.txt).
+
+* Tue Mar 18 2014 Michal Minar <miminar@redhat.com> 0.262-1
+- Update of pci and vendor ids.
+
+* Tue Feb 25 2014 Michal Minar <miminar@redhat.com> 0.261-1
+- Update of pci, usb and vendor ids.
+
+* Sun Jan 19 2014 Michal Minar <miminar@redhat.com> 0.260-1
+- Update of pci, usb and vendor ids.
+
+* Tue Dec 31 2013 Michal Minar <miminar@redhat.com> 0.259-1
+- Update of pci, usb and vendor ids.
+
+* Fri Nov 29 2013 Michal Minar <miminar@redhat.com> 0.258-1
+- Update of pci and oui ids.
+
+* Tue Oct 29 2013 Michal Minar <miminar@redhat.com> 0.257-1
+- Update of pci, oui and usb ids.
+
+* Sun Sep 22 2013 Michal Minar <miminar@redhat.com> 0.256-1
+- Update of pci, oui and usb ids.
+
+* Wed Aug 21 2013 Michal Minar <miminar@redhat.com> 0.255-1
+- Update of pci, oui and usb ids.
+
+* Wed Aug 07 2013 Michal Minar <miminar@redhat.com> 0.254-1
+- Update of vendor ids.
+
+* Mon Jul 29 2013 Michal Minar <miminar@redhat.com> 0.253-1
+- Changelog fix and oui.ids update.
+
+* Sun Jul 21 2013 Michal Minar <miminar@redhat.com> 0.252-1
+- Data files update.
+
+* Sat Jul 06 2013 Michal Minar <miminar@redhat.com> 0.250-1
+- Data files update.
+
+* Thu Jun 20 2013 Michal Minar <miminar@redhat.com> 0.249-1
+- Data files update, pnp.ids included.
+
+* Thu Apr 18 2013 Michal Minar <miminar@redhat.com> 0.248-1
+- Data files update
+
+* Wed Mar 27 2013 Michal Minar <miminar@redhat.com> 0.247-1
+- Moved blacklist.conf from /etc/modprobe.d to /usr/lib/modprobe.d.
+- Renamed it to dist-blacklist.conf.
+- Data files update
+
+* Mon Mar 18 2013 Michal Minar <miminar@redhat.com> 0.245-1
+- Data files update
+
+* Mon Feb 18 2013 Michal Minar <miminar@redhat.com> 0.244-1
+- Data files updated
+
+* Fri Jan 18 2013 Michal Minar <miminar@redhat.com> 0.243-1
+- Data files updated
+
+* Fri Dec 07 2012 Michal Minar <miminar@redhat.com> 0.242-1
+- Update data files
+
+* Wed Nov 07 2012 Michal Minar <miminar@redhat.com> 0.241-1
+- Update data files
+
+* Wed Sep 26 2012 Michal Minar <miminar@redhat.com> 0.240-1
+- made use of configure script in prep
+
+* Tue Sep 25 2012 Michal Minar <miminar@redhat.com> 0.239-1
+- Update data files
+
+* Thu Aug 23 2012 Adam Jackson <ajax@redhat.com> 0.238-1
+- Fix reference specfile to current Fedora style
+
+* Thu Aug 23 2012 Adam Jackson <ajax@redhat.com> 0.235-1
+- Update data files
+- Remove upgradelist, not needed since kudzu-ectomy

 
 

-* Mon Mar 12 2007 Karsten Hopp <karsten@redhat.com> 0.199-1
-- drop %%config from data files in /usr
+* Mon Aug 08 2011 Karsten Hopp <karsten@redhat.com> 0.233-7.3
+- update pci.ids, usb. ids

 
 

-* Tue Feb 27 2007 Adam Jackson <ajax@redhat.com> 0.198-1
-- Fix the intel entry in videodrivers to be tab-delimited (#227591)
-- Add a check for same to the 'check' target
-- Add clog target to Makefile
+* Mon May 02 2011 Karsten Hopp <karsten@redhat.com> 0.233-7.2
+- update pci.ids with a fix for QLogic Infiniband adapter

 
 

-* Mon Feb 26 2007 Karsten Hopp <karsten@redhat.com> 0.197-1
-- add disttag
+* Wed Apr 27 2011 Karsten Hopp <karsten@redhat.com> 0.233-7.1
+- update to latest pci.ids, usb.ids

 
 

-* Wed Feb 21 2007 Karsten Hopp <karsten@redhat.com> 0.196-1
-- review fixes
+* Fri Jan 28 2011 Karsten Hopp <karsten@redhat.com> 0.233-7
+- bump release
+- update oui.txt URL
+- fix tarball name in spec file
+- update usb.ids, out.txt and pci.ids

 
 

-* Mon Jan 29 2007 Karsten Hopp <karsten@redhat.com>
-- add some monitors (#224510)
+* Wed Aug 25 2010 Karsten Hopp <karsten@redhat.com> 0.233-1
+- update usb.ids, out.txt and pci.ids

 
 

-* Tue Jan 23 2007 Karsten Hopp <karsten@redhat.com> 0.195-1
-- update pci.ids, usb.ids and build for FC-7
+* Thu Aug 05 2010 Karsten Hopp <karsten@redhat.com> 0.232-1
+- update usb.ids, out.txt and pci.ids (#550020, #611860)
+- fix incorrect syntax doc/comment in blacklist.conf (Ville Skyttä, #532802)
+- add Acer B243HL and BenQ G2420HDBL (Ville Skyttä, #590787)
+- add HP LP2475w and Samsung 2494HM (Ville Skyttä, #595059)

 
 

-* Tue Jan 02 2007 Karsten Hopp <karsten@redhat.com> 0.193-1
+* Tue May 25 2010 Phil Knirsch <pknirsch@redhat.com> 0.230-1
+- update usb.ids, out.txt and pci.ids
+- Resolves: #584788
+
+* Mon Mar 29 2010 Karsten Hopp <karsten@redhat.com> 0.229-1
+- update usb.ids, out.txt and pci.ids for F-13 (#571914)
+
+* Wed Mar 17 2010 Phil Knirsch <pknirsch@redhat.com> 0.228-1
+- Blacklist chsc_sch for s390x
+- Resolves: #563228
+
+* Tue Feb 23 2010 Dave Airlie <airlied@redhat.com> 0.227-1
+- add viafb to blacklist
+
+* Mon Feb 22 2010 Karsten Hopp <karsten@redhat.com> 0.227-1
+- update usb.ids, pci.ids, oui.txt
+- update license
+
+* Fri Jan 15 2010 Karsten Hopp <karsten@redhat.com> 0.226-1
+- update release number
+
+* Fri Jan 15 2010 Karsten Hopp <karsten@redhat.com> 0.225-4
+- update usb.ids pci.ids oui.txt
+
+* Mon Nov 30 2009 Dennis Gregorovic <dgregor@redhat.com> - 0.225-3.1
+- Rebuilt for RHEL 6
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.225-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Jul 07 2009 Adam Jackson <ajax@redhat.com> 0.225-2
+- pnp-dell.patch: Fix Dell's entry in pnp.ids
+
+* Thu Apr 09 2009 Adam Jackson <ajax@redhat.com> 0.224-1
+- Update pci.ids, usb.ids, and oui.txt
+- Add pnp.ids
+
+* Thu Mar 19 2009 Karsten Hopp <karsten@redhat.com> 0.223-1
+- update usb.ids pci.ids oui.txt
+- rename /etc/modprobe.d/blacklist to /etc/modprobe.d/blacklist.conf
+
+* Wed Jan 28 2009 Karsten Hopp <karsten@redhat.com> 0.222-1
+- update usb.ids pci.ids oui.txt and build for all current releases
+  Fixes p.e. #465440
+
+* Wed Jan 21 2009 Karsten Hopp <karsten@redhat.com> 0.221-1
+- update usb.ids pci.ids oui.txt
+
+* Tue Dec 02 2008 Karsten Hopp <karsten@redhat.com> 0.220-1
+- add new monitor entries from Mandriva hardware database (Thierry Vignaud)
+- make generic entries have properly formated frequencies (Thierry Vignaud)
+- remove duplicate Dell monitor entries (Thierry Vignaud)
+- more vendor name fixes
+- fix extra field in 'Compudyne KD-1500N' definition (Thierry Vignaud)
+- make Dell monitors case consistent (Thierry Vignaud)
+- make all GoldStar monitors have the same vendor name (Thierry Vignaud)
+- add URL of git repository
+- fix spacing (Thierry Vignaud)
+- sort MonitorDB file with LANG=C sort -f -t ";" -k1,2
+- add Samsung SyncMaster 2443BWX (Marc van den Dikkenberg)
+- add some Lenovo monitors (Im Sza)
+
+* Wed Jul 23 2008 Karsten Hopp <karsten@redhat.com> 0.220-1
+- update pci.ids, usb.ids, oui.txt
+- MonitorsDB: add some Samsung monitors (Ronald Warsow)
+- MonitorsDB: add Dell E1609W (Matt Domsch)
+- MonitorsDB: add 7 Dell monitors (Matt Domsch)
+- MonitorsDB: add a bunch of Hyundai and ImageQuest monitors
+
+* Mon Jun 09 2008 Karsten Hopp <karsten@redhat.com> 0.219-1
+- add BenQ FP2091 monitor (Peter Williams)
+- add a bunch of Hyundai and ImageQuest monitors
+
+* Mon Jun 02 2008 Karsten Hopp <karsten@redhat.com> 0.219-1
+- update pci.ids, usb.ids, oui.txt
+- blacklist snd-pcsp (#448425)
+
+* Mon May 19 2008 Karsten Hopp <karsten@redhat.com> 0.218-1
+- add some Acer monitors (Im Sz)
+
+* Tue Apr 01 2008 Karsten Hopp <karsten@redhat.com> 0.217-1
+- update pci.ids, oui.txt
+- update usb.ids, fixes #439963
+- add HP w1907 LCD monitor, fixes #431359
+- fix many monitor entries (Stanislav Ievlev, #430276)
+
+
+* Mon Mar 03 2008 Karsten Hopp <karsten@redhat.com> 0.216-1
+- update pci.ids, usb.ids (#431658)
+
+* Tue Jan 29 2008 Phil Knirsch <pknirsch@redhat.com> 0.215-1
+- Pull new upstream pci.ids
+
+* Wed Jan 23 2008 Karsten Hopp <karsten@redhat.com> 0.215-1
+- add HP W2207 monitor
+- add oui.txt, a list of bluetooth device makers
+
+* Fri Jan 18 2008 Karsten Hopp <karsten@redhat.com> 0.214-1
+- remove MonitorsDB.generic as it isn't used anywhere
+- drop RHEL-5 blacklist patch in -devel
+
+* Tue Jan 15 2008 Karsten Hopp <karsten@redhat.com> 0.213-1
+- add many monitor entries (Im Sza, #367111)
+
+* Fri Jan 11 2008 Karsten Hopp <karsten@redhat.com> 0.212-1
+- pull new upstream pci.ids, usb.ids
+- Resolves: #300831
+- added HP TFT5600 LCD Monitor
+- Resolves: #250569
+- added Acer AL1916W, Eizo L568/L568D, Samsung 795DF
+- Resolves: #250582
+- Add Samsung 205BW/206BW/225BW/226BW
+- Resolves: #250584
+- Add Samsung 931BF
+- Resolves: #250587
+
+* Sat Dec 22 2007 Karsten Hopp <karsten@redhat.com> 0.209-1
+- add Proview 926w monitor (#363091)
+
+* Sat Dec 22 2007 Karsten Hopp <karsten@redhat.com> 0.208-1
+- new release
+- drop dell-monitors patch, already included in tarball
+
+* Thu Dec 13 2007 Karsten Hopp <karsten@redhat.com> 0.207-3
+- fix License tag
+- add empty %%build section for fedora-review
+
+* Thu Oct 25 2007 Matt Domsch <Matt_Domsch@dell.com> 0.207-2
+- MonitorsDB: add 20 new Dell monitors
+
+* Wed Sep 26 2007 Karsten Hopp <karsten@redhat.com> 0.211-1
+- pull new upstream pci.ids, usb.ids
+
+* Thu Sep 20 2007 Karsten Hopp <karsten@redhat.com> 0.210-1
+- add pci.id for Chelsio 10GbE Ethernet Adapter
+- Resolves: bz #296811
+
+* Wed Sep 19 2007 Karsten Hopp <karsten@redhat.com> 0.209-1
+- pull new upstream pci.ids, usb.ids
+
+* Wed Aug 29 2007 Karsten Hopp <karsten@redhat.com> 0.207-1
+- update license tag
+
+* Wed Aug 15 2007 Karsten Hopp <karsten@redhat.com> 0.207-1
+- pull new upstream pci.ids and rebuild
+- Resolves: bz #251732
+- Resolves: bz #251734
+- Resolves: bz #252195
+- Resolves: bz #252196
+- Resolves: bz #241274
+
+* Tue Aug 14 2007 Karsten Hopp <karsten@redhat.com> 0.205-1
+- add HP TFT5600        #229370
+
+* Mon Jul 09 2007 Karsten Hopp <karsten@redhat.com> 0.205-1
+- enable iwl4965 blacklist
+- Resolves: bz#245379
+
+* Mon Jun 25 2007 Karsten Hopp <karsten@redhat.com> 0.205-1
+- really update pci.ids, update-pciids downloaded an old file
+- disable iwl4965 blacklist as it is not approved yet (#245379)
+
+* Mon Jun 25 2007 Karsten Hopp <karsten@redhat.com> 0.202-1
+- don't load iwl4965 module automatically
+- Resolves: #245379
+
+* Tue Jun 19 2007 Karsten Hopp <karsten@redhat.com> 0.201-1
+- add some monitors
+- Resolves: #224511
+- update pci.ids
+- Related: #223105
+
+* Tue Jan 02 2007 Karsten Hopp <karsten@redhat.com> 0.194-1

 - Update to latest pci.ids/usb.ids for RHEL5
 - Resolves: #220182
   Add some Dell monitors to MonitorDB
 
 - Update to latest pci.ids/usb.ids for RHEL5
 - Resolves: #220182
   Add some Dell monitors to MonitorDB
 

-* Wed Dec 06 2006 Karsten Hopp <karsten@redhat.com> 0.192-1
-- update pci.ids
-- update usb.ids
-- add some Samsung monitors (Till Maas, #204459)
-

 * Mon Oct 09 2006 Phil Knirsch <pknirsch@redhat.com> - 0.191-1
 - Update to latest pci.ids for RHEL5
 
 * Mon Oct 09 2006 Phil Knirsch <pknirsch@redhat.com> - 0.191-1
 - Update to latest pci.ids for RHEL5
 


@@ -213,7 +463,7 @@ rm -rf $RPM_BUILD_ROOT
 * Wed Jul 13 2005 Bill Nottingham <notting@redhat.com> - 0.162-1
 - remove /etc/pcmcia/config, conflict with pcmcia-cs
 
 * Wed Jul 13 2005 Bill Nottingham <notting@redhat.com> - 0.162-1
 - remove /etc/pcmcia/config, conflict with pcmcia-cs
 

-* Fri Jul  7 2005 Bill Nottingham <notting@redhat.com> - 0.160-1
+* Thu Jul  7 2005 Bill Nottingham <notting@redhat.com> - 0.160-1

 - move blacklist to /etc/modprobe.d, require new module-init-tools
 - add LG monitors (#162466, #161734)
 - add orinoco card (#161696)
 - move blacklist to /etc/modprobe.d, require new module-init-tools
 - add LG monitors (#162466, #161734)
 - add orinoco card (#161696)


@@ -589,7 +839,7 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Jul 30 2002 Bill Nottingham <notting@redhat.com> 0.36-1
 - tweaks for Dell Remote Assisstant cards (#60376)
 
 * Tue Jul 30 2002 Bill Nottingham <notting@redhat.com> 0.36-1
 - tweaks for Dell Remote Assisstant cards (#60376)
 

-* Thu Jul 26 2002 Mike A. Harris <mharris@redhat.com> 0.35-1
+* Fri Jul 26 2002 Mike A. Harris <mharris@redhat.com> 0.35-1

 - Updated Cards db for CT69000
 - Various ATI cleanups and additions to Cards and pcitable
 - Updated S3 Trio3D to default to "vesa" driver (#59956)
 - Updated Cards db for CT69000
 - Various ATI cleanups and additions to Cards and pcitable
 - Updated S3 Trio3D to default to "vesa" driver (#59956)


@@ -613,7 +863,7 @@ rm -rf $RPM_BUILD_ROOT
   supported natively by 4.x will be changed to use the vesa or vga
   driver, or completely removed as unsupported.
 
   supported natively by 4.x will be changed to use the vesa or vga
   driver, or completely removed as unsupported.
 

-* Tue Apr 17 2002 Michael Fulbright <msf@redhat.com> 0.14-1
+* Wed Apr 17 2002 Michael Fulbright <msf@redhat.com> 0.14-1

 - another megaraid variant
 
 * Mon Apr 15 2002 Michael Fulbright <msf@redhat.com> 0.13-1
 - another megaraid variant
 
 * Mon Apr 15 2002 Michael Fulbright <msf@redhat.com> 0.13-1