use usb-ids from system usb.ids

diff --git a/chromium-browser.spec b/chromium-browser.spec
index fd5dde6cd0ed9349b709a6641b34a1fdcd627b16..a6d053d718d78bcf55f6c3b89d4900eff80ebcb6 100644 (file)
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -41,7 +41,6 @@
 # - use_system_hunspell
 # - use_system_stlport
 # - other defaults: src/build/common.gypi
-# - system usb-ids stuff
 
 # NOTES:
 # - mute BEEP mixer if you do not want to hear horrible system bell when
@@ -160,6 +159,7 @@ BuildRequires:      sqlite3-devel >= 3.6.1
 BuildRequires: subversion
 BuildRequires: tar >= 1:1.22
 BuildRequires: udev-devel
+BuildRequires: usbutils
 BuildRequires: util-linux
 %{?with_system_v8:BuildRequires:       v8-devel >= 3.7}
 BuildRequires: which
@@ -372,6 +372,7 @@ test -e Makefile || \
 %endif
        %{!?with_sse2:-Ddisable_sse2=1} \
        %{?with_selinux:-Dselinux=1} \
+       -Dusb_ids_path=$(pkg-config --variable usbids usbutils) \
        -Dlinux_link_libpci=1 \
        %{!?with_tcmalloc:-Dlinux_use_tcmalloc=0} \
        -Dlinux_use_gold_binary=0 \

diff --git a/clean-source.sh b/clean-source.sh
index b184e8f0778994440d4bbec78370c76d52d79fa2..afd02e95ee4414cd9a6bda8dd2dff2465954ff01 100755 (executable)
--- a/clean-source.sh
+++ b/clean-source.sh
@@ -483,7 +483,6 @@ clean_third_party() {
                \! -path 'third_party/v8/*' \
                \! -path 'third_party/webrtc/*' \
                \! -path 'third_party/widevine/*' \
-               \! -path 'third_party/usb_ids/*' \
                -print -delete
 
        rm -vf third_party/expat/files/lib/expat.h