Updated pci, vendor and usb ids

[oweals/hwdata.git] / hwdata.spec

diff --git a/hwdata.spec b/hwdata.spec
index 6b13456611266f9d359265476eb08f2dfd2b5e04..f4a83be2e116843a46dd50156239bf2a3473d872 100644 (file)
--- a/hwdata.spec
+++ b/hwdata.spec
@@ -1,52 +1,173 @@
-Name: hwdata
-Summary: Hardware identification and configuration data
-Version: 0.232
-Release: 1%{?dist}
-License: GPLv2+
-Group: System Environment/Base
-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
-Requires: module-init-tools >= 3.2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# This package is arch-specific just because of bundling different files for
+# different architectures. No -debuginfo package is needed.
+%global     debug_package %{nil}
+%global     uprelease   8.2
+
+Name:       hwdata
+Summary:    Hardware identification and configuration data
+Version:    0.252
+Release:    %{uprelease}%{?dist}
+License:    GPLv2+
+Group:      System Environment/Base
+Source0:    https://fedorahosted.org/releases/h/w/%{name}/%{name}-%{version}-%{uprelease}.tar.bz2
+URL:        http://git.fedorahosted.org/git/hwdata.git
+
+BuildRequires   : perl
+BuildRequires   : perl(Date::Format)
+
+Requires        : systemd
+Requires(post)  : systemd
+Requires(postun): systemd

 
 %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 -n %{name}-%{version}-%{uprelease}
+%ifarch ppc ppc64
+patch -b -B nx_crypto -p1 < blacklist-nx_crypto.patch
+%endif
+%configure

 
 %build
 
 %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
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 

+%post
+udevadm hwdb --update >/dev/null 2>&1 || :
+
+%postun
+udevadm hwdb --update >/dev/null 2>&1 || :
+

 %files
 %files

-%defattr(-,root,root)

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

-%config(noreplace) %{_sysconfdir}/modprobe.d/blacklist.conf
+%{_prefix}/lib/modprobe.d/dist-blacklist.conf
+%{_prefix}/lib/udev/hwdb.d/[0-9][0-9]-*.hwdb

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

+* Tue Jun 28 2016 Michal Minar <miminar@redhat.com> 0.252-8.2
+- Updated pci, usb and vendor ids.
+- Resolves: rhbz#1292382
+- Resolves: rhbz#1291614
+- Resolves: rhbz#1324198
+
+* Fri Oct 23 2015 Michal Minar <miminar@redhat.com> 0.252-8.1
+- Updated pci, usb and vendor ids.
+- Resolves: rhbz#1236458
+- Resolves: rhbz#1256004
+- Resolves: rhbz#1266217
+- Resolves: rhbz#1271797
+
+* Mon Jun 29 2015 Michal Minar <miminar@redhat.com> 0.252-7.9
+- Updated pci, usb and vendor ids.
+
+* Tue Apr 14 2015 Michal Minar <miminar@redhat.com> 0.252-7.8
+- Blacklisted module nx_crypto on PowerPCs.
+- Resolves: rhbz#1211389
+- Disable debuginfo build.
+
+* Fri Apr 10 2015 Michal Minar <miminar@redhat.com> 0.252-7.6
+- Blacklisted experimental module sha1-mb.
+- Resolves: rhbz#1208120
+
+* Fri Jan 30 2015 Michal Minar <miminar@redhat.com> 0.252-7.5
+- Updated vendor, usb and pci ids.
+
+* Mon Sep 22 2014 Michal Minar <miminar@redhat.com> 0.252-7.4
+- Updated vendor, usb and pci ids.
+
+* Thu Mar 27 2014 Michal Minar <miminar@redhat.com> 0.252-7.3
+- Added few more hwdb files.
+- Updated vendor and pci ids.
+
+* Thu Mar 20 2014 Michal Minar <miminar@redhat.com> 0.252-7.1
+- Bumped release to reflect rhel version.
+- Fixed bogus dates in changelog.
+- Generate and install hwdb.d/* files.
+
+* Fri Dec 27 2013 Daniel Mach <dmach@redhat.com> - 0.252-3
+- Mass rebuild 2013-12-27
+
+* Mon Aug 5 2013 Michal Minar <miminar@redhat.com> 0.252-2
+- Changelog fix.
+
+* 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 Aug 08 2011 Karsten Hopp <karsten@redhat.com> 0.233-7.3
+- update pci.ids, usb. ids
+
+* Mon May 02 2011 Karsten Hopp <karsten@redhat.com> 0.233-7.2
+- update pci.ids with a fix for QLogic Infiniband adapter
+
+* Wed Apr 27 2011 Karsten Hopp <karsten@redhat.com> 0.233-7.1
+- update to latest pci.ids, usb.ids
+
+* 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
+
+* Wed Aug 25 2010 Karsten Hopp <karsten@redhat.com> 0.233-1
+- update usb.ids, out.txt and pci.ids
+

 * 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)
 
 * 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 May 25 2010 Phil Knirsch <pknirsch@redhat.com> 0.230-1
 - update usb.ids, out.txt and pci.ids
 - Resolves: #584788
 * Tue May 25 2010 Phil Knirsch <pknirsch@redhat.com> 0.230-1
 - update usb.ids, out.txt and pci.ids
 - Resolves: #584788


@@ -58,13 +179,13 @@ rm -rf $RPM_BUILD_ROOT
 - Blacklist chsc_sch for s390x
 - Resolves: #563228
 
 - 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
 
 * Mon Feb 22 2010 Karsten Hopp <karsten@redhat.com> 0.227-1
 - update usb.ids, pci.ids, oui.txt
 - update license
 

-* Tue Feb 23 2010 Dave Airlie <airlied@redhat.com> 0.227-1
-- add viafb to blacklist
-

 * 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.226-1
 - update release number
 


@@ -134,7 +255,7 @@ rm -rf $RPM_BUILD_ROOT
 - fix many monitor entries (Stanislav Ievlev, #430276)
 
 
 - fix many monitor entries (Stanislav Ievlev, #430276)
 
 

-* Wed Mar 03 2008 Karsten Hopp <karsten@redhat.com> 0.216-1
+* 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
 - update pci.ids, usb.ids (#431658)
 
 * Tue Jan 29 2008 Phil Knirsch <pknirsch@redhat.com> 0.215-1


@@ -336,7 +457,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)


@@ -712,7 +833,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)


@@ -736,7 +857,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