update data files, fixed spec file

configure script made executable
 - it is now used in spec's prep section

updated oui.txt and pci.ids

diff --git a/configure b/configure
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/hwdata.spec b/hwdata.spec
index 767f8d1561a5bb8311fb03d9cea2987331cbc3f5..85fffc8deda024807d34ded5d264597c7704f113 100644 (file)
--- a/hwdata.spec
+++ b/hwdata.spec
@@ -1,6 +1,6 @@
 Name: hwdata
 Summary: Hardware identification and configuration data
-Version: 0.239
+Version: 0.240
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
@@ -14,6 +14,7 @@ such as the pci.ids and usb.ids databases.
 
 %prep
 %setup -q
+%configure
 
 %build
 # nothing to build
@@ -26,13 +27,15 @@ make install DESTDIR=$RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
 %doc LICENSE COPYING
 %dir %{_datadir}/%{name}
 %config(noreplace) %{_sysconfdir}/modprobe.d/blacklist.conf
 %{_datadir}/%{name}/*
 
 %changelog
+* 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
 

diff --git a/oui.txt b/oui.txt
index 45d4b0b9047f117ae914e635d30aa91e44755ad3..beff5b175bee6dbd50efd9cb81fa5cba54108041 100644 (file)
--- a/oui.txt
+++ b/oui.txt
@@ -45948,10 +45948,10 @@ company_id                    Organization
                                Dahlewitz BBG 15827
                                GERMANY
 
-00-1C-4D   (hex)               Zeetoo, Inc.
-001C4D     (base 16)           Zeetoo, Inc.
-                               128 Great Road
-                               Bedford MA 01730
+00-1C-4D   (hex)               Zeemote Technology Inc. (part of Aplix).
+001C4D     (base 16)           Zeemote Technology Inc. (part of Aplix).
+                               285 Mill Road
+                               Chelmsford MA 01824
                                UNITED STATES
 
 00-1C-4E   (hex)               TASA International Limited
@@ -81691,11 +81691,10 @@ company_id                    Organization
                                JAMAICA NY 11434
                                UNITED STATES
 
-08-00-64   (hex)               AUTOPHON AG
-080064     (base 16)           AUTOPHON AG
-                               ABT. TZM 307
-                               ZIEGELMATTSTRASSE 1-15 4503 SOLOTHURN
-                               SWITZERLAND
+08-00-64   (hex)               Sitasys AG
+080064     (base 16)           Sitasys AG
+                               Freiburgstrasse 251
+                               CH-3018 Bern
                                SWITZERLAND
 
 08-00-65   (hex)               GENRAD INC.
@@ -82533,6 +82532,12 @@ company_id                     Organization
                                Kulim Kedah 09000
                                MALAYSIA
 
+0C-8C-DC   (hex)               Suunto Oy
+0C8CDC     (base 16)           Suunto Oy
+                               Valimotie 7
+                               Vantaa Uusimaa 02710
+                               FINLAND
+
 0C-8D-98   (hex)               TOP EIGHT IND CORP
 0C8D98     (base 16)           TOP EIGHT IND CORP
                                8F.,No79-1 Zhouzi St., Neihu District, Taipei City  (Neihu Technology Park)
@@ -89770,6 +89775,9 @@ company_id                      Organization
                                Kunpo-city Gyeonggi-Do 435-824
                                KOREA, REPUBLIC OF
 
+58-09-43   (hex)               PRIVATE
+580943     (base 16)            
+                                
 58-12-43   (hex)               AcSiP Technology Corp.
 581243     (base 16)           AcSiP Technology Corp.
                                3F., No.22, Dalin Rd.,
@@ -94859,6 +94867,12 @@ company_id                     Organization
                                San Diego CA 92127
                                UNITED STATES
 
+84-9D-C5   (hex)               Centera Photonics Inc.
+849DC5     (base 16)           Centera Photonics Inc.
+                               3F, No 6-3 Dusing Rd.
+                               Hsinchu Taiwan 30078
+                               TAIWAN, PROVINCE OF CHINA
+
 84-A6-C8   (hex)               Intel Corporate
 84A6C8     (base 16)           Intel Corporate
                                Lot 8, Jalan Hi-Tech 2/3
@@ -98358,6 +98372,13 @@ A870A5     (base 16)           UniComm Inc.
                                Chung-Ho City Taipei Hsien 23500
                                TAIWAN, REPUBLIC OF CHINA
 
+A8-75-D6   (hex)               FreeTek International Co., Ltd.
+A875D6     (base 16)           FreeTek International Co., Ltd.
+                               Unit D, 15/F, Tai Ping Ind.Ctr., Blk 2
+                               55 Ting Kok Rd.
+                               HonTai Po  1111
+                               HONG KONG
+
 A8-77-6F   (hex)               Zonoff
 A8776F     (base 16)           Zonoff
                                70E Swedesford Rd
@@ -103242,7 +103263,7 @@ D8160A     (base 16)          Nippon Electro-Sensory Devices
 D8-18-2B   (hex)               Conti Temic Microelectronic GmbH
 D8182B     (base 16)           Conti Temic Microelectronic GmbH
                                Sieboldstr. 19
-                               Nuremberg Bavaria 90403
+                               Nuremberg Bavaria 90411
                                GERMANY
 
 D8-1B-FE   (hex)               TWINLINX CORPORATION
@@ -105546,6 +105567,12 @@ ECFAAA     (base 16)         The IMS Company
                                Brea CA 92821
                                UNITED STATES
 
+EC-FC-55   (hex)               A. Eberle GmbH & Co. KG
+ECFC55     (base 16)           A. Eberle GmbH & Co. KG
+                               Frankenstrasse 160
+                               Nuernberg Bavaria 90461
+                               GERMANY
+
 EC-FE-7E   (hex)               BlueRadios, Inc.
 ECFE7E     (base 16)           BlueRadios, Inc.
                                7173 S. Havana Street, Suite 600

diff --git a/pci.ids b/pci.ids
index 3d0d757ddad6a3c33dd5236d26850afc63319804..9427e7ad0ae8e055824b5a1cbb52557f5caa9612 100644 (file)
--- a/pci.ids
+++ b/pci.ids
@@ -1,8 +1,8 @@
 #
 #      List of PCI ID's
 #
-#      Version: 2012.09.22
-#      Date:    2012-09-22 03:15:01
+#      Version: 2012.09.26
+#      Date:    2012-09-26 03:15:01
 #
 #      Maintained by Martin Mares <mj@ucw.cz> and other volunteers from the
 #      PCI ID Project at http://pci-ids.ucw.cz/.
@@ -18584,7 +18584,7 @@
                8086 4f4d  DeskTop Board D510MO
        27bd  82801GHM (ICH7-M DH) LPC Interface Bridge
                1025 006c  9814 WKMI
-       27c0  N10/ICH7 Family SATA Controller [IDE mode]
+       27c0  NM10/ICH7 Family SATA Controller [IDE mode]
                1028 01ad  OptiPlex GX620
                1028 01df  PowerEdge SC440
                1028 01e6  PowerEdge 860
@@ -18594,7 +18594,7 @@
                1462 7236  945P Neo3-F Rev. 2.2 motherboard
                1775 11cc  CC11/CL11
                8086 544e  DeskTop Board D945GTP
-       27c1  N10/ICH7 Family SATA Controller [AHCI mode]
+       27c1  NM10/ICH7 Family SATA Controller [AHCI mode]
                1028 01df  PowerEdge SC440
                103c 2a3b  Pavilion A1512X
                1775 11cc  CC11/CL11
@@ -18612,7 +18612,7 @@
                103c 30a3  Compaq nw8440
                17aa 200d  ThinkPad T60/R60 series
        27c6  82801GHM (ICH7-M DH) SATA Controller [RAID mode]
-       27c8  N10/ICH 7 Family USB UHCI Controller #1
+       27c8  NM10/ICH7 Family USB UHCI Controller #1
                1025 006c  9814 WKMI
                1028 01ad  OptiPlex GX620
                1028 01d7  XPS M1210
@@ -18629,7 +18629,7 @@
                17aa 200a  ThinkPad T60/R60 series
                8086 4f4d  DeskTop Board D510MO
                8086 544e  DeskTop Board D945GTP
-       27c9  N10/ICH 7 Family USB UHCI Controller #2
+       27c9  NM10/ICH7 Family USB UHCI Controller #2
                1025 006c  9814 WKMI
                1028 01ad  OptiPlex GX620
                1028 01d7  XPS M1210
@@ -18646,7 +18646,7 @@
                17aa 200a  ThinkPad T60/R60 series
                8086 4f4d  DeskTop Board D510MO
                8086 544e  DeskTop Board D945GTP
-       27ca  N10/ICH 7 Family USB UHCI Controller #3
+       27ca  NM10/ICH7 Family USB UHCI Controller #3
                1025 006c  9814 WKMI
                1028 01ad  OptiPlex GX620
                1028 01d7  XPS M1210
@@ -18663,7 +18663,7 @@
                17aa 200a  ThinkPad T60/R60 series
                8086 4f4d  DeskTop Board D510MO
                8086 544e  DeskTop Board D945GTP
-       27cb  N10/ICH 7 Family USB UHCI Controller #4
+       27cb  NM10/ICH7 Family USB UHCI Controller #4
                1025 006c  9814 WKMI
                1028 01ad  OptiPlex GX620
                1028 01d7  XPS M1210
@@ -18679,7 +18679,7 @@
                17aa 200a  ThinkPad T60/R60 series
                8086 4f4d  DeskTop Board D510MO
                8086 544e  DeskTop Board D945GTP
-       27cc  N10/ICH 7 Family USB2 EHCI Controller
+       27cc  NM10/ICH7 Family USB2 EHCI Controller
                1025 006c  9814 WKMI
                1028 01ad  OptiPlex GX620
                1028 01d7  XPS M1210
@@ -18695,20 +18695,20 @@
                17aa 200b  ThinkPad T60/R60 series
                8086 4f4d  DeskTop Board D510MO
                8086 544e  DeskTop Board D945GTP
-       27d0  N10/ICH 7 Family PCI Express Port 1
+       27d0  NM10/ICH7 Family PCI Express Port 1
                103c 309f  Compaq nx9420 Notebook
                103c 30a3  Compaq nw8440
                1775 11cc  CC11/CL11
-       27d2  N10/ICH 7 Family PCI Express Port 2
+       27d2  NM10/ICH7 Family PCI Express Port 2
                103c 309f  Compaq nx9420 Notebook
                103c 30a3  Compaq nw8440
                1775 11cc  CC11/CL11
-       27d4  N10/ICH 7 Family PCI Express Port 3
+       27d4  NM10/ICH7 Family PCI Express Port 3
                1775 11cc  CC11/CL11
-       27d6  N10/ICH 7 Family PCI Express Port 4
+       27d6  NM10/ICH7 Family PCI Express Port 4
                103c 30a3  Compaq nw8440
                1775 11cc  CC11/CL11
-       27d8  N10/ICH 7 Family High Definition Audio Controller
+       27d8  NM10/ICH7 Family High Definition Audio Controller
                1025 006c  9814 WKMI
                1028 01d7  XPS M1210
                103c 2a3b  Pavilion A1512X
@@ -18734,7 +18734,7 @@
                8086 27d8  DeskTop Board D945GTP
                8086 d618  DeskTop Board D510MO
                8384 7680  STAC9221 HD Audio Codec
-       27da  N10/ICH 7 Family SMBus Controller
+       27da  NM10/ICH7 Family SMBus Controller
                1025 006c  9814 WKMI
                1028 01ad  OptiPlex GX620
                1028 01d7  XPS M1210
@@ -18749,7 +18749,7 @@
                8086 4f4d  DeskTop Board D510MO
                8086 544e  DeskTop Board D945GTP
                8086 5842  DeskTop Board D975XBX
-       27dc  N10/ICH 7 Family LAN Controller
+       27dc  NM10/ICH7 Family LAN Controller
                103c 2a3b  Pavilion A1512X
                8086 308d  DeskTop Board D945GTP
        27dd  82801G (ICH7 Family) AC'97 Modem Controller