- 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 bbcd69d404e4927eb048b85d85d6b46a5a9552ab..b654e0cde45d293b863a56fda24ecb754e8689d2 100644 (file)
--- 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
 -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
 -endif
 -endif

++AM_CXXFLAGS += -DUSB_IDS='"/etc/usb.ids"'

  
  SUBDIRS = docs
  
  
  SUBDIRS = docs
  

diff --git a/lsvpd.spec b/lsvpd.spec
index b83b8040f744a096faf74e986eec03faff479a5c..5eb959074ec3abdcfc2f4520d13eea4d6361c2c1 100644 (file)
--- 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
 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)
 
 Requires:      rc-scripts
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)