From: Jakub Bogusz Date: Tue, 3 May 2011 08:51:50 +0000 (+0000) Subject: - updated usb.ids path in make patch X-Git-Tag: auto/th/lsvpd-1.7.0-1~3 X-Git-Url: http://git.pld-linux.org/?p=packages%2Flsvpd.git;a=commitdiff_plain;h=7d6fa36 - updated usb.ids path in make patch - require {pci,usb}.ids in expected location Changed files: lsvpd-make.patch -> 1.3 lsvpd.spec -> 1.30 --- diff --git a/lsvpd-make.patch b/lsvpd-make.patch index bbcd69d..b654e0c 100644 --- a/lsvpd-make.patch +++ b/lsvpd-make.patch @@ -30,9 +30,10 @@ -if USB_IDS_LOC2 -AM_CXXFLAGS += -DUSB_IDS='"/usr/share/hwdata/usb.ids"' -else - AM_CXXFLAGS += -DUSB_IDS='"/usr/share/misc/usb.ids"' +-AM_CXXFLAGS += -DUSB_IDS='"/usr/share/misc/usb.ids"' -endif -endif ++AM_CXXFLAGS += -DUSB_IDS='"/etc/usb.ids"' SUBDIRS = docs diff --git a/lsvpd.spec b/lsvpd.spec index b83b804..5eb9590 100644 --- a/lsvpd.spec +++ b/lsvpd.spec @@ -28,6 +28,8 @@ BuildRequires: sg3_utils-devel BuildRequires: zlib-devel Requires(post,preun): /sbin/chkconfig Requires(post): /sbin/ldconfig +Requires: /etc/pci.ids +Requires: /etc/usb.ids Requires: rc-scripts BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)